merge of 29e89051e9a2c503357df607dde2562d060d5989

     and 69b99cade429033901bed0a58c27d6c6537ba35b

79 files changed, 670 insertions, 222 deletions

diff --git a/packages/abiword/abiword-plugins_2.4.5.bb b/packages/abiword/abiword-plugins_2.4.5.bb
new file mode 100644
index 0000000000..75861792dd
--- /dev/null
+++ b/packages/abiword/abiword-plugins_2.4.5.bb
@@ -0,0 +1,26 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE="GPLv2"
+
+DEPENDS     = "abiword libwpd librsvg goffice poppler"
+PR="r0"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \
+           file://abiword-plugin-pdf-poppler.patch;patch=1;pnum=2"
+S = "${WORKDIR}/abiword-${PV}/abiword-plugins"
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = "--without-libwmf"
+
+PACKAGES_DYNAMIC = "abiword-plugin-*"
+
+python populate_packages_prepend () {
+	abiword_libdir = bb.data.expand('${libdir}/AbiWord-2.4/plugins', d)
+
+	do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
+}
+
diff --git a/packages/abiword/abiword_2.4.5.bb b/packages/abiword/abiword_2.4.5.bb
new file mode 100644
index 0000000000..8b1ed52d8a
--- /dev/null
+++ b/packages/abiword/abiword_2.4.5.bb
@@ -0,0 +1,42 @@
+DESCRIPTION ="AbiWord is free word processing program similar to Microsoft(r) Word""
+HOMEPAGE="http://www.abiword.org""
+MAINTAINER="Koen Kooi <koen@handhelds.org>"
+LICENSE="GPLv2"
+
+DEPENDS     = "perl-native libgsf libgnomeprint libgnomeprintui libglade libfribidi enchant jpeg libpng perl glibc libxml2"
+RDEPENDS    = "enchant glibc-gconv-ibm850 glibc-gconv-cp1252 \
+               glibc-gconv-iso8859-15 glibc-gconv-iso8859-1"
+PR="r0"
+
+SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz"
+S = "${WORKDIR}/abiword-${PV}/abi"
+
+FILES_${PN} += " ${datadir}/icons/* \
+${datadir}/AbiSuite-2.4/AbiWord/glade \
+${datadir}/AbiSuite-2.4/AbiWord/scripts \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en \
+${datadir}/AbiSuite-2.4/AbiWord/system.profile-en_GB \
+#${datadir}/AbiSuite-2.4/templates/A4.awt \
+#${datadir}/AbiSuite-2.4/templates/US-Letter.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt \
+${datadir}/AbiSuite-2.4/templates/normal.awt-en_GB \
+${datadir}/AbiSuite-2.4/templates/Employee-Directory.awt \
+${datadir}/AbiSuite-2.4/templates/Business-Report.awt \
+${datadir}/AbiSuite-2.4/templates/Fax-Coversheet.awt \
+${datadir}/AbiSuite-2.4/templates/Resume.awt \
+${datadir}/AbiSuite-2.4/templates/Two-Columns.awt \
+${datadir}/AbiSuite-2.4/templates/Memo.awt \
+${datadir}/AbiSuite-2.4/templates/Press-Release.awt "
+
+inherit autotools
+
+PARALLEL_MAKE=""
+
+EXTRA_OECONF = "--disable-pspell --enable-enchant"
+
+do_install_append() {
+        install -d ${D}${datadir}/pixmaps/
+        mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
+}
+
+
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index fcba6d2f30..c0477bd4fc 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -5,9 +5,10 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "libsdl-qpe libsdl-image"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
+SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz \
+           file://gcc4.patch;patch=1"
 
 inherit palmtop
 
