Merge commit 'fanch/master'

12 files changed, 104 insertions, 10 deletions

diff --git a/extra/etherape/.md5sum b/extra/etherape/.md5sum
index bf85431d4..ba2553e65 100644
--- a/extra/etherape/.md5sum
+++ b/extra/etherape/.md5sum
@@ -1 +1 @@
-ca770d23b825b1a39d4c3b27efd8cbd1  etherape-0.9.8.tar.gz
+5ac4d386284fe8ed31860656cdfefb45  etherape-0.9.9.tar.gz
diff --git a/extra/etherape/Pkgfile b/extra/etherape/Pkgfile
index 0e05e7806..ebae42b68 100644
--- a/extra/etherape/Pkgfile
+++ b/extra/etherape/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: libpcap, libgnomeui
 
 name=etherape
-version=0.9.8
+version=0.9.9
 release=1
-source=(http://downloads.sourceforge.net/project/etherape/etherape/0.9.8/etherape-0.9.8.tar.gz)
+source=(http://downloads.sourceforge.net/project/etherape/etherape/0.9.9/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/extra/isomaster/.md5sum b/extra/isomaster/.md5sum
index 038f02dca..5f08c7e3b 100644
--- a/extra/isomaster/.md5sum
+++ b/extra/isomaster/.md5sum
@@ -1,2 +1,2 @@
-ceec3c0034d443f4d514558256038dcd  isomaster-1.3.5.tar.bz2
+c88e76c59600239f278b41052e47cfcb  isomaster-1.3.6.tar.bz2
 88ace8012c82527d522ad138e0adad08  isomaster.desktop
diff --git a/extra/isomaster/Pkgfile b/extra/isomaster/Pkgfile
index 8d26e8006..74cf3ad99 100644
--- a/extra/isomaster/Pkgfile
+++ b/extra/isomaster/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:gtk, desktop-file-utils 
 
 name=isomaster
-version=1.3.5
+version=1.3.6
 release=1
 source=(http://littlesvr.ca/isomaster/releases/$name-$version.tar.bz2 \
 	$name.desktop)
diff --git a/extra/john/.md5sum b/extra/john/.md5sum
index 33876e29b..4b8d811fd 100755
--- a/extra/john/.md5sum
+++ b/extra/john/.md5sum
@@ -1,2 +1,2 @@
 66cff429c263f534e9ebe06a4eeaa845  john
-4000132d5dd50b431e5b507cf521808b  john-1.7.3.tar.gz
+b8055b53076691add77a717721e8b170  john-1.7.3.4.tar.gz
diff --git a/extra/john/Pkgfile b/extra/john/Pkgfile
index 0e740337a..e724754df 100755
--- a/extra/john/Pkgfile
+++ b/extra/john/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: 
 
 name=john
-version=1.7.3
+version=1.7.3.4
 release=3
 source=(http://www.openwall.com/john/g/$name-$version.tar.gz john)
 
diff --git a/extra/verbiste/.directory b/extra/verbiste/.directory
new file mode 100644
index 000000000..9becffa22
--- /dev/null
+++ b/extra/verbiste/.directory
@@ -0,0 +1,5 @@
+[Dolphin]
+Timestamp=2010,1,8,15,42,37
+
+[Settings]
+ShowDotFiles=true
diff --git a/extra/verbiste/.footprint b/extra/verbiste/.footprint
new file mode 100644
index 000000000..74c244e6c
--- /dev/null
+++ b/extra/verbiste/.footprint
@@ -0,0 +1,62 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/french-conjugator
+-rwxr-xr-x	root/root	usr/bin/french-deconjugator
+-rwxr-xr-x	root/root	usr/bin/verbiste-gtk
+drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/verbiste-0.1/
+drwxr-xr-x	root/root	usr/include/verbiste-0.1/verbiste/
+-rw-r--r--	root/root	usr/include/verbiste-0.1/verbiste/FrenchVerbDictionary.h
+-rw-r--r--	root/root	usr/include/verbiste-0.1/verbiste/Trie.cpp
+-rw-r--r--	root/root	usr/include/verbiste-0.1/verbiste/Trie.h
+-rw-r--r--	root/root	usr/include/verbiste-0.1/verbiste/c-api.h
+-rw-r--r--	root/root	usr/include/verbiste-0.1/verbiste/misc-types.h
+drwxr-xr-x	root/root	usr/lib/
+-rwxr-xr-x	root/root	usr/lib/libverbiste-0.1.la
+lrwxrwxrwx	root/root	usr/lib/libverbiste-0.1.so -> libverbiste-0.1.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libverbiste-0.1.so.0 -> libverbiste-0.1.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libverbiste-0.1.so.0.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/verbiste-0.1.pc
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/applications/
+-rw-r--r--	root/root	usr/share/applications/verbiste.desktop
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/verbiste-0.1.28/
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/AUTHORS
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/COPYING
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/HACKING
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/INSTALL
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/LISEZMOI
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/NEWS
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/README
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/THANKS
+-rw-r--r--	root/root	usr/share/doc/verbiste-0.1.28/TODO (EMPTY)
+drwxr-xr-x	root/root	usr/share/locale/
+drwxr-xr-x	root/root	usr/share/locale/fr/
+drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/verbiste.mo
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/fr/
+drwxr-xr-x	root/root	usr/share/man/fr/man1/
+-rw-r--r--	root/root	usr/share/man/fr/man1/french-conjugator.1.gz
+-rw-r--r--	root/root	usr/share/man/fr/man1/french-deconjugator.1.gz
+drwxr-xr-x	root/root	usr/share/man/fr/man3/
+-rw-r--r--	root/root	usr/share/man/fr/man3/verbiste.3.gz
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/french-conjugator.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/french-deconjugator.1.gz
+drwxr-xr-x	root/root	usr/share/man/man3/
+-rw-r--r--	root/root	usr/share/man/man3/verbiste.3.gz
+drwxr-xr-x	root/root	usr/share/pixmaps/
+-rw-r--r--	root/root	usr/share/pixmaps/verbiste.png
+drwxr-xr-x	root/root	usr/share/texmf/
+drwxr-xr-x	root/root	usr/share/texmf/tex/
+drwxr-xr-x	root/root	usr/share/texmf/tex/latex/
+drwxr-xr-x	root/root	usr/share/texmf/tex/latex/verbiste/
+-rw-r--r--	root/root	usr/share/texmf/tex/latex/verbiste/verbiste.cfg
+-rw-r--r--	root/root	usr/share/texmf/tex/latex/verbiste/verbiste.cls
+drwxr-xr-x	root/root	usr/share/verbiste-0.1/
+-rw-r--r--	root/root	usr/share/verbiste-0.1/COPYING
+-rw-r--r--	root/root	usr/share/verbiste-0.1/conjugation-fr.xml
+-rw-r--r--	root/root	usr/share/verbiste-0.1/verbs-fr.xml
diff --git a/extra/verbiste/.md5sum b/extra/verbiste/.md5sum
new file mode 100644
index 000000000..6be3b4b1f
--- /dev/null
+++ b/extra/verbiste/.md5sum
@@ -0,0 +1 @@
+423afc22348bc7d4788f6c68bd8d0f27  verbiste-0.1.28.tar.gz
diff --git a/extra/verbiste/Pkgfile b/extra/verbiste/Pkgfile
new file mode 100644
index 000000000..bff30de40
--- /dev/null
+++ b/extra/verbiste/Pkgfile
@@ -0,0 +1,26 @@
+# Description: Apprendre la conjugaison française
+# URL:  http://perso.b2b2c.ca/sarrazip/dev/verbiste.html
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: libxml2 gtk2
+
+name=verbiste
+version=0.1.28
+release=1
+group=app
+source=(http://perso.b2b2c.ca/sarrazip/dev/$name-$version.tar.gz \
+	)
+
+build() {
+	cd $name-$version
+	./configure --prefix=/usr \
+	--with-gtk-app
+	 
+	make -j3
+	make DESTDIR=$PKG install
+	install -D -m644 $SRC/$name-$version/src/gnome/verbiste.desktop \
+	$PKG/usr/share/applications/verbiste.desktop
+	sed -i 's/Exec=verbiste/Exec=verbiste-gtk/g' \
+	$PKG/usr/share/applications/verbiste.desktop
+}
+ 
diff --git a/extra/wireshark/.md5sum b/extra/wireshark/.md5sum
index 9af4cc1ff..79d01447c 100644
--- a/extra/wireshark/.md5sum
+++ b/extra/wireshark/.md5sum
@@ -1,2 +1,2 @@
-c2dfc197e485a0b0072ca64b8ac4d24c  wireshark-1.2.3.tar.bz2
+38010265a76f25553498304dcf15a92c  wireshark-1.2.5.tar.bz2
 031b1d52ccf31cde9f8c813ab1e1000b  wireshark.desktop
diff --git a/extra/wireshark/Pkgfile b/extra/wireshark/Pkgfile
index 0a6a1e9cb..8363837a6 100644
--- a/extra/wireshark/Pkgfile
+++ b/extra/wireshark/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: gnutls, gtk, libcap, libpcap, pcre
 
 name=wireshark
-version=1.2.3
+version=1.2.5
 release=1
-source=(http://media-2.cacetech.com/wireshark/src/wireshark-1.2.3.tar.bz2 \
+source=(http://media-2.cacetech.com/wireshark/src/wireshark-$version.tar.bz2 \
 	$name.desktop)
 
 build() {