merge of '16141cfb7ddd939f1759a94546b737b35c0ece43'

     and '70cf6fac1508deeecfecf766f0b26020893dc6d3'

42 files changed, 364 insertions, 107 deletions

diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass
index 24e824d06f..95ed4f538a 100644
--- a/classes/qt3x11.bbclass
+++ b/classes/qt3x11.bbclass
@@ -11,5 +11,5 @@ export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
 export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
 export OE_QMAKE_LIBS_QT = "qt"
 export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
-
-
+export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
+export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index 793348597f..8124dc877c 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -7,7 +7,13 @@
 HOMEPAGE = "http://www.xfce.org"
 LICENSE = "LGPL-2"
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.gz"
+def xfce_extension(ver):
+	ext = "gz"
+	if ver == "4.3.99.2":
+		ext = "bz2"
+	return ext
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.${@xfce_extension("${PV}")}"
 
 inherit autotools
 
diff --git a/classes/xorg-module.bbclass b/classes/xorg-module.bbclass
new file mode 100644
index 0000000000..135ca31c16
--- /dev/null
+++ b/classes/xorg-module.bbclass
@@ -0,0 +1,31 @@
+python populate_packages_prepend () {
+	import re, os.path
+
+	new_packages = []
+
+	def the_hook(file, pkg, pattern, format, basename):
+		new_packages.append(pkg)
+
+	do_split_packages(d, root=bb.data.expand('${libdir}/xorg/modules/drivers', d), file_regex='(.*)_drv\.so', output_pattern='xorg-driver-%s', description='xorg %s driver', extra_depends='xserver-xorg', hook=the_hook)
+
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+
+	so_to_la_re = "\.so$"
+
+	# fish out any debug or devel files corresponding to the new packages
+	for p in new_packages:
+		packages.append("%s-dbg" % p)
+		packages.append("%s-dev" % p)
+
+		files = bb.data.getVar("FILES_%s" % p, d).split()
+		dev_files = []
+		dbg_files = []
+		for f in files:
+			dev_files.append(re.sub(so_to_la_re, ".la", f))
+			(dir, file) = os.path.split(f)
+			dbg_files.append(os.path.join(dir, ".debug", file))
+		bb.data.setVar("FILES_%s-dbg" % p, " ".join(dbg_files), d)
+		bb.data.setVar("FILES_%s-dev" % p, " ".join(dev_files), d)
+	
+	bb.data.setVar('PACKAGES', ' '.join(packages), d)
+}
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
index dba0893b2b..72cec9be3c 100644
--- a/packages/bogofilter/bogofilter_0.96.0.bb
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (
 by a statistical analysis of the message's header and content (body). \
 The program is able to learn from the user's classifications and corrections."
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 PRIORITY = "optional"
 
 SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
diff --git a/packages/bogofilter/files/volatiles b/packages/bogofilter/files/volatiles
index 04960ff2d3..f460c91fea 100644
--- a/packages/bogofilter/files/volatiles
+++ b/packages/bogofilter/files/volatiles
@@ -1 +1 @@
-d spam filter 0770 /var/spool/filter
+d spam filter 0770 /var/spool/filter none
diff --git a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
index 14fb728304..e72253d4eb 100644
--- a/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
+++ b/packages/cyrus-imapd/cyrus-imapd_2.2.12.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "cyrus-sasl virtual/db"
 LICENSE = "BSD"
-PR = "r9"
+PR = "r10"
 DEPENDS += "install-native"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz \
diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles
index e0a55493b3..a95841c53c 100644
--- a/packages/cyrus-imapd/files/volatiles
+++ b/packages/cyrus-imapd/files/volatiles
@@ -1,63 +1,63 @@
-d cyrus mail 0755 /var/lib/cyrus
-d cyrus root 0755 /var/lib/cyrus/db
-d cyrus mail 0755 /var/lib/cyrus/proc
-d cyrus mail 0755 /var/lib/cyrus/sieve
+d cyrus mail 0755 /var/lib/cyrus none
+d cyrus root 0755 /var/lib/cyrus/db none
+d cyrus mail 0755 /var/lib/cyrus/proc none
+d cyrus mail 0755 /var/lib/cyrus/sieve none
 # if only i could: d cyrus mail 0755 /var/lib/cyrus/sieve/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-d cyrus mail 0755 /var/lib/cyrus/sieve/a
-d cyrus mail 0755 /var/lib/cyrus/sieve/b
-d cyrus mail 0755 /var/lib/cyrus/sieve/c
-d cyrus mail 0755 /var/lib/cyrus/sieve/d
-d cyrus mail 0755 /var/lib/cyrus/sieve/e
-d cyrus mail 0755 /var/lib/cyrus/sieve/f
-d cyrus mail 0755 /var/lib/cyrus/sieve/g
-d cyrus mail 0755 /var/lib/cyrus/sieve/h
-d cyrus mail 0755 /var/lib/cyrus/sieve/i
-d cyrus mail 0755 /var/lib/cyrus/sieve/j
-d cyrus mail 0755 /var/lib/cyrus/sieve/k
-d cyrus mail 0755 /var/lib/cyrus/sieve/l
-d cyrus mail 0755 /var/lib/cyrus/sieve/m
-d cyrus mail 0755 /var/lib/cyrus/sieve/n
-d cyrus mail 0755 /var/lib/cyrus/sieve/o
-d cyrus mail 0755 /var/lib/cyrus/sieve/p
-d cyrus mail 0755 /var/lib/cyrus/sieve/q
-d cyrus mail 0755 /var/lib/cyrus/sieve/r
-d cyrus mail 0755 /var/lib/cyrus/sieve/s
-d cyrus mail 0755 /var/lib/cyrus/sieve/t
-d cyrus mail 0755 /var/lib/cyrus/sieve/u
-d cyrus mail 0755 /var/lib/cyrus/sieve/v
-d cyrus mail 0755 /var/lib/cyrus/sieve/w
-d cyrus mail 0755 /var/lib/cyrus/sieve/x
-d cyrus mail 0755 /var/lib/cyrus/sieve/y
-d cyrus mail 0755 /var/lib/cyrus/sieve/z
-d cyrus root 0755 /var/lib/cyrus/socket
-d cyrus mail 0755 /var/lib/cyrus/user
+d cyrus mail 0755 /var/lib/cyrus/sieve/a none
+d cyrus mail 0755 /var/lib/cyrus/sieve/b none
+d cyrus mail 0755 /var/lib/cyrus/sieve/c none
+d cyrus mail 0755 /var/lib/cyrus/sieve/d none
+d cyrus mail 0755 /var/lib/cyrus/sieve/e none
+d cyrus mail 0755 /var/lib/cyrus/sieve/f none
+d cyrus mail 0755 /var/lib/cyrus/sieve/g none
+d cyrus mail 0755 /var/lib/cyrus/sieve/h none
+d cyrus mail 0755 /var/lib/cyrus/sieve/i none
+d cyrus mail 0755 /var/lib/cyrus/sieve/j none
+d cyrus mail 0755 /var/lib/cyrus/sieve/k none
+d cyrus mail 0755 /var/lib/cyrus/sieve/l none
+d cyrus mail 0755 /var/lib/cyrus/sieve/m none
+d cyrus mail 0755 /var/lib/cyrus/sieve/n none
+d cyrus mail 0755 /var/lib/cyrus/sieve/o none
+d cyrus mail 0755 /var/lib/cyrus/sieve/p none
+d cyrus mail 0755 /var/lib/cyrus/sieve/q none
+d cyrus mail 0755 /var/lib/cyrus/sieve/r none
+d cyrus mail 0755 /var/lib/cyrus/sieve/s none
+d cyrus mail 0755 /var/lib/cyrus/sieve/t none
+d cyrus mail 0755 /var/lib/cyrus/sieve/u none
+d cyrus mail 0755 /var/lib/cyrus/sieve/v none
+d cyrus mail 0755 /var/lib/cyrus/sieve/w none
+d cyrus mail 0755 /var/lib/cyrus/sieve/x none
+d cyrus mail 0755 /var/lib/cyrus/sieve/y none
+d cyrus mail 0755 /var/lib/cyrus/sieve/z none
+d cyrus root 0755 /var/lib/cyrus/socket none
+d cyrus mail 0755 /var/lib/cyrus/user none
 # if only i could: d cyrus mail 0755 /var/lib/cyrus/user/{a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z}
-d cyrus mail 0755 /var/lib/cyrus/user/a
-d cyrus mail 0755 /var/lib/cyrus/user/b
-d cyrus mail 0755 /var/lib/cyrus/user/c
-d cyrus mail 0755 /var/lib/cyrus/user/d
-d cyrus mail 0755 /var/lib/cyrus/user/e
-d cyrus mail 0755 /var/lib/cyrus/user/f
-d cyrus mail 0755 /var/lib/cyrus/user/g
-d cyrus mail 0755 /var/lib/cyrus/user/h
-d cyrus mail 0755 /var/lib/cyrus/user/i
-d cyrus mail 0755 /var/lib/cyrus/user/j
-d cyrus mail 0755 /var/lib/cyrus/user/k
-d cyrus mail 0755 /var/lib/cyrus/user/l
-d cyrus mail 0755 /var/lib/cyrus/user/m
-d cyrus mail 0755 /var/lib/cyrus/user/n
-d cyrus mail 0755 /var/lib/cyrus/user/o
-d cyrus mail 0755 /var/lib/cyrus/user/p
-d cyrus mail 0755 /var/lib/cyrus/user/q
-d cyrus mail 0755 /var/lib/cyrus/user/r
-d cyrus mail 0755 /var/lib/cyrus/user/s
-d cyrus mail 0755 /var/lib/cyrus/user/t
-d cyrus mail 0755 /var/lib/cyrus/user/u
-d cyrus mail 0755 /var/lib/cyrus/user/v
-d cyrus mail 0755 /var/lib/cyrus/user/w
-d cyrus mail 0755 /var/lib/cyrus/user/x
-d cyrus mail 0755 /var/lib/cyrus/user/y
-d cyrus mail 0755 /var/lib/cyrus/user/z
-d root root 0755 /var/spool/cyrus
-d cyrus mail 0750 /var/spool/cyrus/mail
-d cyrus mail 0750 /var/spool/cyrus/news
+d cyrus mail 0755 /var/lib/cyrus/user/a none
+d cyrus mail 0755 /var/lib/cyrus/user/b none
+d cyrus mail 0755 /var/lib/cyrus/user/c none
+d cyrus mail 0755 /var/lib/cyrus/user/d none
+d cyrus mail 0755 /var/lib/cyrus/user/e none
+d cyrus mail 0755 /var/lib/cyrus/user/f none
+d cyrus mail 0755 /var/lib/cyrus/user/g none
+d cyrus mail 0755 /var/lib/cyrus/user/h none
+d cyrus mail 0755 /var/lib/cyrus/user/i none
+d cyrus mail 0755 /var/lib/cyrus/user/j none
+d cyrus mail 0755 /var/lib/cyrus/user/k none
+d cyrus mail 0755 /var/lib/cyrus/user/l none
+d cyrus mail 0755 /var/lib/cyrus/user/m none
+d cyrus mail 0755 /var/lib/cyrus/user/n none
+d cyrus mail 0755 /var/lib/cyrus/user/o none
+d cyrus mail 0755 /var/lib/cyrus/user/p none
+d cyrus mail 0755 /var/lib/cyrus/user/q none
+d cyrus mail 0755 /var/lib/cyrus/user/r none
+d cyrus mail 0755 /var/lib/cyrus/user/s none
+d cyrus mail 0755 /var/lib/cyrus/user/t none
+d cyrus mail 0755 /var/lib/cyrus/user/u none
+d cyrus mail 0755 /var/lib/cyrus/user/v none
+d cyrus mail 0755 /var/lib/cyrus/user/w none
+d cyrus mail 0755 /var/lib/cyrus/user/x none
+d cyrus mail 0755 /var/lib/cyrus/user/y none
+d cyrus mail 0755 /var/lib/cyrus/user/z none
+d root root 0755 /var/spool/cyrus none
+d cyrus mail 0750 /var/spool/cyrus/mail none
+d cyrus mail 0750 /var/spool/cyrus/news none
diff --git a/packages/davfs2/davfs2_0.2.8.bb b/packages/davfs2/davfs2_0.2.8.bb
index ecb7034042..e49c4af424 100644
--- a/packages/davfs2/davfs2_0.2.8.bb
+++ b/packages/davfs2/davfs2_0.2.8.bb
@@ -6,7 +6,7 @@ DEPENDS = "neon-0.25.5"
 RDEPENDS_${PN} = "kernel-module-coda"
 LICENSE = "GPL"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dav/${P}.tar.gz \
            file://Makefile.in.patch;patch=1 \
diff --git a/packages/davfs2/files/volatiles b/packages/davfs2/files/volatiles
index 51405429d1..169fda7c3d 100644
--- a/packages/davfs2/files/volatiles
+++ b/packages/davfs2/files/volatiles
@@ -1 +1 @@
-d root users 0775 /var/run/mount.davfs
+d root users 0775 /var/run/mount.davfs none
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index c5692fea7f..3bb3d94de6 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -114,7 +114,6 @@ apply_cfgfile() {
   cat ${CFGFILE} | grep -v "^#" | \
   while read LINE; do
 
-    # This is a hell of a lot faster than using cut or awk 5 times
     eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
 
     [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
diff --git a/packages/initscripts/initscripts-1.0/volatiles b/packages/initscripts/initscripts-1.0/volatiles
index 2bc7d82fbd..4320485663 100644
--- a/packages/initscripts/initscripts-1.0/volatiles
+++ b/packages/initscripts/initscripts-1.0/volatiles
@@ -3,14 +3,14 @@
 #
 # Every line must either be a comment starting with #
 # or a definition of format:
-# <type> <owner> <group> <mode> <path> [<linksource>]
+# <type> <owner> <group> <mode> <path> <linksource>
 # where the items are separated by whitespace !
 #
 # <type> : d|f|l : (d)irectory|(f)ile|(l)ink
 #
 # A linking example:
 # l root root 0777 /var/test /tmp/testfile
-# f root root 0644 /var/test
+# f root root 0644 /var/test none
 #
 # Understanding links:
 # When populate-volatile is to verify/create a directory or file, it will first
diff --git a/packages/lame/lame/Makefile-lm.patch b/packages/lame/lame/Makefile-lm.patch
new file mode 100644
index 0000000000..cbbb1706ce
--- /dev/null
+++ b/packages/lame/lame/Makefile-lm.patch
@@ -0,0 +1,22 @@
+--- lame-3.96.1/libmp3lame/Makefile.am.old	2007-01-16 13:41:48.000000000 +0000
++++ lame-3.96.1/libmp3lame/Makefile.am	2007-01-16 13:41:53.000000000 +0000
+@@ -18,7 +18,7 @@
+ decoder_ldadd =
+ endif
+ 
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
+ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+ 			-no-undefined
+ 
+--- lame-3.96.1/libmp3lame/Makefile.in.old	2007-01-16 13:47:17.000000000 +0000
++++ lame-3.96.1/libmp3lame/Makefile.in	2007-01-16 13:47:29.000000000 +0000
+@@ -177,7 +177,7 @@
+ @LIB_WITH_DECODER_TRUE@decoder_ldadd = $(top_builddir)/mpglib/libmpgdecoder.la
+ @LIB_WITH_DECODER_FALSE@decoder_ldadd = 
+ 
+-libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd)
++libmp3lame_la_LIBADD = $(nasm_ldadd) $(decoder_ldadd) -lm
+ libmp3lame_la_LDFLAGS = -version-info @LIB_MAJOR_VERSION@:@LIB_MINOR_VERSION@ \
+ 			-no-undefined
+ 
diff --git a/packages/lame/lame_3.96.1.bb b/packages/lame/lame_3.96.1.bb
index edb4265f13..0c5c245829 100644
--- a/packages/lame/lame_3.96.1.bb
+++ b/packages/lame/lame_3.96.1.bb
@@ -1,10 +1,11 @@
 SECTION = "console/utils"
 DESCRIPTION = "Not an MP3 encoder"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lame/lame-${PV}.tar.gz \
-	file://no-gtk1.patch;patch=1"
+	file://no-gtk1.patch;patch=1 \
+	file://Makefile-lm.patch;patch=1"
 
 inherit autotools
 
diff --git a/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
new file mode 100644
index 0000000000..07d7a95ae1
--- /dev/null
+++ b/packages/libxfce4mcs/libxfce4mcs_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# libxfce4mcs OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/libxfce4util/libxfce4util_4.3.99.2.bb b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
new file mode 100644
index 0000000000..d1c29197d6
--- /dev/null
+++ b/packages/libxfce4util/libxfce4util_4.3.99.2.bb
@@ -0,0 +1,22 @@
+require ${PN}.inc
+
+SRC_URI += "\
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-depends.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-features.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-i18n.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-python.m4 \
+http://svn.xfce.org/svn/xfce/xfce4-dev-tools/trunk/m4macros/xdt-xfce.m4"
+
+
+MACROS="m4/xdt*.m4"
+
+XFCE_HEADERS="debug.h utf8.h xfce-generics.h   xfce-resource.h \
+              i18n.h util.h xfce-kiosk.h libxfce4util-config.h  \
+              xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \
+              xfce-fileutils.h xfce-rc.h xfce-utf8.h \
+              xfce-license.h xfce-i18n.h libxfce4util-enum-types.h"
+
+do_configure_prepend() {
+    install -m 0755 -d ${S}/m4/
+    install -m 0644 ${WORKDIR}/xdt-*.m4 ${S}/m4/
+}
diff --git a/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
new file mode 100644
index 0000000000..2def53685a
--- /dev/null
+++ b/packages/libxfcegui4/libxfcegui4_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# libxfcegui4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/networkmanager/files/99_networkmanager b/packages/networkmanager/files/99_networkmanager
index b3e7f94657..20cbcc1bca 100644
--- a/packages/networkmanager/files/99_networkmanager
+++ b/packages/networkmanager/files/99_networkmanager
@@ -1 +1 @@
-d root root 0700 /var/run/NetworkManager
+d root root 0700 /var/run/NetworkManager none
diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index 95e85002b0..e14230aadc 100644
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
 DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
 	file://dbus-api-fix.patch;patch=1 \
diff --git a/packages/openchrome/.mtn2git_empty b/packages/openchrome/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openchrome/.mtn2git_empty
diff --git a/packages/openchrome/configure.patch b/packages/openchrome/configure.patch
new file mode 100644
index 0000000000..a2f236470d
--- /dev/null
+++ b/packages/openchrome/configure.patch
@@ -0,0 +1,42 @@
+--- trunk/configure.ac	2007-01-16 16:58:44.000000000 +0000
++++ trunk/configure.ac	2007-01-16 18:09:26.000000000 +0000
+@@ -69,11 +69,11 @@
+ AC_HEADER_STDC
+ 
+ if test "$DRI" != no; then
+-        AC_CHECK_FILE([${sdkdir}/dri.h],
++        AC_CHECK_BUILD_FILE([${sdkdir}/dri.h],
+                       [have_dri_h="yes"], [have_dri_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/sarea.h],
++        AC_CHECK_BUILD_FILE([${sdkdir}/sarea.h],
+                       [have_sarea_h="yes"], [have_sarea_h="no"])
+-        AC_CHECK_FILE([${sdkdir}/dristruct.h],
++        AC_CHECK_BUILD_FILE([${sdkdir}/dristruct.h],
+                       [have_dristruct_h="yes"], [have_dristruct_h="no"])
+ fi
+ 
+@@ -113,7 +113,7 @@
+ 
+ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+ 
+-AC_CHECK_FILE([${sdkdir}/xf86Module.h],
++AC_CHECK_BUILD_FILE([${sdkdir}/xf86Module.h],
+               [have_xf86Module_h="yes"], [have_xf86Module_h="no"])
+ 
+ # Check the ABI_VIDEODRV_VERSION
+--- /dev/null	2003-09-15 14:40:47.000000000 +0100
++++ trunk/m4/check-build.m4	2007-01-16 18:07:37.000000000 +0000
+@@ -0,0 +1,13 @@
++# Check for the existence of FILE.
++AC_DEFUN([AC_CHECK_BUILD_FILE],
++[AS_VAR_PUSHDEF([ac_File], [ac_cv_file_$1])dnl
++AC_CACHE_CHECK([for $1], ac_File,
++[if test -r "$1"; then
++  AS_VAR_SET(ac_File, yes)
++else
++  AS_VAR_SET(ac_File, no)
++fi])
++AS_IF([test AS_VAR_GET(ac_File) = yes], [$2], [$3])[]dnl
++AS_VAR_POPDEF([ac_File])dnl
++])# AC_CHECK_BUILD_FILE
++
diff --git a/packages/openchrome/openchrome_svn.bb b/packages/openchrome/openchrome_svn.bb
new file mode 100644
index 0000000000..d5de8afce9
--- /dev/null
+++ b/packages/openchrome/openchrome_svn.bb
@@ -0,0 +1,20 @@
+SRC_URI = "svn://svn.openchrome.org/svn;module=trunk;proto=http \
+	file://configure.patch;patch=1"
+S = "${WORKDIR}/trunk"
+
+PACKAGES = "libviaXvMC libviaXvMCPro libviaXvMC-dev libviaXvMCPro-dev libviaXvMC-dbg libviaXvMCPro-dbg ${PN}-doc"
+
+FILES_libviaXvMC = "${libdir}/libviaXvMC.so.*"
+FILES_libviaXvMCPro = "${libdir}/libviaXvMCPro.so.*"
+FILES_libviaXvMC-dev = "${libdir}/libviaXvMC.so ${libdir}/libviaXvMC.la"
+FILES_libviaXvMCPro-dev = "${libdir}/libviaXvMCPro.so ${libdir}/libviaXvMCPro.la"
+FILES_libviaXvMC-dbg = "${libdir}/.debug/libviaXvMC.so.*"
+FILES_libviaXvMCPro-dbg = "${libdir}/.debug/libviaXvMCPro.so.*"
+
+DEPENDS = "xserver-xorg"
+
+inherit autotools xorg-module
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/postfix/files/internal_recipient b/packages/postfix/files/internal_recipient
new file mode 100644
index 0000000000..0d11944beb
--- /dev/null
+++ b/packages/postfix/files/internal_recipient
@@ -0,0 +1,2 @@
+root@   permit_mynetworks,reject
+
diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0
index 002f681217..1a6ddabbf3 100644
--- a/packages/postfix/files/main.cf_2.0
+++ b/packages/postfix/files/main.cf_2.0
@@ -2,6 +2,7 @@
 cat <<EOF
 # Configure your domain and accounts
 mydomain=sample.com
+mynetworks = 127.0.0.1/32 192.168.1.0/24
 
 virtual_mailbox_domains = sample.com, other.net
 virtual_mailbox_maps = hash:/etc/postfix/virtual
@@ -35,4 +36,66 @@ debug_peer_level = 2
 sendmail_path = /usr/sbin/sendmail
 newaliases_path = /usr/bin/newaliases
 mailq_path = /usr/bin/mailq
+
+smtpd_data_restrictions =
+        permit_mynetworks,
+        reject_unauth_pipelining,
+        permit
+
+smtpd_client_restrictions =
+        permit_mynetworks,
+        # reject_unknown_client, # This can cause a lot of false rejects.
+        reject_invalid_hostname,
+        reject_rbl_client list.dsbl.org,
+        reject_rbl_client sbl.spamhaus.org,
+        reject_rbl_client cbl.abuseat.org,
+        reject_rbl_client dul.dnsbl.sorbs.net,
+        permit
+
+smtpd_helo_required = yes
+smtpd_helo_restrictions =
+        permit_mynetworks,
+        reject_unauth_pipelining,
+        # reject_non_fqdn_hostname, # This can cause a lot of false rejects.
+        # reject_unknown_hostname, # This can cause a lot of false rejects.
+        reject_invalid_hostname,
+        permit
+
+smtpd_sender_restrictions =
+        permit_mynetworks,
+        reject_non_fqdn_sender,
+        # check_sender_access hash:/etc/postfix/access_domains,
+        reject_unknown_sender_domain,
+        permit
+
+smtpd_recipient_restrictions =
+        permit_mynetworks,
+        permit_sasl_authenticated,
+        reject_unauth_destination,
+
+        # check_recipient_access pcre:/etc/postfix/recipient_checks.pcre,
+        # check_helo_access pcre:/etc/postfix/helo_checks.pcre,
+
+        # check_client_access hash:/etc/postfix/maps/access_client,
+        # check_client_access hash:/etc/postfix/maps/exceptions_client,
+        # check_helo_access hash:/etc/postfix/maps/access_helo,
+        # check_helo_access hash:/etc/postfix/maps/verify_helo,
+        # check_sender_access hash:/etc/postfix/maps/access_sender,
+        # check_sender_access hash:/etc/postfix/maps/verify_sender,
+        # check_recipient_access hash:/etc/postfix/maps/access_recipient,
+
+        # reject_multi_recipient_bounce,
+        reject_non_fqdn_recipient,
+        reject_unknown_recipient_domain,
+        # reject_unlisted_recipient,
+        #check_policy_service unix:private/policy,
+
+        # check_sender_access hash:/etc/postfix/maps/no_verify_sender,
+        # check_sender_access hash:/etc/postfix/access_domains,
+        # reject_unverified_sender,
+        # reject_unverified_recipient
+        check_recipient_access hash:/etc/postfix/internal_recipient
+
+disable_vrfy_command = yes
+
 EOF
diff --git a/packages/postfix/files/volatiles b/packages/postfix/files/volatiles
index cb111cd4c0..bc330c99bd 100644
--- a/packages/postfix/files/volatiles
+++ b/packages/postfix/files/volatiles
@@ -1,15 +1,15 @@
-d postfix nogroup 2755 /var/spool/mail
-d root postfix 0755 /var/spool/postfix
-d postfix root 0700 /var/spool/postfix/active
-d postfix root 0700 /var/spool/postfix/bounce
-d postfix root 0700 /var/spool/postfix/corrupt
-d postfix root 0700 /var/spool/postfix/defer
-d postfix root 0700 /var/spool/postfix/deferred
-d postfix root 0700 /var/spool/postfix/flush
-d postfix root 0700 /var/spool/postfix/hold
-d postfix root 0700 /var/spool/postfix/incoming
-d postfix postdrop 0730 /var/spool/postfix/maildrop
-d root root 0755 /var/spool/postfix/pid
-d postfix root 0700 /var/spool/postfix/private
-d postfix postdrop 0710 /var/spool/postfix/public
-d root root 0755 /var/spool/vmail
+d postfix nogroup 2755 /var/spool/mail none
+d root postfix 0755 /var/spool/postfix none
+d postfix root 0700 /var/spool/postfix/active none
+d postfix root 0700 /var/spool/postfix/bounce none
+d postfix root 0700 /var/spool/postfix/corrupt none
+d postfix root 0700 /var/spool/postfix/defer none
+d postfix root 0700 /var/spool/postfix/deferred none
+d postfix root 0700 /var/spool/postfix/flush none
+d postfix root 0700 /var/spool/postfix/hold none
+d postfix root 0700 /var/spool/postfix/incoming none
+d postfix postdrop 0730 /var/spool/postfix/maildrop none
+d root root 0755 /var/spool/postfix/pid none
+d postfix root 0700 /var/spool/postfix/private none
+d postfix postdrop 0710 /var/spool/postfix/public none
+d root root 0755 /var/spool/vmail none
diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb
index 117fd2fc61..280f073333 100644
--- a/packages/postfix/postfix_2.0.20.bb
+++ b/packages/postfix/postfix_2.0.20.bb
@@ -1,7 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "virtual/db libpcre postfix-native"
 LICENSE = "IPL"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
 	   file://${FILESDIR}/makedefs.patch;patch=1 \
@@ -9,6 +9,7 @@ SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV
 	   file://main.cf_2.0 \
 	   file://volatiles \
 	   file://postfix \
+	   file://internal_recipient \
 	   "
 
 S = "${WORKDIR}/postfix-${PV}"
@@ -47,6 +48,7 @@ do_install () {
 	install -m 755 ${WORKDIR}/main.cf_2.0 ${D}${localstatedir}/tmp/main_cf.sh
         install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_postfix
         install -m 755 ${WORKDIR}/postfix ${D}${sysconfdir}/init.d/postfix
+        install -m 644 ${WORKDIR}/internal_recipient ${D}${sysconfdir}/postfix/internal_recipient
 	mv ${D}${sbindir}/sendmail ${D}${sbindir}/sendmail.${PN}
 }
 
diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf
index 287dbeba19..205b693fda 100644
--- a/packages/qmake/files/linux-oe-qmake.conf
+++ b/packages/qmake/files/linux-oe-qmake.conf
@@ -56,7 +56,8 @@ QMAKE_LIBS_X11		= $(OE_QMAKE_LIBS_X11)
 QMAKE_LIBS_X11SM	= 
 QMAKE_LIBS_QT		= -l$(OE_QMAKE_LIBS_QT)
 QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
-QMAKE_LIBS_QT_OPENGL	= -lqgl
+QMAKE_LIBS_OPENGL	= $(OE_QMAKE_LIBS_OPENGL)
+QMAKE_LIBS_OPENGL_QT	= $(OE_QMAKE_LIBS_OPENGL_QT)
 QMAKE_LIBS_THREAD       = -lpthread
 
 QMAKE_MOC		= $(OE_QMAKE_MOC)
diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index a5c164c08a..29f736dea1 100644
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r3"
+PR = "r4"
 
 QTEVER = "qt-embedded-free-3.3.5"
 
diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 2dcabe3261..306891e9af 100644
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.1.1"
 
diff --git a/packages/qt/qt-x11-free/configure.patch b/packages/qt/qt-x11-free/configure.patch
index a56c621abb..9d6c1e8ef7 100644
--- a/packages/qt/qt-x11-free/configure.patch
+++ b/packages/qt/qt-x11-free/configure.patch
@@ -5,15 +5,6 @@
 
 --- qt-x11-free-3.3.2/configure~configure.patch
 +++ qt-x11-free-3.3.2/configure
-@@ -219,7 +219,7 @@
- # licensed modules depend on type of commercial license
- MODULES="styles tools kernel widgets dialogs iconview workspace"
- [ "$PLATFORM_QWS" = "yes" ] && [ "$Products" = "qt-professional" ] && MODULES="$MODULES network"
--[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml opengl sql"
-+[ "$Products" != "qt-professional" ] && MODULES="$MODULES network canvas table xml sql"
- CFG_MODULES_AVAILABLE=$MODULES
- QMAKE_VARS="$QMAKE_VARS \"QT_PRODUCT=$Products\""
- QMAKE_VARS="$QMAKE_VARS \"styles += windows motif mac platinum sgi cde motifplus\""
 @@ -1754,21 +1754,14 @@
  	    CFG_FREETYPE=yes
  	fi
diff --git a/packages/qt/qt-x11-free_3.3.6.bb b/packages/qt/qt-x11-free_3.3.6.bb
index 5a1c014e6d..51228b4d30 100644
--- a/packages/qt/qt-x11-free_3.3.6.bb
+++ b/packages/qt/qt-x11-free_3.3.6.bb
@@ -3,9 +3,9 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE = "GPL QPL"
 HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql"
+DEPENDS = "uicmoc3-native freetype virtual/libx11 xft libxext libxrender libxrandr libxcursor mysql mesa"
 PROVIDES = "qt3x11"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
 	   file://configure.patch;patch=1 \
diff --git a/packages/uim/uim-native_1.2.1.bb b/packages/uim/uim-native_1.3.1.bb
index 5249ac6394..5249ac6394 100644
--- a/packages/uim/uim-native_1.2.1.bb
+++ b/packages/uim/uim-native_1.3.1.bb
diff --git a/packages/uim/uim_1.2.1.bb b/packages/uim/uim_1.3.1.bb
index 5d82945df7..5d82945df7 100644
--- a/packages/uim/uim_1.2.1.bb
+++ b/packages/uim/uim_1.3.1.bb
diff --git a/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
new file mode 100644
index 0000000000..de5cf2b012
--- /dev/null
+++ b/packages/xfce-mcs-manager/xfce-mcs-manager_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce-mcs-manager OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
new file mode 100644
index 0000000000..02ad97e860
--- /dev/null
+++ b/packages/xfce-mcs-plugins/xfce-mcs-plugins_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce-mcs-plugins OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce-utils/xfce-utils_4.3.99.2.bb b/packages/xfce-utils/xfce-utils_4.3.99.2.bb
new file mode 100644
index 0000000000..57909f2c2d
--- /dev/null
+++ b/packages/xfce-utils/xfce-utils_4.3.99.2.bb
@@ -0,0 +1,6 @@
+# xfce-utils OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR = "r1"
+require ${PN}.inc
diff --git a/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
new file mode 100644
index 0000000000..f7c97970d5
--- /dev/null
+++ b/packages/xfce4-goodies/xfce4-appfinder_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce4-appfinder build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
new file mode 100644
index 0000000000..6dd3c0565b
--- /dev/null
+++ b/packages/xfce4-goodies/xfce4-mixer_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xfce-mixer-plugin OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
new file mode 100644
index 0000000000..18dce6fa3c
--- /dev/null
+++ b/packages/xfce4-panel/xfce4-panel_4.3.99.2.bb
@@ -0,0 +1,6 @@
+# xfce4-panel OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR="r1"
+require ${PN}.inc
diff --git a/packages/xfdesktop/xfdesktop_4.3.99.2.bb b/packages/xfdesktop/xfdesktop_4.3.99.2.bb
new file mode 100644
index 0000000000..d7af836791
--- /dev/null
+++ b/packages/xfdesktop/xfdesktop_4.3.99.2.bb
@@ -0,0 +1,6 @@
+# xfdesktop OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR = "r1"
+require ${PN}.inc
diff --git a/packages/xffm/xffm_4.3.99.2.bb b/packages/xffm/xffm_4.3.99.2.bb
new file mode 100644
index 0000000000..c098e1c96b
--- /dev/null
+++ b/packages/xffm/xffm_4.3.99.2.bb
@@ -0,0 +1,5 @@
+# xffm OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+require ${PN}.inc
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index e6c81841b7..2b174d3d7f 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -12,7 +12,7 @@ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
 xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \
 resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
 libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
-libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
+libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native"
 
 RDEPENDS="rgb"
 
diff --git a/packages/zudoku/zudoku_1.1.bb b/packages/zudoku/zudoku_1.1.bb
index 46c64ebb6e..e9eb09741a 100644
--- a/packages/zudoku/zudoku_1.1.bb
+++ b/packages/zudoku/zudoku_1.1.bb
@@ -5,6 +5,7 @@ LICENSE = "GPL"
 SECTION = "opie/games"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}"
+PR = "r1"
 
 SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
            file://zudoku.html \
@@ -13,6 +14,7 @@ SRC_URI = "http://www.vanille.de/mirror/zudoku-${PV}.tar.gz \
 inherit opie
 
 EXTRA_QMAKEVARS_POST += "TARGET=zudoku"
+LDFLAGS += "-lstdc++"
 
 do_install() {
 	install -d ${D}${palmtopdir}/help/en/html