diff --git a/packages/conserver/conserver.inc b/packages/conserver/conserver.inc
new file mode 100644
index 0000000000..579def2fab
--- /dev/null
+++ b/packages/conserver/conserver.inc
@@ -0,0 +1,31 @@
+DESCRIPTION = "Conserver provides remote access to serial port \
+consoles and logs all data to a central host."
+HOMEPAGE = "http://www.conserver.com/"
+SECTION = "console/network"
+LICENSE = "BSD"
+
+SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz \
+	   file://conserver.init \
+	   file://conserver.default"
+
+inherit autotools update-rc.d
+
+# Settings for the initscript
+INITSCRIPT_NAME    = "conserver"
+INITSCRIPT_PARAMS  = "defaults 98 2"
+
+# Stop install being called with -s so it doesn't try and run the host strip command
+EXTRA_OEMAKE=" INSTALL_PROGRAM=install"
+
+# Include the examples in the documentation package
+FILES_${PN}-doc += "${datadir}/examples/conserver"
+
+# Indicate that the default file is a configuation file
+CONFFILES_${PN} = "${sysconfdir}/default/conserver"
+
+# Include the init script and default settings in the package
+do_install_append () {
+	install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d
+	install -m 0644 ${WORKDIR}/conserver.default ${D}${sysconfdir}/default/conserver
+	install -m 0755 ${WORKDIR}/conserver.init ${D}${sysconfdir}/init.d/conserver
+}
diff --git a/packages/conserver/conserver_8.1.14.bb b/packages/conserver/conserver_8.1.14.bb
new file mode 100644
index 0000000000..ce7ba48efc
--- /dev/null
+++ b/packages/conserver/conserver_8.1.14.bb
@@ -0,0 +1,2 @@
+include conserver.inc
+PR="r2"
diff --git a/packages/conserver/conserver_8.1.2.bb b/packages/conserver/conserver_8.1.2.bb
index b3f57b544c..306a3f5129 100644
--- a/packages/conserver/conserver_8.1.2.bb
+++ b/packages/conserver/conserver_8.1.2.bb
@@ -1,7 +1,2 @@
-DESCRIPTION = "Conserver provides remote access to serial port \
-consoles and logs all data to a central host."
-SECTION = "console/network"
-LICENSE = "BSD"
-SRC_URI = "http://www.conserver.com/conserver-${PV}.tar.gz"
-
-inherit autotools
+include conserver.inc
+PR="r3"
diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty b/packages/conserver/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/.mtn2git_empty
+++ b/packages/conserver/files/.mtn2git_empty
diff --git a/packages/conserver/files/conserver.default b/packages/conserver/files/conserver.default
new file mode 100644
index 0000000000..64e589c6a2
--- /dev/null
+++ b/packages/conserver/files/conserver.default
@@ -0,0 +1,2 @@
+# Set the port (otherwise it needs conserver in /etc/services)
+CONSERVER_ARGS="-p 782"
diff --git a/packages/conserver/files/conserver.init b/packages/conserver/files/conserver.init
new file mode 100644
index 0000000000..dfbb72c6be
--- /dev/null
+++ b/packages/conserver/files/conserver.init
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Startup for conserver
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/conserver
+PIDFILE="/var/run/conserver.pid"
+DESC="Serial console server"
+CONF="/etc/conserver.cf"
+
+test ! -r /etc/default/conserver || . /etc/default/conserver
+test -x "$DAEMON" || exit 0
+test -f "$CONF" || exit 0
+
+case "$1" in
+	'start')
+		echo "Starting console server daemon"
+		start-stop-daemon -S -x "$DAEMON" -- -d $CONSERVER_ARGS
+		;;
+
+	'stop')
+		echo "Stopping console server daemon"
+		start-stop-daemon -K -x "$DAEMON"
+		;;
+
+	'restart')
+		echo "Restarting console server daemon"
+		[ -e $PIDFILE ] && kill -HUP `cat $PIDFILE`
+		;;
+
+	*)
+		echo "Usage: $0 { start | stop | restart }"
+		;;
+
+esac
+exit 0
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index a50fd6b567..4f96715b79 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -18,6 +18,7 @@ EXTRA_QMAKEVARS_POST += "CONFIG-=qt \
                          LIBS+=-lSDL_mixer \
 			 LIBS+=-lSDL_image \
                          LIBS+=-lpthread \
+                         LIBS+=-Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT} \
                          DEFINES+=DATA_PREFIX=\\"\"${datadir}/gemdropx/\\"\""
 
 do_configure_prepend() {
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
deleted file mode 100644
index cce7301b38..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.45.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r1"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-	   file://bluez-pin-gpe.glade"
-
-FILES_${PN} += '${datadir}/bluez-pin'
-
-do_install_append() {
-install -d ${D}${datadir}/bluez-pin
-install -m 644 ${WORKDIR}/bluez-pin-gpe.glade ${D}${datadir}/bluez-pin/
-
-}
-
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb
deleted file mode 100644
index 59b371897e..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.46.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb
deleted file mode 100644
index 59b371897e..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.47.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPL"
-inherit gpe autotools
-
-DESCRIPTION = "GPE bluetooth support"
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-SECTION = "gpe"
-PRIORITY = "optional"
-PR = "r0"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb
deleted file mode 100644
index bc79545182..0000000000
--- a/packages/gpe-bluetooth/gpe-bluetooth_0.48.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "GPE bluetooth support"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
-RDEPENDS = "bluez-utils-dbus blueprobe"
-
-GPE_TARBALL_SUFFIX= "bz2"
-inherit gpe autotools
-
-FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
new file mode 100644
index 0000000000..ce28d0b347
--- /dev/null
+++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb
@@ -0,0 +1,14 @@
+LICENSE     = "GPL"
+DESCRIPTION = "GPE bluetooth support user interface tool."
+SECTION     = "gpe"
+PRIORITY    = "optional"
+MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
+PR          = "r0"
+
+DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus"
+RDEPENDS = "bluez-utils-dbus blueprobe"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpe autotools
+
+FILES_${PN} += '${datadir}/bluez-pin'
diff --git a/packages/gpe-conf/gpe-conf_cvs.bb b/packages/gpe-conf/gpe-conf_cvs.bb
index 552fc7def5..a0bec2b70f 100644
--- a/packages/gpe-conf/gpe-conf_cvs.bb
+++ b/packages/gpe-conf/gpe-conf_cvs.bb
@@ -2,13 +2,11 @@ DEFAULT_PREFERENCE = "-1"
 
 S = "${WORKDIR}/${PN}"
 PV = "0.1.29+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
-inherit gpe
+inherit autotools gpe
 
-SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/${PN} \
-		 file://Makefile.dpkg_ipkg \
-    		 file://Makefile.translation"
+SRC_URI =	"${HANDHELDS_CVS};module=gpe/base/${PN}"
 
 PACKAGES = "gpe-conf gpe-conf-panel"
 LICENSE = "GPL"
@@ -25,17 +23,3 @@ FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \
 		${datadir}/gpe-conf"
 FILES_gpe-conf-panel = "${datadir}/applications/gpe-conf.desktop"
 
-
-do_compile () {
-	sed -i 's:CVSBUILD = yes:CVSBUILD = no:' Makefile
-	mkdir build
-	cp ${WORKDIR}/Makefile.* build/
-	oe_runmake PREFIX=${prefix}
-	oe_runmake all-desktop PREFIX=${prefix}
-}
-
-do_install () {
-        oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-}
-
-
diff --git a/packages/gpe-contacts/gpe-contacts_0.36.bb b/packages/gpe-contacts/gpe-contacts_0.36.bb
deleted file mode 100644
index 28e93b48b0..0000000000
--- a/packages/gpe-contacts/gpe-contacts_0.36.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-PR = "r0"
-
-DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-DESCRIPTION = "GPE contacts manager"
-
-FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
-
diff --git a/packages/gpe-contacts/gpe-contacts_0.42.bb b/packages/gpe-contacts/gpe-contacts_0.45.bb
index 32103b1867..b5afbb3a3c 100644
--- a/packages/gpe-contacts/gpe-contacts_0.42.bb
+++ b/packages/gpe-contacts/gpe-contacts_0.45.bb
@@ -1,10 +1,9 @@
 LICENSE = "GPL"
-MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 inherit gpe autotools
 
 PR = "r0"
 
-DEPENDS = "libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
+DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
 DESCRIPTION = "GPE contacts manager"
diff --git a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch b/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch
deleted file mode 100644
index bfa5567590..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet-0.13/gpe-timesheet-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u gpe-timesheet-0.13.orig/Makefile gpe-timesheet-0.13/Makefile
---- gpe-timesheet-0.13.orig/Makefile	2003-10-10 05:56:43.000000000 +1000
-+++ gpe-timesheet-0.13/Makefile	2004-04-29 15:09:46.000000000 +1000
-@@ -21,7 +21,7 @@
- 
- CFLAGS += -MD -Wall $(GTKCFLAGS)
- 
--CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
-+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
- 
- MEMBERS = main sql
- 
-@@ -40,6 +40,9 @@
- $(PACKAGE): $(OBJS)
- 	$(CC) -o $@ $^ $(LGPEWIDGET) $(GTKLDFLAGS) -lsqlite $(LDFLAGS)
- 
-+.c.o:;
-+	$(CC) $(PACKAGE_CPPFLAGS)  $(CFLAGS) $(GTKCFLAGS) -c $< -o $@
-+
- install-program: all $(PACKAGE).desktop
- 	mkdir -p $(DESTDIR)$(PREFIX)/bin
- 	install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE)
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.13.bb b/packages/gpe-timesheet/gpe-timesheet_0.13.bb
deleted file mode 100644
index b97ed97ffc..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.13.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DEPENDS = "libgpewidget glib-2.0 gtk+"
-SECTION = "gpe"
-
-SRC_URI += "file://gpe-timesheet-makefile.patch;patch=0"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.14.bb b/packages/gpe-timesheet/gpe-timesheet_0.14.bb
deleted file mode 100644
index b4f580736c..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.14.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.15.bb b/packages/gpe-timesheet/gpe-timesheet_0.15.bb
deleted file mode 100644
index 0cd8b539f0..0000000000
--- a/packages/gpe-timesheet/gpe-timesheet_0.15.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-LICENSE = "GPL"
-inherit gpe
-
-DESCRIPTION = "GPE time tracker"
-DEPENDS = "libgpewidget gtk+ sqlite"
-SECTION = "gpe"
-RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.16.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
index 0cd8b539f0..c23c963446 100644
--- a/packages/gpe-timesheet/gpe-timesheet_0.16.bb
+++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb
@@ -1,9 +1,10 @@
 LICENSE = "GPL"
