Merge remote branch 'nutyx-2009/master'

20 files changed, 58 insertions, 38 deletions

diff --git a/base/autoconf/.footprint b/base/autoconf/.footprint
index 6b1c78ff1..2fa7e6e57 100644
--- a/base/autoconf/.footprint
+++ b/base/autoconf/.footprint
@@ -47,6 +47,7 @@ drwxr-xr-x	root/root	usr/share/autoconf/autotest/
 -rw-r--r--	root/root	usr/share/autoconf/autotest/autotest.m4
 -rw-r--r--	root/root	usr/share/autoconf/autotest/autotest.m4f
 -rw-r--r--	root/root	usr/share/autoconf/autotest/general.m4
+-rw-r--r--	root/root	usr/share/autoconf/autotest/specific.m4
 drwxr-xr-x	root/root	usr/share/autoconf/m4sugar/
 -rw-r--r--	root/root	usr/share/autoconf/m4sugar/foreach.m4
 -rw-r--r--	root/root	usr/share/autoconf/m4sugar/m4sh.m4
diff --git a/base/autoconf/.md5sum b/base/autoconf/.md5sum
index 59f86707b..a853d7d4f 100644
--- a/base/autoconf/.md5sum
+++ b/base/autoconf/.md5sum
@@ -1 +1 @@
-30a198cef839471dd4926e92ab485361  autoconf-2.64.tar.gz
+46cfb40e0babf4c64f8325f03da81c9b  autoconf-2.65.tar.gz
diff --git a/base/autoconf/Pkgfile b/base/autoconf/Pkgfile
index f279a0d2f..a4ea02238 100755
--- a/base/autoconf/Pkgfile
+++ b/base/autoconf/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: 
 
 name=autoconf
-version=2.64
+version=2.65
 release=1
 source=( http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 
diff --git a/base/doxygen/Pkgfile b/base/doxygen/Pkgfile
index 2045feeab..d20edf359 100644
--- a/base/doxygen/Pkgfile
+++ b/base/doxygen/Pkgfile
@@ -2,7 +2,7 @@
 # URL:  http://www.doxygen.org/
 # Maintainer: NuTyX 
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: qt, graphviz
+# Depends on:
 
 name=doxygen
 version=1.5.8
diff --git a/base/git/.md5sum b/base/git/.md5sum
index 83ab30925..6a1698620 100644
--- a/base/git/.md5sum
+++ b/base/git/.md5sum
@@ -1,2 +1,2 @@
-1c214e8175e8dd372618ecf3d76448f5  git-1.6.5.4.tar.bz2
-513390db5f38534f5f2459202a8feccc  git-manpages-1.6.5.4.tar.bz2
+03aefaaecae7a236b88d04d1a83698d9  git-1.6.5.6.tar.bz2
+27fd30124444af534f9e1ad2c67fdac7  git-manpages-1.6.5.6.tar.bz2
diff --git a/base/git/Pkgfile b/base/git/Pkgfile
index 94ca98de1..b25f2bb06 100644
--- a/base/git/Pkgfile
+++ b/base/git/Pkgfile
@@ -6,7 +6,7 @@
 # Nice to have: tk
 
 name=git
-version=1.6.5.4
+version=1.6.5.6
 release=1
 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)
 
diff --git a/base/libusb/Pkgfile b/base/libusb/Pkgfile
index 10ce2b835..33b511060 100755
--- a/base/libusb/Pkgfile
+++ b/base/libusb/Pkgfile
@@ -7,7 +7,7 @@
 name=libusb
 version=0.1.12
 release=1
