9 files changed, 14 insertions, 12 deletions

diff --git a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 3d041bfe21..8e89d9b9ff 100644
--- a/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -9,7 +9,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig
 
@@ -22,7 +22,7 @@ FILES_${PN} = "${bindir}/* \
 
 FILES_${PN}-dev += "${libdir}/matchbox-desktop \
                    ${includedir}/matchbox-desktop \
-                   ${libdir}/matchbox/desktop/*.*a \
+                   ${libdir}/matchbox/desktop/*.*a \
                    ${datadir}/matchbox/desktop/modules/*a"
 
 FILES_${PN}-dbg += "${libdir}/matchbox/desktop/.debug/"
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index e561e846af..4cea81a2ea 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -2,14 +2,13 @@ DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft"
 SECTION = "x11"
-MAINTAINER = "Koen Kooi <koen@handhelds.org>"
 PV = "0.0+svn${SRCDATE}"
 PR="r2"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
@@ -19,4 +18,3 @@ FILES_${PN} = "${bindir}/* \
                ${datadir}/applications \
                ${datadir}/pixmaps \
                 ${datadir}/matchbox-keyboard"
-        
diff --git a/meta/packages/matchbox-panel/matchbox-panel.inc b/meta/packages/matchbox-panel/matchbox-panel.inc
index 26f15437ad..44bbae6870 100644
--- a/meta/packages/matchbox-panel/matchbox-panel.inc
+++ b/meta/packages/matchbox-panel/matchbox-panel.inc
@@ -1,8 +1,10 @@
 DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
+DEPENDS = "libmatchbox virtual/libx11 libxext libxpm apmd startup-notification virtual/kernel wireless-tools"
 SECTION = "x11/wm"
 
+PR = "r1"
+
 inherit autotools pkgconfig gettext
 
 CFLAGS += "-D_GNU_SOURCE"
@@ -11,10 +13,12 @@ EXTRA_OECONF = " --enable-startup-notification --enable-dnotify "
 EXTRA_OECONF_append_h3600 = " --enable-small-icons "
 EXTRA_OECONF_append_h3900 = " --enable-small-icons "
 EXTRA_OECONF_append_h2200 = " --enable-small-icons "
+EXTRA_OECONF_append_h4000 = " --enable-small-icons "
 EXTRA_OECONF_append_collie = " --enable-small-icons "
 EXTRA_OECONF_append_poodle = " --enable-small-icons "
 EXTRA_OECONF_append_mnci = " --enable-small-icons "
 EXTRA_OECONF_append_integral13 = " --enable-small-icons "
+PACKAGE_ARCH = "${MACHINE}"
 
 FILES_${PN} = "${bindir}/* \
                ${datadir}/applications \
diff --git a/meta/packages/matchbox-panel/matchbox-panel_svn.bb b/meta/packages/matchbox-panel/matchbox-panel_svn.bb
index a279954fe2..e42d505a30 100644
--- a/meta/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/meta/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -6,6 +6,6 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 
diff --git a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb b/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
index a019c16ca6..6e003c787c 100644
--- a/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/meta/packages/matchbox-stroke/matchbox-stroke_svn.bb
@@ -8,7 +8,7 @@ PR="r1"
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
 
-S = ${WORKDIR}/${PN}
+S = "${WORKDIR}/${PN}"
 
 inherit autotools pkgconfig gettext
 
diff --git a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb b/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
index ac00978c41..fb91f03b12 100644
--- a/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
+++ b/meta/packages/matchbox-themes-extra/matchbox-themes-extra_0.3.bb
@@ -11,7 +11,7 @@ inherit autotools  pkgconfig
 # split into several packages plus one meta package
 PACKAGES = "${PN} ${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
 
-ALLOW_EMPTY_${PN} = 1
+ALLOW_EMPTY_${PN} = "1"
 FILES_${PN} = ""
 RDEPENDS_${PN} = "${PN}-industrial ${PN}-expose ${PN}-mbcrystal"
 
diff --git a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
index cc21edebd8..1a1a89ec7a 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_0.9.5.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
 RDEPENDS = "matchbox-common"
 PR="r0"
 
diff --git a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
index 2d7c575c03..27298b06f2 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_1.1.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common"
+DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common"
 RDEPENDS = "matchbox-common"
 PR="r2"
 
diff --git a/meta/packages/matchbox-wm/matchbox-wm_svn.bb b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
index 262a3b98d4..4f58c46a73 100644
--- a/meta/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/meta/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,7 +1,7 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox libx11 libxext libxrender startup-notification expat matchbox-common gconf"
+DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat matchbox-common gconf"
 RDEPENDS = "matchbox-common"
 PV = "0.9.5+svn${SRCDATE}"
 PR = "r4"