-inherit gpe
+inherit autotools gpe
 
 DESCRIPTION = "GPE time tracker"
+GPE_TARBALL_SUFFIX = "bz2"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
 DEPENDS = "libgpewidget gtk+ sqlite"
 SECTION = "gpe"
 RDEPENDS = "gpe-icons"
-
-SRC_URI = "${GPE_MIRROR}/gpe-timesheet-${PV}.tar.gz"
+ 
\ No newline at end of file
diff --git a/packages/hping/.mtn2git_empty b/packages/hping/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hping/.mtn2git_empty
diff --git a/packages/hping/files/.mtn2git_empty b/packages/hping/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hping/files/.mtn2git_empty
diff --git a/packages/hping/files/hping2_configure.patch b/packages/hping/files/hping2_configure.patch
new file mode 100644
index 0000000000..90795ab0e0
--- /dev/null
+++ b/packages/hping/files/hping2_configure.patch
@@ -0,0 +1,75 @@
+Allow the byteorder and target os type to be specified via
+environment variables when running the configured shell script, don't
+try and run the resultant binary after building it, don't set various
+compiler related environment varibles - we'll let OE set those.
+
+diff -dur hping2-rc3-orig/configure hping2-rc3/configure
+--- hping2-rc3-orig/configure	2005-12-03 19:04:44.000000000 +1100
++++ hping2-rc3/configure	2005-12-03 19:05:58.000000000 +1100
+@@ -13,16 +13,19 @@
+ 	exit 0
+ fi
+ 
+-CC=${CC:=cc}
++if [ "x$BYTEORDER" = "x" ]; then
++	CC=${CC:=cc}
+ 
+-echo build byteorder.c...
+-$CC byteorder.c -o byteorder || exit 1
++	echo build byteorder.c...
++	$CC byteorder.c -o byteorder || exit 1
++
++	BYTEORDER=`./byteorder -m`
++fi
+ 
+ INSTALL_MANPATH=`echo $MANPATH|cut -f1 -d:`
+ if [ "$INSTALL_MANPATH" = "" ]; then
+ 	INSTALL_MANPATH="/usr/local/man"
+ fi
+-BYTEORDER=`./byteorder -m`
+ 
+ echo create byteorder.h...
+ cat > byteorder.h <<EOF
+@@ -38,7 +41,9 @@
+ #endif /* __BYTEORDER_H */
+ EOF
+ 
+-CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]`
++if [ "x$CONFIGOSTYPE" = "x" ]; then
++  CONFIGOSTYPE=`uname -s | tr [a-z] [A-Z]`
++fi
+ if [ ! "$CONFIGOSTYPE" ]; then
+ 	CONFIGOSTYPE=UNKNOWN
+ fi
+diff -dur hping2-rc3-orig/Makefile.in hping2-rc3/Makefile.in
+--- hping2-rc3-orig/Makefile.in	2005-12-03 19:04:44.000000000 +1100
++++ hping2-rc3/Makefile.in	2005-12-03 19:05:41.000000000 +1100
+@@ -6,17 +6,6 @@
+ # $date: Sun Jul 25 17:56:15 MET DST 1999$ 
+ # $rev: 3$ 
+ 
+-CC= gcc
+-AR=/usr/bin/ar
+-RANLIB=/usr/bin/ranlib
+-CCOPT= -O2 -Wall @PCAP_INCLUDE@
+-DEBUG= -g
+-#uncomment the following if you need libpcap based build under linux
+-#(not raccomanded)
+-COMPILE_TIME= @FORCE_LIBPCAP@
+-INSTALL_MANPATH=@MANPATH@
+-@PCAP@
+-
+ OBJ=	main.o getifname.o getlhs.o \
+ 	linux_sockpacket.o parseoptions.o datafiller.o \
+ 	datahandler.o gethostname.o \
+@@ -44,10 +33,6 @@
+ 
+ hping2: byteorder.h $(OBJ)
+ 	$(CC) -o hping2 $(CCOPT) $(DEBUG) $(OBJ) $(PCAP) @SOLARISLIB@
+-	@echo
+-	./hping2 -v
+-	@echo "use \`make strip' to strip hping2 binary"
+-	@echo "use \`make install' to install hping2"
+ 
+ byteorder.h:
+ 	./configure
diff --git a/packages/hping/files/hping2_debian.patch b/packages/hping/files/hping2_debian.patch
new file mode 100644
index 0000000000..4edc893896
--- /dev/null
+++ b/packages/hping/files/hping2_debian.patch
@@ -0,0 +1,168 @@
+The following minor changes were taken from the debian hping2 package:
+
+--- hping2-2.rc3.orig/antigetopt.c
++++ hping2-2.rc3/antigetopt.c
+@@ -140,7 +140,7 @@
+ #define UNK_LONG_ERRSTRING "unrecognized option `--%s'\n"
+ #define ARG_SHORT_ERRSTRING "option requires an argument -- %c\n"
+ #define ARG_LONG_ERRSTRING "option `--%s' requires an argument\n"
+-#define AMB_ERRSTRING "option `--%s' is ambiguos\n"
++#define AMB_ERRSTRING "option `--%s' is ambiguous\n"
+ #define IERR_ERRSTRING "internal error. ago_gnu_error() called with " \
+ 			   "a bad error code (%d)\n"
+ void ago_gnu_error(char *pname, int error)
+--- hping2-2.rc3.orig/bytesex.h
++++ hping2-2.rc3/bytesex.h
+@@ -7,16 +7,11 @@
+ #ifndef ARS_BYTESEX_H
+ #define ARS_BYTESEX_H
+ 
+-#if 	defined(__i386__) \
+-	|| defined(__alpha__) \
+-	|| (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
++#include <endian.h>
++
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define BYTE_ORDER_LITTLE_ENDIAN
+-#elif 	defined(__mc68000__) \
+-	|| defined (__sparc__) \
+-	|| defined (__sparc) \
+-	|| defined (__PPC__) \
+-	|| defined (__BIG_ENDIAN__) \
+-	|| (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__)))
++#elif __BYTE_ORDER == __BIG_ENDIAN
+ #define BYTE_ORDER_BIG_ENDIAN
+ #else
+ # error can not find the byte order for this architecture, fix bytesex.h
+--- hping2-2.rc3.orig/getlhs.c
++++ hping2-2.rc3/getlhs.c
+@@ -55,6 +55,12 @@
+ 	case DLT_IEEE802_11:
+ 		linkhdr_size = 14;
+ 		break;
++	case DLT_IEEE802_11:
++		linkhdr_size = 14;
++		break;
++	case DLT_TOKEN_RING:
++		linkhdr_size = 20;
++		break;
+ 	case DLT_ATM_RFC1483:
+ #ifdef DLT_CIP
+ 	case DLT_CIP:
+@@ -105,6 +111,15 @@
+ 	} else if ( strstr(ifname, "wlan") ) {
+ 		linkhdr_size = WLANHDR_SIZE;
+ 		return 0;
++	} else if (strstr(ifname, "atm")) {
++		linkhdr_size = 0;
++		return 0;
++	} else if ( strstr(ifname, "wlan") ) {
++		linkhdr_size = WLANHDR_SIZE;
++		return 0;
++	} else if ( strstr(ifname, "tr") ) {
++		linkhdr_size = TRHDR_SIZE;
++		return 0;
+ 	}
+ 	else
+ 		return -1;
+--- hping2-2.rc3.orig/listen.c
++++ hping2-2.rc3/listen.c
+@@ -10,6 +10,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+--- hping2-2.rc3.orig/main.c
++++ hping2-2.rc3/main.c
+@@ -26,6 +26,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <time.h>
+ 
+ #include "hping2.h"
+ 
+--- hping2-2.rc3.orig/resolve.c
++++ hping2-2.rc3/resolve.c
+@@ -12,6 +12,7 @@
+ #include <sys/types.h>
+ #include <netdb.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+--- hping2-2.rc3.orig/sendicmp.c
++++ hping2-2.rc3/sendicmp.c
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <signal.h>
+ #include <errno.h>
++#include <time.h>
+ 
+ #include "hping2.h"
+ #include "globals.h"
+--- hping2-2.rc3.orig/sendtcp.c
++++ hping2-2.rc3/sendtcp.c
+@@ -15,6 +15,8 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <errno.h>
++#include <time.h>
+ 
+ #include "hping2.h"
+ #include "globals.h"
+--- hping2-2.rc3.orig/sendudp.c
++++ hping2-2.rc3/sendudp.c
+@@ -15,6 +15,8 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <signal.h>
++#include <errno.h>
++#include <time.h>
+ 
+ #include "hping2.h"
+ #include "globals.h"
+--- hping2-2.rc3.orig/statistics.c
++++ hping2-2.rc3/statistics.c
+@@ -10,6 +10,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "hping2.h"
+ #include "globals.h"
+@@ -33,7 +34,7 @@
+ 			lossrate = 100;
+ 
+ 	fprintf(stderr, "\n--- %s hping statistic ---\n", targetname);
+-	fprintf(stderr, "%d packets tramitted, %d packets received, "
++	fprintf(stderr, "%d packets transmitted, %d packets received, "
+ 			"%d%% packet loss\n", sent_pkt, recv_pkt, lossrate);
+ 	if (out_of_sequence_pkt)
+ 		fprintf(stderr, "%d out of sequence packets received\n",
+--- hping2-2.rc3.orig/usage.c
++++ hping2-2.rc3/usage.c
+@@ -12,6 +12,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ void	show_usage(void)
+ {
+--- hping2-2.rc3.orig/version.c
++++ hping2-2.rc3/version.c
+@@ -10,6 +10,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #include "release.h"
+ #include "hping2.h"
diff --git a/packages/hping/hping2_1.9.9+2.0.0rc3.bb b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
new file mode 100644
index 0000000000..912f7c420e
--- /dev/null
+++ b/packages/hping/hping2_1.9.9+2.0.0rc3.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "hping is a command-line oriented TCP/IP packet \
+assembler/analyzer. The interface is inspired to the ping(8) \
+unix command, but hping isn't only able to send ICMP echo requests. \
+It supports TCP, UDP, ICMP and RAW-IP protocols, has a traceroute \
+mode, the ability to send files between a covered channel, and many \
+other features."
+HOMEPAGE = "http://www.hping.org/"
+SECTION = "console/network"
+MAINTAINER = "Jamie Lenehan <lenehan@twibble.org>"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.hping.org/hping2.0.0-rc3.tar.gz \
+	   file://hping2_debian.patch;patch=1 \
+	   file://hping2_configure.patch;patch=1"
+S="${WORKDIR}/hping2-rc3"
+
+#
+# We've patched configure to accept byte order and ostype as env
+# variables Pass those values in to stop it trying to figure it out
+# by itself.
+# NOTE: The configure script is not an autoconf script.
+#
+do_configure() {
+	# endianness fun.. inspired by openssl.inc
+	. ${CONFIG_SITE}
+        BYTEORDER="UNKNOWN"
+	if test "x$ac_cv_c_bigendian" = "xyes"; then
+	    BYTEORDER="__BIG_ENDIAN_BITFIELD"
+	elif test "x$ac_cv_c_littleendian" = "xyes"; then
+	    BYTEORDER="__LITTLE_ENDIAN_BITFIELD"
+	else
+	    oefatal do_configure cannot determine endianess
+	fi
+	BYTEORDER="${BYTEORDER}" CONFIGOSTYPE="LINUX" ./configure
+}
+
+#
+# Instead of patching the install we do things manually here
+#
+do_install() {
+	install -m 0755 -d ${D}${sbindir} ${D}/${mandir} ${D}${docdir}/hping2
+	install -m 0755 hping2 ${D}/${sbindir}
+	install -m 0644 docs/hping2.8 ${D}/${mandir}
+	install -m 0644 docs/HPING2-HOWTO.txt docs/HPING2-IS-OPEN \
+		docs/MORE-FUN-WITH-IPID docs/SPOOFED_SCAN.txt \
+		docs/AS-BACKDOOR docs/APD.txt ${D}${docdir}/hping2
+}
diff --git a/packages/libcontactsdb/libcontactsdb_0.4.bb b/packages/libcontactsdb/libcontactsdb_0.4.bb
new file mode 100644
index 0000000000..93950a3e1c
--- /dev/null
+++ b/packages/libcontactsdb/libcontactsdb_0.4.bb
@@ -0,0 +1,15 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Database access library for GPE contacts"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libgpepimc sqlite"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+
+PR = "r0"
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit autotools gpe pkgconfig
+
+do_stage () {
+autotools_stage_all
+}
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb
index 1ecc553cf9..737a7970dc 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.10-hh1.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb
index 1ecc553cf9..737a7970dc 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh0.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb
index 1ecc553cf9..737a7970dc 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh1.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb
index 48d468462b..374936deea 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.11-hh2.bb
@@ -4,6 +4,8 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
+
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb
index 1ecc553cf9..737a7970dc 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh0.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb
index 1ecc553cf9..737a7970dc 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh1.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
index 0b55dc8a53..4c7a1bba52 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.12-hh3.bb
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 PR="r1"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
index 6c69b548d0..2c01ca91f8 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb
index 03169de305..81b63d5021 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.6-hh0.bb
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 #
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb b/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb
index 35de9cff9b..58a8eff2cb 100644
--- a/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb
+++ b/packages/linux/handhelds-pxa-2.6_2.6.8.1-hh0.bb
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 #
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 DEFCONFIG = "defconfig-${MACHINE}_2.6.8.1-hh0"
diff --git a/packages/linux/handhelds-pxa-2.6_cvs.bb b/packages/linux/handhelds-pxa-2.6_cvs.bb
index bcf502d52f..1581a444b6 100644
--- a/packages/linux/handhelds-pxa-2.6_cvs.bb
+++ b/packages/linux/handhelds-pxa-2.6_cvs.bb
@@ -6,6 +6,7 @@ PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-hh${HHV}+cvs${SRCDATE}"
 PR = "r3"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
index 2f1a05a3bd..2d9eccfd83 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -6,6 +6,7 @@ PR = "r2"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
index 02575213ad..d0b2afe75d 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -6,6 +6,7 @@ PR = "r7"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
index c10d058160..034f2ca055 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb
@@ -6,6 +6,7 @@ PR = "r4"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb
index dce837db02..6bf75de349 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.6.bb
@@ -6,6 +6,7 @@ PR = "r0"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb
index 9fd7f0ba5e..7bdb445312 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh39.bb
@@ -6,6 +6,7 @@ PR = "r1"
 
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
index 319324dac8..32068528aa 100644
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
@@ -8,6 +8,7 @@ DEFAULT_PREFERENCE="-1"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3900|h2200|ipaq-pxa270)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-${PACKAGE_ARCH} \
diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb
index 5daabd127c..bdc2f86633 100644
--- a/packages/linux/handhelds-sa-2.6_cvs.bb
+++ b/packages/linux/handhelds-sa-2.6_cvs.bb
@@ -4,6 +4,7 @@ MAINTAINER = "Alex Lange <chicken@handhelds.org>"
 LICENSE = "GPL"
 #
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3600|simpad)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
index 9089678fdc..9e53e0394c 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
@@ -6,6 +6,7 @@ PR = "r3"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3600|simpad)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
index b4850a24de..9dc6f5fa50 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -6,6 +6,7 @@ PR = "r3"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3600|simpad)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index df160cd1ed..240e52ccc2 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -6,6 +6,7 @@ PR = "r6"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3600|simpad)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
index 3abb8719c5..a3d54d1319 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
@@ -7,6 +7,7 @@ DEFAULT_PREFERENCE = "-1"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(h3600|simpad)'
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index 5f30df1858..e1fb772eff 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -23,16 +23,14 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/poodle_mmcsd_fix-r0.patch;patch=1;status=merged \
            ${RPSRC}/poodle_ssp-r1.patch;patch=1;status=merged \
            ${RPSRC}/sharpsl_pm-do-r2.patch;patch=1;status=merged \
