Merge commit 'lesibel/master'

12 files changed, 38 insertions, 34 deletions

diff --git a/base/db/.footprint b/base/db/.footprint
index 65901d937..a06d302a2 100644
--- a/base/db/.footprint
+++ b/base/db/.footprint
@@ -2,13 +2,13 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/db_archive
 -rwxr-xr-x	root/root	usr/bin/db_checkpoint
--rwxr-xr-x	root/root	usr/bin/db_codegen
 -rwxr-xr-x	root/root	usr/bin/db_deadlock
 -rwxr-xr-x	root/root	usr/bin/db_dump
 -rwxr-xr-x	root/root	usr/bin/db_hotbackup
 -rwxr-xr-x	root/root	usr/bin/db_load
 -rwxr-xr-x	root/root	usr/bin/db_printlog
 -rwxr-xr-x	root/root	usr/bin/db_recover
+-rwxr-xr-x	root/root	usr/bin/db_sql
 -rwxr-xr-x	root/root	usr/bin/db_stat
 -rwxr-xr-x	root/root	usr/bin/db_upgrade
 -rwxr-xr-x	root/root	usr/bin/db_verify
@@ -17,15 +17,15 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/db_185.h
 -rw-r--r--	root/root	usr/include/db_cxx.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libdb-4.7.a
--rw-r--r--	root/root	usr/lib/libdb-4.7.la
--rwxr-xr-x	root/root	usr/lib/libdb-4.7.so
-lrwxrwxrwx	root/root	usr/lib/libdb-4.so -> libdb-4.7.so
+-rw-r--r--	root/root	usr/lib/libdb-4.8.a
+-rw-r--r--	root/root	usr/lib/libdb-4.8.la
+-rwxr-xr-x	root/root	usr/lib/libdb-4.8.so
+lrwxrwxrwx	root/root	usr/lib/libdb-4.so -> libdb-4.8.so
 -rw-r--r--	root/root	usr/lib/libdb.a
-lrwxrwxrwx	root/root	usr/lib/libdb.so -> libdb-4.7.so
--rw-r--r--	root/root	usr/lib/libdb_cxx-4.7.a
--rw-r--r--	root/root	usr/lib/libdb_cxx-4.7.la
--rwxr-xr-x	root/root	usr/lib/libdb_cxx-4.7.so
-lrwxrwxrwx	root/root	usr/lib/libdb_cxx-4.so -> libdb_cxx-4.7.so
+lrwxrwxrwx	root/root	usr/lib/libdb.so -> libdb-4.8.so
+-rw-r--r--	root/root	usr/lib/libdb_cxx-4.8.a
+-rw-r--r--	root/root	usr/lib/libdb_cxx-4.8.la
+-rwxr-xr-x	root/root	usr/lib/libdb_cxx-4.8.so
+lrwxrwxrwx	root/root	usr/lib/libdb_cxx-4.so -> libdb_cxx-4.8.so
 -rw-r--r--	root/root	usr/lib/libdb_cxx.a
