2 files changed, 9 insertions, 9 deletions
diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc
index bbd6215539..2124bfe6c1 100644
--- a/packages/madwifi/madwifi-ng_r.inc
+++ b/packages/madwifi/madwifi-ng_r.inc
@@ -4,17 +4,16 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "kernel (${KERNEL_VERSION})"
 DEPENDS = "virtual/kernel"
-PR="r1"
+PR="r3"
+
+WACKELF_SRC_URI = ""
+WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1"
 
 SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
 	   file://10-xscale-be-elf-copts.patch;patch=1 \
 	   file://10-xscale-le-elf-copts.patch;patch=1 \
-	   file://10-sh4-le-elf-copts.patch;patch=1"
-
-SRC_URI_slugos = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \
-		  file://slugos-xscale-be-elf-copts.patch;patch=1 \
-		  file://slugos-xscale-le-elf-copts.patch;patch=1 \
-		  file://slugos-VFP-wackelf.patch;patch=1"
+           file://10-sh4-le-elf-copts.patch;patch=1 \
+	   ${WACKELF_SRC_URI}"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
diff --git a/packages/opie-handwriting/opie-handwriting.inc b/packages/opie-handwriting/opie-handwriting.inc
index caecc65d58..86b9ab51c6 100644
--- a/packages/opie-handwriting/opie-handwriting.inc
+++ b/packages/opie-handwriting/opie-handwriting.inc
@@ -3,6 +3,7 @@ SECTION = "opie/inputmethods"
 PRIORITY = "optional"
 LICENSE = "GPL"
 APPNAME = "qhandwriting"
+PR = "r1"
 
 
 S = "${WORKDIR}/handwriting"
@@ -35,9 +36,9 @@ do_install() {
 	done
 }
 
-PACKAGES = " opie-handwriting-classicset opie-handwriting-graffitiset opie-handwriting "
+PACKAGES += " opie-handwriting-classicset opie-handwriting-graffitiset "
 
-FILES_opie-handwriting = "${palmtopdir}/plugins/inputmethods/libqhandwriting.so*"
+FILES_${PN} = "${palmtopdir}/plugins/inputmethods/libqhandwriting.so*"
 FILES_opie-handwriting-classicset = "${palmtopdir}/etc/qimpen/default.conf \
 	${palmtopdir}/etc/qimpen/combining.qpt \
 	${palmtopdir}/etc/qimpen/asciilower.qpt \