-           ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=pending \
-           ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=pending \
-           ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=pending \
-           ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=pending \
-           file://00-hostap.patch;patch=1;status=pending \
-           file://10-pcnet.patch;patch=1;status=pending \
-#           ${RPSRC}/alsa/asoc-v0.10-oz-r0.patch;patch=1 \
-	  ${RPSRC}/alsa/asoc-v0.10.patch;patch=1 \
-#           ${RPSRC}/alsa/asoc-v0.10rc4.patch;patch=1 \
-#           ${RPSRC}/asoc_fixups-r1.patch;patch=1 \
+           ${RPSRC}/zlib_inflate-r3.patch;patch=1;status=merged \
+           ${RPSRC}/logo_rotate_fix-r1.patch;patch=1;status=merged \
+           ${RPSRC}/collie_frontlight-r6.patch;patch=1;status=merged \
+           ${RPSRC}/input_modalias_fix-r0.patch;patch=1;status=merged \
+           file://00-hostap.patch;patch=1;status=merged \
+           file://10-pcnet.patch;patch=1;status=merged \
+           ${RPSRC}/asoc-v0.11pre2-oz.patch;patch=1 \
+           ${RPSRC}/asoc_updates-r1.patch;patch=1 \
            ${RPSRC}/hx2750_base-r25.patch;patch=1 \
            ${RPSRC}/hx2750_bl-r7.patch;patch=1 \
            ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