-lrwxrwxrwx	root/root	usr/lib/libdb_cxx.so -> libdb_cxx-4.7.so
+lrwxrwxrwx	root/root	usr/lib/libdb_cxx.so -> libdb_cxx-4.8.so
diff --git a/base/db/.md5sum b/base/db/.md5sum
index 5d63c7118..8b6ff7f90 100644
--- a/base/db/.md5sum
+++ b/base/db/.md5sum
@@ -1,5 +1 @@
-ec2b87e833779681a0c3a814aa71359e  db-4.7.25.tar.gz
-5fdf101259e5164dea1c8c86214fde38  patch.4.7.25.1
-bd410a11c71fee52fddb6aa2d8d4f80c  patch.4.7.25.2
-6fcd69f64f5b34bfe8f0a63cc2e402c1  patch.4.7.25.3
-c71830a1303cd34595ca655257196eec  patch.4.7.25.4
+3476bac9ec0f3c40729c8a404151d5e3  db-4.8.26.tar.gz
diff --git a/base/db/Pkgfile b/base/db/Pkgfile
index fc25736b9..525def2cc 100755
--- a/base/db/Pkgfile
+++ b/base/db/Pkgfile
@@ -4,19 +4,18 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=db
-version=4.7.25
-release=2
-source=(http://download.oracle.com/berkeley-db/$name-$version.tar.gz \
-	http://www.oracle.com/technology/products/berkeley-db/db/update/$version/patch.$version.{1,2,3,4})
+version=4.8.26
+release=1
+source=(http://download.oracle.com/berkeley-db/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
-	cat $SRC/patch.$version.{1,2,3,4} | patch -p0
 	cd build_unix
 	../dist/configure --prefix=/usr \
 		--enable-compat185 \
+		--enable-shared \
 		--enable-cxx
-	make
+	make LIBSO_LIBS=-lpthread
 	make DESTDIR=$PKG install
 	rm -rf $PKG/usr/docs
 	chmod -R +w $PKG
diff --git a/base/libtool/.footprint b/base/libtool/.footprint
index ea8b636b4..248af105b 100644
--- a/base/libtool/.footprint
+++ b/base/libtool/.footprint
@@ -11,9 +11,9 @@ drwxr-xr-x	root/root	usr/include/libltdl/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libltdl.a
 -rwxr-xr-x	root/root	usr/lib/libltdl.la
-lrwxrwxrwx	root/root	usr/lib/libltdl.so -> libltdl.so.7.2.1
-lrwxrwxrwx	root/root	usr/lib/libltdl.so.7 -> libltdl.so.7.2.1
--rwxr-xr-x	root/root	usr/lib/libltdl.so.7.2.1
+lrwxrwxrwx	root/root	usr/lib/libltdl.so -> libltdl.so.7.2.2
+lrwxrwxrwx	root/root	usr/lib/libltdl.so.7 -> libltdl.so.7.2.2
+-rwxr-xr-x	root/root	usr/lib/libltdl.so.7.2.2
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/argz.m4
@@ -74,3 +74,7 @@ drwxr-xr-x	root/root	usr/share/libtool/libltdl/loaders/
 -rw-r--r--	root/root	usr/share/libtool/libltdl/ltdl.c
 -rw-r--r--	root/root	usr/share/libtool/libltdl/ltdl.h
 -rw-r--r--	root/root	usr/share/libtool/libltdl/slist.c
+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/libtool.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/libtoolize.1.gz
diff --git a/base/libtool/.md5sum b/base/libtool/.md5sum
index 806e7a0f8..7370c0898 100644
--- a/base/libtool/.md5sum
+++ b/base/libtool/.md5sum
@@ -1 +1 @@
-07da460450490148c6d2df0f21481a25  libtool-2.2.6b.tar.gz
+b745d220e88163fcd9eea0a90ccf21b0  libtool-2.2.10.tar.gz
diff --git a/base/libtool/Pkgfile b/base/libtool/Pkgfile
index 74c70f7ea..54de868d6 100755
--- a/base/libtool/Pkgfile
+++ b/base/libtool/Pkgfile
@@ -4,7 +4,8 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=libtool
-version=2.2.6b
+#version=2.2.6b
+version=2.2.10
 release=1
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz )
 
diff --git a/extra/apr/.footprint b/extra/apr/.footprint
index 0089faab2..e24ae1752 100644
--- a/extra/apr/.footprint
+++ b/extra/apr/.footprint
@@ -73,6 +73,14 @@ drwxr-xr-x	root/root	usr/include/apr-1/
 -rw-r--r--	root/root	usr/include/apr-1/apu_want.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/apr-util-1/
+-rwxr-xr-x	root/root	usr/lib/apr-util-1/apr_dbd_odbc-1.so
+-rw-r--r--	root/root	usr/lib/apr-util-1/apr_dbd_odbc.a
+-rwxr-xr-x	root/root	usr/lib/apr-util-1/apr_dbd_odbc.la
+lrwxrwxrwx	root/root	usr/lib/apr-util-1/apr_dbd_odbc.so -> apr_dbd_odbc-1.so
+-rwxr-xr-x	root/root	usr/lib/apr-util-1/apr_dbd_pgsql-1.so
+-rw-r--r--	root/root	usr/lib/apr-util-1/apr_dbd_pgsql.a
+-rwxr-xr-x	root/root	usr/lib/apr-util-1/apr_dbd_pgsql.la
+lrwxrwxrwx	root/root	usr/lib/apr-util-1/apr_dbd_pgsql.so -> apr_dbd_pgsql-1.so
 -rwxr-xr-x	root/root	usr/lib/apr-util-1/apr_dbd_sqlite3-1.so
 -rw-r--r--	root/root	usr/lib/apr-util-1/apr_dbd_sqlite3.a
 -rwxr-xr-x	root/root	usr/lib/apr-util-1/apr_dbd_sqlite3.la
diff --git a/extra/python/.footprint b/extra/python/.footprint
index 57bb32818..645cc53b3 100644
--- a/extra/python/.footprint
+++ b/extra/python/.footprint
@@ -1717,7 +1717,6 @@ drwxr-xr-x	root/root	usr/lib/python2.6/json/tests/
 drwxr-xr-x	root/root	usr/lib/python2.6/lib-dynload/
 -rw-r--r--	root/root	usr/lib/python2.6/lib-dynload/Python-2.6.5-py2.6.egg-info
 -rwxr-xr-x	root/root	usr/lib/python2.6/lib-dynload/_bisect.so
--rwxr-xr-x	root/root	usr/lib/python2.6/lib-dynload/_bsddb.so
 -rwxr-xr-x	root/root	usr/lib/python2.6/lib-dynload/_bytesio.so
 -rwxr-xr-x	root/root	usr/lib/python2.6/lib-dynload/_codecs_cn.so
 -rwxr-xr-x	root/root	usr/lib/python2.6/lib-dynload/_codecs_hk.so
diff --git a/extra/python/Pkgfile b/extra/python/Pkgfile
index 6b16ffba4..b9ab9d1b0 100755
--- a/extra/python/Pkgfile
+++ b/extra/python/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.python.org
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: pth, sqlite3
+# Depends on: pth, sqlite3, tk
 
 name=python
 version=2.6.5
diff --git a/gnome/gnome-speech/.footprint b/gnome/gnome-speech/.footprint
index 2ef344b1e..d60080a40 100755
--- a/gnome/gnome-speech/.footprint
+++ b/gnome/gnome-speech/.footprint
@@ -28,5 +28,3 @@ drwxr-xr-x	root/root	usr/share/idl/gnome-speech-1.0/
 -rw-r--r--	root/root	usr/share/idl/gnome-speech-1.0/GNOME_Speech_Speaker.idl
 -rw-r--r--	root/root	usr/share/idl/gnome-speech-1.0/GNOME_Speech_SpeechCallback.idl
 -rw-r--r--	root/root	usr/share/idl/gnome-speech-1.0/GNOME_Speech_SynthesisDriver.idl
-drwxr-xr-x	root/root	usr/share/jar/
--rw-r--r--	root/root	usr/share/jar/gnome-speech.jar
diff --git a/gnome/gnome-speech/Pkgfile b/gnome/gnome-speech/Pkgfile
index 1f858cf7b..1d38fc41e 100755
--- a/gnome/gnome-speech/Pkgfile
+++ b/gnome/gnome-speech/Pkgfile
@@ -2,8 +2,7 @@
 # URL: http://mail.gnome.org/mailman/listinfo/gnome-accessibility-devel
 # Maintainer: Matt Housh, jaeger at morpheus dot net
 # Packager: jaeger at morpheus dot net
-# Depends on: libbonobo
-# Group: gnome/desktop
+# Depends on: libbonobo, jdk
 
 name=gnome-speech
 version=0.4.22
diff --git a/xorg/xorg-libxcb/Pkgfile b/xorg/xorg-libxcb/Pkgfile
index e051071f6..b59aa070f 100644
--- a/xorg/xorg-libxcb/Pkgfile
+++ b/xorg/xorg-libxcb/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://xcb.freedesktop.org
 # Maintainer: Tilman Sauerbeck, tilman at crux dot nu
 # Packagger: thierryn1 at hispeed dot ch
-# Depends on: xorg-libxdmcp, xorg-libxau, libxslt, libpthread-stubs
+# Depends on: xorg-libxdmcp, xorg-libxau, libxslt, libpthread-stubs, xorg-xcb-proto
 
 name=xorg-libxcb
 version=1.4