merge of 9603f6005b15a0057063cac02eda02f14cb2e651

     and 913ad257363032feeb27b024f8bb727bce13dea7

21 files changed, 137 insertions, 33 deletions

diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index e2112cdbe4..a45c396c8b 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -101,7 +101,6 @@ ${PKGDIR}/packages/ncftp/*.bb \
 ${PKGDIR}/packages/ncurses/*.bb \
 ${PKGDIR}/packages/netbase/*.bb \
 ${PKGDIR}/packages/netpbm/*.bb \
-${PKGDIR}/packages/nslu2-binary-only/*.bb \
 ${PKGDIR}/packages/ntp/*.bb \
 ${PKGDIR}/packages/obexftp/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
@@ -135,7 +134,6 @@ ${PKGDIR}/packages/samba/*.bb \
 ${PKGDIR}/packages/sane-backends/*.bb \
 ${PKGDIR}/packages/sed/*.bb \
 ${PKGDIR}/packages/setpwc/*.bb \
-${PKGDIR}/packages/slugimage/*.bb \
 ${PKGDIR}/packages/strace/*.bb \
 ${PKGDIR}/packages/streamripper/*.bb \
 ${PKGDIR}/packages/sudo/*.bb \
@@ -147,7 +145,6 @@ ${PKGDIR}/packages/timezones/*.bb \
 ${PKGDIR}/packages/tinylogin/*.bb \
 ${PKGDIR}/packages/uclibc/*.bb \
 ${PKGDIR}/packages/unionfs/*.bb \
-${PKGDIR}/packages/unzip/*.bb \
 ${PKGDIR}/packages/update-modules/*.bb \
 ${PKGDIR}/packages/update-rc.d/*.bb \
 ${PKGDIR}/packages/util-linux/*.bb \
diff --git a/packages/bogofilter/.mtn2git_empty b/packages/bogofilter/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bogofilter/.mtn2git_empty
diff --git a/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty
diff --git a/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch
new file mode 100644
index 0000000000..310eaaa16d
--- /dev/null
+++ b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch
@@ -0,0 +1,34 @@
+--- bogofilter-0.96.0/configure.ac.orig	2005-09-04 20:42:35.000000000 +0200
++++ bogofilter-0.96.0/configure.ac	2005-09-04 20:45:12.000000000 +0200
+@@ -460,6 +460,7 @@
+ 	dnl check if run-time link works
+ 	saveLIBS="$LIBS"
+ 	LIBS="$LIBS $LIBDB"
++	if test x$cross_compiling = xNO ; then
+ 	AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run)
+ 	AC_RUN_IFELSE(
+ 	AC_LANG_PROGRAM([[
+@@ -500,6 +501,7 @@
+ 		   [AC_MSG_RESULT(no)
+ 		   AC_MSG_ERROR(db.h header file and db library version do not match.)],)
+ 	AC_MSG_RESULT(yes)
++	fi
+ 	AC_CHECK_DECLS(db_create,,
+ 	       AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file.
+ Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
+@@ -509,6 +511,7 @@
+ #endif
+ #include <db.h>]]
+ 	)
++	if test x$cross_compiling = xNO ; then
+ 	AC_MSG_CHECKING(if Berkeley DB supports shared environments)
+ 	if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then
+ 	AC_RUN_IFELSE(
+@@ -548,6 +551,7 @@
+     else
+ 	AC_MSG_RESULT(skipped)
+     fi
++	fi
+ 
+ 	AC_DEFINE(ENABLE_DB_DATASTORE,1, [Enable Berkeley DB datastore])
+ 	LIBS="$saveLIBS"
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
new file mode 100644
index 0000000000..e552f1b8bd
--- /dev/null
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -0,0 +1,17 @@
+SECTION = "console/network"
+DEPENDS = "db3"
+DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) \
+by a statistical analysis of the message's header and content (body). \
+The program is able to learn from the user's classifications and corrections."
+LICENSE = "GPL"
+PR = "r1"
+PRIORITY = "optional"
+
+SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
+           file://${FILESDIR}/configure.ac.patch;patch=1 \
+	   "
+
+inherit autotools
+
+EXTRA_OECONF = "--with-libdb-prefix=${libdir}"
+
diff --git a/packages/dbh/dbh_1.0-18.bb b/packages/dbh/dbh_1.0-18.bb
index 65ea98ca75..a84bd95dd4 100644
--- a/packages/dbh/dbh_1.0-18.bb
+++ b/packages/dbh/dbh_1.0-18.bb
@@ -1,15 +1,13 @@
-SECTION = "devel"
-# cramfs-native OE build file
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
+DESCRIPTION ="Disk based hashes is a method to create multidimensional binary trees on disk."
+HOMEPAGE = "http://dbh.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "libs"
+SRC_URI = "${SOURCEFORGE_MIRROR}/dbh/dbh_${PV}.tar.bz2 \
+	   file://${FILESDIR}/configure.patch;patch=1"
 
-DESCRIPTION="Disk based hashes is a method to create multidimensional binary trees on disk."
-HOMEPAGE="http://dbh.sourceforge.net"
-LICENSE="QPL"
-SRC_URI="${SOURCEFORGE_MIRROR}/dbh/${PN}_${PV}.tar.bz2 \
-	file://${FILESDIR}/configure.patch;patch=1"
-
-S="${WORKDIR}/${PN}_${PV}"
+S="${WORKDIR}/dbh_${PV}"
 
 inherit autotools pkgconfig
 
@@ -18,6 +16,5 @@ do_stage() {
 	install -m 644 src/dbh_functions.h ${STAGING_INCDIR}
 	install -m 644 src/dbh.h ${STAGING_INCDIR}
 
-	oe_soinstall src/.libs/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}
-	ln -s ${STAGING_LIBDIR}/libdbh-1.0.so.1.0.0 ${STAGING_LIBDIR}/libdbh.so
+	oe_libinstall -C src/.libs libdbh-1.0 ${STAGING_LIBDIR}
 }
diff --git a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
index beaef3c80c..5e98e9e0d6 100644
--- a/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
+++ b/packages/gnome/gnome-vfs-dbus_2.8.4.4.bb
@@ -6,7 +6,7 @@ RPROVIDES = "gnome-vfs"
 
 inherit gnome pkgconfig
 
-DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba"
+DEPENDS = "libxml2 gconf-dbus dbus bzip2 gnome-mime-data zlib samba-3.0.14"
 RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
 
 
diff --git a/packages/linux/linux-openzaurus_2.6.13-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
index 00ec5e609e..a9275ee095 100644
--- a/packages/linux/linux-openzaurus_2.6.13-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
 KV = "${@bb.data.getVar('PV',d,True)}"
 
-PR = "r1"
+PR = "r2"
 
 DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -61,7 +61,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharpsl_lcd-r2.patch;patch=1 \
            ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
            ${RPSRC}/sharpsl_bl-r2.patch;patch=1 \
-           ${RPSRC}/sharpsl_pm-r5.patch;patch=1 \
+           ${RPSRC}/sharpsl_pm-r6.patch;patch=1 \
            ${RPSRC}/corgi_pm-r1.patch;patch=1 \
            ${RPSRC}/spitzkbd-r1.patch;patch=1 \
            ${RPSRC}/spitzcf-r2.patch;patch=1 \
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index 733063a1fc..44eb82cf58 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -44,6 +44,7 @@ UCSLUGC_PACKAGES = "\
 	gcc \
 	gdb \
 	gdbm \
+	glib-2.0 \
 	gnu-config \
 	gphoto2 \
 	grep \
@@ -122,7 +123,6 @@ UCSLUGC_PACKAGES = "\
 # These packages only build on TARGET_OS=linux, but not TARGET_OS=linux-uclibc.
 # KEEP IN ALPHABETICAL ORDER
 UCSLUGC_BROKEN_PACKAGES = "\
-	glib-2.0 \
 	iperf \
 	man man-pages \
 	php \
diff --git a/packages/nonworking/ocamlc/ocamlc-native_3.06.bb b/packages/nonworking/ocamlc/ocamlc-native_3.06.bb
index 9bd0ce5394..37805aad06 100644
--- a/packages/nonworking/ocamlc/ocamlc-native_3.06.bb
+++ b/packages/nonworking/ocamlc/ocamlc-native_3.06.bb
@@ -1,9 +1,8 @@
-DESCRIPTION=Objective Caml Compiler
-SECTION=base
-PRIORITY=optional
-LICENSE=QPL
+DESCRIPTION = "Objective Caml Compiler"
+SECTION = "devel"
+LICENSE = "QPL"
 
-SRC_URI = http://caml.inria.fr/distrib/ocaml-3.06/ocaml-3.06.tar.gz
-S = ${WORKDIR}/ocaml-${PV}
+SRC_URI = "http://caml.inria.fr/distrib/ocaml-${PV}/ocaml-${PV}.tar.gz"
+S = "${WORKDIR}/ocaml-${PV}"
 
 inherit autotools native
diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index d5b500a7ac..eab9c4890c 100644
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -3,8 +3,8 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 SECTION = "devel"
-LICENSE = "GPL|QPL"
-PR = "r1"
+LICENSE = "GPL QPL"
+PR = "r2"
 
 QTEVER = "qt-embedded-free-3.3.4"
 
diff --git a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
index d9138a002e..7eceaef3e2 100644
--- a/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
+++ b/packages/qte-fonts-common/qte-fonts-common_3.3.3.bb
@@ -1,7 +1,7 @@
-SECTION = "opie/base"
 DESCRIPTION= "Tools to update the Qt fontdir"
 MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
-LICENSE = "GPL/QPL"
+SECTION = "opie/base"
+LICENSE = "GPL QPL"
 PACKAGE_ARCH = "all"
 PR = "r3"
 
@@ -10,6 +10,7 @@ SRC_URI += "file://update-qtfontdir"
 S = "${WORKDIR}/qt-embedded-free-${PV}"
 
 do_compile() {
+	:
 }
 
 do_install() {
diff --git a/packages/tslib/tslib/h6300/.mtn2git_empty b/packages/tslib/tslib/h6300/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/h6300/.mtn2git_empty
diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh
new file mode 100644
index 0000000000..21aaad9ca4
--- /dev/null
+++ b/packages/tslib/tslib/h6300/tslib.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/packages/tslib/tslib/ts.conf-h6300 b/packages/tslib/tslib/ts.conf-h6300
new file mode 100644
index 0000000000..09309719f2
--- /dev/null
+++ b/packages/tslib/tslib/ts.conf-h6300
@@ -0,0 +1,5 @@
+module_raw input
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index e010333994..d5a4c7ed30 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
 	   file://ts.conf \
-	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 \
+	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
 	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
 	   file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -23,6 +23,7 @@ inherit autotools
 PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
 EXTRA_OECONF        = "--enable-shared"
 EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
+EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
 do_stage () {
 	oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
@@ -39,9 +40,9 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	h3600 | h3900 | h1940 | ipaq-pxa270)
+	h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
 		install -d ${D}${datadir}/tslib
-		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
+		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
 			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
diff --git a/packages/uicmoc/uicmoc-native_2.3.10.bb b/packages/uicmoc/uicmoc-native_2.3.10.bb
index a596ec6824..ca959c1579 100644
--- a/packages/uicmoc/uicmoc-native_2.3.10.bb
+++ b/packages/uicmoc/uicmoc-native_2.3.10.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 2.x"
 SECTION = "devel"
 PRIORITY = "optional"
-LICENSE = "GPL/QPL"
+LICENSE = "GPL QPL"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
diff --git a/packages/uicmoc/uicmoc3-native_3.3.2.bb b/packages/uicmoc/uicmoc3-native_3.3.2.bb
index 271dd1fcd3..f7024f90ba 100644
--- a/packages/uicmoc/uicmoc3-native_3.3.2.bb
+++ b/packages/uicmoc/uicmoc3-native_3.3.2.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "User Interface Generator and Meta Object Compiler (moc) for Qt(E) 3.x"
 SECTION = "devel"
 PRIORITY = "optional"
-LICENSE = "GPL/QPL"
+LICENSE = "GPL QPL"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-free-3.3.2.tar.bz2 \
 	   file://no-examples.patch;patch=1"
diff --git a/packages/upslug/upslug2-native_3.bb b/packages/upslug/upslug2-native_3.bb
new file mode 100644
index 0000000000..c3744f3cf6
--- /dev/null
+++ b/packages/upslug/upslug2-native_3.bb
@@ -0,0 +1,3 @@
+include upslug2.inc
+
+inherit native
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
new file mode 100644
index 0000000000..0be0883cc9
--- /dev/null
+++ b/packages/upslug/upslug2.inc
@@ -0,0 +1,41 @@
+# This package builds the 'upslug2' binary upload/flash tool
+# for the NSLU2.  It is not useful for anything else.
+PR = "r0"
+DESCRIPTION = "NSLU2 binary upload tool (version 2)"
+HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL-2"
+
+# On Linux libpcap does not work.  Using libpcap is sub-optimal - it
+# is intended for packet capture not management of a new protocol
+# stream - so you may want to try the linux options on other operating
+# systems.
+LIBPCAP_OECONF = "--with-libpcap"
+LIBPCAP_OECONF_linux = ""
+LIBPCAP_OECONF_linux-uclibc = ""
+LIBPCAP_RDEPENDS = "libpcap"
+LIBPCAP_RDEPENDS_linux = ""
+LIBPCAP_RDEPENDS_linux-uclibc = ""
+
+RDEPENDS += "${LIBPCAP_RDEPENDS}"
+
+SRC_TAG = "upslug2_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}"
+# For testing use this (tags and other changes take a day to
+# propogate on sourceforge).  Change 'jbowler' to your login name!
+#SRC_URI = "cvs://jbowler@cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}"
+
+inherit autotools
+
+S = "${WORKDIR}/upslug2"
+PACKAGES = "${PN}"
+EXTRA_OECONF += "${LIBPCAP_OECONF}"
+
+python () {
+	# Don't build upslug2 unless we're targeting an nslu2
+	mach = bb.data.getVar("MACHINE", d, 1)
+	if mach != 'nslu2':
+		raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2")
+}
diff --git a/packages/upslug/upslug2_3.bb b/packages/upslug/upslug2_3.bb
new file mode 100644
index 0000000000..de9c427303
--- /dev/null
+++ b/packages/upslug/upslug2_3.bb
@@ -0,0 +1 @@
+include upslug2.inc