diff --git a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
index fd5d161cc1..40cf007174 100644
--- a/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.bb
@@ -8,6 +8,8 @@ PXAV = "${@bb.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
 PR = "r22"
 
+COMPATIBLE_MACHINE = 'simpad'
+
 FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
diff --git a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
index fff45f20e9..51fabecd75 100644
--- a/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
+++ b/packages/linux/opensimpad_2.4.27-vrs1-pxa1-jpm1.bb
@@ -9,6 +9,8 @@ JPMV = "${@bb.data.getVar('PV',d,True).split('-')[3]}"
 USBV= "usb20040610"
 PR = "r4"
 
+COMPATIBLE_MACHINE = 'simpad'
+
 FILESPATH = "${FILE_DIRNAME}/opensimpad-${PV}:${FILE_DIRNAME}/opensimpad:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
diff --git a/packages/man/man_1.5p.bb b/packages/man/man_1.5p.bb
index f4f8f4ba42..fa4b318956 100644
--- a/packages/man/man_1.5p.bb
+++ b/packages/man/man_1.5p.bb
@@ -12,6 +12,9 @@ RDEPENDS_${PN} = "less groff"
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/man/man-${PV}.tar.bz2 \
 		file://man.conf"
 
+# Disable parallel make or it tries to link objects before they are built
+PARALLEL_MAKE = ""
+
 EXTRA_OEMAKE = ""
 GS = "-DGREPSILENT=\"q\""
 DEFS = "-DUSG -DDO_COMPRESS ${GS}"