-source=( http://switch.dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=( http://downloads.sourceforge.net/$name/$name-$version.tar.gz)
 
 
 
diff --git a/base/libusb/Pkgfile.1 b/base/libusb/Pkgfile.1
new file mode 100644
index 000000000..bd6e72dcb
--- /dev/null
+++ b/base/libusb/Pkgfile.1
@@ -0,0 +1,20 @@
+# Description: Library giving userland programs access to USB devices
+# URL:         http://libusb.sourceforge.net/
+# Maintainer:  CRUX System Team, core-ports at crux dot nu
+
+name=libusb
+version=1.0.6
+release=1
+source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+
+build () {
+    cd $name-$version
+    
+    ./configure --prefix=/usr 
+    make
+    make DESTDIR=$PKG install
+    
+    install -d $PKG/lib
+    mv $PKG/usr/lib/libusb-1.0.so.* $PKG/lib
+    ln -sf ../../lib/libusb-1.0.so.0.0.0 $PKG/usr/lib/libusb-1.0.so
+}
diff --git a/base/mpfr/.footprint b/base/mpfr/.footprint
index 92484db5c..f418afb4d 100644
--- a/base/mpfr/.footprint
+++ b/base/mpfr/.footprint
@@ -5,9 +5,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmpfr.a
 -rwxr-xr-x	root/root	usr/lib/libmpfr.la
-lrwxrwxrwx	root/root	usr/lib/libmpfr.so -> libmpfr.so.1.2.0
-lrwxrwxrwx	root/root	usr/lib/libmpfr.so.1 -> libmpfr.so.1.2.0
--rwxr-xr-x	root/root	usr/lib/libmpfr.so.1.2.0
+lrwxrwxrwx	root/root	usr/lib/libmpfr.so -> libmpfr.so.1.2.2
+lrwxrwxrwx	root/root	usr/lib/libmpfr.so.1 -> libmpfr.so.1.2.2
+-rwxr-xr-x	root/root	usr/lib/libmpfr.so.1.2.2
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/info/
 -rw-r--r--	root/root	usr/share/info/mpfr.info.gz
diff --git a/base/mpfr/.md5sum b/base/mpfr/.md5sum
index d8ec0acc4..a8c2e0d77 100644
--- a/base/mpfr/.md5sum
+++ b/base/mpfr/.md5sum
@@ -1 +1 @@
-a70bbde2a23d82e8f3314d4293500ae4  mpfr-2.4.1.tar.gz
+0e3dcf9fe2b6656ed417c89aa9159428  mpfr-2.4.2.tar.gz
diff --git a/base/mpfr/Pkgfile b/base/mpfr/Pkgfile
index 748c32bb8..cea800d56 100644
--- a/base/mpfr/Pkgfile
+++ b/base/mpfr/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gmp
 
 name=mpfr
-version=2.4.1
+version=2.4.2
 release=1
 source=(http://www.mpfr.org/mpfr-current/mpfr-$version.tar.gz \
 	)
@@ -17,4 +17,5 @@ build() {
 	make DESTDIR=$PKG install
 	# Remove the dir file
 	rm $PKG/usr/share/info/dir
+	rm -r $PKG/usr/share/doc
 }
diff --git a/base/patch/.md5sum b/base/patch/.md5sum
index 2ffdeb24b..424036b7b 100644
--- a/base/patch/.md5sum
+++ b/base/patch/.md5sum
@@ -1,2 +1 @@
-a2f0901f42e87ad3d5fefbccee6a09f4  patch-2.5.9-fixes-1.patch
-dacfb618082f8d3a2194601193cf8716  patch-2.5.9.tar.gz
+bc71d33c35004db3768465bcaf9ed23c  patch-2.6.tar.gz
diff --git a/base/patch/Pkgfile b/base/patch/Pkgfile
index 126eb2a07..9602b86c7 100755
--- a/base/patch/Pkgfile
+++ b/base/patch/Pkgfile
@@ -5,13 +5,11 @@
 # Depends on: module-init-tools
 
 name=patch
-version=2.5.9
+version=2.6
 release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz \
-http://www.linuxfromscratch.org/patches/lfs/development/patch-$version-fixes-1.patch)
+source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 build() {
 cd $name-$version
-patch -Np1 -i ../patch-$version-fixes-1.patch
 ./configure --prefix=/usr \
 	--mandir=/usr/share/man \
 	--infodir=/usr/share/info
diff --git a/base/usbutils/.footprint b/base/usbutils/.footprint
index 3d0fa7dbe..d0fcd0855 100644
--- a/base/usbutils/.footprint
+++ b/base/usbutils/.footprint
@@ -1,15 +1,16 @@
 drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/usbutils.pc
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/usb-devices
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/lsusb
 -rwxr-xr-x	root/root	usr/sbin/update-usbids.sh
--rwxr-xr-x	root/root	usr/sbin/usb-devices
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/usb-devices.1.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/lsusb.8.gz
--rw-r--r--	root/root	usr/share/man/man8/usb-devices.8.gz
+drwxr-xr-x	root/root	usr/share/pkgconfig/
+-rw-r--r--	root/root	usr/share/pkgconfig/usbutils.pc
 -rw-r--r--	root/root	usr/share/usb.ids
 -rw-r--r--	root/root	usr/share/usb.ids.gz
diff --git a/base/usbutils/.md5sum b/base/usbutils/.md5sum
index ba4bbbfd8..ce944ef69 100644
--- a/base/usbutils/.md5sum
+++ b/base/usbutils/.md5sum
@@ -1 +1 @@
-87612c82e66393a395db91361d168c1b  usbutils-0.84.tar.gz
+34979f675d2bcb3e1b45012fa830a53f  usbutils-0.86.tar.gz
diff --git a/base/usbutils/Pkgfile b/base/usbutils/Pkgfile
index 67651d233..f86587fd5 100755
--- a/base/usbutils/Pkgfile
+++ b/base/usbutils/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: libusb
 
 name=usbutils
-version=0.84
+version=0.86
 release=1
-source=( http://switch.dl.sourceforge.net/sourceforge/linux-usb/$name-$version.tar.gz)
+source=( http://downloads.sourceforge.net/linux-usb/$name-$version.tar.gz)
 
 
 
diff --git a/base/util-linux-ng/.md5sum b/base/util-linux-ng/.md5sum
index 82c0db8dc..47ba28089 100644
--- a/base/util-linux-ng/.md5sum
+++ b/base/util-linux-ng/.md5sum
@@ -1 +1 @@
-9623380641b0c2e0449f5b1ecc567663  util-linux-ng-2.16.tar.bz2
+edd1f7a82fd388cc0e1e3d2d1e7ea55a  util-linux-ng-2.16.2.tar.bz2
diff --git a/base/util-linux-ng/Pkgfile b/base/util-linux-ng/Pkgfile
index 37284f40b..c55f771f9 100755
--- a/base/util-linux-ng/Pkgfile
+++ b/base/util-linux-ng/Pkgfile
@@ -5,8 +5,8 @@
 # Depends on:  ncurses
 
 name=util-linux-ng
-version=2.16
-release=2
+version=2.16.2
+release=1
 source=(http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$name-$version.tar.bz2)
 
 build() {
diff --git a/base/wget/.footprint b/base/wget/.footprint
index e03536fe3..71dd19ce4 100644
--- a/base/wget/.footprint
+++ b/base/wget/.footprint
@@ -3,7 +3,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/wget
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/info/
--rw-r--r--	root/root	usr/share/info/dir.gz
 -rw-r--r--	root/root	usr/share/info/wget.info.gz
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
diff --git a/base/wget/Pkgfile b/base/wget/Pkgfile
index 7bc06ab63..8c8d4ddb5 100755
--- a/base/wget/Pkgfile
+++ b/base/wget/Pkgfile
@@ -6,17 +6,18 @@
 
 name=wget
 version=1.12
-release=1
+release=2
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz )
 
 build() {
-    cd $name-$version
-    ./configure --prefix=/usr \
+	cd $name-$version
+	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-		--disable-debug \
-		--mandir=/usr/share/man \
-                --infodir=/usr/share/info
-    make
-    make prefix=$PKG/usr mandir=$PKG/usr/share/man infodir=$PKG/usr/share/info install
+	--disable-debug \
+	--mandir=/usr/share/man \
+	--infodir=/usr/share/info
+	make
+	make prefix=$PKG/usr mandir=$PKG/usr/share/man infodir=$PKG/usr/share/info install
+	rm $PKG/usr/share/info/dir
 }