Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

538 files changed, 8616 insertions, 1571 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index fc62c269ef..f70c0c4147 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -318,7 +318,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}"
 # Program to be used to patch sources, use 'inherit patcher' to overwrite this:
 
 PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi'
-PATCHCMD = "quilt upgrade; chmod 644 patches/* || true; quilt import -f -p '%s' -n '%s' '%s'; quilt push"
+PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push"
 PATCH_DEPENDS = "quilt-native"
 
 ##################################################################
diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index d3da39ee0a..f57e361e04 100644
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
 	console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
 	devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
 
-CVSDATE = "20050220"
+CVSDATE = "20050224"
 
 #
 # Zaurus
diff --git a/packages/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff b/conf/distro/sharprom-compatible.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/glibc3.3.2-getopt-throw.diff
+++ b/conf/distro/sharprom-compatible.conf
diff --git a/packages/abuse/abuse-qpe_0.7.0.bb b/packages/abuse/abuse-qpe_0.7.0.bb
index e69de29bb2..0b588b3c07 100644
--- a/packages/abuse/abuse-qpe_0.7.0.bb
+++ b/packages/abuse/abuse-qpe_0.7.0.bb
@@ -0,0 +1,19 @@
+SECTION = "opie/games"
+
+include abuse_${PV}.bb
+
+DEPENDS += "virtual/libqpe"
+
+EXTRA_CXXFLAGS_append = " -Dmain=SDL_main"
+EXTRA_CFLAGS_append = " -Dmain=SDL_main"
+EXTRA_LFLAGS_append = "-lqpe"
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/pics \
+        	   ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/share/aliens
+        install -D -m 0755 aliens ${D}${palmtopdir}/bin/aliens
+	install -D -m 0644 aliens.png ${D}${palmtopdir}/pics/aliens.png
+        install -D -m 0644 aliens.desktop ${D}${palmtopdir}/Games/aliens.desktop
+}
diff --git a/packages/acpid/acpid_1.0.2.bb b/packages/acpid/acpid_1.0.2.bb
index e69de29bb2..c96f431224 100644
--- a/packages/acpid/acpid_1.0.2.bb
+++ b/packages/acpid/acpid_1.0.2.bb
@@ -0,0 +1,32 @@
+SECTION = "base"
+DESCRIPTION = "A daemon for delivering ACPI events."
+LICENSE="GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
+           file://init"
+
+EXTRA_OEMAKE = ""
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+}
+
+do_install () {
+	oe_runmake 'INSTPREFIX=${D}' install
+	install -d ${D}${sysconfdir}/init.d
+	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
+	chmod 755 ${D}${sysconfdir}/init.d/acpid
+}
+
+pkg_postinst () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid defaults
+}
+
+pkg_prerm () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid remove
+}
diff --git a/packages/acpid/acpid_1.0.3.bb b/packages/acpid/acpid_1.0.3.bb
index e69de29bb2..c96f431224 100644
--- a/packages/acpid/acpid_1.0.3.bb
+++ b/packages/acpid/acpid_1.0.3.bb
@@ -0,0 +1,32 @@
+SECTION = "base"
+DESCRIPTION = "A daemon for delivering ACPI events."
+LICENSE="GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/acpid/acpid-${PV}.tar.gz \
+           file://init"
+
+EXTRA_OEMAKE = ""
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+}
+
+do_install () {
+	oe_runmake 'INSTPREFIX=${D}' install
+	install -d ${D}${sysconfdir}/init.d
+	cat ${WORKDIR}/init | sed -e's,/usr/sbin,${sbindir},g' > ${D}${sysconfdir}/init.d/acpid
+	chmod 755 ${D}${sysconfdir}/init.d/acpid
+}
+
+pkg_postinst () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid defaults
+}
+
+pkg_prerm () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D acpid remove
+}
diff --git a/packages/aliens/aliens_1.0.0.bb b/packages/aliens/aliens_1.0.0.bb
index e69de29bb2..0c9d21caaa 100644
--- a/packages/aliens/aliens_1.0.0.bb
+++ b/packages/aliens/aliens_1.0.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Classic Arcade Shooter for Qt/Embedded based palmtop environments w/ SDL."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-mixer libsdl-image"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/aliens/src/aliens_V${PV}.tar.gz"
+S = "${WORKDIR}/aliens_V${PV}"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST="INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer LIBS+=-lSDL_image LIBS+=-lpthread CONFIG+=qte"
+
+do_compile_prepend() {
+	cd images && make && cd ..
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/pics \
+        	   ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/share/aliens
+        install -D -m 0755 aliens ${D}${palmtopdir}/bin/aliens
+	install -D -m 0644 aliens.png ${D}${palmtopdir}/pics/aliens.png
+        install -D -m 0644 aliens.desktop ${D}${palmtopdir}/apps/Games/aliens.desktop
+}
diff --git a/packages/apache/apache_2.0.48.bb b/packages/apache/apache_2.0.48.bb
index e69de29bb2..adb068a575 100644
--- a/packages/apache/apache_2.0.48.bb
+++ b/packages/apache/apache_2.0.48.bb
@@ -0,0 +1,87 @@
+BROKEN = "1"
+SECTION = "console/network"
+DEPENDS = "expat openssl"
+DESCRIPTION = "A high performance Unix-based HTTP server."
+LICENSE="Apache-2.0"
+
+SRC_URI = "http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz \
+           file://configure.patch;patch=1 \
+           file://pcre-configure.patch;patch=1 \
+           file://init \
+	   file://httpd.conf"
+S = "${WORKDIR}/httpd-${PV}"
+
+basesysconfdir := "${sysconfdir}"
+sysconfdir = "/etc/apache"
+
+inherit autotools
+
+FILES_${PN}="${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+	     ${libdir}/*/ ${basesysconfdir} ${sharedstatedir} ${localstatedir} \
+	     /bin /sbin /lib/*/ /lib/*.so* ${datadir}/${PN} ${datadir}/htdocs \
+	     ${datadir}/icons ${datadir}/cgi-bin ${datadir}/error /var"
+
+CFLAGS_append = " -DPATH_MAX=4096"
+CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
+EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \
+		--enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no \
+		--with-gdbm=no --with-ndbm=no"
+do_configure () {
+	(cd srclib/apr && ./buildconf)
+	(cd srclib/apr-util && ./buildconf)
+
+	cp srclib/apr/build/config.guess srclib/apr/build/config.sub \
+	   srclib/apr/build/PrintPath srclib/apr/build/apr_common.m4 \
+	   srclib/apr/build/find_apr.m4 $apu_src_dir/build/find_apu.m4 build
+
+	(cd srclib/pcre && autoconf)
+
+	aclocal -I build
+	autoheader
+	autoconf
+	oe_runconf
+}
+
+do_compile () {
+	touch srclib/apr-util/uri/gen_uri_delims.lo
+	${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims
+	touch srclib/pcre/dftables.lo
+	${BUILD_CC} -I/usr/include/pcre srclib/pcre/dftables.c -o srclib/pcre/dftables
+	cd server
+	${BUILD_CC} -I${S}/srclib/apr/include -c gen_test_char.c && touch gen_test_char.lo
+	${BUILD_CC} -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -c util_debug.c && touch util_debug.lo
+	${BUILD_CC} gen_test_char.o util_debug.o -o gen_test_char
+	/bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/srclib/apr/include -prefer-non-pic -static -c gen_test_char.c && touch gen_test_char.lo
+	/bin/sh ${S}/srclib/apr/libtool --silent --mode=compile ${CC} -DPATH_MAX=4096 -I${S}/os/unix -I${S}/srclib/apr/include -I${S}/srclib/apr-util/include -I${S}/include -prefer-non-pic -static -c util_debug.c && touch util_debug.lo
+	touch gen_test_char
+	cd ..
+	oe_runmake
+}
+
+do_install_append () {
+	set -x
+	install -d ${D}${basesysconfdir}/init.d
+	cat ${WORKDIR}/init | \
+		sed -e 's,/usr/sbin/,${sbindir}/,g; \
+			s,/usr/bin/,${bindir}/,g; \
+			s,/usr/lib,${libdir}/,g; \
+			s,/etc/apache/,${sysconfdir}/,g; \
+			s,/etc/,${basesysconfdir}/,g; \
+			s,/usr/,${prefix}/,g;' > ${D}${basesysconfdir}/init.d/httpd
+	chmod 755 ${D}${basesysconfdir}/init.d/httpd
+	install -m 0644 ${WORKDIR}/httpd.conf ${D}${sysconfdir}/httpd.conf
+}
+
+pkg_postinst () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D httpd defaults 91 20
+}
+
+pkg_prerm () {
+	if test -n "${D}"; then
+		D="-r $D"
+	fi
+	update-rc.d $D httpd remove
+}
diff --git a/packages/apmd/apmd_3.2.2.bb b/packages/apmd/apmd_3.2.2.bb
index e69de29bb2..9efd794f82 100644
--- a/packages/apmd/apmd_3.2.2.bb
+++ b/packages/apmd/apmd_3.2.2.bb
@@ -0,0 +1,65 @@
+PR = "r2"
+SECTION = "base"
+PRIORITY = "required"
+DEPENDS = "libtool-cross"
+DESCRIPTION = "Set of tools for managing notebook power consumption."
+LICENSE="GPL"
+
+PACKAGES =+ "libapm libapm-dev apm"
+
+FILES_libapm = "${libdir}/libapm.so.*"
+FILES_libapm-dev = "${libdir}/libapm.* ${includedir}"
+FILES_apm = "${bindir}/apm*"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \
+           file://debian.patch;patch=1 \
+           file://workaround.patch;patch=1 \
+           file://apmwrapper \
+           file://init \
+           file://default \
+           file://apmd_proxy \
+           file://apmd_proxy.conf"
+SRC_URI_append_beagle = " file://devfs.patch;patch=1 "	   
+
+S = "${WORKDIR}/apmd-${PV}.orig"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "apmd"
+INITSCRIPT_PARAMS = "defaults"
+
+do_compile() {
+	oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd
+}
+
+do_stage() {
+	install -m 0644 apm.h ${STAGING_INCDIR}
+	oe_libinstall -so libapm ${STAGING_LIBDIR}
+}
+
+do_install() {
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/apm
+	install -d ${D}${sysconfdir}/apm/event.d
+	install -d ${D}${sysconfdir}/apm/other.d
+	install -d ${D}${sysconfdir}/apm/suspend.d
+	install -d ${D}${sysconfdir}/apm/resume.d
+	install -d ${D}${sysconfdir}/apm/scripts.d
+	install -d ${D}${sysconfdir}/default
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sbindir}
+	install -d ${D}${bindir}
+	install -d ${D}${libdir}
+	install -d ${D}${datadir}/apmd
+	install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm.orig
+	install -m 0755 ${WORKDIR}/apmwrapper ${D}${bindir}/apm
+	install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
+	install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/
+	install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/
+	install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd
+	oe_libinstall -so libapm ${D}${libdir}
+	install -m 0644 apm.h ${D}${includedir}
+
+	cat ${WORKDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}${sysconfdir}/init.d/apmd
+	chmod 755 ${D}${sysconfdir}/init.d/apmd
+}
diff --git a/packages/appweb/appweb_1.0.0.bb b/packages/appweb/appweb_1.0.0.bb
index e69de29bb2..e962675509 100644
--- a/packages/appweb/appweb_1.0.0.bb
+++ b/packages/appweb/appweb_1.0.0.bb
@@ -0,0 +1,86 @@
+DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
+LICENSE="GPL"
+SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz" 
+SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \
+		 file://charsignedness.patch;patch=1 \
+		 file://makerules.patch;patch=1'
+S = "${WORKDIR}/appWeb-${PV}"
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d)
+	bb.build.exec_func('base_do_unpack', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+	bb.build.exec_func('do_unpack_cleanup', d)
+}
+
+do_unpack_cleanup () {
+	(
+		set -e
+		cd ${WORKDIR}
+		rm -f README.HTML install remove
+	)
+}
+
+python do_patch () {
+	bb.build.exec_func('base_do_patch', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d)
+	bb.build.exec_func('base_do_patch', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+}
+#       --enable-access-log
+#       --enable-admin
+#       --enable-all-static
+#       --enable-assert
+#       --enable-c-api
+#       --enable-dll
+#       --enable-fast-malloc
+#       --enable-goahead-compat
+#       --enable-if-modified
+#       --enable-log
+#       --enable-rom-fs
+#       --enable-run-as-service
+#       --enable-safe-strings
+#       --enable-squeeze
+#       --enable-ssl
+#       --enable-session
+
+APPWEB_TARGET = "${TARGET_ARCH}"
+APPWEB_OS = "${TARGET_OS}"
+APPWEB_OS_linux = "LINUX"
+EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \
+		--enable-keep-alive \
+		--enable-multi-thread \
+		--enable-cgi \
+		--enable-cookie \
+		--enable-config \
+		--enable-digest-auth \
+		--disable-ssl"
+EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'"
+
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
+do_configure () {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake build
+	oe_runmake compile
+}
+
+do_stage () {
+	:
+}
+
+do_install () {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \
+		   ${D}${libexecdir}/appWeb ${D}${libdir}
+	install -m 0755 appWeb/appWeb ${D}${sbindir}/
+	install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/
+	install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/
+	install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/
+}
diff --git a/packages/appweb/appweb_1.0.1.bb b/packages/appweb/appweb_1.0.1.bb
index e69de29bb2..8595e0e691 100644
--- a/packages/appweb/appweb_1.0.1.bb
+++ b/packages/appweb/appweb_1.0.1.bb
@@ -0,0 +1,86 @@
+DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
+LICENSE="GPL"
+SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz"
+SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-5.tar.gz \
+		 file://charsignedness.patch;patch=1 \
+		 file://makerules.patch;patch=1'
+S = "${WORKDIR}/appWeb-${PV}"
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d)
+	bb.build.exec_func('base_do_unpack', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+	bb.build.exec_func('do_unpack_cleanup', d)
+}
+
+do_unpack_cleanup () {
+	(
+		set -e
+		cd ${WORKDIR}
+		rm -f README.HTML install remove
+	)
+}
+
+python do_patch () {
+	bb.build.exec_func('base_do_patch', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d)
+	bb.build.exec_func('base_do_patch', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+}
+#       --enable-access-log
+#       --enable-admin
+#       --enable-all-static
+#       --enable-assert
+#       --enable-c-api
+#       --enable-dll
+#       --enable-fast-malloc
+#       --enable-goahead-compat
+#       --enable-if-modified
+#       --enable-log
+#       --enable-rom-fs
+#       --enable-run-as-service
+#       --enable-safe-strings
+#       --enable-squeeze
+#       --enable-ssl
+#       --enable-session
+
+APPWEB_TARGET = "${TARGET_ARCH}"
+APPWEB_OS = "${TARGET_OS}"
+APPWEB_OS_linux = "LINUX"
+EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \
+		--enable-keep-alive \
+		--enable-multi-thread \
+		--enable-cgi \
+		--enable-cookie \
+		--enable-config \
+		--enable-digest-auth \
+		--disable-ssl"
+EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'"
+
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
+do_configure () {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake build
+	oe_runmake compile
+}
+
+do_stage () {
+	:
+}
+
+do_install () {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \
+		   ${D}${libexecdir}/appWeb ${D}${libdir}
+	install -m 0755 appWeb/appWeb ${D}${sbindir}/
+	install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/
+	install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/
+	install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/
+}
diff --git a/packages/appweb/appweb_1.0.2.bb b/packages/appweb/appweb_1.0.2.bb
index e69de29bb2..7702078135 100644
--- a/packages/appweb/appweb_1.0.2.bb
+++ b/packages/appweb/appweb_1.0.2.bb
@@ -0,0 +1,87 @@
+DESCRIPTION = "AppWeb is an embedded HTTP Web server that has been designed with security in mind."
+SECTION = "console/network"
+LICENSE="GPL"
+
+SRC_URI = "http://www.mbedthis.com/software/appWeb-${PV}.LINUX-i386.self.tar.gz"
+SRC_URI_EXTRA = 'file://${WORKDIR}/appWeb-src-${PV}-12.tar.gz \
+		 file://charsignedness.patch;patch=1 \
+		 file://makerules.patch;patch=1'
+S = "${WORKDIR}/appWeb-${PV}"
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d)
+	bb.build.exec_func('base_do_unpack', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+	bb.build.exec_func('do_unpack_cleanup', d)
+}
+
+do_unpack_cleanup () {
+	(
+		set -e
+		cd ${WORKDIR}
+		rm -f README.HTML install remove
+	)
+}
+
+python do_patch () {
+	bb.build.exec_func('base_do_patch', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${SRC_URI_EXTRA}', d)
+	bb.build.exec_func('base_do_patch', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+}
+#       --enable-access-log
+#       --enable-admin
+#       --enable-all-static
+#       --enable-assert
+#       --enable-c-api
+#       --enable-dll
+#       --enable-fast-malloc
+#       --enable-goahead-compat
+#       --enable-if-modified
+#       --enable-log
+#       --enable-rom-fs
+#       --enable-run-as-service
+#       --enable-safe-strings
+#       --enable-squeeze
+#       --enable-ssl
+#       --enable-session
+
+APPWEB_TARGET = "${TARGET_ARCH}"
+APPWEB_OS = "${TARGET_OS}"
+APPWEB_OS_linux = "LINUX"
+EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \
+		--enable-keep-alive \
+		--enable-multi-thread \
+		--enable-cgi \
+		--enable-cookie \
+		--enable-config \
+		--enable-digest-auth \
+		--disable-ssl"
+EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'"
+
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
+do_configure () {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile () {
+	oe_runmake build
+	oe_runmake compile
+}
+
+do_stage () {
+	:
+}
+
+do_install () {
+	install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \
+		   ${D}${libexecdir}/appWeb ${D}${libdir}
+	install -m 0755 appWeb/appWeb ${D}${sbindir}/
+	install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/
+	install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/
+	install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/
+}
diff --git a/packages/appweb/appweb_1.2.0.bb b/packages/appweb/appweb_1.2.0.bb
index f303232f26..dc0ac7d0dd 100644
--- a/packages/appweb/appweb_1.2.0.bb
+++ b/packages/appweb/appweb_1.2.0.bb
@@ -101,10 +101,10 @@ do_install () {
 }
 
 #do_install () {
-#	install -d ${D}/${sbindir} ${D}/${sysconfdir}/appWeb/lib \
-#		   ${D}/${libexecdir}/appWeb ${D}/${libdir}
-#	install -m 0755 appWeb/appWeb ${D}/${sbindir}/
-#	install -m 0644 appWeb/appWeb.conf ${D}/${sysconfdir}/appWeb/
-#	install -m 0755 bin/${APPWEB_OS}/* ${D}/${libexecdir}/appWeb/
-#	install -m 0755 lib/lib*.so* ${D}/${sysconfdir}/appWeb/lib/
+#	install -d ${D}${sbindir} ${D}${sysconfdir}/appWeb/lib \
+#		   ${D}${libexecdir}/appWeb ${D}${libdir}
+#	install -m 0755 appWeb/appWeb ${D}${sbindir}/
+#	install -m 0644 appWeb/appWeb.conf ${D}${sysconfdir}/appWeb/
+#	install -m 0755 bin/${APPWEB_OS}/* ${D}${libexecdir}/appWeb/
+#	install -m 0755 lib/lib*.so* ${D}${sysconfdir}/appWeb/lib/
 #}
diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc
index a3ccc82e01..03d64155c1 100644
--- a/packages/apt/apt-package.inc
+++ b/packages/apt/apt-package.inc
@@ -47,9 +47,9 @@ def get_commands_apt_doc(d, bb, manpages):
 		dest = get_files_apt_doc(d, bb, m)
 		dir = os.path.dirname(dest)
 		if not dir in __dir_cache__:
-			s.append("install -d ${D}/%s" % dir)
+			s.append("install -d ${D}%s" % dir)
 			__dir_cache__.append(dir)
-		s.append("install -m 0644 %s ${D}/%s" % (m, dest))
+		s.append("install -m 0644 %s ${D}%s" % (m, dest))
 	return "\n".join(s)
 
 PACKAGES += "${PN}-utils ${PN}-utils-doc"
@@ -67,33 +67,33 @@ FILES_${PN}-dev = "${libdir}/libapt*.so"
 do_install () {
 	${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))}
 	${@get_commands_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}
-	install -d ${D}/${bindir}
-	install -m 0755 bin/apt-cdrom ${D}/${bindir}/
-	install -m 0755 bin/apt-get ${D}/${bindir}/
-	install -m 0755 bin/apt-config ${D}/${bindir}/
-	install -m 0755 bin/apt-cache ${D}/${bindir}/
+	install -d ${D}${bindir}
+	install -m 0755 bin/apt-cdrom ${D}${bindir}/
+	install -m 0755 bin/apt-get ${D}${bindir}/
+	install -m 0755 bin/apt-config ${D}${bindir}/
+	install -m 0755 bin/apt-cache ${D}${bindir}/
 
-	install -m 0755 bin/apt-sortpkgs ${D}/${bindir}/
-	install -m 0755 bin/apt-extracttemplates ${D}/${bindir}/
+	install -m 0755 bin/apt-sortpkgs ${D}${bindir}/
+	install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
 
-	oe_libinstall -so -C bin libapt-pkg--6 ${D}/${libdir}/
-	ln -sf libapt-pkg--6.so ${D}/${libdir}/libapt-pkg.so
-	oe_libinstall -so -C bin libapt-inst--6 ${D}/${libdir}/
-	ln -sf libapt-inst--6.so ${D}/${libdir}/libapt-inst.so
+	oe_libinstall -so -C bin libapt-pkg--6 ${D}${libdir}/
+	ln -sf libapt-pkg--6.so ${D}${libdir}/libapt-pkg.so
+	oe_libinstall -so -C bin libapt-inst--6 ${D}${libdir}/
+	ln -sf libapt-inst--6.so ${D}${libdir}/libapt-inst.so
 
-	install -d ${D}/${libdir}/apt/methods
-	install -m 0755 bin/methods/* ${D}/${libdir}/apt/methods/
+	install -d ${D}${libdir}/apt/methods
+	install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
 
-	install -d ${D}/${libdir}/dpkg/methods/apt
-	install -m 0644 dselect/desc.apt ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0644 dselect/names ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/install ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/setup ${D}/${libdir}/dpkg/methods/apt/ 
-	install -m 0755 dselect/update ${D}/${libdir}/dpkg/methods/apt/ 
+	install -d ${D}${libdir}/dpkg/methods/apt
+	install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
+	install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 
 
-	install -d ${D}/${sysconfdir}/apt
-	install -d ${D}/${localstatedir}/lib/apt/lists/partial
-	install -d ${D}/${localstatedir}/cache/apt/archives/partial
-	install -d ${D}/${docdir}/apt/examples
-	install -m 0644 doc/examples/* ${D}/${docdir}/apt/examples/
+	install -d ${D}${sysconfdir}/apt
+	install -d ${D}${localstatedir}/lib/apt/lists/partial
+	install -d ${D}${localstatedir}/cache/apt/archives/partial
+	install -d ${D}${docdir}/apt/examples
+	install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
 }
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index 025a20ee1d..93a09329b5 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -25,11 +25,11 @@ update-modules || true
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
-	for i in ${MODULES}; do install -m 0644 $i ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/$i; done
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
+	for i in ${MODULES}; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/$i; done
 
 	if [ "${MACHINE}" = "h3900" ]; then
-		install -d ${D}/${sysconfdir}/modutils
-		echo "at76c503-rfmd" > ${D}/${sysconfdir}/modutils/at76c503-rfmd
+		install -d ${D}${sysconfdir}/modutils
+		echo "at76c503-rfmd" > ${D}${sysconfdir}/modutils/at76c503-rfmd
 	fi
 }
diff --git a/packages/atd/atd_0.70.bb b/packages/atd/atd_0.70.bb
index d7be74ee72..fce9a73265 100644
--- a/packages/atd/atd_0.70.bb
+++ b/packages/atd/atd_0.70.bb
@@ -18,6 +18,6 @@ do_compile() {
 do_install() {
 	install -d ${D}${sbindir}
 	install atd ${D}${sbindir}/atd
-	install -d ${D}/${sysconfdir}/init.d
-	install dist/etc/init.d/atd ${D}/${sysconfdir}/init.d/atd
+	install -d ${D}${sysconfdir}/init.d
+	install dist/etc/init.d/atd ${D}${sysconfdir}/init.d/atd
 }
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
index fd156a31c7..ad07c26b53 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.3.5.6.bb
@@ -16,7 +16,7 @@ CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includ
 
 do_compile() {
 	export INC="${S}/src/includes"
-	export OBJDIR="${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
+	export OBJDIR="${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
 	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
 	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
 	export CC="${KERNEL_CC}" 
@@ -31,9 +31,9 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${sysconfdir}/pcmcia
-	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/${sysconfdir}/pcmcia/
+	install -d ${D}${sysconfdir}/pcmcia
+	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}${sysconfdir}/pcmcia/
 
 	# remove any maps that were installed
-	rm -f ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
+	rm -f ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
 }
diff --git a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
index fd156a31c7..ad07c26b53 100644
--- a/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
+++ b/packages/atmelwlandriver/atmelwlandriver_3.4.1.0.bb
@@ -16,7 +16,7 @@ CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includ
 
 do_compile() {
 	export INC="${S}/src/includes"
-	export OBJDIR="${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
+	export OBJDIR="${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/"
 	export KERNEL_PATH="${STAGING_KERNEL_DIR}"
 	export KERNEL_SRC="${STAGING_KERNEL_DIR}"
 	export CC="${KERNEL_CC}" 
@@ -31,9 +31,9 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${sysconfdir}/pcmcia
-	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}/${sysconfdir}/pcmcia/
+	install -d ${D}${sysconfdir}/pcmcia
+	install -m 0644 ${WORKDIR}/pcmf502rd.conf ${D}${sysconfdir}/pcmcia/
 
 	# remove any maps that were installed
-	rm -f ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
+	rm -f ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless/atmel/*.map
 }
diff --git a/packages/autofs/autofs_3.1.7.bb b/packages/autofs/autofs_3.1.7.bb
index e69de29bb2..e09971b59f 100644
--- a/packages/autofs/autofs_3.1.7.bb
+++ b/packages/autofs/autofs_3.1.7.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Kernel based automounter for linux."
+SECTION = "base"
+LICENSE = "GPL"
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_prepend () {
+	if [ ! -e acinclude.m4 ]; then
+		cp aclocal.m4 acinclude.m4
+	fi
+}
+
+do_install () {
+	install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \
+		   ${D}${sbindir}
+	oe_runmake 'INSTALLROOT=${D}' install
+}
diff --git a/packages/automake/automake_1.7.7.bb b/packages/automake/automake_1.7.7.bb
index e69de29bb2..e28e79009e 100644
--- a/packages/automake/automake_1.7.7.bb
+++ b/packages/automake/automake_1.7.7.bb
@@ -0,0 +1,20 @@
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+DESCRIPTION = "A tool for automatically generating Makefiles."
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r2"
+inherit autotools
+
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.7 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.7 ${D}${datadir}/automake
+	fi
+}
diff --git a/packages/automake/automake_1.8.2.bb b/packages/automake/automake_1.8.2.bb
index e69de29bb2..a61ab5cc98 100644
--- a/packages/automake/automake_1.8.2.bb
+++ b/packages/automake/automake_1.8.2.bb
@@ -0,0 +1,24 @@
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+	   file://automake182-update-configscripts.patch;patch=1;pnum=1"
+DESCRIPTION = "A tool for automatically generating Makefiles."
+SECTION = "devel"
+LICENSE = "GPL"
+PR = "r2"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.8 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.8 ${D}${datadir}/automake
+	fi
+}
diff --git a/packages/automake/automake_1.8.4.bb b/packages/automake/automake_1.8.4.bb
index e69de29bb2..b0f2ab169b 100644
--- a/packages/automake/automake_1.8.4.bb
+++ b/packages/automake/automake_1.8.4.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+PR = "r2"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.8 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.8 ${D}${datadir}/automake
+	fi
+}
diff --git a/packages/automake/automake_1.9.2.bb b/packages/automake/automake_1.9.2.bb
index e69de29bb2..e720475f8b 100644
--- a/packages/automake/automake_1.9.2.bb
+++ b/packages/automake/automake_1.9.2.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+PR = "r2"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+S = "${WORKDIR}/automake-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.9 ${D}${datadir}/automake
+	fi
+}
diff --git a/packages/automake/automake_1.9.3.bb b/packages/automake/automake_1.9.3.bb
index e69de29bb2..448974e65c 100644
--- a/packages/automake/automake_1.9.3.bb
+++ b/packages/automake/automake_1.9.3.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "A tool for automatically generating Makefiles."
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnu.org/software/automake/"
+SECTION = "devel"
+PR = "r1"
+
+SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2"
+S = "${WORKDIR}/automake-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*"
+RDEPENDS_${PN} += "perl"
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${datadir}
+	if [ ! -e ${D}${datadir}/aclocal ]; then
+		ln -sf aclocal-1.9 ${D}${datadir}/aclocal
+	fi
+	if [ ! -e ${D}${datadir}/automake ]; then
+		ln -sf automake-1.9 ${D}${datadir}/automake
+	fi
+}
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index 38c3bf7d32..677ff0f4f7 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -49,104 +49,104 @@ hostname_ramses = "MNCI"
 
 do_install () {
 	for d in ${dirs755}; do
-		install -m 0755 -d ${D}/$d
+		install -m 0755 -d ${D}$d
 	done
 	for d in ${dirs1777}; do
-		install -m 1777 -d ${D}/$d
+		install -m 1777 -d ${D}$d
 	done
 	for d in ${dirs2775}; do
-		install -m 2755 -d ${D}/$d
+		install -m 2755 -d ${D}$d
 	done
 	for d in card cf net ram; do
-		ln -sf /media/$d ${D}/mnt/$d
+		ln -sf /media/$d ${D}mnt/$d
 	done
 
 	if [ -n "${MACHINE}" -a "${hostname}" = "openembedded" ]; then
-		echo ${MACHINE} > ${D}/${sysconfdir}/hostname
+		echo ${MACHINE} > ${D}${sysconfdir}/hostname
 	else
-		echo ${hostname} > ${D}/${sysconfdir}/hostname
+		echo ${hostname} > ${D}${sysconfdir}/hostname
 	fi
 
         if [ -n "${DISTRO_NAME}" ]; then
-		echo -n "${DISTRO_NAME} " > ${D}/${sysconfdir}/issue
-		echo -n "${DISTRO_NAME} " > ${D}/${sysconfdir}/issue.net
+		echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue
+		echo -n "${DISTRO_NAME} " > ${D}${sysconfdir}/issue.net
 		if [ -n "${DISTRO_VERSION}" ]; then
-			echo -n "${DISTRO_VERSION} " >> ${D}/${sysconfdir}/issue
-			echo -n "${DISTRO_VERSION} " >> ${D}/${sysconfdir}/issue.net
+			echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
+			echo -n "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
 		fi
-		echo "\n \l" >> ${D}/${sysconfdir}/issue
-		echo >> ${D}/${sysconfdir}/issue
-		echo "%h"    >> ${D}/${sysconfdir}/issue.net
-		echo >> ${D}/${sysconfdir}/issue.net
+		echo "\n \l" >> ${D}${sysconfdir}/issue
+		echo >> ${D}${sysconfdir}/issue
+		echo "%h"    >> ${D}${sysconfdir}/issue.net
+		echo >> ${D}${sysconfdir}/issue.net
 	else
- 	       install -m 0644 ${WORKDIR}/issue ${D}/${sysconfdir}/issue
- 	       install -m 0644 ${WORKDIR}/issue.net ${D}/${sysconfdir}/issue.net
+ 	       install -m 0644 ${WORKDIR}/issue ${D}${sysconfdir}/issue
+ 	       install -m 0644 ${WORKDIR}/issue.net ${D}${sysconfdir}/issue.net
  	fi
 
-	install -m 0644 ${WORKDIR}/fstab ${D}/${sysconfdir}/fstab
+	install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
 	install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
-	install -m 0644 ${WORKDIR}/usbd ${D}/${sysconfdir}/default/usbd
-	install -m 0644 ${WORKDIR}/profile ${D}/${sysconfdir}/profile
-	install -m 0755 ${WORKDIR}/share/dot.profile ${D}/${sysconfdir}/skel/.profile
-	install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}/${sysconfdir}/skel/.bashrc
-	install -m 0644 ${WORKDIR}/inputrc ${D}/${sysconfdir}/inputrc
-	install -m 0644 ${WORKDIR}/nsswitch.conf ${D}/${sysconfdir}/nsswitch.conf
-	install -m 0644 ${WORKDIR}/host.conf ${D}/${sysconfdir}/host.conf
-	install -m 0644 ${WORKDIR}/motd ${D}/${sysconfdir}/motd
+	install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
+	install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
+	install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
+	install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
+	install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
+	install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
+	install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
+	install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
 
 	for license in BSD GPL-2 LGPL-2 LGPL-2.1 Artistic; do
-		install -m 0644 ${WORKDIR}/licenses/$license ${D}/${datadir}/common-licenses/
+		install -m 0644 ${WORKDIR}/licenses/$license ${D}${datadir}/common-licenses/
 	done
 
-	if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}/${sysconfdir}/fstab); then
+	if (grep -q "^\(tmpfs\|ramfs\)\W\+/var" ${D}${sysconfdir}/fstab); then
 		# /var is in a ramdisk
-		install -d ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/rcS.d
+		install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/rcS.d
 		for d in ${dirs755}; do
 			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
-				echo "chmod 0775 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+				echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
+				echo "chmod 0775 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
 			fi
 		done
 		for d in ${dirs1777}; do
 			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
-				echo "chmod 1777 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+				echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
+				echo "chmod 1777 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
 			fi
 		done
 		for d in ${dirs2775}; do
 			if (echo $d|grep -q "^${localstatedir}"); then
-				echo "mkdir -p $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
-				echo "chmod 2775 $d" >> ${D}/${sysconfdir}/init.d/populate-var.sh
+				echo "mkdir -p $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
+				echo "chmod 2775 $d" >> ${D}${sysconfdir}/init.d/populate-var.sh
 			fi
 		done
 
 
-		echo ">/var/run/utmp" >> ${D}/${sysconfdir}/init.d/populate-var.sh
-		echo ">/var/log/wtmp" >> ${D}/${sysconfdir}/init.d/populate-var.sh
-		echo ">/var/log/lastlog" >> ${D}/${sysconfdir}/init.d/populate-var.sh
-		echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog"	>> ${D}/${sysconfdir}/init.d/populate-var.sh
-		echo "touch /var/run/resolv.conf"	>> ${D}/${sysconfdir}/init.d/populate-var.sh
+		echo ">/var/run/utmp" >> ${D}${sysconfdir}/init.d/populate-var.sh
+		echo ">/var/log/wtmp" >> ${D}${sysconfdir}/init.d/populate-var.sh
+		echo ">/var/log/lastlog" >> ${D}${sysconfdir}/init.d/populate-var.sh
+		echo "chmod 0664 /var/run/utmp /var/log/wtmp /var/log/lastlog"	>> ${D}${sysconfdir}/init.d/populate-var.sh
+		echo "touch /var/run/resolv.conf"	>> ${D}${sysconfdir}/init.d/populate-var.sh
 
-#		rmdir ${D}/${localstatedir}/*
-		chmod 0755 ${D}/${sysconfdir}/init.d/populate-var.sh
-		ln -sf ../init.d/populate-var.sh ${D}/${sysconfdir}/rcS.d/S37populate-var.sh
-		ln -sf ${localstatedir}/run/resolv.conf ${D}/${sysconfdir}/resolv.conf
-		ln -sf ${localstatedir}/ld.so.cache ${D}/${sysconfdir}/ld.so.cache
-		ln -sf /proc/mounts ${D}/${sysconfdir}/mtab
+#		rmdir ${D}${localstatedir}/*
+		chmod 0755 ${D}${sysconfdir}/init.d/populate-var.sh
+		ln -sf ../init.d/populate-var.sh ${D}${sysconfdir}/rcS.d/S37populate-var.sh
+		ln -sf ${localstatedir}/run/resolv.conf ${D}${sysconfdir}/resolv.conf
+		ln -sf ${localstatedir}/ld.so.cache ${D}${sysconfdir}/ld.so.cache
+		ln -sf /proc/mounts ${D}${sysconfdir}/mtab
 	fi
 }
 
 
 do_install_append_ramses () {
-	rmdir ${D}/tmp
-	mkdir -p ${D}/${localstatedir}/tmp
-	ln -s var/tmp ${D}/tmp
+	rmdir ${D}tmp
+	mkdir -p ${D}${localstatedir}/tmp
+	ln -s var/tmp ${D}tmp
 }
 
 do_install_append_nylon() {
-	rm ${D}/${sysconfdir}/resolv.conf
-	touch ${D}/${sysconfdir}/resolv.conf
-	rm -r ${D}/mnt/*
+	rm ${D}${sysconfdir}/resolv.conf
+	touch ${D}${sysconfdir}/resolv.conf
+	rm -r ${D}mnt/*
 }
 
 PACKAGES = "${PN}-doc ${PN}"
diff --git a/packages/base-passwd/base-passwd_3.5.7.bb b/packages/base-passwd/base-passwd_3.5.7.bb
index 54a3223215..d2148b6312 100644
--- a/packages/base-passwd/base-passwd_3.5.7.bb
+++ b/packages/base-passwd/base-passwd_3.5.7.bb
@@ -13,32 +13,32 @@ inherit autotools
 FILES_${PN}-doc += "${docdir}"
 
 do_install () {
-	install -d -m 755 ${D}/${sbindir}
-	install -p -m 755 update-passwd ${D}/${sbindir}/
+	install -d -m 755 ${D}${sbindir}
+	install -p -m 755 update-passwd ${D}${sbindir}/
 	install -d -m 755 \
-		${D}/${mandir}/man8 ${D}/${mandir}/pl/man8
+		${D}${mandir}/man8 ${D}${mandir}/pl/man8
 	install -p -m 644 man/update-passwd.8 \
-		${D}/${mandir}/man8/
+		${D}${mandir}/man8/
 	install -p -m 644 man/update-passwd.pl.8 \
-		${D}/${mandir}/pl/man8/update-passwd.8
-	gzip -9 ${D}/${mandir}/man8/* \
-		${D}/${mandir}/pl/man8/*
-	install -d -m 755 ${D}/${datadir}/base-passwd
+		${D}${mandir}/pl/man8/update-passwd.8
+	gzip -9 ${D}${mandir}/man8/* \
+		${D}${mandir}/pl/man8/*
+	install -d -m 755 ${D}${datadir}/base-passwd
 	install -p -m 644 passwd.master \
-		${D}/${datadir}/base-passwd/
+		${D}${datadir}/base-passwd/
 	install -p -m 644 group.master \
-		${D}/${datadir}/base-passwd/
+		${D}${datadir}/base-passwd/
 
-	install -d -m 755 ${D}/${docdir}/${PN}
-	install -p -m 644 debian/changelog ${D}/${docdir}/${PN}/
-	gzip -9 ${D}/${docdir}/${PN}/*
-	install -p -m 644 README ${D}/${docdir}/${PN}/
-	install -p -m 644 debian/copyright ${D}/${docdir}/${PN}/
+	install -d -m 755 ${D}${docdir}/${PN}
+	install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
+	gzip -9 ${D}${docdir}/${PN}/*
+	install -p -m 644 README ${D}${docdir}/${PN}/
+	install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
 }
 
 
 do_install_append_ramses() {
-	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}/${datadir}/base-passwd/passwd.master
+	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
 }
 
 
diff --git a/packages/bash-completion/bash-completion_20040711.bb b/packages/bash-completion/bash-completion_20040711.bb
index e69de29bb2..8294d98257 100644
--- a/packages/bash-completion/bash-completion_20040711.bb
+++ b/packages/bash-completion/bash-completion_20040711.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Programmable Completion for Bash"
+SECTION = "console/utils"
+RDEPENDS = "bash"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.caliban.org/files/bash/bash-completion-${PV}.tar.gz \
+	   file://bash_completion.sh"
+S = "${WORKDIR}/bash_completion"
+
+do_configure() {
+	:
+}
+
+do_compile() {
+	:
+}
+
+do_install() {
+	install -d ${D}${sysconfdir}/profile.d
+	install -m 0755 ${WORKDIR}/bash_completion.sh ${D}${sysconfdir}/profile.d
+	install -m 0755 bash_completion ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/bash_completion.d/
+	install -m 0755 contrib/* ${D}${sysconfdir}/bash_completion.d/
+}
+
diff --git a/packages/billiardz/billiardz_0.1.4.bb b/packages/billiardz/billiardz_0.1.4.bb
index e69de29bb2..a3593a4c49 100644
--- a/packages/billiardz/billiardz_0.1.4.bb
+++ b/packages/billiardz/billiardz_0.1.4.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Billiard Game for Qt/Embedded based palmtop environments w/ SDL."
+HOMEPAGE = "http://www.chipx86.com/projects/billiardz/"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "libsdl-qpe libsdl-image"
+PR = "r1"
+
+SRC_URI = "http://www.chipx86.com/packages/ipkg/billiardz-${PV}.tar.gz"
+
+inherit palmtop
+
+QMAKE_PROFILES = "billiardz.arm.pro"
+EXTRA_QMAKEVARS_POST = "DEFINES-=FPM_INTEL" 
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/ \
+		   ${D}${palmtopdir}/apps/Games \
+		   ${D}${palmtopdir}/pics \
+		   ${D}${palmtopdir}/pics/billiardz
+        install -m 0755 billiardz ${D}${palmtopdir}/bin/billiardz
+        install -m 0644 billiardz.png ${D}${palmtopdir}/pics/billiardz.png
+	cp -a images/*.png ${D}${palmtopdir}/pics/billiardz
+
+	echo "[Desktop Entry] " >${D}${palmtopdir}/apps/Games/billiardz.desktop
+	echo "Comment=Billiards for Zaurus" >>${D}${palmtopdir}/apps/Games/billiardz.desktop
+	echo "Exec=billiardz" >>${D}${palmtopdir}/apps/Games/billiardz.desktop
+	echo "Icon=billiardz" >>${D}${palmtopdir}/apps/Games/billiardz.desktop
+	echo "Type=Application" >>${D}${palmtopdir}/apps/Games/billiardz.desktop
+	echo "Name=BilliardZ" >>${D}${palmtopdir}/apps/Games/billiardz.desktop
+}
diff --git a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb
index e69de29bb2..7b51227cde 100644
--- a/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb
+++ b/packages/binutils/binutils-cross-sdk_2.15.91.0.2.bb
@@ -0,0 +1,21 @@
+SECTION = "devel"
+PR = "r1"
+include binutils_${PV}.bb
+inherit sdk
+DEPENDS += "flex-native bison-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+		--program-prefix=${TARGET_PREFIX}"
+
+do_stage() {
+	:
+}
+
+do_install () {
+        autotools_do_install
+                                                                               
+        # Install the libiberty header
+        install -d ${D}${includedir}
+        install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+        install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+}
diff --git a/packages/binutils/binutils_2.14.90.0.6.bb b/packages/binutils/binutils_2.14.90.0.6.bb
index e69de29bb2..9a95ae0109 100644
--- a/packages/binutils/binutils_2.14.90.0.6.bb
+++ b/packages/binutils/binutils_2.14.90.0.6.bb
@@ -0,0 +1,126 @@
+SECTION = "devel"
+inherit autotools gettext
+
+PR = "r2"
+
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-uclibc-001-debian.patch;patch=1 \
+     file://binutils-uclibc-100-conf.patch;patch=1 \
+     file://binutils-uclibc-200-build_modules.patch;patch=1 \
+     file://binutils-uclibc-210-cflags.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://plt32trunc.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -d ${D}${includedir}
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/binutils/binutils_2.14.90.0.7.bb b/packages/binutils/binutils_2.14.90.0.7.bb
index e69de29bb2..8b431732de 100644
--- a/packages/binutils/binutils_2.14.90.0.7.bb
+++ b/packages/binutils/binutils_2.14.90.0.7.bb
@@ -0,0 +1,126 @@
+SECTION = "devel"
+inherit autotools gettext
+
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r3"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-uclibc-001-debian.patch;patch=1 \
+     file://binutils-uclibc-100-conf.patch;patch=1 \
+     file://binutils-uclibc-200-build_modules.patch;patch=1 \
+     file://binutils-uclibc-210-cflags.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://plt32trunc.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -d ${D}${includedir}
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/binutils/binutils_2.15.90.0.3.bb b/packages/binutils/binutils_2.15.90.0.3.bb
index e69de29bb2..38d760d431 100644
--- a/packages/binutils/binutils_2.15.90.0.3.bb
+++ b/packages/binutils/binutils_2.15.90.0.3.bb
@@ -0,0 +1,124 @@
+SECTION = "devel"
+inherit autotools gettext
+
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r3"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-100-conf.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
+     file://plt32trunc.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -d ${D}${includedir}
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/binutils/binutils_2.15.91.0.1.bb b/packages/binutils/binutils_2.15.91.0.1.bb
index e69de29bb2..0257b76fb7 100644
--- a/packages/binutils/binutils_2.15.91.0.1.bb
+++ b/packages/binutils/binutils_2.15.91.0.1.bb
@@ -0,0 +1,123 @@
+SECTION = "devel"
+inherit autotools gettext
+
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r3"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -d ${D}${includedir}
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/binutils/binutils_2.15.91.0.2.bb b/packages/binutils/binutils_2.15.91.0.2.bb
index e69de29bb2..588d529866 100644
--- a/packages/binutils/binutils_2.15.91.0.2.bb
+++ b/packages/binutils/binutils_2.15.91.0.2.bb
@@ -0,0 +1,125 @@
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+SECTION = "devel"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r5"
+
+inherit autotools gettext
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
+     file://600-arm-textrel.patch;patch=1 \
+     file://sec_link_duplicates_same_contents.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -d ${D}${includedir}
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb
index e69de29bb2..f8d39b1720 100644
--- a/packages/binutils/binutils_2.15.94.0.1.bb
+++ b/packages/binutils/binutils_2.15.94.0.1.bb
@@ -0,0 +1,123 @@
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+SECTION = "devel"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+PR = "r0"
+
+inherit autotools gettext
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = \
+    "http://ftp.kernel.org/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1"
+
+S = "${WORKDIR}/binutils-${PV}"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -d ${D}${includedir}
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/binutils/binutils_cvs.bb b/packages/binutils/binutils_cvs.bb
index e69de29bb2..f295795554 100644
--- a/packages/binutils/binutils_cvs.bb
+++ b/packages/binutils/binutils_cvs.bb
@@ -0,0 +1,122 @@
+SECTION = "devel"
+inherit autotools gettext
+
+DESCRIPTION = "A GNU collection of binary utilities"
+HOMEPAGE = "http://www.gnu.org/software/binutils/"
+LICENSE = "GPL"
+MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs"
+PV = "0.0cvs${CVSDATE}"
+PR = "r2"
+
+PACKAGES = "${PN} ${PN}-dev ${PN}-doc ${PN}-symlinks"
+
+FILES_${PN} = " \
+	${bindir}/${TARGET_PREFIX}* \
+	${libdir}/lib*-*.so \
+	${prefix}/${TARGET_SYS}/bin/*"
+
+FILES_${PN}-dev = " \
+	${includedir} \
+	${libdir}/*.a \
+	${libdir}/*.la \
+	${libdir}/libbfd.so \
+	${libdir}/libopcodes.so"
+
+FILES_${PN}-symlinks = " \
+	${bindir}/addr2line \
+	${bindir}/ar \
+	${bindir}/as \
+	${bindir}/c++filt \
+	${bindir}/gprof \
+	${bindir}/ld \
+	${bindir}/nm \
+	${bindir}/objcopy \
+	${bindir}/objdump \
+	${bindir}/ranlib \
+	${bindir}/readelf \
+	${bindir}/size \
+	${bindir}/strings \
+	${bindir}/strip"
+
+SRC_URI = "cvs://anoncvs:anoncvs@sources.redhat.com/cvs/src;module=binutils;method=pserver;localdir=src \
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
+     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1"
+
+S = "${WORKDIR}/src"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-sysroot=${prefix} \
+		--program-prefix=${TARGET_PREFIX} \
+		--enable-shared"
+
+# This is necessary due to a bug in the binutils Makefiles
+EXTRA_OEMAKE = "configure-build-libiberty all"
+
+export AR = "${HOST_PREFIX}ar"
+export AS = "${HOST_PREFIX}as"
+export LD = "${HOST_PREFIX}ld"
+export NM = "${HOST_PREFIX}nm"
+export RANLIB = "${HOST_PREFIX}ranlib"
+export OBJCOPY = "${HOST_PREFIX}objcopy"
+export OBJDUMP = "${HOST_PREFIX}objdump"
+
+export AR_FOR_TARGET = "${TARGET_PREFIX}ar"
+export AS_FOR_TARGET = "${TARGET_PREFIX}as"
+export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
+export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
+export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
+
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+
+do_configure () {
+	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
+	oe_runconf
+}
+
+do_stage () {
+	oe_libinstall -so -a -C opcodes libopcodes ${STAGING_LIBDIR}/
+	oe_libinstall -a -C libiberty libiberty ${STAGING_LIBDIR}/
+	oe_libinstall -so -a -C bfd libbfd ${STAGING_LIBDIR}/
+	install -m 0644 ${S}/include/dis-asm.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/symcat.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/libiberty.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/ansidecl.h ${STAGING_INCDIR}/
+	install -m 0644 ${S}/include/bfdlink.h ${STAGING_INCDIR}/
+	install -m 0644 bfd/bfd.h ${STAGING_INCDIR}/
+}
+
+do_install () {
+	autotools_do_install
+
+	# We don't really need these, so we'll remove them...
+	rm -rf ${D}${libdir}/ldscripts
+
+	# Fix the /usr/${TARGET_SYS}/bin/* links
+	for l in ${D}${prefix}/${TARGET_SYS}/bin/*; do
+		rm -f $l
+		ln -sf `echo ${prefix}/${TARGET_SYS}/bin \
+			| tr -s / \
+			| sed -e 's,^/,,' -e 's,[^/]*,..,g'`${bindir}/${TARGET_PREFIX}`basename $l` $l
+	done
+
+	# Install the libiberty header
+	install -m 644 ${S}/include/ansidecl.h ${D}${includedir}
+	install -m 644 ${S}/include/libiberty.h ${D}${includedir}
+
+	cd ${D}${bindir}
+
+	# Symlinks for ease of running these on the native target
+	for p in ${TARGET_SYS}-* ; do
+		ln -sf $p `echo $p | sed -e s,${TARGET_SYS}-,,`
+	done
+}
diff --git a/packages/bitchx/bitchx_1.1.bb b/packages/bitchx/bitchx_1.1.bb
index e69de29bb2..843adacfe6 100644
--- a/packages/bitchx/bitchx_1.1.bb
+++ b/packages/bitchx/bitchx_1.1.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "BitchX is a IRC client"
+SECTION = "console/network"
+
+LICENSE = "BSD"
+
+SRC_URI = "http://www.bitchx.org/files/source/ircii-pana-${PV}-final.tar.gz \
+	   file://gcc34.patch;patch=1"
+S = "${WORKDIR}/BitchX"
+
+inherit autotools
+
+do_configure() {
+        gnu-configize
+        oe_runconf
+}
+
+do_install() {
+	oe_runmake install \
+                    prefix=${D}${prefix} \
+                    exec_prefix=${D}${exec_prefix} \
+                    bindir=${D}${bindir} \
+                    sbindir=${D}${sbindir} \
+                    libexecdir=${D}${libexecdir} \
+                    datadir=${D}${datadir} \
+                    sysconfdir=${D}${sysconfdir} \
+                    sharedstatedir=${D}${sharedstatedir} \
+                    localstatedir=${D}${localstatedir} \
+                    libdir=${D}${libdir} \
+                    includedir=${D}${includedir} \
+                    oldincludedir=${D}${oldincludedir} \
+                    infodir=${D}${infodir} \
+                    mandir=${D}${mandir}
+	ln -sf ./BitchX-1.1-final ${D}${bindir}/BitchX
+}
+
diff --git a/packages/bluez-utils/bluez-utils-common_2.10.inc b/packages/bluez-utils/bluez-utils-common_2.10.inc
index f1774a236b..902189d96e 100644
--- a/packages/bluez-utils/bluez-utils-common_2.10.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.10.inc
@@ -13,13 +13,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
-	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
-	mv ${D}${bindir}/* ${D}/${base_bindir}/
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
-	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
index 48f05d029c..65676585e5 100644
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.11.inc
@@ -13,13 +13,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
-	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
-	mv ${D}${bindir}/* ${D}/${base_bindir}/
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
-	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.13.inc b/packages/bluez-utils/bluez-utils-common_2.13.inc
index 361903bab0..8c57742637 100644
--- a/packages/bluez-utils/bluez-utils-common_2.13.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.13.inc
@@ -17,13 +17,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
-	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
-	mv ${D}${bindir}/* ${D}/${base_bindir}/
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
-	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/bluez-utils/bluez-utils-common_2.14.inc b/packages/bluez-utils/bluez-utils-common_2.14.inc
index fae2efd3fa..6ab6d0ccd9 100644
--- a/packages/bluez-utils/bluez-utils-common_2.14.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.14.inc
@@ -17,13 +17,13 @@ S = "${WORKDIR}/bluez-utils-${PV}"
 EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
 
 do_install_append() {
-	install -d ${D}/${base_sbindir} ${D}/${base_bindir}/
-	mv ${D}${sbindir}/* ${D}/${base_sbindir}/
-	mv ${D}${bindir}/* ${D}/${base_bindir}/
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	mv ${D}${sbindir}/* ${D}${base_sbindir}/
+	mv ${D}${bindir}/* ${D}${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
-	chmod u+s ${D}/${base_sbindir}/hciattach ${D}/${base_sbindir}/hciconfig
-	chmod 755 ${D}/${sysconfdir}/pcmcia/bluetooth
-	install -m 0644 ${WORKDIR}/hcid.conf ${D}/${sysconfdir}/bluetooth/
+	chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig
+	chmod 755 ${D}${sysconfdir}/pcmcia/bluetooth
+	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
 }
 
 inherit autotools update-rc.d
diff --git a/packages/boa/boa_0.94.13.bb b/packages/boa/boa_0.94.13.bb
index e69de29bb2..e88ded7df5 100644
--- a/packages/boa/boa_0.94.13.bb
+++ b/packages/boa/boa_0.94.13.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Lightweight and High Performance WebServer"
+SECTION = "console/network"
+RPROVIDES = "httpd"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+DEPENDS = "mime-support"
+RDEPENDS = "mime-support"
+
+SRC_URI = "http://www.boa.org/boa-${PV}.tar.gz \
+           file://debian-patch.diff;patch=1;pnum=2 \
+           file://boa.conf \
+           file://boa.init"
+S = "${WORKDIR}/boa-${PV}/src"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "boa"
+INITSCRIPT_PARAMS = "defaults 20"
+
+CFLAGS_append = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+#CFLAGS_append = " -DSERVER_ROOT=..."
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -d ${D}${libdir}/${PN}
+	install -m 0755 boa 			${D}${sbindir}
+	install -m 0755 boa_indexer 		${D}${libdir}/${PN}
+
+	install -d ${D}${sysconfdir}/${PN}
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0640 ${WORKDIR}/boa.conf 	${D}${sysconfdir}/${PN}
+	install -m 0755 ${WORKDIR}/boa.init	${D}${sysconfdir}/init.d/boa
+}
diff --git a/packages/brickout/brickout_2002.06.09.bb b/packages/brickout/brickout_2002.06.09.bb
index e69de29bb2..c3d1da6712 100644
--- a/packages/brickout/brickout_2002.06.09.bb
+++ b/packages/brickout/brickout_2002.06.09.bb
@@ -0,0 +1,41 @@
+DESCRIPTION = "Clone of the classic arcade game Asteroids for Qt/Embedded based palmtop environments w/ SDL"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "libsdl-qpe libsdl-mixer libsdl-image"
+PR = "r4"
+
+SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/agenda/brickout/src/brickout-${PV}.tar.gz \
+           file://directories.patch;patch=1"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer LIBS+=-lSDLmain \
+			LIBS+=-lSDL_image LIBS+=-lpthread TARGET=brickout DEFINES+=USE_SDL "
+
+do_configure_prepend() {
+        qmake -project -o brickout.pro
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Games \
+		   ${D}${palmtopdir}/pics \
+		   ${D}${palmtopdir}/share/brickout/sounds \
+		   ${D}${palmtopdir}/share/brickout/music \
+		   ${D}${palmtopdir}/share/brickout/images
+        install -D -m 0755 brickout ${D}${palmtopdir}/bin/brickout
+	install -D -m 0644 brickout.png ${D}${palmtopdir}/pics/brickout.png
+
+        cp -a sounds/* ${D}${palmtopdir}/share/brickout/sounds/
+        cp -a music/* ${D}${palmtopdir}/share/brickout/music/
+        cp -a images-sdl/* ${D}${palmtopdir}/share/brickout/images/
+
+	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/brickout.desktop
+	echo "Comment=Arkanoid game" >>${D}${palmtopdir}/apps/Games/brickout.desktop
+	echo "Exec=brickout" >>${D}${palmtopdir}/apps/Games/brickout.desktop
+	echo "Icon=brickout" >>${D}${palmtopdir}/apps/Games/brickout.desktop
+	echo "Type=Application" >>${D}${palmtopdir}/apps/Games/brickout.desktop
+	echo "Name=Brickout" >>${D}${palmtopdir}/apps/Games/brickout.desktop
+}
diff --git a/packages/bt950-cs/bt950-cs_0.1.bb b/packages/bt950-cs/bt950-cs_0.1.bb
index 9da0752656..e32db47b6d 100644
--- a/packages/bt950-cs/bt950-cs_0.1.bb
+++ b/packages/bt950-cs/bt950-cs_0.1.bb
@@ -16,10 +16,10 @@ FILES_kernel-module-bt950-cs = "/etc/pcmcia/bt950.conf /lib/modules/${KERNEL_VER
 inherit module
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/ \
-				${D}/${sysconfdir}/pcmcia/
-	install -m 0644 bt950_cs.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/
-	install -m 0644 bt950.conf ${D}/${sysconfdir}/pcmcia/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/ \
+				${D}${sysconfdir}/pcmcia/
+	install -m 0644 bt950_cs.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/bluetooth/
+	install -m 0644 bt950.conf ${D}${sysconfdir}/pcmcia/
 }
 
 pkg_postinst() {
diff --git a/packages/btxml/btxml.bb b/packages/btxml/btxml.bb
index ee8e38a0e6..b48ebb79f6 100644
--- a/packages/btxml/btxml.bb
+++ b/packages/btxml/btxml.bb
@@ -14,6 +14,6 @@ do_compile() {
 }
 
 do_install() {
-    install -d ${D}/${bindir}/
-    install -m 0775 btxml ${D}/${bindir}/
+    install -d ${D}${bindir}/
+    install -m 0775 btxml ${D}${bindir}/
 }
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb
index 89b3206cb9..c3197fba29 100644
--- a/packages/busybox/busybox_1.00.bb
+++ b/packages/busybox/busybox_1.00.bb
@@ -57,32 +57,32 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/init.d
 	oe_runmake 'PREFIX=${D}' install
-	install -m 0755 ${WORKDIR}/syslog ${D}/${sysconfdir}/init.d/
-	install -m 644 ${WORKDIR}/syslog.conf ${D}/${sysconfdir}/
+	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/
+	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
 	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/busybox-cron ${D}/${sysconfdir}/init.d/
+		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/busybox-httpd ${D}/${sysconfdir}/init.d/
+		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}/${sysconfdir}/init.d/
+		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then 
-		install -m 0755 ${WORKDIR}/hwclock.sh ${D}/${sysconfdir}/init.d/
+		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then 
-		install -d ${D}/${sysconfdir}/udhcpc.d
+		install -d ${D}${sysconfdir}/udhcpc.d
 		install -d ${D}${datadir}/udhcpc
-		install -m 0755 ${S}/examples/udhcp/simple.script ${D}/${sysconfdir}/udhcpc.d/50default
+		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 	fi
-	rm ${D}/${base_bindir}/mount
-	install -m 0755 ${WORKDIR}/mount.busybox ${D}/${base_bindir}/
-	rm ${D}/${base_bindir}/umount
-	install -m 0755 ${WORKDIR}/umount.busybox ${D}/${base_bindir}/
+	rm ${D}${base_bindir}/mount
+	install -m 0755 ${WORKDIR}/mount.busybox ${D}${base_bindir}/
+	rm ${D}${base_bindir}/umount
+	install -m 0755 ${WORKDIR}/umount.busybox ${D}${base_bindir}/
 }
 
 pkg_postinst () {
diff --git a/packages/bzip2/bzip2_1.0.2.bb b/packages/bzip2/bzip2_1.0.2.bb
index e69de29bb2..0233f0f235 100644
--- a/packages/bzip2/bzip2_1.0.2.bb
+++ b/packages/bzip2/bzip2_1.0.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Very high-quality data compression program."
+SECTION = "console/utils"
+
+LICENSE = "bzip2"
+SRC_URI = "ftp://sources.redhat.com/pub/bzip2/v102/bzip2-${PV}.tar.gz \
+	   file://installpaths.patch;patch=1"
+
+CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce -D_FILE_OFFSET_BITS=64"
+
+do_compile () {
+	oe_runmake -f Makefile-libbz2_so
+	ln -sf libbz2.so.1.0.2 libbz2.so.1.0
+	ln -sf libbz2.so.1.0.2 libbz2.so.1
+	ln -sf libbz2.so.1.0.2 libbz2.so
+	oe_runmake libbz2.a bzip2 bzip2recover
+}
+
+do_stage () {
+	install -m 0644 bzlib.h ${STAGING_INCDIR}/
+	oe_libinstall -a -so libbz2 ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+	oe_libinstall -a -so libbz2 ${D}${libdir}
+}
diff --git a/packages/camera-assistant/camera-assistant_0.2.0.bb b/packages/camera-assistant/camera-assistant_0.2.0.bb
index e69de29bb2..db117e102c 100644
--- a/packages/camera-assistant/camera-assistant_0.2.0.bb
+++ b/packages/camera-assistant/camera-assistant_0.2.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Camera Assistant aims to be an allround calculator for photographers & Cinematographers. \
+It currently has the following features: \
+  \
+  * Depth of field calculator.  \
+  * Inverse Depth of field calculator. (Calculate what aperture you need for a given depth/distance & lens) \
+  * Field of view calculator.  \
+  * Variants of the above, calculate distance to object or lens for a given field of view.  \
+  * Database of TV cameras, Motion picture cameras and Still photography cameras."
+SECTION = "opie/applications"
+
+
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "zaurus@bredband.net"
+HOMEPAGE = "http://cameraassistant.sourceforge.net/"
+
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/cameraassistant/camera-assistant_0.2.0.tar.gz \
+	  file://g++-3.4-compile-fixes.patch;patch=1 \
+	  file://ca.desktop \
+	  file://ca.png "
+	  
+
+S = "${WORKDIR}/CameraAssistant"
+
+APPNAME = "ca"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}" 
+
+do_install() {
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/ca.png ${D}${palmtopdir}/pics/${APPNAME}/
+}
+
+
+inherit opie
+
diff --git a/packages/ccdv/ccdv.bb b/packages/ccdv/ccdv.bb
index e69de29bb2..2adf9f1a35 100644
--- a/packages/ccdv/ccdv.bb
+++ b/packages/ccdv/ccdv.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "ccdv is a tool to reduce the deluge of make output to make \
+finding actual problems easier."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPL"
+SRC_URI = "http://openembedded.org/dl/ccdv.c"
+S = "${WORKDIR}/openembedded.org"
+
+do_compile () {
+	${CC} ${CFLAGS} ${LDFLAGS} ccdv.c -o ccdv
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 ccdv ${D}${bindir}/
+}
diff --git a/packages/cdparanoia/cdparanoia_9.8alpha.bb b/packages/cdparanoia/cdparanoia_9.8alpha.bb
index e69de29bb2..2c81cfb61d 100644
--- a/packages/cdparanoia/cdparanoia_9.8alpha.bb
+++ b/packages/cdparanoia/cdparanoia_9.8alpha.bb
@@ -0,0 +1,27 @@
+# cdparanoia OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+LICENSE="GPL"
+
+SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz \
+	 file://fixes.patch;patch=1"
+
+S="${WORKDIR}/cdparanoia-III-alpha9.8"
+
+inherit autotools
+
+do_install() {
+	oe_runmake BINDIR="${D}usr/bin" MANDIR="${D}usr/share/man/" \
+		   INCLUDEDIR="${D}usr/include/" LIBDIR="${D}usr/lib" install 
+}
+
+do_stage() {
+	install -d ${STAGING_INCDIR} ${STAGING_LIBDIR}
+	
+	install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR}
+	install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR}
+
+	oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR}
+	oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR}
+}
diff --git a/packages/cflow/cflow_2.0.bb b/packages/cflow/cflow_2.0.bb
index e69de29bb2..918c1ed0ab 100644
--- a/packages/cflow/cflow_2.0.bb
+++ b/packages/cflow/cflow_2.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Utility for viewing function call flow."
+SECTION = "devel"
+SRC_URI = "http://www.ibiblio.org/pub/Linux/devel/lang/c/cflow-${PV}.tar.gz \
+	   file://compile.patch;patch=1"
+LICENSE = "PD"
+
+do_install () {
+	install -d ${D}${bindir}
+	oe_runmake 'PREFIX=${D}' 'BINDIR=${D}${bindir}' install
+}
diff --git a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
index c221552747..367063870e 100644
--- a/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
+++ b/packages/changedfiles/changedfiles-modules_1.0-rc1.bb
@@ -23,6 +23,6 @@ rm -f /dev/changedfiles
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
-	install -m 0644 changedfiles.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
+	install -m 0644 changedfiles.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/changedfiles/
 }
diff --git a/packages/chillispot/chillispot_0.98.bb b/packages/chillispot/chillispot_0.98.bb
index c36d45606f..f3ebc90ee5 100644
--- a/packages/chillispot/chillispot_0.98.bb
+++ b/packages/chillispot/chillispot_0.98.bb
@@ -11,9 +11,9 @@ RRECOMMENDS = "kernel-module-tun"
 inherit autotools
 
 do_install_append() {
-	install -d ${D}/${sysconfdir} ${D}/${sysconfdir}/init.d
-	install ${S}/doc/chilli.conf ${D}/${sysconfdir}
-	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/chillispot
+	install -d ${D}${sysconfdir} ${D}${sysconfdir}/init.d
+	install ${S}/doc/chilli.conf ${D}${sysconfdir}
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/chillispot
 }
 
 CONFFILES_${PN}_nylon = "${sysconfdir}/chilli.conf"
diff --git a/packages/chkhinge/chkhinge_20040706.bb b/packages/chkhinge/chkhinge_20040706.bb
index 2b3b55f0eb..4159b487ed 100644
--- a/packages/chkhinge/chkhinge_20040706.bb
+++ b/packages/chkhinge/chkhinge_20040706.bb
@@ -11,7 +11,7 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${base_bindir}
-	install -m 4755 chkhinge ${D}/${base_bindir}/
+	install -d ${D}${base_bindir}
+	install -m 4755 chkhinge ${D}${base_bindir}/
 }
 
diff --git a/packages/ckermit/ckermit_211.bb b/packages/ckermit/ckermit_211.bb
index e69de29bb2..9bf4c2859e 100644
--- a/packages/ckermit/ckermit_211.bb
+++ b/packages/ckermit/ckermit_211.bb
@@ -0,0 +1,92 @@
+DESCRIPTION = "C-Kermit is a combined serial and network communication \
+software package offering a consistent, medium-independent, \
+cross-platform approach to connection establishment, terminal \
+sessions, file transfer, character-set translation, and automation \
+of communication tasks."
+LICENSE = "Kermit"
+MAINTAINER = "Holger Schurig"
+HOMEPAGE = "http://www.columbia.edu/kermit/"
+SECTION = "console/network"
+SRC_URI = "ftp://kermit.columbia.edu/kermit/archives/cku${PV}.tar.gz"
+
+#
+# From http://www.columbia.edu/kermit/ck80.html#license
+#
+#	"Free Unix Distributions: C-Kermit may be included in "free Unix"
+#	distributions such as GNU/Linux, FreeBSD, NetBSD, and OpenBSD. See the
+#	license for details."
+#
+# A distributions based on OpenEmbedded (OpenZaurus, OpenSimpad etc) is a
+# "free Unix" distribution, therefore we can include the package.
+#
+#
+# Please note that the license is not 100% because it limits what you can
+# do:
+#
+#	"The C-Kermit source code may not be changed without the consent of
+#	the Kermit Project, which will not be unreasonably withheld (this is
+#	simply a matter of keeping a consistent and supportable code base)."
+#
+# But we don't change the source code in any way, so we comply to the license.
+# So, essentially for us C-Kermit is free as in beer, but not in freedom.
+#
+# That is true for other distros. C-Kkermit is distributed by:
+#
+#	Debian:	http://packages.debian.org/unstable/comm/ckermit
+#	Gentoo: http://mirror.pudas.net/gentoo-x86-portage/app-misc/ckermit/ckermit-8.0.211.ebuild
+#	SuSE: http://www.novell.com/products/linuxpackages/enterpriseserver/s390/ckermit.html
+#	Fedora Core: http://cvs.fedora.redhat.com/viewcvs/devel/ckermit/
+#	PLD: http://cvs.pld.org.pl/SPECS/ckermit.spec
+#
+# and, according to the Kermit website http://www.columbia.edu/kermit/ck80.html also with
+#
+#	Red Hat 9 (on earlier Red Hat's it was on the PowerTools CD)
+#	HP-UX
+#	FreeBSD
+#	NetBSD
+#	OpenBSD
+#
+# ... and probably other distro's as well.
+#
+
+
+
+python do_unpack () {
+	bb.mkdirhier(bb.data.expand('${S}', d))
+	bb.build.exec_func('base_do_unpack', d, [ '${S}' ])
+}
+
+
+
+export CC2 = "${CC}"
+export BINDIR = "${bindir}"
+export MANDIR = "${mandir}/man1"
+export INFODIR = "${infodir}"
+
+do_compile () {
+	# The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
+	# so we build wart manually. Note that you need a ckwart.o with the proper
+	# timestamp to make this hack work:
+	${BUILD_CC} -c ckwart.c
+	${BUILD_CC} -o wart ckwart.o
+	./wart ckcpro.w ckcpro.c
+
+	# read ${S}/ckccfg.txt to understand this :-)
+	oe_runmake wermit CFLAGS="${CFLAGS} -DLINUX -DCK_POSIX_SIG \
+		-DNOTCPOPTS -DLINUXFSSTND -DNOCOTFMC -DPOSIX -DUSE_STRERROR \
+		-DNOSYSLOG -DHAVE_PTMX -DNO_DNS_SRV -DNOGFTIMER \
+		-DNOB_50 -DNOB_75 -DNOB_134 -DNOB_150 -DNOB_200 \
+		-DNOB_1800 -DNOB_3600 -DNOB_7200 -DNOB_76K -DNOB_230K \
+		-DNOB_460K -DNOB_921K \
+		-DNOAPC -DNOCSETS -DNONET -DNOUNICODE -DNOHELP -DNODEBUG \
+		-DNOFRILLS -DNOFTP -DNODIAL -DNOPUSH -DNOIKSD -DNOHTTP -DNOFLOAT \
+		-DNOSERVER -DNOSEXP -DNORLOGIN -DNOOLDMODEMS -DNOSSH -DNOLISTEN \
+		-DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
+		-DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
+		-DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI"
+}
+
+do_install () {
+	install -d ${D}${BINDIR} ${D}${MANDIR} ${D}${INFODIR}
+	oe_runmake 'DESTDIR=${D}' 'MANDIR=${D}${MANDIR}' install
+}
diff --git a/packages/comprec/comprec_0.01.bb b/packages/comprec/comprec_0.01.bb
index e69de29bb2..3b0e858385 100644
--- a/packages/comprec/comprec_0.01.bb
+++ b/packages/comprec/comprec_0.01.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "An MP3 command line encoder"
+HOMEPAGE = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/index.html"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-${PV}.tar.gz \
+	   file://makefile.patch;patch=1"
+
+export AS = "${TARGET_PREFIX}as"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 shine ${D}${bindir}/shine
+}
diff --git a/packages/comprec/comprec_0.02.bb b/packages/comprec/comprec_0.02.bb
index e69de29bb2..3b0e858385 100644
--- a/packages/comprec/comprec_0.02.bb
+++ b/packages/comprec/comprec_0.02.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "An MP3 command line encoder"
+HOMEPAGE = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/index.html"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://unimut.fsk.uni-heidelberg.de/demi/comprec/comprec-${PV}.tar.gz \
+	   file://makefile.patch;patch=1"
+
+export AS = "${TARGET_PREFIX}as"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 shine ${D}${bindir}/shine
+}
diff --git a/packages/cpuspeed/cpuspeed_1.1.bb b/packages/cpuspeed/cpuspeed_1.1.bb
index f27df18992..ca2150daef 100644
--- a/packages/cpuspeed/cpuspeed_1.1.bb
+++ b/packages/cpuspeed/cpuspeed_1.1.bb
@@ -13,7 +13,7 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${base_sbindir}
-	install -m 0755 cpuspeed ${D}/${base_sbindir}/cpuspeed
+	install -d ${D}${base_sbindir}
+	install -m 0755 cpuspeed ${D}${base_sbindir}/cpuspeed
 }
 
diff --git a/packages/cron/cron_3.0pl1.bb b/packages/cron/cron_3.0pl1.bb
index e69de29bb2..bca3f89180 100644
--- a/packages/cron/cron_3.0pl1.bb
+++ b/packages/cron/cron_3.0pl1.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+DESCRIPTION = "Vixie cron."
+LICENSE = "cron"
+
+SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/cron${PV}.tar.gz \
+	   file://nonrootinstall.patch;patch=1 \
+	   file://time.patch;patch=1"
+S = "${WORKDIR}/cron${PV}"
+
+CFLAGS_append = " -I${S} -DSYS_TIME_H=0"
+do_install () {
+	install -d ${D}${sbindir} ${D}${bindir}
+	oe_runmake 'DESTDIR=${D}' install
+	chmod ugo+rx ${D}${sbindir}/* ${D}${bindir}/*
+}
diff --git a/packages/cumulus/cumulus_1.2.bb b/packages/cumulus/cumulus_1.2.bb
index e69de29bb2..01af252e44 100644
--- a/packages/cumulus/cumulus_1.2.bb
+++ b/packages/cumulus/cumulus_1.2.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "A flightcomputer application for Qt/E based Palmtop Environments"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+APPTYPE = "binary"
+APPNAME = "cumulus"
+APPDESKTOP = "${S}"
+PR = "r0"
+
+SRC_URI = "http://cumulus.kflog.org/download/src/cumulus-${PV}.src.tar.bz2 \
+           file://qtooltip.patch;patch=1"
+S = "${WORKDIR}/cumulus-arm-${PV}/cumulus"
+
+inherit opie
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=-I."
+
+#
+# nasty hack since cumulus doesn't obey the qmake standard which requires just one .pro file per directory
+#
+do_compile() {
+	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} cumulus.pro
+	oe_runmake
+	qmake -makefile -spec ${QMAKESPEC} -after ${EXTRA_QMAKEVARS_POST} gpsClient.pro 
+	oe_runmake
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/mapicons
+        install -m 0644 ../cumulus.png ${D}${palmtopdir}/pics/cumulus.png
+        cp -a map-icons/* ${D}${palmtopdir}/pics/mapicons
+
+	install -m 0755 gpsClient ${D}${palmtopdir}/bin/
+}
diff --git a/packages/cumulus/cumulus_cvs.bb b/packages/cumulus/cumulus_cvs.bb
index 0677d0769b..d6f8e51064 100644
--- a/packages/cumulus/cumulus_cvs.bb
+++ b/packages/cumulus/cumulus_cvs.bb
@@ -29,15 +29,15 @@ do_compile() {
 }
 
 do_install() {
-        install -d ${D}/${palmtopdir}/pics/mapicons \
-                   ${D}/${palmtopdir}/pics/mapicons/small \
-                   ${D}/${palmtopdir}/pics/mapicons/windarrows
-        install -m 0644 ../cumulus.png ${D}/${palmtopdir}/pics/cumulus.png
-        install -m 0644 map-icons/*.png ${D}/${palmtopdir}/pics/mapicons
-        install -m 0644 map-icons/*.xpm ${D}/${palmtopdir}/pics/mapicons
-        install -m 0644 map-icons/small/*.png ${D}/${palmtopdir}/pics/mapicons/small
-        install -m 0644 map-icons/small/*.xpm ${D}/${palmtopdir}/pics/mapicons/small
-        install -m 0644 map-icons/windarrows/*.png ${D}/${palmtopdir}/pics/mapicons/windarrows
+        install -d ${D}${palmtopdir}/pics/mapicons \
+                   ${D}${palmtopdir}/pics/mapicons/small \
+                   ${D}${palmtopdir}/pics/mapicons/windarrows
+        install -m 0644 ../cumulus.png ${D}${palmtopdir}/pics/cumulus.png
+        install -m 0644 map-icons/*.png ${D}${palmtopdir}/pics/mapicons
+        install -m 0644 map-icons/*.xpm ${D}${palmtopdir}/pics/mapicons
+        install -m 0644 map-icons/small/*.png ${D}${palmtopdir}/pics/mapicons/small
+        install -m 0644 map-icons/small/*.xpm ${D}${palmtopdir}/pics/mapicons/small
+        install -m 0644 map-icons/windarrows/*.png ${D}${palmtopdir}/pics/mapicons/windarrows
 
-	install -m 0755 gpsClient ${D}/${palmtopdir}/bin/
+	install -m 0755 gpsClient ${D}${palmtopdir}/bin/
 }
diff --git a/packages/db/db3_3.2.9.bb b/packages/db/db3_3.2.9.bb
index e69de29bb2..4c78279745 100644
--- a/packages/db/db3_3.2.9.bb
+++ b/packages/db/db3_3.2.9.bb
@@ -0,0 +1,80 @@
+SECTION = "libs"
+DESCRIPTION = "Berkeley DB v3."
+HOMEPAGE = "http://www.sleepycat.com"
+LICENSE = "BSD Sleepycat"
+PR = "r1"
+
+SRC_URI = "ftp://sleepycat1.inetu.net/releases/db-${PV}.tar.gz \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/db-${PV}/dist"
+B = "${WORKDIR}/db-${PV}/build_unix"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --enable-compat185 --enable-static"
+EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}` cr' 'chmod=`which chmod`' \
+		'cp=`which cp`' 'ln=`which ln`' 'mkdir=`which mkdir`' 'ranlib=`which ${RANLIB}`' \
+		'rm=`which rm`' 'strip=`which ${STRIP}`'"
+
+PACKAGES = "${PN} ${PN}-bin ${PN}-dev ${PN}-doc ${PN}-locale"
+
+FILES_${PN} = "${libdir}/libdb-3.2*so*"
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN}-dev = "${includedir} ${libdir}/libdb.so ${libdir}/libdb.a \
+		   ${libdir}/libdb-3.so ${libdir}/libdb.la ${libdir}/libdb-3.2.a \
+		   ${libdir}/libdb-3.2.la"
+
+do_configure_prepend () {
+	set -e
+	(
+		cd ${S}
+		. ./RELEASE
+		(echo "AC_DEFUN(AM_VERSION_SET, [" &&
+		echo "AC_SUBST(DB_VERSION_MAJOR)" &&
+		echo "AC_DEFINE(DB_VERSION_MAJOR, [$DB_VERSION_MAJOR])" &&
+		echo "DB_VERSION_MAJOR=$DB_VERSION_MAJOR" &&
+		echo "AC_SUBST(DB_VERSION_MINOR)" &&
+		echo "AC_DEFINE(DB_VERSION_MINOR, [$DB_VERSION_MINOR])" &&
+		echo "DB_VERSION_MINOR=$DB_VERSION_MINOR" &&
+		echo "AC_SUBST(DB_VERSION_PATCH)" &&
+		echo "AC_DEFINE(DB_VERSION_PATCH, [$DB_VERSION_PATCH])" &&
+		echo "DB_VERSION_PATCH=$DB_VERSION_PATCH" &&
+		echo "AC_SUBST(DB_VERSION_STRING)" &&
+		echo "AC_DEFINE(DB_VERSION_STRING, [$DB_VERSION_STRING])" &&
+		echo "DB_VERSION_STRING=\"\\\"\$DB_VERSION_STRING\\\"\"" &&
+		echo "])dnl") > acinclude.m4
+	)
+}
+
+do_configure () {
+	rm -f ${S}/configure
+	autotools_do_configure
+}
+
+do_compile () {
+	oe_runmake
+}
+
+do_stage () {
+	install -m 0644 db_185.h ../include/db_cxx.h db.h ${STAGING_INCDIR}/
+	oe_libinstall -so -a libdb-3.2 ${STAGING_LIBDIR}
+	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb.so
+	ln -sf libdb-3.2.a ${STAGING_LIBDIR}/libdb.a
+}
+
+do_install () {
+	oe_runmake \
+		prefix=${D}${prefix} \
+		exec_prefix=${D}${exec_prefix} \
+		bindir=${D}${bindir} \
+		includedir=${D}${includedir} \
+		libdir=${D}${libdir} \
+		docdir=${D}${docdir} \
+		install
+}
+
+python do_package() {
+	if bb.data.getVar('DEBIAN_NAMES', d, 1):
+		bb.data.setVar('PKG_${PN}', 'libdb3', d)
+	bb.build.exec_func('package_do_package', d)
+}
diff --git a/packages/dcron/dcron_2.3.3.bb b/packages/dcron/dcron_2.3.3.bb
index e69de29bb2..ed9f0ac9d4 100644
--- a/packages/dcron/dcron_2.3.3.bb
+++ b/packages/dcron/dcron_2.3.3.bb
@@ -0,0 +1,16 @@
+SECTION = "base"
+DESCRIPTION = "Dillon's Cron is a multi-user cron written from scratch, \
+similar to vixie-cron but with major differences."
+LICENSE = "GPL"
+
+SRC_URI = "http://ibiblio.org/pub/Linux/system/daemons/cron/dcron-${PV}.tar.gz \
+	   file://compile.patch;patch=1"
+
+do_install () {
+	install -d ${D}${bindir} ${D}${sbindir} \
+		   ${D}${mandir}/man1 ${D}${mandir}/man8
+	install -m 0755 crond ${D}${sbindir}/
+	install -m 4755 crontab ${D}${bindir}/
+	install crontab.1 ${D}${mandir}/man1
+	install crond.8 ${D}${mandir}/man8
+}
diff --git a/packages/ddclient/ddclient_3.6.3.bb b/packages/ddclient/ddclient_3.6.3.bb
index 21ab6527c5..acaf2c68a9 100644
--- a/packages/ddclient/ddclient_3.6.3.bb
+++ b/packages/ddclient/ddclient_3.6.3.bb
@@ -10,15 +10,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ddclient/ddclient-${PV}.tar.bz2 \
 RDEPENDS = "perl perl-module-strict perl-module-getopt-long perl-module-vars perl-module-warnings-register perl-module-warnings perl-module-carp perl-module-exporter perl-module-constant perl-module-exporter-heavy perl-module-sys-hostname perl-module-xsloader perl-module-autoloader perl-module-io-socket perl-module-io-handle perl-module-symbol perl-module-selectsaver perl-module-io perl-module-socket perl-module-errno perl-module-config perl-module-io-socket-inet perl-module-io-socket-unix perl-module-integer"
 
 do_install() {
-	install -d ${D}/${sbindir} ${D}/${sysconfdir} ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/ppp/ip-up.d/ install -d ${D}/${docdir}/ddclient
-	install -m 755 ${S}/ddclient ${D}/${sbindir}
-	install ${S}/sample-etc_ddclient.conf ${D}/${sysconfdir}/ddclient.conf
-	install -m 755 ${WORKDIR}/ip-up ${D}/${sysconfdir}/ppp/ip-up.d/ddclient
-	install -m 755 ${S}/sample-etc_rc.d_init.d_ddclient ${D}/${sysconfdir}/init.d/ddclient
-	install ${S}/README* ${D}/${docdir}/ddclient
-	install ${S}/COPY* ${D}/${docdir}/ddclient
-	install ${S}/sample* ${D}/${docdir}/ddclient
+	install -d ${D}${sbindir} ${D}${sysconfdir} ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/ppp/ip-up.d/ install -d ${D}${docdir}/ddclient
+	install -m 755 ${S}/ddclient ${D}${sbindir}
+	install ${S}/sample-etc_ddclient.conf ${D}${sysconfdir}/ddclient.conf
+	install -m 755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/ip-up.d/ddclient
+	install -m 755 ${S}/sample-etc_rc.d_init.d_ddclient ${D}${sysconfdir}/init.d/ddclient
+	install ${S}/README* ${D}${docdir}/ddclient
+	install ${S}/COPY* ${D}${docdir}/ddclient
+	install ${S}/sample* ${D}${docdir}/ddclient
 }
 
 CONFFILES_${PN}_nylon = "${sysconfdir}/ddclient.conf"
diff --git a/packages/devlabel/devlabel_0.45.01.bb b/packages/devlabel/devlabel_0.45.01.bb
index d401ce2b2e..d8e2c9b4ae 100644
--- a/packages/devlabel/devlabel_0.45.01.bb
+++ b/packages/devlabel/devlabel_0.45.01.bb
@@ -14,9 +14,9 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${base_sbindir} ${D}/${bindir} ${D}/${mandir}/man8 \
-		   ${D}/${sysconfdir}/sysconfig/devlabel.d
-	install -m 755 devlabel ${D}/${base_sbindir}/devlabel
+	install -d ${D}${base_sbindir} ${D}${bindir} ${D}${mandir}/man8 \
+		   ${D}${sysconfdir}/sysconfig/devlabel.d
+	install -m 755 devlabel ${D}${base_sbindir}/devlabel
 	install -m 755 scsi_unique_id ${D}${bindir}/
 	install -m 755 partition_uuid ${D}${bindir}/
 	install -m 644 devlabel.8.gz ${D}${mandir}/man8/
diff --git a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
index 6b61b8a1e3..399695aa31 100644
--- a/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
+++ b/packages/dhcp-forwarder/dhcp-forwarder_0.6.bb
@@ -19,9 +19,9 @@ INITSCRIPT_NAME="dhcp-forwarder"
 INITSCRIPT_PARAMS="defaults"
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/dhcp-forwarder
-	install -m 0644 ${WORKDIR}/dhcp-fwd.cfg ${D}/${sysconfdir}
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dhcp-forwarder
+	install -m 0644 ${WORKDIR}/dhcp-fwd.cfg ${D}${sysconfdir}
 }
 
 CONFFILES_${PN}_nylon = "${sysconfdir}/dhcp-fwd.cfg"
diff --git a/packages/dhcp/dhcp_3.0.1.bb b/packages/dhcp/dhcp_3.0.1.bb
index b7856a883a..b31c357fbd 100644
--- a/packages/dhcp/dhcp_3.0.1.bb
+++ b/packages/dhcp/dhcp_3.0.1.bb
@@ -24,15 +24,15 @@ do_compile() {
 
 do_install() {
 	make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/default
-	install -d ${D}/${sysconfdir}/dhcp
-	install -m 0755 ${WORKDIR}/init-relay ${D}/${sysconfdir}/init.d/dhcp-relay
-	install -m 0644 ${WORKDIR}/default-relay ${D}/${sysconfdir}/default/dhcp-relay
-	install -m 0755 ${WORKDIR}/init-server ${D}/${sysconfdir}/init.d/dhcp-server
-	install -m 0644 ${WORKDIR}/default-server ${D}/${sysconfdir}/default/dhcp-server
-	install -m 0644 ${WORKDIR}/dhclient.conf ${D}/${sysconfdir}/dhcp/dhclient.conf
-	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}/${sysconfdir}/dhcp/dhcpd.conf
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/default
+	install -d ${D}${sysconfdir}/dhcp
+	install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
+	install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
+	install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
+	install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
+	install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
+	install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
 }
 
 PACKAGES = "dhcp-server dhcp-client dhcp-relay dhcp-omshell dhcp-dev dhcp-doc"
diff --git a/packages/diethotplug/diethotplug_0.4.bb b/packages/diethotplug/diethotplug_0.4.bb
index e69de29bb2..ddb0dccf62 100644
--- a/packages/diethotplug/diethotplug_0.4.bb
+++ b/packages/diethotplug/diethotplug_0.4.bb
@@ -0,0 +1,22 @@
+SECTION = "base"
+LICENSE = "GPL"
+DESCRIPTION = "A small, C implementation of hotplug."
+
+SRC_URI = "http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/diethotplug-${PV}.tar.gz \
+           file://modules.usbmap \
+           file://modules.pcimap \
+           file://modules.ieee1394map"
+
+export KLIBC = ""
+
+do_compile () {
+	perl convert_usb.pl ${WORKDIR}/modules.usbmap > usb_modules.h
+	perl convert_pci.pl ${WORKDIR}/modules.pcimap > pci_modules.h
+	perl convert_ieee1394.pl ${WORKDIR}/modules.ieee1394map > ieee1394_modules.h
+	oe_runmake
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 hotplug ${D}${sbindir}/
+}
diff --git a/packages/dillo/dillo2_0.6.6.bb b/packages/dillo/dillo2_0.6.6.bb
index e69de29bb2..c4fff54e23 100644
--- a/packages/dillo/dillo2_0.6.6.bb
+++ b/packages/dillo/dillo2_0.6.6.bb
@@ -0,0 +1,29 @@
+SECTION = "x11/network"
+DESCRIPTION = "Lightweight gtk+2 browser."
+LICENSE = "GPL"
+DEPENDS = "gtk+"
+RDEPENDS = "gdk-pixbuf-loader-xpm"
+SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \
+         file://gtk2.patch;patch=1;pnum=1 \
+	 file://fix_about_syntax.patch;patch=1;pnum=1 \
+	 file://dillo.desktop \
+	 file://dillo.png \
+	 file://dillorc"
+
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+PRIORITY = "optional"
+
+S = ${WORKDIR}/dillo-${PV}/
+
+inherit autotools pkgconfig
+
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${datadir}/applications
+	install -d ${D}${datadir}/pixmaps
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/dillo.desktop ${D}${datadir}/applications/dillo.desktop
+	install -m 0644 ${WORKDIR}/dillo.png ${D}${datadir}/pixmaps/dillo.png
+	install -m 0755 ${S}/src/dillo ${D}${bindir}/dillo
+	install -m 0644 ${WORKDIR}/dillorc ${D}${sysconfdir}/dillorc
+}
diff --git a/packages/dnsmasq/dnsmasq_2.11.bb b/packages/dnsmasq/dnsmasq_2.11.bb
index e69de29bb2..7627ae3e09 100644
--- a/packages/dnsmasq/dnsmasq_2.11.bb
+++ b/packages/dnsmasq/dnsmasq_2.11.bb
@@ -0,0 +1,15 @@
+SECTION = "console/network"
+LICENSE = "GPL"
+DESCRIPTION = "Dnsmasq is a lightweight, easy to configure \
+DNS forwarder and DHCP server."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+
+SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/dnsmasq-${PV}.tar.gz"
+S = "${WORKDIR}/dnsmasq-${PV}"
+
+do_install () {
+	oe_runmake "PREFIX=${D}${prefix}" \
+		   "BINDIR=${D}${bindir}" \
+		   "MANDIR=${D}${mandir}" \
+		   install
+}
diff --git a/packages/dnsmasq/dnsmasq_2.15.bb b/packages/dnsmasq/dnsmasq_2.15.bb
index f349810eaa..348646e3b0 100644
--- a/packages/dnsmasq/dnsmasq_2.15.bb
+++ b/packages/dnsmasq/dnsmasq_2.15.bb
@@ -17,13 +17,13 @@ INITSCRIPT_NAME = "dnsmasq"
 INITSCRIPT_PARAMS = "defaults"
 
 do_install () {
-	oe_runmake "PREFIX=${D}/${prefix}" \
-		   "BINDIR=${D}/${bindir}" \
-		   "MANDIR=${D}/${mandir}" \
+	oe_runmake "PREFIX=${D}${prefix}" \
+		   "BINDIR=${D}${bindir}" \
+		   "MANDIR=${D}${mandir}" \
 		   install
-	install -d ${D}/${sysconfdir}/ ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/
-	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/dnsmasq
+	install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/dnsmasq.conf ${D}${sysconfdir}/
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq
 }
 
 CONFFILES_${PN}_nylon = "${sysconfdir}/dnsmasq.conf"
diff --git a/packages/dosfstools/dosfstools_2.10.bb b/packages/dosfstools/dosfstools_2.10.bb
index e69de29bb2..f558bbf669 100644
--- a/packages/dosfstools/dosfstools_2.10.bb
+++ b/packages/dosfstools/dosfstools_2.10.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "DOS FAT Filesystem Utilities"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
+       file://alignment_hack.patch;patch=1 \
+	   file://dosfstools-2.10-kernel-2.6.patch;patch=1"
+
+do_install () {
+	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
+		   "MANDIR=${D}${mandir}/man8" install
+}
diff --git a/packages/dri/drm-kernel_cvs.bb b/packages/dri/drm-kernel_cvs.bb
index d869e9979f..602163cb4a 100644
--- a/packages/dri/drm-kernel_cvs.bb
+++ b/packages/dri/drm-kernel_cvs.bb
@@ -14,9 +14,9 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drm
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/drm
 	cd linux
-	for i in *.ko; do install -m 0644 $i ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drm/; done
+	for i in *.ko; do install -m 0644 $i ${D}${base_libdir}/modules/${KERNEL_VERSION}/drm/; done
 }
 
 python populate_packages_prepend () {
diff --git a/packages/dropbear/dropbear_0.42.bb b/packages/dropbear/dropbear_0.42.bb
index e69de29bb2..ef76beb172 100644
--- a/packages/dropbear/dropbear_0.42.bb
+++ b/packages/dropbear/dropbear_0.42.bb
@@ -0,0 +1,63 @@
+SECTION = "console/network"
+DESCRIPTION = "Dropbear SSH Implementation"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+PR = "r4"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://allow-nopw.patch;patch=1 \
+	   file://multi-binary.patch;patch=1 \
+	   file://init"
+S = "${WORKDIR}/dropbear-${PV}"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = "-I. "
+LD = "${CC}"
+
+do_compile () {
+	oe_runmake dropbearmulti
+}
+
+do_install () {
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
+	cd ${D}${sbindir}/ && ln -s ./dropbearmulti dropbear && ln -s ./dropbearmulti dropbearkey && ln -s ./dropbearmulti dropbearconvert
+#	autotools_do_install
+	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
+				  -e 's,/usr/sbin,${sbindir},g' \
+				  -e 's,/var,${localstatedir},g' \
+				  -e 's,/usr/bin,${bindir},g' \
+				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+	chmod 755 ${D}${sysconfdir}/init.d/dropbear
+}
+pkg_postinst_append () {
+
+if [ -n "$D"  ]; then exit 1; fi
+if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+	dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
+fi
+#if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+#	dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
+#fi
+}
+
+pkg_postrm_append () {
+
+if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+	rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+fi
+if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+	rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+fi
+}
diff --git a/packages/dropbear/dropbear_0.43.bb b/packages/dropbear/dropbear_0.43.bb
index e69de29bb2..957b88bc49 100644
--- a/packages/dropbear/dropbear_0.43.bb
+++ b/packages/dropbear/dropbear_0.43.bb
@@ -0,0 +1,63 @@
+SECTION = "console/network"
+DESCRIPTION = "Dropbear SSH Implementation"
+LICENSE = "MIT"
+DEPENDS = "zlib"
+PR = "r6"
+
+SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://allow-nopw.patch;patch=1 \
+	   file://multi-binary.patch;patch=1 \
+	   file://init"
+S = "${WORKDIR}/dropbear-${PV}"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "dropbear"
+INITSCRIPT_PARAMS = "defaults 10"
+
+CFLAGS_prepend = "-I. "
+LD = "${CC}"
+
+do_compile () {
+	oe_runmake dropbearmulti
+}
+
+do_install () {
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
+	cd ${D}${sbindir}/ && ln -s ./dropbearmulti dropbear && ln -s ./dropbearmulti dropbearkey && ln -s ./dropbearmulti dropbearconvert
+#	autotools_do_install
+	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
+				  -e 's,/usr/sbin,${sbindir},g' \
+				  -e 's,/var,${localstatedir},g' \
+				  -e 's,/usr/bin,${bindir},g' \
+				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+	chmod 755 ${D}${sysconfdir}/init.d/dropbear
+}
+pkg_postinst_append () {
+
+if [ -n "$D"  ]; then exit 1; fi
+if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+	dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
+fi
+#if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+#	dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
+#fi
+}
+
+pkg_postrm_append () {
+
+if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+	rm ${sysconfdir}/dropbear/dropbear_rsa_host_key
+fi
+if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+	rm ${sysconfdir}/dropbear/dropbear_dss_host_key
+fi
+}
diff --git a/packages/dropbear/dropbear_0.44.bb b/packages/dropbear/dropbear_0.44.bb
index f9b706d6f9..0812c71aa4 100644
--- a/packages/dropbear/dropbear_0.44.bb
+++ b/packages/dropbear/dropbear_0.44.bb
@@ -27,29 +27,29 @@ BINCOMMANDS = "dbclient ssh scp"
 EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
 
 do_install() {
-	install -d ${D}/${sysconfdir} \
-		   ${D}/${sysconfdir}/init.d \
-		   ${D}/${sysconfdir}/default \
-		   ${D}/${sysconfdir}/dropbear \
-                   ${D}/${bindir} \
-		   ${D}/${sbindir} \
-		   ${D}/${localstatedir}
-
-	install -m 0755 dropbearmulti ${D}/${sbindir}/
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/dropbear \
+                   ${D}${bindir} \
+		   ${D}${sbindir} \
+		   ${D}${localstatedir}
+
+	install -m 0755 dropbearmulti ${D}${sbindir}/
 	for i in ${BINCOMMANDS}
 	do
-		ln -s ${sbindir}/dropbearmulti ${D}/${bindir}/$i
+		ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
 	done
 	for i in ${SBINCOMMANDS}
 	do
-		ln -s ./dropbearmulti ${D}/${sbindir}/$i
+		ln -s ./dropbearmulti ${D}${sbindir}/$i
 	done
 	cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
 				  -e 's,/usr/sbin,${sbindir},g' \
 				  -e 's,/var,${localstatedir},g' \
 				  -e 's,/usr/bin,${bindir},g' \
-				  -e 's,/usr,${prefix},g' > ${D}/${sysconfdir}/init.d/dropbear
-	chmod 755 ${D}/${sysconfdir}/init.d/dropbear
+				  -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
+	chmod 755 ${D}${sysconfdir}/init.d/dropbear
 }
 
 pkg_postrm_append () {
diff --git a/packages/dvbtools/dvbstream_cvs.bb b/packages/dvbtools/dvbstream_cvs.bb
index e69de29bb2..f25ec23652 100644
--- a/packages/dvbtools/dvbstream_cvs.bb
+++ b/packages/dvbtools/dvbstream_cvs.bb
@@ -0,0 +1,15 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "console/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPLV2"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "libxml2"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/dvbtools;module=dvbstream"
+S = "${WORKDIR}/dvbstream"
+
+CFLAGS_append = " -D_GNU_SOURCE"
+
+do_install() {
+	mkdir -p ${D}${bindir}
+	for i in dvbstream dumprtp ts_filter rtpfeed; do install -m 0755 $i ${D}${bindir}/; done
+}
diff --git a/packages/dvbtools/dvbtune_cvs.bb b/packages/dvbtools/dvbtune_cvs.bb
index e69de29bb2..76052c66ab 100644
--- a/packages/dvbtools/dvbtune_cvs.bb
+++ b/packages/dvbtools/dvbtune_cvs.bb
@@ -0,0 +1,21 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "console/multimedia"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "libxml2"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/dvbtools;module=dvbtune"
+S = "${WORKDIR}/dvbtune"
+
+CFLAGS += "\$(shell xml2-config --cflags)"
+LDFLAGS += "\$(shell xml2-config --libs)"
+
+do_compile() {
+	oe_runmake dvbtune xml2vdr
+}
+
+do_install() {
+	mkdir -p ${D}${bindir}
+	install -m 0755 dvbtune ${D}${bindir}/
+	install -m 0755 xml2vdr ${D}${bindir}/
+}
diff --git a/packages/dviviewer/dviviewer_1.0.2.bb b/packages/dviviewer/dviviewer_1.0.2.bb
index e69de29bb2..75523ca793 100644
--- a/packages/dviviewer/dviviewer_1.0.2.bb
+++ b/packages/dviviewer/dviviewer_1.0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "DVI Viewer for Opie/Qtopia"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www013.upp.so-net.ne.jp/hn43o/dviviewer/"
+PR = "r1"
+
+SRC_URI = "http://www013.upp.so-net.ne.jp/hn43o/dviviewer/dviviewer-${PV}.tar.gz"
+S = "${WORKDIR}/dviviewer"
+
+inherit palmtop
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Applications \
+		   ${D}${palmtopdir}/pics
+        install -D -m 755 dviviewer ${D}${palmtopdir}/bin/dviviewer
+        install -D -m 644 dviviewer.desktop ${D}${palmtopdir}/Applications/dviviewer.desktop
+        install -d ${D}${palmtopdir}/pics
+        cp -a *.png ${D}${palmtopdir}/pics/
+}
diff --git a/packages/ebtables/ebtables_2.0.6.bb b/packages/ebtables/ebtables_2.0.6.bb
index 5141da3a6d..3c5d17dacb 100644
--- a/packages/ebtables/ebtables_2.0.6.bb
+++ b/packages/ebtables/ebtables_2.0.6.bb
@@ -17,6 +17,6 @@ do_compile () {
 }
 
 do_install () {
-	oe_runmake 'BINPATH=${D}/${base_sbindir}/' 'MANDIR=${D}/${mandir}/' \
-		   'ETHERTYPESPATH=${D}/${sysconfdir}/' install
+	oe_runmake 'BINPATH=${D}${base_sbindir}/' 'MANDIR=${D}${mandir}/' \
+		   'ETHERTYPESPATH=${D}${sysconfdir}/' install
 }
diff --git a/packages/espgs/espgs_7.07.1rc1.bb b/packages/espgs/espgs_7.07.1rc1.bb
index e69de29bb2..7fdba47866 100644
--- a/packages/espgs/espgs_7.07.1rc1.bb
+++ b/packages/espgs/espgs_7.07.1rc1.bb
@@ -0,0 +1,26 @@
+SECTION = "unknown"
+DEPENDS = "jpeg zlib libpng espgs-native"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.easysw.com/pub/ghostscript/espgs-${PV}-source.tar.bz2"
+S = "${WORKDIR}/espgs-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-drivers= \
+		--without-ijs \
+		--without-gimp-print \
+		--without-omni \
+		--without-x \
+		--disable-cups"
+EXTRA_OEMAKE = "'BUILD_TIME_GS=${STAGING_BINDIR}/gs' \
+		'ECHOGS_XE=${STAGING_BINDIR}/echogs' \
+		'GENARCH_XE=${STAGING_BINDIR}/genarch' \
+		'GENCONF_XE=${STAGING_BINDIR}/genconf'"
+
+do_install () {
+	oe_runmake 'prefix=${D}${prefix}' \
+		   'bindir=${D}${bindir}' \
+		   'datadir=${D}${datadir}' \
+		   'mandir=${D}${mandir}' install
+}
diff --git a/packages/etherpuppet/etherpuppet_0.1.bb b/packages/etherpuppet/etherpuppet_0.1.bb
index e69de29bb2..e875a8d374 100644
--- a/packages/etherpuppet/etherpuppet_0.1.bb
+++ b/packages/etherpuppet/etherpuppet_0.1.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Etherpuppet is a small program for Linux that will create a \
+voodoo doll for an Ethernet interface. You have to run the Etherpuppet on \
+your machine to create the doll, which will have the shape of a virtual \
+TUN/TAP interface (named by default puppet%d, where %d is a number). \
+You also have to run Etherpuppet on the victim interface's machine."
+SECTION = "console/network"
+LICENSE = "LGPL"
+
+SRC_URI = "http://www.cartel-securite.fr/pbiondi/projects/etherpuppet/etherpuppet.c"
+S = "${WORKDIR}"
+
+do_unpack() {
+	install -m 0644 ${DL_DIR}/etherpuppet.c ${S}
+}
+
+do_compile() {
+	${CC} ${CFLAGS} ${LFLAGS} -o etherpuppet etherpuppet.c
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 0755 etherpuppet ${D}${sbindir}
+}
+
diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb
index e69de29bb2..f597b3f18d 100644
--- a/packages/expat/expat_1.95.6.bb
+++ b/packages/expat/expat_1.95.6.bb
@@ -0,0 +1,22 @@
+SECTION = "libs"
+DESCRIPTION = "Jim Clarkes XML parser library."
+LICENSE = "MIT"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"
+S = "${WORKDIR}/expat-${PV}"
+
+inherit autotools 
+export LTCC = "${CC}"
+
+do_stage () {
+	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
+	oe_libinstall -so libexpat ${STAGING_LIBDIR}/
+}
+
+do_install () {
+	oe_runmake prefix="${D}${prefix}" \
+		bindir="${D}${bindir}" \
+		libdir="${D}${libdir}" \
+		includedir="${D}${includedir}" \
+		install
+}
diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb
index e69de29bb2..95572ce84b 100644
--- a/packages/expat/expat_1.95.7.bb
+++ b/packages/expat/expat_1.95.7.bb
@@ -0,0 +1,29 @@
+SECTION = "libs"
+DESCRIPTION = "Jim Clarkes XML parser library."
+HOMEPAGE = "http://expat.sourceforge.net/"
+LICENSE = "MIT"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+	   file://autotools.patch;patch=1"
+S = "${WORKDIR}/expat-${PV}"
+
+inherit autotools lib_package
+export LTCC = "${CC}"
+
+do_configure () {
+	rm -f ${S}/conftools/libtool.m4
+	autotools_do_configure
+}
+
+do_stage () {
+	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
+	oe_libinstall -so libexpat ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_runmake prefix="${D}${prefix}" \
+		bindir="${D}${bindir}" \
+		libdir="${D}${libdir}" \
+		includedir="${D}${includedir}" \
+		install
+}
diff --git a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
index e5cbd0a5fb..39004cbb7b 100644
--- a/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver-kmodule_0.9.4.bb
@@ -14,6 +14,6 @@ inherit module
 EXTRA_OEMAKE = "KERNEL_INCLUDES=-I${STAGING_KERNEL_DIR}/include zaurus_kbdsim.o"
 
 do_install () {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
-	install -m 0644 zaurus_kbdsim.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc
+	install -m 0644 zaurus_kbdsim.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc/
 }
diff --git a/packages/fbvncserver/fbvncserver_0.9.4.bb b/packages/fbvncserver/fbvncserver_0.9.4.bb
index cdff17efa4..bc66c5c8ac 100644
--- a/packages/fbvncserver/fbvncserver_0.9.4.bb
+++ b/packages/fbvncserver/fbvncserver_0.9.4.bb
@@ -36,6 +36,6 @@ do_install () {
 	install -d ${D}${datadir}/fbvncserver
 	install -m 0644 ${WORKDIR}/zaurus_panel.jpg ${D}${datadir}/fbvncserver/
 	
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/fbvncinput
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/fbvncinput
 }
diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
index 6770703b8a..233be09722 100644
--- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
+++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb
@@ -48,7 +48,7 @@ EXTRA_OECONF=" \
 	--extra-libs=\$(TARGET_LDFLAGS) \
 	\
 	--cpu=${PACKAGE_ARCH} \
-	--prefix=${D}/${prefix} \
+	--prefix=${D}${prefix} \
 "
 
 PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
diff --git a/packages/ffmpeg/ffmpeg_cvs.bb b/packages/ffmpeg/ffmpeg_cvs.bb
index e69de29bb2..40ee8d937f 100644
--- a/packages/ffmpeg/ffmpeg_cvs.bb
+++ b/packages/ffmpeg/ffmpeg_cvs.bb
@@ -0,0 +1,83 @@
+PV = "0.4.9-pre1+cvs-${CVSDATE}"
+DESCRIPTION = "ffmpeg"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib libvorbis faac liba52 lame"
+LICENSE = "GPL"
+PR = "r1"
+S = ${WORKDIR}/ffmpeg
+DEFAULT_PREFERENCE = "-1"
+
+inherit autotools
+
+SRC_URI = "cvs://anonymous@mplayerhq.hu/cvsroot/ffmpeg;module=ffmpeg \
+	file://configure.patch;patch=0 \
+	file://common.patch;patch=1 \
+	file://soname.patch;patch=1 \
+	"
+
+TARGET_LDFLAGS_append = " -lm -la52 "
+
+EXTRA_OECONF=" \
+	--enable-mp3lame \
+	--enable-vorbis \
+	--enable-faac \
+	--enable-a52 \
+	--enable-a52bin \
+	--enable-pp \
+#	--enable-shared-pp \
+	--enable-shared \
+	--disable-amr_nb \
+	--enable-amr_nb-fixed \
+	--disable-amr_wb \
+	--enable-pthreads \
+	--enable-gpl \
+	--enable-zlib \
+	\
+	--disable-audio-beos \
+	--disable-v4l \
+	--disable-dv1394 \
+	--disable-debug \
+	--disable-ffserver \
+	--disable-ffplay \
+	\
+	--cross-prefix=${TARGET_PREFIX} \
+	--extra-cflags=\$(TARGET_CFLAGS) \
+	--extra-ldflags=\$(TARGET_LDFLAGS) \
+	--extra-libs=\$(TARGET_LDFLAGS) \
+	\
+	--cpu=${PACKAGE_ARCH} \
+	--prefix=${D}${prefix} \
+	--mandir=${D}${prefix}/man \
+"
+
+PACKAGES += "libavcodec libavcodec-dev libavformat libavformat-dev"
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dev = "${includedir}"
+FILES_libavcodec = "${libdir}/libavcodec*.so.*"
+FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/libavcodec*.la ${libdir}/libavcodec*.a"
+FILES_libavformat = "${libdir}/libavformat*.so.*"
+FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/libavformat*.la ${libdir}/libavformat*.a"
+
+# We do this because the install program is called with -s which causes it to call "strip" and it then mangles cross compiled stuff..
+PATH_prepend=${CROSS_DIR}/${TARGET_SYS}/bin:
+
+
+do_configure_prepend() {
+	export CC="${CC}"
+}
+
+do_stage() {
+	oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR}
+	oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/ffmpeg
+	install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h
+	install -m 0644 ${S}/libavcodec/common.h ${STAGING_INCDIR}/ffmpeg/common.h
+	install -m 0644 ${S}/libavcodec/rational.h ${STAGING_INCDIR}/ffmpeg/rational.h
+	install -m 0644 ${S}/libavformat/avformat.h ${STAGING_INCDIR}/ffmpeg/avformat.h
+	install -m 0644 ${S}/libavformat/avio.h ${STAGING_INCDIR}/ffmpeg/avio.h
+	install -m 0644 ${S}/libavformat/rtp.h ${STAGING_INCDIR}/ffmpeg/rtp.h
+	install -m 0644 ${S}/libavformat/rtsp.h ${STAGING_INCDIR}/ffmpeg/rtsp.h
+	install -m 0644 ${S}/libavformat/rtspcodes.h ${STAGING_INCDIR}/ffmpeg/rtspcodes.h
+}
diff --git a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
index e69de29bb2..b3c0119470 100644
--- a/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
+++ b/packages/flexis-zaurus/flexis-zaurus_1.0.0.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "A Qtopia/Opie Input Method plugin for the Flexis FX100 Keyboard."
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.Vanille.de/mirror/flexis-zaurus-${PV}.tar.bz2"
+S = "${WORKDIR}/flexis-zaurus"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia"
+
+do_install() {
+	oe_libinstall libqflexis ${D}${palmtopdir}/plugins/inputmethods/
+}
diff --git a/packages/flnx/flnx_0.17.bb b/packages/flnx/flnx_0.17.bb
index b453ad24b1..e2db1358d8 100644
--- a/packages/flnx/flnx_0.17.bb
+++ b/packages/flnx/flnx_0.17.bb
@@ -10,7 +10,7 @@ inherit autotools
 EXTRA_OECONF = "--with-microwin=${STAGING_LIBDIR}/.."
 
 do_install () {
-	oe_runmake "bindir=${D}/${bindir}" \
-		   "libdir=${D}/${libdir}" \
-		   "includedir=${D}/${includedir}" install
+	oe_runmake "bindir=${D}${bindir}" \
+		   "libdir=${D}${libdir}" \
+		   "includedir=${D}${includedir}" install
 }
diff --git a/packages/flnx/flnx_0.18.bb b/packages/flnx/flnx_0.18.bb
index e69de29bb2..6f84247404 100644
--- a/packages/flnx/flnx_0.18.bb
+++ b/packages/flnx/flnx_0.18.bb
@@ -0,0 +1,32 @@
+SECTION = "x11/libs"
+DEPENDS = "microwindows"
+RDEPENDS = "microwindows"
+DESCRIPTION = "fltk library for microwindows."
+SRC_URI = "ftp://ftp.microwindows.org/pub/microwindows/flnx/flnx-${PV}-tar.gz \
+	   file://gcc3.patch;patch=1"
+S = "${WORKDIR}/flnx"
+LICENSE = "LGPL"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-microwin=${STAGING_LIBDIR}/.."
+
+python do_fetch () {
+	import os
+	bb.build.exec_func("base_do_fetch", d)
+	if os.access(bb.data.expand("${DL_DIR}/flnx-${PV}-tar.gz", d), os.R_OK):
+		os.rename(bb.data.expand("${DL_DIR}/flnx-${PV}-tar.gz", d), bb.data.expand("${DL_DIR}/flnx-${PV}.tar.gz", d))
+}
+
+python do_unpack () {
+	src_uri = bb.data.getVar("SRC_URI", d)
+	src_uri = src_uri.replace("-tar", ".tar")
+	bb.data.setVar("SRC_URI", src_uri, d)
+	bb.build.exec_func("base_do_unpack", d)
+}
+
+do_install () {
+	oe_runmake "bindir=${D}${bindir}" \
+		   "libdir=${D}${libdir}" \
+		   "includedir=${D}${includedir}" install
+}
diff --git a/packages/fltk/fltk_1.2+cvs20040806.bb b/packages/fltk/fltk_1.2+cvs20040806.bb
index e69de29bb2..b72e357d06 100644
--- a/packages/fltk/fltk_1.2+cvs20040806.bb
+++ b/packages/fltk/fltk_1.2+cvs20040806.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
+LICENSE ="LGPL"
+HOMEPAGE = "http://www.fltk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+DEPENDS = "jpeg libpng zlib"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/fltk;module=fltk;method=pserver;tag=v1_2;date=${@bb.data.getVar('PV', d, 1)[7:]} \
+	   file://makefiles.patch;patch=1 \
+	   file://autotools.patch;patch=1"
+S="${WORKDIR}/fltk"
+
+inherit autotools binconfig
+
+do_configure_prepend() {
+	autoconf
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += " ${bindir}/fltk-config"
+LEAD_SONAME = "libfltk.so"
+
+EXTRA_OECONF = "--enable-shared --disable-gl"
+
+do_install () {
+	oe_runmake prefix="${D}${prefix}" \
+		bindir="${D}${bindir}" \
+		libdir="${D}${libdir}" \
+		includedir="${D}${includedir}" \
+		install
+}
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
+
+python populate_packages_prepend () {
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libfltk1.2', d)
+}
diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb
index e69de29bb2..7718da0696 100644
--- a/packages/freedroid/freedroid_1.0.2.bb
+++ b/packages/freedroid/freedroid_1.0.2.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Clone of the classic Paradroid from C64 for Qtopia/Opie - based on SDL"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://freedroid.sourceforge.net/"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freedroid/freedroid-${PV}.tar.gz \
+           file://icon.png"
+
+inherit autotools 
+
+do_compile() {
+	oe_runmake pkgdatadir=${palmtopdir}/share/freedroid
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Games \
+		   ${D}${palmtopdir}/pics \
+		   ${D}${palmtopdir}/share/freedroid/graphics \
+		   ${D}${palmtopdir}/share/freedroid/map \
+		   ${D}${palmtopdir}/share/freedroid/sound
+        install -D -m 0755 src/freedroid ${D}${palmtopdir}/bin/freedroid
+	install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/freedroid.png
+
+	cp -a graphics/* ${D}${palmtopdir}/share/freedroid/graphics
+	cp -a map/* ${D}${palmtopdir}/share/freedroid/map
+	cp -a sound/* ${D}${palmtopdir}/share/freedroid/sound
+
+	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Comment=A Paradroid Clone" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Exec=freedroid" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Icon=freedroid" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Type=Application" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
+	echo "Name=Freedroid" >>${D}${palmtopdir}/apps/Games/freedroid.desktop
+}
+
+FILES_${PN} = ""
+FILES_${PN} = "${palmtopdir}/"
diff --git a/packages/frodo/frodo_4.1b.bb b/packages/frodo/frodo_4.1b.bb
index e69de29bb2..c048751d59 100644
--- a/packages/frodo/frodo_4.1b.bb
+++ b/packages/frodo/frodo_4.1b.bb
@@ -0,0 +1,47 @@
+DESCRIPTION = "A C64 emulator based on SDL."
+SECTION = "opie/applications"
+DEPENDS = "libsdl-qpe"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://wwwthep.physik.uni-mainz.de/~cbauer/FrodoV4_1b.Src.tar.gz \
+           file://frodo-qte.diff;patch=1 \
+           file://frodo-joystick-4state.diff;patch=1 \
+           file://frodorc \
+           file://Frodo.png \
+           file://frodo.desktop"
+S = "${WORKDIR}/Frodo-${PV}/Src"
+
+inherit autotools 
+
+EXTRA_OECONF = "--disable-sdltest --enable-qtopia"
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/pics
+	install -m 0644 ${WORKDIR}/Frodo.png ${D}${palmtopdir}/pics/Frodo.png
+	install -m 0644 ${WORKDIR}/frodo.desktop ${D}${palmtopdir}/apps/Games/frodo.desktop
+	# start script and executable
+	install -d ${D}${palmtopdir}/bin/${PN}
+	install -m 0755 Frodo ${D}${palmtopdir}/bin/${PN}/Frodo
+	cat <<STARTER_EOF > ${D}${palmtopdir}/bin/${PN}/frodostart
+#!/bin/sh
+cd ${palmtopdir}/bin/${PN}
+./Frodo
+STARTER_EOF
+	chmod 0755 ${D}${palmtopdir}/bin/${PN}/frodostart
+	ln -sf ${PN}/frodostart ${D}${palmtopdir}/bin/Frodo
+	# conffiles
+	install -d ${D}${sysconfdir}
+	install -m 644 ${WORKDIR}/frodorc ${D}${sysconfdir}/frodorc
+}
+
+FILES_${PN} = "${palmtopdir} ${sysconfdir}"
+
+#FIXME: Add postinst which copies /etc/frodorc into $HOME/.frodorc
diff --git a/packages/frodo/frodo_4.2.bb b/packages/frodo/frodo_4.2.bb
index 5535a4d3d6..a779cdcfbb 100644
--- a/packages/frodo/frodo_4.2.bb
+++ b/packages/frodo/frodo_4.2.bb
@@ -20,24 +20,24 @@ inherit autotools
 EXTRA_OECONF = "--disable-sdltest --enable-qtopia --with-sdl-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
 
 do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-                   ${D}/${palmtopdir}/apps/Games \
-                   ${D}/${palmtopdir}/pics
-        install -m 0644 ${WORKDIR}/Frodo.png ${D}/${palmtopdir}/pics/Frodo.png
-        install -m 0644 ${WORKDIR}/frodo.desktop ${D}/${palmtopdir}/apps/Games/frodo.desktop
+        install -d ${D}${palmtopdir}/bin \
+                   ${D}${palmtopdir}/apps/Games \
+                   ${D}${palmtopdir}/pics
+        install -m 0644 ${WORKDIR}/Frodo.png ${D}${palmtopdir}/pics/Frodo.png
+        install -m 0644 ${WORKDIR}/frodo.desktop ${D}${palmtopdir}/apps/Games/frodo.desktop
         # start script and executable
-        install -d ${D}/${palmtopdir}/bin/${PN}
-        install -m 0755 Frodo ${D}/${palmtopdir}/bin/${PN}/Frodo
-        cat <<STARTER_EOF > ${D}/${palmtopdir}/bin/${PN}/frodostart
+        install -d ${D}${palmtopdir}/bin/${PN}
+        install -m 0755 Frodo ${D}${palmtopdir}/bin/${PN}/Frodo
+        cat <<STARTER_EOF > ${D}${palmtopdir}/bin/${PN}/frodostart
 #!/bin/sh
 cd ${palmtopdir}/bin/${PN}
 ./Frodo
 STARTER_EOF
-        chmod 0755 ${D}/${palmtopdir}/bin/${PN}/frodostart
-        ln -sf ${PN}/frodostart ${D}/${palmtopdir}/bin/Frodo
+        chmod 0755 ${D}${palmtopdir}/bin/${PN}/frodostart
+        ln -sf ${PN}/frodostart ${D}${palmtopdir}/bin/Frodo
         # conffiles
-        install -d ${D}/${sysconfdir}
-        install -m 644 ${WORKDIR}/frodorc ${D}/${sysconfdir}/frodorc
+        install -d ${D}${sysconfdir}
+        install -m 644 ${WORKDIR}/frodorc ${D}${sysconfdir}/frodorc
 }
 
 FILES_${PN} = "${palmtopdir} ${sysconfdir}"
diff --git a/packages/froot/froot_0.7.1.bb b/packages/froot/froot_0.7.1.bb
index e69de29bb2..1faf5a5788 100644
--- a/packages/froot/froot_0.7.1.bb
+++ b/packages/froot/froot_0.7.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Froot is a game like frozen bubbles"
+SECTION = "opie/games"
+APPNAME = "froot"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+LICENSE = "GPL"
+PR = "r2"
+
+SRC_URI = "http://www.cs.unc.edu/~scheuerm/froot/froot-${PV}.tar.gz"
+S = "${WORKDIR}/froot-${PV}"
+
+inherit opie
+
+do_install() {
+    install -d ${D}${palmtopdir}/help/html
+    install -d ${D}${palmtopdir}/pics/froot
+    install -m 0644 Froot.png ${D}${palmtopdir}/pics/
+    install -m 0644 help/html/froot.html ${D}${palmtopdir}/help/html/
+    install -m 0644 pics/froot/*.png ${D}${palmtopdir}/pics/froot/
+}
diff --git a/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb b/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb
index d74fb4fa3d..47aea70e85 100644
--- a/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb
+++ b/packages/gcc-csl/gcc-csl-cross_2004-q1a.bb
@@ -69,25 +69,25 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then
+	mkdir -p ${D}${base_libdir}
+	if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then
 		# Already in the right location
 		:
-	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
+		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
 	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
 	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+	mkdir -p ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
-	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-	${TARGET_PREFIX}strip ${D}/${base_libdir}gcc_s.so.*
+	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+	${TARGET_PREFIX}strip ${D}${base_libdir}gcc_s.so.*
 }
diff --git a/packages/gcc-csl/gcc-csl_2004-q1a.bb b/packages/gcc-csl/gcc-csl_2004-q1a.bb
index c4839792c0..4a3d02333d 100644
--- a/packages/gcc-csl/gcc-csl_2004-q1a.bb
+++ b/packages/gcc-csl/gcc-csl_2004-q1a.bb
@@ -188,28 +188,28 @@ do_install () {
 	autotools_do_install
 
 	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
-	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
-	rm ${D}/${libdir}/libgcc_s.so
+	mkdir -p ${D}${base_libdir}
+	mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm ${D}${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
 		| tr -s / \
 		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
+		      ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
 
 	# We don't need libtool libraries
-	rm ${D}/${libdir}/libg2c.la
+	rm ${D}${libdir}/libg2c.la
 
 	# Cleanup manpages..
-	rm -r ${D}/${mandir}/man7
+	rm -r ${D}${mandir}/man7
 
 	# We use libiberty from binutils
-	rm ${D}/${libdir}/libiberty.a
+	rm ${D}${libdir}/libiberty.a
 
-	cd ${D}/${bindir}
+	cd ${D}${bindir}
 
 	# We care about g++ not c++
 	rm *c++
diff --git a/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb b/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb
index d92b09f2b3..4e2f7fa91b 100644
--- a/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb
+++ b/packages/gcc-snapshot/gcc-snapshot-cross_cvs.bb
@@ -69,25 +69,25 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then
+	mkdir -p ${D}${base_libdir}
+	if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then
 		# Already in the right location
 		:
-	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
+		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
 	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
 	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+	mkdir -p ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
-	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-	${TARGET_PREFIX}strip ${D}/${base_libdir}gcc_s.so.*
+	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+	${TARGET_PREFIX}strip ${D}${base_libdir}gcc_s.so.*
 }
diff --git a/packages/gcc-snapshot/gcc-snapshot_cvs.bb b/packages/gcc-snapshot/gcc-snapshot_cvs.bb
index f7c1a0ec09..bf87651e75 100644
--- a/packages/gcc-snapshot/gcc-snapshot_cvs.bb
+++ b/packages/gcc-snapshot/gcc-snapshot_cvs.bb
@@ -167,28 +167,28 @@ do_install () {
 	autotools_do_install
 
 	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
-	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
-	rm ${D}/${libdir}/libgcc_s.so
+	mkdir -p ${D}${base_libdir}
+	mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm ${D}${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
 		| tr -s / \
 		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
+		      ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
 
 	# We don't need libtool libraries
-	rm ${D}/${libdir}/libg2c.la
+	rm ${D}${libdir}/libg2c.la
 
 	# Cleanup manpages..
-	rm -r ${D}/${mandir}/man7
+	rm -r ${D}${mandir}/man7
 
 	# We use libiberty from binutils
-	rm ${D}/${libdir}/libiberty.a
+	rm ${D}${libdir}/libiberty.a
 
-	cd ${D}/${bindir}
+	cd ${D}${bindir}
 
 	# We care about g++ not c++
 	rm *c++
diff --git a/packages/gcc/gcc-cross_3.3.3.bb b/packages/gcc/gcc-cross_3.3.3.bb
index c59ea0d37a..4d1e05457b 100644
--- a/packages/gcc/gcc-cross_3.3.3.bb
+++ b/packages/gcc/gcc-cross_3.3.3.bb
@@ -75,23 +75,23 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
+	mkdir -p ${D}${base_libdir}
 	if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
 		# native builds drop one pathname component
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
 	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
 	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+	mkdir -p ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
-	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-	${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-	${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.*
+	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+	${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+	${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
 }
diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb
index 3abf6f0103..997c5044a7 100644
--- a/packages/gcc/gcc-cross_3.3.4.bb
+++ b/packages/gcc/gcc-cross_3.3.4.bb
@@ -76,25 +76,25 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
+	mkdir -p ${D}${base_libdir}
 	if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then
 		# native builds drop one pathname component
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
 	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
 	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+	mkdir -p ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
 	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-		${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.*
+		${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+		${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+		${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
 	fi
 }
diff --git a/packages/gcc/gcc-package.inc b/packages/gcc/gcc-package.inc
index 205c40587b..8e776af7b3 100644
--- a/packages/gcc/gcc-package.inc
+++ b/packages/gcc/gcc-package.inc
@@ -65,31 +65,31 @@ do_install () {
 	autotools_do_install
 
 	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
-	rm -r ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
-	rm -r ${D}/${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/install-tools
+	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${PV}/install-tools
 
 	# Hack around specs file assumptions
-	sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/specs
+	sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/specs
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	mv ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
-	rm ${D}/${libdir}/libgcc_s.so
+	mkdir -p ${D}${base_libdir}
+	mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm ${D}${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${PV} \
 		| tr -s / \
 		| sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
-		      ${D}/${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
+		      ${D}${libdir}/gcc/${TARGET_SYS}/${PV}/libgcc_s.so
 
 	# We don't need libtool libraries
-	rm ${D}/${libdir}/libg2c.la
+	rm ${D}${libdir}/libg2c.la
 
 	# Cleanup manpages..
-	rm -r ${D}/${mandir}/man7
+	rm -r ${D}${mandir}/man7
 
 	# We use libiberty from binutils
-	rm ${D}/${libdir}/libiberty.a
+	rm ${D}${libdir}/libiberty.a
 
-	cd ${D}/${bindir}
+	cd ${D}${bindir}
 
 	# We care about g++ not c++
 	rm *c++
diff --git a/packages/gcc/gcc3-cross-build.inc b/packages/gcc/gcc3-cross-build.inc
index 611b021b11..ef3ae3a6a1 100644
--- a/packages/gcc/gcc3-cross-build.inc
+++ b/packages/gcc/gcc3-cross-build.inc
@@ -53,27 +53,27 @@ do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	if [ -f ${D}/${base_libdir}/libgcc_s.so.? ]; then
+	mkdir -p ${D}${base_libdir}
+	if [ -f ${D}${base_libdir}/libgcc_s.so.? ]; then
 		# Already in the right location
 		:
-	elif [ -f ${D}/${prefix}/lib/libgcc_s.so.? ]; then
-		mv -f ${D}/${prefix}/lib/libgcc_s.so.* ${D}/${base_libdir}
+	elif [ -f ${D}${prefix}/lib/libgcc_s.so.? ]; then
+		mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir}
 	else
-		mv -f ${D}/${prefix}/*/lib/libgcc_s.so.* ${D}/${base_libdir}
+		mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir}
 	fi
 
 	# Move libstdc++ and libg2c into libdir (resetting our prefix to /usr
 	TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'`
-	mkdir -p ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libstdc++.so.* ${D}/${TGT_LIBDIR}
-	mv -f ${D}/${prefix}/*/lib/libg2c.so.* ${D}/${TGT_LIBDIR}
+	mkdir -p ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR}
+	mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR}
 
 	# Manually run the target stripper since we won't get it run by
 	# the packaging.
 	if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libstdc++.so.*
-		${TARGET_PREFIX}strip ${D}/${TGT_LIBDIR}/libg2c.so.*
-		${TARGET_PREFIX}strip ${D}/${base_libdir}/libgcc_s.so.*
+		${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.*
+		${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.*
+		${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.*
 	fi
 }
diff --git a/packages/gcc/gcc_3.3.3.bb b/packages/gcc/gcc_3.3.3.bb
index f69dedf29b..7f0091a18e 100644
--- a/packages/gcc/gcc_3.3.3.bb
+++ b/packages/gcc/gcc_3.3.3.bb
@@ -157,27 +157,27 @@ do_install () {
 	autotools_do_install
 
 	# Cleanup some of the gcc-lib stuff
-	rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
+	rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
-	rm -f ${D}/${libdir}/libgcc_s.so
+	mkdir -p ${D}${base_libdir}
+	mv -f ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm -f ${D}${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
 		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
+		${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
 
 	# Cleanup manpages..
-	rm -rf ${D}/${mandir}/man7
-	mv ${D}/${mandir}/man1/cpp.1 \
-	   ${D}/${mandir}/man1/${TARGET_SYS}-cpp.1
-	mv ${D}/${mandir}/man1/gcov.1 \
-	   ${D}/${mandir}/man1/${TARGET_SYS}-gcov.1
+	rm -rf ${D}${mandir}/man7
+	mv ${D}${mandir}/man1/cpp.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-cpp.1
+	mv ${D}${mandir}/man1/gcov.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-gcov.1
 
 	# We use libiberty from binutils
-	rm -f ${D}/${libdir}/libiberty.a
+	rm -f ${D}${libdir}/libiberty.a
 
-	cd ${D}/${bindir}
+	cd ${D}${bindir}
 
 	# We care about g++ not c++
 	rm -f *c++
diff --git a/packages/gcc/gcc_3.3.4.bb b/packages/gcc/gcc_3.3.4.bb
index c93bda0e7a..dc3a66cd29 100644
--- a/packages/gcc/gcc_3.3.4.bb
+++ b/packages/gcc/gcc_3.3.4.bb
@@ -135,27 +135,27 @@ do_install () {
 	autotools_do_install
 
 	# Cleanup some of the gcc-lib stuff
-	rm -rf ${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
+	rm -rf ${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/install-tools
 
 	# Move libgcc_s into /lib
-	mkdir -p ${D}/${base_libdir}
-	mv -f ${D}/${libdir}/libgcc_s.so.* ${D}/${base_libdir}
-	rm -f ${D}/${libdir}/libgcc_s.so
+	mkdir -p ${D}${base_libdir}
+	mv -f ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+	rm -f ${D}${libdir}/libgcc_s.so
 	ln -sf `echo ${libdir}/gcc-lib/${TARGET_SYS}/${PV} | tr -s / |
 		sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.? \
-		${D}/${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
+		${D}${libdir}/gcc-lib/${TARGET_SYS}/${PV}/libgcc_s.so
 
 	# Cleanup manpages..
-	rm -rf ${D}/${mandir}/man7
-	mv ${D}/${mandir}/man1/cpp.1 \
-	   ${D}/${mandir}/man1/${TARGET_SYS}-cpp.1
-	mv ${D}/${mandir}/man1/gcov.1 \
-	   ${D}/${mandir}/man1/${TARGET_SYS}-gcov.1
+	rm -rf ${D}${mandir}/man7
+	mv ${D}${mandir}/man1/cpp.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-cpp.1
+	mv ${D}${mandir}/man1/gcov.1 \
+	   ${D}${mandir}/man1/${TARGET_SYS}-gcov.1
 
 	# We use libiberty from binutils
-	rm -f ${D}/${libdir}/libiberty.a
+	rm -f ${D}${libdir}/libiberty.a
 
-	cd ${D}/${bindir}
+	cd ${D}${bindir}
 
 	# We care about g++ not c++
 	rm -f *c++
diff --git a/packages/gchub/gchub-module_svn.bb b/packages/gchub/gchub-module_svn.bb
index 37617e8030..0da37b0eb7 100644
--- a/packages/gchub/gchub-module_svn.bb
+++ b/packages/gchub/gchub-module_svn.bb
@@ -12,6 +12,6 @@ S = "${WORKDIR}/gchub/kernel"
 inherit module
 
 do_install() {
-        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb
-	install gchub.ko -m 0644 ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/gchub.ko
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb
+	install gchub.ko -m 0644 ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/gchub.ko
 }
diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb
index dac4dc0656..4cace02ef0 100644
--- a/packages/gdb/gdb_6.1.bb
+++ b/packages/gdb/gdb_6.1.bb
@@ -37,9 +37,9 @@ do_configure () {
 do_install () {
 	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
 	oe_runmake install \
-	    'prefix=${D}/${prefix}' 'exec_prefix=${D}/${prefix}' 'bindir=${D}/${bindir}' \
-	    'sbindir=${D}/${sbindir}' 'infodir=${D}/${infodir}' 'libdir=${D}/${libdir}' \
-	    'mandir=${D}/${mandir}' 'includedir=${D}/${includedir}'
+	    'prefix=${D}${prefix}' 'exec_prefix=${D}${prefix}' 'bindir=${D}${bindir}' \
+	    'sbindir=${D}${sbindir}' 'infodir=${D}${infodir}' 'libdir=${D}${libdir}' \
+	    'mandir=${D}${mandir}' 'includedir=${D}${includedir}'
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb
index 3c1490c8d1..b459ee9204 100644
--- a/packages/gdb/gdb_6.2.bb
+++ b/packages/gdb/gdb_6.2.bb
@@ -40,9 +40,9 @@ do_configure () {
 do_install () {
 	make -C bfd/doc chew LDFLAGS= CFLAGS=-O2
 	oe_runmake install \
-	    'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}/${base_bindir}' \
-	    'sbindir=${D}/${base_sbindir}' 'infodir=${D}/share/info' 'libdir=${D}/${base_libdir}' \
-	    'mandir=${D}/share/man' 'includedir=${D}/include'
+	    'prefix=${D}' 'exec_prefix=${D}' 'bindir=${D}${base_bindir}' \
+	    'sbindir=${D}${base_sbindir}' 'infodir=${D}share/info' 'libdir=${D}${base_libdir}' \
+	    'mandir=${D}share/man' 'includedir=${D}include'
 	install -d ${D}${bindir}
 	install -m 0755 gdb/gdbserver/gdbserver ${D}${bindir}
 }
diff --git a/packages/gemdropx/gemdropx_0.9.bb b/packages/gemdropx/gemdropx_0.9.bb
index e69de29bb2..426bdcad6c 100644
--- a/packages/gemdropx/gemdropx_0.9.bb
+++ b/packages/gemdropx/gemdropx_0.9.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Classic arcade puzzle game Qtopia/Opie - based on SDL"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.newbreedsoftware.com/gemdropx/"
+DEPENDS = "virtual/libqpe libsdl-qpe"
+PR = "r3"
+
+SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/src/gemdropx-${PV}.tar.gz \
+           file://directories.patch;patch=1 \
+           file://icon.png"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer \
+			LIBS+=-lSDLmain LIBS+=-lSDL_image LIBS+=-lpthread"
+
+do_configure_prepend() {
+        qmake -project -o gemdropx.pro
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Games \
+		   ${D}${palmtopdir}/pics \
+		   ${D}${palmtopdir}/share/gemdropx
+        install -D -m 0755 gemdropx ${D}${palmtopdir}/bin/gemdropx
+	install -D -m 0644 ${WORKDIR}/icon.png ${D}${palmtopdir}/pics/gemdropx.png
+	cp -a data/* ${D}${palmtopdir}/share/gemdropx
+
+	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/gemdropx.desktop
+	echo "Comment=Puzzle game" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop
+	echo "Exec=gemdropx" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop
+	echo "Icon=gemdropx" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop
+	echo "Type=Application" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop
+	echo "Name=GemdropX" >>${D}${palmtopdir}/apps/Games/gemdropx.desktop
+}
diff --git a/packages/giac/giac_0.5.0.bb b/packages/giac/giac_0.5.0.bb
index 642a851553..0689da6964 100644
--- a/packages/giac/giac_0.5.0.bb
+++ b/packages/giac/giac_0.5.0.bb
@@ -25,15 +25,15 @@ do_configure() {
 }
 
 do_install () {
-	oe_runmake prefix="${D}/${prefix}" \
-		bindir="${D}/${bindir}" \
-		libdir="${D}/${libdir}" \
-		includedir="${D}/${includedir}" \
+	oe_runmake prefix="${D}${prefix}" \
+		bindir="${D}${bindir}" \
+		libdir="${D}${libdir}" \
+		includedir="${D}${includedir}" \
 		install
 
 	# put the docs where they belong
 	# might need further investigation in case giac needs
 	# them in the original place
-	install -d ${D}/${docdir}
-	mv ${D}/${datadir}/${PN}/doc ${D}/${docdir}/${PN}
+	install -d ${D}${docdir}
+	mv ${D}${datadir}/${PN}/doc ${D}${docdir}/${PN}
 }
diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
index 217325296d..15ca1612e8 100644
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ b/packages/gkdial/gkdial_1.8.1.bb
@@ -24,11 +24,11 @@ CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include"
 LDFLAGS_append = " -Wl,--export-dynamic"
 
 do_install_append () {
-        mkdir -p  ${D}/${datadir}/pixmaps
+        mkdir -p  ${D}${datadir}/pixmaps
         install -m 0644 ${WORKDIR}/gkdial.png ${D}${datadir}/pixmaps/gkdial.png
         mkdir -p  ${D}${datadir}/applications
         install -m 0644 ${WORKDIR}/gkdial.desktop ${D}${datadir}/applications/gkdial.desktop
-	mkdir -p ${D}/${sysconfdir}/chatscripts
-        mkdir -p ${D}/${sysconfdir}/gconf/schemas
-        install -m 0644 ${S}/gkdial.schemas ${D}/${sysconfdir}/gconf/schemas/gkdial.schemas
+	mkdir -p ${D}${sysconfdir}/chatscripts
+        mkdir -p ${D}${sysconfdir}/gconf/schemas
+        install -m 0644 ${S}/gkdial.schemas ${D}${sysconfdir}/gconf/schemas/gkdial.schemas
 }
diff --git a/packages/gkrellm/gkrellm_2.2.1.bb b/packages/gkrellm/gkrellm_2.2.1.bb
index 2c52cecdb1..2e668e7a87 100644
--- a/packages/gkrellm/gkrellm_2.2.1.bb
+++ b/packages/gkrellm/gkrellm_2.2.1.bb
@@ -15,12 +15,12 @@ export LINK_FLAGS = "${LDFLAGS}"
 export SMC_LIBS = "-lSM -lICE"
 
 do_install () {
-	oe_runmake 'INSTALLDIR=${D}/${bindir}' \
-		   'SINSTALLDIR=${D}/${bindir}' \
-		   'MANDIR=${D}/${mandir}/man1' \
-		   'SMANDIR=${D}/${mandir}/man1' \
-		   'INCLUDEDIR=${D}/${includedir}' \
-		   'PKGCONFIGDIR=${D}/${libdir}/pkgconfig' \
-		   'LOCALEDIR=${D}/${datadir}/locale' \
+	oe_runmake 'INSTALLDIR=${D}${bindir}' \
+		   'SINSTALLDIR=${D}${bindir}' \
+		   'MANDIR=${D}${mandir}/man1' \
+		   'SMANDIR=${D}${mandir}/man1' \
+		   'INCLUDEDIR=${D}${includedir}' \
+		   'PKGCONFIGDIR=${D}${libdir}/pkgconfig' \
+		   'LOCALEDIR=${D}${datadir}/locale' \
 		   install
 }
diff --git a/packages/gnu-config/gnu-config.bb b/packages/gnu-config/gnu-config.bb
index d45d7dcc73..092da1327b 100644
--- a/packages/gnu-config/gnu-config.bb
+++ b/packages/gnu-config/gnu-config.bb
@@ -15,11 +15,11 @@ FILES_${PN} = "${bindir} \
 	       ${datadir}/gnu-config"
 
 do_install () {
-	install -d ${D}/${datadir}/gnu-config \
-		   ${D}/${bindir}
+	install -d ${D}${datadir}/gnu-config \
+		   ${D}${bindir}
 	cat ${WORKDIR}/gnu-configize.in | \
 		sed -e 's,@gnu-configdir@,${datadir}/gnu-config,' \
 		    -e 's,@autom4te_perllibdir@,${STAGING_DATADIR}/autoconf,' > ${STAGING_BINDIR}/gnu-configize
-	chmod 755 ${D}/${bindir}/gnu-configize
-	install -m 0644 config.guess config.sub ${D}/${datadir}/gnu-config/
+	chmod 755 ${D}${bindir}/gnu-configize
+	install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
 }
diff --git a/packages/gnu-config/gnu-config_cvs.bb b/packages/gnu-config/gnu-config_cvs.bb
index e69de29bb2..5aaf2767a2 100644
--- a/packages/gnu-config/gnu-config_cvs.bb
+++ b/packages/gnu-config/gnu-config_cvs.bb
@@ -0,0 +1,29 @@
+SECTION = "base"
+DESCRIPTION = "gnu-configize"
+LICENSE = "GPL"
+DEPENDS = ""
+INHIBIT_DEFAULT_DEPS = "1"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PV = "0.1cvs${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/config;module=config;method=ext;rsh=ssh \
+           file://gnu-configize.in"
+S = "${WORKDIR}/config"
+
+do_compile() {
+	:
+}
+
+do_install () {
+	install -d ${D}${datadir}/gnu-config \
+		   ${D}${bindir}
+	cat ${WORKDIR}/gnu-configize.in | \
+		sed -e 's,@gnu-configdir@,${datadir}/gnu-config,' \
+		    -e 's,@autom4te_perllibdir@,${D}${datadir}/autoconf,' > ${D}${bindir}/gnu-configize
+	chmod 755 ${D}${bindir}/gnu-configize
+	install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${bindir} ${datadir}/gnu-config"
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 8fae783654..6f475e37f6 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
 
 do_install_append() {
 	install -d ${D}${datadir}/applications/
-	install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}/${datadir}/applications/
+	install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
 	install -d ${D}${datadir}/pixmaps/
 	install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
 }
diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb
index e69de29bb2..23a1832596 100644
--- a/packages/gnuz/gnuz_0.3.bb
+++ b/packages/gnuz/gnuz_0.3.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "gnuZ is a Lemmings style game"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "GPL"
+AUTHOR = "Lukas Fraser"
+HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/"
+DEPENDS = "gnuz-levelmaker-native gnuz-package-native"
+
+SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \
+           http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3_levels.tar.gz \
+		   file://intro_level.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}/gnuz"
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST += "LIBS+=-lqpe"
+
+inherit palmtop
+
+do_compile_append() {
+
+	cd ${WORKDIR}
+	
+	for level in *.conf
+	do
+		if [ $level != 'intro.conf' ] ;then
+			${STAGING_BINDIR}/gnuz_levelmaker `basename $level .conf`.lvl $level
+		fi
+	done
+	${STAGING_BINDIR}/gnuz_levelmaker intro intro.conf
+	cd ${S}/data/
+	${STAGING_BINDIR}/gnuz_package guiimages.dat gui
+	${STAGING_BINDIR}/gnuz_package gnuimages.dat gnu
+	
+	
+}
+
+do_install() {
+
+	install -d ${D}${palmtopdir}/apps/Games \
+			   ${D}${palmtopdir}/pics \
+			   ${D}${palmtopdir}/bin \
+			   ${D}${palmtopdir}/share/gnuz/levels
+
+	install -m 0755 gnuz ${D}${palmtopdir}/bin/
+	install -m 0644 data/gnuz.desktop ${D}${palmtopdir}/apps/Games/
+	install -m 0644 data/gnuz.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/*.lvl ${D}${palmtopdir}/share/gnuz/levels/
+	install -m 0644 ${WORKDIR}/intro ${D}${palmtopdir}/share/gnuz/levels/
+	install -m 0644 ${S}/data/*images.dat ${D}${palmtopdir}/share/gnuz/
+
+}
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
index bcf50ae7d2..ba09ac20b0 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.13.bb
@@ -14,6 +14,6 @@ FILES_${PN} += "${datadir}/gpe"
 do_install_append() {
 	install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-p.svg
 	install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-l.svg
-	mv ${D}/${sysconfdir}/rcS.d/S00bootsplash ${D}/${sysconfdir}/rcS.d/S02bootsplash
+	mv ${D}${sysconfdir}/rcS.d/S00bootsplash ${D}${sysconfdir}/rcS.d/S02bootsplash
 }
 
diff --git a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
index a2bda8b6e0..f84864d353 100644
--- a/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
+++ b/packages/gpe-bootsplash/gpe-bootsplash_1.14.bb
@@ -14,6 +14,6 @@ FILES_${PN} += "${datadir}/gpe"
 do_install_append() {
 	install -m 0644 ${WORKDIR}/splash-p.svg ${D}${datadir}/gpe/splash-p.svg
 	install -m 0644 ${WORKDIR}/splash-l.svg ${D}${datadir}/gpe/splash-l.svg
-	mv ${D}/${sysconfdir}/rcS.d/S00bootsplash ${D}/${sysconfdir}/rcS.d/S02bootsplash
+	mv ${D}${sysconfdir}/rcS.d/S00bootsplash ${D}${sysconfdir}/rcS.d/S02bootsplash
 }
 
diff --git a/packages/gpe-conf/gpe-conf_0.1.19.bb b/packages/gpe-conf/gpe-conf_0.1.19.bb
index 5a93c38856..c44a195903 100644
--- a/packages/gpe-conf/gpe-conf_0.1.19.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.19.bb
@@ -16,6 +16,6 @@ do_compile () {
 
 do_install () {
         oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-	rm -f ${D}/${datadir}/applications/gpe-conf.desktop
+	rm -f ${D}${datadir}/applications/gpe-conf.desktop
 }
 
diff --git a/packages/gpe-conf/gpe-conf_0.1.20.bb b/packages/gpe-conf/gpe-conf_0.1.20.bb
index 3b6feb0419..9a829351ea 100644
--- a/packages/gpe-conf/gpe-conf_0.1.20.bb
+++ b/packages/gpe-conf/gpe-conf_0.1.20.bb
@@ -23,5 +23,5 @@ do_compile () {
 
 do_install () {
         oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
-	rm -f ${D}/${datadir}/applications/gpe-conf.desktop
+	rm -f ${D}${datadir}/applications/gpe-conf.desktop
 }
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
index ef503e4dde..9d199cd780 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb
@@ -14,9 +14,9 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question
 SRC_URI += "file://change-default-applets.patch;patch=1"
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/gpe/xsettings-default.d
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}/${sysconfdir}/gpe/xsettings-default.d/toolbar
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
 	fi
 }
 
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
index 0dacd7a7de..dd10fe50c8 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb
@@ -21,20 +21,20 @@ SRC_URI += "file://zaurus.sh \
 	file://disable-composite.xsettings"
 
 do_install_append() {
-	install ${WORKDIR}/zaurus.sh ${D}/${sysconfdir}/X11/Xinit.d/11zaurus
-	install ${WORKDIR}/keymap.sh ${D}/${sysconfdir}/X11/Xinit.d/12keymap
+	install ${WORKDIR}/zaurus.sh ${D}${sysconfdir}/X11/Xinit.d/11zaurus
+	install ${WORKDIR}/keymap.sh ${D}${sysconfdir}/X11/Xinit.d/12keymap
 	for m in simpad shepherd collie; do
-		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/${sysconfdir}/X11/
+		install -m 0644 ${WORKDIR}/$m.xmodmap ${D}${sysconfdir}/X11/
 	done
-	install -d ${D}/${sysconfdir}/gpe/xsettings-default.d
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
 	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
-		echo "Gtk/ToolbarStyle:S:icons" > ${D}/${sysconfdir}/gpe/xsettings-default.d/toolbar
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
 	fi
-	install -d ${D}/${sysconfdir}/matchbox
-	install ${WORKDIR}/matchbox-session ${D}/${sysconfdir}/matchbox/session
+	install -d ${D}${sysconfdir}/matchbox
+	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
 
-	install -d ${D}/${sysconfdir}/gpe/xsettings-default.d
-	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}/${sysconfdir}/gpe/xsettings-default.d/disable-composite
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
 }
 
 # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
diff --git a/packages/gpsd/gpsd_2.6.bb b/packages/gpsd/gpsd_2.6.bb
index 90f51c65d7..cb32b2d2c6 100644
--- a/packages/gpsd/gpsd_2.6.bb
+++ b/packages/gpsd/gpsd_2.6.bb
@@ -30,19 +30,19 @@ do_stage () {
 }
 
 do_install () {
-	install -d ${D}/${sbindir}
-	install -d ${D}/${mandir}/man1
-	install -d ${D}/${mandir}/man3
-	install -d ${D}/${incdir}
-	install -d ${D}/${libdir}
-	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}${sbindir}
+	install -d ${D}${mandir}/man1
+	install -d ${D}${mandir}/man3
+	install -d ${D}${incdir}
+	install -d ${D}${libdir}
+	install -d ${D}${sysconfdir}/init.d
 
 	install -m 0755 ${S}/.libs/gpsd ${D}${sbindir}
 	oe_libinstall -so -C ${S}/.libs libgps ${D}${libdir}
 	install -m 755 gpsd.1 ${D}${mandir}/man1/gpsd.1
 	install -m 0755 ${S}/libgps.la ${D}${libdir}libgps.la
-	install -m 0755 ${S}/gps.h ${S}/gpsd.h ${D}/${incdir}
-	install -m 755 libgps.3 libgpsd.3 ${D}/${mandir}/man3/
+	install -m 0755 ${S}/gps.h ${S}/gpsd.h ${D}${incdir}
+	install -m 755 libgps.3 libgpsd.3 ${D}${mandir}/man3/
 	install -m 755 gpsd.init ${D}${sysconfdir}/init.d/gpsd
 }
 
diff --git a/packages/gputty/gputty_0.9.7.bb b/packages/gputty/gputty_0.9.7.bb
index 51cc98fbdb..86b42c15f8 100644
--- a/packages/gputty/gputty_0.9.7.bb
+++ b/packages/gputty/gputty_0.9.7.bb
@@ -19,8 +19,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
+	install -d ${D}${bindir}
 	oe_runmake -C src BINDIR="${bindir}" DESTDIR="${D}" install
-	install -d ${D}/${sysconfdir}/
-	install -m 0644 ${WORKDIR}/gputty ${D}/${sysconfdir}/
+	install -d ${D}${sysconfdir}/
+	install -m 0644 ${WORKDIR}/gputty ${D}${sysconfdir}/
 }
diff --git a/packages/gstreamer/gstreamer_0.8.5.bb b/packages/gstreamer/gstreamer_0.8.5.bb
index 2e5ef2a53a..5f85f66fab 100644
--- a/packages/gstreamer/gstreamer_0.8.5.bb
+++ b/packages/gstreamer/gstreamer_0.8.5.bb
@@ -28,7 +28,7 @@ do_stage() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install ${WORKDIR}/gstreamer.xsession ${D}/${sysconfdir}/X11/Xsession.d/90gst-register
+	install -d ${D}${sysconfdir}/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register
 }
 
diff --git a/packages/gstreamer/gstreamer_0.8.7.bb b/packages/gstreamer/gstreamer_0.8.7.bb
index 3f0ce7c307..fdaaa03e30 100644
--- a/packages/gstreamer/gstreamer_0.8.7.bb
+++ b/packages/gstreamer/gstreamer_0.8.7.bb
@@ -27,7 +27,7 @@ do_stage() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install ${WORKDIR}/gstreamer.xsession ${D}/${sysconfdir}/X11/Xsession.d/90gst-register
+	install -d ${D}${sysconfdir}/X11/Xsession.d
+	install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register
 }
 
diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb
index 089f13e996..a3a527c7c1 100644
--- a/packages/gtk+/gtk+-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-1.2_1.2.10.bb
@@ -52,6 +52,6 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-1.2
+	install -d ${D}${sysconfdir}/gtk-1.2
 }
 
diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
index 3d37fda14d..cd6e496a31 100644
--- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb
+++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb
@@ -52,6 +52,6 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-1.2
+	install -d ${D}${sysconfdir}/gtk-1.2
 }
 
diff --git a/packages/gtk+/gtk+_2.2.4.bb b/packages/gtk+/gtk+_2.2.4.bb
index 3eff8adf27..eb4e088b78 100644
--- a/packages/gtk+/gtk+_2.2.4.bb
+++ b/packages/gtk+/gtk+_2.2.4.bb
@@ -61,7 +61,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-2.0
+	install -d ${D}${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.4.13.bb b/packages/gtk+/gtk+_2.4.13.bb
index 968851d951..01a3b2a14e 100644
--- a/packages/gtk+/gtk+_2.4.13.bb
+++ b/packages/gtk+/gtk+_2.4.13.bb
@@ -59,7 +59,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-2.0
+	install -d ${D}${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.4.4.bb b/packages/gtk+/gtk+_2.4.4.bb
index 7830c759c9..690f5efec6 100644
--- a/packages/gtk+/gtk+_2.4.4.bb
+++ b/packages/gtk+/gtk+_2.4.4.bb
@@ -68,7 +68,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-2.0
+	install -d ${D}${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.6.0.bb b/packages/gtk+/gtk+_2.6.0.bb
index bc6c4e27d7..1aa164e182 100644
--- a/packages/gtk+/gtk+_2.6.0.bb
+++ b/packages/gtk+/gtk+_2.6.0.bb
@@ -53,7 +53,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-2.0
+	install -d ${D}${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.6.1.bb b/packages/gtk+/gtk+_2.6.1.bb
index 20a6bf3d7a..1ed4eb13b8 100644
--- a/packages/gtk+/gtk+_2.6.1.bb
+++ b/packages/gtk+/gtk+_2.6.1.bb
@@ -54,7 +54,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-2.0
+	install -d ${D}${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk+/gtk+_2.6.2.bb b/packages/gtk+/gtk+_2.6.2.bb
index b84425217f..33dd7804b4 100644
--- a/packages/gtk+/gtk+_2.6.2.bb
+++ b/packages/gtk+/gtk+_2.6.2.bb
@@ -53,7 +53,7 @@ do_stage () {
 }
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/gtk-2.0
+	install -d ${D}${sysconfdir}/gtk-2.0
 }
 
 python populate_packages_prepend () {
diff --git a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
index e69de29bb2..43b64aa005 100644
--- a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
+++ b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
@@ -0,0 +1,20 @@
+# gtk2-ssh-askpass OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="GTK2 ssh askpass utility"
+HOMEPAGE="http://www.cgabriel.org/sw/gtk2-ssh-askpass/"
+LICENSE = "GPL"
+SECTION = "net-misc"
+
+SRC_URI="http://www.cgabriel.org/sw/gtk2-ssh-askpass/gtk2-ssh-askpass-${PV}.tar.gz \
+	file://makefile.patch;patch=1"
+
+DEPENDS="gtk+"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${libexecdir}
+	cp ${S}/gtk2-ssh-askpass ${D}${bindir}
+	ln -s ${bindir}/gtk2-ssh-askpass ${D}${libexecdir}/ssh-askpass
+}
diff --git a/packages/hdparm/hdparm_5.4.bb b/packages/hdparm/hdparm_5.4.bb
index e69de29bb2..21b5bd5d4d 100644
--- a/packages/hdparm/hdparm_5.4.bb
+++ b/packages/hdparm/hdparm_5.4.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "hdparm is a Linux shell utility for viewing \
+and manipulating various IDE drive and driver parameters."
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PR = "r1"
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-${PV}.tar.gz \
+	   file://bswap.patch;patch=1 \
+	   file://readahead.patch;patch=1"
+
+do_install () {
+	install -d ${D}${sbindir} ${D}${mandir}/man8
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/hostap/hostap-daemon_0.2.4.bb b/packages/hostap/hostap-daemon_0.2.4.bb
index e69de29bb2..86566ce828 100644
--- a/packages/hostap/hostap-daemon_0.2.4.bb
+++ b/packages/hostap/hostap-daemon_0.2.4.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "hostap-modules (${PV}) hostap-utils (${PV})"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz"
+S = "${WORKDIR}/hostapd-${PV}"
+
+do_install() {
+	install -d ${D}${sysconfdir} ${D}${bindir}
+	install -m 0644 hostapd.conf ${D}${sysconfdir}/
+	install -m 0755 hostapd ${D}${bindir}
+}
+
diff --git a/packages/hostap/hostap-modules_0.1.3.bb b/packages/hostap/hostap-modules_0.1.3.bb
index d88da7e971..a471da8d39 100644
--- a/packages/hostap/hostap-modules_0.1.3.bb
+++ b/packages/hostap/hostap-modules_0.1.3.bb
@@ -14,13 +14,13 @@ inherit module
 MAKE_TARGETS = "hostap pccard"
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
-		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
-        	   ${D}/${sysconfdir}/pcmcia
-	install -m 0755 driver/modules/hostap_crypt_wep${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-	install -m 0755 driver/modules/hostap${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-	install -m 0755 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
-        install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf                
-        cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}${sysconfdir}/pcmcia
+	install -m 0755 driver/modules/hostap_crypt_wep${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+	install -m 0755 driver/modules/hostap${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+	install -m 0755 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+        install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf                
+        cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
 
 }
diff --git a/packages/hostap/hostap-modules_0.2.6.bb b/packages/hostap/hostap-modules_0.2.6.bb
index 6b4007425d..ca7ccd6271 100644
--- a/packages/hostap/hostap-modules_0.2.6.bb
+++ b/packages/hostap/hostap-modules_0.2.6.bb
@@ -21,20 +21,20 @@ MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
 NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
-		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
-        	   ${D}/${sysconfdir}/pcmcia
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}${sysconfdir}/pcmcia
 	for i in ${NET_MODULES}
 	do
-		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
 	done
-	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
-	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
-	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+	cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
 
 	if [ "${MACHINE}" = "mtx-1" ]; then
-		install -d ${D}/${sysconfdir}/modutils
-		echo "hostap_pci" > ${D}/${sysconfdir}/modutils/hostap
+		install -d ${D}${sysconfdir}/modutils
+		echo "hostap_pci" > ${D}${sysconfdir}/modutils/hostap
 	fi
 }
 
diff --git a/packages/hostap/hostap-modules_0.3.5.bb b/packages/hostap/hostap-modules_0.3.5.bb
index 6db38c4f35..0aa8e846ea 100644
--- a/packages/hostap/hostap-modules_0.3.5.bb
+++ b/packages/hostap/hostap-modules_0.3.5.bb
@@ -22,16 +22,16 @@ MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'"
 NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
-		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
-        	   ${D}/${sysconfdir}/pcmcia
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}${sysconfdir}/pcmcia
 	for i in ${NET_MODULES}
 	do
-		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
 	done
-	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
-	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
-	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+	cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
 }
 
 PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb
index a68d8b959b..de7fe1d5f6 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -22,16 +22,16 @@ MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'"
 NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net \
-		   ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
-        	   ${D}/${sysconfdir}/pcmcia
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
+		   ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+        	   ${D}${sysconfdir}/pcmcia
 	for i in ${NET_MODULES}
 	do
-		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
+		install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
 	done
-	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
-	install -m 0644 driver/etc/hostap_cs.conf ${D}/${sysconfdir}/pcmcia/hostap_cs.conf
-	cat ${WORKDIR}/hostap_cs.conf >>${D}/${sysconfdir}/pcmcia/hostap_cs.conf
+	install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+	cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
 }
 
 PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
diff --git a/packages/hostap/hostap-utils_0.2.6.bb b/packages/hostap/hostap-utils_0.2.6.bb
index e69de29bb2..deafe7c026 100644
--- a/packages/hostap/hostap-utils_0.2.6.bb
+++ b/packages/hostap/hostap-utils_0.2.6.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "User mode helpers for the hostap driver"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "hostap-modules (${PV})"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
+	   file://hostap-fw-load.patch;patch=1"
+S = "${WORKDIR}/hostap-utils-${PV}"
+
+BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \
+	    hostap_rid prism2_param prism2_srec split_combined_hex"
+
+do_install() {
+	install -d ${D}${sbindir}/
+	for f in ${BINARIES}
+	do
+		install -m 0755 $f ${D}${sbindir}/
+	done
+}
+
diff --git a/packages/hostap/hostap-utils_0.3.2.bb b/packages/hostap/hostap-utils_0.3.2.bb
index e69de29bb2..49036a7421 100644
--- a/packages/hostap/hostap-utils_0.3.2.bb
+++ b/packages/hostap/hostap-utils_0.3.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "User mode helpers for the hostap driver"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "hostap-modules (${PV})"
+PR = "r1"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
+	   file://hostap-fw-load.patch;patch=1"
+S = "${WORKDIR}/hostap-utils-${PV}"
+
+BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \
+	    hostap_rid prism2_param prism2_srec split_combined_hex"
+
+do_install() {
+	install -d ${D}${sbindir}/
+	for f in ${BINARIES}
+	do
+		install -m 0755 $f ${D}${sbindir}/
+	done
+}
+
diff --git a/packages/hostap/hostap-utils_0.3.7.bb b/packages/hostap/hostap-utils_0.3.7.bb
index e69de29bb2..93a3cb550e 100644
--- a/packages/hostap/hostap-utils_0.3.7.bb
+++ b/packages/hostap/hostap-utils_0.3.7.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "User mode helpers for the hostap driver"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "hostap-modules (${PV})"
+PR = "r0"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
+	   file://hostap-fw-load.patch;patch=1"
+S = "${WORKDIR}/hostap-utils-${PV}"
+
+BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \
+	    hostap_rid prism2_param prism2_srec split_combined_hex"
+
+do_install() {
+	install -d ${D}${sbindir}/
+	for f in ${BINARIES}
+	do
+		install -m 0755 $f ${D}${sbindir}/
+	done
+}
+
diff --git a/packages/htb-init/htb-init_0.8.5.bb b/packages/htb-init/htb-init_0.8.5.bb
index 7a3d69e4e9..f0f79ba6ed 100644
--- a/packages/htb-init/htb-init_0.8.5.bb
+++ b/packages/htb-init/htb-init_0.8.5.bb
@@ -13,7 +13,7 @@ RDEPENDS = "iproute2 (>= 2.6.8-r1)"
 S="${WORKDIR}"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/htb
-	install -m 755 ${S}/htb.init-v${PV} ${D}/${sysconfdir}/init.d/htb
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/htb
+	install -m 755 ${S}/htb.init-v${PV} ${D}${sysconfdir}/init.d/htb
 }
diff --git a/packages/hugs/hugs_hugs98-Nov2003.bb b/packages/hugs/hugs_hugs98-Nov2003.bb
index cc249fc9af..9ad5247375 100644
--- a/packages/hugs/hugs_hugs98-Nov2003.bb
+++ b/packages/hugs/hugs_hugs98-Nov2003.bb
@@ -25,7 +25,7 @@ do_compile() {
 do_install() {
     cd ../ && autotools_do_install
     install -d ${D}${datadir}/applications/
-    install -m 0644 ${WORKDIR}/hugs.desktop ${D}/${datadir}/applications/
+    install -m 0644 ${WORKDIR}/hugs.desktop ${D}${datadir}/applications/
     install -d ${D}${datadir}/pixmaps/
     install -m 0644 ${WORKDIR}/hugs.png ${D}${datadir}/pixmaps/
 }
diff --git a/packages/hvsc/hvsc_5.8.bb b/packages/hvsc/hvsc_5.8.bb
index 9c3132e779..027eb13c7f 100644
--- a/packages/hvsc/hvsc_5.8.bb
+++ b/packages/hvsc/hvsc_5.8.bb
@@ -8,8 +8,8 @@ SRC_URI = "http://gallium.prg.dtu.dk/HVSC/random/HVSC_${PV}-all-of-them.zip"
 S = "${WORKDIR}"
 
 do_install() {
-	install -d ${D}/${datadir}/hvsc
-	unzip -d ${D}/${datadir}/hvsc C64Music.zip
+	install -d ${D}${datadir}/hvsc
+	unzip -d ${D}${datadir}/hvsc C64Music.zip
 }
 
 PACKAGE_ARCH = "all"
diff --git a/packages/hydra/hydra_4.4.bb b/packages/hydra/hydra_4.4.bb
index e69de29bb2..dacb5ada8d 100644
--- a/packages/hydra/hydra_4.4.bb
+++ b/packages/hydra/hydra_4.4.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "A very fast network logon cracker which support many different services"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+SECTION = "console/network"
+DEPENDS = "openssl"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://thc.org/releases/hydra-${PV}-src.tar.gz"
+S = "${WORKDIR}/hydra-${PV}-src"
+
+inherit autotools
+
+do_configure() {
+	echo "Now that's a sucky build system..."
+	cp -f Makefile.am Makefile
+}
+
+BINARIES = "pw-inspector hydra"
+
+do_install() {
+	install -d ${D}${bindir}
+	for f in ${BINARIES}
+	do
+		install -m 0755 $f ${D}${bindir}
+	done
+}
diff --git a/packages/hydra/hydra_4.5.bb b/packages/hydra/hydra_4.5.bb
index e69de29bb2..dacb5ada8d 100644
--- a/packages/hydra/hydra_4.5.bb
+++ b/packages/hydra/hydra_4.5.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "A very fast network logon cracker which support many different services"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+SECTION = "console/network"
+DEPENDS = "openssl"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://thc.org/releases/hydra-${PV}-src.tar.gz"
+S = "${WORKDIR}/hydra-${PV}-src"
+
+inherit autotools
+
+do_configure() {
+	echo "Now that's a sucky build system..."
+	cp -f Makefile.am Makefile
+}
+
+BINARIES = "pw-inspector hydra"
+
+do_install() {
+	install -d ${D}${bindir}
+	for f in ${BINARIES}
+	do
+		install -m 0755 $f ${D}${bindir}
+	done
+}
diff --git a/packages/iaimaster/iaimaster_0.5.bb b/packages/iaimaster/iaimaster_0.5.bb
index e69de29bb2..d47b81dfba 100644
--- a/packages/iaimaster/iaimaster_0.5.bb
+++ b/packages/iaimaster/iaimaster_0.5.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Pen action mini game. You fight evil Iai-Master and must survive. \
+(Iai is a kind of the samurai fighting style)"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+SECTION = "opie/games"
+LICENSE = "GPL"
+APPNAME = "${PN}"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+
+SRC_URI = "http://www.urban.ne.jp/home/kanemori/zaurus/IaiMaster_${PV}.tar.gz \
+           file://iaimaster.desktop \
+           file://iaimaster.png"
+S = "${WORKDIR}/IaiMaster"
+
+inherit opie
+
+EXTRA_QMAKEVARS_POST = "TARGET=${PN}"
+
+do_configure_prepend() {
+	qmake -project
+}
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/iaimaster.png ${D}${palmtopdir}/pics/
+}
+
diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.4.bb
index e2d21f10d4..81490eda01 100644
--- a/packages/ifupdown/ifupdown_0.6.4.bb
+++ b/packages/ifupdown/ifupdown_0.6.4.bb
@@ -23,11 +23,11 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}/init.d \
-		   ${D}/${sysconfdir}/network \
-		   ${D}/${base_sbindir}
-	install -m 0755 ifup ${D}/${base_sbindir}/
-	ln ${D}/${base_sbindir}/ifup ${D}/${base_sbindir}/ifdown
-	install -m 0644 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/networking
-	install -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
+	install -d ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/network \
+		   ${D}${base_sbindir}
+	install -m 0755 ifup ${D}${base_sbindir}/
+	ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown
+	install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
+	install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
 }
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 076a69576c..6728f628c8 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -52,91 +52,91 @@ do_install () {
 #
 # Create directories and install device independent scripts
 #
-	install -d ${D}/${sysconfdir}/init.d \
-		   ${D}/${sysconfdir}/rcS.d \
-		   ${D}/${sysconfdir}/rc0.d \
-		   ${D}/${sysconfdir}/rc1.d \
-		   ${D}/${sysconfdir}/rc2.d \
-		   ${D}/${sysconfdir}/rc3.d \
-		   ${D}/${sysconfdir}/rc4.d \
-		   ${D}/${sysconfdir}/rc5.d \
-		   ${D}/${sysconfdir}/rc6.d \
-		   ${D}/${sysconfdir}/default
+	install -d ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/rcS.d \
+		   ${D}${sysconfdir}/rc0.d \
+		   ${D}${sysconfdir}/rc1.d \
+		   ${D}${sysconfdir}/rc2.d \
+		   ${D}${sysconfdir}/rc3.d \
+		   ${D}${sysconfdir}/rc4.d \
+		   ${D}${sysconfdir}/rc5.d \
+		   ${D}${sysconfdir}/rc6.d \
+		   ${D}${sysconfdir}/default
 
-	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/checkroot.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/finish		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/halt		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/hostname.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/mountall.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/mountnfs.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/ramdisk		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/reboot		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/rmnologin	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/sendsigs		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/single		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/urandom		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/devpts.sh	${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/devpts		${D}/${sysconfdir}/default
-	install -m 0755    ${WORKDIR}/sysfs.sh		${D}/${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/bootmisc.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/checkroot.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/finish		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/halt		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/hostname.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/mountall.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/mountnfs.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/ramdisk		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/reboot		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rmnologin	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/sendsigs		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/single		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/urandom		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/devpts.sh	${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
+	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
 	if [ "${TARGET_ARCH}" = "arm" ]; then
-		install -m 0755 ${WORKDIR}/alignment.sh	${D}/${sysconfdir}/init.d
+		install -m 0755 ${WORKDIR}/alignment.sh	${D}${sysconfdir}/init.d
 	fi
 #
 # Install device dependent scripts
 #
 
 	if [ "${DISTRO}" == "openzaurus" ]; then
-		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}/${sysconfdir}/init.d/checkversion
-        	chmod 0755 				${D}/${sysconfdir}/init.d/checkversion
-		ln -sf          ../init.d/checkversion  ${D}/${sysconfdir}/rcS.d/S00version
+		cat ${WORKDIR}/checkversion | sed -e "s,VERSION,${KERNEL_VERSION}-${DISTRO_VERSION}," > ${D}${sysconfdir}/init.d/checkversion
+        	chmod 0755 				${D}${sysconfdir}/init.d/checkversion
+		ln -sf          ../init.d/checkversion  ${D}${sysconfdir}/rcS.d/S00version
 	fi
 
 	if [ "${MACHINE}" == "c7x0" ]; then
-		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}/${sysconfdir}
-		install -m 0755    ${WORKDIR}/keymap				${D}/${sysconfdir}/init.d
-		ln -sf          ../init.d/keymap  				${D}/${sysconfdir}/rcS.d/S04keymap
+		install -m 0755    ${WORKDIR}/corgikeymap-2.6.map		${D}${sysconfdir}
+		install -m 0755    ${WORKDIR}/keymap				${D}${sysconfdir}/init.d
+		ln -sf          ../init.d/keymap  				${D}${sysconfdir}/rcS.d/S04keymap
 	fi
 
 
-	install -m 0755 ${WORKDIR}/banner	${D}/${sysconfdir}/init.d/banner
-	install -m 0755 ${WORKDIR}/devices	${D}/${sysconfdir}/init.d/devices
-	install -m 0755 ${WORKDIR}/umountfs	${D}/${sysconfdir}/init.d/umountfs
+	install -m 0755 ${WORKDIR}/banner	${D}${sysconfdir}/init.d/banner
+	install -m 0755 ${WORKDIR}/devices	${D}${sysconfdir}/init.d/devices
+	install -m 0755 ${WORKDIR}/umountfs	${D}${sysconfdir}/init.d/umountfs
 #
 # Create runlevel links
 #
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc2.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc3.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc4.d/S99rmnologin
-	ln -sf		../init.d/rmnologin	${D}/${sysconfdir}/rc5.d/S99rmnologin
-	ln -sf		../init.d/sendsigs	${D}/${sysconfdir}/rc6.d/S20sendsigs
-#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rc6.d/S30urandom
-	ln -sf		../init.d/umountnfs.sh	${D}/${sysconfdir}/rc6.d/S31umountnfs.sh
-#	ln -sf		../init.d/umountfs	${D}/${sysconfdir}/rc6.d/S40umountfs
-	ln -sf          ../init.d/ramdisk       ${D}/${sysconfdir}/rcS.d/S30ramdisk 
-	ln -sf		../init.d/reboot	${D}/${sysconfdir}/rc6.d/S90reboot
-	ln -sf		../init.d/sendsigs	${D}/${sysconfdir}/rc0.d/S20sendsigs
-#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rc0.d/S30urandom
-	ln -sf		../init.d/umountnfs.sh	${D}/${sysconfdir}/rc0.d/S31umountnfs.sh
-#	ln -sf		../init.d/umountfs	${D}/${sysconfdir}/rc0.d/S40umountfs
-	ln -sf		../init.d/halt		${D}/${sysconfdir}/rc0.d/S90halt
-	ln -sf		../init.d/banner	${D}/${sysconfdir}/rcS.d/S01banner
-	ln -sf		../init.d/checkroot.sh	${D}/${sysconfdir}/rcS.d/S10checkroot.sh
-#	ln -sf		../init.d/checkfs.sh	${D}/${sysconfdir}/rcS.d/S30checkfs.sh
-	ln -sf		../init.d/mountall.sh	${D}/${sysconfdir}/rcS.d/S35mountall.sh
-	ln -sf		../init.d/hostname.sh	${D}/${sysconfdir}/rcS.d/S40hostname.sh
-	ln -sf		../init.d/mountnfs.sh	${D}/${sysconfdir}/rcS.d/S45mountnfs.sh
-	ln -sf		../init.d/bootmisc.sh	${D}/${sysconfdir}/rcS.d/S55bootmisc.sh
-#	ln -sf		../init.d/urandom	${D}/${sysconfdir}/rcS.d/S55urandom
-	ln -sf		../init.d/finish	${D}/${sysconfdir}/rcS.d/S99finish
-	ln -sf		../init.d/devices	${D}/${sysconfdir}/rcS.d/S04devices
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc2.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc3.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc4.d/S99rmnologin
+	ln -sf		../init.d/rmnologin	${D}${sysconfdir}/rc5.d/S99rmnologin
+	ln -sf		../init.d/sendsigs	${D}${sysconfdir}/rc6.d/S20sendsigs
+#	ln -sf		../init.d/urandom	${D}${sysconfdir}/rc6.d/S30urandom
+	ln -sf		../init.d/umountnfs.sh	${D}${sysconfdir}/rc6.d/S31umountnfs.sh
+#	ln -sf		../init.d/umountfs	${D}${sysconfdir}/rc6.d/S40umountfs
+	ln -sf          ../init.d/ramdisk       ${D}${sysconfdir}/rcS.d/S30ramdisk 
+	ln -sf		../init.d/reboot	${D}${sysconfdir}/rc6.d/S90reboot
+	ln -sf		../init.d/sendsigs	${D}${sysconfdir}/rc0.d/S20sendsigs
+#	ln -sf		../init.d/urandom	${D}${sysconfdir}/rc0.d/S30urandom
+	ln -sf		../init.d/umountnfs.sh	${D}${sysconfdir}/rc0.d/S31umountnfs.sh
+#	ln -sf		../init.d/umountfs	${D}${sysconfdir}/rc0.d/S40umountfs
+	ln -sf		../init.d/halt		${D}${sysconfdir}/rc0.d/S90halt
+	ln -sf		../init.d/banner	${D}${sysconfdir}/rcS.d/S01banner
+	ln -sf		../init.d/checkroot.sh	${D}${sysconfdir}/rcS.d/S10checkroot.sh
+#	ln -sf		../init.d/checkfs.sh	${D}${sysconfdir}/rcS.d/S30checkfs.sh
+	ln -sf		../init.d/mountall.sh	${D}${sysconfdir}/rcS.d/S35mountall.sh
+	ln -sf		../init.d/hostname.sh	${D}${sysconfdir}/rcS.d/S40hostname.sh
+	ln -sf		../init.d/mountnfs.sh	${D}${sysconfdir}/rcS.d/S45mountnfs.sh
+	ln -sf		../init.d/bootmisc.sh	${D}${sysconfdir}/rcS.d/S55bootmisc.sh
+#	ln -sf		../init.d/urandom	${D}${sysconfdir}/rcS.d/S55urandom
+	ln -sf		../init.d/finish	${D}${sysconfdir}/rcS.d/S99finish
+	ln -sf		../init.d/devices	${D}${sysconfdir}/rcS.d/S04devices
 	# udev will run at S03 if installed
-	ln -sf		../init.d/sysfs.sh	${D}/${sysconfdir}/rcS.d/S02sysfs
-	ln -sf		../init.d/devpts.sh	${D}/${sysconfdir}/rcS.d/S38devpts.sh
+	ln -sf		../init.d/sysfs.sh	${D}${sysconfdir}/rcS.d/S02sysfs
+	ln -sf		../init.d/devpts.sh	${D}${sysconfdir}/rcS.d/S38devpts.sh
 	if [ "${TARGET_ARCH}" = "arm" ]; then
-		ln -sf	../init.d/alignment.sh	${D}/${sysconfdir}/rcS.d/S05alignment
+		ln -sf	../init.d/alignment.sh	${D}${sysconfdir}/rcS.d/S05alignment
 	fi
 
-	install -m 0755    ${WORKDIR}/device_table.txt		${D}/${sysconfdir}/device_table
+	install -m 0755    ${WORKDIR}/device_table.txt		${D}${sysconfdir}/device_table
 }
diff --git a/packages/inkwp/inkwp_0.1.1.bb b/packages/inkwp/inkwp_0.1.1.bb
index e69de29bb2..9d7e25ad03 100644
--- a/packages/inkwp/inkwp_0.1.1.bb
+++ b/packages/inkwp/inkwp_0.1.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Inkwp - a handwriting note take application for Qt/Embedded based palmtop environments."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp.html"
+
+SRC_URI = "http://www.geocities.co.jp/SiliconValley-Oakland/4550/inkwp-${PV}.tar.gz"
+S = "${WORKDIR}/inkwp"
+
+inherit palmtop
+
+do_install() {
+        install -d ${D}${palmtopdir}/apps/Applications/
+        install -d ${D}${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/pics/inkwp/
+        install -m 0755 inkwp ${D}${palmtopdir}/bin/
+	install -m 0644 InkWp.png ${D}${palmtopdir}/pics/
+	install -m 0644 *.png ${D}${palmtopdir}/pics/inkwp/
+	install -m 0644 inkwp.desktop ${D}${palmtopdir}/apps/Applications/
+}
diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb
index e69de29bb2..3f4001356b 100644
--- a/packages/inputpipe/inputpipe_svn.bb
+++ b/packages/inputpipe/inputpipe_svn.bb
@@ -0,0 +1,24 @@
+SECTION = "base"
+PRIORITY = "optional"
+DESCRIPTION = "Inputpipe is a network transparency layer for linux input devices"
+MAINTAINER = "Micah Dowty <micah@navi.cx>"
+LICENSE = "GPL"
+PV = "svn-${CVSDATE}"
+SRC_URI = "svn://navi.cx/svn/misc/trunk;module=inputpipe"
+
+S = "${WORKDIR}/inputpipe"
+
+do_compile() {
+	oe_runmake CC="${CC}" CFLAGS="-I ${WORKDIR}/inputpipe/uinput ${CFLAGS}"
+}
+
+do_install() {
+        install -d ${D}${bindir}
+	install	inputpipe-server ${D}${bindir}
+	install	inputpipe-client ${D}${bindir}
+}
+
+PACKAGES = "inputpipe-server inputpipe-client"
+
+FILES_inputpipe-client = "${bindir}/inputpipe-client"
+FILES_inputpipe-server = "${bindir}/inputpipe-server"
diff --git a/packages/ipac-ng/ipac-ng_1.30.bb b/packages/ipac-ng/ipac-ng_1.30.bb
index e69de29bb2..2c22353358 100644
--- a/packages/ipac-ng/ipac-ng_1.30.bb
+++ b/packages/ipac-ng/ipac-ng_1.30.bb
@@ -0,0 +1,20 @@
+SECTION = "console/network"
+DESCRIPTION = "IPAC-NG is the iptables/ipchains based IP accounting package for Linux"
+HOMEPAGE = "http://ipac-ng.sourceforge.net/"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+SRC_URI = "${SOURCEFORGE_MIRROR}/ipac-ng/ipac-ng-${PV}.tar.bz2 \
+	file://makefile-build-cc.diff;patch=1;pnum=0"
+RDEPENDS = "perl libgd-perl"
+LICENSE = "GPL"
+
+inherit autotools
+
+do_configure() {
+	oe_runconf
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/ipac-ng
+	install -m 644 ${S}/doc/ipac.conf.sample ${D}${sysconfdir}/ipac-ng
+	install -m 644 ${S}/doc/rules.conf.sample ${D}${sysconfdir}/ipac-ng
+}
diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb
index f8287acc48..1305c5dc90 100644
--- a/packages/ipaq-boot-params/ipaq-boot-params.bb
+++ b/packages/ipaq-boot-params/ipaq-boot-params.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SRC_URI = "file://params"
 
 do_install() {
-	install -d ${D}/boot
-	install -m 0644 ${WORKDIR}/params ${D}/boot/
+	install -d ${D}boot
+	install -m 0644 ${WORKDIR}/params ${D}boot/
 }
 
diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb
index e69de29bb2..3434bfc3a7 100644
--- a/packages/iperf/iperf_1.7.0.bb
+++ b/packages/iperf/iperf_1.7.0.bb
@@ -0,0 +1,27 @@
+SECTION = "console/network"
+DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
+HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
+LICENSE = "BSD"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+
+SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \
+	file://socketaddr-h-errno.diff;patch=1;pnum=0"
+
+inherit autotools
+
+S=${WORKDIR}/iperf-${PV}/cfg
+PATCHES_DIR=${WORKDIR}/iperf-${PV}
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile() {
+	cd ${WORKDIR}/iperf-${PV}
+	oe_runmake
+}
+
+do_install() {
+	cd ${WORKDIR}/iperf-${PV}/src
+	oe_runmake INSTALL_DIR=${D}${bindir} install
+}
diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs.bb b/packages/ipkg-utils/ipkg-link_1.6cvs.bb
index e69de29bb2..1b46a35c3c 100644
--- a/packages/ipkg-utils/ipkg-link_1.6cvs.bb
+++ b/packages/ipkg-utils/ipkg-link_1.6cvs.bb
@@ -0,0 +1,20 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager utilities link script"
+LICENSE = "GPL"
+CONFLICTS = "ipkg-utils"
+PV_append = "${CVSDATE}"
+
+SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
+	   file://fix-ipkg-link.patch;patch=1 "
+	   
+SRC_URI_append_beagle = "file://fix-ipkg-link-beagle.patch;patch=1"	   
+S = "${WORKDIR}/ipkg-utils"
+
+do_compile() {
+	:
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ipkg-link ${D}${bindir}
+}
diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb
index f718596edb..8d76e60748 100644
--- a/packages/ipkg/ipkg-collateral.bb
+++ b/packages/ipkg/ipkg-collateral.bb
@@ -16,6 +16,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}/
-	install -m 0644 ${WORKDIR}/ipkg.conf ${D}/${sysconfdir}/ipkg.conf
+	install -d ${D}${sysconfdir}/
+	install -m 0644 ${WORKDIR}/ipkg.conf ${D}${sysconfdir}/ipkg.conf
 }
diff --git a/packages/iptables/iptables_1.2.11.bb b/packages/iptables/iptables_1.2.11.bb
index 7b034b5830..0d6d8ccadf 100644
--- a/packages/iptables/iptables_1.2.11.bb
+++ b/packages/iptables/iptables_1.2.11.bb
@@ -18,11 +18,11 @@ export KERNEL_DIR = "${STAGING_INCDIR}"
 
 do_compile () {
 	unset CFLAGS
-	oe_runmake BINDIR=${D}/${bindir} LIBDIR=${D}/${libdir} MANDIR=${D}/${mandir} NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
 }
 
 do_install () {
-	oe_runmake BINDIR=${D}/${bindir} LIBDIR=${D}/${libdir} MANDIR=${D}/${mandir} install NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
 }
 
 FILES_${PN}-doc += "${mandir}"
diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb
index 028be89aff..d08a1fc806 100644
--- a/packages/iptables/iptables_1.2.9.bb
+++ b/packages/iptables/iptables_1.2.9.bb
@@ -11,10 +11,10 @@ export KERNEL_DIR = "${STAGING_INCDIR}"
 
 do_compile () {
 	unset CFLAGS
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}usr/man NO_SHARED_LIBS=1
 }
 
 do_install () {
 #	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
-	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}/usr/man install NO_SHARED_LIBS=1
+	oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}usr/man install NO_SHARED_LIBS=1
 }
diff --git a/packages/iputils/iputils_20020927.bb b/packages/iputils/iputils_20020927.bb
index 54f783ea81..8ec7f54e2b 100644
--- a/packages/iputils/iputils_20020927.bb
+++ b/packages/iputils/iputils_20020927.bb
@@ -18,13 +18,13 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${base_bindir} ${D}${sbindir} \
-		   ${D}/${mandir}/man8 ${D}/${docdir}/${P}
-	install -m 0755 ping ${D}/${base_bindir}/
+	install -d ${D}${base_bindir} ${D}${sbindir} \
+		   ${D}${mandir}/man8 ${D}${docdir}/${P}
+	install -m 0755 ping ${D}${base_bindir}/
 	for f in ipg tracepath clockdiff rdisc arping \
 		tftpd rarpd tracepath6 traceroute6 ping6; do
-		install -m 0755 $f ${D}/${sbindir}/
+		install -m 0755 $f ${D}${sbindir}/
 	done
-	install -m 0644 doc/*.8 ${D}/${mandir}/man8/
-	install -m 0644 doc/*.html ${D}/${docdir}/${P}/
+	install -m 0644 doc/*.8 ${D}${mandir}/man8/
+	install -m 0644 doc/*.html ${D}${docdir}/${P}/
 }
diff --git a/packages/iqnotes/iqnotes_2.0.2.bb b/packages/iqnotes/iqnotes_2.0.2.bb
index 833e0fcf40..d8245f5f23 100644
--- a/packages/iqnotes/iqnotes_2.0.2.bb
+++ b/packages/iqnotes/iqnotes_2.0.2.bb
@@ -21,14 +21,14 @@ export OE_QMAKE_LINK="${CXX}"
 
 
 do_install() {
-        install -d ${D}/${palmtopdir}/help/html \
-		   ${D}/${palmtopdir}/bin \
-		   ${D}/${palmtopdir}/apps/Applications \
-		   ${D}/${palmtopdir}/pics/iqnotes/items \
-		   ${D}/${palmtopdir}/iqnotes/icons
-        install -m 0755 ${S}/../bin/iqnotes ${D}/${palmtopdir}/bin/
-        install -m 0644 ${S}/../apps/Applications/*.desktop ${D}/${palmtopdir}/apps/Applications/
-        install -m 0644 ${S}/../pics/iqnotes/*.png ${D}/${palmtopdir}/pics/iqnotes/
-        install -m 0644 ${S}/../help/html/iqnotes.html ${D}/${palmtopdir}/help/html/
-        install -m 0644 ${S}/../pics/*.xpm ${D}/${palmtopdir}/pics/
+        install -d ${D}${palmtopdir}/help/html \
+		   ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Applications \
+		   ${D}${palmtopdir}/pics/iqnotes/items \
+		   ${D}${palmtopdir}/iqnotes/icons
+        install -m 0755 ${S}/../bin/iqnotes ${D}${palmtopdir}/bin/
+        install -m 0644 ${S}/../apps/Applications/*.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 ${S}/../pics/iqnotes/*.png ${D}${palmtopdir}/pics/iqnotes/
+        install -m 0644 ${S}/../help/html/iqnotes.html ${D}${palmtopdir}/help/html/
+        install -m 0644 ${S}/../pics/*.xpm ${D}${palmtopdir}/pics/
 }
diff --git a/packages/irda-utils/irda-utils_0.9.16.bb b/packages/irda-utils/irda-utils_0.9.16.bb
index 36b80a1b71..d99846f8cd 100644
--- a/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/packages/irda-utils/irda-utils_0.9.16.bb
@@ -25,6 +25,6 @@ do_install () {
 	oe_runmake -C irattach ROOT="${D}" install
 	oe_runmake -C irdaping ROOT="${D}" install
 
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/irattach
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/irattach
 }
diff --git a/packages/irk/irk-belkin_0.11.bb b/packages/irk/irk-belkin_0.11.bb
index e69de29bb2..a8d6056914 100644
--- a/packages/irk/irk-belkin_0.11.bb
+++ b/packages/irk/irk-belkin_0.11.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "IRK provides a Qtopia/Opie Input Method plugin that allows you to use external infrared keyboards with the Zaurus. (version with Belkin support instead of Targus)"
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe lirc"
+RDEPENDS = "lirc"
+RPROVIDES = "irk"
+RCONFLICTS = "irk"
+RREPLACES = "irk"
+PR = "r1"
+
+SRC_URI = "http://kopsisengineering.com/irk-current.tgz \
+           file://install-default-conf.patch;patch=1"
+S = "${WORKDIR}/irk"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc"
+
+do_install() {
+	install -d ${D}${sysconfdir}/
+	install -d ${D}${palmtopdir}/etc/skel/
+	install -d ${D}${palmtopdir}/plugins/inputmethods/
+
+	install -m 0644 chicony.conf ${D}${sysconfdir}/lircd.conf
+	install -m 0644 IRK.conf ${D}${palmtopdir}/etc/skel/
+	oe_libinstall -so libirk ${D}${palmtopdir}/plugins/inputmethods
+}
+
+FILES_${PN} += "${sysconfdir}"
diff --git a/packages/irk/irk_0.11.bb b/packages/irk/irk_0.11.bb
index e69de29bb2..687dee3b50 100644
--- a/packages/irk/irk_0.11.bb
+++ b/packages/irk/irk_0.11.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "IRK provides a Qtopia/Opie Input Method plugin that allows you to use external infrared keyboards with the Zaurus."
+SECTION = "opie/inputmethods"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://angela1.data-uncertain.co.uk/~zaurus/irk.php"
+DEPENDS = "virtual/libqpe lirc"
+RCONFLICTS = "irk-belkin"
+RREPLACES = "irk-belkin"
+PR = "r1"
+REALV = "0.11.0"
+
+SRC_URI = "http://angela1.data-uncertain.co.uk/~zaurus/irk-${REALV}.tgz"
+S = "${WORKDIR}/irk"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia INCLUDEPATH+=${STAGING_INCDIR}/lirc"
+
+do_install() {
+	install -d ${D}${sysconfdir}
+	install -d ${D}${palmtopdir}/plugins/inputmethods/
+	install -d ${D}home/root/Settings/
+
+	install chicony.conf ${D}${sysconfdir}/lircd.conf
+	install IRK.conf ${D}${sysconfdir}
+	oe_libinstall -so libirk ${D}${palmtopdir}/plugins/inputmethods
+}
+
+FILES_irk_append=" /etc /home/root"
+
diff --git a/packages/irssi/irssi_cvs.bb b/packages/irssi/irssi_cvs.bb
index e69de29bb2..f1a2bc6f7c 100644
--- a/packages/irssi/irssi_cvs.bb
+++ b/packages/irssi/irssi_cvs.bb
@@ -0,0 +1,69 @@
+DESCRIPTION = "Irssi is a modular IRC client with Perl scripting."
+HOMEPAGE = "http://irssi.org/"
+SECTION = "console/network"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+DEPENDS += "ncurses glib-2.0"
+PV = "0.8.9+cvs${CVSDATE}"
+PR = "r2"
+
+PACKAGES += "${PN}-common"
+FILES_${PN} = "${bindir}/irssi"
+FILES_${PN}-common = "${datadir}/irssi ${sysconfdir}"
+RDEPENDS_${PN} += "${PN}-common"
+
+inherit autotools
+
+SRC_URI = "cvs://anonymous:@cvs.irssi.org/home/cvs;module=irssi \
+	   file://autofoo.patch;patch=1"
+S = "${WORKDIR}/irssi"
+
+EXTRA_OECONF = "--enable-ipv6 \
+		--disable-ssl \
+		--disable-glibtest \
+		--without-socks \
+		--with-textui \
+		--without-bot \
+		--without-proxy \
+		--without-glib1 \
+		--with-glib2 \
+		--with-perl=no \
+		--with-glib-prefix=${STAGING_LIBDIR}/.. \
+		--with-glib-exec-prefix=${STAGING_LIBDIR}/.. \
+		--with-ncurses=${STAGING_LIBDIR}/.."
+
+do_configure () {
+	# create help files
+	echo "Creating help files..."
+	perl syntax.pl
+	
+	files=`echo docs/help/in/*.in|sed -e 's,docs/help/in/Makefile.in ,,' -e 's,docs/help/in/,!,g' -e 's/\.in /.in ?/g'`
+	cat docs/help/in/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/in/Makefile.am
+	
+	files=`echo $files|sed 's/\.in//g'`
+	cat docs/help/Makefile.am.gen|sed "s/@HELPFILES@/$files/g"|sed 's/?/\\?/g'|tr '!?' '\t\n' > docs/help/Makefile.am
+	
+	# .HTML -> .txt with lynx
+	# echo "Documentation: html -> txt..."
+	# lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+	> docs/faq.txt
+	
+	autotools_do_configure
+}
+
+do_stage () {
+	find . -name \*.h | for h in `cat`; do
+		install -d ${STAGING_LIBDIR}/../irssi/`dirname $h`
+		install -m 0644 $h ${STAGING_LIBDIR}/../irssi/$h
+	done
+	find . -name lib\*.a | for l in `cat`; do
+		install -d ${STAGING_LIBDIR}/../irssi/`dirname $l`
+		install -m 0644 $l ${STAGING_LIBDIR}/../irssi/$l
+	done
+	install -m 0644 irssi-config ${STAGING_LIBDIR}/../irssi/
+}
+
+do_install () {
+	autotools_do_install
+	rm -f ${D}${docdir}/irssi/faq.txt
+}
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index f77a7c0172..5f1e37220a 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -42,6 +42,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
-	install -m 0644 ixp425_eth.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net
+	install -m 0644 ixp425_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/
 }
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index fcf25e01b4..b9738a86fc 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -40,6 +40,6 @@ do_stage () {
 }
 
 do_install () {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400
-	install -m 0644 lib/linuxbe/ixp400.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400
+	install -m 0644 lib/linuxbe/ixp400.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400/
 }
diff --git a/packages/jack/jack_0.99.0.bb b/packages/jack/jack_0.99.0.bb
index e69de29bb2..ebd2bd18ab 100644
--- a/packages/jack/jack_0.99.0.bb
+++ b/packages/jack/jack_0.99.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "JACK is a low-latency audio server. It can \
+connect a number of different applications to an audio \
+device, as well as allowing them to share audio between \
+themselves."
+SECTION = "libs/multimedia"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL LGPL" 
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/jackit/jack-audio-connection-kit-${PV}.tar.gz"
+S = "${WORKDIR}/jack-audio-connection-kit-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--enable-timestamps --disable-capabilities --disable-oldtrans \
+		--disable-portaudio --disable-coreaudio --enable-oss --enable-alsa"
+
+EXTRA_OEMAKE = 'transform="s,^,,"'
+
+do_configure() {
+	gnu-configize
+	oe_runconf
+}
+
+do_install_append() {
+	install -d ${D}${docdir}
+	mv -f ${D}${datadir}/jack-audio-connection-kit ${D}${docdir}/
+}
+
+PACKAGES = "libjack jack-server jack-examples jack-doc jack-dev"
+FILES_libjack = "${libdir}/*.so.* ${libdir}/jack/*.so"
+FILES_jack-server = "${bindir}/jackd"
+FILES_jack-examples = "${bindir}"
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 30429b6031..49e0382b6e 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -29,7 +29,7 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${bindir} ${D}/${includedir} \
-		   ${D}/${mandir}/man1 ${D}/${libdir}
+	install -d ${D}${bindir} ${D}${includedir} \
+		   ${D}${mandir}/man1 ${D}${libdir}
 	oe_runmake 'DESTDIR=${D}' install
 }
diff --git a/packages/justreader/justreader_2.0k.bb b/packages/justreader/justreader_2.0k.bb
index 117e747167..70ee709436 100644
--- a/packages/justreader/justreader_2.0k.bb
+++ b/packages/justreader/justreader_2.0k.bb
@@ -21,10 +21,10 @@ do_configure_prepend() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin \
-		   ${D}/${palmtopdir}/pics/${PN}/ \
-		   ${D}/${palmtopdir}/apps/Applications
-	install -m 0644 apps/Applications/justreader.desktop ${D}/${palmtopdir}/apps/Applications/
-	install -m 0755 bin/justreader ${D}/${palmtopdir}/bin/
-	install -m 0644 pics/* ${D}/${palmtopdir}/pics/justreader/
+	install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/pics/${PN}/ \
+		   ${D}${palmtopdir}/apps/Applications
+	install -m 0644 apps/Applications/justreader.desktop ${D}${palmtopdir}/apps/Applications/
+	install -m 0755 bin/justreader ${D}${palmtopdir}/bin/
+	install -m 0644 pics/* ${D}${palmtopdir}/pics/justreader/
 }
diff --git a/packages/kbdd/kbdd_20040904.bb b/packages/kbdd/kbdd_20040904.bb
index 858dd1fdf9..55461b2454 100644
--- a/packages/kbdd/kbdd_20040904.bb
+++ b/packages/kbdd/kbdd_20040904.bb
@@ -10,8 +10,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -d ${D}/${docdir}/kbdd/
-	install -m 0755 kbdd ${D}/${bindir}/
-	install -m 0644 README ${D}/${docdir}/kbdd/
+	install -d ${D}${bindir}
+	install -d ${D}${docdir}/kbdd/
+	install -m 0755 kbdd ${D}${bindir}/
+	install -m 0644 README ${D}${docdir}/kbdd/
 }
diff --git a/packages/kbdd/kbdd_cvs.bb b/packages/kbdd/kbdd_cvs.bb
index a191abf0a5..a749c3b147 100644
--- a/packages/kbdd/kbdd_cvs.bb
+++ b/packages/kbdd/kbdd_cvs.bb
@@ -14,8 +14,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -d ${D}/${docdir}/kbdd/
-	install -m 0755 kbdd ${D}/${bindir}/
-	install -m 0644 README ${D}/${docdir}/kbdd/
+	install -d ${D}${bindir}
+	install -d ${D}${docdir}/kbdd/
+	install -m 0755 kbdd ${D}${bindir}/
+	install -m 0644 README ${D}${docdir}/kbdd/
 }
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index 8c22a6075b..adc869b61f 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -69,42 +69,42 @@ do_configure_prepend() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/bin \
-               ${D}/${palmtopdir}/lib \
-               ${D}/${palmtopdir}/apps/1Pim \
-               ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16 \
-               ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini \
-               ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
-               ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
-               ${D}/${palmtopdir}/plugins/applets
-
-    install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}/${palmtopdir}/pics/
-    install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}/${palmtopdir}/pics/
-    install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}/${palmtopdir}/pics/kdepim/korganizer
-    install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/icons16
-    install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}/${palmtopdir}/pics/kdepim/korganizer/iconsmini
-    install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop
-
-    install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}/${palmtopdir}/pics/kdepim/kaddressbook
-    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons16
-    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}/${palmtopdir}/pics/kdepim/kaddressbook/icons22
-    install -m 0644 kaddressbook/kaddressbook.desktop ${D}/${palmtopdir}/apps/1Pim/kaddressbook.desktop
+    install -d ${D}${palmtopdir}/bin \
+               ${D}${palmtopdir}/lib \
+               ${D}${palmtopdir}/apps/1Pim \
+               ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
+               ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \
+               ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
+               ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
+               ${D}${palmtopdir}/plugins/applets
+
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/
+    install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/
+    install -m 0644 ${S}/bin/kdepim/korganizer/*.* ${D}${palmtopdir}/pics/kdepim/korganizer
+    install -m 0644 ${S}/bin/kdepim/korganizer/icons16/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/icons16
+    install -m 0644 ${S}/bin/kdepim/korganizer/iconsmini/*.png ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini
+    install -m 0644 korganizer/korganizer.desktop ${D}${palmtopdir}/apps/1Pim/korganizer.desktop
+
+    install -m 0644 ${S}/bin/kdepim/kaddressbook/*.* ${D}${palmtopdir}/pics/kdepim/kaddressbook
+    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons16/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16
+    install -m 0644 ${S}/bin/kdepim/kaddressbook/icons22/*.png ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22
+    install -m 0644 kaddressbook/kaddressbook.desktop ${D}${palmtopdir}/apps/1Pim/kaddressbook.desktop
 
     for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat libmicrokabc_file libmicrokabc_dir libmicrokabcformat_binary libmicrokabc_qtopia 
     do
-        oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/lib
+        oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
     done
 
-    install -m 0755 ${S}/dest/kopi ${D}/${palmtopdir}/bin/kopi
-    install -m 0755 ${S}/dest/kapi ${D}/${palmtopdir}/bin/kapi
+    install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
+    install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
     
-    install -d ${D}/${bindir} ${D}/${libdir}
-    install -m 0755 ${S}/dest/kammu ${D}/${bindir}/kammu
-    oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}/${libdir}
+    install -d ${D}${bindir} ${D}${libdir}
+    install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
+    oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
 
     for f in libkopialarmapplet
     do
-        oe_libinstall -so -C ${S}/dest/ $f ${D}/${palmtopdir}/plugins/applets
+        oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/plugins/applets
     done
 }
 
diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb
index 9436c83671..016a0358c5 100644
--- a/packages/keyring/keyring_0.6.8.bb
+++ b/packages/keyring/keyring_0.6.8.bb
@@ -14,20 +14,20 @@ inherit palmtop
 QPEDIR = ${OPIEDIR}
 
 do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-        	   ${D}/${palmtopdir}/apps/Applications \
-        	   ${D}/${palmtopdir}/pics/keyring 
-        install -m 0755 keyring ${D}/${palmtopdir}/bin/
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics/keyring 
+        install -m 0755 keyring ${D}${palmtopdir}/bin/
         install -m 0644 keyring.desktop \
-			${D}/${palmtopdir}/apps/Applications/
+			${D}${palmtopdir}/apps/Applications/
         install -m 0644 ${S}/Keyring.png \
 			${S}/keyring-pwlist.png \
-			${D}/${palmtopdir}/pics/
+			${D}${palmtopdir}/pics/
 
 	# The following should appear in an assoicated DOC package.
 
-	install -d ${D}/${palmtopdir}/help/html
-        install -m 0644 ${S}/*.html ${D}/${palmtopdir}/help/html/
+	install -d ${D}${palmtopdir}/help/html
+        install -m 0644 ${S}/*.html ${D}${palmtopdir}/help/html/
 }
 
 PACKAGES = "${PN} ${PN}-help"
diff --git a/packages/kismet/kismet-2004-04-R1/no-chmod.diff b/packages/kismet/files/glibc3.3.2-getopt-throw.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/no-chmod.diff
+++ b/packages/kismet/files/glibc3.3.2-getopt-throw.diff
diff --git a/packages/kismet/kismet-2004-04-R1/no-strip.diff b/packages/kismet/files/no-chmod.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/kismet/kismet-2004-04-R1/no-strip.diff
+++ b/packages/kismet/files/no-chmod.diff
diff --git a/packages/kismet/files/no-strip.diff b/packages/kismet/files/no-strip.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/files/no-strip.diff
diff --git a/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch b/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet-2004-04-R1/packet_friend_fix.patch
diff --git a/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff b/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet-2005-01-R1/no-lib-modules-uname-include.diff
diff --git a/packages/kismet/kismet_2004-04-R1.bb b/packages/kismet/kismet_2004-04-R1.bb
index 5f03366541..f1510f9e87 100644
--- a/packages/kismet/kismet_2004-04-R1.bb
+++ b/packages/kismet/kismet_2004-04-R1.bb
@@ -2,15 +2,16 @@ SECTION = "console/network"
 DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
 HOMEPAGE = "http://www.kismetwireless.net/"
 LICENSE = "GPLv2"
-MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
 DEPENDS = "expat gmp"
 
 SRC_URI = "http://www.kismetwireless.net/code/kismet-2004-04-R1.tar.gz \
 	file://no-strip.diff;patch=1;pnum=0 \
 	file://no-chmod.diff;patch=1;pnum=0 \
-	file://no-lib-modules-uname-include.diff;patch=1;pnum=0"
+	file://no-lib-modules-uname-include.diff;patch=1;pnum=0 \
+	file://packet_friend_fix.patch;patch=1 \
+	file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
 	
-SRC_URI_append_mipsel = " file://glibc3.3.2-getopt-throw.diff;patch=1;pnum=0"
 SRC_URI_append_mtx-1 = " file://kismet.conf"
 
 EXTRA_OECONF = "--with-pcap=linux --disable-setuid"
@@ -24,7 +25,7 @@ do_configure() {
 
 do_install_append() {
 	if test -e ${WORKDIR}/kismet.conf; then
-		install -m 644 ${WORKDIR}/kismet.conf ${D}/${sysconfdir}/
+		install -m 644 ${WORKDIR}/kismet.conf ${D}${sysconfdir}/
 	fi
 }
 
diff --git a/packages/kismet/kismet_2005-01-R1.bb b/packages/kismet/kismet_2005-01-R1.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kismet/kismet_2005-01-R1.bb
diff --git a/packages/klimt/klimt_0.6.1.bb b/packages/klimt/klimt_0.6.1.bb
index e69de29bb2..c7c70bf9ae 100644
--- a/packages/klimt/klimt_0.6.1.bb
+++ b/packages/klimt/klimt_0.6.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Klimt is a software OpenGL rendering library for Qt/Embedded based Palmtop Environments"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/klimt/klimt-src-${PV}.zip"
+S = "${WORKDIR}/klimt/build/LinuxQTE"
+
+EXTRA_QMAKEVARS_POST += " QMAKE_CXXFLAGS+=-fpermissive"
+
+inherit opie
+
+do_stage() {
+	oe_libinstall -so libKlimt ${STAGING_LIBDIR}/
+	cp -a ${S}/../../include/* ${STAGING_INCDIR}/
+}
+
+do_install() {
+	oe_libinstall -so libKlimt ${D}${palmtopdir}/lib
+}
diff --git a/packages/knights/knights_1.14.bb b/packages/knights/knights_1.14.bb
index 9d35e64b68..1131481c8e 100644
--- a/packages/knights/knights_1.14.bb
+++ b/packages/knights/knights_1.14.bb
@@ -22,11 +22,11 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-	           ${D}/${palmtopdir}/apps/Games \
-       	 	   ${D}/${palmtopdir}/pics
-        install -D -m 755 knights/knights ${D}/${palmtopdir}/bin/knights
-        install -D -m 644 knights.desktop ${D}/${palmtopdir}/apps/Games/knights.desktop
-        install -d ${D}/${palmtopdir}/pics
-        cp -a pics/knights ${D}/${palmtopdir}/pics/
+        install -d ${D}${palmtopdir}/bin \
+	           ${D}${palmtopdir}/apps/Games \
+       	 	   ${D}${palmtopdir}/pics
+        install -D -m 755 knights/knights ${D}${palmtopdir}/bin/knights
+        install -D -m 644 knights.desktop ${D}${palmtopdir}/apps/Games/knights.desktop
+        install -d ${D}${palmtopdir}/pics
+        cp -a pics/knights ${D}${palmtopdir}/pics/
 }
diff --git a/packages/konqueror/konqueror-embedded_20030705.bb b/packages/konqueror/konqueror-embedded_20030705.bb
index c90160d60b..8cfca82302 100644
--- a/packages/konqueror/konqueror-embedded_20030705.bb
+++ b/packages/konqueror/konqueror-embedded_20030705.bb
@@ -40,10 +40,10 @@ do_compile_prepend() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/share/
-    install -d ${D}/${palmtopdir}/share/config/
+    install -d ${D}${palmtopdir}/share/
+    install -d ${D}${palmtopdir}/share/config/
     
-    install -m 0644 ${WORKDIR}/konq-embedrc ${D}/${palmtopdir}/share/config/
+    install -m 0644 ${WORKDIR}/konq-embedrc ${D}${palmtopdir}/share/config/
     
     autotools_do_install
 }
\ No newline at end of file
diff --git a/packages/kphonepi/kphonepi_1.0.0.bb b/packages/kphonepi/kphonepi_1.0.0.bb
index e69de29bb2..cf4fcdf76f 100644
--- a/packages/kphonepi/kphonepi_1.0.0.bb
+++ b/packages/kphonepi/kphonepi_1.0.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Kphone/Pi is a 'Voice Over Internet' phone which uses the Session Initiation Protocol (SIP)."
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net/html/kp_pi.html"
+DEPENDS ="openssl"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kphone_pi_${PV}.tar.gz"
+
+S = "${WORKDIR}/kphone_pi"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/kppi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+QMAKE_PROFILES= "kphone_piE.pro"
+
+do_configure_prepend() {
+	mkdir ${S}/dest/
+}
+
+do_install() {
+    install -d ${D}${palmtopdir}/bin \
+               ${D}${palmtopdir}/apps/Applications \
+               ${D}${palmtopdir}/pics/kphone/ 
+
+    install -m 0644 ${S}/bin/kdepim/kphone/*.png ${D}${palmtopdir}/pics/kphone/
+    install -m 0644 ${S}/kphone.desktop ${D}${palmtopdir}/apps/Applications/
+
+    install -m 0755 ${S}/dest/kppi ${D}${palmtopdir}/bin/kppi
+}
diff --git a/packages/kstars/kstars-embedded_0.8.5.bb b/packages/kstars/kstars-embedded_0.8.5.bb
index e69de29bb2..a0c43e29d1 100644
--- a/packages/kstars/kstars-embedded_0.8.5.bb
+++ b/packages/kstars/kstars-embedded_0.8.5.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "KDE Stars: The Universe, in your hands! QtE based Palmtop Environments Edition"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+APPNAME = "kstars"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}/apps/Applications"
+PR = "r1"
+
+SRC_URI = "http://kstars.sourceforge.net/kstars-embedded-${PV}.tar.gz"
+S = "${WORKDIR}/kstars"
+
+inherit opie
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST += 'DEFINES+=I18N_NOOP='
+
+do_install() {
+    install -d ${D}${palmtopdir}/bin \
+	       ${D}${palmtopdir}/pics/kstars \
+	       ${D}${palmtopdir}/share/apps/kstars
+    cp -a ${WORKDIR}/pics ${D}${palmtopdir}
+    cp -a ${WORKDIR}/share/apps/kstars ${D}${palmtopdir}/share/apps/
+}
diff --git a/packages/ksymoops/ksymoops_2.4.9.bb b/packages/ksymoops/ksymoops_2.4.9.bb
index e69de29bb2..783b4981e4 100644
--- a/packages/ksymoops/ksymoops_2.4.9.bb
+++ b/packages/ksymoops/ksymoops_2.4.9.bb
@@ -0,0 +1,16 @@
+SECTION = "console/utils"
+DESCRIPTION = "Kernel oops and error message decoder."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPLv2"
+DEPENDS = "binutils"
+
+SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/ksymoops-${PV}.tar.bz2 \
+	   file://flags.patch;patch=1"
+S = "${WORKDIR}/ksymoops-${PV}"
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 ksymoops ${D}${bindir}/ksymoops
+	install -d ${D}${mandir}/man8
+	install -m 0755 ksymoops.8 ${D}${mandir}/man8/ksymoops.8
+}
diff --git a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
index e69de29bb2..251694103d 100644
--- a/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
+++ b/packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Time tracking program"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+HOMEPAGE = "http://www.pi-sync.net"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/ktimetracker_pi097.tar.gz"
+
+S = "${WORKDIR}/ktimetracker_pi"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link, OBJECTS_DIR=obj/ MOC_DIR=moc/ TARGET=${S}/dest/ktpi HEADERS-=kphone/qptrlisth HEADERS+=kphone/qptrlist.h LIBS+=-lstdc++"
+QMAKE_PROFILES= "ktimetracker_piE.pro"
+
+do_configure_prepend() {
+	mkdir ${S}/dest/
+}
+
+do_install() {
+    install -d ${D}${palmtopdir}/bin \
+               ${D}${palmtopdir}/apps/1Pim \
+               ${D}${palmtopdir}/pics/
+
+    install -m 0644 ${S}/ktimetracker.png ${D}${palmtopdir}/pics/
+    install -m 0644 ${S}/ktimetracker.desktop ${D}${palmtopdir}/apps/1Pim/
+
+    install -m 0755 ${S}/dest/ktpi ${D}${palmtopdir}/bin/ktpi
+}
diff --git a/packages/lcdproc/lcdproc_0.4.5.bb b/packages/lcdproc/lcdproc_0.4.5.bb
index 6c170ecf3e..b5c24e9157 100644
--- a/packages/lcdproc/lcdproc_0.4.5.bb
+++ b/packages/lcdproc/lcdproc_0.4.5.bb
@@ -14,24 +14,24 @@ EXTRA_OECONF = "${@'--enable-drivers=' + (bb.data.getVar('LCDPROC_DRIVERS',d) or
 
 do_install () {
 	# binaries
-	install -D -m 0755 server/LCDd ${D}/${sbindir}/LCDd
-	install -D -m 0755 clients/lcdproc/lcdproc ${D}/${bindir}/lcdproc
+	install -D -m 0755 server/LCDd ${D}${sbindir}/LCDd
+	install -D -m 0755 clients/lcdproc/lcdproc ${D}${bindir}/lcdproc
 
 	# init scripts
-	install -D -m 0755 scripts/init-LCDd.debian ${D}/${sysconfdir}/init.d/lcdd
+	install -D -m 0755 scripts/init-LCDd.debian ${D}${sysconfdir}/init.d/lcdd
 	# prevent lcdproc from starting if no SCREENS are set.
 	# will be fixed in next upstream release
 	cat scripts/init-lcdproc.debian | sed -e 's/C X//' | sed -e 's/case/[ -n $SCREENS ] || exit 0
 
-case/' > ${D}/${sysconfdir}/init.d/lcdproc
-	chmod 0755 ${D}/${sysconfdir}/init.d/lcdproc
+case/' > ${D}${sysconfdir}/init.d/lcdproc
+	chmod 0755 ${D}${sysconfdir}/init.d/lcdproc
 
 	# configuration files
-	install -D -m 0644 LCDd.conf ${D}/${sysconfdir}/LCDd.conf
+	install -D -m 0644 LCDd.conf ${D}${sysconfdir}/LCDd.conf
 	# don't start lcdproc by default
 	# will be fixed in next upstream release
-	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}/${sysconfdir}/lcdproc.conf
-	chmod 0644 ${D}/${sysconfdir}/lcdproc.conf
+	cat scripts/lcdproc.conf | sed -e 's/C X//' > ${D}${sysconfdir}/lcdproc.conf
+	chmod 0644 ${D}${sysconfdir}/lcdproc.conf
 }
 
 pkg_postinst () {
diff --git a/packages/lemon/lemon.bb b/packages/lemon/lemon.bb
index e69de29bb2..3309a45b42 100644
--- a/packages/lemon/lemon.bb
+++ b/packages/lemon/lemon.bb
@@ -0,0 +1,12 @@
+include lemon.inc
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 lemon ${D}${bindir}/
+	install -d ${D}${datadir}/lemon
+	install -m 0644 lempar.c ${D}${datadir}/lemon/
+	install -d ${D}${docdir}/lemon
+	install -m 0644 lemon.html ${D}${docdir}/lemon/
+	install -d ${D}${mandir}/man1
+	install -m 0644 lemon.1 ${D}${mandir}/man1/
+}
diff --git a/packages/libffi/libffi_2.0+gcc3.4.1.bb b/packages/libffi/libffi_2.0+gcc3.4.1.bb
index e69de29bb2..90886f1cd8 100644
--- a/packages/libffi/libffi_2.0+gcc3.4.1.bb
+++ b/packages/libffi/libffi_2.0+gcc3.4.1.bb
@@ -0,0 +1,65 @@
+SECTION = "libs"
+DESCRIPTION = "Foreign Function Interface library"
+LICENSE = "libffi"
+PRIORITY = "optional"
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+
+inherit autotools gettext
+
+PACKAGES = "${PN} ${PN}-dev"
+
+FILES_${PN} = "${libdir}/libffi.so.*"
+
+FILES_${PN}-dev = "${includedir}/ffi* \
+		   ${libdir}/libffi.a \
+		   ${libdir}/libffi.la \
+		   ${libdir}/libffi.so"
+
+GCC_VER = "${@bb.data.getVar('PV',d,1).split('gcc')[1]}"
+
+SRC_URI = "${GNU_MIRROR}/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2 \
+	   file://soname.patch;patch=1"
+
+MIRRORS_prepend () {
+${GNU_MIRROR}/gcc/	http://gcc.get-software.com/releases/
+${GNU_MIRROR}/gcc/	http://mirrors.rcn.net/pub/sourceware/gcc/releases/
+}
+
+S = "${WORKDIR}/gcc-${GCC_VER}/libffi"
+B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
+
+EXTRA_OECONF = "--with-gnu-ld \
+                --enable-shared \
+                --enable-target-optspace \
+                --enable-languages=c,c++,f77 \
+                --enable-threads=posix \
+                --enable-multilib \
+                --enable-c99 \
+                --enable-long-long \
+                --enable-symvers=gnu \
+                --program-prefix=${TARGET_PREFIX} \
+                ${EXTRA_OECONF_PATHS}"
+
+EXTRA_OECONF_PATHS = "--with-local-prefix=${prefix}/local \
+                      --with-gxx-include-dir=${includedir}/c++/${PV}"
+
+do_configure () {
+	(cd ${S}/.. && gnu-configize) || die "failure running gnu-configize"
+	oe_runconf
+}
+
+do_install_append() {
+	# follow debian and move this to $includedir
+	mv ${D}${libdir}/gcc/arm-linux/3.4.1/include/libffi/ffitarget.h ${D}${includedir}/
+}
+
+ffi_include = "ffi.h ffitarget.h"
+
+do_stage () {
+	oe_libinstall -so -C .libs libffi ${STAGING_LIBDIR}
+
+	mkdir -p ${STAGING_INCDIR}/
+	for i in ${ffi_include}; do
+		install -m 0644 include/$i ${STAGING_INCDIR}/
+	done
+}
diff --git a/packages/libgtkstylus/libgtkstylus_0.1.bb b/packages/libgtkstylus/libgtkstylus_0.1.bb
index 4558a1551d..940eac5f38 100644
--- a/packages/libgtkstylus/libgtkstylus_0.1.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.1.bb
@@ -12,7 +12,7 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
 	file://gtkstylus.sh"
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/profile.d
-	install ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/profile.d/
+	install -d ${D}${sysconfdir}/profile.d
+	install ${WORKDIR}/gtkstylus.sh ${D}${sysconfdir}/profile.d/
 }
 
diff --git a/packages/libgtkstylus/libgtkstylus_0.3.bb b/packages/libgtkstylus/libgtkstylus_0.3.bb
index a331e17c6b..6f26a2ed0e 100644
--- a/packages/libgtkstylus/libgtkstylus_0.3.bb
+++ b/packages/libgtkstylus/libgtkstylus_0.3.bb
@@ -13,7 +13,7 @@ SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
 	file://gtkstylus.sh"
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/profile.d
-	install ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/profile.d/
+	install -d ${D}${sysconfdir}/profile.d
+	install ${WORKDIR}/gtkstylus.sh ${D}${sysconfdir}/profile.d/
 }
 
diff --git a/packages/libmailwrapper/libmailwrapper_1.1.9.bb b/packages/libmailwrapper/libmailwrapper_1.1.9.bb
index 47de55f049..e752a7dbd2 100644
--- a/packages/libmailwrapper/libmailwrapper_1.1.9.bb
+++ b/packages/libmailwrapper/libmailwrapper_1.1.9.bb
@@ -22,5 +22,5 @@ do_stage () {
 }
 
 do_install() {
-	oe_libinstall -so libmailwrapper ${D}/${palmtopdir}/lib
+	oe_libinstall -so libmailwrapper ${D}${palmtopdir}/lib
 }
diff --git a/packages/libmailwrapper/libmailwrapper_cvs.bb b/packages/libmailwrapper/libmailwrapper_cvs.bb
index be1d69a43e..858e6844dd 100644
--- a/packages/libmailwrapper/libmailwrapper_cvs.bb
+++ b/packages/libmailwrapper/libmailwrapper_cvs.bb
@@ -22,5 +22,5 @@ do_stage () {
 }
 
 do_install() {
-	oe_libinstall -so libmailwrapper ${D}/${palmtopdir}/lib
+	oe_libinstall -so libmailwrapper ${D}${palmtopdir}/lib
 }
diff --git a/packages/libmng/libmng_1.0.8.bb b/packages/libmng/libmng_1.0.8.bb
index 86d5497829..eb17d8c6b3 100644
--- a/packages/libmng/libmng_1.0.8.bb
+++ b/packages/libmng/libmng_1.0.8.bb
@@ -19,9 +19,9 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${bindir} ${D}/${mandir} \
-		   ${D}/${libdir} ${D}/${includedir}
+	install -d ${D}${bindir} ${D}${mandir} \
+		   ${D}${libdir} ${D}${includedir}
 	unset LDFLAGS
 	oe_runmake -f makefiles/makefile.linux install \
-	INCPATH="${D}/${includedir}" LIBPATH="${D}/${libdir}" prefix=${prefix}
+	INCPATH="${D}${includedir}" LIBPATH="${D}${libdir}" prefix=${prefix}
 }
diff --git a/packages/libopie/libopie2_1.1.9.bb b/packages/libopie/libopie2_1.1.9.bb
index 569a87988d..6a1b95cae3 100644
--- a/packages/libopie/libopie2_1.1.9.bb
+++ b/packages/libopie/libopie2_1.1.9.bb
@@ -65,10 +65,10 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/lib
+	install -d ${D}${palmtopdir}/lib
 	for f in ${LIBS}
 	do
-		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
+		oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
 	done
 }
 
diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb
index 6ccf444de8..2b6cf8086f 100644
--- a/packages/libopie/libopie2_cvs.bb
+++ b/packages/libopie/libopie2_cvs.bb
@@ -65,10 +65,10 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/lib
+	install -d ${D}${palmtopdir}/lib
 	for f in ${LIBS}
 	do
-		oe_libinstall -so libopie$f ${D}/${palmtopdir}/lib
+		oe_libinstall -so libopie$f ${D}${palmtopdir}/lib
 	done
 }
 
diff --git a/packages/libopietooth/libopietooth1_1.1.9.bb b/packages/libopietooth/libopietooth1_1.1.9.bb
index f00d4dead0..79cb6389b5 100644
--- a/packages/libopietooth/libopietooth1_1.1.9.bb
+++ b/packages/libopietooth/libopietooth1_1.1.9.bb
@@ -19,6 +19,6 @@ do_stage() {
 }
  
 do_install() {
-	oe_libinstall -so libopietooth1 ${D}/${palmtopdir}/lib
+	oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
 }
 
diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index 9d286310ec..3aacaac86d 100644
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -19,6 +19,6 @@ do_stage() {
 }
  
 do_install() {
-	oe_libinstall -so libopietooth1 ${D}/${palmtopdir}/lib
+	oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
 }
 
diff --git a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb b/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
index aeead61674..216657cb8f 100644
--- a/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
+++ b/packages/libpng/libpng_1.2.5+1.2.6rc5.bb
@@ -37,12 +37,12 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${bindir} ${D}/${mandir} \
-		   ${D}/${libdir} ${D}/${includedir}
+	install -d ${D}${bindir} ${D}${mandir} \
+		   ${D}${libdir} ${D}${includedir}
 	unset LDFLAGS
 	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
-		   'DB=${D}/${bindir}' 'DI=${D}/${includedir}' \
-		   'DL=${D}/${libdir}' 'DM=${D}/${mandir}' \
+		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
+		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
 		   install
 }
 
diff --git a/packages/libpng/libpng_1.2.7.bb b/packages/libpng/libpng_1.2.7.bb
index e69de29bb2..a93587c3a0 100644
--- a/packages/libpng/libpng_1.2.7.bb
+++ b/packages/libpng/libpng_1.2.7.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+LICENSE = "libpng"
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+
+DEPENDS = "zlib"
+
+PACKAGES =+ "${PN}12 ${PN}12-dev"
+
+FILES_${PN}12 = ${libdir}/libpng12.so.*
+FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+S = "${WORKDIR}/libpng-${PV}"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
+
+do_compile() {
+	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
+	unset LDFLAGS
+	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+		   'ZLIBINC=${STAGING_INCDIR}' \
+		   'ZLIBLIB=${STAGING_LIBDIR}'
+}
+
+do_stage() {
+	cp libpng.pc libpng12.pc
+	install -m 644 png.h ${STAGING_INCDIR}/png.h
+	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+	oe_libinstall -so libpng12 ${STAGING_LIBDIR}
+	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
+
+do_install() {
+	install -d ${D}${bindir} ${D}${mandir} \
+		   ${D}${libdir} ${D}${includedir}
+	unset LDFLAGS
+	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
+		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
+		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
+		   install
+}
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libpng12', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
diff --git a/packages/libpng/libpng_1.2.8.bb b/packages/libpng/libpng_1.2.8.bb
index e69de29bb2..a93587c3a0 100644
--- a/packages/libpng/libpng_1.2.8.bb
+++ b/packages/libpng/libpng_1.2.8.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+LICENSE = "libpng"
+SECTION = "libs"
+PRIORITY = "required"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+
+DEPENDS = "zlib"
+
+PACKAGES =+ "${PN}12 ${PN}12-dev"
+
+FILES_${PN}12 = ${libdir}/libpng12.so.*
+FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc
+FILES_${PN} = ${libdir}/lib*.so.*
+FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
+		${libdir}/*.a ${libdir}/pkgconfig \
+		${datadir}/aclocal ${bindir} ${sbindir}
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
+S = "${WORKDIR}/libpng-${PV}"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
+
+do_compile() {
+	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
+	unset LDFLAGS
+	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+		   'ZLIBINC=${STAGING_INCDIR}' \
+		   'ZLIBLIB=${STAGING_LIBDIR}'
+}
+
+do_stage() {
+	cp libpng.pc libpng12.pc
+	install -m 644 png.h ${STAGING_INCDIR}/png.h
+	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+	oe_libinstall -so libpng12 ${STAGING_LIBDIR}
+	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
+
+do_install() {
+	install -d ${D}${bindir} ${D}${mandir} \
+		   ${D}${libdir} ${D}${includedir}
+	unset LDFLAGS
+	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
+		   'DB=${D}${bindir}' 'DI=${D}${includedir}' \
+		   'DL=${D}${libdir}' 'DM=${D}${mandir}' \
+		   install
+}
+
+python do_package() {
+        if bb.data.getVar('DEBIAN_NAMES', d, 1):
+            bb.data.setVar('PKG_${PN}', 'libpng12', d)
+        bb.build.exec_func('package_do_package', d)
+}
+
diff --git a/packages/libqpe/libqpe-opie_1.1.9.bb b/packages/libqpe/libqpe-opie_1.1.9.bb
index ed03318a49..c29ce9bd5d 100644
--- a/packages/libqpe/libqpe-opie_1.1.9.bb
+++ b/packages/libqpe/libqpe-opie_1.1.9.bb
@@ -51,7 +51,7 @@ do_stage() {
 }
 
 do_install() {
-	oe_libinstall -so libqpe ${D}/${palmtopdir}/lib
+	oe_libinstall -so libqpe ${D}${palmtopdir}/lib
 }
 
 PACKAGES = "libqpe1"
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index befa5fbd11..d496600354 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -55,7 +55,7 @@ do_stage() {
 }
 
 do_install() {
-	oe_libinstall -so libqpe ${D}/${palmtopdir}/lib
+	oe_libinstall -so libqpe ${D}${palmtopdir}/lib
 }
 
 PACKAGES = "libqpe1"
diff --git a/packages/libqtaux/libqtaux2_1.1.9.bb b/packages/libqtaux/libqtaux2_1.1.9.bb
index 07971136ce..cbc9a7856f 100644
--- a/packages/libqtaux/libqtaux2_1.1.9.bb
+++ b/packages/libqtaux/libqtaux2_1.1.9.bb
@@ -25,7 +25,7 @@ do_stage() {
 }
 
 do_install() {
-	oe_libinstall -so libqtaux2 ${D}/${palmtopdir}/lib
+	oe_libinstall -so libqtaux2 ${D}${palmtopdir}/lib
 }
 
 FILES_${PN}=${palmtopdir}/lib
diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb
index fa756e3d67..3aad4c6444 100644
--- a/packages/libqtaux/libqtaux2_cvs.bb
+++ b/packages/libqtaux/libqtaux2_cvs.bb
@@ -25,7 +25,7 @@ do_stage() {
 }
 
 do_install() {
-	oe_libinstall -so libqtaux2 ${D}/${palmtopdir}/lib
+	oe_libinstall -so libqtaux2 ${D}${palmtopdir}/lib
 }
 
 FILES_${PN}=${palmtopdir}/lib
diff --git a/packages/libssh/libssh_0.1.bb b/packages/libssh/libssh_0.1.bb
index f55ea09f3b..0d3cd17d26 100644
--- a/packages/libssh/libssh_0.1.bb
+++ b/packages/libssh/libssh_0.1.bb
@@ -22,12 +22,12 @@ do_stage () {
 }
 
 do_install () {
-	oe_runmake "prefix=${D}/${prefix}" \
-		   "exec_prefix=${D}/${exec_prefix}" \
-		   "bindir=${D}/${bindir}" \
-		   "incldir=${D}/${includedir}" \
-		   "infodir=${D}/${infodir}" \
-		   "mandir=${D}/${mandir}/man1" \
-		   "libdir=${D}/${libdir}" \
+	oe_runmake "prefix=${D}${prefix}" \
+		   "exec_prefix=${D}${exec_prefix}" \
+		   "bindir=${D}${bindir}" \
+		   "incldir=${D}${includedir}" \
+		   "infodir=${D}${infodir}" \
+		   "mandir=${D}${mandir}/man1" \
+		   "libdir=${D}${libdir}" \
 		   install
 }
diff --git a/packages/libvncserver/libvncserver_0.6.bb b/packages/libvncserver/libvncserver_0.6.bb
index e69de29bb2..2e0a7f81c5 100644
--- a/packages/libvncserver/libvncserver_0.6.bb
+++ b/packages/libvncserver/libvncserver_0.6.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "library for easy implementation of a RDP/VNC server"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib jpeg"
+LICENSE = "GPL"
+PACKAGES = "libvncserver-storepasswd libvncserver-javaapplet"
+FILES_libvncserver-storepasswd = "${bindir}/storepasswd"
+FILES_libvncserver-javaapplet = "/${datadir}fbvncserver/classes/index.vnc \
+			         /${datadir}fbvncserver/classes/VncViewer.jar"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/LibVNCServer-${PV}.tar.gz"
+
+CFLAGS_append = " -D_REENTRANT"
+S = "${WORKDIR}/LibVNCServer-${PV}"
+
+inherit autotools
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/rfb
+	install -m 0644 rfb/rfb.h rfb/rfbproto.h rfb/rfbint.h rfb/rfbconfig.h \
+		    rfb/rfbclient.h rfb/rfbregion.h rfb/keysym.h \
+		    rfb/default8x16.h ${STAGING_INCDIR}/rfb
+
+	oe_libinstall -a -C libvncclient libvncclient ${STAGING_LIBDIR}/
+	oe_libinstall -a libvncserver ${STAGING_LIBDIR}/
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 examples/storepasswd ${D}${bindir}
+	install -d ${D}${datadir}fbvncserver/classes
+	install -m 0644 classes/index.vnc ${D}${datadir}fbvncserver/classes/
+	install -m 0644 classes/VncViewer.jar ${D}${datadir}fbvncserver/classes/
+}
diff --git a/packages/libxine/libxine_1.0.0-beta12.bb b/packages/libxine/libxine_1.0.0-beta12.bb
index 6f3558c095..d74cc26ba1 100644
--- a/packages/libxine/libxine_1.0.0-beta12.bb
+++ b/packages/libxine/libxine_1.0.0-beta12.bb
@@ -65,21 +65,21 @@ do_stage() {
 do_install() {
         oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
           -C src install-data \
-          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-          'includedir=${D}/${includedir}' 
+          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}${libdir}' \
+          'includedir=${D}${includedir}' 
 
         oe_runmake -e LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool \
           -C include install-data \
-          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-          'includedir=${D}/${includedir}'
+          'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}${libdir}' \
+          'includedir=${D}${includedir}'
 
         for plugin in `find ${S}/src -type f -name xineplug*.la`; do
           dir=`dirname $plugin`
           libname=`basename $plugin|sed -e's,\.la,,'`
-          oe_libinstall -so -C $dir $libname ${D}/${libdir}/xine/plugins/1.0.0
+          oe_libinstall -so -C $dir $libname ${D}${libdir}/xine/plugins/1.0.0
         done
 
-        oe_libinstall -so -C src/xine-engine libxine ${D}/${libdir}
+        oe_libinstall -so -C src/xine-engine libxine ${D}${libdir}
 }
 
 python populate_packages_prepend () {
diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb
index e69de29bb2..9f06cd7c55 100644
--- a/packages/linux-hotplug/linux-hotplug_20040329.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040329.bb
@@ -0,0 +1,49 @@
+SECTION = "base"
+DESCRIPTION = "This package contains the scripts necessary \
+for hotplug Linux support, and lets you plug in new devices \
+and use them immediately."
+LICENSE = "GPL"
+RPROVIDES = "hotplug"
+RCONFLICTS = "hotplug"
+RREPLACES = "hotplug"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \
+	   file://busybox.patch;patch=1 \
+           file://fix-net.agent \
+           file://update-usb.usermap \
+           file://logcheck-ignore \
+	   file://sleeve.agent file://sleeve.rc file://mmc.agent \
+	   file://usbd.agent"
+S = "${WORKDIR}/hotplug-2004_03_29"
+
+INITSCRIPT_NAME = "hotplug"
+INITSCRIPT_PARAMS = "start 40 S . stop 89 0 6 ."
+
+inherit update-rc.d
+
+do_compile () {
+	:
+}
+
+oldmandir := "${mandir}"
+oldsbindir := "${sbindir}"
+prefix = ""
+exec_prefix = ""
+FILES_hotplug_append = " ${oldsbindir}"
+FILES_hotplug-doc_append = " ${oldmandir}"
+
+export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
+do_install () {
+	install -d ${D}${sysconfdir}/logcheck/ignore.d \
+		   ${D}${oldmandir} ${D}${oldsbindir}
+	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
+		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
+		   mandir=${D}${oldmandir} install
+	sh ${WORKDIR}/fix-net.agent ${D}
+	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}${oldsbindir}/
+	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}${sysconfdir}/logcheck/ignore.d/hotplug
+	install -m 0755 ${WORKDIR}/sleeve.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/sleeve.rc ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/mmc.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/usbd.agent ${D}${sysconfdir}/hotplug/
+}
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index 764cca82e9..e4cb823cab 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -45,16 +45,16 @@ FILES_hotplug-doc_append = " ${oldmandir}"
 
 export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
 do_install () {
-	install -d ${D}/${sysconfdir}/logcheck/ignore.d
-	install -d ${D}/${oldmandir}
-	install -d ${D}/${oldsbindir}
-	#install -d ${D}/${sysconfdir}/default
+	install -d ${D}${sysconfdir}/logcheck/ignore.d
+	install -d ${D}${oldmandir}
+	install -d ${D}${oldsbindir}
+	#install -d ${D}${sysconfdir}/default
 	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
 		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
 		   mandir=${D}${oldmandir} install
 	sh ${WORKDIR}/fix-net.agent ${D} || :
-	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}/${oldsbindir}/
-	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
+	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}${oldsbindir}/
+	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}${sysconfdir}/logcheck/ignore.d/hotplug
 	install -m 0755 ${WORKDIR}/sleeve.agent ${D}${sysconfdir}/hotplug/
 	install -m 0755 ${WORKDIR}/sleeve.rc ${D}${sysconfdir}/hotplug/
 	install -m 0755 ${WORKDIR}/mmc.agent ${D}${sysconfdir}/hotplug/
@@ -62,6 +62,6 @@ do_install () {
 	#install -m 0755 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
 	install -d ${D}${sysconfdir}/sysconfig
 	install -m 0644 ${WORKDIR}/sysconfig-hotplug ${D}${sysconfdir}/sysconfig/hotplug
-	install -m 0644 ${WORKDIR}/sysconfig-usb ${D}/${sysconfdir}/sysconfig/usb
+	install -m 0644 ${WORKDIR}/sysconfig-usb ${D}${sysconfdir}/sysconfig/usb
 	install -m 0755 ${WORKDIR}/usb-storage ${D}${sysconfdir}/hotplug/usb
 }
diff --git a/packages/linux-uml/linux-uml_2.4.26.bb b/packages/linux-uml/linux-uml_2.4.26.bb
index e69de29bb2..f2b8d24255 100644
--- a/packages/linux-uml/linux-uml_2.4.26.bb
+++ b/packages/linux-uml/linux-uml_2.4.26.bb
@@ -0,0 +1,43 @@
+SECTION = "kernel"
+DESCRIPTION = "User Mode Linux Kernel"
+LICENSE = "GPL"
+UMLR = "2"
+PR = "0"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${PV}.tar.bz2 \
+           ${SOURCEFORGE_MIRROR}/user-mode-linux/uml-patch-${PV}-${UMLR}.bz2;patch=1 \
+           file://defconfig \
+           file://aio_abi.h"
+S = "${WORKDIR}/linux-${PV}"
+
+inherit kernel
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+export OS = "Linux"
+ARCH = "um"
+SUBARCH = "${TARGET_ARCH}"
+KERNEL_IMAGETYPE = "linux"
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/defconfig .config
+	oe_runmake oldconfig
+	install -d arch/um/include/linux/
+	#install -m 0644 ${WORKDIR}/aio_abi.h arch/um/include/linux/
+}
+
+do_compile() {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake dep
+	oe_runmake HAVE_AIO_ABI= HAVE_AIO_LIBC= STAGING_LIBDIR=${STAGING_LIBDIR} ${KERNEL_IMAGETYPE}
+	oe_runmake modules
+}
+
+do_install() {
+        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+        oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
+        install -d ${D}boot
+        install -m 0755 linux ${D}boot/linux-${PV}
+        install -m 0644 System.map ${D}boot/System.map-${PV}
+        install -m 0644 .config ${D}boot/config-${PV}
+}
diff --git a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
index bdbbd85fb8..e66b9620ed 100644
--- a/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
+++ b/packages/linux-uml/linux-uml_2.6.11-rc2-mm1.bb
@@ -51,8 +51,8 @@ do_stage_prepend() {
 do_install() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         #oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" modules_install
-        install -d ${D}/boot
-        install -m 0755 linux ${D}/boot/linux-${PV}
-        install -m 0644 System.map ${D}/boot/System.map-${PV}
-        install -m 0644 .config ${D}/boot/config-${PV}
+        install -d ${D}boot
+        install -m 0755 linux ${D}boot/linux-${PV}
+        install -m 0644 System.map ${D}boot/System.map-${PV}
+        install -m 0644 .config ${D}boot/config-${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 3238f1d96b..2f1a05a3bd 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
@@ -60,6 +60,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
 }
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 e808cecbee..02575213ad 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
@@ -63,6 +63,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
 }
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 bc9982374c..ed083d5e76 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
@@ -62,6 +62,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
 }
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 e0af79d39a..50d22387be 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
@@ -53,6 +53,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-        install -d ${D}/${sysconfdir}/init.d
-        install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
+        install -d ${D}${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
 }
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 3d9029b73b..4125999b56 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
@@ -52,6 +52,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-        install -d ${D}/${sysconfdir}/init.d
-        install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
+        install -d ${D}${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
 }
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 6cc5e1a023..0e63dec2fb 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
@@ -50,6 +50,6 @@ do_configure_prepend() {
 }
 
 do_install_append() {
-        install -d ${D}/${sysconfdir}/init.d
-        install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal
+        install -d ${D}${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
 }
diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
index 7e14473036..e062af29ee 100644
--- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
+++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb
@@ -56,10 +56,10 @@ kernel_do_install() {
 	else
 		oenote "no modules to install"
 	fi
-	install -d ${D}/tmp
-	install -m 0644 ${KERNEL_OUTPUT} ${D}/tmp
-	install -d ${D}/boot
-	install -m 0644 .config ${D}/boot/config-${PV}
-	bzip2 -9 ${D}/boot/*
-	install -d ${D}/${sysconfdir}/modutils
+	install -d ${D}tmp
+	install -m 0644 ${KERNEL_OUTPUT} ${D}tmp
+	install -d ${D}boot
+	install -m 0644 .config ${D}boot/config-${PV}
+	bzip2 -9 ${D}boot/*
+	install -d ${D}${sysconfdir}/modutils
 }
diff --git a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
index e69de29bb2..4cd87bba34 100644
--- a/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc-modules_0.6.6+cvs20040918.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "kernel"
+DEPENDS = "virtual/kernel"
+PR = "r2"
+
+S = "${WORKDIR}/lirc"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/lirc;module=lirc;date=20040918;method=pserver \
+file://lirc_sir-sa1100.patch;patch=1"
+
+inherit autotools module-base
+
+EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR}"
+EXTRA_OECONF_append_epia = " --with-driver=serial"
+EXTRA_OECONF_append_collie = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x"
+
+export TOPDIR = "${STAGING_KERNEL_DIR}"
+
+do_compile() {
+	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+}
+
+fakeroot do_install() {
+	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
+	rm -rf ${D}dev
+}
+
+FILES_${PN}="/lib/modules"
diff --git a/packages/lirc/lirc-modules_0.6.6.bb b/packages/lirc/lirc-modules_0.6.6.bb
index 6235156148..7073bab8d8 100644
--- a/packages/lirc/lirc-modules_0.6.6.bb
+++ b/packages/lirc/lirc-modules_0.6.6.bb
@@ -24,8 +24,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char
-	install -m 0644 drivers/lirc_sir/lirc_sir.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char/lirc_sir.o
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char
+	install -m 0644 drivers/lirc_sir/lirc_sir.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/char/lirc_sir.o
 }
 
 pkg_postinst() {
diff --git a/packages/lirc/lirc-modules_0.7.0.bb b/packages/lirc/lirc-modules_0.7.0.bb
index e69de29bb2..c87fe06a98 100644
--- a/packages/lirc/lirc-modules_0.7.0.bb
+++ b/packages/lirc/lirc-modules_0.7.0.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel fakeroot-native"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
+           file://lirc_sir-sa1100.patch;patch=1"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools module-base
+
+EXTRA_OECONF = "--with-kerneldir=${STAGING_KERNEL_DIR}"
+EXTRA_OECONF_append_epia = " --with-driver=serial"
+EXTRA_OECONF_append_collie = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_h3600 = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_beagle = " --with-driver=sa1100 --without-x"
+EXTRA_OECONF_append_simpad = " --with-driver=sa1100 --without-x"
+
+export TOPDIR = "${STAGING_KERNEL_DIR}"
+
+do_compile() {
+	cd drivers && oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}"
+}
+
+fakeroot do_install() {
+	oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install
+	rm -rf ${D}dev
+}
+
+pkg_postinst() {
+#!/bin/sh
+ mknod /dev/lirc c 61 0
+ if [ -n $D ]; then exit 1; fi
+}
+
+FILES_${PN} = "/lib/modules"
diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb
index 9949c0a4dd..4f3a9f5928 100644
--- a/packages/lirc/lirc_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc_0.6.6+cvs20040918.bb
@@ -32,17 +32,17 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
+	install -d ${D}${bindir}
 
-	install -m 755 daemons/irrecord ${D}/${bindir}/irrecord
-	install -m 755 daemons/lircd ${D}/${bindir}/lircd
+	install -m 755 daemons/irrecord ${D}${bindir}/irrecord
+	install -m 755 daemons/lircd ${D}${bindir}/lircd
 
 	oe_libinstall -so -C tools liblirc_client ${D}${libdir}/
 	install -d ${D}${includedir}
 	install -m 0644 tools/lirc_client.h ${D}${includedir}/
 
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}/${sysconfdir}/init.d/lircd
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
 
 	install -d ${D}${datadir}/lirc/
 	cp -a remotes ${D}${datadir}/lirc/
diff --git a/packages/lirc/lirc_0.6.6.bb b/packages/lirc/lirc_0.6.6.bb
index e69de29bb2..ca9168198c 100644
--- a/packages/lirc/lirc_0.6.6.bb
+++ b/packages/lirc/lirc_0.6.6.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls."
+SECTION = "console/network"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/kernel"
+PR = "r5"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
+S = "${WORKDIR}/lirc-${PV}"
+
+inherit autotools module-base
+
+EXTRA_OECONF_epia = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=serial"
+EXTRA_OECONF_collie = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_h3600 = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_beagle = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+EXTRA_OECONF_simpad = "--with-kerneldir=${STAGING_KERNEL_DIR} --with-driver=sa1100 --without-x"
+
+EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
+
+do_stage() {
+        oe_libinstall -so -C tools liblirc_client ${STAGING_LIBDIR}
+	install -d ${STAGING_INCDIR}/lirc/
+	install -m 0644 tools/lirc_client.h ${STAGING_INCDIR}/lirc/
+}
+
+do_install() {
+	install -d ${D}${bindir}
+
+	install -m 755 daemons/irrecord ${D}${bindir}/irrecord
+	install -m 755 daemons/lircd ${D}${bindir}/lircd
+	install -m 755 tools/rc ${D}${bindir}/rc
+
+	oe_libinstall -so -C tools liblirc_client ${D}${libdir}/
+	install -d ${D}${includedir}
+	install -m 0644 tools/lirc_client.h ${D}${includedir}/
+}
+
diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb
index eb062770bc..4de5432aae 100644
--- a/packages/lirc/lirc_0.7.0.bb
+++ b/packages/lirc/lirc_0.7.0.bb
@@ -31,8 +31,8 @@ do_stage() {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install ${WORKDIR}/lircd.init ${D}/${sysconfdir}/init.d/lircd
+	install -d ${D}${sysconfdir}/init.d
+	install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd
 
         install -d ${D}${datadir}/lirc/
         cp -a ${S}/remotes ${D}${datadir}/lirc/
diff --git a/packages/lmbench/lmbench_2.0.4.bb b/packages/lmbench/lmbench_2.0.4.bb
index e69de29bb2..dfe8c82d13 100644
--- a/packages/lmbench/lmbench_2.0.4.bb
+++ b/packages/lmbench/lmbench_2.0.4.bb
@@ -0,0 +1,44 @@
+SECTION = "console/utils"
+DESCRIPTION = "Tools for performance analysis."
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+
+SRC_URI = "ftp://ftp.bitmover.com/lmbench/lmbench-${PV}.tgz \
+	   file://debian.patch;patch=1 \
+	   file://exe.patch;patch=1 \
+	   file://lmbench-run"
+S = "${WORKDIR}/lmbench-${PV}"
+
+EXTRA_OEMAKE = '"CC=${CC}" "AR=${AR}" "CFLAGS=$CFLAGS" \
+		"LDFLAGS=${LDFLAGS}" "LD=${LD}" "OS=${TARGET_SYS}" \
+		"TARGET=${TARGET_OS}" "O=${S}/bin/${TARGET_SYS}"'
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	bb.build.exec_func('byebk_do_unpack', d)
+}
+
+byebk_do_unpack () {
+	find ${S}/.. -name BitKeeper -o -name SCCS | xargs rm -rf
+}
+
+do_compile () {
+	. ${CONFIG_SITE}
+	if [ X"$ac_cv_uint" == X"yes" ]; then
+		CFLAGS="${CFLAGS} -DHAVE_uint"
+	fi
+	install -d ${S}/bin/${TARGET_SYS}
+	oe_runmake -C src exe
+	sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${PN},;' \
+	       -e 's,^BINDIR=.*$,BINDIR=${libdir}/${PN},;' ${WORKDIR}/lmbench-run
+}
+
+do_install () {
+	oe_runmake 'PREFIX=${D}${prefix}' \
+		   'SHAREDIR=${D}${datadir}/${PN}' \
+		   'BINDIR=${D}${libdir}/lmbench' install
+	install -d ${D}${localstatedir}/lib/lmbench/config \
+		   ${D}${localstatedir}/run/lmbench \
+		   ${D}${bindir}
+	install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/
+}
diff --git a/packages/lockstat/lockstat_1.4.10.bb b/packages/lockstat/lockstat_1.4.10.bb
index 054ef4ca6f..65fd73fe0a 100644
--- a/packages/lockstat/lockstat_1.4.10.bb
+++ b/packages/lockstat/lockstat_1.4.10.bb
@@ -21,6 +21,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sbindir}
-	install -m 0755 lockstat ${D}/${sbindir}/
+	install -d ${D}${sbindir}
+	install -m 0755 lockstat ${D}${sbindir}/
 }
diff --git a/packages/lrzsz/lrzsz_0.12.20.bb b/packages/lrzsz/lrzsz_0.12.20.bb
index e69de29bb2..be2104c05b 100644
--- a/packages/lrzsz/lrzsz_0.12.20.bb
+++ b/packages/lrzsz/lrzsz_0.12.20.bb
@@ -0,0 +1,24 @@
+LICENSE = GPL
+SECTION = "console/network"
+PRIORITY = "standard"
+DESCRIPTION = "Tools for zmodem/xmodem/ymodem file transfer"
+DEPENDS = ""
+PR = "r2"
+
+SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
+	   file://autotools.patch;patch=1 \
+	   file://makefile.patch;patch=1 \
+	   file://gettext.patch;patch=1"
+
+inherit autotools gettext
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -m 0755 src/lrz src/lsz ${D}${bindir}/
+	ln -sf ./lrz ${D}${bindir}/rz
+	ln -sf ./lrz ${D}${bindir}/rx
+	ln -sf ./lrz ${D}${bindir}/rb
+	ln -sf ./lsz ${D}${bindir}/sz
+	ln -sf ./lsz ${D}${bindir}/sx
+	ln -sf ./lsz ${D}${bindir}/sb
+}
diff --git a/packages/lsof/lsof_4.73.bb b/packages/lsof/lsof_4.73.bb
index e69de29bb2..fd311bac78 100644
--- a/packages/lsof/lsof_4.73.bb
+++ b/packages/lsof/lsof_4.73.bb
@@ -0,0 +1,40 @@
+SECTION = "console/utils"
+DESCRIPTION = "Lsof is a Unix-specific diagnostic \
+tool. Its name stands for LiSt Open Files, and it \
+does just that."
+LICENSE = "BSD"
+
+PR = "r1"
+
+SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.gz"
+LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
+S = "${WORKDIR}/lsof_${PV}_src"
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${LOCALSRC}', d)
+	bb.build.exec_func('base_do_unpack', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+}
+
+LSOF_OS = "${TARGET_OS}"
+LSOF_OS_linux-uclibc = "linux"
+
+do_configure () {
+	./Configure ${LSOF_OS}
+}
+
+export I = "${STAGING_INCDIR}"
+export L = "${STAGING_INCDIR}"
+export EXTRA_OEMAKE = ""
+
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
+}
+
+do_install () {
+	install -d ${D}${sbindir} ${D}${mandir}/man8
+	install -m 4755 lsof ${D}${sbindir}/lsof
+	install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8
+}
diff --git a/packages/lsof/lsof_4.74.bb b/packages/lsof/lsof_4.74.bb
index e69de29bb2..e66272353b 100644
--- a/packages/lsof/lsof_4.74.bb
+++ b/packages/lsof/lsof_4.74.bb
@@ -0,0 +1,38 @@
+SECTION = "console/utils"
+DESCRIPTION = "Lsof is a Unix-specific diagnostic \
+tool. Its name stands for LiSt Open Files, and it \
+does just that."
+LICENSE = "BSD"
+
+SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.gz"
+LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
+S = "${WORKDIR}/lsof_${PV}_src"
+
+python do_unpack () {
+	bb.build.exec_func('base_do_unpack', d)
+	src_uri = bb.data.getVar('SRC_URI', d)
+	bb.data.setVar('SRC_URI', '${LOCALSRC}', d)
+	bb.build.exec_func('base_do_unpack', d)
+	bb.data.setVar('SRC_URI', src_uri, d)
+}
+
+LSOF_OS = "${TARGET_OS}"
+LSOF_OS_linux-uclibc = "linux"
+
+do_configure () {
+	./Configure ${LSOF_OS}
+}
+
+export I = "${STAGING_INCDIR}"
+export L = "${STAGING_INCDIR}"
+export EXTRA_OEMAKE = ""
+
+do_compile () {
+	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
+}
+
+do_install () {
+	install -d ${D}${sbindir} ${D}${mandir}/man8
+	install -m 4755 lsof ${D}${sbindir}/lsof
+	install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8
+}
diff --git a/packages/lxt/lxt_1.0.bb b/packages/lxt/lxt_1.0.bb
index a72df24c95..561d64a2bb 100644
--- a/packages/lxt/lxt_1.0.bb
+++ b/packages/lxt/lxt_1.0.bb
@@ -11,6 +11,6 @@ SRC_URI = "http://www.xtreefanpage.org/download/lxt-1.0.tgz \
 S = "${WORKDIR}/lxt"
 
 do_install() {
-	install -d ${D}/${bindir}/
-	install -m 755 -D ${S}/lxt ${D}/${bindir}/lxt
+	install -d ${D}${bindir}/
+	install -m 755 -D ${S}/lxt ${D}${bindir}/lxt
 }
diff --git a/packages/makedev/makedev_2.3.1.bb b/packages/makedev/makedev_2.3.1.bb
index 1c363dbc65..635bd38d22 100644
--- a/packages/makedev/makedev_2.3.1.bb
+++ b/packages/makedev/makedev_2.3.1.bb
@@ -7,9 +7,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/m/makedev/makedev_${PV}.orig.tar.gz"
 S = "${WORKDIR}/makedev-${PV}.orig"
 
 do_install () {
-	install -d ${D}/dev ${D}/${mandir}/man8
-	install -m 0755 MAKEDEV ${D}/dev/MAKEDEV
-	install -m 0644 MAKEDEV.man ${D}/${mandir}/man8/MAKEDEV.8
+	install -d ${D}dev ${D}${mandir}/man8
+	install -m 0755 MAKEDEV ${D}dev/MAKEDEV
+	install -m 0644 MAKEDEV.man ${D}${mandir}/man8/MAKEDEV.8
 }
 
 FILES_${PN} = "/dev"
diff --git a/packages/makedevs/makedevs_1.0.0.bb b/packages/makedevs/makedevs_1.0.0.bb
index da41240b5c..f6c1ffbfa1 100644
--- a/packages/makedevs/makedevs_1.0.0.bb
+++ b/packages/makedevs/makedevs_1.0.0.bb
@@ -15,6 +15,6 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${base_sbindir}
-	install -m 0755 ${S}/makedevs ${D}/${base_sbindir}/makedevs
+	install -d ${D}${base_sbindir}
+	install -m 0755 ${S}/makedevs ${D}${base_sbindir}/makedevs
 }
diff --git a/packages/manufacturers/manufacturers_20031209.bb b/packages/manufacturers/manufacturers_20031209.bb
index 0f4f9be23f..43de376211 100644
--- a/packages/manufacturers/manufacturers_20031209.bb
+++ b/packages/manufacturers/manufacturers_20031209.bb
@@ -8,6 +8,6 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/etc"
 S = "${WORKDIR}/etc"
 
 do_install() {
-	install -d ${D}/${sysconfdir}
-	install -m 0644 manufacturers ${D}/${sysconfdir}/
+	install -d ${D}${sysconfdir}
+	install -m 0644 manufacturers ${D}${sysconfdir}/
 }
diff --git a/packages/maradns/maradns_1.0.23.bb b/packages/maradns/maradns_1.0.23.bb
index abb0de5dd7..5fbbed546d 100644
--- a/packages/maradns/maradns_1.0.23.bb
+++ b/packages/maradns/maradns_1.0.23.bb
@@ -9,14 +9,14 @@ SRC_URI = "http://www.maradns.org/download/maradns-${PV}.tar.bz2 \
 	file://rng-makefile-build-cc.patch;patch=1;pnum=0"
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -d ${D}/${sbindir}
-	install -d ${D}/${sysconfdir}
-	install -d ${D}/${sysconfdir}/mararc
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${mandir}/man1
-	install -d ${D}/${mandir}/man5
-	install -d ${D}/${mandir}/man8
+	install -d ${D}${bindir}
+	install -d ${D}${sbindir}
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/mararc
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${mandir}/man1
+	install -d ${D}${mandir}/man5
+	install -d ${D}${mandir}/man8
 
 	sed -i -e "s:PREFIX/man:PREFIX/share/man:" \
                 -e "s:PREFIX/doc/maradns-\$VERSION:PREFIX/share/doc/${PF}:" \
@@ -26,15 +26,15 @@ do_install() {
                 TOPLEVEL=${S} \
                 BUILDDIR=${S}/build \
                 RPM_BUILD_ROOT=${D} \
-                PREFIX=${D}/usr \
+                PREFIX=${D}usr \
                 MAN1=${D}${mandir}/man1 \
                 MAN5=${D}${mandir}/man5 \
                 MAN8=${D}${mandir}/man8 \
                 install
 	
-	mv ${D}/${sysconfdir}/mararc/example_mararc ${D}/${sysconfdir}/maradns/mararc
-	rm -r ${D}/${sysconfdir}/mararc/
-	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/maradns
+	mv ${D}${sysconfdir}/mararc/example_mararc ${D}${sysconfdir}/maradns/mararc
+	rm -r ${D}${sysconfdir}/mararc/
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/maradns
 }
 
 PACKAGES = "maradns-zone maradns-ask maradns maradns-doc"
diff --git a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
index d4fc63d6b9..31d8241aef 100644
--- a/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
+++ b/packages/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.bb
@@ -9,10 +9,10 @@ PR = "r1"
 LICENSE = "MIT"
 
 do_install() {
-        install -d ${D}/${bindir}
-        install -d ${D}/${datadir}/applications
-        install -d ${D}/${datadir}/pixmaps
-	install -m 0755 ${WORKDIR}/xrandr-panelapp.sh ${D}/${bindir}/
-	install -m 0644 ${WORKDIR}/xrandr-panelapp.desktop ${D}/${datadir}/applications/
-	install -m 0644 ${WORKDIR}/xrandr.png ${D}/${datadir}/pixmaps/
+        install -d ${D}${bindir}
+        install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/pixmaps
+	install -m 0755 ${WORKDIR}/xrandr-panelapp.sh ${D}${bindir}/
+	install -m 0644 ${WORKDIR}/xrandr-panelapp.desktop ${D}${datadir}/applications/
+	install -m 0644 ${WORKDIR}/xrandr.png ${D}${datadir}/pixmaps/
 }
diff --git a/packages/matrixssl/matrixssl_1.0-beta.bb b/packages/matrixssl/matrixssl_1.0-beta.bb
index a62d811e4e..3dfd02448d 100644
--- a/packages/matrixssl/matrixssl_1.0-beta.bb
+++ b/packages/matrixssl/matrixssl_1.0-beta.bb
@@ -12,7 +12,7 @@ def define_os (d):
 CFLAGS += " ${@define_os(d)}"
 
 do_install () {
-	install -d ${D}/${includedir}
-	install -m 0644 ${S}/../matrixSsl.h ${D}/${includedir}/
-	oe_libinstall -so libmatrixssl ${D}/${libdir}/
+	install -d ${D}${includedir}
+	install -m 0644 ${S}/../matrixSsl.h ${D}${includedir}/
+	oe_libinstall -so libmatrixssl ${D}${libdir}/
 }
diff --git a/packages/matrixssl/matrixssl_1.1.1.bb b/packages/matrixssl/matrixssl_1.1.1.bb
index c7e36a3b2c..674e4b4509 100644
--- a/packages/matrixssl/matrixssl_1.1.1.bb
+++ b/packages/matrixssl/matrixssl_1.1.1.bb
@@ -12,7 +12,7 @@ def define_os (d):
 CFLAGS += " ${@define_os(d)}"
 
 do_install () {
-	install -d ${D}/${includedir}
-	install -m 0644 ${S}/../matrixSsl.h ${D}/${includedir}/
-	oe_libinstall -so libmatrixssl ${D}/${libdir}/
+	install -d ${D}${includedir}
+	install -m 0644 ${S}/../matrixSsl.h ${D}${includedir}/
+	oe_libinstall -so libmatrixssl ${D}${libdir}/
 }
diff --git a/packages/memtester/memtester_4.0.4.bb b/packages/memtester/memtester_4.0.4.bb
index e69de29bb2..e342050656 100644
--- a/packages/memtester/memtester_4.0.4.bb
+++ b/packages/memtester/memtester_4.0.4.bb
@@ -0,0 +1,20 @@
+SECTION = "console/utils"
+DESCRIPTION = "Utility to test for faulty memory subsystem"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://www.qcc.ca/~charlesc/software/memtester/memtester-${PV}.tar.gz"
+S = "${WORKDIR}/memtester-${PV}"
+
+do_compile () {
+	echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc
+	echo '${CC} ${LDFLAGS}' > conf-ld
+	oe_runmake
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man8
+	install -m 0755 memtester ${D}${bindir}/
+	install -m 0755 memtester.8 ${D}${mandir}/man8/
+}
diff --git a/packages/metalog/metalog_0.7.bb b/packages/metalog/metalog_0.7.bb
index e16cca88e1..fef8c315f1 100644
--- a/packages/metalog/metalog_0.7.bb
+++ b/packages/metalog/metalog_0.7.bb
@@ -10,6 +10,6 @@ S = "${WORKDIR}/metalog-${PV}"
 inherit autotools
 
 do_install_append() {
-        install -d ${D}/${sysconfdir}/metalog
+        install -d ${D}${sysconfdir}/metalog
         install -m 0755 ${S}/metalog.conf ${D}${sysconfdir}/metalog/metalog.conf
 }
diff --git a/packages/mgetty/mgetty_1.1.30.bb b/packages/mgetty/mgetty_1.1.30.bb
index 2041f40450..ba230d48d5 100644
--- a/packages/mgetty/mgetty_1.1.30.bb
+++ b/packages/mgetty/mgetty_1.1.30.bb
@@ -63,5 +63,5 @@ do_compile () {
 }
 
 do_install () {
-	oe_runmake install DESTDIR="${D}" prefix="${D}/${prefix}"
+	oe_runmake install DESTDIR="${D}" prefix="${D}${prefix}"
 }
diff --git a/packages/micro-emacs/micro-emacs_20040301.bb b/packages/micro-emacs/micro-emacs_20040301.bb
index e69de29bb2..4c0ac781e2 100644
--- a/packages/micro-emacs/micro-emacs_20040301.bb
+++ b/packages/micro-emacs/micro-emacs_20040301.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Mini-version of emacs, from http://www.jasspa.com"
+SECTION = "console/utils"
+PRIORITY = "optional"
+MAINTAINER = "Jason Haslup <openembedded@haslup.com>"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+S = "${WORKDIR}/me040301"
+
+SRC_URI = "http://www.jasspa.com/release_040301/jasspa-mesrc-20040301.tar.gz \
+           http://www.jasspa.com/release_040301/jasspa-memacros-20040301.tar.gz \
+           file://${FILESDIR}/zaurus_make.patch;patch=1"
+
+do_compile () {
+        oe_runmake -C src -f zaurus.gmk mec
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${datadir}/jasspa/macros
+        install -m 0755 src/mec ${D}${bindir}/mec
+        install -m 0644 ${WORKDIR}/*.* ${D}${datadir}/jasspa/macros/
+}
+
+PACKAGES += " ${PN}-macros"
+FILES_${PN}-macros = "${datadir}/jasspa"
+
diff --git a/packages/microcom/microcom_1.02.bb b/packages/microcom/microcom_1.02.bb
index e69de29bb2..b87ce5e0d5 100644
--- a/packages/microcom/microcom_1.02.bb
+++ b/packages/microcom/microcom_1.02.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "microcom is a small minicom-like serial terminal emulator with \
+scripting support."
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+
+SRC_URI = "http://microcom.port5.com/m102.tar.gz \
+	   file://make.patch;patch=1"
+S = "${WORKDIR}"
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 microcom ${D}${bindir}/
+}
diff --git a/packages/microwindows/microwindows_0.90.bb b/packages/microwindows/microwindows_0.90.bb
index 1601d96eb4..cb84e95781 100644
--- a/packages/microwindows/microwindows_0.90.bb
+++ b/packages/microwindows/microwindows_0.90.bb
@@ -35,8 +35,8 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${bindir} ${D}/${libdir}
-	install -m 0755 src/lib/*.so ${D}/${libdir}
-	install -m 0755 src/bin/nano-X ${D}/${bindir}/nano-X
-	#install -m 0755 src/bin/nxcal ${D}/${bindir}/nxcal
+	install -d ${D}${bindir} ${D}${libdir}
+	install -m 0755 src/lib/*.so ${D}${libdir}
+	install -m 0755 src/bin/nano-X ${D}${bindir}/nano-X
+	#install -m 0755 src/bin/nxcal ${D}${bindir}/nxcal
 }
diff --git a/packages/mileage/mileage_cvs.bb b/packages/mileage/mileage_cvs.bb
index e69de29bb2..16178768f0 100644
--- a/packages/mileage/mileage_cvs.bb
+++ b/packages/mileage/mileage_cvs.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A Car Mileage Calculator."
+HOMEPAGE = "http://mileage.sourceforge.net"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PV = "4.2.0-cvs-${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/mileage;module=mileage"
+S = "${WORKDIR}/mileage"
+
+inherit palmtop
+export OE_QMAKE_LINK="${CXX}"
+
+do_install() {
+	install -d ${D}${palmtopdir}/apps/Applications/
+	install -d ${D}${palmtopdir}/pics/
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 ${PN} ${D}${palmtopdir}/bin/
+	install -m 0644 ${PN}.desktop ${D}${palmtopdir}/apps/Applications/
+	install -m 0644 ${PN}.png ${D}${palmtopdir}/pics/
+#FIXME: Package and install help files seperatly
+}
+
diff --git a/packages/militaryalphabet/militaryalphabet_0.2.1.bb b/packages/militaryalphabet/militaryalphabet_0.2.1.bb
index e69de29bb2..c24230a4e6 100644
--- a/packages/militaryalphabet/militaryalphabet_0.2.1.bb
+++ b/packages/militaryalphabet/militaryalphabet_0.2.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Militaryalphabet"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Patrick Steiner <patrick.steiner@a1.net>"
+LICENSE = "GPL"
+APPNAME = "militaryalphabet"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+SRC_URI = "http://sickpeople.wmc-allstars.com/law/files/militaryalphabet/militaryalphabet_${PV}-r0_arm.tar.bz2"
+S = "${WORKDIR}/militaryalphabet"
+
+inherit opie
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/militaryalphabet
+	install -d ${D}${palmtopdir}/sounds/militaryalphabet
+	install -m 0755 ${WORKDIR}/militaryalphabet/pics/militaryalphabet.png  ${D}${palmtopdir}/pics/
+	install -m 0755 ${WORKDIR}/militaryalphabet/sounds/*.wav  ${D}${palmtopdir}/sounds/militaryalphabet/
+}
+
diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb
index 3b82ae7dbb..a3ca1fd266 100644
--- a/packages/mime-support/mime-support_3.28.bb
+++ b/packages/mime-support/mime-support_3.28.bb
@@ -14,41 +14,41 @@ FILES_${PN} += " ${libdir}/mime"
 docdir_append = "/${PN}"
 
 do_install () {
-	install -d ${D}/${sysconfdir}
-	install -d ${D}/${libdir}/mime/packages
-	install -d ${D}/${docdir}
-	install -d ${D}/${sbindir}
-	install -d ${D}/${bindir}
-	install -d ${D}/${mandir}/man1
-	install -d ${D}/${mandir}/man5
-	install -d ${D}/${mandir}/man8
-	install -m 644 mime.types 		${D}/${sysconfdir}/
-	install -m 644 mailcap    		${D}/${libdir}/mime/
-	install -m 644 mailcap.order   		${D}/${sysconfdir}/
-	install -m 644 mailcap.man		${D}/${mandir}/man5/mailcap.5
-	install -m 644 mailcap.order.man	${D}/${mandir}/man5/mailcap.order.5
-#	install -m 755 install-mime		${D}/${sbindir}/
-#	install -m 644 install-mime.man		${D}/${mandir}/man8/install-mime.8
-	install -m 755 update-mime		${D}/${sbindir}/
-	install -m 644 update-mime.man		${D}/${mandir}/man8/update-mime.8
-	install -m 755 run-mailcap		${D}/${bindir}/
-	install -m 644 run-mailcap.man		${D}/${mandir}/man1/run-mailcap.1
-#	install -m 644 rfcs/*			${D}/${docdir}/
-	install -m 644 debian/changelog		${D}/${docdir}/changelog.Debian
-	install -m 644 debian/README		${D}/${docdir}/copyright
-	install -m 755 debian-view		${D}/${libdir}/mime/
-	install -m 755 playaudio		${D}/${libdir}/mime/
-	install -m 755 playdsp			${D}/${libdir}/mime/
-	install -m 644 mailcap.entries		${D}/${libdir}/mime/packages/mime-support
-	cd ${D}/${mandir}; gzip -9fv */*
-	cd ${D}/${docdir}; gzip -9v *
-	cd ${D}/${docdir}; gunzip copyright.gz
-	cd ${D}/${bindir}; ln -s run-mailcap see
-	cd ${D}/${bindir}; ln -s run-mailcap edit
-	cd ${D}/${bindir}; ln -s run-mailcap compose
-	cd ${D}/${bindir}; ln -s run-mailcap print
-	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz
-	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz
-	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz
-	cd ${D}/${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz
+	install -d ${D}${sysconfdir}
+	install -d ${D}${libdir}/mime/packages
+	install -d ${D}${docdir}
+	install -d ${D}${sbindir}
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man1
+	install -d ${D}${mandir}/man5
+	install -d ${D}${mandir}/man8
+	install -m 644 mime.types 		${D}${sysconfdir}/
+	install -m 644 mailcap    		${D}${libdir}/mime/
+	install -m 644 mailcap.order   		${D}${sysconfdir}/
+	install -m 644 mailcap.man		${D}${mandir}/man5/mailcap.5
+	install -m 644 mailcap.order.man	${D}${mandir}/man5/mailcap.order.5
+#	install -m 755 install-mime		${D}${sbindir}/
+#	install -m 644 install-mime.man		${D}${mandir}/man8/install-mime.8
+	install -m 755 update-mime		${D}${sbindir}/
+	install -m 644 update-mime.man		${D}${mandir}/man8/update-mime.8
+	install -m 755 run-mailcap		${D}${bindir}/
+	install -m 644 run-mailcap.man		${D}${mandir}/man1/run-mailcap.1
+#	install -m 644 rfcs/*			${D}${docdir}/
+	install -m 644 debian/changelog		${D}${docdir}/changelog.Debian
+	install -m 644 debian/README		${D}${docdir}/copyright
+	install -m 755 debian-view		${D}${libdir}/mime/
+	install -m 755 playaudio		${D}${libdir}/mime/
+	install -m 755 playdsp			${D}${libdir}/mime/
+	install -m 644 mailcap.entries		${D}${libdir}/mime/packages/mime-support
+	cd ${D}${mandir}; gzip -9fv */*
+	cd ${D}${docdir}; gzip -9v *
+	cd ${D}${docdir}; gunzip copyright.gz
+	cd ${D}${bindir}; ln -s run-mailcap see
+	cd ${D}${bindir}; ln -s run-mailcap edit
+	cd ${D}${bindir}; ln -s run-mailcap compose
+	cd ${D}${bindir}; ln -s run-mailcap print
+	cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz see.1.gz
+	cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz edit.1.gz
+	cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz compose.1.gz
+	cd ${D}${mandir}/man1; ln -s run-mailcap.1.gz print.1.gz
 }
diff --git a/packages/miniclipboard/miniclipboard_0.3.bb b/packages/miniclipboard/miniclipboard_0.3.bb
index d255353a26..9b741d9e2b 100644
--- a/packages/miniclipboard/miniclipboard_0.3.bb
+++ b/packages/miniclipboard/miniclipboard_0.3.bb
@@ -10,11 +10,11 @@ PR = "r1"
 SRC_URI += "file://miniclipboard.desktop"
 
 do_install() {
-	install -d ${D}/${bindir}
-        install -d ${D}/${datadir}/applications
-	install -d ${D}/${datadir}/pixmaps
-	install -m 0755 miniclipboard ${D}/${bindir}/
-	install -m 0644 ${WORKDIR}/miniclipboard.desktop ${D}/${datadir}/applications/
-	install -m 0644 copy.xpm ${D}/${datadir}/pixmaps/
-	install -m 0644 paste.xpm ${D}/${datadir}/pixmaps/
+	install -d ${D}${bindir}
+        install -d ${D}${datadir}/applications
+	install -d ${D}${datadir}/pixmaps
+	install -m 0755 miniclipboard ${D}${bindir}/
+	install -m 0644 ${WORKDIR}/miniclipboard.desktop ${D}${datadir}/applications/
+	install -m 0644 copy.xpm ${D}${datadir}/pixmaps/
+	install -m 0644 paste.xpm ${D}${datadir}/pixmaps/
 }
diff --git a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
index 3699c3b47a..8042a9789c 100644
--- a/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
+++ b/packages/misc-binary-only/prism2-firmware-update_1.7.4.bb
@@ -10,9 +10,9 @@ SRC_URI = "http://www.red-bean.com/~proski/firmware/1.7.4.tar.gz"
 INHIBIT_PACKAGE_STRIP = "1"
 
 do_install() {
-	install -d ${D}/tmp
-	install ${WORKDIR}/${PV}/pk010101.hex ${D}/tmp
-	install ${WORKDIR}/${PV}/sf010704.hex ${D}/tmp
+	install -d ${D}tmp
+	install ${WORKDIR}/${PV}/pk010101.hex ${D}tmp
+	install ${WORKDIR}/${PV}/sf010704.hex ${D}tmp
 }
 
 pkg_postinst() {
diff --git a/packages/misc-binary-only/prism3-firmware_1.8.3.bb b/packages/misc-binary-only/prism3-firmware_1.8.3.bb
index b5d87f3184..b1b6321b25 100644
--- a/packages/misc-binary-only/prism3-firmware_1.8.3.bb
+++ b/packages/misc-binary-only/prism3-firmware_1.8.3.bb
@@ -8,10 +8,10 @@ SRC_URI = "http://www.red-bean.com/~proski/firmware/${PV}.tar.gz \
 S = "${WORKDIR}"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 primary/pm010102.hex ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 1.8.3/rf010803.hex ${D}/${sysconfdir}/pcmcia/
-	cat >${D}/${sysconfdir}/pcmcia/README.prism3-firmware <<EOF
+	install -d ${D}${sysconfdir}/pcmcia/
+	install -m 0644 primary/pm010102.hex ${D}${sysconfdir}/pcmcia/
+	install -m 0644 1.8.3/rf010803.hex ${D}${sysconfdir}/pcmcia/
+	cat >${D}${sysconfdir}/pcmcia/README.prism3-firmware <<EOF
 To make a prism3 card w/ downloadable firmware work, do the following:
 	0.) Install hostap-utils
 	1.) Add "needs_reset yes" and "needs_firmware hostap_fw_load" to
diff --git a/packages/mobilemesh/mobilemesh_1.2.bb b/packages/mobilemesh/mobilemesh_1.2.bb
index aa601249e6..96360a9ae9 100644
--- a/packages/mobilemesh/mobilemesh_1.2.bb
+++ b/packages/mobilemesh/mobilemesh_1.2.bb
@@ -18,21 +18,21 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${sbindir}
-	install -d ${D}/${sysconfdir}/mobilemesh
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${docdir}
-	install -d ${D}/${mandir}/man8
-	oe_runmake PREFIX=${TARGET_PREFIX} BINDIR=${D}/${sbindir} ETCDIR=${D}/${sysconfdir}/mobilemesh install
-	install ${S}/doc/InternetDrafts/draft* ${D}/${docdir}
-	#install ${S}/doc/man/mm*.ps ${D}/${docdir}
-	install ${S}/doc/man/mm*.pdf ${D}/${docdir}
-	install ${S}/doc/man/mm*.8 ${D}/${mandir}/man8
-	install ${S}/doc/FAQ ${D}/${docdir}
-	install ${S}/doc/INSTALL ${D}/${docdir}
-	install ${S}/doc/LICENSE ${D}/${docdir}
-	install ${S}/doc/README ${D}/${docdir}
-	install ${S}/mobilemesh.init ${D}/${sysconfdir}/init.d/mobilemesh
+	install -d ${D}${sbindir}
+	install -d ${D}${sysconfdir}/mobilemesh
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${docdir}
+	install -d ${D}${mandir}/man8
+	oe_runmake PREFIX=${TARGET_PREFIX} BINDIR=${D}${sbindir} ETCDIR=${D}${sysconfdir}/mobilemesh install
+	install ${S}/doc/InternetDrafts/draft* ${D}${docdir}
+	#install ${S}/doc/man/mm*.ps ${D}${docdir}
+	install ${S}/doc/man/mm*.pdf ${D}${docdir}
+	install ${S}/doc/man/mm*.8 ${D}${mandir}/man8
+	install ${S}/doc/FAQ ${D}${docdir}
+	install ${S}/doc/INSTALL ${D}${docdir}
+	install ${S}/doc/LICENSE ${D}${docdir}
+	install ${S}/doc/README ${D}${docdir}
+	install ${S}/mobilemesh.init ${D}${sysconfdir}/init.d/mobilemesh
 }
 
 CONFFILES_${PN}_nylon = "${sysconfdir}/mobilemesh/mmrp.conf ${sysconfdir}/mobilemesh/mmdiscover.conf"
diff --git a/packages/module-init-tools/module-init-tools_3.1.bb b/packages/module-init-tools/module-init-tools_3.1.bb
index a6fdd2eafd..ac4f50fa3b 100644
--- a/packages/module-init-tools/module-init-tools_3.1.bb
+++ b/packages/module-init-tools/module-init-tools_3.1.bb
@@ -27,7 +27,7 @@ inherit autotools
 do_install() {
 	autotools_do_install
 	for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
-		mv ${D}/$f ${D}/$f.26
+		mv ${D}$f ${D}$f.26
 	done
 }
 
diff --git a/packages/modutils/modutils-collateral.bb b/packages/modutils/modutils-collateral.bb
index a485541f41..5c502021f9 100644
--- a/packages/modutils/modutils-collateral.bb
+++ b/packages/modutils/modutils-collateral.bb
@@ -10,7 +10,7 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}
-	install -m 0644 ${WORKDIR}/modules ${D}/${sysconfdir}/modules
-	install -m 0644 ${WORKDIR}/modules.conf ${D}/${sysconfdir}/modules.conf
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/modules ${D}${sysconfdir}/modules
+	install -m 0644 ${WORKDIR}/modules.conf ${D}${sysconfdir}/modules.conf
 }
diff --git a/packages/modutils/modutils-initscripts.bb b/packages/modutils/modutils-initscripts.bb
index eb22255a27..1976ebc226 100644
--- a/packages/modutils/modutils-initscripts.bb
+++ b/packages/modutils/modutils-initscripts.bb
@@ -13,6 +13,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/modutils.sh ${D}/${sysconfdir}/init.d/
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/
 }
diff --git a/packages/modutils/modutils_2.4.27.bb b/packages/modutils/modutils_2.4.27.bb
index f878e6869b..c260d651b9 100644
--- a/packages/modutils/modutils_2.4.27.bb
+++ b/packages/modutils/modutils_2.4.27.bb
@@ -22,11 +22,11 @@ export BUILDCFLAGS = "${BUILD_CFLAGS}"
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
-	install -d ${D}/${sysconfdir}
-	rm ${D}/${base_sbindir}/lsmod
-	install -d ${D}/${base_bindir}/
-	ln -s ../sbin/insmod ${D}/${base_bindir}/lsmod
-        for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do                mv ${D}/$f ${D}/$f.24
+	install -d ${D}${sysconfdir}
+	rm ${D}${base_sbindir}/lsmod
+	install -d ${D}${base_bindir}/
+	ln -s ../sbin/insmod ${D}${base_bindir}/lsmod
+        for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do                mv ${D}$f ${D}$f.24
         done
 }
 
diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb
index bb7f635e14..917ff34019 100644
--- a/packages/mozilla/minimo_cvs.bb
+++ b/packages/mozilla/minimo_cvs.bb
@@ -39,16 +39,16 @@ do_install () {
 	mkdir -p ${mozdir}
 	cp -rL $MOZ_OBJDIR/dist/Embed/* ${mozdir}/
 	rm -f ${mozdir}/TestGtkEmbed
-	mkdir -p ${D}/${datadir}/applications
-	install -m 0644 ${WORKDIR}/minimo.desktop ${D}/${datadir}/applications/minimo.desktop
-	mkdir -p ${D}/${datadir}/pixmaps
-	install -m 0644 ${WORKDIR}/minimo.png ${D}/${datadir}/pixmaps/minimo.png
-	mkdir -p ${D}/${bindir}
-	echo "#!/bin/sh" > ${D}/${bindir}/minimo
-	cat >>${D}/${bindir}/minimo << EOF
+	mkdir -p ${D}${datadir}/applications
+	install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop
+	mkdir -p ${D}${datadir}/pixmaps
+	install -m 0644 ${WORKDIR}/minimo.png ${D}${datadir}/pixmaps/minimo.png
+	mkdir -p ${D}${bindir}
+	echo "#!/bin/sh" > ${D}${bindir}/minimo
+	cat >>${D}${bindir}/minimo << EOF
 cd ${libdir}/mozilla-minimo
 export LD_LIBRARY_PATH=${libdir}/mozilla-minimo
 exec ./Minimo http://www.mozilla.org/projects/minimo/home.html
 EOF
-	chmod 755 ${D}/${bindir}/minimo
+	chmod 755 ${D}${bindir}/minimo
 }
diff --git a/packages/mplayer/mplayer_1.0pre3try2.bb b/packages/mplayer/mplayer_1.0pre3try2.bb
index f22b7a23e6..788f07f36e 100644
--- a/packages/mplayer/mplayer_1.0pre3try2.bb
+++ b/packages/mplayer/mplayer_1.0pre3try2.bb
@@ -64,9 +64,9 @@ do_configure() {
 }
 
 do_install_append () {
-        install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc
+        install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc
         install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
-        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir}
+        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir}
         cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
         cd ${D}${libdir}
         ln -sf libpostproc.so.0.0.0 libpostproc.so.0
diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb
index 5dd6702e48..c1ea58ef45 100644
--- a/packages/mplayer/mplayer_1.0pre6.bb
+++ b/packages/mplayer/mplayer_1.0pre6.bb
@@ -67,9 +67,9 @@ do_configure() {
 }
 
 do_install_append () {
-        install -d ${D}/${libdir} ${D}${includedir} ${D}${includedir}/postproc
+        install -d ${D}${libdir} ${D}${includedir} ${D}${includedir}/postproc
         install -m 0644 libavcodec/libpostproc/postprocess.h ${D}${includedir}/postproc/
-        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}/${libdir}
+        oe_libinstall -so -C ${S}/libavcodec/libpostproc libpostproc ${D}${libdir}
         cp ${S}/libavcodec/libpostproc/libpostproc.so ${D}${libdir}/libpostproc.so.0.0.0
         cd ${D}${libdir}
         ln -sf libpostproc.so.0.0.0 libpostproc.so.0
diff --git a/packages/murasaki/murasaki_0.8.8.bb b/packages/murasaki/murasaki_0.8.8.bb
index 505a7947e8..5a46db0cba 100644
--- a/packages/murasaki/murasaki_0.8.8.bb
+++ b/packages/murasaki/murasaki_0.8.8.bb
@@ -9,11 +9,11 @@ SRC_URI = "http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-${PV}.tar
 EXTRA_OEMAKE = 'OPT="-DPATH_MAX" DEBUG= INC="-I ../inc ${CFLAGS}"'
 
 do_install () {
-	install -d ${D}/${base_sbindir} ${D}/${sysconfdir}/${PN} \
-		   ${D}/${sysconfdir}/init.d
-	oe_runmake install 'BIN_DIR=${D}/${base_sbindir}' 'CONF_DIR=${D}/${sysconfdir}/${PN}' \
-		   'RC_DIR=${D}/${sysconfdir}/rc.d' \
-		   'RC_INIT_DIR=${D}/${sysconfdir}/init.d' \
-		   'INST_SCRIPT_DIR=${D}/${sysconfdir}/murasaki' \
-		   'INST_FIRMWARE_DIR=${D}/${sysconfdir}/firmware'
+	install -d ${D}${base_sbindir} ${D}${sysconfdir}/${PN} \
+		   ${D}${sysconfdir}/init.d
+	oe_runmake install 'BIN_DIR=${D}${base_sbindir}' 'CONF_DIR=${D}${sysconfdir}/${PN}' \
+		   'RC_DIR=${D}${sysconfdir}/rc.d' \
+		   'RC_INIT_DIR=${D}${sysconfdir}/init.d' \
+		   'INST_SCRIPT_DIR=${D}${sysconfdir}/murasaki' \
+		   'INST_FIRMWARE_DIR=${D}${sysconfdir}/firmware'
 }
diff --git a/packages/mythfront/mythfront-config.bb b/packages/mythfront/mythfront-config.bb
index d3b7d10980..4a7db96d5e 100644
--- a/packages/mythfront/mythfront-config.bb
+++ b/packages/mythfront/mythfront-config.bb
@@ -8,25 +8,25 @@ SRC_URI = "file://tftp.sh file://xorg.conf"
 SRC_URI_append_epia = " file://serial.sh"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/udhcpc.d/
-	install ${WORKDIR}/tftp.sh ${D}/${sysconfdir}/udhcpc.d/80tftp
+	install -d ${D}${sysconfdir}/udhcpc.d/
+	install ${WORKDIR}/tftp.sh ${D}${sysconfdir}/udhcpc.d/80tftp
 
-	install -d ${D}/${sysconfdir}/mythtv
-	ln -sf /var/lib/config/mysql.txt ${D}/${sysconfdir}/mythtv
+	install -d ${D}${sysconfdir}/mythtv
+	ln -sf /var/lib/config/mysql.txt ${D}${sysconfdir}/mythtv
 
-	install -d ${D}/${sysconfdir}/X11
-	install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11
+	install -d ${D}${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11
 
-	ln -sf /var/lib/config/lircd.conf ${D}/${sysconfdir}/lircd.conf
+	ln -sf /var/lib/config/lircd.conf ${D}${sysconfdir}/lircd.conf
 
-	install -d ${D}/dev
-	ln -sf lirc0 ${D}/dev/lirc
+	install -d ${D}dev
+	ln -sf lirc0 ${D}dev/lirc
 
 	if [ -f ${WORKDIR}/serial.sh ]; then
-		install -d ${D}/${sysconfdir}/init.d
-		install -d ${D}/${sysconfdir}/rc2.d
-		install ${WORKDIR}/serial.sh ${D}/${sysconfdir}/init.d/mythfront-serial
-		ln -sf ../init.d/mythfront-serial ${D}/${sysconfdir}/rc2.d/S10mythfront-serial
+		install -d ${D}${sysconfdir}/init.d
+		install -d ${D}${sysconfdir}/rc2.d
+		install ${WORKDIR}/serial.sh ${D}${sysconfdir}/init.d/mythfront-serial
+		ln -sf ../init.d/mythfront-serial ${D}${sysconfdir}/rc2.d/S10mythfront-serial
 	fi
 }
 
diff --git a/packages/mythfront/mythfront-session.bb b/packages/mythfront/mythfront-session.bb
index 6f669170bf..1e03a4bae3 100644
--- a/packages/mythfront/mythfront-session.bb
+++ b/packages/mythfront/mythfront-session.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 SRC_URI = "file://mythfront.sh"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/X11/Xinit.d
-	install ${WORKDIR}/mythfront.sh ${D}/${sysconfdir}/X11/Xinit.d/90mythfront
+	install -d ${D}${sysconfdir}/X11/Xinit.d
+	install ${WORKDIR}/mythfront.sh ${D}${sysconfdir}/X11/Xinit.d/90mythfront
 }
 
diff --git a/packages/nasm/nasm_0.98.38.bb b/packages/nasm/nasm_0.98.38.bb
index 0d5f7a10b4..7faaf360f1 100644
--- a/packages/nasm/nasm_0.98.38.bb
+++ b/packages/nasm/nasm_0.98.38.bb
@@ -10,8 +10,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2"
 inherit autotools
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -d ${D}/${mandir}/man1
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man1
 
 	oe_runmake 'INSTALLROOT=${D}' install
 }
diff --git a/packages/ncftp/ncftp_3.1.7.bb b/packages/ncftp/ncftp_3.1.7.bb
index b1dc0e3386..99673d8a97 100644
--- a/packages/ncftp/ncftp_3.1.7.bb
+++ b/packages/ncftp/ncftp_3.1.7.bb
@@ -12,8 +12,8 @@ do_configure_prepend () {
 }
 
 do_install () {
-	install -d ${D}/${bindir} ${D}/${sysconfdir} ${D}/${mandir}
-	oe_runmake 'prefix=${D}/${prefix}' 'BINDIR=${D}/${bindir}' \
-		   'SYSCONFDIR=${D}/${sysconfdir}' 'mandir=${D}/${mandir}' \
+	install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
+	oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
+		   'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
 		   install
 }
diff --git a/packages/ncftp/ncftp_3.1.8.bb b/packages/ncftp/ncftp_3.1.8.bb
index b1dc0e3386..99673d8a97 100644
--- a/packages/ncftp/ncftp_3.1.8.bb
+++ b/packages/ncftp/ncftp_3.1.8.bb
@@ -12,8 +12,8 @@ do_configure_prepend () {
 }
 
 do_install () {
-	install -d ${D}/${bindir} ${D}/${sysconfdir} ${D}/${mandir}
-	oe_runmake 'prefix=${D}/${prefix}' 'BINDIR=${D}/${bindir}' \
-		   'SYSCONFDIR=${D}/${sysconfdir}' 'mandir=${D}/${mandir}' \
+	install -d ${D}${bindir} ${D}${sysconfdir} ${D}${mandir}
+	oe_runmake 'prefix=${D}${prefix}' 'BINDIR=${D}${bindir}' \
+		   'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \
 		   install
 }
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index a3c051f376..58e7b59e59 100644
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -50,8 +50,8 @@ do_install() {
 	autotools_do_install
 
 	# our ncurses has termcap support
-	ln -sf libncurses.so ${D}/${libdir}/libtermcap.so
-	ln -sf libncurses.a ${D}/${libdir}/libtermcap.a
+	ln -sf libncurses.so ${D}${libdir}/libtermcap.so
+	ln -sf libncurses.a ${D}${libdir}/libtermcap.a
 
 	# include some basic terminfo files
 	# stolen ;) from gentoo and modified a bit
@@ -62,15 +62,15 @@ do_install() {
 
                 if [ -n "${termfile}" ]
                 then
-                        install -d ${D}/${sysconfdir}/terminfo/${basedir}
-                        mv ${termfile} ${D}/${sysconfdir}/terminfo/${basedir}/
+                        install -d ${D}${sysconfdir}/terminfo/${basedir}
+                        mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/
                         ln -s /etc/terminfo/${basedir}/${x} \
                                 ${D}${datadir}/terminfo/${basedir}/${x}
                 fi
         done
 	# i think we can use xterm-color as default xterm
-	if [ -e ${D}/${sysconfdir}/terminfo/x/xterm-color ]
+	if [ -e ${D}${sysconfdir}/terminfo/x/xterm-color ]
 	then
-		ln -sf xterm-color ${D}/${sysconfdir}/terminfo/x/xterm
+		ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
 	fi
 }
diff --git a/packages/net-snmp/net-snmp_5.1.2.bb b/packages/net-snmp/net-snmp_5.1.2.bb
index e69de29bb2..8864ffb004 100644
--- a/packages/net-snmp/net-snmp_5.1.2.bb
+++ b/packages/net-snmp/net-snmp_5.1.2.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "Various tools relating to the Simple Network Management Protocol"
+HOMEPAGE = "http://www.net-snmp.org/"
+LICENSE = "BSD"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+DEPENDS = "openssl"
+SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
+	file://init \
+	file://snmpd.conf \
+	file://snmptrapd.conf"
+	
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared --disable-manuals" 
+EXTRA_OECONF_mipsel += "--with-endianness=little"
+
+EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
+
+do_configure() {
+	oe_runconf
+}
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/snmp
+	install -d ${D}${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
+	install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
+	install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
+}
+
+PACKAGES = "net-snmp-doc net-snmp-dev net-snmp-libs net-snmp-mibs net-snmp-server net-snmp-client"
+FILES_net-snmp-libs = "${libdir}"
+FILES_net-snmp-mibs = "${datadir}/snmp/mibs"
+FILES_net-snmp-server = "${sbindir} ${sysconfdir}"
+FILES_net-snmp-client = "${bindir} ${datadir}/snmp/"
+RDEPENDS_net-snmp-server += "net-snmp-mibs"
+RDEPENDS_net-snmp-client += "net-snmp-mibs"
+
+pkg_postinst_net-snmp-server() {
+if test "x$D" != "x"; then
+	D="-r $D"
+else
+	D="-s"
+fi
+update-rc.d $D snmpd defaults
+}
+
+pkg_postrm_net-snmp-server() {
+if test "x$D" != "x"; then
+	D="-r $D"
+else
+	/etc/init.d/snmpd stop
+fi
+update-rc.d $D snmpd remove
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/snmp/snmpd.conf ${sysconfdir}/snmp/snmptrapd.conf"
diff --git a/packages/netbase/netbase_4.19.bb b/packages/netbase/netbase_4.19.bb
index 4765503561..c83037e137 100644
--- a/packages/netbase/netbase_4.19.bb
+++ b/packages/netbase/netbase_4.19.bb
@@ -16,22 +16,22 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
            file://interfaces"
 
 do_install () {
-	install -d ${D}/${sysconfdir}/init.d \
-		   ${D}/${sbindir} \
-		   ${D}/${mandir}/man8 \
-		   ${D}/${sysconfdir}/network/if-pre-up.d \
-		   ${D}/${sysconfdir}/network/if-up.d \
-		   ${D}/${sysconfdir}/network/if-down.d \
-		   ${D}/${sysconfdir}/network/if-post-down.d
-	install -m 0644 ${WORKDIR}/options ${D}/${sysconfdir}/network/options
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/networking
-	install -m 0644 ${WORKDIR}/hosts ${D}/${sysconfdir}/hosts
-	install -m 0644 etc-rpc ${D}/${sysconfdir}/rpc
-	install -m 0644 etc-protocols ${D}/${sysconfdir}/protocols
-	install -m 0644 etc-services ${D}/${sysconfdir}/services
-	install -m 0755 update-inetd ${D}/${sbindir}/
-	install -m 0644 update-inetd.8 ${D}/${mandir}/man8/
-	install -m 0644 ${WORKDIR}/interfaces ${D}/${sysconfdir}/network/interfaces
+	install -d ${D}${sysconfdir}/init.d \
+		   ${D}${sbindir} \
+		   ${D}${mandir}/man8 \
+		   ${D}${sysconfdir}/network/if-pre-up.d \
+		   ${D}${sysconfdir}/network/if-up.d \
+		   ${D}${sysconfdir}/network/if-down.d \
+		   ${D}${sysconfdir}/network/if-post-down.d
+	install -m 0644 ${WORKDIR}/options ${D}${sysconfdir}/network/options
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
+	install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts
+	install -m 0644 etc-rpc ${D}${sysconfdir}/rpc
+	install -m 0644 etc-protocols ${D}${sysconfdir}/protocols
+	install -m 0644 etc-services ${D}${sysconfdir}/services
+	install -m 0755 update-inetd ${D}${sbindir}/
+	install -m 0644 update-inetd.8 ${D}${mandir}/man8/
+	install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
 }
 
 CONFFILES_${PN} = "${sysconfdir}/network/options ${sysconfdir}/hosts ${sysconfdir}/network/interfaces"
diff --git a/packages/netkit-base/netkit-base_0.17.bb b/packages/netkit-base/netkit-base_0.17.bb
index a6a7c66511..690338193f 100644
--- a/packages/netkit-base/netkit-base_0.17.bb
+++ b/packages/netkit-base/netkit-base_0.17.bb
@@ -13,10 +13,10 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}/init.d ${D}/${sbindir}
-	install -m 0755 inetd/inetd ${D}/${sbindir}/inetd
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/inetd
-	install -m 0644 ${WORKDIR}/inetd.conf ${D}/${sysconfdir}
+	install -d ${D}${sysconfdir}/init.d ${D}${sbindir}
+	install -m 0755 inetd/inetd ${D}${sbindir}/inetd
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/inetd
+	install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}
 }
 
 pkg_postinst () {
diff --git a/packages/netkit-ftp/netkit-ftp_0.17.bb b/packages/netkit-ftp/netkit-ftp_0.17.bb
index 248fa285b2..41c3b08376 100644
--- a/packages/netkit-ftp/netkit-ftp_0.17.bb
+++ b/packages/netkit-ftp/netkit-ftp_0.17.bb
@@ -10,6 +10,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 ftp/ftp ${D}/${bindir}
+	install -d ${D}${bindir}
+	install -m 0755 ftp/ftp ${D}${bindir}
 }
diff --git a/packages/netkit-tftp/netkit-tftp_0.17.bb b/packages/netkit-tftp/netkit-tftp_0.17.bb
index 1eaa43873a..ee9225db72 100644
--- a/packages/netkit-tftp/netkit-tftp_0.17.bb
+++ b/packages/netkit-tftp/netkit-tftp_0.17.bb
@@ -10,6 +10,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 tftp/tftp ${D}/${bindir}
+	install -d ${D}${bindir}
+	install -m 0755 tftp/tftp ${D}${bindir}
 }
diff --git a/packages/netkit-tftp/netkit-tftpd_0.17.bb b/packages/netkit-tftp/netkit-tftpd_0.17.bb
index 75f94622a3..537d2beb69 100644
--- a/packages/netkit-tftp/netkit-tftpd_0.17.bb
+++ b/packages/netkit-tftp/netkit-tftpd_0.17.bb
@@ -20,8 +20,8 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sbindir}
-	install -m 0755 tftpd/tftpd ${D}/${sbindir}/tftpd
+	install -d ${D}${sbindir}
+	install -m 0755 tftpd/tftpd ${D}${sbindir}/tftpd
 }
 
 pkg_postinst () {
diff --git a/packages/netperf/netperf_2.3.bb b/packages/netperf/netperf_2.3.bb
index 02465402db..ea6954e358 100644
--- a/packages/netperf/netperf_2.3.bb
+++ b/packages/netperf/netperf_2.3.bb
@@ -18,31 +18,31 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${sbindir} ${D}/${bindir} ${D}/${sysconfdir}/init.d
-        install -m 4755 netperf ${D}/${bindir}
-	install -m 4755 netserver ${D}/${sbindir}
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/netperf
+	install -d ${D}${sbindir} ${D}${bindir} ${D}${sysconfdir}/init.d
+        install -m 4755 netperf ${D}${bindir}
+	install -m 4755 netserver ${D}${sbindir}
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/netperf
     
 	# man
-	install -d ${D}/${mandir}/man1/
-    	install -m 0644 netserver.man ${D}/${mandir}/man1/netserver.1
-	install -m 0644 netperf.man ${D}/${mandir}/man1/netperf.1
+	install -d ${D}${mandir}/man1/
+    	install -m 0644 netserver.man ${D}${mandir}/man1/netserver.1
+	install -m 0644 netperf.man ${D}${mandir}/man1/netperf.1
 
 	# move scripts to examples directory
-	install -d ${D}/${docdir}/netperf/examples
-	install -m 0644 tcp_range_script ${D}/${docdir}/netperf/examples/
-	install -m 0644 tcp_stream_script ${D}/${docdir}/netperf/examples/
-	install -m 0644 tcp_rr_script ${D}/${docdir}/netperf/examples/
-	install -m 0644 udp_stream_script ${D}/${docdir}/netperf/examples/
-	install -m 0644 udp_rr_script ${D}/${docdir}/netperf/examples/
-	install -m 0644 snapshot_script ${D}/${docdir}/netperf/examples/
+	install -d ${D}${docdir}/netperf/examples
+	install -m 0644 tcp_range_script ${D}${docdir}/netperf/examples/
+	install -m 0644 tcp_stream_script ${D}${docdir}/netperf/examples/
+	install -m 0644 tcp_rr_script ${D}${docdir}/netperf/examples/
+	install -m 0644 udp_stream_script ${D}${docdir}/netperf/examples/
+	install -m 0644 udp_rr_script ${D}${docdir}/netperf/examples/
+	install -m 0644 snapshot_script ${D}${docdir}/netperf/examples/
 	
 	# docs ..
-	install -m 0644 ACKNWLDGMNTS ${D}/${docdir}/netperf
-	install -m 0644 COPYRIGHT ${D}/${docdir}/netperf
-	install -m 0644 Release_Notes ${D}/${docdir}/netperf
-	install -m 0644 README ${D}/${docdir}/netperf
-	install -m 0644 netperf.ps ${D}/${docdir}/netperf
+	install -m 0644 ACKNWLDGMNTS ${D}${docdir}/netperf
+	install -m 0644 COPYRIGHT ${D}${docdir}/netperf
+	install -m 0644 Release_Notes ${D}${docdir}/netperf
+	install -m 0644 README ${D}${docdir}/netperf
+	install -m 0644 netperf.ps ${D}${docdir}/netperf
 }
 
 INITSCRIPT_NAME="netperf"
diff --git a/packages/ngrep/ngrep_1.42.bb b/packages/ngrep/ngrep_1.42.bb
index 31b462fb33..64970ab994 100644
--- a/packages/ngrep/ngrep_1.42.bb
+++ b/packages/ngrep/ngrep_1.42.bb
@@ -15,6 +15,6 @@ inherit autotools
 CFLAGS += '-DDROPPRIVS_ONLY_ROOT=0 -DDROPPRIVS_USER=\""nobody\"" -DUSE_DROPPRIVS=1'
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 ngrep ${D}/${bindir}/
+	install -d ${D}${bindir}
+	install -m 0755 ngrep ${D}${bindir}/
 }
diff --git a/packages/nmap/nmap_3.77.bb b/packages/nmap/nmap_3.77.bb
index e69de29bb2..a028d9d077 100644
--- a/packages/nmap/nmap_3.77.bb
+++ b/packages/nmap/nmap_3.77.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Nmap is a command line portscanner."
+HOMEPAGE = "http://www.insecure.org/nmap/"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "console/network"
+LICENSE = "GPL"
+DEPENDS = "libpcap pcre"
+PR = "r1"
+
+inherit autotools
+
+SRC_URI = "http://download.insecure.org/nmap/dist/nmap-${PV}.tar.bz2 \
+	   file://autofoo.patch;patch=1 \
+	   file://remove_gtk.patch;patch=1"
+S = "${WORKDIR}/nmap-${PV}"
+
+EXTRA_OECONF = "--with-pcap=linux \
+		--with-libpcap=${STAGING_LIBDIR}/.. \
+		--with-libpcre=${STAGING_LIBDIR}/.. \
+		--without-nmapfe \
+		--without-openssl"
+EXTRA_OEMAKE = "STRIPPROG=${STRIP}"
+
+CXXFLAGS_append = " -fpermissive"
+# Ugly hack follows -- their configure.ac doesnt match their configure .. 
+# doesnt include a check for the length type in recvfrom, so we hack it here
+CPPFLAGS_append = " -Drecvfrom6_t=socklen_t"
+
+do_install () {
+	oe_runmake 'prefix=${D}${prefix}' \
+		   'exec_prefix=${D}${exec_prefix}' \
+		   'bindir=${D}${bindir}' \
+		   'sbindir=${D}${sbindir}' \
+		   'mandir=${D}${mandir}' \
+		   'datadir=${D}${datadir}' \
+		   'nmapdatadir=${D}${datadir}/nmap' \
+		   install
+}
diff --git a/packages/notez/notez_1.1.0.bb b/packages/notez/notez_1.1.0.bb
index 652ccdd8ab..36c1cf76b5 100644
--- a/packages/notez/notez_1.1.0.bb
+++ b/packages/notez/notez_1.1.0.bb
@@ -17,7 +17,7 @@ file://fix-encoding.patch;patch=1"
 inherit opie
 
 do_install () {
-	install -d ${D}/${palmtopdir}/pics/
-	install -m 0644 notez.png ${D}/${palmtopdir}/pics/noteZ.png
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 notez.png ${D}${palmtopdir}/pics/noteZ.png
 }
 
diff --git a/packages/nsd/nsd_2.0.0.bb b/packages/nsd/nsd_2.0.0.bb
index 85feae9580..27794804a0 100644
--- a/packages/nsd/nsd_2.0.0.bb
+++ b/packages/nsd/nsd_2.0.0.bb
@@ -8,16 +8,16 @@ LICENSE = "nsd"
 inherit autotools
 
 do_install() {
-	oe_runmake 	configdir=${D}/${sysconfdir}/nsd              \
-			pidfile=${D}/${localstatedir}/run/nsd.pid        \
-			zonesfile=${D}/${sysconfdir}/nsd/nsd.zones    \
-			dbfile=${D}/${sysconfdir}/nsd/nsd.db          \
-			configfile=${D}/${sysconfdir}/nsd/nsdc.conf   \
-			zonesdir=${D}/${sysconfdir}/nsd \
-			prefix=${D}/${prefix} \
-			exec_prefix=${D}/${exec_prefix} \
-			sbindir=${D}/${sbindir} \
-			mandir=${D}/${mandir} \
+	oe_runmake 	configdir=${D}${sysconfdir}/nsd              \
+			pidfile=${D}${localstatedir}/run/nsd.pid        \
+			zonesfile=${D}${sysconfdir}/nsd/nsd.zones    \
+			dbfile=${D}${sysconfdir}/nsd/nsd.db          \
+			configfile=${D}${sysconfdir}/nsd/nsdc.conf   \
+			zonesdir=${D}${sysconfdir}/nsd \
+			prefix=${D}${prefix} \
+			exec_prefix=${D}${exec_prefix} \
+			sbindir=${D}${sbindir} \
+			mandir=${D}${mandir} \
 			install
 }
 
diff --git a/packages/nsqld/nsqld_0.5.3.bb b/packages/nsqld/nsqld_0.5.3.bb
index e69de29bb2..c6f44397db 100644
--- a/packages/nsqld/nsqld_0.5.3.bb
+++ b/packages/nsqld/nsqld_0.5.3.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Server process for syncing"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Tim Teulings <tim@teulings.org>"
+LICENSE = "GPL"
+
+SRC_URI = "${GPE_MIRROR}/nsqld-${PV}.tar.gz"
+
+S = "${WORKDIR}/nsqld-${PV}"
+
+inherit autotools pkgconfig
+
+do_install () {
+        install -d ${D}${bindir}
+        install -m 0755 ${WORKDIR}/nsqld-${PV}/nsqld ${D}${bindir}
+}
diff --git a/packages/ntp/ntp-ssl_4.1.2.bb b/packages/ntp/ntp-ssl_4.1.2.bb
index fc661a240d..adaa2283fd 100644
--- a/packages/ntp/ntp-ssl_4.1.2.bb
+++ b/packages/ntp/ntp-ssl_4.1.2.bb
@@ -25,6 +25,6 @@ PACKAGES = "ntpdate ntp"
 FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/ntpdate ${D}${sysconfdir}/init.d
 }
diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb
index f77112bdfc..0328268026 100644
--- a/packages/ntp/ntp_4.1.2.bb
+++ b/packages/ntp/ntp_4.1.2.bb
@@ -23,8 +23,8 @@ PACKAGES = "ntpdate ntp"
 FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate"
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/ntpdate ${D}${sysconfdir}/init.d
 }
 
 pkg_postinst_ntpdate_nylon() {
diff --git a/packages/nylon/nylon-statistics.bb b/packages/nylon/nylon-statistics.bb
index b89c0b395c..e93749e7f2 100644
--- a/packages/nylon/nylon-statistics.bb
+++ b/packages/nylon/nylon-statistics.bb
@@ -10,11 +10,11 @@ SRC_URI = "svn://meshcube.org/svn/application;module=${PN};proto=http"
 S = "${WORKDIR}/${PN}"
 
 do_install() {
-	install -d ${D}/srv/www/cgi-bin
-	install -d ${D}/${sbindir}
-	ln -s /var/tmp ${D}/srv/www/rrd-img
-	install -m 755 ${S}/*.html ${D}/srv/www/cgi-bin
-	install -m 755 ${S}/collect.sh ${D}/${sbindir}
+	install -d ${D}srv/www/cgi-bin
+	install -d ${D}${sbindir}
+	ln -s /var/tmp ${D}srv/www/rrd-img
+	install -m 755 ${S}/*.html ${D}srv/www/cgi-bin
+	install -m 755 ${S}/collect.sh ${D}${sbindir}
 }
 
 pkg_postinst() {
diff --git a/packages/nylon/yamonenv.bb b/packages/nylon/yamonenv.bb
index e69de29bb2..db3aa6f001 100644
--- a/packages/nylon/yamonenv.bb
+++ b/packages/nylon/yamonenv.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Reads YAMON environment-variables"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael Stickel <michael.stickel@4g-systems.biz>"
+LICENSE = "GPL"
+PV = "cvs${CVSDATE}"
+
+SRC_URI = "svn://meshcube.org/svn/application;module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 755 ${S}/src/yamonenv ${D}${sbindir}
+}
diff --git a/packages/olsrd/olsrd_0.4.7.bb b/packages/olsrd/olsrd_0.4.7.bb
index 9b2acb2ffb..cd103a1203 100644
--- a/packages/olsrd/olsrd_0.4.7.bb
+++ b/packages/olsrd/olsrd_0.4.7.bb
@@ -22,8 +22,8 @@ do_compile() {
 
 do_install () {
 	oe_runmake INSTALL_PREFIX=${D} install install_libs
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd
 }
 
 CONFFILES_${PN} = "/etc/olsrd.conf"
diff --git a/packages/olsrd/olsrd_0.4.8.bb b/packages/olsrd/olsrd_0.4.8.bb
index e69de29bb2..54925362bd 100644
--- a/packages/olsrd/olsrd_0.4.8.bb
+++ b/packages/olsrd/olsrd_0.4.8.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "OLSR mesh routing daemon"
+HOMEPAGE = "http://www.olsr.org"
+DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+SRC_URI="http://www.olsr.org/downloadolsr.cgi?file=olsrd-${PV}.tar.bz2 \
+	file://init \
+	file://olsrd.conf"
+
+PACKAGES =+ "olsrd-libs"
+FILES_olsrd-libs = "${libdir}"
+
+S = "${WORKDIR}/olsrd-${PV}"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "olsrd"
+INITSCRIPT_PARAMS = "defaults"
+
+do_compile() {
+	touch .depend
+	touch src/cfgparser/.depend
+	oe_runmake OS=linux all libs
+}
+
+do_install () {
+	oe_runmake INSTALL_PREFIX=${D} install install_libs
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd
+	install -m 644 ${WORKDIR}/olsrd.conf ${D}${sysconfdir}
+}
+
+CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/olsrd/olsrd_cvs.bb b/packages/olsrd/olsrd_cvs.bb
index e69de29bb2..2aa5729992 100644
--- a/packages/olsrd/olsrd_cvs.bb
+++ b/packages/olsrd/olsrd_cvs.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "OLSR mesh routing daemon"
+HOMEPAGE = "http://www.olsr.org"
+DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "BSD"
+PV = "cvs${CVSDATE}"
+
+SRC_URI="cvs://anonymous@cvs.sourceforge.net/cvsroot/olsrd;module=olsrd-current \
+	file://init \
+	file://olsrd.conf"
+
+PACKAGES =+ "olsrd-libs"
+FILES_olsrd-libs = "${libdir}"
+
+S = "${WORKDIR}/olsrd-current"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "olsrd"
+INITSCRIPT_PARAMS = "defaults"
+
+do_compile() {
+	touch .depend
+	touch src/cfgparser/.depend
+	oe_runmake OS=linux clean all libs
+}
+
+do_install () {
+	oe_runmake INSTALL_PREFIX=${D} install install_libs
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/olsrd
+	install -m 644 ${WORKDIR}/olsrd.conf ${D}${sysconfdir}
+}
+
+CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/openssh/openssh_3.8p1.bb b/packages/openssh/openssh_3.8p1.bb
index 88428dd99a..93f5169f7a 100644
--- a/packages/openssh/openssh_3.8p1.bb
+++ b/packages/openssh/openssh_3.8p1.bb
@@ -45,8 +45,8 @@ do_compile_append () {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/sshd
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
 }
 
 PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc"
diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc
index e69de29bb2..d5cd66aeb7 100644
--- a/packages/openssl/openssl.inc
+++ b/packages/openssl/openssl.inc
@@ -0,0 +1,80 @@
+SECTION = "libs"
+DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
+HOMEPAGE = "http://www.openssl.org/"
+LICENSE = "openssl"
+
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+S = "${WORKDIR}/openssl-${PV}"
+
+AR_append = " r"
+export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+
+# -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom
+export CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
+
+export DIRS = "crypto ssl apps"
+export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+export AS = "${CC} -c"
+
+PACKAGES =+ "libcrypto libssl"
+FILES_libcrypto = "${libdir}/libcrypto.so*"
+FILES_libssl = "${libdir}/libssl.so*"
+
+do_compile () {
+	cd util
+	perl perlpath.pl ${bindir}
+	cd ..
+	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
+
+	# endianness fun.. whee
+	. ${CONFIG_SITE}
+	if test "x$ac_cv_c_bigendian" = "xyes"; then
+		CFLAG="${CFLAG} -DB_ENDIAN"
+	elif test "x$ac_cv_c_littleendian" = "xyes"; then
+		CFLAG="${CFLAG} -DL_ENDIAN"
+	elif test "x$ac_cv_c_bigendian" = "xno" && test "x$ac_cv_c_littleendian" = "xno"; then
+		# no idea what to do with this...
+		:
+	else
+		CFLAG="${CFLAG} -DL_ENDIAN"
+	fi
+
+	os=${HOST_OS}
+	if [ "x$os" = "xlinux-uclibc" ]; then
+		os=linux
+	fi
+	target="$os-${HOST_ARCH}"
+	case $target in
+	linux-arm)
+		target=linux-elf-arm
+		;;
+	linux-armeb)
+		target=linux-elf-armeb
+		;;
+	linux-i586)
+		target=linux-pentium
+		;;
+	linux-i686)
+		target=linux-ppro
+		;;
+	linux-powerpc)
+		target=linux-ppc
+		;;
+	esac
+	perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+	oe_runmake
+}
+
+do_stage () {
+	cp --dereference -R include/openssl ${STAGING_INCDIR}/
+	oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
+	oe_libinstall -a -so libssl ${STAGING_LIBDIR}
+}
+
+do_install () {
+	install -m 0755 -d ${D}${libdir}/pkgconfig
+	oe_runmake INSTALL_PREFIX="${D}" install
+	chmod 644 ${D}${libdir}/pkgconfig/openssl.pc
+	oe_libinstall -so libcrypto ${D}${libdir}
+	oe_libinstall -so libssl ${D}${libdir}
+}
diff --git a/packages/openvpn/openvpn_1.5.0.bb b/packages/openvpn/openvpn_1.5.0.bb
index f5eabe4ae0..2ae76af84e 100644
--- a/packages/openvpn/openvpn_1.5.0.bb
+++ b/packages/openvpn/openvpn_1.5.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-${PV}.tar.gz \
 inherit autotools
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/openvpn
-	install -m 755 ${WORKDIR}/openvpn ${D}/${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/openvpn
+	install -m 755 ${WORKDIR}/openvpn ${D}${sysconfdir}/init.d
 }
diff --git a/packages/openvpn/openvpn_1.6.0.bb b/packages/openvpn/openvpn_1.6.0.bb
index e69de29bb2..4b5c46e859 100644
--- a/packages/openvpn/openvpn_1.6.0.bb
+++ b/packages/openvpn/openvpn_1.6.0.bb
@@ -0,0 +1,19 @@
+SECTION = "console/network"
+DESCRIPTION = "A VPN solution via tun device.  Not IPSEC!"
+HOMEPAGE = "http://openvpn.sourceforge.net"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+DEPENDS = "lzo openssl"
+RDEPENDS = "kernel-module-tun"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-${PV}.tar.gz \
+	file://openvpn"
+
+inherit autotools
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/openvpn
+	install -m 755 ${WORKDIR}/openvpn ${D}${sysconfdir}/init.d
+}
diff --git a/packages/openvpn/openvpn_2.0rc1.bb b/packages/openvpn/openvpn_2.0rc1.bb
index e69de29bb2..8003d88709 100644
--- a/packages/openvpn/openvpn_2.0rc1.bb
+++ b/packages/openvpn/openvpn_2.0rc1.bb
@@ -0,0 +1,21 @@
+SECTION = "console/network"
+DESCRIPTION = "A VPN solution via tun device.  Not IPSEC!"
+HOMEPAGE = "http://openvpn.sourceforge.net"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+DEPENDS = "lzo openssl"
+RDEPENDS = "kernel-module-tun"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-2.0_rc1.tar.gz \
+	file://openvpn"
+S = "${WORKDIR}/openvpn-2.0_rc1"
+
+inherit autotools
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/openvpn
+	install -m 755 ${WORKDIR}/openvpn ${D}${sysconfdir}/init.d
+}
diff --git a/packages/opie-advancedfm/opie-advancedfm_1.1.9.bb b/packages/opie-advancedfm/opie-advancedfm_1.1.9.bb
index 528b049686..1da3ac4846 100644
--- a/packages/opie-advancedfm/opie-advancedfm_1.1.9.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_1.1.9.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
 
 PACKAGES_prepend = "opie-advancedfm-pics "
diff --git a/packages/opie-advancedfm/opie-advancedfm_cvs.bb b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
index 6943651e8c..a043e9d190 100644
--- a/packages/opie-advancedfm/opie-advancedfm_cvs.bb
+++ b/packages/opie-advancedfm/opie-advancedfm_cvs.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
 
 PACKAGES_prepend = "opie-advancedfm-pics "
diff --git a/packages/opie-alarm/opie-alarm_1.1.9.bb b/packages/opie-alarm/opie-alarm_1.1.9.bb
index c3985e83fb..f2a21153b9 100644
--- a/packages/opie-alarm/opie-alarm_1.1.9.bb
+++ b/packages/opie-alarm/opie-alarm_1.1.9.bb
@@ -15,9 +15,9 @@ S = "${WORKDIR}/opiealarm"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/ ${D}/${sysconfdir}/apm/event.d/
-	install -m 0755 ${S}/opiealarm ${D}/${palmtopdir}/bin/
-	install -m 0755 ${WORKDIR}/01opiealarm ${D}/${sysconfdir}/apm/event.d/
+	install -d ${D}${palmtopdir}/bin/ ${D}${sysconfdir}/apm/event.d/
+	install -m 0755 ${S}/opiealarm ${D}${palmtopdir}/bin/
+	install -m 0755 ${WORKDIR}/01opiealarm ${D}${sysconfdir}/apm/event.d/
 }
 
 FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/packages/opie-alarm/opie-alarm_cvs.bb b/packages/opie-alarm/opie-alarm_cvs.bb
index 8344ead3d7..8679f0ec57 100644
--- a/packages/opie-alarm/opie-alarm_cvs.bb
+++ b/packages/opie-alarm/opie-alarm_cvs.bb
@@ -15,9 +15,9 @@ S = "${WORKDIR}/opiealarm"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/ ${D}/${sysconfdir}/apm/event.d/
-	install -m 0755 ${S}/opiealarm ${D}/${palmtopdir}/bin/
-	install -m 0755 ${WORKDIR}/01opiealarm ${D}/${sysconfdir}/apm/event.d/
+	install -d ${D}${palmtopdir}/bin/ ${D}${sysconfdir}/apm/event.d/
+	install -m 0755 ${S}/opiealarm ${D}${palmtopdir}/bin/
+	install -m 0755 ${WORKDIR}/01opiealarm ${D}${sysconfdir}/apm/event.d/
 }
 
 FILES_${PN} = "${palmtopdir}/bin/opiealarm ${sysconfdir}/apm/event.d/01opiealarm"
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.9.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.9.bb
index 21769eb17f..b4b0cc8bd9 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.9.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_1.1.9.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}
-	install -m 0655 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/pics/${APPNAME}
+	install -m 0655 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
 
 pkg_postinst() {
diff --git a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
index b3f7f748bc..1950b2c973 100644
--- a/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
+++ b/packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
@@ -13,8 +13,8 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}
-	install -m 0655 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/pics/${APPNAME}
+	install -m 0655 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
 
 pkg_postinst() {
diff --git a/packages/opie-calibrate/opie-calibrate_1.1.9.bb b/packages/opie-calibrate/opie-calibrate_1.1.9.bb
index 814c0fac30..9b735e133c 100644
--- a/packages/opie-calibrate/opie-calibrate_1.1.9.bb
+++ b/packages/opie-calibrate/opie-calibrate_1.1.9.bb
@@ -12,6 +12,6 @@ S = "${WORKDIR}/calibrate"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 0755 calibrate ${D}/${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 calibrate ${D}${palmtopdir}/bin/
 }
diff --git a/packages/opie-calibrate/opie-calibrate_cvs.bb b/packages/opie-calibrate/opie-calibrate_cvs.bb
index 96ffa16930..7c8ee88d40 100644
--- a/packages/opie-calibrate/opie-calibrate_cvs.bb
+++ b/packages/opie-calibrate/opie-calibrate_cvs.bb
@@ -11,6 +11,6 @@ S = "${WORKDIR}/calibrate"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 0755 calibrate ${D}/${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 calibrate ${D}${palmtopdir}/bin/
 }
diff --git a/packages/opie-camera/opie-camera_1.0.3.bb b/packages/opie-camera/opie-camera_1.0.3.bb
index 68dccb49c4..9af1d02b76 100644
--- a/packages/opie-camera/opie-camera_1.0.3.bb
+++ b/packages/opie-camera/opie-camera_1.0.3.bb
@@ -22,9 +22,9 @@ PARALLEL_MAKE = ""
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}
-    install -d ${D}/${palmtopdir}/lib/
-    oe_libinstall -so libcamera ${D}/${palmtopdir}/lib
-    install -m 0755 capture ${D}/${palmtopdir}/bin/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}
+    install -d ${D}${palmtopdir}/lib/
+    oe_libinstall -so libcamera ${D}${palmtopdir}/lib
+    install -m 0755 capture ${D}${palmtopdir}/bin/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-camera/opie-camera_cvs.bb b/packages/opie-camera/opie-camera_cvs.bb
index 2cd43f074e..67dfa9840f 100644
--- a/packages/opie-camera/opie-camera_cvs.bb
+++ b/packages/opie-camera/opie-camera_cvs.bb
@@ -19,9 +19,9 @@ PARALLEL_MAKE = ""
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}
-    install -d ${D}/${palmtopdir}/lib/
-    oe_libinstall -so libcamera ${D}/${palmtopdir}/lib
-    install -m 0755 capture ${D}/${palmtopdir}/bin/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}
+    install -d ${D}${palmtopdir}/lib/
+    oe_libinstall -so libcamera ${D}${palmtopdir}/lib
+    install -m 0755 capture ${D}${palmtopdir}/bin/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-checkbook/opie-checkbook_0.8.0.bb b/packages/opie-checkbook/opie-checkbook_0.8.0.bb
index e5f0508713..6335d51c7a 100644
--- a/packages/opie-checkbook/opie-checkbook_0.8.0.bb
+++ b/packages/opie-checkbook/opie-checkbook_0.8.0.bb
@@ -15,6 +15,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-checkbook/opie-checkbook_cvs.bb b/packages/opie-checkbook/opie-checkbook_cvs.bb
index bd08b4f094..6ad26c6e6d 100644
--- a/packages/opie-checkbook/opie-checkbook_cvs.bb
+++ b/packages/opie-checkbook/opie-checkbook_cvs.bb
@@ -14,6 +14,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-console/opie-console_1.1.9.bb b/packages/opie-console/opie-console_1.1.9.bb
index d3a6c24033..0b176e5100 100644
--- a/packages/opie-console/opie-console_1.1.9.bb
+++ b/packages/opie-console/opie-console_1.1.9.bb
@@ -16,7 +16,7 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/console/keys/
-    install -m 0644 ${WORKDIR}/pics/console/*.png ${D}/${palmtopdir}/pics/console/
-    install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}/${palmtopdir}/pics/console/keys/
+    install -d ${D}${palmtopdir}/pics/console/keys/
+    install -m 0644 ${WORKDIR}/pics/console/*.png ${D}${palmtopdir}/pics/console/
+    install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}${palmtopdir}/pics/console/keys/
 }
diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb
index a978b8fdc3..295fb3823e 100644
--- a/packages/opie-console/opie-console_cvs.bb
+++ b/packages/opie-console/opie-console_cvs.bb
@@ -17,7 +17,7 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/console/keys/
-	install -m 0644 ${WORKDIR}/pics/console/*.png ${D}/${palmtopdir}/pics/console/
-	install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}/${palmtopdir}/pics/console/keys/
+	install -d ${D}${palmtopdir}/pics/console/keys/
+	install -m 0644 ${WORKDIR}/pics/console/*.png ${D}${palmtopdir}/pics/console/
+	install -m 0644 ${WORKDIR}/pics/console/keys/*.png ${D}${palmtopdir}/pics/console/keys/
 }
diff --git a/packages/opie-dasher/opie-dasher_1.1.9.bb b/packages/opie-dasher/opie-dasher_1.1.9.bb
index 3e7db12a9d..608ecf5d0f 100644
--- a/packages/opie-dasher/opie-dasher_1.1.9.bb
+++ b/packages/opie-dasher/opie-dasher_1.1.9.bb
@@ -34,8 +34,8 @@ if [ -n "$D" ]; then exit 1; fi
 # FILES plugins/inputmethods/libqdasher.so* share/dasher/alphabet.xml
 # FILES share/dasher/training_*.txt
 do_install() {
-	install -d ${D}/${palmtopdir}/share/dasher/
-	install -m 0644 ${WORKDIR}/share/dasher/alphabet.xml ${D}/${palmtopdir}/share/dasher/
+	install -d ${D}${palmtopdir}/share/dasher/
+	install -m 0644 ${WORKDIR}/share/dasher/alphabet.xml ${D}${palmtopdir}/share/dasher/
 	for f in ${WORKDIR}/share/dasher/training_*.txt
 	do
 #		echo Installing Dasher Language $f
diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/opie-dasher/opie-dasher_cvs.bb
index a4db7d3d27..3b4207d42e 100644
--- a/packages/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/opie-dasher/opie-dasher_cvs.bb
@@ -33,8 +33,8 @@ if [ -n "$D" ]; then exit 1; fi
 # FILES plugins/inputmethods/libqdasher.so* share/dasher/alphabet.xml
 # FILES share/dasher/training_*.txt
 do_install() {
-	install -d ${D}/${palmtopdir}/share/dasher/
-	install -m 0644 ${WORKDIR}/share/dasher/alphabet.xml ${D}/${palmtopdir}/share/dasher/
+	install -d ${D}${palmtopdir}/share/dasher/
+	install -m 0644 ${WORKDIR}/share/dasher/alphabet.xml ${D}${palmtopdir}/share/dasher/
 	for f in ${WORKDIR}/share/dasher/training_*.txt
 	do
 #		echo Installing Dasher Language $f
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.9.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.9.bb
index f926a836b0..ea279b6dbb 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.9.bb
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_1.1.9.bb
@@ -17,6 +17,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/konsole/
-    install -m 0644 ${WORKDIR}/pics/konsole/*.png ${D}/${palmtopdir}/pics/konsole/
+    install -d ${D}${palmtopdir}/pics/konsole/
+    install -m 0644 ${WORKDIR}/pics/konsole/*.png ${D}${palmtopdir}/pics/konsole/
 }
diff --git a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
index a84fb8f770..9c09f6e91a 100644
--- a/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
+++ b/packages/opie-embeddedkonsole/opie-embeddedkonsole_cvs.bb
@@ -16,6 +16,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/konsole/
-    install -m 0644 ${WORKDIR}/pics/konsole/*.png ${D}/${palmtopdir}/pics/konsole/
+    install -d ${D}${palmtopdir}/pics/konsole/
+    install -m 0644 ${WORKDIR}/pics/konsole/*.png ${D}${palmtopdir}/pics/konsole/
 }
diff --git a/packages/opie-examples/opie-examples_cvs.bb b/packages/opie-examples/opie-examples_cvs.bb
index af3ca1e6f6..e0cda71e51 100644
--- a/packages/opie-examples/opie-examples_cvs.bb
+++ b/packages/opie-examples/opie-examples_cvs.bb
@@ -20,7 +20,7 @@ do_install() {
 
         for i in `find . -perm 0755 -type f`
         do
-                install -m 0755 $i ${D}/${palmtopdir}/bin/`basename $i`
+                install -m 0755 $i ${D}${palmtopdir}/bin/`basename $i`
         done
 }
 
diff --git a/packages/opie-eye/opie-eye_1.1.9.bb b/packages/opie-eye/opie-eye_1.1.9.bb
index 713534e019..17cc636a09 100644
--- a/packages/opie-eye/opie-eye_1.1.9.bb
+++ b/packages/opie-eye/opie-eye_1.1.9.bb
@@ -24,7 +24,7 @@ do_compile_append() {
 }
 
 do_install() {
-	install -m 0755 opie-eye_slave ${D}/${palmtopdir}/bin/
+	install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-eye/opie-eye_cvs.bb b/packages/opie-eye/opie-eye_cvs.bb
index 0d2e31ac09..dd8876a0a5 100644
--- a/packages/opie-eye/opie-eye_cvs.bb
+++ b/packages/opie-eye/opie-eye_cvs.bb
@@ -24,7 +24,7 @@ do_compile_append() {
 }
 
 do_install() {
-	install -m 0755 opie-eye_slave ${D}/${palmtopdir}/bin/
+	install -m 0755 opie-eye_slave ${D}${palmtopdir}/bin/
         install -d ${D}${palmtopdir}/pics/${APPNAME}/
         install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-ftplib/opie-ftplib_1.1.9.bb b/packages/opie-ftplib/opie-ftplib_1.1.9.bb
index 3ee33d219c..427fbc02f8 100644
--- a/packages/opie-ftplib/opie-ftplib_1.1.9.bb
+++ b/packages/opie-ftplib/opie-ftplib_1.1.9.bb
@@ -19,5 +19,5 @@ do_stage () {
 }
 
 do_install() {
-	oe_libinstall -so libftplib ${D}/${palmtopdir}/lib
+	oe_libinstall -so libftplib ${D}${palmtopdir}/lib
 }
diff --git a/packages/opie-ftplib/opie-ftplib_cvs.bb b/packages/opie-ftplib/opie-ftplib_cvs.bb
index 592021af5e..37ee60cd0d 100644
--- a/packages/opie-ftplib/opie-ftplib_cvs.bb
+++ b/packages/opie-ftplib/opie-ftplib_cvs.bb
@@ -20,5 +20,5 @@ do_stage () {
 }
 
 do_install() {
-	oe_libinstall -so libftplib ${D}/${palmtopdir}/lib
+	oe_libinstall -so libftplib ${D}${palmtopdir}/lib
 }
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_1.1.9.bb b/packages/opie-helpbrowser/opie-helpbrowser_1.1.9.bb
index 2af2801495..9bd13f6815 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_1.1.9.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_1.1.9.bb
@@ -16,6 +16,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
index 2852ccbcad..2923dc972d 100644
--- a/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
+++ b/packages/opie-helpbrowser/opie-helpbrowser_cvs.bb
@@ -15,6 +15,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
index e69de29bb2..ad948c23f4 100644
--- a/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_0.0.1.bb
@@ -0,0 +1,24 @@
+SECTION = "opie/settings"
+DESCRIPTION = "Reload .desktop files on the fly"
+PRIORITY = "optional"
+MAINTAINER = "Matthias 'CoreDump' Hentges <coredump@handhelds.org>"
+LICENSE = "GPL"
+
+PR = "r2"
+
+SRC_URI = "file://icon-reload.desktop \
+	   file://icon-reload.sh \
+	   file://reload.png"
+
+FILES_${PN} += "/opt"
+
+do_install() {		
+	install -d ${D}opt/QtPalmtop/apps/Settings
+	install -d ${D}opt/QtPalmtop/bin
+	install -d ${D}opt/QtPalmtop/pics
+	
+	install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}opt/QtPalmtop/apps/Settings
+	install -m 0755 ${WORKDIR}/icon-reload.sh ${D}opt/QtPalmtop/bin
+	install -m 0644 ${WORKDIR}/reload.png ${D}opt/QtPalmtop/pics	
+}
+
diff --git a/packages/opie-jumpx/opie-jumpx_1.1.9.bb b/packages/opie-jumpx/opie-jumpx_1.1.9.bb
index dc7a001486..0c7725804f 100644
--- a/packages/opie-jumpx/opie-jumpx_1.1.9.bb
+++ b/packages/opie-jumpx/opie-jumpx_1.1.9.bb
@@ -33,7 +33,7 @@ if [ -n "$D" ]; then exit 1; fi
 
 # FILES plugins/inputmethods/libqjumpx.so* pics/jumpx
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/jumpx/
-	install -m 0644 ${WORKDIR}/pics/jumpx/*.png ${D}/${palmtopdir}/pics/jumpx/
+	install -d ${D}${palmtopdir}/pics/jumpx/
+	install -m 0644 ${WORKDIR}/pics/jumpx/*.png ${D}${palmtopdir}/pics/jumpx/
 }
 
diff --git a/packages/opie-jumpx/opie-jumpx_cvs.bb b/packages/opie-jumpx/opie-jumpx_cvs.bb
index ca51255a78..4fba09974c 100644
--- a/packages/opie-jumpx/opie-jumpx_cvs.bb
+++ b/packages/opie-jumpx/opie-jumpx_cvs.bb
@@ -32,7 +32,7 @@ if [ -n "$D" ]; then exit 1; fi
 
 # FILES plugins/inputmethods/libqjumpx.so* pics/jumpx
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/jumpx/
-	install -m 0644 ${WORKDIR}/pics/jumpx/*.png ${D}/${palmtopdir}/pics/jumpx/
+	install -d ${D}${palmtopdir}/pics/jumpx/
+	install -m 0644 ${WORKDIR}/pics/jumpx/*.png ${D}${palmtopdir}/pics/jumpx/
 }
 
diff --git a/packages/opie-kjumpx/opie-kjumpx_1.1.9.bb b/packages/opie-kjumpx/opie-kjumpx_1.1.9.bb
index 7f6383456d..aadfc55fea 100644
--- a/packages/opie-kjumpx/opie-kjumpx_1.1.9.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_1.1.9.bb
@@ -34,7 +34,7 @@ if [ -n "$D" ]; then exit 1; fi
 
 # FILES plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/kjumpx/
-	install -m 0644 ${WORKDIR}/pics/kjumpx/*.png ${D}/${palmtopdir}/pics/kjumpx/
+	install -d ${D}${palmtopdir}/pics/kjumpx/
+	install -m 0644 ${WORKDIR}/pics/kjumpx/*.png ${D}${palmtopdir}/pics/kjumpx/
 }
 
diff --git a/packages/opie-kjumpx/opie-kjumpx_cvs.bb b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
index 81986fa458..bee86e4d51 100644
--- a/packages/opie-kjumpx/opie-kjumpx_cvs.bb
+++ b/packages/opie-kjumpx/opie-kjumpx_cvs.bb
@@ -33,7 +33,7 @@ if [ -n "$D" ]; then exit 1; fi
 
 # FILES plugins/inputmethods/libqkjumpx.so* pics/kjumpx/*
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/kjumpx/
-	install -m 0644 ${WORKDIR}/pics/kjumpx/*.png ${D}/${palmtopdir}/pics/kjumpx/
+	install -d ${D}${palmtopdir}/pics/kjumpx/
+	install -m 0644 ${WORKDIR}/pics/kjumpx/*.png ${D}${palmtopdir}/pics/kjumpx/
 }
 
diff --git a/packages/opie-lockapplet/opie-lockapplet_1.1.9.bb b/packages/opie-lockapplet/opie-lockapplet_1.1.9.bb
index 87d1134361..69a63b0e69 100644
--- a/packages/opie-lockapplet/opie-lockapplet_1.1.9.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_1.1.9.bb
@@ -33,8 +33,8 @@ pkg_postrm() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/security/
-    install -m 0644 ${WORKDIR}/pics/security/lock.png ${D}/${palmtopdir}/pics/security/
-    oe_libinstall -so liblockapplet ${D}/${palmtopdir}/plugins/applets/
+    install -d ${D}${palmtopdir}/plugins/applets ${D}${palmtopdir}/pics/security/
+    install -m 0644 ${WORKDIR}/pics/security/lock.png ${D}${palmtopdir}/pics/security/
+    oe_libinstall -so liblockapplet ${D}${palmtopdir}/plugins/applets/
 }
 
diff --git a/packages/opie-lockapplet/opie-lockapplet_cvs.bb b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
index 695fb4bb79..987aa36d0e 100644
--- a/packages/opie-lockapplet/opie-lockapplet_cvs.bb
+++ b/packages/opie-lockapplet/opie-lockapplet_cvs.bb
@@ -30,8 +30,8 @@ pkg_postrm() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/security/
-    install -m 0644 ${WORKDIR}/pics/security/lock.png ${D}/${palmtopdir}/pics/security/
-    oe_libinstall -so liblockapplet ${D}/${palmtopdir}/plugins/applets/
+    install -d ${D}${palmtopdir}/plugins/applets ${D}${palmtopdir}/pics/security/
+    install -m 0644 ${WORKDIR}/pics/security/lock.png ${D}${palmtopdir}/pics/security/
+    oe_libinstall -so liblockapplet ${D}${palmtopdir}/plugins/applets/
 }
 
diff --git a/packages/opie-login/opie-login_1.1.9.bb b/packages/opie-login/opie-login_1.1.9.bb
index c88e315d51..b58e7fff6d 100644
--- a/packages/opie-login/opie-login_1.1.9.bb
+++ b/packages/opie-login/opie-login_1.1.9.bb
@@ -25,13 +25,13 @@ EXTRA_QMAKEVARS_POST_append = " DEFINES-=USEPAM"
 
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin
-	install -d ${D}/${palmtopdir}/etc
-	install -d ${D}/${palmtopdir}/share/opie-login
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/etc
+	install -d ${D}${palmtopdir}/share/opie-login
 
-	install -m 755 ${WORKDIR}/${PN}/opie-login ${D}/${palmtopdir}/bin
-	install -m 644 ${WORKDIR}/*-session ${D}/${palmtopdir}/share/opie-login
-	install -m 644 ${WORKDIR}/opie-login.conf ${D}/${palmtopdir}/etc
+	install -m 755 ${WORKDIR}/${PN}/opie-login ${D}${palmtopdir}/bin
+	install -m 644 ${WORKDIR}/*-session ${D}${palmtopdir}/share/opie-login
+	install -m 644 ${WORKDIR}/opie-login.conf ${D}${palmtopdir}/etc
 }
 
 do_configure() {
diff --git a/packages/opie-login/opie-login_cvs.bb b/packages/opie-login/opie-login_cvs.bb
index 23d6d22a37..007f68ef7e 100644
--- a/packages/opie-login/opie-login_cvs.bb
+++ b/packages/opie-login/opie-login_cvs.bb
@@ -23,13 +23,13 @@ EXTRA_QMAKEVARS_POST_append = " LIBS-=-lpam"
 EXTRA_QMAKEVARS_POST_append = " DEFINES-=USEPAM"
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin
-	install -d ${D}/${palmtopdir}/etc
-	install -d ${D}/${palmtopdir}/share/opie-login
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/etc
+	install -d ${D}${palmtopdir}/share/opie-login
 
-	install -m 755 ${WORKDIR}/${PN}/opie-login ${D}/${palmtopdir}/bin
-	install -m 644 ${WORKDIR}/*-session ${D}/${palmtopdir}/share/opie-login
-	install -m 644 ${WORKDIR}/opie-login.conf ${D}/${palmtopdir}/etc
+	install -m 755 ${WORKDIR}/${PN}/opie-login ${D}${palmtopdir}/bin
+	install -m 644 ${WORKDIR}/*-session ${D}${palmtopdir}/share/opie-login
+	install -m 644 ${WORKDIR}/opie-login.conf ${D}${palmtopdir}/etc
 }
 
 do_configure() {
diff --git a/packages/opie-mail/opie-mail_1.1.9.bb b/packages/opie-mail/opie-mail_1.1.9.bb
index 97be791e03..8e105de3cc 100644
--- a/packages/opie-mail/opie-mail_1.1.9.bb
+++ b/packages/opie-mail/opie-mail_1.1.9.bb
@@ -20,7 +20,7 @@ inherit opie
 # FILES plugins/application/libopiemail.so* bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/mail/
-	install -m 0644 ${WORKDIR}/pics/mail/*.png ${D}/${palmtopdir}/pics/mail/
+	install -d ${D}${palmtopdir}/pics/mail/
+	install -m 0644 ${WORKDIR}/pics/mail/*.png ${D}${palmtopdir}/pics/mail/
 }
 
diff --git a/packages/opie-mail/opie-mail_cvs.bb b/packages/opie-mail/opie-mail_cvs.bb
index 75004bf6a9..92814ebd5d 100644
--- a/packages/opie-mail/opie-mail_cvs.bb
+++ b/packages/opie-mail/opie-mail_cvs.bb
@@ -19,7 +19,7 @@ inherit opie
 # FILES plugins/application/libopiemail.so* bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/mail/
-	install -m 0644 ${WORKDIR}/pics/mail/*.png ${D}/${palmtopdir}/pics/mail/
+	install -d ${D}${palmtopdir}/pics/mail/
+	install -m 0644 ${WORKDIR}/pics/mail/*.png ${D}${palmtopdir}/pics/mail/
 }
 
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_1.1.9.bb b/packages/opie-memoryapplet/opie-memoryapplet_1.1.9.bb
index eff741b1b3..1136bee2b4 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_1.1.9.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_1.1.9.bb
@@ -29,8 +29,8 @@ pkg_postrm() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/memory/
-    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}/${palmtopdir}/pics/memory/
-    oe_libinstall -so libmemoryapplet ${D}/${palmtopdir}/plugins/applets/
+    install -d ${D}${palmtopdir}/plugins/applets ${D}${palmtopdir}/pics/memory/
+    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}${palmtopdir}/pics/memory/
+    oe_libinstall -so libmemoryapplet ${D}${palmtopdir}/plugins/applets/
 }
 
diff --git a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
index 5175fb2b1a..8b9a77c4fa 100644
--- a/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
+++ b/packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
@@ -29,8 +29,8 @@ pkg_postrm() {
 }
 
 do_install() {
-    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/memory/
-    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}/${palmtopdir}/pics/memory/
-    oe_libinstall -so libmemoryapplet ${D}/${palmtopdir}/plugins/applets/
+    install -d ${D}${palmtopdir}/plugins/applets ${D}${palmtopdir}/pics/memory/
+    install -m 0644 ${WORKDIR}/pics/memory/*.png ${D}${palmtopdir}/pics/memory/
+    oe_libinstall -so libmemoryapplet ${D}${palmtopdir}/plugins/applets/
 }
 
diff --git a/packages/opie-networksettings/opie-networksettings_1.1.9.bb b/packages/opie-networksettings/opie-networksettings_1.1.9.bb
index 1db0c97e78..2484cad78f 100644
--- a/packages/opie-networksettings/opie-networksettings_1.1.9.bb
+++ b/packages/opie-networksettings/opie-networksettings_1.1.9.bb
@@ -28,21 +28,21 @@ do_stage() {
 
 do_install() {
 	# Create dir for changedns and the opie-kppp peer
-	install -d ${D}/${bindir}/
-	install -d ${D}/${sysconfdir}/
-	install -d ${D}/${sysconfdir}/ppp/
-	install -d ${D}/${sysconfdir}/ppp/peers/
+	install -d ${D}${bindir}/
+	install -d ${D}${sysconfdir}/
+	install -d ${D}${sysconfdir}/ppp/
+	install -d ${D}${sysconfdir}/ppp/peers/
 	
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-	install -d ${D}/${palmtopdir}/pics/Network/
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/pics/Network/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
-	install -d ${D}/${palmtopdir}/lib/
+	install -d ${D}${palmtopdir}/lib/
 	oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib
-	install -d ${D}/${palmtopdir}/plugins/networksettings/
+	install -d ${D}${palmtopdir}/plugins/networksettings/
 	for plugin in kppp wlan
 	do
-		install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/
+		install lib$plugin.so ${D}${palmtopdir}/plugins/networksettings/
 	done
 
 	# install changedns script
diff --git a/packages/opie-networksettings/opie-networksettings_cvs.bb b/packages/opie-networksettings/opie-networksettings_cvs.bb
index aabba348d4..3ce090f010 100644
--- a/packages/opie-networksettings/opie-networksettings_cvs.bb
+++ b/packages/opie-networksettings/opie-networksettings_cvs.bb
@@ -28,21 +28,21 @@ do_stage() {
 
 do_install() {
 	# Create dir for changedns and the opie-kppp peer
-	install -d ${D}/${bindir}/
-	install -d ${D}/${sysconfdir}/
-	install -d ${D}/${sysconfdir}/ppp/
-	install -d ${D}/${sysconfdir}/ppp/peers/
+	install -d ${D}${bindir}/
+	install -d ${D}${sysconfdir}/
+	install -d ${D}${sysconfdir}/ppp/
+	install -d ${D}${sysconfdir}/ppp/peers/
 	
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-	install -d ${D}/${palmtopdir}/pics/Network/
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/pics/Network/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
-	install -d ${D}/${palmtopdir}/lib/
+	install -d ${D}${palmtopdir}/lib/
 	oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib
-	install -d ${D}/${palmtopdir}/plugins/networksettings/
+	install -d ${D}${palmtopdir}/plugins/networksettings/
 	for plugin in kppp wlan
 	do
-		install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/
+		install lib$plugin.so ${D}${palmtopdir}/plugins/networksettings/
 	done
 
 	# install changedns script
diff --git a/packages/opie-oxygen/opie-oxygen_1.0.0.bb b/packages/opie-oxygen/opie-oxygen_1.0.0.bb
index a160199703..8f1460ee22 100644
--- a/packages/opie-oxygen/opie-oxygen_1.0.0.bb
+++ b/packages/opie-oxygen/opie-oxygen_1.0.0.bb
@@ -18,8 +18,8 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -d ${D}/${palmtopdir}/share/oxygen/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/share/oxygen/*o* ${D}/${palmtopdir}/share/oxygen/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/share/oxygen/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/share/oxygen/*o* ${D}${palmtopdir}/share/oxygen/
 }
diff --git a/packages/opie-oxygen/opie-oxygen_cvs.bb b/packages/opie-oxygen/opie-oxygen_cvs.bb
index 1bd8d79267..6045bce40b 100644
--- a/packages/opie-oxygen/opie-oxygen_cvs.bb
+++ b/packages/opie-oxygen/opie-oxygen_cvs.bb
@@ -15,8 +15,8 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -d ${D}/${palmtopdir}/share/oxygen/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/share/oxygen/*o* ${D}/${palmtopdir}/share/oxygen/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/share/oxygen/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/share/oxygen/*o* ${D}${palmtopdir}/share/oxygen/
 }
diff --git a/packages/opie-packagemanager/opie-packagemanager_1.1.9.bb b/packages/opie-packagemanager/opie-packagemanager_1.1.9.bb
index fa85458650..fa67d4cf0c 100644
--- a/packages/opie-packagemanager/opie-packagemanager_1.1.9.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_1.1.9.bb
@@ -18,6 +18,6 @@ inherit opie
 EXTRA_QMAKEVARS_PRE = 'LIBIPK_INC_DIR=${STAGING_INCDIR}/libipkg'
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-packagemanager/opie-packagemanager_cvs.bb b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
index 046d2a741d..c5ab7419ea 100644
--- a/packages/opie-packagemanager/opie-packagemanager_cvs.bb
+++ b/packages/opie-packagemanager/opie-packagemanager_cvs.bb
@@ -17,6 +17,6 @@ inherit opie
 EXTRA_QMAKEVARS_PRE = 'LIBIPK_INC_DIR=${STAGING_INCDIR}/libipkg'
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-qcop/opie-qcop_1.0.0.bb b/packages/opie-qcop/opie-qcop_1.0.0.bb
index 17f5a4a910..ea358ca47a 100644
--- a/packages/opie-qcop/opie-qcop_1.0.0.bb
+++ b/packages/opie-qcop/opie-qcop_1.0.0.bb
@@ -12,6 +12,6 @@ S = "${WORKDIR}/qcop"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 0755 ${S}/qcop ${D}/${palmtopdir}/bin/qcop
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 ${S}/qcop ${D}${palmtopdir}/bin/qcop
 }
diff --git a/packages/opie-qcop/opie-qcop_cvs.bb b/packages/opie-qcop/opie-qcop_cvs.bb
index e69de29bb2..a060a8b5a1 100644
--- a/packages/opie-qcop/opie-qcop_cvs.bb
+++ b/packages/opie-qcop/opie-qcop_cvs.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Opie QCOP IPC Client"
+SECTION = "opie/base"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+PV = "1.0.0+cvs-${CVSDATE}"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/qcop"
+S = "${WORKDIR}/qcop"
+
+inherit opie
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 ${S}/qcop ${D}${palmtopdir}/bin/qcop
+}
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_1.1.9.bb b/packages/opie-quicklauncher/opie-quicklauncher_1.1.9.bb
index 3e74da1e79..f4e1e10f89 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_1.1.9.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_1.1.9.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}/quicklauncher"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 755 quicklauncher ${D}/${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/bin/
+	install -m 755 quicklauncher ${D}${palmtopdir}/bin/
 
 }
diff --git a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
index dca104b061..1aaeec9b59 100644
--- a/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
+++ b/packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/quicklauncher"
 inherit opie
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 755 quicklauncher ${D}/${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/bin/
+	install -m 755 quicklauncher ${D}${palmtopdir}/bin/
 
 }
diff --git a/packages/opie-reader/opie-reader_1.1.9.bb b/packages/opie-reader/opie-reader_1.1.9.bb
index acca006b75..411b181dca 100644
--- a/packages/opie-reader/opie-reader_1.1.9.bb
+++ b/packages/opie-reader/opie-reader_1.1.9.bb
@@ -30,15 +30,15 @@ do_install() {
 
 		for f in libAportis libPlucker libppms libCHM libWeasel libiSilo   
 		do
-			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/plugins/reader/codecs/
+			oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/codecs/
 		done
 
 		for f in libreader_codec libreader_pdb libreader_pluckerbase
 		do
-			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/lib/
+			oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/lib/
 		done
-		oe_libinstall -so -C ${S}/ libHTMLfilter ${D}/${palmtopdir}/plugins/reader/filters/
-		install -m 0644 ${S}/HTMLentities ${D}/${palmtopdir}/plugins/reader/data/
+		oe_libinstall -so -C ${S}/ libHTMLfilter ${D}${palmtopdir}/plugins/reader/filters/
+		install -m 0644 ${S}/HTMLentities ${D}${palmtopdir}/plugins/reader/data/
 		
 }
 
diff --git a/packages/opie-reader/opie-reader_cvs.bb b/packages/opie-reader/opie-reader_cvs.bb
index dfe0161026..982e112846 100644
--- a/packages/opie-reader/opie-reader_cvs.bb
+++ b/packages/opie-reader/opie-reader_cvs.bb
@@ -29,15 +29,15 @@ do_install() {
 
 		for f in libAportis libPlucker libppms libCHM libWeasel libiSilo   
 		do
-			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/plugins/reader/codecs/
+			oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/plugins/reader/codecs/
 		done
 
 		for f in libreader_codec libreader_pdb libreader_pluckerbase
 		do
-			oe_libinstall -so -C ${S}/ $f ${D}/${palmtopdir}/lib/
+			oe_libinstall -so -C ${S}/ $f ${D}${palmtopdir}/lib/
 		done
-		oe_libinstall -so -C ${S}/ libHTMLfilter ${D}/${palmtopdir}/plugins/reader/filters/
-		install -m 0644 ${S}/HTMLentities ${D}/${palmtopdir}/plugins/reader/data/
+		oe_libinstall -so -C ${S}/ libHTMLfilter ${D}${palmtopdir}/plugins/reader/filters/
+		install -m 0644 ${S}/HTMLentities ${D}${palmtopdir}/plugins/reader/data/
 		
 }
 
diff --git a/packages/opie-sh-snes/opie-sh-snes_0.2.bb b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
index c8cfb35d2b..4fe14863e9 100644
--- a/packages/opie-sh-snes/opie-sh-snes_0.2.bb
+++ b/packages/opie-sh-snes/opie-sh-snes_0.2.bb
@@ -20,10 +20,10 @@ do_install() {
 
 	for dir in apps apps/Games bin pics
 	do
-		install -d ${D}/opt/QtPalmtop/$dir
+		install -d ${D}opt/QtPalmtop/$dir
 	done
 	
-	install -m 755 ${WORKDIR}/opie-sh-snes.sh ${D}/opt/QtPalmtop/bin
-	install -m 644 ${WORKDIR}/*.png ${D}/opt/QtPalmtop/pics
-	install -m 644 ${WORKDIR}/*.desktop ${D}/opt/QtPalmtop/apps/Games
+	install -m 755 ${WORKDIR}/opie-sh-snes.sh ${D}opt/QtPalmtop/bin
+	install -m 644 ${WORKDIR}/*.png ${D}opt/QtPalmtop/pics
+	install -m 644 ${WORKDIR}/*.desktop ${D}opt/QtPalmtop/apps/Games
 }	   
diff --git a/packages/opie-taskbar/opie-taskbar_1.1.9.bb b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
index 2574cd0ef7..102d8d94e4 100644
--- a/packages/opie-taskbar/opie-taskbar_1.1.9.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.1.9.bb
@@ -58,44 +58,44 @@ SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
 PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/bin
 	for i in ${SECTIONS}
 	do
-		install -d ${D}/${palmtopdir}/apps/$i/
-		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+		install -d ${D}${palmtopdir}/apps/$i/
+		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/
 	done
-	install -d ${D}/${palmtopdir}/pics/launcher
-	install -d ${D}/${palmtopdir}/pics/logo
-	install -d ${D}/${palmtopdir}/pics/RoH/star/
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/profile.d
-	install -d ${D}/${palmtopdir}/etc/colors
-	install -d ${D}/${palmtopdir}/etc/skel
-
-	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
-	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
-	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}/${sysconfdir}/profile.d/
+	install -d ${D}${palmtopdir}/pics/launcher
+	install -d ${D}${palmtopdir}/pics/logo
+	install -d ${D}${palmtopdir}/pics/RoH/star/
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/profile.d
+	install -d ${D}${palmtopdir}/etc/colors
+	install -d ${D}${palmtopdir}/etc/skel
+
+	install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe
+	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
+	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/
 
 	for p in ${PICS}
 	do
-		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p
 	done
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg
 
-	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
-	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/
+	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
 
-	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/${sysconfdir}/
+	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
 
-	install -m 0755 ${WORKDIR}/opie ${D}/${sysconfdir}/init.d/opie
-	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+	install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
+	install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
 
-	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
 }
 
 FILES_opie-taskbar_append = " /etc /etc/profile.d ${palmtopdir}/apps ${palmtopdir}/pics"
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 113787b460..343b2b76d4 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -56,48 +56,48 @@ SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
 PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/bin
 	for i in ${SECTIONS}
 	do
-		install -d ${D}/${palmtopdir}/apps/$i/
-		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+		install -d ${D}${palmtopdir}/apps/$i/
+		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}${palmtopdir}/apps/$i/
 	done
-	install -d ${D}/${palmtopdir}/pics/launcher
-	install -d ${D}/${palmtopdir}/pics/logo
-	install -d ${D}/${palmtopdir}/pics/RoH/star/
-	install -d ${D}/${sysconfdir}/init.d
-	install -d ${D}/${sysconfdir}/profile.d	
-	install -d ${D}/${palmtopdir}/etc/colors
-	install -d ${D}/${palmtopdir}/etc/skel
-
-	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
-	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
-	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
-	install -m 0644 ${WORKDIR}/opie_defaults ${D}/${sysconfdir}/profile.d/
+	install -d ${D}${palmtopdir}/pics/launcher
+	install -d ${D}${palmtopdir}/pics/logo
+	install -d ${D}${palmtopdir}/pics/RoH/star/
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/profile.d	
+	install -d ${D}${palmtopdir}/etc/colors
+	install -d ${D}${palmtopdir}/etc/skel
+
+	install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe
+	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/
+	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/
 
 	for p in ${PICS}
 	do
-		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}${palmtopdir}/pics/launcher/$p
 	done
-	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
-	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/firstuse.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}${palmtopdir}/pics/launcher/opie-background.jpg
 
-	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
-	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}${palmtopdir}/pics/logo/
+	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}${palmtopdir}/pics/RoH/star/
 
-	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
-	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/${sysconfdir}/
+	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/
 
-	install -m 0755 ${WORKDIR}/opie ${D}/${sysconfdir}/init.d/opie
-	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+	install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie
+	install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/
 
 	if [ -s ${WORKDIR}/locale.conf ]; then
-	    install -m 0644 ${WORKDIR}/locale.conf ${D}/${palmtopdir}/etc/skel/
+	    install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/
 	fi
 
-        install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
-        install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/
 }
 
 updatercd_postinst_ramses() {
diff --git a/packages/opie-textedit/opie-textedit_1.1.9.bb b/packages/opie-textedit/opie-textedit_1.1.9.bb
index cfdf089177..38f18df8a9 100644
--- a/packages/opie-textedit/opie-textedit_1.1.9.bb
+++ b/packages/opie-textedit/opie-textedit_1.1.9.bb
@@ -15,6 +15,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-textedit/opie-textedit_cvs.bb b/packages/opie-textedit/opie-textedit_cvs.bb
index 67352bdf5c..6d2a07645f 100644
--- a/packages/opie-textedit/opie-textedit_cvs.bb
+++ b/packages/opie-textedit/opie-textedit_cvs.bb
@@ -14,6 +14,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_1.0.4.bb b/packages/opie-wellenreiter/opie-wellenreiter_1.0.4.bb
index e69de29bb2..a18f96ba0c 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_1.0.4.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_1.0.4.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A Wireless Network Monitor"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RRECOMMENDS = "manufacturers"
+APPNAME = "wellenreiter"
+APPTYPE = "binary"
+# 20050201 _is_ V1.0.4
+CVSDATE = "20050201"
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/wellenreiter \
+           ${HANDHELDS_CVS};module=opie/pics \
+           ${HANDHELDS_CVS};module=opie/apps"
+S = "${WORKDIR}/wellenreiter"
+
+inherit opie
+
+do_install() {
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
+}
diff --git a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
index 15e5e9a610..bff189fd7c 100644
--- a/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
+++ b/packages/opie-wellenreiter/opie-wellenreiter_cvs.bb
@@ -17,6 +17,6 @@ S = "${WORKDIR}/wellenreiter"
 inherit opie
 
 do_install() {
-        install -d ${D}/${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
 	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-write/opie-write_1.1.9.bb b/packages/opie-write/opie-write_1.1.9.bb
index 68573fae0b..152e8cd2aa 100644
--- a/packages/opie-write/opie-write_1.1.9.bb
+++ b/packages/opie-write/opie-write_1.1.9.bb
@@ -15,6 +15,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/opie-write/opie-write_cvs.bb b/packages/opie-write/opie-write_cvs.bb
index ee8b2ba917..1a2b8912ee 100644
--- a/packages/opie-write/opie-write_cvs.bb
+++ b/packages/opie-write/opie-write_cvs.bb
@@ -14,6 +14,6 @@ S = "${WORKDIR}/${APPNAME}"
 inherit opie
 
 do_install() {
-    install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+    install -d ${D}${palmtopdir}/pics/${APPNAME}/
+    install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/orinoco/orinoco-modules_0.13e.bb b/packages/orinoco/orinoco-modules_0.13e.bb
index f39ba65f76..44bae20228 100644
--- a/packages/orinoco/orinoco-modules_0.13e.bb
+++ b/packages/orinoco/orinoco-modules_0.13e.bb
@@ -20,13 +20,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/${sysconfdir}/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
-        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
-        install -d ${D}/${sysconfdir}/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}${sysconfdir}/pcmcia/
+        install -d ${D}${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb
index 74a269d6d9..e1f6e11583 100644
--- a/packages/orinoco/orinoco-modules_0.15rc1.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc1.bb
@@ -24,13 +24,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/${sysconfdir}/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
-        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
-        install -d ${D}/${sysconfdir}/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}${sysconfdir}/pcmcia/
+        install -d ${D}${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index a81dbdd424..ec7eb6a3d0 100644
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -27,13 +27,13 @@ do_compile_prepend() {
 }
 
 do_install() {   
-        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/${sysconfdir}/pcmcia
-        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
-        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
-        install -d ${D}/${sysconfdir}/modutils
-        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}${sysconfdir}/pcmcia
+        install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}${sysconfdir}/pcmcia/
+        install -d ${D}${sysconfdir}/modutils
+        install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb
index d268f6d646..2afe839d34 100644
--- a/packages/orinoco/orinoco-modules_cvs.bb
+++ b/packages/orinoco/orinoco-modules_cvs.bb
@@ -28,13 +28,13 @@ do_compile_prepend() {
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/${sysconfdir}/pcmcia
-	install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/${sysconfdir}/pcmcia/
-        install -m 0644 hermes.conf ${D}/${sysconfdir}/pcmcia/
-	install -d ${D}/${sysconfdir}/modutils
-	install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/${sysconfdir}/modutils/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -d ${D}${sysconfdir}/pcmcia
+	install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+        install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/
+        install -m 0644 hermes.conf ${D}${sysconfdir}/pcmcia/
+	install -d ${D}${sysconfdir}/modutils
+	install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/
 }
 
 PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules"
diff --git a/packages/oz-compat/oz-compat_0.5.bb b/packages/oz-compat/oz-compat_0.5.bb
index 41ca32049e..81b83fb414 100644
--- a/packages/oz-compat/oz-compat_0.5.bb
+++ b/packages/oz-compat/oz-compat_0.5.bb
@@ -20,33 +20,33 @@ INITSCRIPT_NAME = "quickexec"
 INITSCRIPT_PARAMS = "defaults 10"
 
 do_install() {
-	install -d ${D}/opt/QtPalmtop/apps/Settings
-	install -d ${D}/opt/QtPalmtop/bin/
-	install -d ${D}/opt/QtPalmtop/etc/
-	install -d ${D}/opt/QtPalmtop/pics/
+	install -d ${D}opt/QtPalmtop/apps/Settings
+	install -d ${D}opt/QtPalmtop/bin/
+	install -d ${D}opt/QtPalmtop/etc/
+	install -d ${D}opt/QtPalmtop/pics/
 	
-	install -d ${D}/opt/QtPalmtop.compat/bin
-	install -d ${D}/opt/QtPalmtop.compat/binlib
-	install -d ${D}/opt/QtPalmtop.compat/lib
+	install -d ${D}opt/QtPalmtop.compat/bin
+	install -d ${D}opt/QtPalmtop.compat/binlib
+	install -d ${D}opt/QtPalmtop.compat/lib
 	
-	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/init.d
 	
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}/opt/QtPalmtop/apps/Settings		
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}/opt/QtPalmtop/etc/quickexec.libs
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}/opt/QtPalmtop/pics/libraries.png
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/apps/Settings/makecompat.desktop ${D}opt/QtPalmtop/apps/Settings		
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/etc/quickexec.libs ${D}opt/QtPalmtop/etc/quickexec.libs
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop/pics/libraries.png ${D}opt/QtPalmtop/pics/libraries.png
 	
-	install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}/opt/QtPalmtop.compat/bin
-	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}/opt/QtPalmtop.compat/lib
+	install -m 0755 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/bin/* ${D}opt/QtPalmtop.compat/bin
+	install -m 0644 ${WORKDIR}/oz-compat-0.5/opt/QtPalmtop.compat/lib/* ${D}opt/QtPalmtop.compat/lib
 	
-	install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/oz-compat-0.5/etc/init.d/quickexec ${D}${sysconfdir}/init.d
 			
-	cd ${D}/opt/QtPalmtop/bin
+	cd ${D}opt/QtPalmtop/bin
 	for file in chkhinge makecompat qeserver quickexec runcompat
 	do
 		ln -s /opt/QtPalmtop.compat/bin/$file
 	done
 	
-	cd ${D}/opt/QtPalmtop.compat/lib
+	cd ${D}opt/QtPalmtop.compat/lib
 	ln -s libqpe.so.1.5.0 libqpe.so.1.5
 	ln -s libqpe.so.1.5.0 libqpe.so.1
 	ln -s libqpe.so.1.5.0 libqpe.so
diff --git a/packages/patcher/patcher_20040913.bb b/packages/patcher/patcher_20040913.bb
index e69de29bb2..9559f5cf72 100644
--- a/packages/patcher/patcher_20040913.bb
+++ b/packages/patcher/patcher_20040913.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Patcher is a perl script for managing patches."
+HOMEPAGE = "http://www.holgerschurig.de/patcher.html"
+LICENSE = "Perl"
+DEPENDS = ""
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Holger Schurig <hs4233@mail.mn-solutions.de>"
+INHIBIT_DEFAULT_DEPS = "1"
+
+SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2"
+S="${WORKDIR}/patcher"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 patcher.py ${D}${bindir}/patcher
+}
+
+DEPENDS_prepend_delete = "patcher "
diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb
index 60008cfe45..cb77a6b5c2 100644
--- a/packages/pciutils/pciutils_2.1.11.bb
+++ b/packages/pciutils/pciutils_2.1.11.bb
@@ -15,10 +15,10 @@ do_configure () {
 	(cd lib && ./configure ${datadir} ${PV} ${TARGET_OS} 2.4.21 ${TARGET_ARCH})
 }
 
-export PREFIX = "${D}/${prefix}"
-export SBINDIR = "${D}/${sbindir}"
-export SHAREDIR = "${D}/${datadir}"
-export MANDIR = "${D}/${mandir}"
+export PREFIX = "${D}${prefix}"
+export SBINDIR = "${D}${sbindir}"
+export SHAREDIR = "${D}${datadir}"
+export MANDIR = "${D}${mandir}"
 
 do_install () {
 	oe_runmake install
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 4f4a437bc5..6b3895a046 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -58,36 +58,36 @@ INSTALL_ETC_DATA =     "config config.opts ftl.opts ieee1394.opts memory.opts ne
 INSTALL_ETC_DATA_arm = "config             ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
 
 do_install() {
-	install -d ${D}/${sbindir}
+	install -d ${D}${sbindir}
 	for f in cardmgr/cardctl cardmgr/cardmgr cardmgr/ide_info cardmgr/ifport cardmgr/ifuser cardmgr/pcinitrd flash/ftl_check flash/ftl_format
 	do
-		install -m 0755 $f ${D}/${sbindir}/
+		install -m 0755 $f ${D}${sbindir}/
 	done
-	install -d ${D}/${sysconfdir}/init.d \
-		   ${D}/${sysconfdir}/pcmcia \
-		   ${D}/${sysconfdir}/pcmcia/cis
+	install -d ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/pcmcia \
+		   ${D}${sysconfdir}/pcmcia/cis
 
-	install -m 0644 ${WORKDIR}/network.conf ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 ${WORKDIR}/wnv.conf ${D}/${sysconfdir}/pcmcia/
+	install -m 0644 ${WORKDIR}/network.conf ${D}${sysconfdir}/pcmcia/
+	install -m 0644 ${WORKDIR}/wnv.conf ${D}${sysconfdir}/pcmcia/
 
 	for i in ${INSTALL_ETC}; do
-		install -m 0755 etc/${i} ${D}/${sysconfdir}/pcmcia/
+		install -m 0755 etc/${i} ${D}${sysconfdir}/pcmcia/
 	done
 	for i in ${INSTALL_ETC_DATA}; do
-		install -m 0644 etc/${i} ${D}/${sysconfdir}/pcmcia/
+		install -m 0644 etc/${i} ${D}${sysconfdir}/pcmcia/
 	done
 
 	# ensure that config.opts always exists, albeit empty
-	echo >> ${D}/${sysconfdir}/pcmcia/config.opts
+	echo >> ${D}${sysconfdir}/pcmcia/config.opts
 
-	install -m 0644 ${WORKDIR}/ide.opts ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 ${WORKDIR}/wireless.opts ${D}/${sysconfdir}/pcmcia/
+	install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
+	install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/
 	for i in etc/cis/*; do
-		install -m 0644 $i ${D}/${sysconfdir}/pcmcia/cis/
+		install -m 0644 $i ${D}${sysconfdir}/pcmcia/cis/
 	done
-	install -m 0755 etc/rc.pcmcia ${D}/${sysconfdir}/init.d/pcmcia
-	install -d ${D}/${sysconfdir}/sysconfig
-	install -m 0755 ${WORKDIR}/pcmcia ${D}/${sysconfdir}/sysconfig/pcmcia
+	install -m 0755 etc/rc.pcmcia ${D}${sysconfdir}/init.d/pcmcia
+	install -d ${D}${sysconfdir}/sysconfig
+	install -m 0755 ${WORKDIR}/pcmcia ${D}${sysconfdir}/sysconfig/pcmcia
 }
 
 PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd"
diff --git a/packages/pdm/pdm_1.0.bb b/packages/pdm/pdm_1.0.bb
index e69de29bb2..56f1f5a3d1 100644
--- a/packages/pdm/pdm_1.0.bb
+++ b/packages/pdm/pdm_1.0.bb
@@ -0,0 +1,13 @@
+SECTION = "x11/base"
+LICENSE = "GPL"
+DESCRIPTION = "pdm is a minimal session manager for GUIs."
+
+SRC_URI = "http://www.penguru.net/download/pdm-${PV}.tar.gz"
+
+do_install () {
+	install -d ${D}${sbindir} \
+		   ${D}${sysconfdir}/pdm/sessions \
+		   ${D}${sysconfdir}/pdm/plugins
+	install -m 0755 pdm ${D}${sbindir}/pdm
+	install -m 0644 conf/pdm.conf* ${D}${sysconfdir}/pdm/
+}
diff --git a/packages/perl/perl_5.8.3.bb b/packages/perl/perl_5.8.3.bb
index 44f39a56fb..465ef99c3b 100644
--- a/packages/perl/perl_5.8.3.bb
+++ b/packages/perl/perl_5.8.3.bb
@@ -37,7 +37,7 @@ do_compile() {
 
 do_install() {
 	oe_runmake install
-	mv ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}/${libdir}/libperl.so.${PV}
+	mv ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/CORE/libperl.so ${D}${libdir}/libperl.so.${PV}
 	( cd ${D}${bindir}/; rm perl; ln -s perl${PV} perl )
 }
 
diff --git a/packages/petitepainture/petitepainture_1.4a.bb b/packages/petitepainture/petitepainture_1.4a.bb
index 81cb8c8686..b489414f9d 100644
--- a/packages/petitepainture/petitepainture_1.4a.bb
+++ b/packages/petitepainture/petitepainture_1.4a.bb
@@ -18,7 +18,7 @@ inherit opie
 QMAKE_PROFILES = "spainter.pro"
 
 do_install() {
-        install -d ${D}/${palmtopdir}/pics
-        install -m 0644 *.png ${D}/${palmtopdir}/pics/
-        install -m 0644 ${WORKDIR}/petitpeintu.png ${D}/${palmtopdir}/pics/
+        install -d ${D}${palmtopdir}/pics
+        install -m 0644 *.png ${D}${palmtopdir}/pics/
+        install -m 0644 ${WORKDIR}/petitpeintu.png ${D}${palmtopdir}/pics/
 }
diff --git a/packages/picocom/picocom_1.3.bb b/packages/picocom/picocom_1.3.bb
index 62d2ab2941..b747569033 100644
--- a/packages/picocom/picocom_1.3.bb
+++ b/packages/picocom/picocom_1.3.bb
@@ -12,6 +12,6 @@ do_compile() {
 }
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}/${bindir}/
+	install -d ${D}${bindir}
+	install -m 0755 ${PN} pcasc pcxm pcym pczm ${D}${bindir}/
 }
diff --git a/packages/pmacct/pmacct_0.7.9.bb b/packages/pmacct/pmacct_0.7.9.bb
index 421b3967cb..d557cae0e2 100644
--- a/packages/pmacct/pmacct_0.7.9.bb
+++ b/packages/pmacct/pmacct_0.7.9.bb
@@ -16,10 +16,10 @@ do_configure () {
 
 do_install() {
 	autotools_do_install
-	install -d ${D}/${sysconfdir}/init.d/
-	install -d ${D}/${sysconfdir}/pmacct
-	install -m 755 ${WORKDIR}/pmacct.init ${D}/${sysconfdir}/init.d/pmacct
-	install -m 644 ${WORKDIR}/pmacct.conf.eth0 ${D}/${sysconfdir}/pmacct
+	install -d ${D}${sysconfdir}/init.d/
+	install -d ${D}${sysconfdir}/pmacct
+	install -m 755 ${WORKDIR}/pmacct.init ${D}${sysconfdir}/init.d/pmacct
+	install -m 644 ${WORKDIR}/pmacct.conf.eth0 ${D}${sysconfdir}/pmacct
 }
 
 CONFFILES_nylon = "/etc/pmacct/pmacct.conf.eth0"
diff --git a/packages/pocketcellar/pocketcellar_1.1.bb b/packages/pocketcellar/pocketcellar_1.1.bb
index e69de29bb2..de339235c9 100644
--- a/packages/pocketcellar/pocketcellar_1.1.bb
+++ b/packages/pocketcellar/pocketcellar_1.1.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Program for wine enthusiasts"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.staikos.net/~staikos/pocketcellar/pocketcellar-${PV}.tar.gz \
+           file://gcc3.patch;patch=1"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = " DESTDIR=pkg-cellar/home/QtPalmtop/bin/"
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics \
+			   ${D}${palmtopdir}/data/PocketCellar
+			   
+		install -m 644 pkg-pcellar/home/QtPalmtop/data/PocketCellar/* ${D}${palmtopdir}/data/PocketCellar/
+# BAD.  packages -never- install files into home directories.  ever. --CL
+#	cp -a pkg-pcellar/home/root/Settings/* ${D}home/root/Settings/
+        install -m 755 pkg-cellar/home/QtPalmtop/bin/pocketcellar ${D}${palmtopdir}/bin/
+        install -m 644 pocketcellar.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 644 pocketcellar.png ${D}${palmtopdir}/pics/
+}
+
+FILES_${PN} = "/"
diff --git a/packages/poqetpresenter/poqetpresenter_0.0.6.bb b/packages/poqetpresenter/poqetpresenter_0.0.6.bb
index e69de29bb2..93e0caa485 100644
--- a/packages/poqetpresenter/poqetpresenter_0.0.6.bb
+++ b/packages/poqetpresenter/poqetpresenter_0.0.6.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "OpenOffice.org Impress presentation viewer for Qt/E based Palmtop environments"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://poqetp.sourceforge.net/"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/poqetp/poqetp_${PV}_src.tar.gz"
+S = "${WORKDIR}/poqetp"
+
+inherit palmtop
+
+do_configure_prepend() {
+	find . -name "Makefile"|xargs rm -f # force regenerating Makefiles
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics
+        install -D -m 0755 poqetp/poqetp ${D}${palmtopdir}/bin/poqetp
+        install -D -m 0644 poqetp.desktop ${D}${palmtopdir}/Applications/poqetp.desktop
+        install -d ${D}${palmtopdir}/pics/poqetp
+        cp -a pics/* ${D}${palmtopdir}/pics/poqetp/
+}
diff --git a/packages/portabase/portabase_1.9.bb b/packages/portabase/portabase_1.9.bb
index 1379f31d59..394c99f2b5 100644
--- a/packages/portabase/portabase_1.9.bb
+++ b/packages/portabase/portabase_1.9.bb
@@ -28,20 +28,20 @@ EXTRA_QMAKEVARS_POST += "CONFIG-=desktop"
 # lrelease portabase.pro
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin \
-			${D}/${palmtopdir}/apps/Applications \
-			${D}/${palmtopdir}/pics/${APPNAME}		\
-			${D}/${palmtopdir}/help/en
-	install -D -m 0755 ${APPNAME} ${D}/${palmtopdir}/bin/${APPNAME}
-	install -m 0644 package/${APPNAME}.desktop ${D}/${palmtopdir}/apps/Applications/${APPNAME}.desktop
+	install -d ${D}${palmtopdir}/bin \
+			${D}${palmtopdir}/apps/Applications \
+			${D}${palmtopdir}/pics/${APPNAME}		\
+			${D}${palmtopdir}/help/en
+	install -D -m 0755 ${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
+	install -m 0644 package/${APPNAME}.desktop ${D}${palmtopdir}/apps/Applications/${APPNAME}.desktop
 	 
-	install -D -m 0644 pics/PortaBase.png ${D}/${palmtopdir}/pics/PortaBase.png
+	install -D -m 0644 pics/PortaBase.png ${D}${palmtopdir}/pics/PortaBase.png
 	for f in calculator.png checked.png image.png note.png save.png save_disabled.png unchecked.png calendar.xpm QtaDatePickerNext.xpm QtaDatePickerPrev.xpm
 	do
-		install -D -m 0644 pics/$f ${D}/${palmtopdir}/pics/${APPNAME}/$f
+		install -D -m 0644 pics/$f ${D}${palmtopdir}/pics/${APPNAME}/$f
 	done         
 
-	install -D -m 0644 help/html/${APPNAME}.html ${D}/${palmtopdir}/help/en/html/${APPNAME}.html
+	install -D -m 0644 help/html/${APPNAME}.html ${D}${palmtopdir}/help/en/html/${APPNAME}.html
 } 
 
 
diff --git a/packages/portaudio/portaudio_0.0.19.bb b/packages/portaudio/portaudio_0.0.19.bb
index 00acecddd4..98c49ef1d9 100644
--- a/packages/portaudio/portaudio_0.0.19.bb
+++ b/packages/portaudio/portaudio_0.0.19.bb
@@ -75,12 +75,12 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${libdir}
-	install -d ${D}/${bindir}
-	install -d ${D}/${includedir}
-	oe_libinstall -so -C lib libportaudio ${D}/${libdir}
-	install -m 0644 pa_common/portaudio.h ${D}/${includedir}
-	install -m 0755 bin/* ${D}/${bindir}/
+	install -d ${D}${libdir}
+	install -d ${D}${bindir}
+	install -d ${D}${includedir}
+	oe_libinstall -so -C lib libportaudio ${D}${libdir}
+	install -m 0644 pa_common/portaudio.h ${D}${includedir}
+	install -m 0755 bin/* ${D}${bindir}/
 }
 
 PACKAGES = "libportaudio0 portaudio-dev portaudio-examples"
diff --git a/packages/portmap/portmap_5-7.bb b/packages/portmap/portmap_5-7.bb
index 4acb379673..0e6e2ab6a5 100644
--- a/packages/portmap/portmap_5-7.bb
+++ b/packages/portmap/portmap_5-7.bb
@@ -26,8 +26,8 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/portmap.init ${D}/${sysconfdir}/init.d/portmap
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
 	oe_runmake 'docdir=${docdir}/portmap' \
 		   'DESTDIR=${D}' install
 }
diff --git a/packages/powermanga/powermanga_0.79.bb b/packages/powermanga/powermanga_0.79.bb
index e69de29bb2..36ebdddc2b 100644
--- a/packages/powermanga/powermanga_0.79.bb
+++ b/packages/powermanga/powermanga_0.79.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Powermanga is an arcade 2D shoot-em-up game with 41 levels and more than 200 sprites."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "libsdl-qpe libsdl-mixer"
+PR = "r1"
+
+SRC_URI = "http://linux.tlk.fr/games/Powermanga/download/powermanga-0.79.tgz \
+	   file://linuxroutines.cpp \
+	   file://pda-tweaks.patch;patch=1 \
+	   file://powermanga.pro \
+	   file://powermanga.png \
+	   file://powermanga.desktop"
+
+S = ${WORKDIR}/${PN}-${PV}/
+
+inherit palmtop
+
+do_configure_prepend() {
+	mv ${WORKDIR}/linuxroutines.cpp ${S}/src/
+	mv ${WORKDIR}/powermanga.pro ${S}/
+	rm -f `find ${S}/ -name Makefile\*`
+	rm -f `find ${S}/ -name config\*`
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/pics \
+        	   ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/share/games/powermanga/graphics \
+		   ${D}${palmtopdir}/share/games/powermanga/sounds
+        install -m 0755 ${S}/src/powermanga ${D}${palmtopdir}/bin/powermanga
+	install -m 0644 ${WORKDIR}/powermanga.png ${D}${palmtopdir}/pics/powermanga.png
+        install -m 0644 ${WORKDIR}/powermanga.desktop ${D}${palmtopdir}/apps/Games/powermanga.desktop
+	install -m 0644 ${S}/graphics/* ${D}${palmtopdir}/share/games/powermanga/graphics/
+	install -m 0644 ${S}/sounds/* ${D}${palmtopdir}/share/games/powermanga/sounds/
+}
diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb
index b6fe40b1bf..65af10dd31 100644
--- a/packages/ppp-dialin/ppp-dialin_0.1.bb
+++ b/packages/ppp-dialin/ppp-dialin_0.1.bb
@@ -10,11 +10,11 @@ SRC_URI = "file://host-peer \
            file://ppp-dialin"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/ppp/peers
-	install -m 0644 ${WORKDIR}/host-peer ${D}/${sysconfdir}/ppp/peers/host
+	install -d ${D}${sysconfdir}/ppp/peers
+	install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host
 
-	install -d ${D}/${sbindir}
-	install -m 0755 ${WORKDIR}/ppp-dialin ${D}/${sbindir}
+	install -d ${D}${sbindir}
+	install -m 0755 ${WORKDIR}/ppp-dialin ${D}${sbindir}
 }
 
 
diff --git a/packages/ppp-dsl/ppp-dsl_0.1.bb b/packages/ppp-dsl/ppp-dsl_0.1.bb
index e69de29bb2..58861f1f32 100644
--- a/packages/ppp-dsl/ppp-dsl_0.1.bb
+++ b/packages/ppp-dsl/ppp-dsl_0.1.bb
@@ -0,0 +1,28 @@
+SECTION = "console/network"
+DESCRIPTION = "Enables PPP dial-in through a DSL connection"
+MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
+LICENSE = "PD"
+DEPENDS = "ppp rp-pppoe"
+RDEPENDS = "ppp rp-pppoe kernel-module-ppp-async kernel-module-ppp-generic kernel-module-slhc"
+PR = "r1"
+
+SRC_URI = "file://dsl-provider \
+	file://ppp_on_boot.dsl"
+
+do_install() {
+	install -d ${D}${sysconfdir}/ppp/peers
+	install -m 0644 ${WORKDIR}/dsl-provider ${D}${sysconfdir}/ppp/peers/
+	install -m 0755 ${WORKDIR}/ppp_on_boot.dsl ${D}${sysconfdir}/ppp/
+}
+
+pkg_postinst() {
+if test "x$D" != "x"; then
+	exit 1
+else
+	if ! test -e ${sysconfdir}/ppp/ppp_on_boot; then
+		ln -s ppp_on_boot.dsl ${sysconfdir}/ppp/ppp_on_boot
+	fi
+fi
+}
+
+CONFFILES_${PN}_nylon = "${sysconfdir}/ppp/peers/dsl-provider"
diff --git a/packages/prboom/prboom-opie_2.2.6.bb b/packages/prboom/prboom-opie_2.2.6.bb
index 3c32b75517..c0df03c5a6 100644
--- a/packages/prboom/prboom-opie_2.2.6.bb
+++ b/packages/prboom/prboom-opie_2.2.6.bb
@@ -11,12 +11,12 @@ SRC_URI_append = " file://prboom.png \
 
 
 do_install_append() {
-        install -d ${D}/${palmtopdir}/apps/Games \
-        	   ${D}/${palmtopdir}/pics \
+        install -d ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/pics \
 
-	install -m 0755 ${WORKDIR}/prboom.sh ${D}/${bindir}
-	install -m 0644 ${WORKDIR}/prboom.png ${D}/${palmtopdir}/pics/prboom.png
-	install -m 0644 ${WORKDIR}/prboom.desktop ${D}/${palmtopdir}/apps/Games/prboom.desktop
+	install -m 0755 ${WORKDIR}/prboom.sh ${D}${bindir}
+	install -m 0644 ${WORKDIR}/prboom.png ${D}${palmtopdir}/pics/prboom.png
+	install -m 0644 ${WORKDIR}/prboom.desktop ${D}${palmtopdir}/apps/Games/prboom.desktop
 }
 
 FILES_${PN}_append = " ${palmtopdir}"
diff --git a/packages/prboom/prboom_2.3.1.bb b/packages/prboom/prboom_2.3.1.bb
index 567e381390..043a6e9c30 100644
--- a/packages/prboom/prboom_2.3.1.bb
+++ b/packages/prboom/prboom_2.3.1.bb
@@ -25,14 +25,14 @@ do_configure() {
 }
 
 do_install() {
-        install -d ${D}/${palmtopdir}/bin \
-        	   ${D}/${palmtopdir}/apps/Games \
-        	   ${D}/${palmtopdir}/pics \
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/pics \
 		   ${D}${datadir}/games/doom
-	install -m 0755 src/prboom ${D}/${palmtopdir}/bin/prboom
+	install -m 0755 src/prboom ${D}${palmtopdir}/bin/prboom
 	install -m 0644 data/prboom.wad ${D}${datadir}/games/doom/
-	install -m 0644 ${WORKDIR}/prboom.png ${D}/${palmtopdir}/pics/prboom.png
-	install -m 0644 ${WORKDIR}/prboom.desktop ${D}/${palmtopdir}/apps/Games/prboom.desktop
+	install -m 0644 ${WORKDIR}/prboom.png ${D}${palmtopdir}/pics/prboom.png
+	install -m 0644 ${WORKDIR}/prboom.desktop ${D}${palmtopdir}/apps/Games/prboom.desktop
 }
 
 FILES_${PN} = "${palmtopdir} ${datadir}/games/doom/prboom.wad"
diff --git a/packages/prelink/prelink_20031029.bb b/packages/prelink/prelink_20031029.bb
index 6a07b88309..1788dd3342 100644
--- a/packages/prelink/prelink_20031029.bb
+++ b/packages/prelink/prelink_20031029.bb
@@ -19,8 +19,8 @@ S = "${WORKDIR}/prelink"
 inherit autotools 
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
-	install -m 0644 ${WORKDIR}/prelink.conf ${D}/${sysconfdir}/prelink.conf
-	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}/${sysconfdir}/cron.daily/prelink
-	install -m 0644 ${WORKDIR}/prelink.default ${D}/${sysconfdir}/default/prelink
+	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
+	install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
+	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
+	install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
 }
diff --git a/packages/prelink/prelink_20040304.bb b/packages/prelink/prelink_20040304.bb
index 972aac43f8..bb134fe536 100644
--- a/packages/prelink/prelink_20040304.bb
+++ b/packages/prelink/prelink_20040304.bb
@@ -13,8 +13,8 @@ S = "${WORKDIR}/prelink-0.0.${PV}"
 inherit autotools 
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
-	install -m 0644 ${WORKDIR}/prelink.conf ${D}/${sysconfdir}/prelink.conf
-	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}/${sysconfdir}/cron.daily/prelink
-	install -m 0644 ${WORKDIR}/prelink.default ${D}/${sysconfdir}/default/prelink
+	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
+	install -m 0644 ${WORKDIR}/prelink.conf ${D}${sysconfdir}/prelink.conf
+	install -m 0644 ${WORKDIR}/prelink.cron.daily ${D}${sysconfdir}/cron.daily/prelink
+	install -m 0644 ${WORKDIR}/prelink.default ${D}${sysconfdir}/default/prelink
 }
diff --git a/packages/prelink/prelink_20040520.bb b/packages/prelink/prelink_20040520.bb
index b07f05a285..922994ce3a 100644
--- a/packages/prelink/prelink_20040520.bb
+++ b/packages/prelink/prelink_20040520.bb
@@ -12,5 +12,5 @@ EXTRA_OECONF = "--disable-64bit"
 inherit autotools 
 
 do_install_append () {
-	install -d ${D}/${sysconfdir}/cron.daily ${D}/${sysconfdir}/default
+	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
 }
diff --git a/packages/prism3-support/prism3-support_0.1.bb b/packages/prism3-support/prism3-support_0.1.bb
index 492a90812b..e263d9f11a 100644
--- a/packages/prism3-support/prism3-support_0.1.bb
+++ b/packages/prism3-support/prism3-support_0.1.bb
@@ -7,8 +7,8 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 PR = "r0"
 
 do_install() {
-	install -d ${D}/${sysconfdir}/network/if-pre-up.d/
-	cat >${D}/${sysconfdir}/network/if-pre-up.d/hostap-fw-load <<EOF
+	install -d ${D}${sysconfdir}/network/if-pre-up.d/
+	cat >${D}${sysconfdir}/network/if-pre-up.d/hostap-fw-load <<EOF
 #!/bin/sh
                                                        
 # Special case for prism3 cards needing firmware upload
@@ -21,6 +21,6 @@ fi
   
 # lets hope that run-parts obeys the order :D
 EOF
-	chmod a+rx ${D}/${sysconfdir}/network/if-pre-up.d/hostap-fw-load
+	chmod a+rx ${D}${sysconfdir}/network/if-pre-up.d/hostap-fw-load
 }
 
diff --git a/packages/prism54/prism54-firmware_1.0.3.0.bb b/packages/prism54/prism54-firmware_1.0.3.0.bb
index ee79560a06..33138ca064 100644
--- a/packages/prism54/prism54-firmware_1.0.3.0.bb
+++ b/packages/prism54/prism54-firmware_1.0.3.0.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
 S = "${WORKDIR}/prism54.org"
 
 do_install() {
-	install -d ${D}/${base_libdir}/firmware/
-	install -m 0644 ${PV}.arm ${D}/${base_libdir}/firmware/isl3890
+	install -d ${D}${base_libdir}/firmware/
+	install -m 0644 ${PV}.arm ${D}${base_libdir}/firmware/isl3890
 }
 
 FILES_${PN} = "/lib/firmware/"
diff --git a/packages/prism54/prism54-firmware_1.0.4.3.bb b/packages/prism54/prism54-firmware_1.0.4.3.bb
index 65c381fcc0..ebcef7233c 100644
--- a/packages/prism54/prism54-firmware_1.0.4.3.bb
+++ b/packages/prism54/prism54-firmware_1.0.4.3.bb
@@ -9,8 +9,8 @@ SRC_URI = "http://prism54.org/~mcgrof/firmware/${PV}.arm"
 S = "${WORKDIR}/prism54.org"
 
 do_install() {
-	install -d ${D}/${base_libdir}/firmware/
-	install -m 0644 ${PV}.arm ${D}/${base_libdir}/firmware/isl3890
+	install -d ${D}${base_libdir}/firmware/
+	install -m 0644 ${PV}.arm ${D}${base_libdir}/firmware/isl3890
 }
 
 FILES_${PN} = "/lib/firmware/"
diff --git a/packages/prism54/prism54-module_1.2.bb b/packages/prism54/prism54-module_1.2.bb
index fc86f536ae..c55bf27bca 100644
--- a/packages/prism54/prism54-module_1.2.bb
+++ b/packages/prism54/prism54-module_1.2.bb
@@ -16,7 +16,7 @@ inherit module-base
 # Hack Alert :D
 ARCH_mipsel = "mips"
 
-EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} KMISC=${D}/${base_libdir}/modules/${KERNEL_VERSION}/net KVER=${KERNEL_VERSION}"
+EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} KMISC=${D}${base_libdir}/modules/${KERNEL_VERSION}/net KVER=${KERNEL_VERSION}"
 
 do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
diff --git a/packages/prismstumbler/prismstumbler_0.7.2.bb b/packages/prismstumbler/prismstumbler_0.7.2.bb
index 45ad2bb719..9658d11106 100644
--- a/packages/prismstumbler/prismstumbler_0.7.2.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.2.bb
@@ -54,5 +54,5 @@ do_configure() {
 }
 
 do_install_append() {
-  chmod a+s ${D}/${bindir}/prismstumbler
+  chmod a+s ${D}${bindir}/prismstumbler
 }
diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index 919a4fa153..45f0526048 100644
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -53,5 +53,5 @@ do_configure() {
 }
 
 do_install_append() {
-  chmod a+s ${D}/${bindir}/prismstumbler
+  chmod a+s ${D}${bindir}/prismstumbler
 }
diff --git a/packages/putty/putty_cvs.bb b/packages/putty/putty_cvs.bb
index 56ad86e979..a82649712a 100644
--- a/packages/putty/putty_cvs.bb
+++ b/packages/putty/putty_cvs.bb
@@ -32,11 +32,11 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${libdir}
-	oe_libinstall -so libputty ${D}/${libdir}
-	install -d ${D}/${bindir}/
-	install -m 0755 plink ${D}/${bindir}/ssh
-	install -m 0755 pscp ${D}/${bindir}/scp
-	install -m 0755 psftp ${D}/${bindir}/sftp
+	install -d ${D}${libdir}
+	oe_libinstall -so libputty ${D}${libdir}
+	install -d ${D}${bindir}/
+	install -m 0755 plink ${D}${bindir}/ssh
+	install -m 0755 pscp ${D}${bindir}/scp
+	install -m 0755 psftp ${D}${bindir}/sftp
 }
 
diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb
index 000bb9712f..a4b5bf4223 100644
--- a/packages/python/python-pymp3_0.3.4.bb
+++ b/packages/python/python-pymp3_0.3.4.bb
@@ -12,17 +12,17 @@ PY_FILES = "box_info.py layer.py sound_ctrl.py stack.py txt_tools.py"
 
 do_install() {
 
-   install -d ${D}/${libdir}
-   install -d ${D}/${libdir}/${PYTHON_DIR}
-   install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+   install -d ${D}${libdir}
+   install -d ${D}${libdir}/${PYTHON_DIR}
+   install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
 
    for f in ${PY_FILES}
    do
       install -m 0644 $f ${D}${libdir}/${PYTHON_DIR}/site-packages/
    done
 
-   install -d ${D}/${bindir}
-   install -m 755 pymp3 ${D}/${bindir}/
+   install -d ${D}${bindir}
+   install -m 755 pymp3 ${D}${bindir}/
 }
 
 FILES_${PN} += " ${libdir}/${PYTHON_DIR}/site-packages/"
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index a1cc6a6bfb..bddc1dca95 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -46,10 +46,10 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
     for module in ${SIP_MODULES}
     do
-	install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so
+	install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so
     done
 }
 
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index c39661bd28..8677ed05ea 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -54,10 +54,10 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
     for module in ${SIP_MODULES}
     do
-        install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so
+        install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so
     done
 }
 
diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb
index aa294caeee..c675a2f0fc 100644
--- a/packages/python/python-quicklauncher_0.0.1.bb
+++ b/packages/python/python-quicklauncher_0.0.1.bb
@@ -18,10 +18,10 @@ do_compile() {
 #
 
 do_install() {
-	install -d ${D}/${libdir}/${PYTHON_DIR}/
-	install -m 0755 quicklauncher.py ${D}/${libdir}/${PYTHON_DIR}/
-	install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
-	install -m 0755 testapp.py ${D}/${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
+	install -d ${D}${libdir}/${PYTHON_DIR}/
+	install -m 0755 quicklauncher.py ${D}${libdir}/${PYTHON_DIR}/
+	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
+	install -m 0755 testapp.py ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
 }
  
 
diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_0.9.17.bb
index 278fc88a86..d90875f75e 100644
--- a/packages/python/python-scapy_0.9.17.bb
+++ b/packages/python/python-scapy_0.9.17.bb
@@ -13,8 +13,8 @@ SRC_URI = "http://www.cartel-securite.fr/pbiondi/python/scapy-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 do_install() {
-	install -d ${D}/${libdir}/${PYTHON_DIR}
-	install -m 0755 ${S}/scapy.py ${D}/${libdir}/${PYTHON_DIR}/
+	install -d ${D}${libdir}/${PYTHON_DIR}
+	install -m 0755 ${S}/scapy.py ${D}${libdir}/${PYTHON_DIR}/
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb
index cc600c691c..5a402d3aee 100644
--- a/packages/python/python-sip_4.1.1.bb
+++ b/packages/python/python-sip_4.1.1.bb
@@ -34,8 +34,8 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
-	install libsip.so.1.0.0 ${D}/${libdir}/${PYTHON_DIR}/site-packages/sip.so
+	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+	install libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
diff --git a/packages/qclockchange/qclockchange_0.1a.bb b/packages/qclockchange/qclockchange_0.1a.bb
index e69de29bb2..331b20d00e 100644
--- a/packages/qclockchange/qclockchange_0.1a.bb
+++ b/packages/qclockchange/qclockchange_0.1a.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Program that allows you to set the CCCR registers on PXA Zauruses."
+SECTION = "opie/settings"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Dylan Taft <soundmanok@yahoo.com>"
+AUTHOR = "piro <piro400@occn.zaq.ne.jp>"
+HOMEPAGE = "http://www.piro.hopto.org/~piro/pukiwiki/pukiwiki.php?%5B%5B%A5%AB%A1%BC%A5%CD%A5%EB%A5%D1%A5%C3%A5%C1%A4%F2%A4%DE%A4%C8%A4%E1%A4%EB%5D%5D"
+APPTYPE="binary"
+PR = "r1"
+
+SRC_URI = "http://www.piro.hopto.org/~piro/zaurus/qclockchange-${PV}.tar.gz"
+
+inherit palmtop
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin/ \
+               ${D}${palmtopdir}/pics \
+               ${D}${palmtopdir}/apps/Settings
+
+	install -m 0755 qclockchange ${D}${palmtopdir}/bin/qclockchange
+	install -m 0644 ipkg/opt/QtPalmtop/pics/qclockchange.png ${D}${palmtopdir}/pics/qclockchange.png
+	install -m 0644 ipkg/opt/QtPalmtop/apps/Settings/qclockchange.desktop ${D}${palmtopdir}/apps/Settings/qclockchange.desktop	
+}
diff --git a/packages/qpe-games/aliens-qt_1.0.0.bb b/packages/qpe-games/aliens-qt_1.0.0.bb
index e69de29bb2..b31007987b 100644
--- a/packages/qpe-games/aliens-qt_1.0.0.bb
+++ b/packages/qpe-games/aliens-qt_1.0.0.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Alien ShootOut"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Bill Kendrick"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Aliens.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/aliens_V1.0.0.tar.gz \
+	   file://Makefile.patch;patch=1 \
+           file://aliens.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/aliens_V${PV}"
+
+APPNAME = "aliens"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_compile_prepend () {
+	oe_runmake -C images
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
+
diff --git a/packages/qpe-games/atomic_1.0.1.bb b/packages/qpe-games/atomic_1.0.1.bb
index e69de29bb2..cdb5dfe4ba 100644
--- a/packages/qpe-games/atomic_1.0.1.bb
+++ b/packages/qpe-games/atomic_1.0.1.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Atomic"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+
+LICENSE = "GPL"
+AUTHOR = "Andre Wuest"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Atomic.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/atomic_V1.0.1.tar.gz \
+	   file://atomic.patch;patch=1"
+
+
+PV = "1.0.1"
+S = "${WORKDIR}/atomic_V${PV}"
+APPNAME = "atomic"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+
+
+do_compile_prepend() {
+	oe_runmake -C images
+	oe_runmake -C tools
+	oe_runmake -C levels
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpe-games/checkers_1.0.5ern.bb b/packages/qpe-games/checkers_1.0.5ern.bb
index e69de29bb2..3f22d09939 100644
--- a/packages/qpe-games/checkers_1.0.5ern.bb
+++ b/packages/qpe-games/checkers_1.0.5ern.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Checkers"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Walter Rawdanik"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Checkers.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/checkers_V1.0.5ern.tar.gz \
+           file://checkers.patch;patch=1"
+
+PV = "1.0.5ern"
+S = "${WORKDIR}/checkers_V${PV}"
+APPNAME = "checkers"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+
+inherit opie
diff --git a/packages/qpe-games/crossword_0.0.3.bb b/packages/qpe-games/crossword_0.0.3.bb
index e69de29bb2..d257a75ac9 100644
--- a/packages/qpe-games/crossword_0.0.3.bb
+++ b/packages/qpe-games/crossword_0.0.3.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Checkers"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Crossword.html"
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/crossword_V0.0.3.tar.gz \
+	   file://crossword.patch;patch=1"
+
+PV = "0.0.3"
+S = "${WORKDIR}/crossword_V${PV}"
+
+APPNAME = "crossword"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+pkg_postinst() {
+#!/bin/sh
+
+MIMEFILE=/opt/QtPalmtop/etc/mime.types
+
+grep -q application/puz $MIMEFILE 2>/dev/null || echo -e "application/crossword\t\tpuz tpz" >> $MIMEFILE
+}
+
+inherit opie
diff --git a/packages/qpe-games/fish_1.1.0.bb b/packages/qpe-games/fish_1.1.0.bb
index e69de29bb2..5034ab3803 100644
--- a/packages/qpe-games/fish_1.1.0.bb
+++ b/packages/qpe-games/fish_1.1.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Fish Amusement"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Fish.html"
+
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/fish_V1.1.0.tar.gz \
+           file://Makefile.patch;patch=1 \
+           file://fish.patch;patch=1"
+
+PV = "1.1.0"
+S = "${WORKDIR}/fish_V${PV}"
+
+APPNAME = "fish"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_compile_prepend() {
+	oe_runmake -C images
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpe-games/glider_1.0.0.bb b/packages/qpe-games/glider_1.0.0.bb
index e69de29bb2..ab5addfa5f 100644
--- a/packages/qpe-games/glider_1.0.0.bb
+++ b/packages/qpe-games/glider_1.0.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Glider"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Glider.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/glider_V1.0.0.tar.gz \
+           file://Makefile.patch;patch=1 \
+	   file://glider.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/glider_V${PV}"
+
+APPNAME = "glider"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_compile_prepend() {
+	oe_runmake -C images
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb
index e69de29bb2..c1528165ce 100644
--- a/packages/qpe-games/hexatrolic_1.0beta3.bb
+++ b/packages/qpe-games/hexatrolic_1.0beta3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Hexatrolic a Ball Game"
+SECTION     = "opie/games"
+PRIORITY    = "optional"
+MAINTAINER  = "none"
+LICENSE     = "GPL"
+AUTHOR      = "Helge Plehn"
+HOMEPAGE    = "http://hexatrolic.i-networx.de/"
+APPNAME     = "hexatrolic"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/hexatrolic-103beta3-zecke1.tar.bz2"
+
+S = "${WORKDIR}/${APPNAME}"
+
+
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
+}
+
+
+inherit opie
diff --git a/packages/qpe-games/icebloxx_1.0.0.bb b/packages/qpe-games/icebloxx_1.0.0.bb
index e69de29bb2..e1a842375a 100644
--- a/packages/qpe-games/icebloxx_1.0.0.bb
+++ b/packages/qpe-games/icebloxx_1.0.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "IceBloxx"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-IceBloxx.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/icebloxx_V1.0.0.tar.gz \
+           file://Makefile.patch;patch=1 \
+	   file://icebloxx.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/icebloxx_V${PV}"
+
+APPNAME = "icebloxx"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_compile_prepend() {
+	oe_runmake -C images
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb
index e69de29bb2..e7468b507b 100644
--- a/packages/qpe-games/labyrinth_0.7.bb
+++ b/packages/qpe-games/labyrinth_0.7.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A traditional (german?) boardgame"
+SECTION     = "opie/games"
+PRIORITY    = "optional"
+MAINTAINER  = "none"
+LICENSE     = "GPL"
+AUTHOR      = "Helge Plehn"
+HOMEPAGE    = "http://hexatrolic.i-networx.de/"
+APPNAME     = "labyrinth"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz"
+
+S = "${WORKDIR}/${APPNAME}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/share/games/${APPNAME}/
+
+	install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
+	install -m 0644 ${S}/labyrinth.record ${D}${palmtopdir}/share/games/${APPNAME}/
+}
+
+
+inherit opie
diff --git a/packages/qpe-games/mahjongg_1.0.0.bb b/packages/qpe-games/mahjongg_1.0.0.bb
index e69de29bb2..1deff98a6f 100644
--- a/packages/qpe-games/mahjongg_1.0.0.bb
+++ b/packages/qpe-games/mahjongg_1.0.0.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Mahjongg"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Mario Weilguni, Port by Rober Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Mahjongg.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/mahjongg_V1.0.0.tar.gz \
+           file://Makefile.patch;patch=1 \
+	   file://mahjongg.patch;patch=1"
+
+
+PV = "1.0.0"
+S = "${WORKDIR}/mahjongg_V${PV}"
+
+APPNAME = "mahjongg"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_compile_prepend() {
+	oe_runmake -C images
+	oe_runmake -C layouts
+	oe_runmake -C tools
+}
+
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpe-games/maki_1.0.4ern.bb b/packages/qpe-games/maki_1.0.4ern.bb
index e69de29bb2..5e99fbffae 100644
--- a/packages/qpe-games/maki_1.0.4ern.bb
+++ b/packages/qpe-games/maki_1.0.4ern.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Maki"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Henry So, Jr."
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Maki.html"
+
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/maki_V1.0.4ern.tar.gz \
+	   file://maki.patch;patch=1"
+
+PV = "1.0.4ern"
+S = "${WORKDIR}/maki_V${PV}"
+
+APPNAME = "maki"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpe-games/nmm_0.0.2.bb b/packages/qpe-games/nmm_0.0.2.bb
index e69de29bb2..41f0be5c9d 100644
--- a/packages/qpe-games/nmm_0.0.2.bb
+++ b/packages/qpe-games/nmm_0.0.2.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Nime Mens Morris"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Dirk Farin, Port by Rober Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Nine-Mens-Morris.html"
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/nmm_V0.0.2.tar.gz \
+           file://Makefile.patch;patch=1 \
+	   file://nmm.patch;patch=1"
+
+PV = "0.0.2"
+S = "${WORKDIR}/nmm_V${PV}"
+
+APPNAME = "nmm"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_compile_prepend() {
+	oe_runmake -C images	
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
+
diff --git a/packages/qpe-games/pairs_1.1.1.bb b/packages/qpe-games/pairs_1.1.1.bb
index e69de29bb2..275251db28 100644
--- a/packages/qpe-games/pairs_1.1.1.bb
+++ b/packages/qpe-games/pairs_1.1.1.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Pairs"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Rober Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Pairs.html"
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/pairs_V1.1.1.tar.gz \
+           file://pairs.patch;patch=1"
+
+PV = "1.1.1"
+S = "${WORKDIR}/pairs_V${PV}"
+
+APPNAME = "pairs"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_compile_prepend() {
+	oe_runmake -C images	
+}
+
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+
+inherit opie
+
+
diff --git a/packages/qpe-games/pdamaze_1.0.0.bb b/packages/qpe-games/pdamaze_1.0.0.bb
index e69de29bb2..2074eac3e5 100644
--- a/packages/qpe-games/pdamaze_1.0.0.bb
+++ b/packages/qpe-games/pdamaze_1.0.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "PDA-Maze"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Bill Kendrick, Port by Rober Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-PDA-Maze.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/pdamaze_V1.0.0.tar.gz \
+           file://Makefile.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/pdamaze_V${PV}"
+
+APPNAME = "pdamaze"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_compile_prepend() {
+	oe_runmake -C images	
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
+
+
+
diff --git a/packages/qpe-games/pipeman_1.0.0.bb b/packages/qpe-games/pipeman_1.0.0.bb
index e69de29bb2..9fe156695e 100644
--- a/packages/qpe-games/pipeman_1.0.0.bb
+++ b/packages/qpe-games/pipeman_1.0.0.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Pipeman"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Rober Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-PDA-Pipeman.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/pipeman_V1.0.0.tar.gz \
+           file://pipe.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/pipeman_V${PV}"
+
+APPNAME = "pipeman"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_compile_prepend() {
+	oe_runmake -C images	
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
+
diff --git a/packages/qpe-games/shisensho_1.0.0.bb b/packages/qpe-games/shisensho_1.0.0.bb
index e69de29bb2..b33bdc3805 100644
--- a/packages/qpe-games/shisensho_1.0.0.bb
+++ b/packages/qpe-games/shisensho_1.0.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Shisensho"
+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-Shisen-Sho.html"
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/shisensho_V1.0.0.tar.gz \
+           file://shisen.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/shisensho_V${PV}"
+
+APPNAME = "shisensho"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_compile_prepend() {
+	oe_runmake -C images	
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
+
diff --git a/packages/qpe-games/sokoban_1.3.8ern.bb b/packages/qpe-games/sokoban_1.3.8ern.bb
index e69de29bb2..70bb5442ab 100644
--- a/packages/qpe-games/sokoban_1.3.8ern.bb
+++ b/packages/qpe-games/sokoban_1.3.8ern.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Pairs"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Anders Widell, Steve Dunham, Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Sokoban.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/sokoban_V1.3.8ern.tar.gz \
+           file://sokoban.patch;patch=1"
+
+PV = "1.3.8ern"
+S = "${WORKDIR}/sokoban_V${PV}"
+
+APPNAME = "sokoban"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_compile_prepend() {
+	oe_runmake -C images	
+	oe_runmake -C levels
+}
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
+
diff --git a/packages/qpe-games/tron_1.0.0.bb b/packages/qpe-games/tron_1.0.0.bb
index e69de29bb2..22387000c6 100644
--- a/packages/qpe-games/tron_1.0.0.bb
+++ b/packages/qpe-games/tron_1.0.0.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Tron"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Matthias Kiefer"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Tron.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/tron_V1.0.0.tar.gz \
+           file://tron.patch;patch=1"
+
+PV = "1.0.0"
+S = "${WORKDIR}/tron_V${PV}"
+
+APPNAME = "tron"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+
+inherit opie
diff --git a/packages/qpe-games/win4_1.0.1.bb b/packages/qpe-games/win4_1.0.1.bb
index e69de29bb2..05e4a68e5b 100644
--- a/packages/qpe-games/win4_1.0.1.bb
+++ b/packages/qpe-games/win4_1.0.1.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "4 wins"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Anders Widell, Steve Dunham, Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-Win4.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/win4_V1.0.1.tar.gz \
+           file://win4.patch;patch=1"
+
+PV = "1.0.1"
+S = "${WORKDIR}/win4_V${PV}"
+
+APPNAME = "win4"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_compile_prepend() {
+	oe_runmake -C images		
+}
+
+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/qpe-games/ziq_1.1ern.bb b/packages/qpe-games/ziq_1.1ern.bb
index e69de29bb2..37c9e790f8 100644
--- a/packages/qpe-games/ziq_1.1ern.bb
+++ b/packages/qpe-games/ziq_1.1ern.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "ZIQ"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Bill Wetter"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZIQ.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/ziq_V1.1ern.tar.gz \
+           file://ziq.patch;patch=1"
+
+PV = "1.1ern"
+S = "${WORKDIR}/ziq_V${PV}"
+
+
+APPNAME = "ziq"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+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/qpe-games/zrev7_1.0.1.bb b/packages/qpe-games/zrev7_1.0.1.bb
index e69de29bb2..2f023c4264 100644
--- a/packages/qpe-games/zrev7_1.0.1.bb
+++ b/packages/qpe-games/zrev7_1.0.1.bb
@@ -0,0 +1,32 @@
+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"
+
+
+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"
+
+
+
+do_compile_prepend() {
+	oe_runmake -C images	
+}
+
+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/qpe-games/zsubhunt_1.0.0ern.bb b/packages/qpe-games/zsubhunt_1.0.0ern.bb
index e69de29bb2..29446b5b4d 100644
--- a/packages/qpe-games/zsubhunt_1.0.0ern.bb
+++ b/packages/qpe-games/zsubhunt_1.0.0ern.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Sub Marine Hunt"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Kart Bartel, Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZSubhunt.html"
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/zsubhunt_V1.0.0ern.tar.gz "
+
+PV = "1.0.0ern"
+S = "${WORKDIR}/zsubhunt_V${PV}"
+
+
+APPNAME = "zsubhunt"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
+}
+
+
+inherit opie
diff --git a/packages/qpe-games/ztappy_0.9.3ern.bb b/packages/qpe-games/ztappy_0.9.3ern.bb
index e69de29bb2..c7e816bea9 100644
--- a/packages/qpe-games/ztappy_0.9.3ern.bb
+++ b/packages/qpe-games/ztappy_0.9.3ern.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "ZTappy"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Kart Bartel, Robert Ernst"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/games-ZTappy.html"
+
+
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/ztappy_V0.9.3ern.tar.gz "
+
+PV = "0.9.3ern"
+S = "${WORKDIR}/ztappy_V${PV}"
+
+
+APPNAME = "ztappy"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games
+}
+
+inherit opie
diff --git a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
index e69de29bb2..9351377a31 100644
--- a/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
+++ b/packages/qpe-vexed/qpe-vexed-levels_2.1Beta1.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Vexed levels for qpe-vexed"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "GPL"
+AUTHOR = "The Vexed Development Team"
+HOMEPAGE = "http://vexed.sourceforge.net/"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/vexed/vexed21Beta1.zip"
+
+S = "${WORKDIR}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/etc/qpe-vexed
+
+	cd ${WORKDIR}
+	for level in *.pdb
+	do
+	    cp "$level" "`basename "$level" .pdb`.lvl"
+	done
+
+	install -m 0644 ${WORKDIR}/*.lvl ${D}${palmtopdir}/etc/qpe-vexed/
+}
+
+FILES_${PN} = "${palmtopdir}/etc/qpe-vexed/*.lvl"
+
diff --git a/packages/qpe-vexed/qpe-vexed_1.3.bb b/packages/qpe-vexed/qpe-vexed_1.3.bb
index 48c96efc39..8f013cee21 100644
--- a/packages/qpe-vexed/qpe-vexed_1.3.bb
+++ b/packages/qpe-vexed/qpe-vexed_1.3.bb
@@ -19,11 +19,11 @@ S = "${WORKDIR}/qpe-vexed_arm/"
 inherit opie
 
 do_install () {
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}/ \
-		   ${D}/${palmtopdir}/apps/Games/ \
-		   ${D}/${palmtopdir}/bin/
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/ \
+		   ${D}${palmtopdir}/apps/Games/ \
+		   ${D}${palmtopdir}/bin/
 
-	install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed.png ${D}/${palmtopdir}/pics/
-	install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed/*.bmp ${D}/${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/pkg/opt/QtPalmtop/pics/qpe-vexed/*.bmp ${D}${palmtopdir}/pics/${APPNAME}/
 }
diff --git a/packages/qpealarmclock/qpealarmclock_1.0.4.bb b/packages/qpealarmclock/qpealarmclock_1.0.4.bb
index e69de29bb2..19b8532098 100644
--- a/packages/qpealarmclock/qpealarmclock_1.0.4.bb
+++ b/packages/qpealarmclock/qpealarmclock_1.0.4.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Alarm Clock"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Dafydd Walters"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-AlarmClock.html"
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/qpealarmclock_V1.0.4.tar.gz \
+	   file://qpealarm.patch;patch=1 \
+	   file://fix-compile.patch;patch=1 "
+
+S = "${WORKDIR}/qpealarmclock_V${PV}"
+PR = "r1"
+
+APPNAME = "qpealarmclock"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	
+}
+
+inherit opie
diff --git a/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb b/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb
index e69de29bb2..0a6c708cb1 100644
--- a/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb
+++ b/packages/qpegps/qpegps_0.9.1+cvs-20040817.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Navigation application for use with GPS adapters"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpegps.sourceforge.net/"
+CVSDATE = 20040817
+PV = "0.9.1+cvs-${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/qpegps;module=qpegps \
+           file://gpsd-fix.patch;patch=1 \
+           file://qpegps.desktop \
+           file://qpegps.png"
+S = "${WORKDIR}/qpegps"
+
+inherit palmtop
+
+QMAKE_PROFILES = "qpegps.pro"
+EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics/qpegps \
+        	   ${D}${palmtopdir}/help/html/qpegps_icons \
+        	   ${D}${palmtopdir}/qpegps/maps \
+        	   ${D}${palmtopdir}/qpegps/icons \
+        	   ${D}${palmtopdir}/qpegps/tracks
+        install -m 0755 qpegps ${D}${palmtopdir}/bin/
+        install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+        install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
+        install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
+        install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
+}
diff --git a/packages/qpegps/qpegps_0.9.2.2.bb b/packages/qpegps/qpegps_0.9.2.2.bb
index e69de29bb2..de5d61addd 100644
--- a/packages/qpegps/qpegps_0.9.2.2.bb
+++ b/packages/qpegps/qpegps_0.9.2.2.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Navigation application for use with GPS adapters"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+RRECOMMENDS = "gpsd"
+LICENSE = "GPL"
+HOMEPAGE = "http://qpegps.sourceforge.net/"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_0_9_2_2_src.zip \
+           file://qpegps.desktop \
+           file://qpegps.png"
+S = "${WORKDIR}/root/qpegps_src_my/qpegps_my"
+
+inherit palmtop
+
+QMAKE_PROFILES = "qpegps.pro"
+EXTRA_QMAKEVARS_POST = "LIBS=-lqpe"
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics/qpegps \
+        	   ${D}${palmtopdir}/help/html/qpegps_icons \
+        	   ${D}${palmtopdir}/qpegps/maps \
+        	   ${D}${palmtopdir}/qpegps/icons \
+        	   ${D}${palmtopdir}/qpegps/tracks
+        install -m 0755 qpegps ${D}${palmtopdir}/bin/
+        install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+        install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
+        install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
+        install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
+	install -m 0644 datum/*.dat ${D}${palmtopdir}/qpegps/
+}
diff --git a/packages/qpenmapfe/qpenmapfe_1.0.0.bb b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
index e69de29bb2..e90c20e1a0 100644
--- a/packages/qpenmapfe/qpenmapfe_1.0.0.bb
+++ b/packages/qpenmapfe/qpenmapfe_1.0.0.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A frontend for the nmap port scanner, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+AUTHOR = "Dennis Webb"
+APPNAME = "qpenmapfe"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+PR = "r0"
+
+SRC_URI = "http://home.midsouth.rr.com/zaurus/qpenmapfe_${PV}_src.tar.gz \
+           file://qpenmapfe.desktop \
+           file://qpenmapfe.png"
+S = "${WORKDIR}/qpe-nmapfe"
+
+inherit opie
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics/
+	
+}
diff --git a/packages/qpf-fonts/qpf-font-common_1.0.bb b/packages/qpf-fonts/qpf-font-common_1.0.bb
index e69de29bb2..f06ea7a76a 100644
--- a/packages/qpf-fonts/qpf-font-common_1.0.bb
+++ b/packages/qpf-fonts/qpf-font-common_1.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Qt/Embedded Fonts Common Files"
+SECTION = "opie/fonts"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL QPL"
+PR = "r0"
+
+SRC_URI = "file://update-qtfontdir"
+S = "${WORKDIR}/qt-${PV}"
+
+do_install() {
+	install -d ${D}${sbindir}/
+	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/
+}
diff --git a/packages/qplot/qplot_2.0.1+cvs20020420.bb b/packages/qplot/qplot_2.0.1+cvs20020420.bb
index e69de29bb2..fecf1f746f 100644
--- a/packages/qplot/qplot_2.0.1+cvs20020420.bb
+++ b/packages/qplot/qplot_2.0.1+cvs20020420.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "QPlot is an Advanced Matematical Calculator for Qt/Embedded based Palmtop Environments"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://qplot.sourceforge.net/"
+CVSDATE = 20020420
+PV = "2.0.1-cvs-${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/qplot;module=qplot \
+	   file://gcc3.patch;patch=1"
+S = "${WORKDIR}/qplot"
+
+inherit palmtop
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Applications \
+		   ${D}${palmtopdir}/pics \
+		   ${D}${palmtopdir}/lib \
+		   ${D}${palmtopdir}/plugins/inputmethods
+        install -m 755 qplotmain/qplot ${D}${palmtopdir}/bin/qplot
+        install -m 644 qplotmain/qplot.png ${D}${palmtopdir}/pics/
+        install -m 644 qplotmain/qplot-const.b ${D}${palmtopdir}/lib/
+        install -m 644 qplotmain/qplot-math.b ${D}${palmtopdir}/lib/
+	oe_libinstall -so -C qplotmath libqplotmath ${D}${palmtopdir}/plugins/inputmethods/
+        install -m 644 qplot.desktop ${D}${palmtopdir}/apps/Applications/qplot.desktop
+}
diff --git a/packages/qt/qt-x11-free-native_3.3.2.bb b/packages/qt/qt-x11-free-native_3.3.2.bb
index e69de29bb2..ae12f38ad2 100644
--- a/packages/qt/qt-x11-free-native_3.3.2.bb
+++ b/packages/qt/qt-x11-free-native_3.3.2.bb
@@ -0,0 +1,60 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+DEPENDS = "qmake-native x11-native"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+	   file://no-examples.patch;patch=1"
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+#
+# FIXME - This should be updated to use OE's qmake-base.oeclass
+#         or the full qmake.oeclass.
+#
+
+export QTDIR = "${S}"
+export SYSCONF_CXX = "${CCACHE} g++"
+export SYSCONF_CC  = "${CCACHE} gcc"
+export SYSCONF_LINK  = "${CCACHE} g++"
+THIS_QMAKESPEC = "${STAGING_DATADIR}/qmake/${TARGET_OS}-oe-g++"
+export QMAKESPEC = ""
+ARCH_i686 = "x86"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -qt-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
+                   -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-nis -no-cups -stl -thread -no-exceptions"
+
+
+inherit native
+
+do_configure() {
+	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast
+}
+
+do_compile() {
+	LD_LIBRARY_PATH=${S}/lib oe_runmake \
+		QMAKE="${STAGING_BINDIR}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
+		QMAKESPEC="${THIS_QMAKESPEC}"
+}
+
+do_stage() {
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt3/lib
+	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_DIR}/${HOST_SYS}/qt3/lib
+	install -d ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+	for f in include/*.h
+	do
+		install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/
+	done
+	for f in include/private/*.h
+	do
+	        install -m 0644 $f ${STAGING_DIR}/${HOST_SYS}/qt3/include/private
+	done
+}
+
+do_install() {
+	install -d ${D}${libdir}/
+	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+}
+
diff --git a/packages/qt/qt-x11-free_3.3.3.bb b/packages/qt/qt-x11-free_3.3.3.bb
index e69de29bb2..b6bb926eea 100644
--- a/packages/qt/qt-x11-free_3.3.3.bb
+++ b/packages/qt/qt-x11-free_3.3.3.bb
@@ -0,0 +1,79 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
+PR = "r5"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
+	   file://no-examples.patch;patch=1"
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+PACKAGES += "qt-x11-plugins"
+FILES_qt-x11-plugins = "${prefix}/plugins"
+
+inherit qmake-base qt3x11
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt3"
+ARCH_i686 = "x86"
+EXTRA_OEMAKE = "-e"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
+                   -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -plugin-sql-mysql -verbose"
+
+do_configure() {
+	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
+		-L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+	# force regenerate
+	rm -f src/qtmain.pro
+	cat Makefile >makefile
+	find . -name "Makefile"|xargs rm -f
+	(cd src && qmake -spec ${QMAKESPEC} )
+	(cd plugins/src && qmake -spec ${QMAKESPEC} )
+}
+
+do_compile() {
+	unset CFLAGS
+	unset CXXFLAGS
+#	cd src && oe_runmake QMAKESPEC="${QMAKESPEC}" QMAKE="${STAGING_BINDIR}/qmake" MOC="moc3" UIC="uic3" MAKE="make -e"
+	oe_runmake -C src \
+		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"
+	oe_runmake -C plugins/src \
+		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \
+		QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \
+		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"
+}
+
+do_stage() {
+	install -d ${STAGING_QT_DIR}/lib
+	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
+	install -d ${STAGING_QT_DIR}/include/private
+	for f in include/*.h
+	do
+		install -m 0644 $f ${STAGING_QT_DIR}/include/
+	done
+	for f in include/private/*.h
+	do
+	        install -m 0644 $f ${STAGING_QT_DIR}/include/private
+	done
+}
+
+do_install() {
+	install -d ${D}${libdir}/
+	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+	oe_runmake -C plugins/src INSTALL_ROOT="${D}" \
+		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \
+		QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \
+		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e" \
+		install
+}
diff --git a/packages/qt/qt-x11-free_4.0.0-b1.bb b/packages/qt/qt-x11-free_4.0.0-b1.bb
index ca2d1ddf77..4b9deaaf6a 100644
--- a/packages/qt/qt-x11-free_4.0.0-b1.bb
+++ b/packages/qt/qt-x11-free_4.0.0-b1.bb
@@ -58,8 +58,8 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${libdir}/
-	oe_soinstall lib/libqt-mt.so.${PV} ${D}/${libdir}/
+	install -d ${D}${libdir}/
+	oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
 	oe_runmake -C plugins/src INSTALL_ROOT="${D}" \
 		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
 		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \
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 e69de29bb2..1cda5ac913 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
@@ -0,0 +1,157 @@
+SECTION = "opie/base"
+DESCRIPTION= "Tools to update the Qt fontdir"
+MAINTAINER = "M&N Solutions <info@mn-solutions.de>"
+LICENSE = "GPL/QPL"
+PACKAGE_ARCH = "all"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-free-${PV}.tar.gz"
+SRC_URI += "file://update-qtfontdir"
+S = "${WORKDIR}/qt-embedded-free-${PV}"
+
+do_compile() {
+}
+
+do_install() {
+	mkdir -p ${D}${sbindir}
+	install -m 755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}
+	mkdir -p ${D}${palmtopdir}/lib/fonts
+	cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts
+	# Delete all other font formats, Qt/E would have a dead slow
+	# application start time if it had to use any other font format
+	# as *.qpf ...
+	find ${D}${palmtopdir}/lib/fonts \
+	     -name "*.bdf" \
+	  -o -name "*.ttf" \
+	  -o -name "*.pfa" \
+	  -o -name "*.pfb" | xargs rm
+}
+
+PACKAGES = "qte-fonts-common"
+FILES_${PN} = "${sbindir}"
+
+
+PACKAGES += "qte-font-fixed"
+PROVIDES += "qte-font-fixed"
+FILES_qte-font-fixed = "${palmtopdir}/lib/fonts/fixed*"
+RDEPENDS_qte-font-fixed = "qte-fonts-common"
+pkg_postinst_qte-font-fixed() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES += "qte-font-helvetica-small"
+PROVIDES += "qte-font-helvetica-small"
+FILES_qte-font-helvetica-small = "${palmtopdir}/lib/fonts/helvetica_80*.qpf \
+	${palmtopdir}/lib/fonts/helvetica_100*.qpf ${palmtopdir}/lib/fonts/helvetica_120*.qpf"
+RDEPENDS_qte-font-helvetica-small = "qte-fonts-common"
+pkg_postinst_qte-font-helvetica-small() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES += "qte-font-helvetica-large"
+PROVIDES += "qte-font-helvetica-large"
+FILES_qte-font-helvetica-large = "${palmtopdir}/lib/fonts/helvetica_140*.qpf \
+	${palmtopdir}/lib/fonts/helvetica_180*.qpf ${palmtopdir}/lib/fonts/helvetica_240*.qpf"
+RDEPENDS_qte-font-helvetica-large = "qte-fonts-common"
+pkg_postinst_qte-font-helvetica-large() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES += "qte-font-smoothtimes"
+PROVIDES += "qte-font-smoothtimes"
+FILES_qte-font-smoothtimes = "${palmtopdir}/lib/fonts/smoothtimes*"
+RDEPENDS_qte-font-smoothtimes = "qte-fonts-common"
+pkg_postinst_qte-font-smoothtimes() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES += "qte-font-smallsmooth"
+PROVIDES += "qte-font-smallsmooth"
+FILES_qte-font-smallsmooth = "${palmtopdir}/lib/fonts/smallsmooth*"
+RDEPENDS_qte-smallsmooth = "qte-fonts-common"
+pkg_postinst_qte-font-smallsmooth() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES += "qte-font-unicode"
+PROVIDES += "qte-font-unicode"
+FILES_qte-font-unicode = "${palmtopdir}/lib/fonts/unifont*.qpf"
+RDEPENDS_qte-font-unicode = "qte-fonts-common"
+pkg_postinst_qte-font-unicode() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+PACKAGES += "qte-font-micro"
+PROVIDES += "qte-font-micro"
+FILES_qte-font-micro = "${palmtopdir}/lib/fonts/micro*.qpf"
+#RDEPENDS_qte-font-micro = "qte-fonts-common"
+pkg_postinst_qte-font-micro() {
+#!/bin/sh
+if [ -n "$D" ]; then exit 1; fi
+set -e
+. /etc/profile
+${sbindir}/update-qtfontdir
+}
+
+# Not in the QtE/3 tar file:
+#PACKAGES += "qte-font-lcd"
+#PROVIDES += "qte-font-lcd"
+#RDEPENDS_qte-font-lcd = "qte-fonts-common"
+#FILES_qte-font-lcd = "${palmtopdir}/lib/fonts/lcd*"
+#pkg_postinst_qte-font-lcd () {
+##!/bin/sh
+#if [ -n "$D" ]; then exit 1; fi
+#set -e
+#. /etc/profile
+#${sbindir}/update-qtfontdir
+#}
+
+# Not in the QtE/3 tar file:
+#PACKAGES += "qte-font-japanese"
+#PROVIDES += "qte-font-japanese"
+#FILES_qte-font-japanese = "${palmtopdir}/lib/fonts/japanese*"
+#RDEPENDS_qte-font-japanese = "qte-fonts-common"
+#pkg_postinst_qte-font-japanese() {
+##!/bin/sh
+#if [ -n "$D" ]; then exit 1; fi
+#set -e
+#. /etc/profile
+#${sbindir}/update-qtfontdir
+#}
+
+# Not in the QtE/3 tar file:
+#PACKAGES += "qte-font-courier"
+#PROVIDES += "qte-font-courier"
+#FILES_qte-font-courier = "${palmtopdir}/lib/fonts/cour*"
+#RDEPENDS_qte-font-courier = "qte-fonts-common"
+#pkg_postinst_qte-font-courier() {
+##!/bin/sh
+#if [ -n "$D" ]; then exit 1; fi
+#set -e
+#. /etc/profile
+#${sbindir}/update-qtfontdir
+#}
diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index b58d9602ea..83da55b3d5 100644
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -121,7 +121,7 @@ do_stage() {
 }
 
 do_install() {
-	oe_libinstall -so -C lib libqte ${D}/${palmqtdir}/lib/
+	oe_libinstall -so -C lib libqte ${D}${palmqtdir}/lib/
 }
 
 FILES_${PN} = "${palmqtdir}"
diff --git a/packages/qte/qte_4.0.0-snapshot.bb b/packages/qte/qte_4.0.0-snapshot.bb
index 1e81edf8f6..09ee610484 100644
--- a/packages/qte/qte_4.0.0-snapshot.bb
+++ b/packages/qte/qte_4.0.0-snapshot.bb
@@ -113,20 +113,20 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin
-	install -d ${D}/${sbindir}/
-	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}/${sbindir}/
+	install -d ${D}${palmtopdir}/bin
+	install -d ${D}${sbindir}/
+	install -m 0755 ${WORKDIR}/update-qtfontdir ${D}${sbindir}/
 	install -d ${D}${palmtopdir}/lib/fonts/
 	cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/
 
 	for lib in Core Gui Network Sql Xml
 	do
-		oe_soinstall lib/libQt${lib}.so.4.0.0 ${D}/${palmtopdir}/lib
+		oe_soinstall lib/libQt${lib}.so.4.0.0 ${D}${palmtopdir}/lib
 	done
 
 	for i in `find . -perm 0755 -type f`
 	do
-		install -m 0755 $i ${D}/${palmtopdir}/bin/`basename $i`
+		install -m 0755 $i ${D}${palmtopdir}/bin/`basename $i`
 	done
 }
 
diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb
index 39dcdb0ddb..883bc5ae27 100644
--- a/packages/qwt/qwt_4.2.0rc1.bb
+++ b/packages/qwt/qwt_4.2.0rc1.bb
@@ -19,9 +19,9 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${libdir} \
-		   ${D}/${includedir}
-	oe_libinstall -so -C lib libqwt ${D}/${libdir}
-	cp -a include/* ${D}/${includedir}
+	install -d ${D}${libdir} \
+		   ${D}${includedir}
+	oe_libinstall -so -C lib libqwt ${D}${libdir}
+	cp -a include/* ${D}${includedir}
 }
 
diff --git a/packages/readline/readline_4.3.bb b/packages/readline/readline_4.3.bb
index 32e9d067b9..234d697dfb 100644
--- a/packages/readline/readline_4.3.bb
+++ b/packages/readline/readline_4.3.bb
@@ -26,8 +26,8 @@ do_configure () {
 do_install () {
 	autotools_do_install
 	# Make install doesn't properly install these
-	oe_libinstall -so -C shlib libhistory ${D}/${libdir}
-	oe_libinstall -so -C shlib libreadline ${D}/${libdir}
+	oe_libinstall -so -C shlib libhistory ${D}${libdir}
+	oe_libinstall -so -C shlib libreadline ${D}${libdir}
 }
 
 do_stage() {
diff --git a/packages/resistorui/resistorui_0.9.bb b/packages/resistorui/resistorui_0.9.bb
index e69de29bb2..e247e64b0f 100644
--- a/packages/resistorui/resistorui_0.9.bb
+++ b/packages/resistorui/resistorui_0.9.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A frontend for the nmap port scanner, Qt/Embedded based Palmtop Environments Edition"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+HOMEPAGE = "http://www.pellicosystems.com/zaurus/applications/index.html"
+APPNAME = "resistorUI"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+PR = "r0"
+
+SRC_URI = "http://www.pellicosystems.com/zaurus/applications/resistorUI_1.5.0-0.9_armSRC.zip"
+S = "${WORKDIR}/ResistorUI"
+
+inherit opie
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 resistorUI.png ${D}${palmtopdir}/pics/
+	
+}
diff --git a/packages/resolvconf/resolvconf_1.22.bb b/packages/resolvconf/resolvconf_1.22.bb
index f94635beb6..5f340ff0cf 100644
--- a/packages/resolvconf/resolvconf_1.22.bb
+++ b/packages/resolvconf/resolvconf_1.22.bb
@@ -18,10 +18,10 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir} ${D}/${sbindir} ${D}/${base_sbindir} ${D}/${localstatedir}/run/resolvconf/interface
-	install -d ${D}/${mandir}/man8 ${D}/${docdir}/${P}
-	cp -a etc/* ${D}/${sysconfdir}/
-	install -m 0755 bin/resolvconf ${D}/${base_sbindir}/
-	install -m 0644 README ${D}/${docdir}/${P}/
-	install -m 0644 man/resolvconf.8 ${D}/${mandir}/man8/
+	install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface
+	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
+	cp -a etc/* ${D}${sysconfdir}/
+	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
+	install -m 0644 README ${D}${docdir}/${P}/
+	install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
 }
diff --git a/packages/rott/rott_1.0.bb b/packages/rott/rott_1.0.bb
index e69de29bb2..821e6ad962 100644
--- a/packages/rott/rott_1.0.bb
+++ b/packages/rott/rott_1.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Rise of the Triad - an SDL based Doom clone - QtE based Palmtop Environments Edition"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer"
+PR = "r1"
+
+SRC_URI = "http://icculus.org/rott/releases/rott-${PV}.tar.gz"
+S = "${WORKDIR}/rott-${PV}/rott"
+
+CFLAGS += "-DPLATFORM_UNIX"
+EXTRA_OEMAKE = 'SDL_INC_DIR=${STAGING_INCDIR}/SDL CC="${CC}" EXTRALDFLAGS="${LDFLAGS}"'
+
+# FIXME: Add Opie integration, i.e. a .desktop file and a logo
+
+do_install() {
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 rott ${D}${palmtopdir}/bin/
+}
+
+FILES_${PN} = "${palmtopdir}"
diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb
index 1a148c81ae..d1c9f458c2 100644
--- a/packages/rrdtool/rrdtool_1.0.49.bb
+++ b/packages/rrdtool/rrdtool_1.0.49.bb
@@ -11,11 +11,11 @@ inherit autotools
 EXTRA_OECONF = "--enable-shared --enable-local-libpng --enable-local-zlib --program-prefix=''"
 
 do_install_append() {
-	install -d ${D}/${docdir}/rrdtool/
-	mv ${D}/usr/html ${D}/${docdir}/rrdtool/
-	mv ${D}/usr/doc/* ${D}/${docdir}/rrdtool/
-	mv ${D}/usr/examples ${D}/${docdir}/rrdtool/
-	mv ${D}/usr/contrib ${D}/${docdir}/rrdtool/
+	install -d ${D}${docdir}/rrdtool/
+	mv ${D}usr/html ${D}${docdir}/rrdtool/
+	mv ${D}usr/doc/* ${D}${docdir}/rrdtool/
+	mv ${D}usr/examples ${D}${docdir}/rrdtool/
+	mv ${D}usr/contrib ${D}${docdir}/rrdtool/
 }
 
 FILES_${PN} += "${libdir}/perl"
diff --git a/packages/sablevm/sablevm_1.1.9.bb b/packages/sablevm/sablevm_1.1.9.bb
index 2448d5231f..b93e12db53 100644
--- a/packages/sablevm/sablevm_1.1.9.bb
+++ b/packages/sablevm/sablevm_1.1.9.bb
@@ -33,10 +33,10 @@ FILES_lib${PN}-dev = "${includedir}/jni* \
 		      ${libdir}/lib${PN}.la"
 
 do_install_append() {
-	install -d ${D}/${docdir}
-	mv ${D}/${datadir}/${PN} ${D}/${docdir}/
+	install -d ${D}${docdir}
+	mv ${D}${datadir}/${PN} ${D}${docdir}/
 
 	# symlink only present in the deb...
-	install -d ${D}/${libdir}/${PN}/bin
-	cd ${D}/${libdir}/${PN}/bin && ln -sf ../../../bin/java-sablevm java
+	install -d ${D}${libdir}/${PN}/bin
+	cd ${D}${libdir}/${PN}/bin && ln -sf ../../../bin/java-sablevm java
 }
diff --git a/packages/sbagen/sbagen_1.4.1.bb b/packages/sbagen/sbagen_1.4.1.bb
index e69de29bb2..7c8604cb13 100644
--- a/packages/sbagen/sbagen_1.4.1.bb
+++ b/packages/sbagen/sbagen_1.4.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Binaural tone generation tool."
+HOMEPAGE = "http://uazu.net/sbagen/"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "tremor"
+
+SRC_URI = "http://uazu.net/sbagen/sbagen-${PV}.tgz"
+S = "${WORKDIR}/sbagen-${PV}"
+
+LIBS = "-lm -lpthread -lvorbisidec"
+DEFS = "-DT_LINUX -DOGG_DECODE"
+# LIBS = "-lm -lpthread -lmad"
+# DEFS = "-DT_LINUX -DMP3_DECODE"
+
+do_compile () {
+	${CC} ${CFLAGS} ${DEFS} sbagen.c ${LDFLAGS} -o sbagen ${LIBS}
+}
+
+do_install () {
+	install -d ${D}${bindir}
+	install -m 0755 sbagen ${D}${bindir}/
+}
diff --git a/packages/schedstat-utils/schedstat-utils.bb b/packages/schedstat-utils/schedstat-utils.bb
index e69de29bb2..c9ff8ab918 100644
--- a/packages/schedstat-utils/schedstat-utils.bb
+++ b/packages/schedstat-utils/schedstat-utils.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Simple utilities for using the information exposed by \
+'schedstats', the kernel patches for obtaining scheduler statistics."
+
+SRC_URI = "http://eaglet.rain.com/rick/linux/schedstat/v10/latency.c \
+	   http://eaglet.rain.com/rick/linux/schedstat/v10/stats-10.pl"
+S = "${WORKDIR}/eaglet.rain.com"
+
+do_compile () {
+	${CC} ${CFLAGS} ${LDFLAGS} latency.c -o stats-latency
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 stats-latency ${D}${sbindir}/
+	install -m 0755 stats-10.pl ${D}${sbindir}/
+}
+
+PACKAGES = "schedstat-utils \
+	    schedstat-utils-latency \
+	    schedstat-utils-perl"
+RDEPENDS_${PN} = "schedstat-utils-latency schedstat-utils-perl"
+RDEPENDS_schedstat-utils-perl += "perl"
+FILES_${PN} = ""
+FILES_schedstat-utils-latency = "${sbindir}/stats-latency"
+FILES_schedstat-utils-perl = "${sbindir}/stats-10.pl"
diff --git a/packages/scummvm/scummvm_0.6.0.bb b/packages/scummvm/scummvm_0.6.0.bb
index e69de29bb2..38f0c7ea98 100644
--- a/packages/scummvm/scummvm_0.6.0.bb
+++ b/packages/scummvm/scummvm_0.6.0.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
+SECTION = "opie/games"
+PRIORITY = "optional"
+DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
+			file://sword1.patch;patch=1 \
+			file://tremor.patch;patch=1 \
+			file://mouse.patch;patch=1 "
+
+inherit autotools 
+
+EXTRA_OECONF = "--host=${HOST_SYS} \
+		--backend=sdl \
+		--with-sdl-prefix=${STAGING_BINDIR}/.. \
+		--disable-alsa \
+		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
+		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
+		--with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
+		--with-mad-prefix=${STAGING_BINDIR}/.. "
+
+do_configure() {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile() {
+	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DQTOPIA -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 scummvm ${D}${bindir}/scummvm
+}
+
diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb
index e69de29bb2..b25d91e6ec 100644
--- a/packages/scummvm/scummvm_0.6.1b.bb
+++ b/packages/scummvm/scummvm_0.6.1b.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
+SECTION = "opie/games"
+PRIORITY = "optional"
+DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
+			file://tremor.patch;patch=1 \
+			file://mouse.patch;patch=1 "
+
+inherit autotools 
+
+EXTRA_OECONF = "--host=${HOST_SYS} \
+		--backend=sdl \
+		--with-sdl-prefix=${STAGING_BINDIR}/.. \
+		--disable-alsa \
+		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
+		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
+		--with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
+		--with-mad-prefix=${STAGING_LIBDIR}/.. "
+
+do_configure() {
+	./configure ${EXTRA_OECONF}
+}
+
+do_compile() {
+	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DQTOPIA -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 scummvm ${D}${bindir}/scummvm
+}
+
diff --git a/packages/setserial/setserial_2.17.bb b/packages/setserial/setserial_2.17.bb
index 6d3e0e7064..3cb11dba32 100644
--- a/packages/setserial/setserial_2.17.bb
+++ b/packages/setserial/setserial_2.17.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 inherit autotools
 
 do_install() {
-	install -d ${D}/${base_bindir}
-	install -d ${D}/usr/man/man8
+	install -d ${D}${base_bindir}
+	install -d ${D}usr/man/man8
 	install -d ${D}${mandir}
 	autotools_do_install
 }
diff --git a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
index 56a9d1417b..179fa33782 100644
--- a/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
+++ b/packages/sharp-binary-only/sharp-aticore-oss_1.0.1.bb
@@ -12,17 +12,17 @@ S = "${WORKDIR}/AtiCore-1.0.1"
 EXTRA_OEMAKE="CC='${CC}' AS='${AS}' AR='${AR}' LD='${LD}'"
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 testcore ${D}/${bindir}/testcore
-	install -m 0755 atitest ${D}/${bindir}/atitest
+	install -d ${D}${bindir}
+	install -m 0755 testcore ${D}${bindir}/testcore
+	install -m 0755 atitest ${D}${bindir}/atitest
 	
-	install -d ${D}/${libdir}
-	install -m 0755 libaticore.so ${D}/${libdir}/libaticore.so
+	install -d ${D}${libdir}
+	install -m 0755 libaticore.so ${D}${libdir}/libaticore.so
 	
-	install -d ${D}/${includedir}
-	install -m 0644 aticore.h ${D}/${includedir}/aticore.h
+	install -d ${D}${includedir}
+	install -m 0644 aticore.h ${D}${includedir}/aticore.h
 
-	cd ${D}/${libdir}/
+	cd ${D}${libdir}/
 	ln -s libaticore.so libaticore.so.1
 	ln -s libaticore.so libaticore.so.1.0
 	ln -s libaticore.so libaticore.so.1.0.1
diff --git a/packages/sharp-binary-only/sharp-aticore.bb b/packages/sharp-binary-only/sharp-aticore.bb
index e89418cc63..da7917f070 100644
--- a/packages/sharp-binary-only/sharp-aticore.bb
+++ b/packages/sharp-binary-only/sharp-aticore.bb
@@ -17,17 +17,17 @@ do_make() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 testcore ${D}/${bindir}/testcore
-	install -m 0755 atitest ${D}/${bindir}/atitest
+	install -d ${D}${bindir}
+	install -m 0755 testcore ${D}${bindir}/testcore
+	install -m 0755 atitest ${D}${bindir}/atitest
 	
-	install -d ${D}/${libdir}
-	install -m 0755 libaticore.so ${D}/${libdir}/libaticore.so
+	install -d ${D}${libdir}
+	install -m 0755 libaticore.so ${D}${libdir}/libaticore.so
 	
-	install -d ${D}/${includedir}
-	install -m 0644 aticore.h ${D}/${includedir}/aticore.h
+	install -d ${D}${includedir}
+	install -m 0644 aticore.h ${D}${includedir}/aticore.h
 
-	cd ${D}/${libdir}/
+	cd ${D}${libdir}/
 	ln -s libaticore.so libaticore.so.1
 	ln -s libaticore.so libaticore.so.1.0
 }
diff --git a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
index ef022439cd..82fea715e5 100644
--- a/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-camera-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -15,12 +15,12 @@ S = "${WORKDIR}"
 inherit module-base
 
 do_install() {
-	install -d ${D}/${sysconfdir}/pcmcia/cis
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia
-	install -m 0644 ${WORKDIR}/CE-AG06.dat ${D}/${sysconfdir}/pcmcia/cis/
-	install -m 0644 ${WORKDIR}/sharpzdc.conf ${D}/${sysconfdir}/pcmcia/
-	install -m 0755 ${WORKDIR}/sharpzdc ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 ${MACHINE}/sharpzdc_cs.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+	install -d ${D}${sysconfdir}/pcmcia/cis
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia
+	install -m 0644 ${WORKDIR}/CE-AG06.dat ${D}${sysconfdir}/pcmcia/cis/
+	install -m 0644 ${WORKDIR}/sharpzdc.conf ${D}${sysconfdir}/pcmcia/
+	install -m 0755 ${WORKDIR}/sharpzdc ${D}${sysconfdir}/pcmcia/
+	install -m 0644 ${MACHINE}/sharpzdc_cs.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
 }
 
 FILES_${PN} = "/"
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index c029795e02..cd947d805b 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -18,12 +18,12 @@ INITSCRIPT_NAME = "sd"
 INITSCRIPT_PARAMS = "start 39 S . stop 96 0 1 6 ."
 
 do_install() {
-	install -d ${D}/${sysconfdir}/init.d ${D}/${base_sbindir}
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
-	install -m 0755 ${WORKDIR}/sdmgr ${D}/${base_sbindir}/
-	install -m 0755 ${WORKDIR}/sdcontrol ${D}/${sysconfdir}
-	install -m 0755 ${WORKDIR}/sd ${D}/${sysconfdir}/init.d/
-	install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
+	install -d ${D}${sysconfdir}/init.d ${D}${base_sbindir}
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
+	install -m 0755 ${WORKDIR}/sdmgr ${D}${base_sbindir}/
+	install -m 0755 ${WORKDIR}/sdcontrol ${D}${sysconfdir}
+	install -m 0755 ${WORKDIR}/sd ${D}${sysconfdir}/init.d/
+	install -m 0644 ${MACHINE}/sharp_mmcsd_m.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/block/
 }
 
 FILES_${PN} = "/"
diff --git a/packages/shfs/shfs-modules_0.35.bb b/packages/shfs/shfs-modules_0.35.bb
index 88fc7edd50..12c9a62779 100644
--- a/packages/shfs/shfs-modules_0.35.bb
+++ b/packages/shfs/shfs-modules_0.35.bb
@@ -24,6 +24,6 @@ do_stage() {
 }
 
 do_install() {
-        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/shfs/
-	install -m 0644 shfs.o ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/shfs/shfs.o
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/shfs/
+	install -m 0644 shfs.o ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/shfs/shfs.o
 }
diff --git a/packages/shfs/shfs-utils_0.35.bb b/packages/shfs/shfs-utils_0.35.bb
index 4af52f2973..73aa089c17 100644
--- a/packages/shfs/shfs-utils_0.35.bb
+++ b/packages/shfs/shfs-utils_0.35.bb
@@ -20,6 +20,6 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 shfsmount shfsumount ${D}/${bindir}
+	install -d ${D}${bindir}
+	install -m 0755 shfsmount shfsumount ${D}${bindir}
 }
diff --git a/packages/shopper/shopper_1.2.1.bb b/packages/shopper/shopper_1.2.1.bb
index e69de29bb2..66cdf197f2 100644
--- a/packages/shopper/shopper_1.2.1.bb
+++ b/packages/shopper/shopper_1.2.1.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Shopping list manager"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "David Greaves <arbor@users.sourceforge.net>"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zaurus-shopper/Shopper-${PV}.tar.gz \
+           file://gcc3.patch;patch=1"
+S = "${WORKDIR}/Shopper"
+
+inherit palmtop
+
+QMAKE_PROFILES = "Shopper.pro"
+
+pkg_preinst() {
+	cp /root/Applications/ShoppingListQt/shoppinglist.xml /root/Applications/ShoppingListQt/shoppinglist.xml.safe 2>/dev/null
+	true
+}
+
+pkg_postinst() {
+	/opt/QtPalmtop/bin/qcop QPE/System "linkChanged(QString)" 2>/dev/null
+	if [ -n "$D" ]; then false; fi
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics \
+        	   ${D}${palmtopdir}/help/html
+        install -m 0755 ${S}/Shopper ${D}${palmtopdir}/bin/
+        install -m 0644 ${S}/Shopper.desktop ${D}${palmtopdir}/apps/Applications/
+        install -m 0644 ${S}/Shopper.png ${D}${palmtopdir}/pics/
+        install -m 0644 ${S}/Shopper.html ${D}${palmtopdir}/help/html/
+# BAD BAD BAD: packages never install into home directories. ever. --CL
+#        install -m 0644 ${S}/shoppinglist.xml ${D}root/Applications/ShoppingListQt/shoppinglist.xml.new
+}
diff --git a/packages/sidplayer/sidplayer_1.5.0.bb b/packages/sidplayer/sidplayer_1.5.0.bb
index e69de29bb2..1916176694 100644
--- a/packages/sidplayer/sidplayer_1.5.0.bb
+++ b/packages/sidplayer/sidplayer_1.5.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A SID Player for the Qt/Embedded based Palmtop Environments"
+SECTION = "opie/multimedia"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://sidplayer.sourceforge.net/"
+DEPENDS = "libsidplay"
+PR = "r1"
+
+SRC_URI = "http://sidplayer.sourceforge.net/sidplayer.tar.gz \
+           file://use-external-libsidplay.patch;patch=1 \
+           file://gcc3.patch;patch=1 \
+	   file://gcc34.patch;patch=1"
+S = "${WORKDIR}/sidplayer"
+
+EXTRA_QMAKEVARS_PRE = "QMAKE_INCDIR=${STAGING_INCDIR}/sidplay"
+
+inherit palmtop
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+        	   ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics
+	cp -a ../apps ../bin ../pics ${D}${palmtopdir}/        
+}
diff --git a/packages/slotsig/slotsig_0.4.bb b/packages/slotsig/slotsig_0.4.bb
index e69de29bb2..be196051cd 100644
--- a/packages/slotsig/slotsig_0.4.bb
+++ b/packages/slotsig/slotsig_0.4.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "A lightweight signal/slot library for decoupling C++ method calls"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://kafka.fr.free.fr/slotsig/slotsig-${PV}.tar.bz2"
+
+do_compile() {
+	${CXX} -c -fPIC ${CXXFLAGS} -o slotsig_bases.o slotsig/slotsig_bases.cpp
+	${CXX} -shared -o libslotsig.so.${PV} slotsig_bases.o
+}
+
+do_stage() {
+	oe_libinstall -so libslotsig ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/slotsig/
+	for X in slotsig/*.h
+	do
+		install -m 0644 ${S}/$X ${STAGING_INCDIR}/$X
+	done
+}
+
+do_install() {
+	oe_libinstall -so libslotsig ${D}${libdir}
+}
diff --git a/packages/slugimage/slugimage.bb b/packages/slugimage/slugimage.bb
index d00f5f21e6..faf088208f 100644
--- a/packages/slugimage/slugimage.bb
+++ b/packages/slugimage/slugimage.bb
@@ -12,6 +12,6 @@ S = "${WORKDIR}"
 
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 slugimage/slugimage ${D}/${bindir}/
+	install -d ${D}${bindir}
+	install -m 0755 slugimage/slugimage ${D}${bindir}/
 }
diff --git a/packages/slugtool/slugtool.bb b/packages/slugtool/slugtool.bb
index 6629b158d5..302d4a3b27 100644
--- a/packages/slugtool/slugtool.bb
+++ b/packages/slugtool/slugtool.bb
@@ -13,6 +13,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 slugtool ${D}/${bindir}/
+	install -d ${D}${bindir}
+	install -m 0755 slugtool ${D}${bindir}/
 }
diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb
index f33c642e35..25b60092ec 100644
--- a/packages/slutils/slutils_0.1.0.bb
+++ b/packages/slutils/slutils_0.1.0.bb
@@ -28,11 +28,11 @@ do_configure_prepend() {
 }
 
 do_install() {
-        install -d ${D}/${sbindir}
+        install -d ${D}${sbindir}
 	for u in ${UTILS}
 	do
-		install -m 0755 ${S}/${u}/${u} ${D}/${sbindir}/
+		install -m 0755 ${S}/${u}/${u} ${D}${sbindir}/
 	done
-	install -d ${D}/${sysconfdir}/init.d/
-	install -m 0755 ${WORKDIR}/sltime.sh ${D}/${sysconfdir}/init.d/sltime
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/sltime.sh ${D}${sysconfdir}/init.d/sltime
 }
diff --git a/packages/snes232/snes232_cvs.bb b/packages/snes232/snes232_cvs.bb
index d563a760a7..56091149bc 100644
--- a/packages/snes232/snes232_cvs.bb
+++ b/packages/snes232/snes232_cvs.bb
@@ -18,6 +18,6 @@ do_configure() {
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/snes232
-	install snes232.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/snes232/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/snes232
+	install snes232.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/snes232/
 }
diff --git a/packages/snes9x/snes9x-sdl-qpe_1.39.bb b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
index 416b35b2a5..b95357284f 100644
--- a/packages/snes9x/snes9x-sdl-qpe_1.39.bb
+++ b/packages/snes9x/snes9x-sdl-qpe_1.39.bb
@@ -17,7 +17,7 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/bin/
-	install -m 0755 snes9x ${D}/${palmtopdir}/bin/snes9x
+	install -d ${D}${palmtopdir}/bin/
+	install -m 0755 snes9x ${D}${palmtopdir}/bin/snes9x
 }
 
diff --git a/packages/socat/socat_1.3.2.1.bb b/packages/socat/socat_1.3.2.1.bb
index d4fb2c19a5..378ea60729 100644
--- a/packages/socat/socat_1.3.2.1.bb
+++ b/packages/socat/socat_1.3.2.1.bb
@@ -10,5 +10,5 @@ S = "${WORKDIR}/socat-1.3"
 inherit autotools
 
 do_install_prepend () {
-	install -d ${D}/${bindir} ${D}/${mandir}/man1
+	install -d ${D}${bindir} ${D}${mandir}/man1
 }
diff --git a/packages/softfan/softfan_0.10.bb b/packages/softfan/softfan_0.10.bb
index aab8d4a28b..b589d736bf 100644
--- a/packages/softfan/softfan_0.10.bb
+++ b/packages/softfan/softfan_0.10.bb
@@ -12,6 +12,6 @@ do_compile() {
 }
 
 do_install() {
-         install -d ${D}/${base_sbindir}
-         install -m 0755 softfan ${D}/${base_sbindir}/softfan
+         install -d ${D}${base_sbindir}
+         install -m 0755 softfan ${D}${base_sbindir}/softfan
 }
diff --git a/packages/sparse/sparse_snapshot.bb b/packages/sparse/sparse_snapshot.bb
index e1caf07c9b..03a2d9a451 100644
--- a/packages/sparse/sparse_snapshot.bb
+++ b/packages/sparse/sparse_snapshot.bb
@@ -21,6 +21,6 @@ SRC_URI = "http://www.codemonkey.org.uk/projects/bitkeeper/sparse/sparse-${@get_
 S = "${WORKDIR}/sparse-bk"
 
 do_install () {
-	install -d ${D}/${bindir}
-	install -m 0755 check ${D}/${bindir}/sparse
+	install -d ${D}${bindir}
+	install -m 0755 check ${D}${bindir}/sparse
 }
diff --git a/packages/sqlite/sqlite_2.8.15.bb b/packages/sqlite/sqlite_2.8.15.bb
index e69de29bb2..17b3605f12 100644
--- a/packages/sqlite/sqlite_2.8.15.bb
+++ b/packages/sqlite/sqlite_2.8.15.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "An Embeddable SQL Database Engine"
+HOMEPAGE = "http://www.sqlite.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "readline ncurses"
+LICENSE = "PD"
+PR = "r3"
+
+SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
+	   file://main.mk"
+S = "${WORKDIR}/sqlite"
+
+SOURCES = "attach.o auth.o btree.o btree_rb.o build.o copy.o date.o delete.o expr.o func.o hash.o \
+           insert.o main.o opcodes.o os.o pager.o parse.o pragma.o printf.o random.o select.o table.o \
+           tokenize.o trigger.o update.o util.o vacuum.o vdbe.o vdbeaux.o where.o"
+
+inherit autotools
+
+do_configure() {
+	install -m 0644 ${WORKDIR}/main.mk ${S}/
+}
+
+do_compile() {
+	oe_runmake -f Makefile.linux-gcc \
+                   TOP="${S}" \
+                   BCC="${BUILD_CC}" \
+                   TCC="${CC}" \
+                   OPTS="-fPIC" \
+                   TCL_FLAGS= LIBTCL= \
+                   READLINE_FLAGS="-DHAVE_READLINE=1 -I${STAGING_INCDIR}" \
+                   LIBREADLINE="-L. -L${STAGING_LIBDIR} -lreadline -lncurses"
+}
+
+do_stage() {
+	install -m 0755 libsqlite.so ${STAGING_LIBDIR}/libsqlite.so.0.8.6
+        ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so
+        ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0
+        ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0.8
+        install -m 0644 sqlite.h ${STAGING_INCDIR}
+}
+
+do_install() {
+	install -d ${D}${libdir} ${D}${bindir}
+	install sqlite ${D}${bindir}
+	install -m 0755 libsqlite.so ${D}${libdir}/libsqlite.so.0.8.6
+	ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so
+        ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0
+        ln -sf libsqlite.so.0.8.6 ${D}${libdir}/libsqlite.so.0.8
+        install -d ${D}${includedir}
+        install -m 0644 sqlite.h ${D}${includedir}/sqlite.h
+}
+
+PACKAGES += "${PN}-bin"
+FILES_${PN}-bin = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
diff --git a/packages/sqlite/sqlite_2.8.9.bb b/packages/sqlite/sqlite_2.8.9.bb
index e69de29bb2..5063711928 100644
--- a/packages/sqlite/sqlite_2.8.9.bb
+++ b/packages/sqlite/sqlite_2.8.9.bb
@@ -0,0 +1,39 @@
+PR = "r1"
+DESCRIPTION = "An Embeddable SQL Database Engine"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "readline ncurses"
+LICENSE = "PD"
+
+PACKAGES =+ "sqlite-bin"
+
+FILES_sqlite-bin = "${bindir}"
+
+SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
+           file://crosscompile.patch;patch=1"
+
+S = "${WORKDIR}/sqlite"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-tcl --enable-static --enable-shared"
+EXTRA_OEMAKE = "'LIBREADLINE=-L${STAGING_LIBDIR} -lreadline -lncurses' 'LIBTOOL=${S}/${HOST_PREFIX}libtool'"
+export config_BUILD_CC = "${BUILD_CC}"
+export config_BUILD_CFLAGS = "${BUILD_CFLAGS}"
+export config_TARGET_CC = "${CC}"
+export config_TARGET_LINK = "${CCLD}"
+export config_TARGET_CFLAGS = "${CFLAGS}"
+
+do_compile () {
+	oe_runmake
+}
+
+do_stage() {
+	oe_libinstall -so libsqlite ${STAGING_LIBDIR}
+	install -m 0644 sqlite.h ${STAGING_INCDIR}
+}
+
+do_install() {
+	oe_runmake install prefix=${D}${prefix} exec_prefix=${D}${exec_prefix}
+}
+
diff --git a/packages/squashfs-tools/squashfs-tools_2.0r2.bb b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
index e69de29bb2..601724a5cb 100644
--- a/packages/squashfs-tools/squashfs-tools_2.0r2.bb
+++ b/packages/squashfs-tools/squashfs-tools_2.0r2.bb
@@ -0,0 +1,15 @@
+SECTION = "base"
+DESCRIPTION = "Squashfs is a highly compressed read-only filesystem for Linux."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPLv2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \
+	   file://flags.patch;patch=1"
+S = "${WORKDIR}/squashfs${PV}/squashfs-tools"
+
+prefix = ""
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 mksquashfs ${D}${sbindir}/
+}
diff --git a/packages/ssmtp/ssmtp_2.60.9.bb b/packages/ssmtp/ssmtp_2.60.9.bb
index 8da46eafe5..e0381db640 100644
--- a/packages/ssmtp/ssmtp_2.60.9.bb
+++ b/packages/ssmtp/ssmtp_2.60.9.bb
@@ -16,9 +16,9 @@ do_compile () {
 }
 
 do_install () {
-	oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \
-		   'bindir=${D}/${bindir}' 'mandir=${D}/${mandir}' \
-		   'etcdir=${D}/${sysconfdir}' GEN_CONFIG="`which echo`" install
-	install -d ${D}/${sysconfdir}/ssmtp
-	install -m 0644 ${WORKDIR}/ssmtp.conf ${D}/${sysconfdir}/ssmtp/ssmtp.conf
+	oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \
+		   'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \
+		   'etcdir=${D}${sysconfdir}' GEN_CONFIG="`which echo`" install
+	install -d ${D}${sysconfdir}/ssmtp
+	install -m 0644 ${WORKDIR}/ssmtp.conf ${D}${sysconfdir}/ssmtp/ssmtp.conf
 }
diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb
index 193412d9fc..5a21ffaa0a 100644
--- a/packages/ssmtp/ssmtp_2.61.bb
+++ b/packages/ssmtp/ssmtp_2.61.bb
@@ -16,9 +16,9 @@ do_compile () {
 }
 
 do_install () {
-	oe_runmake 'prefix=${D}/${prefix}' 'exec_prefix=${D}/${exec_prefix}' \
-		   'bindir=${D}/${bindir}' 'mandir=${D}/${mandir}' \
-		   'etcdir=${D}/${sysconfdir}' GEN_CONFIG="`which echo`" install
-	install -d ${D}/${sysconfdir}/ssmtp
-	install -m 0644 ${WORKDIR}/ssmtp.conf ${D}/${sysconfdir}/ssmtp/ssmtp.conf
+	oe_runmake 'prefix=${D}${prefix}' 'exec_prefix=${D}${exec_prefix}' \
+		   'bindir=${D}${bindir}' 'mandir=${D}${mandir}' \
+		   'etcdir=${D}${sysconfdir}' GEN_CONFIG="`which echo`" install
+	install -d ${D}${sysconfdir}/ssmtp
+	install -m 0644 ${WORKDIR}/ssmtp.conf ${D}${sysconfdir}/ssmtp/ssmtp.conf
 }
diff --git a/packages/stunnel/stunnel_4.05.bb b/packages/stunnel/stunnel_4.05.bb
index 3dc74e40dd..ded0f8e096 100644
--- a/packages/stunnel/stunnel_4.05.bb
+++ b/packages/stunnel/stunnel_4.05.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-ssl=${STAGING_LIBDIR}/.."
 
 do_install() {
 	autotools_do_install
-	install -d ${D}/${sysconfdir}/stunnel ${D}/${sysconfdir}/init.d
-	install -m 755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/stunnel
-	install -m 644 ${WORKDIR}/stunnel.conf ${D}/${sysconfdir}/stunnel
+	install -d ${D}${sysconfdir}/stunnel ${D}${sysconfdir}/init.d
+	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/stunnel
+	install -m 644 ${WORKDIR}/stunnel.conf ${D}${sysconfdir}/stunnel
 }
diff --git a/packages/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb
index 08cbf9b64e..ed2614f0c7 100644
--- a/packages/subapplet/subapplet_1.0.8.bb
+++ b/packages/subapplet/subapplet_1.0.8.bb
@@ -18,9 +18,9 @@ inherit palmtop
 QMAKE_PROFILES = "subapplet.pro"
 
 do_install() {
-    install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/subapplet/
-    install -m 0644 *.png ${D}/${palmtopdir}/pics/subapplet/
-    oe_libinstall -so -C rel${palmtopdir}/plugins/applets libsubapplet ${D}/${palmtopdir}/plugins/applets/
+    install -d ${D}${palmtopdir}/plugins/applets ${D}${palmtopdir}/pics/subapplet/
+    install -m 0644 *.png ${D}${palmtopdir}/pics/subapplet/
+    oe_libinstall -so -C rel${palmtopdir}/plugins/applets libsubapplet ${D}${palmtopdir}/plugins/applets/
 }
 
 pkg_postinst() {
diff --git a/packages/sysklogd/sysklogd_1.4.1.bb b/packages/sysklogd/sysklogd_1.4.1.bb
index e69de29bb2..88d619a556 100644
--- a/packages/sysklogd/sysklogd_1.4.1.bb
+++ b/packages/sysklogd/sysklogd_1.4.1.bb
@@ -0,0 +1,17 @@
+LICENSE = GPL
+SECTION = "base"
+DESCRIPTION = "The sysklogd package implements \
+two system log daemons."
+
+SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \
+	   file://nonrootinstall.patch;patch=1"
+
+CFLAGS_append = " -DSYSV"
+
+do_install () {
+	install -d ${D}${mandir}/man8 \
+		   ${D}${mandir}/man5 \
+		   ${D}${bindir}
+	oe_runmake 'BINDIR=${D}${bindir}' \
+		   'MANDIR=${D}${mandir}' install
+}
diff --git a/packages/sysvinit/sysvinit_2.85.bb b/packages/sysvinit/sysvinit_2.85.bb
index 8bbd4cd5ee..a64f0d2f11 100644
--- a/packages/sysvinit/sysvinit_2.85.bb
+++ b/packages/sysvinit/sysvinit_2.85.bb
@@ -30,26 +30,26 @@ export LCRYPT = "-lcrypt"
 
 
 do_install () {
-	install -d ${D}/${bindir} ${D}/${sbindir} \
-		   ${D}/${base_sbindir} ${D}/${sysconfdir}/default \
-		   ${D}/${sysconfdir}/init.d
+	install -d ${D}${bindir} ${D}${sbindir} \
+		   ${D}${base_sbindir} ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/init.d
 	install -m 755 halt killall5 \
-		runlevel shutdown ${D}/${base_sbindir}/
-	install -m 755 init ${D}/${base_sbindir}/sysvinit
+		runlevel shutdown ${D}${base_sbindir}/
+	install -m 755 init ${D}${base_sbindir}/sysvinit
 	install -m 755 mesg last ${D}${bindir}
-	install -m 0755 ${WORKDIR}/need		${D}/${base_sbindir}/need.sysvinit
-	install -m 0755 ${WORKDIR}/provide		${D}/${base_sbindir}/provide.sysvinit
-	ln -sf halt ${D}/${base_sbindir}/reboot
-	ln -sf halt ${D}/${base_sbindir}/poweroff
-	ln -sf init ${D}/${base_sbindir}/telinit
-	ln -sf killall5 ${D}/${base_sbindir}/pidof
+	install -m 0755 ${WORKDIR}/need		${D}${base_sbindir}/need.sysvinit
+	install -m 0755 ${WORKDIR}/provide		${D}${base_sbindir}/provide.sysvinit
+	ln -sf halt ${D}${base_sbindir}/reboot
+	ln -sf halt ${D}${base_sbindir}/poweroff
+	ln -sf init ${D}${base_sbindir}/telinit
+	ln -sf killall5 ${D}${base_sbindir}/pidof
 	ln -sf last ${D}${bindir}/lastb
-	install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
+	install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then
-		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}/${sysconfdir}/inittab
+		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
 	fi
 	if [ "${USE_VT}" == "1" ]; then
-		cat <<EOF >>${D}/${sysconfdir}/inittab
+		cat <<EOF >>${D}${sysconfdir}/inittab
 # ${base_sbindir}/getty invocations for the runlevels.
 #
 # The "id" field MUST be the same as the last
@@ -64,14 +64,14 @@ do_install () {
 # 4:23:respawn:${base_sbindir}/getty 38400 tty4
 EOF
 	fi
-	install -m 0644    ${WORKDIR}/rcS-default	${D}/${sysconfdir}/default/rcS
-	install -m 0755    ${WORKDIR}/rc		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/rcS		${D}/${sysconfdir}/init.d
+	install -m 0644    ${WORKDIR}/rcS-default	${D}${sysconfdir}/default/rcS
+	install -m 0755    ${WORKDIR}/rc		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rcS		${D}${sysconfdir}/init.d
 }
 
 
 do_install_append_ramses () {
-	cat <<EOF >>${D}/${sysconfdir}/inittab
+	cat <<EOF >>${D}${sysconfdir}/inittab
 # Bluetooth
 #1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1
 # External serial port
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 1d9d4d0af4..e55b3fa0f4 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -54,15 +54,15 @@ EXTRA_OEMAKE += "'INSTALL=install' \
 
 do_install () {
 	oe_runmake 'ROOT=${D}' install
-	install -d ${D}/${sysconfdir} \
-		   ${D}/${sysconfdir}/default \
-		   ${D}/${sysconfdir}/init.d
-	install -m 0644 ${WORKDIR}/inittab ${D}/${sysconfdir}/inittab
+	install -d ${D}${sysconfdir} \
+		   ${D}${sysconfdir}/default \
+		   ${D}${sysconfdir}/init.d
+	install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab
 	if [ ! -z "${SERIAL_CONSOLE}" ]; then
-		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}/${sysconfdir}/inittab
+		echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
 	fi
 	if [ "${USE_VT}" == "1" ]; then
-		cat <<EOF >>${D}/${sysconfdir}/inittab
+		cat <<EOF >>${D}${sysconfdir}/inittab
 # ${base_sbindir}/getty invocations for the runlevels.
 #
 # The "id" field MUST be the same as the last
@@ -77,23 +77,23 @@ do_install () {
 # 4:23:respawn:${base_sbindir}/getty 38400 tty4
 EOF
 	fi
-	install -m 0644    ${WORKDIR}/rcS-default	${D}/${sysconfdir}/default/rcS
-	install -m 0755    ${WORKDIR}/rc		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/rcS		${D}/${sysconfdir}/init.d
-	install -m 0755    ${WORKDIR}/bootlogd.init     ${D}/${sysconfdir}/init.d/bootlogd
-	ln -sf bootlogd ${D}/${sysconfdir}/init.d/stop-bootlogd
-	install -d ${D}/${sysconfdir}/rcS.d
-	ln -sf ../init.d/bootlogd ${D}/${sysconfdir}/rcS.d/S07bootlogd
+	install -m 0644    ${WORKDIR}/rcS-default	${D}${sysconfdir}/default/rcS
+	install -m 0755    ${WORKDIR}/rc		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/rcS		${D}${sysconfdir}/init.d
+	install -m 0755    ${WORKDIR}/bootlogd.init     ${D}${sysconfdir}/init.d/bootlogd
+	ln -sf bootlogd ${D}${sysconfdir}/init.d/stop-bootlogd
+	install -d ${D}${sysconfdir}/rcS.d
+	ln -sf ../init.d/bootlogd ${D}${sysconfdir}/rcS.d/S07bootlogd
 	for level in 2 3 4 5; do
-		install -d ${D}/${sysconfdir}/rc$level.d
-		ln -s ../init.d/stop-bootlogd ${D}/${sysconfdir}/rc$level.d/S99stop-bootlogd
+		install -d ${D}${sysconfdir}/rc$level.d
+		ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
 	done
-	mv                 ${D}/${base_sbindir}/init               ${D}/${base_sbindir}/init.sysvinit
+	mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.sysvinit
 }
 
 
 do_install_append_ramses () {
-	cat <<EOF >>${D}/${sysconfdir}/inittab
+	cat <<EOF >>${D}${sysconfdir}/inittab
 # Bluetooth
 #1:2345:respawn:${base_sbindir}/getty -L 115200 tts/1
 # External serial port
diff --git a/packages/tasklistapplet/tasklistapplet_1.0.5.bb b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
index e69de29bb2..f600286db2 100644
--- a/packages/tasklistapplet/tasklistapplet_1.0.5.bb
+++ b/packages/tasklistapplet/tasklistapplet_1.0.5.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "TaskList Applet"
+SECTION = "opie/applets"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+HOMEPAGE = "http://sourceforge.net/projects/subapplet/"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/tasklist-105.tar.gz"
+
+S = "${WORKDIR}/TaskList-1.0.5"
+
+inherit palmtop
+
+#QMAKE_PROFILES = "subapplet.pro"
+
+do_install() {
+    install -d ${D}${palmtopdir}/plugins/applets ${D}${palmtopdir}/pics/tasklist/
+    install -m 0644 icons/*.png ${D}${palmtopdir}/pics/tasklist/
+    oe_libinstall -so -C rel/opt/Qtopia/plugins/applets libtasklistapplet ${D}${palmtopdir}/plugins/applets/
+}
+
+pkg_postinst() {
+#!/bin/sh
+if pidof -s qpe >/dev/null; then
+  /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+else
+  exit 0
+fi
+ if [ -n "$D" ]; then false; fi
+}
+
+pkg_postrm() {
+#!/bin/sh
+/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()"
+ if [ -n "$D" ]; then false; fi
+}
diff --git a/packages/tickypip/tickypip-levels_1.1.bb b/packages/tickypip/tickypip-levels_1.1.bb
index e69de29bb2..6f7a8f6be1 100644
--- a/packages/tickypip/tickypip-levels_1.1.bb
+++ b/packages/tickypip/tickypip-levels_1.1.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Tickypip levels from NetWalk Group"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "${PN}"
+SRC_DISTRIBUTE_LICENSES += "${PN}"
+AUTHOR = "NetWalk Group <netwalkgroup@hotmail.com>"
+RDEPENDS = "tickypip"
+PACKAGE_ARCH = "all"
+PR = "r1"
+
+SRC_URI = "http://www.hrw.one.pl/_pliki/oe/files/tickypip-levels_${PV}.tar.bz2"
+
+S = "${WORKDIR}/"
+
+#
+# Authors response to LICENSE question:
+#
+# You may distribute them for free provide that you have links to our level
+# packs in PalmGear.
+#
+# Packs available on PalmGear: Pak1, Pak3, Pak8, Pak9, Pak10
+# 
+# URL: http://palmgear.com/index.cfm?fuseaction=software.developer&userID=862314499
+#
+# I also got permission to distribute rest of levelpacks which was available
+# from Palm Gaming World:
+# http://www.palmgamingworld.com/add-in/netwalk.shtml
+#
+
+do_install () {
+	install -d ${D}${palmtopdir}/share/tickypip/levels
+	install -m 0644 levels/* ${D}${palmtopdir}/share/tickypip/levels/
+}
+
+FILES_${PN} = "${palmtopdir}/"
diff --git a/packages/tickypip/tickypip_0.1.2.bb b/packages/tickypip/tickypip_0.1.2.bb
index 01acccb652..578989eb9a 100644
--- a/packages/tickypip/tickypip_0.1.2.bb
+++ b/packages/tickypip/tickypip_0.1.2.bb
@@ -20,13 +20,13 @@ QMAKE_PROFILES = "tickypip.pro"
 EXTRA_QMAKEVARS_POST += "DEFINES-=LOCAL_COMPILE"
 
 do_install () {
-	install -d ${D}/${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${WORKDIR}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${S}/images/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${WORKDIR}/*.png ${D}${palmtopdir}/pics/${APPNAME}/
+	install -m 0644 ${S}/images/*.png ${D}${palmtopdir}/pics/${APPNAME}/
 
 # copy share
-	install -d ${D}/${palmtopdir}/share/${APPNAME}/levels
-	install -m 0644 ${S}/levels/* ${D}/${palmtopdir}/share/${APPNAME}/levels/
+	install -d ${D}${palmtopdir}/share/${APPNAME}/levels
+	install -m 0644 ${S}/levels/* ${D}${palmtopdir}/share/${APPNAME}/levels/
 }
 
 
diff --git a/packages/timesleuth/timesleuth_1.0.5.bb b/packages/timesleuth/timesleuth_1.0.5.bb
index e69de29bb2..ff8fa9d10f 100644
--- a/packages/timesleuth/timesleuth_1.0.5.bb
+++ b/packages/timesleuth/timesleuth_1.0.5.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Time Sleuth"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+AUTHOR = "Dafydd Walters"
+HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-TimeSleuth.html"
+PR = "r1"
+
+SRC_URI = "http://handhelds.org/~zecke/oe_packages/timesleuth_V1.05ern.tar.gz "
+
+PV = "1.05ern"
+S = "${WORKDIR}/timesleuth_V${PV}"
+
+APPNAME = "timesleuthqpe"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/
+	
+}
+
+inherit opie
diff --git a/packages/tinc/tinc_1.0.2.bb b/packages/tinc/tinc_1.0.2.bb
index d9f1717ffe..26a6d7370e 100644
--- a/packages/tinc/tinc_1.0.2.bb
+++ b/packages/tinc/tinc_1.0.2.bb
@@ -27,6 +27,6 @@ do_compile() {
 
 do_install() {
         oe_runmake install DESTDIR=${D}
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/tinc
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/tinc
 }
diff --git a/packages/tinylogin/tinylogin_1.4.bb b/packages/tinylogin/tinylogin_1.4.bb
index d028c9a8e6..99ea0f6d07 100644
--- a/packages/tinylogin/tinylogin_1.4.bb
+++ b/packages/tinylogin/tinylogin_1.4.bb
@@ -19,10 +19,10 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${base_bindir}
-	install -m 4755 tinylogin ${D}/${base_bindir}/tinylogin
+	install -d ${D}${base_bindir}
+	install -m 4755 tinylogin ${D}${base_bindir}/tinylogin
 	for i in `cat tinylogin.links`; do
-		mkdir -p ${D}/`dirname $i`
-		ln -sf /bin/tinylogin ${D}/$i
+		mkdir -p ${D}`dirname $i`
+		ln -sf /bin/tinylogin ${D}$i
 	done
 }
diff --git a/packages/transconnect/transconnect_1.2.bb b/packages/transconnect/transconnect_1.2.bb
index 9ca81eae97..fd3a4a0f1d 100644
--- a/packages/transconnect/transconnect_1.2.bb
+++ b/packages/transconnect/transconnect_1.2.bb
@@ -11,8 +11,8 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}
-	install -m 0644 tconn.conf ${D}/${sysconfdir}/
-	install -d ${D}/${libdir}/tconn
-	oe_libinstall -so tconn ${D}/${libdir}/tconn/
+	install -d ${D}${sysconfdir}
+	install -m 0644 tconn.conf ${D}${sysconfdir}/
+	install -d ${D}${libdir}/tconn
+	oe_libinstall -so tconn ${D}${libdir}/tconn/
 }
diff --git a/packages/transconnect/transconnect_1.3-beta.bb b/packages/transconnect/transconnect_1.3-beta.bb
index c042f7567f..807943daf8 100644
--- a/packages/transconnect/transconnect_1.3-beta.bb
+++ b/packages/transconnect/transconnect_1.3-beta.bb
@@ -13,8 +13,8 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sysconfdir}
-	install -m 0644 tconn.conf ${D}/${sysconfdir}/
-	install -d ${D}/${libdir}/tconn
-	oe_libinstall -so tconn ${D}/${libdir}/tconn/
+	install -d ${D}${sysconfdir}
+	install -m 0644 tconn.conf ${D}${sysconfdir}/
+	install -d ${D}${libdir}/tconn
+	oe_libinstall -so tconn ${D}${libdir}/tconn/
 }
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index a42fe2b12e..fdb5789562 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -40,8 +40,8 @@ do_install_prepend () {
 }
 
 do_install_append() {
-	install -d ${D}/${sysconfdir}/profile.d/
-	install -m 0755 ${WORKDIR}/tslib.sh ${D}/${sysconfdir}/profile.d/
+	install -d ${D}${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
 	h3600 | h3900)
 		install -d ${D}${datadir}/tslib
diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb
index e69de29bb2..7e77fb2348 100644
--- a/packages/txdrug/txdrug_0.1.bb
+++ b/packages/txdrug/txdrug_0.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Tx Drug Database"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "sqlite"
+PR = "r1"
+
+SRC_URI = "http://teax.sourceforge.net/txdrug-${PV}.tar.gz \
+           file://${FILESDIR}/${palmtopdir}"
+S = "${WORKDIR}/txdrug-tar"
+
+inherit palmtop
+
+do_install() {
+        install -d ${D}${palmtopdir}
+	cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/
+        install -D -m 755 txdrug ${D}${palmtopdir}/bin/txdrug
+}
diff --git a/packages/tximage/tximage_0.2.bb b/packages/tximage/tximage_0.2.bb
index e69de29bb2..1c317aaec9 100644
--- a/packages/tximage/tximage_0.2.bb
+++ b/packages/tximage/tximage_0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Tx Image Viewer"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://community.zaurus.com/projects/tximage/"
+PR = "r1"
+
+SRC_URI = "http://downloads.zaurususergroup.com/community/66.180.235.230/download.php/253/tximage-${PV}.tar.gz \
+           file://gcc3.patch;patch=1"
+
+inherit palmtop
+
+do_install() {
+        install -d ${D}${palmtopdir}/apps/Applications \
+        	   ${D}${palmtopdir}/pics \
+        	   ${D}${palmtopdir}/bin
+        install -D -m 755 tximage ${D}${palmtopdir}/bin/tximage
+        install -D -m 644 imageviewer.desktop ${D}${palmtopdir}/apps/Applications/tximage.desktop
+        cp -a tximage.png ${D}${palmtopdir}/pics/
+}
diff --git a/packages/uae/e-uae_0.8.27.bb b/packages/uae/e-uae_0.8.27.bb
index e69de29bb2..7b66d45164 100644
--- a/packages/uae/e-uae_0.8.27.bb
+++ b/packages/uae/e-uae_0.8.27.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Amiga Emulator based on SDL"
+SECTION = "base"
+PRIORITY = "optional"
+DEPENDS = "libsdl-qpe"
+LICENSE = "GPL"
+
+SRC_URI = "http://rcdrummond.net/uae/e-uae-${PV}/e-uae-${PV}.tar.bz2 \
+           file://configure.patch;patch=1"
+#           file://m4.patch;patch=1"
+
+inherit autotools 
+
+EXTRA_OECONF = "--with-hostcc=gcc --disable-ui --without-x \
+		--without-gtk --enable-jit --disable-natmem \
+		--with-zlib=${STAGING_LIBDIR}/.. \
+		--with-sdl-exec-prefix=${STAGING_BINDIR}/.. \
+		--with-sdl-prefix=${STAGING_LIBDIR}/.."
+
+CFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
+CXXFLAGS_append = " -DSTAT_STATFS2_BSIZE=1 "
+PARALLEL_MAKE = ""
+
+do_configure_prepend () {
+	touch NEWS AUTHORS ChangeLog
+}
+
+do_install_append() {
+# Packages NEVER, ever, ever, ever touch home directories directly.
+# ever.
+# Either update a global config in /etc, install it into /etc/skel/ for
+# new users homedirs, rely on the user installing it to put it in place,
+# or dont install it at all.  --CL
+#	install -d ${D}home/root
+#	install ${FILESDIR}/uaerc ${D}home/root/.uaerc
+}
diff --git a/packages/uae/uae_0.8.23-20040129.bb b/packages/uae/uae_0.8.23-20040129.bb
index 138f9d66c0..10dd840283 100644
--- a/packages/uae/uae_0.8.23-20040129.bb
+++ b/packages/uae/uae_0.8.23-20040129.bb
@@ -30,6 +30,6 @@ do_install_append() {
 # Either update a global config in /etc, install it into /etc/skel/ for
 # new users homedirs, rely on the user installing it to put it in place,
 # or dont install it at all.  --CL
-#	install -d ${D}/home/root
-#	install ${FILESDIR}/uaerc ${D}/home/root/.uaerc
+#	install -d ${D}home/root
+#	install ${FILESDIR}/uaerc ${D}home/root/.uaerc
 }
diff --git a/packages/ubahnnav/ubahnnav_0.3.1.bb b/packages/ubahnnav/ubahnnav_0.3.1.bb
index e69de29bb2..01d1a8a192 100644
--- a/packages/ubahnnav/ubahnnav_0.3.1.bb
+++ b/packages/ubahnnav/ubahnnav_0.3.1.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "U-Bahn Navigator helps you navigating through foreign public \
+transport networks. It finds the shortest or direct route from a start to a \
+destination station of the loaded subway map. U-Bahn Navigator is extensible \
+to support each public transport network."
+PRIORITY = "optional"
+SECTION = "opie/applications"
+MAINTAINER = "Dimitri Brukakis"
+LICENSE = "GPL"
+APPNAME = "ubahnnav"
+APPTYPE = "binary"
+APPDESKTOP = "${S}/src/ubahnnav"
+PR = "r2"
+
+SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
+	   file://qmake.patch;patch=1"
+S = "${WORKDIR}/ubahnnav-${PV}"
+
+inherit opie
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST = "LIBS+=-L${S}"
+
+do_configure_prepend() {
+	find . -name "Makefile"|xargs rm -f
+}
+
+do_install() {
+	oe_libinstall -so libsubwaymap ${D}${palmtopdir}/lib
+        install -d ${D}${palmtopdir}/pics ${D}${palmtopdir}/ubahn/maps
+	touch ${D}${palmtopdir}/ubahn/maps/.empty
+        install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png
+}
diff --git a/packages/ubahnnav/ubahnnav_0.4.0.bb b/packages/ubahnnav/ubahnnav_0.4.0.bb
index e69de29bb2..49e46ac8b0 100644
--- a/packages/ubahnnav/ubahnnav_0.4.0.bb
+++ b/packages/ubahnnav/ubahnnav_0.4.0.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "U-Bahn Navigator helps you navigating through foreign public \
+transport networks. It finds the shortest or direct route from a start to a \
+destination station of the loaded subway map. U-Bahn Navigator is extensible \
+to support each public transport network."
+PRIORITY = "optional"
+SECTION = "opie/applications"
+AUTHOR = "Dimitri Brukakis"
+HOMEPAGE = "http://ubahnstation.net"
+LICENSE = "GPL"
+APPNAME = "ubahnnav"
+APPTYPE = "binary"
+APPDESKTOP = "${S}/src/ubahnnav"
+PR = "r2"
+
+SRC_URI = "http://ubahnstation.net/source/ubahnnav-${PV}.tar.gz \
+	   file://qmake.patch;patch=1"
+S = "${WORKDIR}/ubahnnav-${PV}"
+
+inherit opie
+
+export OE_QMAKE_LINK="${CXX}"
+EXTRA_QMAKEVARS_POST = "LIBS+=-L${S} LIBS-=-lqtopia"
+
+do_configure_prepend() {
+	find . -name "Makefile"|xargs rm -f
+}
+
+do_install() {
+	oe_libinstall -so libsubwaymap ${D}${palmtopdir}/lib
+        install -d ${D}${palmtopdir}/pics ${D}${palmtopdir}/ubahn/maps
+	touch ${D}${palmtopdir}/ubahn/maps/.empty
+        install -m 0644 src/ubahnnav/images/u-logo.png ${D}${palmtopdir}/pics/ubahnnav.png
+}
diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc
index c32285d28a..a308926b86 100644
--- a/packages/uclibc/uclibc.inc
+++ b/packages/uclibc/uclibc.inc
@@ -147,21 +147,21 @@ do_install() {
 		install_dev install_runtime install_utils
 
 	# We don't really need this in ${includedir}
-	rm -f ${D}/${prefix}/include/.cvsignore
+	rm -f ${D}${prefix}/include/.cvsignore
 
 	# This conflicts with the c++ version of this header
-	rm -f ${D}/${prefix}/include/bits/atomicity.h
+	rm -f ${D}${prefix}/include/bits/atomicity.h
 
-	install -d ${D}/${includedir}
-	mv ${D}/${prefix}/include/* ${D}/${includedir}/
-	rmdir ${D}/${prefix}/include
+	install -d ${D}${includedir}
+	mv ${D}${prefix}/include/* ${D}${includedir}/
+	rmdir ${D}${prefix}/include
 
-	install -d ${D}/${libdir}
-	mv ${D}/${prefix}/lib/* ${D}/${libdir}/
-	rmdir ${D}/${prefix}/lib
+	install -d ${D}${libdir}
+	mv ${D}${prefix}/lib/* ${D}${libdir}/
+	rmdir ${D}${prefix}/lib
 
-	install -d ${D}/${bindir}
-	mv ${D}/usr/bin/* ${D}/${bindir}/
-	rmdir ${D}/usr/bin
+	install -d ${D}${bindir}
+	mv ${D}usr/bin/* ${D}${bindir}/
+	rmdir ${D}usr/bin
 }
 
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index e69de29bb2..9a15e57e30 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -0,0 +1,34 @@
+DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
+/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
+LICENSE = "GPL"
+
+PACKAGES =+ "udev-utils"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "udev"
+INITSCRIPT_PARAMS = "start 03 S ."
+
+export HOSTCC = "${BUILD_CC}"
+export udevdir ?= "/dev"
+export usrbindir := "${bindir}"
+export usrsbindir := "${sbindir}"
+export etcdir = "${sysconfdir}"
+LD = "${CC}"
+bindir = "/bin"
+sbindir = "/sbin"
+
+UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/"
+FILES_${PN} += "${usrbindir} ${usrsbindir}"
+EXTRA_OEMAKE = "-e \
+		'EXTRAS=${UDEV_EXTRAS}' \
+		'STRIP=echo'"
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' install
+	install -d ${D}${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
+}
diff --git a/packages/unionfs/unionfs-modules.inc b/packages/unionfs/unionfs-modules.inc
index 327ac91e03..ceada47454 100644
--- a/packages/unionfs/unionfs-modules.inc
+++ b/packages/unionfs/unionfs-modules.inc
@@ -27,9 +27,9 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs
-	install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/
+	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs
+	install -m 0644 unionfs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/fs/
 
-	install -d ${D}/${mandir}/man4
-	install -m 0644 man/unionfs.4 ${D}/${mandir}/man4/
+	install -d ${D}${mandir}/man4
+	install -m 0644 man/unionfs.4 ${D}${mandir}/man4/
 }
diff --git a/packages/unionfs/unionfs-utils.inc b/packages/unionfs/unionfs-utils.inc
index e69de29bb2..18b3bc29cd 100644
--- a/packages/unionfs/unionfs-utils.inc
+++ b/packages/unionfs/unionfs-utils.inc
@@ -0,0 +1,20 @@
+unionutils = "unionctl uniondbg"
+
+include unionfs.inc
+
+FILES_${PN} = "${sbindir}/unionctl"
+FILES_${PN}-dev = "${sbindir}/uniondbg"
+
+do_compile () {
+	oe_runmake ${unionutils}
+}
+
+do_install () {
+	install -d ${D}${sbindir}
+	install -m 0755 ${unionutils} ${D}${sbindir}/
+
+	install -d ${D}${mandir}/man8
+	for m in ${unionutils}; do
+		install -m 0644 man/$m.8 ${D}${mandir}/man8/ || exit 1
+	done
+}
diff --git a/packages/unionfs/unionroot-utils_0.1.1.bb b/packages/unionfs/unionroot-utils_0.1.1.bb
index 4af7cd7ef4..4c2ed9ac53 100644
--- a/packages/unionfs/unionroot-utils_0.1.1.bb
+++ b/packages/unionfs/unionroot-utils_0.1.1.bb
@@ -11,9 +11,9 @@ SRC_URI = "file://mount.unionroot \
 	   file://umount.unionroot"
 
 do_install () {
-	install -d ${D}/${base_bindir}
-	install -m 0755 ${WORKDIR}/mount.unionroot ${D}/${base_bindir}/
-	install -m 0755 ${WORKDIR}/umount.unionroot ${D}/${base_bindir}/
+	install -d ${D}${base_bindir}
+	install -m 0755 ${WORKDIR}/mount.unionroot ${D}${base_bindir}/
+	install -m 0755 ${WORKDIR}/umount.unionroot ${D}${base_bindir}/
 }
 
 pkg_postinst () {
diff --git a/packages/unionfs/unionroot_0.1.1.bb b/packages/unionfs/unionroot_0.1.1.bb
index ba07cc1695..50109b47aa 100644
--- a/packages/unionfs/unionroot_0.1.1.bb
+++ b/packages/unionfs/unionroot_0.1.1.bb
@@ -17,8 +17,8 @@ ALTERNATIVE_PATH = "/sbin/init.unionroot"
 ALTERNATIVE_PRIORITY = "100"
 
 do_install () {
-        install -d ${D}/${base_sbindir}
-        install -m 0755 ${WORKDIR}/init.unionroot ${D}/${base_sbindir}/
+        install -d ${D}${base_sbindir}
+        install -m 0755 ${WORKDIR}/init.unionroot ${D}${base_sbindir}/
 }
 
 pkg_postinst () {
diff --git a/packages/units/units_1.80.bb b/packages/units/units_1.80.bb
index b4891ff8ef..0f94f80638 100644
--- a/packages/units/units_1.80.bb
+++ b/packages/units/units_1.80.bb
@@ -11,8 +11,8 @@ SRC_URI = "${GNU_MIRROR}/units/units-${PV}.tar.gz \
 inherit autotools
 
 do_install_append() {
-       install -d ${D}/${datadir}
-       install -m 0655 units.dat ${D}/${datadir}
+       install -d ${D}${datadir}
+       install -m 0655 units.dat ${D}${datadir}
 }
 
 FILES_${PN} += "${datadir}/units.dat"
diff --git a/packages/unixbench/unixbench_4.1.0.bb b/packages/unixbench/unixbench_4.1.0.bb
index e69de29bb2..4e9d8f4b96 100644
--- a/packages/unixbench/unixbench_4.1.0.bb
+++ b/packages/unixbench/unixbench_4.1.0.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "The BYTE UNIX Benchmarks"
+# NOTE: There are no copyright headers or license information of any kind in
+# the unixbench source tree.  Not sure what to make of this.
+LICENSE = "unknown"
+SRC_URI = "http://www.tux.org/pub/tux/benchmarks/System/unixbench/unixbench-${PV}.tgz"
+S = "${WORKDIR}/unixbench-${PV}"
+EXTRA_OEMAKE = "'CC=${CC}'"
+FILES_${PN} = "${prefix}/src/unixbench-${PV}"
+
+do_install () {
+	install -d ${D}${prefix}/src
+	cp -a ${S} ${D}${prefix}/src/
+}
diff --git a/packages/update-rc.d/update-rc.d_0.6.bb b/packages/update-rc.d/update-rc.d_0.6.bb
index b9d1165d67..cbfc28072b 100644
--- a/packages/update-rc.d/update-rc.d_0.6.bb
+++ b/packages/update-rc.d/update-rc.d_0.6.bb
@@ -17,6 +17,6 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${sbindir}
-	install -m 0755 ${S}/update-rc.d ${D}/${sbindir}/update-rc.d
+	install -d ${D}${sbindir}
+	install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d
 }
diff --git a/packages/update-rc.d/update-rc.d_0.7.bb b/packages/update-rc.d/update-rc.d_0.7.bb
index e69de29bb2..20c6f49b6c 100644
--- a/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/packages/update-rc.d/update-rc.d_0.7.bb
@@ -0,0 +1,21 @@
+SECTION = "base"
+PRIORITY = "standard"
+DESCRIPTION = "Manage symlinks in /etc/rcN.d"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+S = ${WORKDIR}/update-rc.d
+PR = "r0"
+
+SRC_URI = "${HANDHELDS_CVS};module=apps/update-rc.d;tag=r0_7"
+
+do_compile() {
+}
+
+do_stage() {
+	install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install -m 0755 ${S}/update-rc.d ${D}${sbindir}/update-rc.d
+}
diff --git a/packages/uqm/uqm_0.3.bb b/packages/uqm/uqm_0.3.bb
index e69de29bb2..b31fb6af01 100644
--- a/packages/uqm/uqm_0.3.bb
+++ b/packages/uqm/uqm_0.3.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Star Control 2 source port using SDL (see sc2.sourceforge.net)"
+SECTION = "games"
+PRIORITY = "optional"
+DEPENDS = "virtual/libsdl libsdl-image libsdl-net libvorbis libogg zlib"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Paul Eggleton <paule@handhelds.org>"
+LICENSE = "GPL"
+
+PR = "r1"
+
+S = "${WORKDIR}/uqm-${PV}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tgz \
+           file://build-opts.sh \
+           file://build-oe.patch;patch=1;pnum=0"
+
+do_configure() {
+	install ${WORKDIR}/build-opts.sh ${S}/
+	./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR}
+}
+
+do_compile() {
+	export ARCH="${TARGET_ARCH}"
+	export CC="${CC}"
+	export STAGING_INCDIR="${STAGING_INCDIR}"
+	export STAGING_LIBDIR="${STAGING_LIBDIR}"
+	./build.sh uqm
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 uqm ${D}${bindir}
+}
diff --git a/packages/v4l2apps/v4l2apps_20020317.bb b/packages/v4l2apps/v4l2apps_20020317.bb
index e69de29bb2..67ab643b2d 100644
--- a/packages/v4l2apps/v4l2apps_20020317.bb
+++ b/packages/v4l2apps/v4l2apps_20020317.bb
@@ -0,0 +1,17 @@
+SECTION = "console/utils"
+DESCRIPTION = "Video4linux Two sample applications"
+LICENSE = "PD"
+DEPENDS = "xaw x11 xt"
+
+SRC_URI = "http://www.thedirks.org/pub/v4l2/apps/apps${PV}.tgz"
+S = "${WORKDIR}"
+
+#FIXME: currently busted, as it requires v4l2 -kernel headers.
+#either fix the apps to use headers not in linux/, or make this package
+#depend on an actual virtual/kernel that supports v4l2.
+BROKEN = "1"
+
+do_install () {
+	install -d ${S}/${bindir}
+	install -m 0755 vcat vctrl vidpanel xcaptest ${D}${bindir}/
+}
diff --git a/packages/vectoroids/vectoroids_1.1.0.bb b/packages/vectoroids/vectoroids_1.1.0.bb
index e69de29bb2..bc115c80b4 100644
--- a/packages/vectoroids/vectoroids_1.1.0.bb
+++ b/packages/vectoroids/vectoroids_1.1.0.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "Clone of the classic arcade game Asteroids for Qtopia/Opie - based on SDL"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqpe libsdl-qpe libsdl-image libsdl-mixer"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.sonic.net/pub/users/nbs/unix/x/vectoroids/src/vectoroids-${PV}.tar.gz"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/SDL LIBS+=-lSDL LIBS+=-lSDL_mixer \
+   			LIBS+=-lSDLmain LIBS+=-lSDL_image LIBS+=-lpthread LIBS+=-lqpe CONFIG+=qte"
+
+do_configure_prepend() {
+        qmake -project vectoroids.pro
+}
+
+do_install() {
+        install -d ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/pics \
+        	   ${D}${palmtopdir}/share/vectoroids \
+        	   ${D}${palmtopdir}/bin
+        install -m 0755 vectoroids-${PV} ${D}${palmtopdir}/bin/vectoroids
+	install -m 0644 data/images/icon.png ${D}${palmtopdir}/pics/vectoroids.png
+	cp -a data/* ${D}${palmtopdir}/share/vectoroids
+
+	echo "[Desktop Entry]" >${D}${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Comment=Asteroids game" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Exec=vectoroids" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Icon=vectoroids" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Type=Application" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop
+	echo "Name=Vectoroids" >>${D}${palmtopdir}/apps/Games/vectoroids.desktop
+}
diff --git a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
index 7442fedb4f..2b74df5bbb 100644
--- a/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
+++ b/packages/vera-fonts/ttf-bitstream-vera_1.10.bb
@@ -14,8 +14,8 @@ do_install () {
         done 
 
 	# fontconfig ships this too.  not sure what to do about it.
-        #install -d ${D}/${sysconfdir}/fonts 
-        #install -m 644 local.conf ${D}/${sysconfdir}/fonts/local.conf 
+        #install -d ${D}${sysconfdir}/fonts 
+        #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf 
 
 
         install -d ${D}${prefix}/share/doc/${PN}/ 
diff --git a/packages/visiscript/visiscript_0.3.1.bb b/packages/visiscript/visiscript_0.3.1.bb
index e69de29bb2..948924d597 100644
--- a/packages/visiscript/visiscript_0.3.1.bb
+++ b/packages/visiscript/visiscript_0.3.1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "VisiScript is a simple graphical frontend for \
+scripting languages like minscript, Python,Ruby, Perl or others. \
+VisiScript runs on the Qtopia desktop environment of the Zaurus."
+SECTION = "opie/applications"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "qscintilla"
+LICENSE = "GPL"
+APPNAME = "visiscript"
+APPTYPE = "binary"
+APPDESKTOP = "${S}"
+
+SRC_URI = "http://www.mneuroth.de/privat/zaurus/visiscript_src_${PV}.tar.gz \
+	   file://compilefix.patch;patch=1"
+S = "${WORKDIR}/visiscript"
+
+inherit opie
+
+QMAKE_PROFILES = "zvisiscript.pro"
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=thread LIBS-=../qscintilla-1.60-gpl-1.3/qt/libqscintilla.a LIBS+=-lqscintilla"
+
+do_install() {
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 Visiscript.png ${D}${palmtopdir}/pics
+}
+
+#FIXME: package help and translation
diff --git a/packages/visiscript/visiscript_0.3.2.bb b/packages/visiscript/visiscript_0.3.2.bb
index 4942b49cbc..23a62cee68 100644
--- a/packages/visiscript/visiscript_0.3.2.bb
+++ b/packages/visiscript/visiscript_0.3.2.bb
@@ -25,8 +25,8 @@ do_compile_prepend() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/
-	install -m 0644 Visiscript.png ${D}/${palmtopdir}/pics
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 Visiscript.png ${D}${palmtopdir}/pics
 }
 
 #FIXME: package help and translation
diff --git a/packages/vlc/vlc-gpe_0.7.2.bb b/packages/vlc/vlc-gpe_0.7.2.bb
index 77e48aa0f2..4f30e191ee 100644
--- a/packages/vlc/vlc-gpe_0.7.2.bb
+++ b/packages/vlc/vlc-gpe_0.7.2.bb
@@ -68,8 +68,8 @@ EXTRA_OECONF = "--disable-plugins \
 do_install() {
 	autotools_do_install
 
-	install -d ${D}/${datadir}/applications
-	install -m 644 ipkg/vlc.gpe ${D}/${datadir}/applications/vlc-gpe.desktop
+	install -d ${D}${datadir}/applications
+	install -m 644 ipkg/vlc.gpe ${D}${datadir}/applications/vlc-gpe.desktop
 }
 
 FILES_${PN} = "${bindir}/vlc \
diff --git a/packages/vpnc/vpnc_0.3.2.bb b/packages/vpnc/vpnc_0.3.2.bb
index e69de29bb2..d542408eb7 100644
--- a/packages/vpnc/vpnc_0.3.2.bb
+++ b/packages/vpnc/vpnc_0.3.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A client for the Cisco3000 VPN Concentrator"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "libgcrypt"
+
+SRC_URI = "http://www.unix-ag.uni-kl.de/~massar/vpnc/vpnc-${PV}.tar.gz"
+
+CFLAGS_append = ' -DVERSION=\\"${PV}\\"'
+LDFLAGS_append = " -lgcrypt -lgpg-error"
+
+do_install () {
+        install -d ${D}${sbindir}
+	install -m 0755 vpnc ${D}${sbindir}
+}
diff --git a/packages/vsftpd/vsftpd_2.0.1.bb b/packages/vsftpd/vsftpd_2.0.1.bb
index ec25f5ea75..b77ce2e1d5 100644
--- a/packages/vsftpd/vsftpd_2.0.1.bb
+++ b/packages/vsftpd/vsftpd_2.0.1.bb
@@ -16,7 +16,7 @@ do_install() {
 	install -d ${D}${mandir}/man8
 	install -d ${D}${mandir}/man5
 	oe_runmake 'DESTDIR=${D}' install
-	install -d ${D}/${sysconfdir}
+	install -d ${D}${sysconfdir}
 	install -m 0755 ${S}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf
 }
 
diff --git a/packages/whois/whois.inc b/packages/whois/whois.inc
index e69de29bb2..9587920fcc 100644
--- a/packages/whois/whois.inc
+++ b/packages/whois/whois.inc
@@ -0,0 +1,22 @@
+DEPENDS += "gettext-native virtual/libintl"
+DESCRIPTION = "whois is an improved whois client"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+HOMEPAGE = "http://www.linux.it/~md/software/"
+SECTION = "net"
+
+def whois_intl(bb, d):
+	# FIXME: This is ugly.. we already have the virtual for this,
+	# but there's no way to ask bb who the current selected provider of
+	# a given virtual/ is.
+	if (bb.data.getVar('TARGET_OS', d, 1) or '').endswith('-uclibc'):
+		return ' -lintl'
+	return ''
+
+EXTRA_OEMAKE = '"OPTS=${CFLAGS} -DCONFIG_FILE=\\\"/etc/whois.conf\\\"" \
+		"CC=${CC}" "LDFLAGS=${LDFLAGS}${@whois_intl(bb, d)}"'
+
+do_install () {
+	install -D -m 0755 whois ${D}${bindir}/whois
+	install -D -m 0644 whois.1 ${D}${mandir}/man1/whois.1
+}
diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb
index 5ef5bfff97..f0f29bf608 100644
--- a/packages/wireless-tools/wireless-tools_26.bb
+++ b/packages/wireless-tools/wireless-tools_26.bb
@@ -25,8 +25,8 @@ do_compile() {
 
 do_install() {
 	oe_runmake PREFIX=${D} install
-	install -d ${D}/${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wireless-tools
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
 }
 
 FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
index b3caa5040f..e40c788e92 100644
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ b/packages/wireless-tools/wireless-tools_27.bb
@@ -15,10 +15,10 @@ S = "${WORKDIR}/wireless_tools.${PV}"
 
 CFLAGS =+ "-I${S}"
 EXTRA_OEMAKE = "-e 'BUILD_SHARED=y' \
-		'INSTALL_DIR=${D}/${base_sbindir}' \
-		'INSTALL_LIB=${D}/${libdir}' \
-		'INSTALL_INC=${D}/${includedir}' \
-		'INSTALL_MAN=${D}/${mandir}'"
+		'INSTALL_DIR=${D}${base_sbindir}' \
+		'INSTALL_LIB=${D}${libdir}' \
+		'INSTALL_INC=${D}${includedir}' \
+		'INSTALL_MAN=${D}${mandir}'"
 
 do_compile() {
 	oe_runmake all libiw.a
@@ -32,8 +32,8 @@ do_stage () {
 
 do_install() {
 	oe_runmake PREFIX=${D} install install-static
-	install -d ${D}/${sysconfdir}/network/if-pre-up.d
-	install ${WORKDIR}/wireless-tools.if-pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wireless-tools
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install ${WORKDIR}/wireless-tools.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/wireless-tools
 }
 
 PACKAGES = "libiw libiw-dev libiw-doc ${PN} ${PN}-doc"
diff --git a/packages/wlags-modules/wlags-modules_718.inc b/packages/wlags-modules/wlags-modules_718.inc
index c2e2e8517b..e56802d5c1 100644
--- a/packages/wlags-modules/wlags-modules_718.inc
+++ b/packages/wlags-modules/wlags-modules_718.inc
@@ -57,12 +57,12 @@ do_compile() {
 
 
 do_install() {
-        install -d ${D}/${sysconfdir}/pcmcia
-        install -m 0644 ${WORKDIR}/wlags_h${COMPILE_HERMES}.conf ${D}/${sysconfdir}/pcmcia/
+        install -d ${D}${sysconfdir}/pcmcia
+        install -m 0644 ${WORKDIR}/wlags_h${COMPILE_HERMES}.conf ${D}${sysconfdir}/pcmcia/
 
-        install -d ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/wireless
+        install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/wireless
 	ls
-        install -m 0644 wlags49_h${COMPILE_HERMES}_cs${KERNEL_OBJECT_SUFFIX} ${D}/${base_libdir}/modules/${KERNEL_VERSION}/net/wireless
+        install -m 0644 wlags49_h${COMPILE_HERMES}_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/wireless
 }
 
 FILES = "/lib/modules/${KERNEL_VERSION}/net/wireless/*${KERNEL_OBJECT_SUFFIX} /${sysconfdir}"        
diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
index 3ec6ff2d0d..8f9aa62712 100644
--- a/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
+++ b/packages/wlan-ng/wlan-ng-modules_0.2.1pre23.bb
@@ -55,20 +55,21 @@ do_compile() {
 
 do_install() {
 	oe_runmake install DESTDIR=${D} TARGET_MODDIR=
-	mkdir -p ${D}/${sysconfdir}/modutils/
-	mkdir -p ${D}/${sysconfdir}/hotplug/
-	mkdir -p ${D}/${base_sbindir}/
-	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}/${sysconfdir}/modutils/wlan-ng.conf
-	install -m 0755 ${WORKDIR}/wlan.agent ${D}/${sysconfdir}/hotplug/wlan.agent
-	install -d ${D}/${sysconfdir}/network/if-pre-up.d
-	install -m 0755 ${WORKDIR}/pre-up ${D}/${sysconfdir}/network/if-pre-up.d/wlan-ng
-	install -d ${D}/${sysconfdir}/network/if-post-down.d
-	install -m 0755 ${WORKDIR}/post-down ${D}/${sysconfdir}/network/if-post-down.d/wlan-ng
-	install -d ${D}/${sysconfdir}/apm/resume.d
-	install -m 0755 ${WORKDIR}/resume ${D}/${sysconfdir}/apm/resume.d/wlan-ng
-	install -m 0755 ${WORKDIR}/usbctl ${D}/${base_sbindir}/usbctl
-	install -d ${D}/${mandir}
-	mv ${D}/usr/local/man/* ${D}/${mandir}
+	echo "YYYYYYYYYYYYYYYYY"
+	mkdir -p ${D}${sysconfdir}/modutils/
+	mkdir -p ${D}${sysconfdir}/hotplug/
+	mkdir -p ${D}${base_sbindir}/
+	install -m 0644 ${WORKDIR}/wlan-ng.modutils ${D}${sysconfdir}/modutils/wlan-ng.conf
+	install -m 0755 ${WORKDIR}/wlan.agent ${D}${sysconfdir}/hotplug/wlan.agent
+	install -d ${D}${sysconfdir}/network/if-pre-up.d
+	install -m 0755 ${WORKDIR}/pre-up ${D}${sysconfdir}/network/if-pre-up.d/wlan-ng
+	install -d ${D}${sysconfdir}/network/if-post-down.d
+	install -m 0755 ${WORKDIR}/post-down ${D}${sysconfdir}/network/if-post-down.d/wlan-ng
+	install -d ${D}${sysconfdir}/apm/resume.d
+	install -m 0755 ${WORKDIR}/resume ${D}${sysconfdir}/apm/resume.d/wlan-ng
+	install -m 0755 ${WORKDIR}/usbctl ${D}${base_sbindir}/usbctl
+	install -d ${D}${mandir}
+	mv ${D}/usr/local/man/* ${D}${mandir}
 	rm -r ${D}/usr/local/man
 	rm -rf ${D}/${sysconfdir}/init.d
 }
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc b/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
index c1a6876b68..c2b51021f9 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
+++ b/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc
@@ -24,11 +24,11 @@ do_configure() {
 }
 
 do_install() {
-	install -d ${D}/${sysconfdir} ${D}/${bindir}
-	install -m 0644 wpa_supplicant.conf ${D}/${sysconfdir}/wpa_supplicant.conf.sample
-	install -m 0644 ../wpa_supplicant_default.conf ${D}/${sysconfdir}/wpa_supplicant.conf
-	install -m 0755 wpa_passphrase ${D}/${bindir}
-	install -m 0755 wpa_cli        ${D}/${bindir}
-	install -m 0755 wpa_supplicant ${D}/${bindir}
+	install -d ${D}${sysconfdir} ${D}${bindir}
+	install -m 0644 wpa_supplicant.conf ${D}${sysconfdir}/wpa_supplicant.conf.sample
+	install -m 0644 ../wpa_supplicant_default.conf ${D}${sysconfdir}/wpa_supplicant.conf
+	install -m 0755 wpa_passphrase ${D}${bindir}
+	install -m 0755 wpa_cli        ${D}${bindir}
+	install -m 0755 wpa_supplicant ${D}${bindir}
 }
 
diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
index 739e3e8d47..b6b9c2f63f 100644
--- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb
@@ -25,8 +25,8 @@ do_install () {
 	install -m755 wpa_passphrase ${D}${sbindir}
 	install -m755 wpa_cli        ${D}${sbindir}
 
-	install -d ${D}/${sysconfdir}
-	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/${sysconfdir}
+	install -d ${D}${sysconfdir}
+	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
 
 	install -d ${D}${docdir}/wpa_supplicant
 	install -m644 README ${D}${docdir}/wpa_supplicant
diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
index 06a3cc6dd5..1c5ec02246 100644
--- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb
+++ b/packages/wpa-supplicant/wpa-supplicant_cvs.bb
@@ -25,8 +25,8 @@ do_install () {
 	install -m755 wpa_passphrase ${D}${sbindir}
 	install -m755 wpa_cli        ${D}${sbindir}
 
-	install -d ${D}/${sysconfdir}
-	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}/${sysconfdir}
+	install -d ${D}${sysconfdir}
+	install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir}
 
 	install -d ${D}${docdir}/wpa_supplicant
 	install -m644 README ${D}${docdir}/wpa_supplicant
diff --git a/packages/xfdesktop/xfdesktop_4.0.5.bb b/packages/xfdesktop/xfdesktop_4.0.5.bb
index 4a4e9d71de..21eb7c9145 100644
--- a/packages/xfdesktop/xfdesktop_4.0.5.bb
+++ b/packages/xfdesktop/xfdesktop_4.0.5.bb
@@ -18,5 +18,5 @@ inherit xfce
 
 do_install() {
 	oe_runmake DESTDIR=${D} install
-	rm -rf ${D}/${sysconfdir}/xfce4/menu.xml.*
+	rm -rf ${D}${sysconfdir}/xfce4/menu.xml.*
 }
diff --git a/packages/xmame/xmame_0.86.bb b/packages/xmame/xmame_0.86.bb
index 8ac72390ad..e2f343cf26 100644
--- a/packages/xmame/xmame_0.86.bb
+++ b/packages/xmame/xmame_0.86.bb
@@ -20,7 +20,7 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 xmame.SDL ${D}/${bindir}
+	install -d ${D}${bindir}
+	install -m 0755 xmame.SDL ${D}${bindir}
 }
 
diff --git a/packages/xmame/xmame_0.87.bb b/packages/xmame/xmame_0.87.bb
index f68a6550a7..0a34cc7721 100644
--- a/packages/xmame/xmame_0.87.bb
+++ b/packages/xmame/xmame_0.87.bb
@@ -19,7 +19,7 @@ do_compile() {
 }
 
 do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 xmame.SDL ${D}/${bindir}
+	install -d ${D}${bindir}
+	install -m 0755 xmame.SDL ${D}${bindir}
 }
 
diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb
index e69de29bb2..9e8cc13754 100644
--- a/packages/xmms-embedded/xmms-embedded_20040327.bb
+++ b/packages/xmms-embedded/xmms-embedded_20040327.bb
@@ -0,0 +1,62 @@
+DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plugins"
+SECTION = "opie/multimedia"
+DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod-3.1.11"
+LICENSE = "GPL"
+PR = "r3"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \
+           file://bogusincdir.patch;patch=1 \
+           file://gtkremoval.patch;patch=1 \
+           file://removenativeincdir.patch;patch=1 \
+           file://glib2.patch;patch=1 \
+           file://tremorlib.patch;patch=1 \
+           file://bufferdefaults.patch;patch=1 \
+           file://gcc34.patch;patch=1 \
+           file://gcc34-enum.patch;patch=1 \
+		   file://mikmod-endian.patch;patch=1 \
+		   file://mikmod-update.patch;patch=1 \
+           file://xmms.png"
+S = "${WORKDIR}/xmms-embedded"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST += "CONFIG-=thread LIBS+=-lpthread LIBS+=-Wl,-rpath-link,${STAGING_LIBDIR} DEFINES+=_REENTRANT"
+QMAKE_PROFILES = "xmms-e.pro"
+export OE_QMAKE_LINK="${CXX}"
+
+do_configure_prepend() {
+    #remove all Makefiles - build will generate the correct ones using qmake
+    find ${S} -name Makefile | xargs rm -f
+}
+
+do_compile() {
+	oe_runmake "STAGING_DIR=${STAGING_DIR}/${HOST_SYS}"
+}
+
+do_install() {
+    install -d ${D}${palmtopdir}/lib/xmms/Effect \
+               ${D}${palmtopdir}/lib/xmms/General \
+               ${D}${palmtopdir}/lib/xmms/Input \
+               ${D}${palmtopdir}/lib/xmms/Output \
+               ${D}${palmtopdir}/lib/xmms/skin \
+               ${D}${palmtopdir}/bin \
+               ${D}${palmtopdir}/apps/Applications \
+               ${D}${palmtopdir}/pics
+    install -m 0644 xmms/General/QPEgui/xmms.desktop ${D}${palmtopdir}/apps/Applications/xmms.desktop
+    install -m 0644 ${WORKDIR}/xmms.png ${D}${palmtopdir}/pics/xmms.png
+    install -m 0755 compiled/bin/xmms ${D}${palmtopdir}/bin/xmms
+    oe_libinstall -so -C compiled libxmms ${D}${palmtopdir}/lib
+    oe_libinstall -so -C compiled/xmms/General libQPEgui ${D}${palmtopdir}/lib/xmms/General
+    for f in libfixpvorbisplugin libmplayer libshorten \
+		libwav libxmms-mad libxmms-sid libmikmod
+    do
+        oe_libinstall -so -C compiled/xmms/Input $f ${D}${palmtopdir}/lib/xmms/Input
+    done
+    oe_libinstall -so -C compiled/xmms/Output liboss ${D}${palmtopdir}/lib/xmms/Output
+    for f in eject.png fileadd.png main.png norep.png pause.png play.png rew.png \
+		shuf.png stop.png ff.png filedel.png move.png noshuf.png plalap.png \
+		rep.png save.png skinconf urladd.png
+    do
+        install -m 0644 Skins/winamp_xmms/${f} ${D}${palmtopdir}/lib/xmms/skin/${f}
+    done
+}
diff --git a/packages/xmonobut/xmonobut_0.4.bb b/packages/xmonobut/xmonobut_0.4.bb
index e69de29bb2..46cfae1a0a 100644
--- a/packages/xmonobut/xmonobut_0.4.bb
+++ b/packages/xmonobut/xmonobut_0.4.bb
@@ -0,0 +1,17 @@
+LICENSE = GPL
+PR = "r1"
+DESCRIPTION = "utility to allow middle and right clicking with a stylus"
+SECTION = "x11/utils"
+DEPENDS = "diet-x11 xext xpm"
+SRC_URI = "http://www.handhelds.org/~mallum/downloadables/xmonobut/xmonobut-${PV}.tar.gz \
+	   file://xmonobut.desktop"
+inherit autotools
+
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${datadir}/applications
+	install -d ${D}${datadir}/pixmaps
+	install -m 0755 xmonobut ${D}${bindir}/xmonobut
+	install -m 0644 xmonobut.xpm ${D}${datadir}/pixmaps/xmonobut.xpm
+	install -m 0644 ${WORKDIR}/xmonobut.desktop ${D}${datadir}/applications/xmonobut.desktop
+}
diff --git a/packages/xprint/xprint_0.9.001.bb b/packages/xprint/xprint_0.9.001.bb
index 692a720599..ce6c36b77e 100644
--- a/packages/xprint/xprint_0.9.001.bb
+++ b/packages/xprint/xprint_0.9.001.bb
@@ -22,7 +22,7 @@ do_compile() {
 do_install() {
 	make -C programs/Xserver DESTDIR="${D}" install
 	install -d ${D}${bindir}/
-	mv ${D}/usr/X11R6/bin/* ${D}${bindir}/
-	rmdir ${D}/usr/X11R6/bin/
+	mv ${D}usr/X11R6/bin/* ${D}${bindir}/
+	rmdir ${D}usr/X11R6/bin/
 }
 
diff --git a/packages/xqt/xqt_0.0.9.bb b/packages/xqt/xqt_0.0.9.bb
index 4bae235e55..dae436fa47 100644
--- a/packages/xqt/xqt_0.0.9.bb
+++ b/packages/xqt/xqt_0.0.9.bb
@@ -75,11 +75,11 @@ do_install() {
 	make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
 	make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
 	
-	install -d ${D}/${palmtopdir}/apps/Applications
-	install -d ${D}/${palmtopdir}/pics/Xqt
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics/Xqt
 	
-	install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}/${palmtopdir}/pics/Xqt
-	install -m 0644 IPKG/Xqt.desktop ${D}/${palmtopdir}/apps/Applications		
+	install -m 0644 programs/Xserver/hw/xqt/Xqt.png ${D}${palmtopdir}/pics/Xqt
+	install -m 0644 IPKG/Xqt.desktop ${D}${palmtopdir}/apps/Applications		
 }
 
 do_stage() {
diff --git a/packages/xscreensaver/xscreensaver_4.16.bb b/packages/xscreensaver/xscreensaver_4.16.bb
index 99067fd557..00ce146ff4 100644
--- a/packages/xscreensaver/xscreensaver_4.16.bb
+++ b/packages/xscreensaver/xscreensaver_4.16.bb
@@ -43,8 +43,8 @@ do_install() {
 	oe_runmake -C ${S}/hacks install_prefix=${D} install-program
 
 	# Install the defaults file
-	install -d ${D}/usr/X11R6/lib/X11/app-defaults
-	install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
+	install -d ${D}usr/X11R6/lib/X11/app-defaults
+	install -m 0644 ${WORKDIR}/XScreenSaver ${D}usr/X11R6/lib/X11/app-defaults
 }
 
 python populate_packages_prepend () {
diff --git a/packages/zauralign/zauralign_1.0.2.bb b/packages/zauralign/zauralign_1.0.2.bb
index e69de29bb2..be05d7a521 100644
--- a/packages/zauralign/zauralign_1.0.2.bb
+++ b/packages/zauralign/zauralign_1.0.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zauralign - a game for one player. The player has to align pieces to remove them from the \
+board fighting against new pieces which appear after each move." 
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.Vanille.de/mirror/zauralign-${PV}.tar.gz"
+S = "${WORKDIR}/zauralign"
+
+inherit palmtop
+export OE_QMAKE_LINK="${CXX}"
+
+do_install() {
+        install -d ${D}${palmtopdir}/apps/Games \
+        	   ${D}${palmtopdir}/pics/zauralign \
+        	   ${D}${palmtopdir}/bin
+        install -m 0755 zauralign ${D}${palmtopdir}/bin/
+	install -m 0644 zauralign.png ${D}${palmtopdir}/pics/
+	install -m 0644 zauralign.desktop ${D}${palmtopdir}/apps/Games/
+	cp -a pics/* ${D}${palmtopdir}/pics/zauralign/
+}
diff --git a/packages/zaurus-updater/encdec-updater.bb b/packages/zaurus-updater/encdec-updater.bb
index e69de29bb2..49371a6a49 100644
--- a/packages/zaurus-updater/encdec-updater.bb
+++ b/packages/zaurus-updater/encdec-updater.bb
@@ -0,0 +1,14 @@
+SECTION = "console/utils"
+LICENSE = "GPL"
+DESCRIPTION = "A tool to encode and decode the Sharp Zaurus updater.sh skript"
+
+SRC_URI = "file://encdec-updater.c"
+
+do_compile() {
+	${CC} -o encdec-updater ${WORKDIR}/encdec-updater.c
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 encdec-updater ${D}${bindir}/
+}
diff --git a/packages/zbedic/zbedic_20041227.bb b/packages/zbedic/zbedic_20041227.bb
index 48f2712f4b..c3d0ccc797 100644
--- a/packages/zbedic/zbedic_20041227.bb
+++ b/packages/zbedic/zbedic_20041227.bb
@@ -34,10 +34,10 @@ do_compile() {
 do_install() {
 	install -d ${D}${palmtopdir}/pics/zbedic/
 	install -d ${D}${palmtopdir}/help/html/
-	install -m 0644 ${ZS}/misc/*.png ${D}/${palmtopdir}/pics/zbedic/
-	install -m 0644 ${ZS}/misc/zbedic.png ${D}/${palmtopdir}/pics/
-	install -m 0644 ${ZS}/doc/manual/*.html ${D}/${palmtopdir}/help/html/
-	rm ${D}/${palmtopdir}/pics/zbedic/zbedic.png
+	install -m 0644 ${ZS}/misc/*.png ${D}${palmtopdir}/pics/zbedic/
+	install -m 0644 ${ZS}/misc/zbedic.png ${D}${palmtopdir}/pics/
+	install -m 0644 ${ZS}/doc/manual/*.html ${D}${palmtopdir}/help/html/
+	rm ${D}${palmtopdir}/pics/zbedic/zbedic.png
 }
 
 PACKAGES =+ "zbedic-help-en"
diff --git a/packages/zbench/zbench_2.0.bb b/packages/zbench/zbench_2.0.bb
index e69de29bb2..336a4e9a82 100644
--- a/packages/zbench/zbench_2.0.bb
+++ b/packages/zbench/zbench_2.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Benchmark for Opie/Qtopia"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.aa.alpha-net.ne.jp/satoshic/dw_zbnch.htm"
+PR = "r1"
+
+SRC_URI = "http://www.vanille.de/mirror/zbench-${PV}.tar.bz2"
+
+inherit palmtop
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Applications \
+		   ${D}${palmtopdir}/pics
+        install -D -m 755 zbench ${D}${palmtopdir}/bin/zbench
+        install -D -m 644 zbench.desktop ${D}${palmtopdir}/Applications/zbench.desktop
+        cp zbench.png ${D}${palmtopdir}/pics/
+}
diff --git a/packages/zcip/zcip_4.bb b/packages/zcip/zcip_4.bb
index 37f7a28a2d..ca0405ca6d 100644
--- a/packages/zcip/zcip_4.bb
+++ b/packages/zcip/zcip_4.bb
@@ -13,6 +13,6 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/${sbindir}
-	install -m 0744 make-arp zcip ${D}/${sbindir}/
+	install -d ${D}${sbindir}
+	install -m 0744 make-arp zcip ${D}${sbindir}/
 }
diff --git a/packages/zddice/zddice_1.0.0.bb b/packages/zddice/zddice_1.0.0.bb
index e69de29bb2..f10589c80b 100644
--- a/packages/zddice/zddice_1.0.0.bb
+++ b/packages/zddice/zddice_1.0.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Zaurus D20 Gaming Dice for Qt/Embedded based Palmtop Environments"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zddice/zddice_${PV}_arm.src.tar.gz \
+           file://qtopia17.patch;patch=1"
+S = "${WORKDIR}/zddice-src"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+
+do_install() {
+	install -d ${D}${palmtopdir}/{bin,pics,apps/Games}
+        install -m 0755 zddice ${D}${palmtopdir}/bin/
+	install -m 0644 images/zddice.png ${D}${palmtopdir}/pics/
+	install -m 0644 zddice.desktop ${D}${palmtopdir}/apps/Games/
+}
diff --git a/packages/zeecookbook/zeecookbook_1.0beta3.bb b/packages/zeecookbook/zeecookbook_1.0beta3.bb
index e69de29bb2..8f70df376e 100644
--- a/packages/zeecookbook/zeecookbook_1.0beta3.bb
+++ b/packages/zeecookbook/zeecookbook_1.0beta3.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Zee Cookbook is a cookbook application for Zaurus. \
+It lets you store, view and edit your recipes on your pda.        \
+Zee Cookbook can import Meal-Master files and can                 \
+export recipes in Meal-Master format or in HTML."
+SECTION = "opie/applications"
+DEPENDS = "sqlite"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+PR = "r0"
+
+SRC_URI = "http://zaurus.spy.org/feeds/docs-zaurus-com/zeecookbook-${PV}.zip"
+S = "${WORKDIR}/zeecookbook-${PV}/src/zeecookbook"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
+
+do_install () {
+	tar xzf ../../ipk/zeecookbook_1.0beta3_arm.ipk
+	tar xzf data.tar.gz
+	cp -a opt ${D}
+	install -m 0755 zeecookbook ${D}${palmtopdir}/bin/
+}
diff --git a/packages/zgscore/zgscore_1.0.1.bb b/packages/zgscore/zgscore_1.0.1.bb
index e69de29bb2..83dacef745 100644
--- a/packages/zgscore/zgscore_1.0.1.bb
+++ b/packages/zgscore/zgscore_1.0.1.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Zaurus Golf Score Application for Qt/Embedded based Palmtop Environments"
+SECTION = "opie/applications"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+HOMEPAGE = "http://nuke.cinlug.org/modules/Static_Docs/data/db/zgs/"
+PR = "r1"
+
+SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zgs/zgscore_${PV}_arm.src.tar.gz \
+           file://qtopia17.patch;patch=1"
+S = "${WORKDIR}/zgscore-src"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+
+do_install() {
+        install -d ${D}${palmtopdir}/bin \
+		   ${D}${palmtopdir}/apps/Applications \
+		   ${D}${palmtopdir}/pics
+        install -m 0755 zgscore ${D}${palmtopdir}/bin/zgscore
+	install -m 0755 zgscore.png ${D}${palmtopdir}/pics/
+	install -m 0644 zgscore.desktop ${D}${palmtopdir}/apps/Applications/
+}
diff --git a/packages/zip/zip_2.3.bb b/packages/zip/zip_2.3.bb
index 906c67314e..934d585a94 100644
--- a/packages/zip/zip_2.3.bb
+++ b/packages/zip/zip_2.3.bb
@@ -12,7 +12,7 @@ do_compile() {
 
 do_install() {
 	oe_runmake -f unix/Makefile prefix=${D}${prefix} \
-		   BINDIR=${D}/${bindir} MANDIR=${D}/${mandir}/man1 \
+		   BINDIR=${D}${bindir} MANDIR=${D}${mandir}/man1 \
 		   install
 }
 
diff --git a/packages/zlapspeed/zlapspeed_1.0.0.bb b/packages/zlapspeed/zlapspeed_1.0.0.bb
index e69de29bb2..ee0718a02c 100644
--- a/packages/zlapspeed/zlapspeed_1.0.0.bb
+++ b/packages/zlapspeed/zlapspeed_1.0.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Zaurus Race Lap Speed Measuring Application for Qt/Embedded based Palmtop Environments"
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.cinlug.org/modules/Static_Docs/data/db/zlaps/zlaps_${PV}_arm.src.tar.gz \
+           file://qtopia17.patch;patch=1"
+S = "${WORKDIR}/zlaps-src"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = 'TMAKE_LIBS-="-luuid" TMAKE_LIBS+="-lqpe" CONFIG+=qt CONFIG-=qtopia'
+
+do_install() {
+	install -d ${D}${palmtopdir}/{bin,pics,apps/Applications}
+        install -m 0755 zlaps ${D}${palmtopdir}/bin/
+	install -m 0755 images/zlaps.png ${D}${palmtopdir}/pics/
+	install -m 0644 zlaps.desktop ${D}${palmtopdir}/apps/Applications/
+}
diff --git a/packages/zlib/zlib_1.1.4.bb b/packages/zlib/zlib_1.1.4.bb
index cf8990eb60..ac90365322 100644
--- a/packages/zlib/zlib_1.1.4.bb
+++ b/packages/zlib/zlib_1.1.4.bb
@@ -28,7 +28,7 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir}
-	oe_runmake "prefix=${D}/${prefix}" "includedir=${D}/${includedir}" \
-		   "libdir=${D}/${libdir}" install
+	install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
+	oe_runmake "prefix=${D}${prefix}" "includedir=${D}${includedir}" \
+		   "libdir=${D}${libdir}" install
 }
diff --git a/packages/zlib/zlib_1.2.2.bb b/packages/zlib/zlib_1.2.2.bb
index 94270a383d..385fbbf57c 100644
--- a/packages/zlib/zlib_1.2.2.bb
+++ b/packages/zlib/zlib_1.2.2.bb
@@ -27,10 +27,10 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir}
-	oe_runmake "prefix=${D}/${prefix}" \
-		   "exec_prefix=${D}/${exec_prefix}" \
-		   "man3dir=${D}/${mandir}/man3" \
-		   "includedir=${D}/${includedir}" \
-		   "libdir=${D}/${libdir}" install
+	install -d ${D}${prefix} ${D}${includedir} ${D}${libdir}
+	oe_runmake "prefix=${D}${prefix}" \
+		   "exec_prefix=${D}${exec_prefix}" \
+		   "man3dir=${D}${mandir}/man3" \
+		   "includedir=${D}${includedir}" \
+		   "libdir=${D}${libdir}" install
 }
diff --git a/packages/zmerlin/zmerlin_0.9.1.bb b/packages/zmerlin/zmerlin_0.9.1.bb
index e69de29bb2..aba2bf2fd6 100644
--- a/packages/zmerlin/zmerlin_0.9.1.bb
+++ b/packages/zmerlin/zmerlin_0.9.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "http://user.cs.tu-berlin.de/~karlb/zmerlin/zmerlin.tar.gz"
+S = "${WORKDIR}/zmerlin"
+
+inherit palmtop
+
+do_install() {
+        install -m 0755 zmerlin ${S}/ipk${palmtopdir}/bin/zmerlin
+	install -d ${D}${palmtopdir}/
+        cp -a ipk/opt/* ${D}opt
+}
+
diff --git a/packages/zope/zope_2.7.1.bb b/packages/zope/zope_2.7.1.bb
index e66e3652d0..96fa1094e7 100644
--- a/packages/zope/zope_2.7.1.bb
+++ b/packages/zope/zope_2.7.1.bb
@@ -18,7 +18,7 @@ do_compile() {
 }
 
 do_install() {
-	oe_runmake install PREFIX=${D}/${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
+	oe_runmake install PREFIX=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
 }
 
 FILES_${PN} = "${prefix}"
diff --git a/packages/zrally/zrally_0.90.bb b/packages/zrally/zrally_0.90.bb
index e69de29bb2..8d9c06536f 100644
--- a/packages/zrally/zrally_0.90.bb
+++ b/packages/zrally/zrally_0.90.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "ZRally is a top view race game which offers the player mulitple \
+tracks and multiple skill levels."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
+LICENSE = "GPL"
+AUTHOR = "Kevin Greenhaw <kevin_greenhaw@email.com>"
+HOMEPAGE = "http://zrally.sourceforge.net/zrally.html"
+APPNAME = "zrally"
+APPTYPE = "binary"
+APPDESKTOP = "${WORKDIR}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/zrally/zrally_0.90_src.tar.gz \
+file://dir.patch;patch=1;pnum=0"
+
+S = "${WORKDIR}"
+
+inherit opie
+
+do_install () {
+	install -d ${D}${palmtopdir}/pics/${APPNAME}/track_pics/
+	install -m 0644 track_pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/track_pics/
+	install -m 0644 track_pics/ZRallyIcon.png ${D}${palmtopdir}/pics/
+}
+
diff --git a/packages/zroadmap/zroadmap_1.0.8.bb b/packages/zroadmap/zroadmap_1.0.8.bb
index febef98584..d5dc8a3328 100644
--- a/packages/zroadmap/zroadmap_1.0.8.bb
+++ b/packages/zroadmap/zroadmap_1.0.8.bb
@@ -29,15 +29,15 @@ do_configure() {
 }
 
 do_install() {
-        install -d ${D}/${palmtopdir}/bin
-	install -d ${D}/${palmtopdir}/apps/Applications
-	install -d ${D}/${palmtopdir}/pics
-        install -m 0755 qtroadmap ${D}/${palmtopdir}/bin/roadmap
-	install -m 0755 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 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/
+        install -d ${D}${palmtopdir}/bin
+	install -d ${D}${palmtopdir}/apps/Applications
+	install -d ${D}${palmtopdir}/pics
+        install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap
+	install -m 0755 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 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/
 }
diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb
index 1b360445e5..cf650d91d9 100644
--- a/packages/zshopi/zshopi_0.2.bb
+++ b/packages/zshopi/zshopi_0.2.bb
@@ -37,7 +37,7 @@ do_install() {
 
 	
 	install -d ${D}${palmtopdir}/i18n/de	
-	install -d ${D}/${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/zshopi.png ${D}/${palmtopdir}/pics/	
+	install -d ${D}${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/zshopi.png ${D}${palmtopdir}/pics/	
 	install -m 0644 ${WORKDIR}/${PN}_${PV}/zshopi/zshopi.de.qm ${D}${palmtopdir}/i18n/de/zshopi.qm
 }
diff --git a/packages/ztappy/ztappy_0.9.1.bb b/packages/ztappy/ztappy_0.9.1.bb
index e69de29bb2..62883f2404 100644
--- a/packages/ztappy/ztappy_0.9.1.bb
+++ b/packages/ztappy/ztappy_0.9.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Puzzle Game for Qt/Embedded based palmtop environments."
+SECTION = "opie/games"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "http://user.cs.tu-berlin.de/~karlb/ztappy/ztappy.tar.gz"
+S = "${WORKDIR}/ztappy"
+
+inherit palmtop
+
+do_install() {
+        install -m 0755 ${PN} ${S}/ipk${palmtopdir}/bin/${PN}
+	install -d ${D}${palmtopdir}/
+        cp -a ipk/opt/* ${D}opt
+}
+
diff --git a/packages/zuc/zuc_1.1.2ern.bb b/packages/zuc/zuc_1.1.2ern.bb
index 78450ef618..673dc8229b 100644
--- a/packages/zuc/zuc_1.1.2ern.bb
+++ b/packages/zuc/zuc_1.1.2ern.bb
@@ -20,8 +20,8 @@ do_configure_append() {
 }
 
 do_install() {
-	install -d ${D}/${palmtopdir}/pics/
-        install -m 0644 *.png ${D}/${palmtopdir}/pics/
-	install -d ${D}/${palmtopdir}/etc/
-	install -m 0644 ${WORKDIR}/nick.kreucher.net/zuc_units ${D}/${palmtopdir}/etc/
+	install -d ${D}${palmtopdir}/pics/
+        install -m 0644 *.png ${D}${palmtopdir}/pics/
+	install -d ${D}${palmtopdir}/etc/
+	install -m 0644 ${WORKDIR}/nick.kreucher.net/zuc_units ${D}${palmtopdir}/etc/
 }