Merge branch '2.3' of crux:/home/crux/scm/ports/contrib into 2.3

19 files changed, 80 insertions, 55 deletions

diff --git a/help2man/.footprint b/help2man/.footprint
new file mode 100644
index 000000000..1b565c0a0
--- /dev/null
+++ b/help2man/.footprint
@@ -0,0 +1,7 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/help2man
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/help2man.1.gz
diff --git a/help2man/.md5sum b/help2man/.md5sum
new file mode 100644
index 000000000..08a7f3d2c
--- /dev/null
+++ b/help2man/.md5sum
@@ -0,0 +1 @@
+d31a0a38c2ec71faa06723f6b8bd3076  help2man-1.36.4.tar.gz
diff --git a/help2man/Pkgfile b/help2man/Pkgfile
new file mode 100644
index 000000000..ec8e88e97
--- /dev/null
+++ b/help2man/Pkgfile
@@ -0,0 +1,24 @@
+# Description: A tool for automatically generating simple manual pages from program output.
+# URL: http://www.gnu.org/software/help2man/
+# Maintainer: Danny Rawlins, romster at shortcircuit dot net dot au
+# Packager: Younes Hafri, ycrux at club-internet dot fr
+# Depends on:
+
+name=help2man
+version=1.36.4
+release=1
+source=(http://ftp.gnu.org/gnu/help2man/help2man-$version.tar.gz)
+
+build() {
+	cd help2man-$version
+
+	./configure \
+		--prefix=/usr \
+		--disable-nls
+
+	make
+	make prefix=$PKG/usr install
+
+	rm -rf $PKG/usr/info
+}
+
diff --git a/libevent/.footprint b/libevent/.footprint
index a9d8f68c9..b7d0dcfe2 100644
--- a/libevent/.footprint
+++ b/libevent/.footprint
@@ -6,10 +6,10 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/event.h
 -rw-r--r--	root/root	usr/include/evhttp.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libevent-1.3d.so.1 -> libevent-1.3d.so.1.0.3
--rwxr-xr-x	root/root	usr/lib/libevent-1.3d.so.1.0.3
+lrwxrwxrwx	root/root	usr/lib/libevent-1.3e.so.1 -> libevent-1.3e.so.1.0.3
+-rwxr-xr-x	root/root	usr/lib/libevent-1.3e.so.1.0.3
 -rwxr-xr-x	root/root	usr/lib/libevent.la
-lrwxrwxrwx	root/root	usr/lib/libevent.so -> libevent-1.3d.so.1.0.3
+lrwxrwxrwx	root/root	usr/lib/libevent.so -> libevent-1.3e.so.1.0.3
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/evdns.3.gz
diff --git a/libevent/.md5sum b/libevent/.md5sum
index ab56407de..b399e5848 100644
--- a/libevent/.md5sum
+++ b/libevent/.md5sum
@@ -1 +1 @@
-664a429247e7737162bd667e166b2761  libevent-1.3d.tar.gz
+8553ad0f8a35d8d96ae0c69c387e06d3  libevent-1.3e.tar.gz
diff --git a/libevent/Pkgfile b/libevent/Pkgfile
index 489834016..b98659bdc 100644
--- a/libevent/Pkgfile
+++ b/libevent/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=libevent
-version=1.3d
+version=1.3e
 release=1
 source=(http://www.monkey.org/~provos/libevent-$version.tar.gz)
 
@@ -15,9 +15,7 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man \
-		--disable-static \
-		--disable-dependency-tracking \
-		--with-gnu-ld
+		--disable-static
 
 	make
 	make DESTDIR=$PKG install
diff --git a/libsigc++/.footprint b/libsigc++/.footprint
index 6764bdb56..35651ef8b 100644
--- a/libsigc++/.footprint
+++ b/libsigc++/.footprint
@@ -39,7 +39,6 @@ drwxr-xr-x	root/root	usr/include/sigc++-2.0/sigc++/adaptors/macros/
 -rw-r--r--	root/root	usr/include/sigc++-2.0/sigc++/bind.h
 -rw-r--r--	root/root	usr/include/sigc++-2.0/sigc++/bind_return.h
 -rw-r--r--	root/root	usr/include/sigc++-2.0/sigc++/class_slot.h
--rw-r--r--	root/root	usr/include/sigc++-2.0/sigc++/compatibility.h
 -rw-r--r--	root/root	usr/include/sigc++-2.0/sigc++/connection.h
 drwxr-xr-x	root/root	usr/include/sigc++-2.0/sigc++/functors/
 -rw-r--r--	root/root	usr/include/sigc++-2.0/sigc++/functors/functor_trait.h
diff --git a/libsigc++/.md5sum b/libsigc++/.md5sum
index 63e142f52..cecb0f4c1 100644
--- a/libsigc++/.md5sum
+++ b/libsigc++/.md5sum
@@ -1 +1 @@
-fde0ee69e3125e982746d9fe005763e1  libsigc++-2.0.17.tar.bz2
+039b7192e79ddc87d4ed8376b0aa4e7f  libsigc++-2.1.1.tar.bz2
diff --git a/libsigc++/Pkgfile b/libsigc++/Pkgfile
index 81c5f66ff..9d2339e9d 100644
--- a/libsigc++/Pkgfile
+++ b/libsigc++/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=libsigc++
-version=2.0.17
+version=2.1.1
 release=1
 source=(ftp://ftp.gnome.org/pub/gnome/sources/libsigc++/${version%.*}/libsigc++-$version.tar.bz2)
 
diff --git a/mercurial/Pkgfile b/mercurial/Pkgfile
index 240843c32..902a2dc24 100644
--- a/mercurial/Pkgfile
+++ b/mercurial/Pkgfile
@@ -1,14 +1,17 @@
-# Description:	Distributed source code management system
-# URL:		http://www.selenic.com/mercurial/
-# Maintainer:	Mark Rosenstand, mark at borkware dot net
-# Depends on:	python
+# Description:	Mercurial the distributed VCS.
+# URL:			http://www.selenic.com/mercurial/wiki/
+# Maintainer:	James Mills, prologic at shortcircuit dot net dot au
+# Packager:		James Mills, prologic at shortcircuit dot net dot au
+#
+# Depends on:
 
 name=mercurial
 version=0.9.4
 release=1
-source=(http://www.selenic.com/mercurial/release/mercurial-$version.tar.gz)
+source=(http://www.selenic.com/$name/release/$name-$version.tar.gz)
 
 build() {
-	cd mercurial-$version
+	cd $name-$version
 	python setup.py install --root=$PKG
+	chown -R root:root $PKG
 }
diff --git a/nvidia-legacy-71xx/.footprint b/nvidia-legacy-71xx/.footprint
index 5e546e208..2eda070ab 100644
--- a/nvidia-legacy-71xx/.footprint
+++ b/nvidia-legacy-71xx/.footprint
@@ -17,20 +17,20 @@ drwxr-xr-x	root/root	usr/include/nvidia/GL/
 -r--r--r--	root/root	usr/include/nvidia/GL/glxtokens.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libGL.la
--rwxr-xr-x	root/root	usr/lib/libGL.so.1.0.7185
--rwxr-xr-x	root/root	usr/lib/libGLcore.so.1.0.7185
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.1.0.7185
+-rwxr-xr-x	root/root	usr/lib/libGL.so.71.86.01
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.71.86.01
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.71.86.01
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.1.0.7185
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.71.86.01
 drwxr-xr-x	root/root	usr/lib/xorg/
 -r--r--r--	root/root	usr/lib/xorg/libXvMCNVIDIA.a
--rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.1.0.7185
+-rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.71.86.01
 drwxr-xr-x	root/root	usr/lib/xorg/modules/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.o
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.so
 drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.1.0.7185
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.71.86.01
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/nvidia-installer.1.gz
diff --git a/nvidia-legacy-71xx/.md5sum b/nvidia-legacy-71xx/.md5sum
index 6c64bb438..1739d9736 100644
--- a/nvidia-legacy-71xx/.md5sum
+++ b/nvidia-legacy-71xx/.md5sum
@@ -1,2 +1,2 @@
-f382af60e932449e5e301f1b424d883f  NVIDIA-Linux-x86-1.0-7185-pkg1.run
+4b89b89f5cd9d7c25ea4016a97705629  NVIDIA-Linux-x86-71.86.01-pkg0.run
 544ac021f572c0aca5025dcca9d01510  nvidia-makefile.patch
diff --git a/nvidia-legacy-71xx/Pkgfile b/nvidia-legacy-71xx/Pkgfile
index 29a4f53f6..435113805 100644
--- a/nvidia-legacy-71xx/Pkgfile
+++ b/nvidia-legacy-71xx/Pkgfile
@@ -1,20 +1,18 @@
-# Description: nVIDIA Linux Display Driver
+# Description: nVIDIA Linux Display Driver.
 # URL: http://www.nvidia.com/
 # Maintainer: Danny Rawlins, romster at shortcircuit dot net dot au
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: xorg
-
-# Nice to have: gl-select-x11r7
+# Depends on: xorg gl-select
 
 name=nvidia-legacy-71xx
-version=1.0-7185-$(uname -r)
+version=71.86.01
 release=1
-source=(http://download.nvidia.com/XFree86/Linux-x86/${version%-*}/NVIDIA-Linux-x86-${version%-*}-pkg1.run \
+source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
 	nvidia-makefile.patch)
 
 build() {
-	sh NVIDIA-Linux-x86-${version%-*}-pkg1.run --extract-only
-	cd NVIDIA-Linux-x86-${version%-*}-pkg1
+	sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only
+	cd NVIDIA-Linux-x86-$version-pkg0
 
 	# patch Makefile.kbuild for normal users and no load during build
 	patch -p0 -i $SRC/nvidia-makefile.patch usr/src/nv/Makefile.kbuild
diff --git a/nvidia-legacy-96xx/.footprint b/nvidia-legacy-96xx/.footprint
index f99e0de26..cac2e7813 100644
--- a/nvidia-legacy-96xx/.footprint
+++ b/nvidia-legacy-96xx/.footprint
@@ -17,20 +17,20 @@ drwxr-xr-x	root/root	usr/include/nvidia/GL/
 -r--r--r--	root/root	usr/include/nvidia/GL/glxext.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libGL.la
--rwxr-xr-x	root/root	usr/lib/libGL.so.1.0.9631
--rwxr-xr-x	root/root	usr/lib/libGLcore.so.1.0.9631
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.1.0.9631
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.1.0.9631
+-rwxr-xr-x	root/root	usr/lib/libGL.so.96.43.01
+-rwxr-xr-x	root/root	usr/lib/libGLcore.so.96.43.01
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.96.43.01
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.96.43.01
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.1.0.9631
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.96.43.01
 drwxr-xr-x	root/root	usr/lib/xorg/
 -r--r--r--	root/root	usr/lib/xorg/libXvMCNVIDIA.a
--rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.1.0.9631
+-rwxr-xr-x	root/root	usr/lib/xorg/libXvMCNVIDIA.so.96.43.01
 drwxr-xr-x	root/root	usr/lib/xorg/modules/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.so
 drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.1.0.9631
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.96.43.01
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/nvidia-installer.1.gz
diff --git a/nvidia-legacy-96xx/.md5sum b/nvidia-legacy-96xx/.md5sum
index 81cb4b1c9..e7280ef14 100644
--- a/nvidia-legacy-96xx/.md5sum
+++ b/nvidia-legacy-96xx/.md5sum
@@ -1,2 +1,2 @@
-3676f622897d22f1815365b44139899e  NVIDIA-Linux-x86-1.0-9631-pkg1.run
+cb00ef87e6d4065ccc29c78ef591b758  NVIDIA-Linux-x86-96.43.01-pkg0.run
 544ac021f572c0aca5025dcca9d01510  nvidia-makefile.patch
diff --git a/nvidia-legacy-96xx/Pkgfile b/nvidia-legacy-96xx/Pkgfile
index 66112030e..7434de78d 100644
--- a/nvidia-legacy-96xx/Pkgfile
+++ b/nvidia-legacy-96xx/Pkgfile
@@ -1,20 +1,18 @@
-# Description: nVIDIA Linux Display Driver
+# Description: nVIDIA Linux Display Driver.
 # URL: http://www.nvidia.com/
 # Maintainer: Danny Rawlins, romster at shortcircuit dot net dot au
 # Packager: Matt Housh, jaeger at morpheus dot net
-# Depends on: xorg
-
-# Nice to have: gl-select-x11r7
+# Depends on: xorg gl-select
 
 name=nvidia-legacy-96xx
-version=1.0-9631-$(uname -r)
+version=96.43.01
 release=1
-source=(http://download.nvidia.com/XFree86/Linux-x86/${version%-*}/NVIDIA-Linux-x86-${version%-*}-pkg1.run \
+source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
 	nvidia-makefile.patch)
 
 build() {
-	sh NVIDIA-Linux-x86-${version%-*}-pkg1.run --extract-only
-	cd NVIDIA-Linux-x86-${version%-*}-pkg1
+	sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only
+	cd NVIDIA-Linux-x86-$version-pkg0
 
 	# patch Makefile.kbuild for normal users and no load during build
 	patch -p0 -i $SRC/nvidia-makefile.patch usr/src/nv/Makefile.kbuild
diff --git a/x264/.md5sum b/x264/.md5sum
index 4bde6b99c..e5c3e9323 100644
--- a/x264/.md5sum
+++ b/x264/.md5sum
@@ -1 +1 @@
-5f0b479a1042c94b322f20a9af2d9174  x264-snapshot-r667.tar.bz2
+362fdb1f472f39533b2c9fef68ff8bb0  x264-snapshot-r680.tar.bz2
diff --git a/x264/Pkgfile b/x264/Pkgfile
index 279c6ed91..ac2fe690d 100644
--- a/x264/Pkgfile
+++ b/x264/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:	
 
 name=x264
-version=r667
+version=r680
 release=1
 source=(http://romster.shortcircuit.net.au/crux/source/x264-snapshot-$version.tar.bz2)
 
diff --git a/xine-lib/Pkgfile b/xine-lib/Pkgfile
index bedac4a83..fd5433112 100644
--- a/xine-lib/Pkgfile
+++ b/xine-lib/Pkgfile
@@ -2,11 +2,11 @@
 # URL: http://xine.sourceforge.net
 # Maintainer: Danny Rawlins, romster at shortcircuit dot net dot au
 # Packager: sten, nick dot steeves at shaw dot ca
-# Depends on: xorg-libxvmc faad2 flac gdk-pixbuf liba52 libmad libmng libsdl speex libtheora wavpack libmpcdec vcdimager ffmpeg
+# Depends on: xorg-libxvmc faad2 flac gdk-pixbuf libmad libmng libsdl speex libtheora wavpack libmpcdec vcdimager ffmpeg
 
 name=xine-lib
 version=1.1.7
-release=1
+release=2
 source=(http://dl.sourceforge.net/sourceforge/xine/xine-lib-$version.tar.bz2)
 
 build() {
@@ -25,12 +25,9 @@ build() {
 		--with-libflac \
 		--with-wavpack \
 		--with-external-libmpcdec \
-		--with-external-a52dec \
 		--with-external-libmad \
 		--with-external-ffmpeg
 
-	#--with-external-dvdnav <- not recomended the latest libdvdnav release is not up to the internal version
-
 	make
 	make DESTDIR=$PKG install
 	rm -r $PKG/usr/share/doc