diff --git a/packages/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb
index 2f023c4264..5bf5f47eb6 100644
--- a/packages/qpe-games/zrev7_1.0.1.bb
+++ b/packages/qpe-games/zrev7_1.0.1.bb
@@ -1,22 +1,20 @@
 DESCRIPTION = "Reversi"
 SECTION = "opie/games"
 PRIORITY = "optional"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 AUTHOR = "Mario Weilguni"
 HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZRev7.html"
-
+PR = "r1"
 
 SRC_URI = "http://handhelds.org/~zecke/oe_packages/zrev7_V1.0.1.tar.gz \
            file://zrev.patch;patch=1"
-
-PV = "1.0.1"
 S = "${WORKDIR}/zrev7_V${PV}"
 
 APPNAME = "zrev7"
 APPTYPE = "binary"
+APPDESKTOP = "${S}"
 
-
+inherit opie
 
 do_compile_prepend() {
 	oe_runmake -C images	
@@ -25,8 +23,4 @@ do_compile_prepend() {
 do_install () {
 	install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
 }
-
-
-inherit opie
diff --git a/packages/qpf-fonts/qpf-dejavusans_2.2.bb b/packages/qpf-fonts/qpf-dejavusans_2.7.bb
index 3428d98a89..3428d98a89 100644
--- a/packages/qpf-fonts/qpf-dejavusans_2.2.bb
+++ b/packages/qpf-fonts/qpf-dejavusans_2.7.bb
diff --git a/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb
index 7494374023..7494374023 100644
--- a/packages/qpf-fonts/qpf-dejavusanscondensed_2.2.bb
+++ b/packages/qpf-fonts/qpf-dejavusanscondensed_2.7.bb
diff --git a/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb
index 51c9e1b925..51c9e1b925 100644
--- a/packages/qpf-fonts/qpf-dejavusansmono_2.2.bb
+++ b/packages/qpf-fonts/qpf-dejavusansmono_2.7.bb
diff --git a/packages/qpf-fonts/qpf-dejavuserif_2.2.bb b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb
index 81009e8a8c..81009e8a8c 100644
--- a/packages/qpf-fonts/qpf-dejavuserif_2.2.bb
+++ b/packages/qpf-fonts/qpf-dejavuserif_2.7.bb
diff --git a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb
index db31216907..db31216907 100644
--- a/packages/qpf-fonts/qpf-dejavuserifcondensed_2.2.bb
+++ b/packages/qpf-fonts/qpf-dejavuserifcondensed_2.7.bb
diff --git a/packages/quagga/quagga.inc b/packages/quagga/quagga.inc
index 34f4a6a1ab..34eb9bec0d 100644
--- a/packages/quagga/quagga.inc
+++ b/packages/quagga/quagga.inc
@@ -91,6 +91,10 @@ RDEPENDS_${PN}		+= "iproute2"
 # These are required for vtysh
 RDEPENDS_${PN}		+= "ncurses readline"
 
+# Indicate that the default files are configuration files
+CONFFILES_${PN} = "${sysconfdir}/default/quagga"
+CONFFILES_${PN}-watchquagga = "${sysconfdir}/default/watchquagga"
+
 do_install () {
 	# Install init script and default settings
 	install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d ${D}${sysconfdir}/quagga
diff --git a/packages/quagga/quagga_0.99.2.bb b/packages/quagga/quagga_0.99.2.bb
index 2789d7eb1a..ead4bf786d 100644
--- a/packages/quagga/quagga_0.99.2.bb
+++ b/packages/quagga/quagga_0.99.2.bb
@@ -1,4 +1,4 @@
 QUAGGASUBDIR = "/attic"
 include quagga.inc
-PR = "r1"
+PR = "r2"
 SRC_URI += "file://ospfd-no-opaque-lsa-fix.patch;patch=1"
diff --git a/packages/quagga/quagga_0.99.3.bb b/packages/quagga/quagga_0.99.3.bb
index e61c80d651..8a55e8b73e 100644
--- a/packages/quagga/quagga_0.99.3.bb
+++ b/packages/quagga/quagga_0.99.3.bb
@@ -1,2 +1,2 @@
 include quagga.inc
-PR = "r1"
+PR = "r2"
diff --git a/packages/quagga/quagga_0.99.4.bb b/packages/quagga/quagga_0.99.4.bb
index 52b47348f3..e61c80d651 100644
--- a/packages/quagga/quagga_0.99.4.bb
+++ b/packages/quagga/quagga_0.99.4.bb
@@ -1,2 +1,2 @@
 include quagga.inc
-PR = "r0"
+PR = "r1"
diff --git a/packages/ttf-fonts/ttf-dejavu_2.3.bb b/packages/ttf-fonts/ttf-dejavu_2.7.bb
index 304b30cfd6..304b30cfd6 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.3.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.7.bb
diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb
new file mode 100644
index 0000000000..de81537f99
--- /dev/null
+++ b/packages/xserver-common/xserver-common_1.10.bb
@@ -0,0 +1,19 @@
+MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh \
+		   file://calibrate_zaurusd.patch;patch=1 \
+		   file://poodle-xmodmap-2.6.patch;patch=1"
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb
deleted file mode 100644
index f6d09ac9e1..0000000000
--- a/packages/xserver-common/xserver-common_1.5.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
diff --git a/packages/xserver-common/xserver-common_1.7.bb b/packages/xserver-common/xserver-common_1.7.bb
deleted file mode 100644
index f6d09ac9e1..0000000000
--- a/packages/xserver-common/xserver-common_1.7.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-DESCRIPTION = "Common X11 scripts and support files"
-LICENSE = "GPL"
-SECTION = "x11"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r1"
-
-PACKAGE_ARCH = "all"
-
-# we are using a gpe-style Makefile
-inherit gpe
diff --git a/packages/zd1211/zd1211_r59.bb b/packages/zd1211/zd1211_r59.bb
index af03e7657f..2ab0f2c5b2 100644
--- a/packages/zd1211/zd1211_r59.bb
+++ b/packages/zd1211/zd1211_r59.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
@@ -20,7 +20,7 @@ inherit module
 
 do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
-        oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
+        oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
 		   'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
 		   'KDIR=${STAGING_KERNEL_DIR}' \
 		   'KERNEL_VERSION=${KERNEL_VERSION}' \
diff --git a/packages/zd1211/zd1211_r67.bb b/packages/zd1211/zd1211_r67.bb
index af03e7657f..2ab0f2c5b2 100644
--- a/packages/zd1211/zd1211_r67.bb
+++ b/packages/zd1211/zd1211_r67.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
@@ -20,7 +20,7 @@ inherit module
 
 do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
-        oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
+        oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
 		   'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
 		   'KDIR=${STAGING_KERNEL_DIR}' \
 		   'KERNEL_VERSION=${KERNEL_VERSION}' \
diff --git a/packages/zd1211/zd1211_r74.bb b/packages/zd1211/zd1211_r74.bb
index fa7e63d610..bb23071835 100644
--- a/packages/zd1211/zd1211_r74.bb
+++ b/packages/zd1211/zd1211_r74.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
@@ -24,7 +24,7 @@ inherit module
 
 do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
-        oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
+        oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
 		   'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
 		   'KDIR=${STAGING_KERNEL_DIR}' \
 		   'KERNEL_VERSION=${KERNEL_VERSION}' \
diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb
index 2e4297308e..c4551a97d8 100644
--- a/packages/zd1211/zd1211_r77.bb
+++ b/packages/zd1211/zd1211_r77.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 SECTION = "kernel/modules"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 RDEPENDS = "wireless-tools"
 
 SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \
@@ -22,7 +22,7 @@ inherit module
 
 do_compile () {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
-        oe_runmake 'MODPATH={D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
+        oe_runmake 'MODPATH=${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net' \
 		   'KERNEL_SOURCE=${STAGING_KERNEL_DIR}' \
 		   'KDIR=${STAGING_KERNEL_DIR}' \
 		   'KERNEL_VERSION=${KERNEL_VERSION}' \
diff --git a/packages/zip/zip-native_2.32.bb b/packages/zip/zip-native_2.32.bb
new file mode 100644
index 0000000000..7cd0261827
--- /dev/null
+++ b/packages/zip/zip-native_2.32.bb
@@ -0,0 +1,9 @@
+SECTION = "console/utils"
+inherit native
+include zip_${PV}.bb
+S = "${WORKDIR}/zip-${PV}"
+
+do_stage() {
+	install -d ${STAGING_BINDIR}
+	install zip zipnote zipsplit zipcloak ${STAGING_BINDIR}
+}
diff --git a/packages/zip/zip.inc b/packages/zip/zip.inc
new file mode 100644
index 0000000000..b66b4b217f
--- /dev/null
+++ b/packages/zip/zip.inc
@@ -0,0 +1,16 @@
+SECTION = "console/utils"
+SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip${@bb.data.getVar('PV',d,1).replace('.', '')}.tar.gz"
+LICENSE = "Info-ZIP"
+EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
+		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
+		'BINFLAGS=0755' 'INSTALL_D=install -d'"
+
+do_compile() {
+	oe_runmake -f unix/Makefile generic
+}
+
+do_install() {
+	oe_runmake -f unix/Makefile prefix=${D}${prefix} \
+		   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
+		   install
+}
diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb
index 6c588a55e5..d10bb4312e 100644
--- a/packages/zip/zip_2.31.bb
+++ b/packages/zip/zip_2.31.bb
@@ -1,17 +1,2 @@
-SECTION = "console/utils"
-SRC_URI = "http://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz"
-LICENSE = "Info-ZIP"
-EXTRA_OEMAKE = "'CC=${CC}' 'BIND=${CC}' 'AS=${CC} -c' 'CPP=${CPP}' \
-		'CFLAGS=-I. -DUNIX ${CFLAGS}' 'INSTALL=install' \
-		'BINFLAGS=0755' 'INSTALL_D=install -d'"
-
-do_compile() {
-	oe_runmake -f unix/Makefile generic
-}
-
-do_install() {
-	oe_runmake -f unix/Makefile prefix=${D}${prefix} \
-		   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
-		   install
-}
-
+include zip.inc
+PR="r0"
diff --git a/packages/zip/zip_2.32.bb b/packages/zip/zip_2.32.bb
new file mode 100644
index 0000000000..d10bb4312e
--- /dev/null
+++ b/packages/zip/zip_2.32.bb
@@ -0,0 +1,2 @@
+include zip.inc
+PR="r0"
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch
new file mode 100644
index 0000000000..24fe1c9bdb
--- /dev/null
+++ b/packages/zroadmap/files/qt2-fixes-r1.patch
@@ -0,0 +1,36 @@
+
+#
+# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
+#
+
+--- src/qt/qt_main.cc~qt2-fixes-r1.patch
++++ src/qt/qt_main.cc
+@@ -137,7 +137,7 @@
+       switch (orientation[0]) {
+          case 't':
+          case 'T': break;
+-
++#ifndef QWS
+          case 'b':
+          case 'B': moveDockWindow (toolBar, DockBottom); break;
+ 
+@@ -146,7 +146,7 @@
+ 
+          case 'r':
+          case 'R': moveDockWindow (toolBar, DockRight); break;
+-
++#endif
+          default: roadmap_log (ROADMAP_FATAL,
+                         "Invalid toolbar orientation %s", orientation);
+       }
+--- src/qt/Makefile~qt2-fixes-r1.patch
++++ src/qt/Makefile
+@@ -19,7 +19,7 @@
+ 
+ ifeq ($(DESKTOP),QPE)
+    CFLAGS += -I$(QTDIR)/include -DQWS
+-   LIBS += -lqte -lqpe
++   LIBS += -lqpe
+    INSTALLDIR=$(QTDIR)
+ endif
+ 
diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb
new file mode 100644
index 0000000000..db44964bfd
--- /dev/null
+++ b/packages/zroadmap/zroadmap_cvs.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \
+It displays a map of the streets, tracks the position provided by a NMEA-compliant \
+GPS receiver, identifies the street matching this GPS position and announces the name \
+of the crossing street at the next intersection."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
+DEPENDS = "popt"
+LICENSE = "GPL"
+PV = "1.0.12+cvs-${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+           file://qt2-fixes-r1.patch;pnum=1;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://zroadgps.png"
+S = "${WORKDIR}/roadmap/src"
+
+inherit palmtop
+
+QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
+QT_LIBRARY_append_c7x0 = " -laticore"
+
+EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
+                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
+PARALLEL_MAKE = ""
+
+do_configure() {
+	echo removing pregenerated stuff
+	find . -name "moc*"|xargs rm -f
+}
+
+do_compile() {
+	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+	oe_runmake -C gpx libgpx.a
+	oe_runmake -C unix libosroadmap.a
+	oe_runmake -C qt qtroadmap qtroadgps
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
+	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+        install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/
+	install -d ${D}${palmtopdir}/share/roadmap/
+        install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
+}