Merge remote branch 'origin/master' into next/image_cleanupsnext/image_cleanups

185 files changed, 1164 insertions, 1804 deletions

diff --git a/bin/ptxdist b/bin/ptxdist
index 7a2d73858..7f02a9a0a 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -354,11 +354,27 @@ _check_config_collection() {
 # check_config()
 #
 check_config() {
-	[ -n "${PTX_SLEDGEHAMMER}" ] && return
-
-	_check_config_ptx &&
-	_check_config_platform &&
-	_check_config_collection
+	if [ -z "${PTX_SLEDGEHAMMER}" ]; then
+		_check_config_ptx &&
+		_check_config_platform &&
+		_check_config_collection
+	fi &&
+	if [ ! -e "${PTXDIST_PLATFORMDIR}/selected_ptxconfig" -o -L "${PTXDIST_PLATFORMDIR}/selected_ptxconfig" ]; then
+		local ptxconfig="$(readlink -f "${PTXDIST_PTXCONFIG}")"
+		rm -f "${PTXDIST_PLATFORMDIR}/selected_ptxconfig" &&
+		ln -s "${ptxconfig}" "${PTXDIST_PLATFORMDIR}/selected_ptxconfig"
+	fi &&
+	if [ ! -e "${PTXDIST_PLATFORMDIR}/selected_platformconfig" -o -L "${PTXDIST_PLATFORMDIR}/selected_platformconfig" ]; then
+		local platformconfig="$(readlink -f "${PTXDIST_PLATFORMCONFIG}")"
+		rm -f "${PTXDIST_PLATFORMDIR}/selected_platformconfig" &&
+		ln -s "${platformconfig}" "${PTXDIST_PLATFORMDIR}/selected_platformconfig"
+	fi &&
+	if [ -e "${PTXDIST_COLLECTIONCONFIG}" -a \( ! -e "${PTXDIST_PLATFORMDIR}/selected_collectionconfig" -o \
+		-L "${PTXDIST_PLATFORMDIR}/selected_collectionconfig" \) ]; then
+		local collectionconfig="$(readlink -f "${PTXDIST_COLLECTIONCONFIG}")"
+		rm -f "${PTXDIST_PLATFORMDIR}/selected_collectionconfig" &&
+		ln -s "${collectionconfig}" "${PTXDIST_PLATFORMDIR}/selected_collectionconfig"
+	fi
 }
 
 
@@ -627,6 +643,9 @@ check_compiler() {
 				ptxd_bailout "unable to create ccache link"
 		done
 	fi
+	local toolchain="$(readlink -f "${PTXDIST_TOOLCHAIN}")"
+	rm -f "${PTXDIST_PLATFORMDIR}/selected_toolchain" &&
+	ln -s "${toolchain}" "${PTXDIST_PLATFORMDIR}/selected_toolchain"
 }
 
 
@@ -1321,6 +1340,10 @@ parse_first()
 		-q|--quiet)
 			PTXDIST_QUIET=1
 			;;
+		--git)
+			# overwrite default from ptxdistrc
+			export PTXCONF_SETUP_PATCHIN_GIT=y
+			;;
 		--)
 			while [ ${#} -ne 0 ]; do
 				arg="${1}"
@@ -1928,14 +1951,7 @@ EOF
 			exit
 			;;
 
-		newpackage|newpacket)
-			if [ "${cmd}" = "newpacket" ]; then
-				echo "${PTXDIST_LOG_PROMPT}There is no subcommand 'newpacket'. I guess you mean"
-				echo "${PTXDIST_LOG_PROMPT}'newpackage' and run it for you.  This service stopps"
-				echo "${PTXDIST_LOG_PROMPT}being provided for free soon. So please use"
-				echo "${PTXDIST_LOG_PROMPT}'newpackage' directly."
-			fi
-
+		newpackage)
 			if [ \! -d "rules" -a "${1}" != "help" ]; then
 				echo
 				echo "${PTXDIST_LOG_PROMPT}error: no rules/ directory found"
diff --git a/generic/etc/init.d/alsa-utils b/generic/etc/init.d/alsa-utils
index 452684f99..cacd5fa81 100644
--- a/generic/etc/init.d/alsa-utils
+++ b/generic/etc/init.d/alsa-utils
@@ -6,6 +6,10 @@
 case "$1" in
 
 	start|restart|force-reload)
+		if [ ! -d /dev/snd ]; then
+			echo "sound not supported, skipping mixer state"
+			exit 0
+		fi
 		echo -n "restoring mixer state..."
 		if [ -f /etc/asound.state ]; then
 			/usr/sbin/alsactl restore -f /etc/asound.state
diff --git a/generic/etc/init.d/dropbear b/generic/etc/init.d/dropbear
index 31025a655..45f88024b 100644
--- a/generic/etc/init.d/dropbear
+++ b/generic/etc/init.d/dropbear
@@ -11,8 +11,8 @@ DROPBEAR_EXTRA_ARGS=
 
 # test ! -h /var/service/dropbear || exit 0
 
-DROPBEAR_RSAKEY_DEFAULT="/etc/dropbear/dropbear_rsa_host_key"
-DROPBEAR_DSSKEY_DEFAULT="/etc/dropbear/dropbear_dss_host_key"
+DROPBEAR_RSAKEY_DEFAULT="@KEYDIR@/dropbear_rsa_host_key"
+DROPBEAR_DSSKEY_DEFAULT="@KEYDIR@/dropbear_dss_host_key"
 
 test -z "$DROPBEAR_BANNER" || \
   DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
diff --git a/generic/etc/init.d/fake-overlayfs b/generic/etc/init.d/fake-overlayfs
index b6cf8c000..a09ca063c 100644
--- a/generic/etc/init.d/fake-overlayfs
+++ b/generic/etc/init.d/fake-overlayfs
@@ -10,7 +10,7 @@ bdir=/tmp/.fake-overlay-root
 
 fake_overlay() {
 	mkdir $bdir
-	mount -o bind / $bdir
+	mount -o bind,ro / $bdir
 	IFS=:
 	set $OVERLAY_DIRS
 	while [ $# -gt 0 ]; do
@@ -26,6 +26,7 @@ fake_overlay() {
 		shift
 	done
 	umount $bdir
+	rmdir $bdir
 }
 
 #
diff --git a/generic/etc/rc.once.d/dropbear b/generic/etc/rc.once.d/dropbear
index d5d1843e6..121fa1366 100644
--- a/generic/etc/rc.once.d/dropbear
+++ b/generic/etc/rc.once.d/dropbear
@@ -2,8 +2,8 @@
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-DROPBEAR_RSAKEY_DEFAULT="/etc/dropbear/dropbear_rsa_host_key"
-DROPBEAR_DSSKEY_DEFAULT="/etc/dropbear/dropbear_dss_host_key"
+DROPBEAR_RSAKEY_DEFAULT="@KEYDIR@/dropbear_rsa_host_key"
+DROPBEAR_DSSKEY_DEFAULT="@KEYDIR@/dropbear_dss_host_key"
 
 test -n "$DROPBEAR_RSAKEY" || \
   DROPBEAR_RSAKEY=$DROPBEAR_RSAKEY_DEFAULT
diff --git a/patches/DeviceKit-disks-009/disable-docs.diff b/patches/DeviceKit-disks-009/disable-docs.diff
deleted file mode 100644
index 7991ab456..000000000
--- a/patches/DeviceKit-disks-009/disable-docs.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: disables docs
-
-we don't need docs and GTK_DOC_CHECK needs gtk during autoreconf.
-This patch removes this to avoid the dependency.
-
-Not for upstream.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- Makefile.am  |    2 +-
- configure.ac |    6 ------
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -34,8 +34,6 @@ AC_PATH_PROG([XSLTPROC], [xsltproc])
- fi
- AM_CONDITIONAL(MAN_PAGES_ENABLED, test x$enable_man_pages = xyes)
- 
--GTK_DOC_CHECK([1.3])
--
- #### gcc warning flags
- 
- if test "x$GCC" = "xyes"; then
-@@ -199,10 +197,6 @@ data/Makefile
- data/DeviceKit-disks.pc
- src/Makefile
- tools/Makefile
--doc/Makefile
--doc/version.xml
--doc/man/Makefile
--doc/dbus/Makefile
- policy/Makefile
- po/Makefile.in
- ])
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS = data src doc tools policy po
-+SUBDIRS = data src tools policy po
- 
- # Creating ChangeLog from git log (taken from cairo/Makefile.am):
- ChangeLog: $(srcdir)/ChangeLog
diff --git a/patches/DeviceKit-disks-009/series b/patches/DeviceKit-disks-009/series
index 49911c6ff..e490966aa 100644
--- a/patches/DeviceKit-disks-009/series
+++ b/patches/DeviceKit-disks-009/series
@@ -1,5 +1,4 @@
 libsgutils-optional.diff
-disable-docs.diff
 libparted-optional.diff
 devmapper-optional.diff
 smart-optional.diff
diff --git a/patches/MesaLib-7.6.1/add-mklib-option.diff b/patches/MesaLib-7.6.1/add-mklib-option.diff
deleted file mode 100644
index f6651eedf..000000000
--- a/patches/MesaLib-7.6.1/add-mklib-option.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-Subject: add -linker-prefix option to mklib
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-On Linux mklib uses gcc or g++ (for C++) as linker. This breaks when
-cross-compiling. The "-linker" option cannot be used, because it cannot be
-used to specify a differen linker for C and C++.
-This patch adds an extra option to add a prefix for the linker command.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- bin/mklib |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-Index: b/bin/mklib
-===================================================================
---- a/bin/mklib
-+++ b/bin/mklib
-@@ -34,6 +34,7 @@ MINOR=0
- PATCH=""
- DEPS=""
- LINK=""
-+LINK_PREFIX=""
- LDFLAGS=""
- CPLUSPLUS=0
- STATIC=0
-@@ -99,6 +100,10 @@ do
- 	    shift 1;
- 	    LINK=$1
- 	    ;;
-+	'-linker-prefix')
-+	    shift 1;
-+	    LINK_PREFIX=$1
-+	    ;;
- 	'-ldflags')
- 	    shift 1;
- 	    LDFLAGS=$1
-@@ -234,9 +239,9 @@ case $ARCH in
- 	if [ "x$LINK" = "x" ] ; then
- 	    # -linker was not specified so set default link command now
-             if [ $CPLUSPLUS = 1 ] ; then
--                LINK=g++
-+                LINK=${LINK_PREFIX}g++
-             else
--                LINK=gcc
-+                LINK=${LINK_PREFIX}gcc
-             fi
- 	fi
- 
-@@ -271,7 +276,7 @@ case $ARCH in
-         elif [ $STATIC = 1 ] ; then
-             LIBNAME="lib${LIBNAME}.a"     # prefix with "lib", suffix with ".a"
-             echo "mklib: Making" $ARCH "static library: " ${LIBNAME}
--            LINK="ar"
-+            LINK="${LINK_PREFIX}ar"
-             OPTS="-ru"
-             if [ "${ALTOPTS}" ] ; then
-                 OPTS=${ALTOPTS}
diff --git a/patches/MesaLib-7.6.1/fix-mklib-cmdline.diff b/patches/MesaLib-7.6.1/fix-mklib-cmdline.diff
deleted file mode 100644
index bb056e6ea..000000000
--- a/patches/MesaLib-7.6.1/fix-mklib-cmdline.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Subject: fix mklib command line
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-
-during configure the environment variable MKLIB_OPTIONS can be used to
-specify extra options for mklib. This variable is not used everywhere.
-This patch fixes this.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- src/gallium/winsys/drm/Makefile.template |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: b/src/gallium/winsys/drm/Makefile.template
-===================================================================
---- a/src/gallium/winsys/drm/Makefile.template
-+++ b/src/gallium/winsys/drm/Makefile.template
-@@ -82,7 +82,7 @@ SHARED_INCLUDES = \
- default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
- 
- $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
--	$(MKLIB) -noprefix -o $@ \
-+	$(MKLIB) -noprefix -o $@ $(MKLIB_OPTIONS) \
- 		$(OBJECTS) $(PIPE_DRIVERS) \
-                 -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
-                  $(WINOBJ) $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
diff --git a/patches/MesaLib-7.6.1/series b/patches/MesaLib-7.6.1/series
deleted file mode 100644
index dc9f03838..000000000
--- a/patches/MesaLib-7.6.1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-configure.ac.diff
-fix-mklib-cmdline.diff
-add-mklib-option.diff
diff --git a/patches/MesaLib-7.6.1/configure.ac.diff b/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch
index 6ffec837e..4a7e170c9 100644
--- a/patches/MesaLib-7.6.1/configure.ac.diff
+++ b/patches/MesaLib-7.8.2/0001-remove-crosscompile-check.patch
@@ -1,5 +1,6 @@
-Subject: remove crosscompile check
 From: Erwin Rol <erwin@erwinrol.com>
+Date: Wed, 7 Jul 2010 10:57:40 +0200
+Subject: [PATCH] remove crosscompile check
 
 When cross compiling it refuses to use assembly since it assumes it can
 not use the gen_matypes tool. But we fixed the gen_matypes so now the
@@ -7,19 +8,15 @@ test is not needed anymore.
 
 Signed-off-by: Erwin Rol <erwin@erwinrol.com>
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-
 ---
-v1: written by Erwin Rol
-v2: ported to Mesa-7.5 by Marc Kleine-Budde
-
  configure.ac |   16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ 1 files changed, 8 insertions(+), 8 deletions(-)
 
-Index: Mesa-7.5/configure.ac
-===================================================================
---- Mesa-7.5.orig/configure.ac
-+++ Mesa-7.5/configure.ac
-@@ -269,14 +269,14 @@ GLAPI_ASM_SOURCES=""
+diff --git a/configure.ac b/configure.ac
+index e711634..e8f32eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -317,14 +317,14 @@ GLAPI_ASM_SOURCES=""
  AC_MSG_CHECKING([whether to enable assembly])
  test "x$enable_asm" = xno && AC_MSG_RESULT([no])
  # disable if cross compiling on x86/x86_64 since we must run gen_matypes
@@ -42,3 +39,6 @@ Index: Mesa-7.5/configure.ac
  # check for supported arches
  if test "x$enable_asm" = xyes; then
      case "$host_cpu" in
+-- 
+1.7.1
+
diff --git a/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch b/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch
new file mode 100644
index 000000000..fc6ae0902
--- /dev/null
+++ b/patches/MesaLib-7.8.2/0002-add-linker-option-to-mklib-call.patch
@@ -0,0 +1,42 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 9 Jul 2010 13:35:14 +0200
+Subject: [PATCH] add linker option to mklib call
+
+When cross compiling, we have to handle the (cross-)linker to the mklib
+call.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/gallium/winsys/drm/i965/xorg/Makefile  |    2 +-
+ src/gallium/winsys/drm/intel/xorg/Makefile |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/winsys/drm/i965/xorg/Makefile b/src/gallium/winsys/drm/i965/xorg/Makefile
+index c25726b..3e00035 100644
+--- a/src/gallium/winsys/drm/i965/xorg/Makefile
++++ b/src/gallium/winsys/drm/i965/xorg/Makefile
+@@ -35,7 +35,7 @@ TARGET_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(TARGET)
+ all default: $(TARGET) $(TARGET_STAGING)
+ 
+ $(TARGET): $(OBJECTS) Makefile $(GALLIUMDIR)/state_trackers/xorg/libxorgtracker.a $(LIBS)
+-	$(TOP)/bin/mklib -noprefix -o $@ \
++	$(TOP)/bin/mklib -noprefix -linker '$(CC)' -o $@ \
+ 	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
+ 
+ $(TOP)/$(LIB_DIR)/gallium:
+diff --git a/src/gallium/winsys/drm/intel/xorg/Makefile b/src/gallium/winsys/drm/intel/xorg/Makefile
+index 14c2462..ad44715 100644
+--- a/src/gallium/winsys/drm/intel/xorg/Makefile
++++ b/src/gallium/winsys/drm/intel/xorg/Makefile
+@@ -34,7 +34,7 @@ DRIVER_DEFINES = \
+ all default: $(TARGET)
+ 
+ $(TARGET): $(OBJECTS) Makefile $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a $(LIBS)
+-	$(TOP)/bin/mklib -noprefix -o $@ \
++	$(TOP)/bin/mklib -noprefix -linker '$(CC)' -o $@ \
+ 	$(OBJECTS) $(LIBS) $(shell pkg-config --libs libdrm) -ldrm_intel
+ 
+ clean:
+-- 
+1.7.1
+
diff --git a/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch b/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch
new file mode 100644
index 000000000..8d9fbf323
--- /dev/null
+++ b/patches/MesaLib-7.8.2/0003-HACK-allow-compiling-host-tools-without-configure.patch
@@ -0,0 +1,94 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 7 Jul 2010 10:58:14 +0200
+Subject: [PATCH] HACK: allow compiling host tools without configure
+
+This patch modifies the Makefiles for the hosttools to allow
+compiling without configure. This way we can avoid
+unnecessary dependencies when only compiling host tools.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ src/glsl/Makefile      |    4 ++++
+ src/glsl/apps/Makefile |    8 ++++++++
+ src/glsl/cl/Makefile   |    4 ++++
+ src/glsl/pp/Makefile   |    4 ++++
+ 4 files changed, 20 insertions(+), 0 deletions(-)
+
+diff --git a/src/glsl/Makefile b/src/glsl/Makefile
+index ca7f2d2..69e980a 100644
+--- a/src/glsl/Makefile
++++ b/src/glsl/Makefile
+@@ -2,7 +2,11 @@
+ 
+ TOP = ../..
+ 
++ifeq ($(wildcard $(TOP)/configs/current),)
++include $(TOP)/configs/default
++else
+ include $(TOP)/configs/current
++endif
+ 
+ SUBDIRS = pp cl apps
+ 
+diff --git a/src/glsl/apps/Makefile b/src/glsl/apps/Makefile
+index 39a0df7..aba16f0 100644
+--- a/src/glsl/apps/Makefile
++++ b/src/glsl/apps/Makefile
+@@ -2,7 +2,11 @@
+ 
+ TOP = ../../..
+ 
++ifeq ($(wildcard $(TOP)/configs/current),)
++include $(TOP)/configs/default
++else
+ include $(TOP)/configs/current
++endif
+ 
+ LIBS = \
+ 	$(TOP)/src/glsl/pp/libglslpp.a \
+@@ -37,6 +41,10 @@ INCLUDES = -I.
+ default: $(APPS)
+ 
+ install:
++	@for app in $(APPS); do \
++		echo install -D -m 0755 $$app $(DESTDIR)/bin/mesa/$$app; \
++		install -D -m 0755 $$app $(DESTDIR)/bin/mesa/$$app; \
++	done
+ 
+ clean:
+ 	-rm -f $(APPS)
+diff --git a/src/glsl/cl/Makefile b/src/glsl/cl/Makefile
+index 04a52df..209dd7b 100644
+--- a/src/glsl/cl/Makefile
++++ b/src/glsl/cl/Makefile
+@@ -2,7 +2,11 @@
+ 
+ TOP = ../../..
+ 
++ifeq ($(wildcard $(TOP)/configs/current),)
++include $(TOP)/configs/default
++else
+ include $(TOP)/configs/current
++endif
+ 
+ LIBNAME = glslcl
+ 
+diff --git a/src/glsl/pp/Makefile b/src/glsl/pp/Makefile
+index fda1c42..d4ad55c 100644
+--- a/src/glsl/pp/Makefile
++++ b/src/glsl/pp/Makefile
+@@ -2,7 +2,11 @@
+ 
+ TOP = ../../..
+ 
++ifeq ($(wildcard $(TOP)/configs/current),)
++include $(TOP)/configs/default
++else
+ include $(TOP)/configs/current
++endif
+ 
+ LIBNAME = glslpp
+ 
+-- 
+1.7.1
+
diff --git a/patches/MesaLib-7.6.1/autogen.sh b/patches/MesaLib-7.8.2/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/MesaLib-7.6.1/autogen.sh
+++ b/patches/MesaLib-7.8.2/autogen.sh
diff --git a/patches/MesaLib-7.8.2/series b/patches/MesaLib-7.8.2/series
new file mode 100644
index 000000000..69ee29fbe
--- /dev/null
+++ b/patches/MesaLib-7.8.2/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+0001-remove-crosscompile-check.patch
+0002-add-linker-option-to-mklib-call.patch
+0003-HACK-allow-compiling-host-tools-without-configure.patch
+# 57f02633d9553fe7ee434b1e860f6099  - git-ptx-patches magic
diff --git a/patches/Python-2.6.4/0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch b/patches/Python-2.6.4/0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
new file mode 100644
index 000000000..e76430e5b
--- /dev/null
+++ b/patches/Python-2.6.4/0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
@@ -0,0 +1,27 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 14 Jul 2010 09:47:43 +0200
+Subject: [PATCH] assume non-buggy getaddrinfo when cross-compiling
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 89acf25..34dd048 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2909,8 +2909,8 @@ AC_MSG_RESULT(good)
+ buggygetaddrinfo=no,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+-AC_MSG_RESULT(buggy)
+-buggygetaddrinfo=yes)], [
++AC_MSG_RESULT(cross compiling: assume good)
++buggygetaddrinfo=no)], [
+ AC_MSG_RESULT(no)
+ buggygetaddrinfo=yes
+ ])
+-- 
+1.7.1
+
diff --git a/patches/Python-2.6.4/series b/patches/Python-2.6.4/series
index 4a0f9190d..1a7563d50 100644
--- a/patches/Python-2.6.4/series
+++ b/patches/Python-2.6.4/series
@@ -16,3 +16,4 @@
 0016-provide-wrapper-for-cross-python.patch
 0017-fix-for-new-autoconf.diff
 0018-dont-add-rpaths.diff
+0019-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
diff --git a/patches/Python-3.1.2/0020-assume-non-buggy-getaddrinfo-when-cross-compiling.patch b/patches/Python-3.1.2/0020-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
new file mode 100644
index 000000000..e76430e5b
--- /dev/null
+++ b/patches/Python-3.1.2/0020-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
@@ -0,0 +1,27 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 14 Jul 2010 09:47:43 +0200
+Subject: [PATCH] assume non-buggy getaddrinfo when cross-compiling
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 89acf25..34dd048 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2909,8 +2909,8 @@ AC_MSG_RESULT(good)
+ buggygetaddrinfo=no,
+ AC_MSG_RESULT(buggy)
+ buggygetaddrinfo=yes,
+-AC_MSG_RESULT(buggy)
+-buggygetaddrinfo=yes)], [
++AC_MSG_RESULT(cross compiling: assume good)
++buggygetaddrinfo=no)], [
+ AC_MSG_RESULT(no)
+ buggygetaddrinfo=yes
+ ])
+-- 
+1.7.1
+
diff --git a/patches/Python-3.1.2/series b/patches/Python-3.1.2/series
index 2b5f25e15..bb6ba56df 100644
--- a/patches/Python-3.1.2/series
+++ b/patches/Python-3.1.2/series
@@ -17,3 +17,4 @@
 0017-fix-for-new-autoconf.diff
 0018-dont-add-rpaths.diff
 0019-add-cache-for-sem-getvalue.diff
+0020-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
diff --git a/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch b/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch
new file mode 100644
index 000000000..6a3f7fc56
--- /dev/null
+++ b/patches/dbus-1.2.24/0003-make-dbus-1.pc-relocatable.patch
@@ -0,0 +1,51 @@
+From 0ceaf99bf18517bf76eb0cd4400a569daa0224ec Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 5 Jul 2010 17:04:38 +0200
+Subject: [PATCH 3/3] make dbus-1.pc relocatable
+
+Don't use expanded paths in dbus-1.pc.in
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.in |    3 +++
+ dbus-1.pc.in |    6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 486c612..fd744a0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1365,10 +1365,13 @@ AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_DATADIR", [Directory for installing DBUS
+ #### Directory to install dbus-daemon
+ if test -z "$with_dbus_daemondir" ; then
+     DBUS_DAEMONDIR=$EXPANDED_BINDIR
++    RELATIVE_DBUS_DAEMONDIR=$bindir
+ else
+     DBUS_DAEMONDIR=$with_dbus_daemondir
++    RELATIVE_DBUS_DAEMONDIR=$with_dbus_daemondir
+ fi
+ AC_SUBST(DBUS_DAEMONDIR)
++AC_SUBST(RELATIVE_DBUS_DAEMONDIR)
+ AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon])
+ 
+ #### Directory to install the other binaries
+diff --git a/dbus-1.pc.in b/dbus-1.pc.in
+index 866f81c..1cb1b8d 100644
+--- a/dbus-1.pc.in
++++ b/dbus-1.pc.in
+@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
+-sysconfdir=@EXPANDED_SYSCONFDIR@
+-session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services
+-daemondir=@DBUS_DAEMONDIR@
++sysconfdir=@sysconfdir@
++session_bus_services_dir=@datadir@/dbus-1/services
++daemondir=@RELATIVE_DBUS_DAEMONDIR@
+ 
+ Name: dbus
+ Description: Free desktop message bus
+-- 
+1.7.1
+
diff --git a/patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff b/patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff
deleted file mode 100644
index 1757b4ba6..000000000
--- a/patches/dbus-1.2.24/make-pkgconfig-file-relocatable.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: make dbus-1.pc relocatable
-
-Don't use expanded paths in dbus-1.pc.in
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- configure.in |    2 +-
- dbus-1.pc.in |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -1330,7 +1330,7 @@ AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_D
- 
- #### Directory to install dbus-daemon
- if test -z "$with_dbus_daemondir" ; then
--    DBUS_DAEMONDIR=$EXPANDED_BINDIR
-+    DBUS_DAEMONDIR=$bindir
- else
-     DBUS_DAEMONDIR=$with_dbus_daemondir
- fi
-Index: b/dbus-1.pc.in
-===================================================================
---- a/dbus-1.pc.in
-+++ b/dbus-1.pc.in
-@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
- libdir=@libdir@
- includedir=@includedir@
- system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@
--sysconfdir=@EXPANDED_SYSCONFDIR@
--session_bus_services_dir=@EXPANDED_DATADIR@/dbus-1/services
-+sysconfdir=@sysconfdir@
-+session_bus_services_dir=@datadir@/dbus-1/services
- daemondir=@DBUS_DAEMONDIR@
- 
- Name: dbus
diff --git a/patches/dbus-1.2.24/series b/patches/dbus-1.2.24/series
index b40f40483..9d94ee130 100644
--- a/patches/dbus-1.2.24/series
+++ b/patches/dbus-1.2.24/series
@@ -1,3 +1,3 @@
 0001-dbus-daemon-launch-helper-fix-build-with-libxml.patch
 0002-dbus-change-DBUS_MACHINE_UUID_FILE-path.patch
-make-pkgconfig-file-relocatable.diff
+0003-make-dbus-1.pc-relocatable.patch
diff --git a/patches/dconf-0.4.1/0001-make-dconf-editor-optional.patch b/patches/dconf-0.4.1/0001-make-dconf-editor-optional.patch
new file mode 100644
index 000000000..ae2cb6826
--- /dev/null
+++ b/patches/dconf-0.4.1/0001-make-dconf-editor-optional.patch
@@ -0,0 +1,50 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 8 Jul 2010 14:21:32 +0200
+Subject: [PATCH 1/2] make dconf editor optional
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.am  |    6 +++++-
+ configure.ac |   11 ++++++++---
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 2a56d9b..219d5a1 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,9 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = gvdb service gsettings tests client bin engine common docs editor
++SUBDIRS = gvdb service gsettings tests client bin engine common docs
++
++if ENABLE_EDITOR
++SUBDIRS += editor
++endif
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+diff --git a/configure.ac b/configure.ac
+index 5353483..2073946 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,9 +25,14 @@ GTK_DOC_CHECK([1.14])
+ 
+ # Dependencies
+ PKG_CHECK_MODULES(gio, gio-2.0 >= 2.25.10)
+-PKG_CHECK_MODULES(gtk, gtk+-2.0)
+-PKG_CHECK_MODULES(gee, gee-1.0)
+-PKG_CHECK_MODULES(libxml, libxml-2.0)
++
++AC_ARG_ENABLE(editor, [  --disable-editor Disable the dconf editor, [default=yes]],,[enable_editor=yes])
++if test "x$enable_editor" = "xyes"; then
++  PKG_CHECK_MODULES(gtk, gtk+-2.0)
++  PKG_CHECK_MODULES(gee, gee-1.0)
++  PKG_CHECK_MODULES(libxml, libxml-2.0)
++fi
++AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" = "xyes")
+ 
+ AC_ARG_WITH(gio_modules_dir, [  --with-gio-modules-dir=PATH choose directory for the GIO module, [default=LIBDIR/gio/modules]], giomodulesdir="$withval", giomodulesdir=${libdir}/gio/modules)
+ AC_SUBST(giomodulesdir)
+-- 
+1.7.1
+
diff --git a/patches/dconf-0.4.1/0002-fix-autotool-stuff.patch b/patches/dconf-0.4.1/0002-fix-autotool-stuff.patch
new file mode 100644
index 000000000..462b6a3af
--- /dev/null
+++ b/patches/dconf-0.4.1/0002-fix-autotool-stuff.patch
@@ -0,0 +1,121 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 8 Jul 2010 14:22:36 +0200
+Subject: [PATCH 2/2] fix autotool stuff
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure.ac        |    2 +-
+ m4/introspection.m4 |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 89 insertions(+), 1 deletions(-)
+ create mode 100644 m4/introspection.m4
+
+diff --git a/configure.ac b/configure.ac
+index 2073946..a639b2b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT([dconf],
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE([1.11 -Wno-portability])
++AM_INIT_AUTOMAKE([foreign])
+ AM_SILENT_RULES([yes])
+ 
+ # Check for programs
+diff --git a/m4/introspection.m4 b/m4/introspection.m4
+new file mode 100644
+index 0000000..bb3a0da
+--- /dev/null
++++ b/m4/introspection.m4
+@@ -0,0 +1,88 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++    dnl enable/disable introspection
++    m4_if([$2], [require],
++    [dnl
++        enable_introspection=yes
++    ],[dnl
++        AC_ARG_ENABLE(introspection,
++                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++                                 [Enable introspection for this build]),,
++                                 [enable_introspection=auto])
++    ])dnl
++
++    AC_MSG_CHECKING([for gobject-introspection])
++
++    dnl presence/version checking
++    AS_CASE([$enable_introspection],
++    [no], [dnl
++        found_introspection="no (disabled, use --enable-introspection to enable)"
++    ],dnl
++    [yes],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++                         found_introspection=yes,
++                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++    ],dnl
++    [auto],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++    ],dnl
++    [dnl
++        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++    ])dnl
++
++    AC_MSG_RESULT([$found_introspection])
++
++    INTROSPECTION_SCANNER=
++    INTROSPECTION_COMPILER=
++    INTROSPECTION_GENERATE=
++    INTROSPECTION_GIRDIR=
++    INTROSPECTION_TYPELIBDIR=
++    if test "x$found_introspection" = "xyes"; then
++       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++    fi
++    AC_SUBST(INTROSPECTION_SCANNER)
++    AC_SUBST(INTROSPECTION_COMPILER)
++    AC_SUBST(INTROSPECTION_GENERATE)
++    AC_SUBST(INTROSPECTION_GIRDIR)
++    AC_SUBST(INTROSPECTION_TYPELIBDIR)
++
++    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
+-- 
+1.7.1
+
diff --git a/patches/udev-150/autogen.sh b/patches/dconf-0.4.1/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/udev-150/autogen.sh
+++ b/patches/dconf-0.4.1/autogen.sh
diff --git a/patches/dconf-0.4.1/series b/patches/dconf-0.4.1/series
new file mode 100644
index 000000000..b2b0a4263
--- /dev/null
+++ b/patches/dconf-0.4.1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+0001-make-dconf-editor-optional.patch
+0002-fix-autotool-stuff.patch
+# fe99d5bbd2a34c41cef075c2805061c1  - git-ptx-patches magic
diff --git a/patches/glib-2.25.10/0001-HACK-don-t-drop-dependency-libs.patch b/patches/glib-2.25.10/0001-HACK-don-t-drop-dependency-libs.patch
new file mode 100644
index 000000000..353fa0c7a
--- /dev/null
+++ b/patches/glib-2.25.10/0001-HACK-don-t-drop-dependency-libs.patch
@@ -0,0 +1,35 @@
+From ec38987a4850b2bd613e45dd952faf9af72b8c20 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Tue, 6 Jul 2010 12:28:03 +0200
+Subject: [PATCH] HACK: don't drop dependency libs
+
+On Linux the configure script generates a libtool that will drop dependency
+libs when linking a library/program. This is done to avoid explicitly
+linking to implicit depencencies. This is usually the right thing to do.
+However it breaks if the implicit depencencies are not installed.
+
+This patch ensures that libtool will link to all dependency libs to avoid
+the problem.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 046d740..f8220a4 100755
+--- a/configure
++++ b/configure
+@@ -13920,9 +13920,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+   openbsd*)
+     with_gnu_ld=no
+     ;;
+-  linux* | k*bsd*-gnu)
+-    link_all_deplibs=no
+-    ;;
+   esac
+ 
+   ld_shlibs=yes
+-- 
+1.7.1
+
diff --git a/patches/glib-2.25.10/series b/patches/glib-2.25.10/series
new file mode 100644
index 000000000..645fbe819
--- /dev/null
+++ b/patches/glib-2.25.10/series
@@ -0,0 +1 @@
+0001-HACK-don-t-drop-dependency-libs.patch
diff --git a/patches/udev-150/0001-Use-utimensat-instead-of-utimes-and-lutimes.patch b/patches/udev-150/0001-Use-utimensat-instead-of-utimes-and-lutimes.patch
deleted file mode 100644
index 8c5ad23e2..000000000
--- a/patches/udev-150/0001-Use-utimensat-instead-of-utimes-and-lutimes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 0f76fd4a8f57c474c4fbac0d9d725ec135f4b0ac Mon Sep 17 00:00:00 2001
-From: Jon Ringle <jon@ringle.org>
-Date: Wed, 10 Mar 2010 10:15:20 -0500
-Subject: [PATCH] Use utimensat instead of utimes and lutimes
-
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- udev/udev-node.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/udev/udev-node.c b/udev/udev-node.c
-index c80a74c..f38a8f8 100644
---- a/udev/udev-node.c
-+++ b/udev/udev-node.c
-@@ -57,7 +57,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mod
- 			preserve = 1;
- 			udev_selinux_lsetfilecon(udev, file, mode);
- 			/* update time stamp when we re-use the node, like on media change events */
--			utimes(file, NULL);
-+			utimensat(AT_FDCWD, file, NULL, 0);
- 		} else {
- 			char file_tmp[UTIL_PATH_SIZE + sizeof(TMP_FILE_EXT)];
- 
-@@ -178,7 +178,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink)
- 					info(udev, "preserve already existing symlink '%s' to '%s'\n",
- 					     slink, target);
- 					udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
--					lutimes(slink, NULL);
-+					utimensat(AT_FDCWD, slink, NULL, AT_SYMLINK_NOFOLLOW);
- 					goto exit;
- 				}
- 			}
--- 
-1.7.0.2.182.ge007
-
diff --git a/patches/udev-150/udev-150-fix-ppc-build.diff b/patches/udev-150/udev-150-fix-ppc-build.diff
deleted file mode 100644
index 62804fdac..000000000
--- a/patches/udev-150/udev-150-fix-ppc-build.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add missing #include <linux/types.h>
-
-Without "#include <linux/types.h>" __u32 is undefined in linux/hiddev.h on PPC
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- extras/hid2hci/hid2hci.c |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: b/extras/hid2hci/hid2hci.c
-===================================================================
---- a/extras/hid2hci/hid2hci.c
-+++ b/extras/hid2hci/hid2hci.c
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <getopt.h>
- #include <sys/ioctl.h>
-+#include <linux/types.h>
- #include <linux/hiddev.h>
- #include <usb.h>
- 
diff --git a/patches/udev-150/udev-150-kernel-headers-dir.diff b/patches/udev-150/udev-150-kernel-headers-dir.diff
deleted file mode 100644
index 728882283..000000000
--- a/patches/udev-150/udev-150-kernel-headers-dir.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: add configure option for kernel header dir
-
-The keymap extra generates code based on linux/input.h. The header file
-used during code generation must be the the one used when compiling.
-By default /usr/include/linux/input.h is used for code generation.
-
-This patch adds a configure option to specify the directory containing the
-kernel headers.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
----
- Makefile.am  |    2 +-
- configure.ac |    5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -565,7 +565,7 @@ udevkeymapforcereldir = $(libexecdir)/ke
- dist_udevkeymapforcerel_DATA = \
- 	extras/keymap/keymaps/force-release/samsung-other
- 
--extras/keymap/keys.txt: /usr/include/linux/input.h
-+extras/keymap/keys.txt: $(KERNEL_HEADERS_DIR)/linux/input.h
- 	mkdir -p extras/keymap
- 	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
- 
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -75,6 +75,11 @@ AC_ARG_ENABLE([modem-modeswitch],
- 	[], [enable_modem_modeswitch=yes])
- AM_CONDITIONAL([ENABLE_MODEM_MODESWITCH], [test "x$enable_modem_modeswitch" = xyes])
- 
-+AC_ARG_WITH([kernel-headers-dir],
-+	AS_HELP_STRING([--with-kernel-headers-dir=DIR], [where to find the kernel headers]),
-+	[kernel_headers=${withval}], [kernel_headers=/usr/include])
-+AC_SUBST([KERNEL_HEADERS_DIR], [$kernel_headers])
-+
- if test "x$enable_keymap" = xyes; then
- 	AC_PATH_PROG([GPERF], [gperf])
- 	if test -z "$GPERF"; then
diff --git a/patches/xf86-video-ati-6.12.4/autogen.sh b/patches/udev-158/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/xf86-video-ati-6.12.4/autogen.sh
+++ b/patches/udev-158/autogen.sh
diff --git a/patches/udev-158/remove-SOCK_CLOEXEC.diff b/patches/udev-158/remove-SOCK_CLOEXEC.diff
new file mode 100644
index 000000000..d9cb3ef4e
--- /dev/null
+++ b/patches/udev-158/remove-SOCK_CLOEXEC.diff
@@ -0,0 +1,30 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: HACK: remove SOCK_CLOEXEC usage
+
+SOCK_CLOEXEC is not supported by OSELAS.Toolchain-1.99.3
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ udev/udevd.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: b/udev/udevd.c
+===================================================================
+--- a/udev/udevd.c
++++ b/udev/udevd.c
+@@ -979,10 +979,11 @@ static int init_notify(const char *state
+ 		goto finish;
+ 	}
+ 
+-	if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
++	if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
+ 		r = -errno;
+ 		goto finish;
+ 	}
++	util_set_fd_cloexec(fd);
+ 
+ 	memset(&sockaddr, 0, sizeof(sockaddr));
+ 	sockaddr.sa.sa_family = AF_UNIX;
diff --git a/patches/udev-150/series b/patches/udev-158/series
index fa53e88ff..cbfcdab6c 100644
--- a/patches/udev-150/series
+++ b/patches/udev-158/series
@@ -2,6 +2,4 @@ udev-150-split-extras.diff
 udev-150-revert-SOCK_CLOEXEC.diff
 udev-150-revert-bsg_h-removal.diff
 udev-150-remove-le16toh.diff
-udev-150-fix-ppc-build.diff
-udev-150-kernel-headers-dir.diff
-0001-Use-utimensat-instead-of-utimes-and-lutimes.patch
+remove-SOCK_CLOEXEC.diff
diff --git a/patches/udev-150/udev-150-remove-le16toh.diff b/patches/udev-158/udev-150-remove-le16toh.diff
index 7794bcf1b..7794bcf1b 100644
--- a/patches/udev-150/udev-150-remove-le16toh.diff
+++ b/patches/udev-158/udev-150-remove-le16toh.diff
diff --git a/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff b/patches/udev-158/udev-150-revert-SOCK_CLOEXEC.diff
index 417a0ee12..c3fa33c98 100644
--- a/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff
+++ b/patches/udev-158/udev-150-revert-SOCK_CLOEXEC.diff
@@ -48,9 +48,9 @@ index c2fff00..6738a9b 100644
  int udev_util_replace_chars(char *str, const char *white);
  int udev_util_encode_string(const char *str, char *str_enc, size_t len);
 +void util_set_fd_cloexec(int fd);
- unsigned int util_string_hash32(const char *str);
+ unsigned int util_string_hash32(const char *key);
+ uint64_t util_string_bloom64(const char *str);
  
- /* libudev-util-private.c */
 diff --git a/libudev/libudev-util.c b/libudev/libudev-util.c
 index c0209f9..9a656b5 100644
 --- a/libudev/libudev-util.c
diff --git a/patches/udev-150/udev-150-revert-bsg_h-removal.diff b/patches/udev-158/udev-150-revert-bsg_h-removal.diff
index f6e57a9d5..f6e57a9d5 100644
--- a/patches/udev-150/udev-150-revert-bsg_h-removal.diff
+++ b/patches/udev-158/udev-150-revert-bsg_h-removal.diff
diff --git a/patches/udev-150/udev-150-split-extras.diff b/patches/udev-158/udev-150-split-extras.diff
index abc162d21..28350f5f7 100644
--- a/patches/udev-150/udev-150-split-extras.diff
+++ b/patches/udev-158/udev-150-split-extras.diff
@@ -17,15 +17,15 @@ as configure options
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 
 ---
- Makefile.am  |   25 +++++++++++++++++----
- configure.ac |   69 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
- 2 files changed, 78 insertions(+), 16 deletions(-)
+ Makefile.am  |   25 +++++++++++++++++++++----
+ configure.ac |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 2 files changed, 71 insertions(+), 13 deletions(-)
 
 Index: b/Makefile.am
 ===================================================================
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -288,7 +288,8 @@ extras_v4l_id_v4l_id_LDADD = libudev/lib
+@@ -284,7 +284,8 @@ extras_v4l_id_v4l_id_LDADD = libudev/lib
  libexec_PROGRAMS += extras/v4l_id/v4l_id
  dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
  
@@ -35,7 +35,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # conditional extras (need glib, libusb, libacl, ...)
  # ------------------------------------------------------------------------------
-@@ -296,7 +297,12 @@ dist_udevrules_DATA += \
+@@ -292,7 +293,12 @@ dist_udevrules_DATA += \
  	rules/rules.d/75-net-description.rules \
  	rules/rules.d/75-tty-description.rules \
  	rules/rules.d/78-sound-card.rules
@@ -48,7 +48,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # GUdev - libudev gobject interface
  # ------------------------------------------------------------------------------
-@@ -334,7 +340,7 @@ dist_extras_gudev_libgudev_1_0_la_SOURCE
+@@ -330,7 +336,7 @@ dist_extras_gudev_libgudev_1_0_la_SOURCE
  	extras/gudev/gudevmarshal.c \
  	extras/gudev/gudevenumtypes.h \
  	extras/gudev/gudevenumtypes.c
@@ -57,7 +57,7 @@ Index: b/Makefile.am
  
  extras_gudev_libgudev_1_0_la_CPPFLAGS = \
  	$(AM_CPPFLAGS) \
-@@ -410,7 +416,9 @@ typelibs_DATA = extras/gudev/GUdev-1.0.t
+@@ -407,7 +413,9 @@ typelibs_DATA = extras/gudev/GUdev-1.0.t
  
  CLEANFILES += $(gir_DATA) $(typelibs_DATA)
  endif # ENABLE_INTROSPECTION
@@ -67,7 +67,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # Bluetooth HID devices with special magic to switch the device
  # ------------------------------------------------------------------------------
-@@ -419,7 +427,9 @@ extras_hid2hci_hid2hci_CPPFLAGS = $(AM_C
+@@ -416,7 +424,9 @@ extras_hid2hci_hid2hci_CPPFLAGS = $(AM_C
  extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
  dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
  libexec_PROGRAMS += extras/hid2hci/hid2hci
@@ -77,7 +77,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # udev_acl - apply ACLs for users with local forground sessions
  # ------------------------------------------------------------------------------
-@@ -434,7 +444,9 @@ udevacl-install-hook:
+@@ -431,7 +441,9 @@ udevacl-install-hook:
  	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
  
  INSTALL_EXEC_HOOKS += udevacl-install-hook
@@ -87,7 +87,7 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # usb-db - read USB vendor/device string database
  # ------------------------------------------------------------------------------
-@@ -442,7 +454,9 @@ extras_usb_db_usb_db_SOURCES = extras/us
+@@ -439,7 +451,9 @@ extras_usb_db_usb_db_SOURCES = extras/us
  extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
  extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
  libexec_PROGRAMS += extras/usb-db/usb-db
@@ -97,27 +97,27 @@ Index: b/Makefile.am
  # ------------------------------------------------------------------------------
  # pci-db - read PCI vendor/device string database
  # ------------------------------------------------------------------------------
-@@ -450,7 +464,9 @@ extras_usb_db_pci_db_SOURCES = extras/us
+@@ -447,7 +461,9 @@ extras_usb_db_pci_db_SOURCES = extras/us
  extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
  extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
  libexec_PROGRAMS += extras/usb-db/pci-db
 +endif # ENABLE_PCIDB
  
-+if ENABLE_MODEM_MODESWITCH
++if ENABLE_MOBILE_ACTION_MODESWITCH
  # ------------------------------------------------------------------------------
- # modem-modeswitch - magic config switch for 3G modems
+ # mobile-action-modeswitch - switch Mobile Action cables into serial mode
  # ------------------------------------------------------------------------------
-@@ -470,7 +486,9 @@ dist_udevrules_DATA += \
- 	extras/modem-modeswitch/61-mobile-action.rules
+@@ -464,7 +480,9 @@ dist_udevrules_DATA += \
+ 	extras/mobile-action-modeswitch/61-mobile-action.rules
  
- libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
-+endif # ENABLE_MODEM_MODESWITCH
+ libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
++endif # ENABLE_MOBILE_ACTION_MODESWITCH
  
 +if ENABLE_KEYMAP
  # ------------------------------------------------------------------------------
- # keymap - map custom hardware's multimedia keys
+ # mtd_probe - autoloads FTL module for mtd devices
  # ------------------------------------------------------------------------------
-@@ -562,8 +580,7 @@ extras/keymap/keys-to-name.h: extras/key
+@@ -574,8 +592,7 @@ extras/keymap/keys-to-name.h: extras/key
  keymaps-distcheck-hook: extras/keymap/keys.txt
  	$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
  DISTCHECK_HOOKS = keymaps-distcheck-hook
@@ -131,9 +131,9 @@ Index: b/configure.ac
 ===================================================================
 --- a/configure.ac
 +++ b/configure.ac
-@@ -46,32 +46,72 @@ if test "x$enable_logging" = "xyes"; the
- 	AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
- fi
+@@ -64,29 +64,68 @@ done
+ IFS=$OLD_IFS
+ AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
  
 -AC_ARG_ENABLE([extras],
 -	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
@@ -163,61 +163,54 @@ Index: b/configure.ac
 +	AS_HELP_STRING([--disable-pcidb], [disable pci-db - read PCI vendor/device string database]),
 +	[], [enable_pcidb=yes])
 +AM_CONDITIONAL([ENABLE_PCIDB], [test "x$enable_pcidb" = xyes])
-+AC_ARG_ENABLE([modem-modeswitch],
-+	AS_HELP_STRING([--disable-modem-modeswitch], [disable modem-modeswitch - magic config switch for 3G modems]),
-+	[], [enable_modem_modeswitch=yes])
-+AM_CONDITIONAL([ENABLE_MODEM_MODESWITCH], [test "x$enable_modem_modeswitch" = xyes])
++AC_ARG_ENABLE([mobile-action-modeswitch],
++	AS_HELP_STRING([--disable-mobile-action-modeswitch], [disable mobile-action-modeswitch - switch Mobile Action cables into serial mode]),
++	[], [enable_mobile_action_modeswitch=yes])
++AM_CONDITIONAL([ENABLE_MOBILE_ACTION_MODESWITCH], [test "x$enable_mobile_action_modeswitch" = xyes])
 +
 +if test "x$enable_keymap" = xyes; then
  	AC_PATH_PROG([GPERF], [gperf])
  	if test -z "$GPERF"; then
  		AC_MSG_ERROR([gperf is needed])
  	fi
-+fi
  
++	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
++	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
++fi
++
 +if test "x$enable_gudev" = xyes -o "x$enable_acl" = xyes; then
  	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
  	AC_SUBST([GLIB_CFLAGS])
  	AC_SUBST([GLIB_LIBS])
 +fi
  
--	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
--	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
--
-+if test "x$enable_bluetooth" = xyes -o "x$enable_modem_modeswitch" = xyes; then
++if test "x$enable_acl" = xyes; then
+ 	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
+ 	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
++fi
+ 
++if test "x$enable_bluetooth" = xyes -o "x$enable_mobile_action_modeswitch" = xyes; then
  	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
  	AC_SUBST(LIBUSB_CFLAGS)
  	AC_SUBST(LIBUSB_LIBS)
 +fi
  
-+if test "x$enable_acl" = xyes; then
-+	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
-+	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
-+fi
-+
 +if test "x$enable_usbdb" = xyes; then
  	PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
  	AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
-+else
-+	USB_DATABASE=no
 +fi
  
--	AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
--	AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
--	AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
 +if test "x$enable_pcidb" = xyes; then
-+	if test "x$cross_compiling" != xyes; then
-+		AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
-+		AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
-+		AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
-+	fi
- 	AC_ARG_WITH(pci-ids-path,
- 		AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
- 		[PCI_DATABASE=${withval}],
-@@ -81,8 +121,9 @@ if test "x$enable_extras" = xyes; then
- 			AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
- 		fi])
+ 	if test "x$cross_compiling" = "xno" ; then
+ 		AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
+ 		AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
+@@ -103,11 +142,9 @@ if test "x$enable_extras" = xyes; then
+ 	AC_MSG_CHECKING([for PCI database location])
+ 	AC_MSG_RESULT([$PCI_DATABASE])
  	AC_SUBST(PCI_DATABASE)
+-
+-	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
+-	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
 +else
 +	PCI_DATABASE=no
  fi
@@ -225,7 +218,7 @@ Index: b/configure.ac
  
  AC_ARG_ENABLE([introspection],
  	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
-@@ -134,7 +175,11 @@ AC_MSG_RESULT([
+@@ -161,7 +198,11 @@ AC_MSG_RESULT([
  	cflags:			${CFLAGS}
  	ldflags:		${LDFLAGS}
  
@@ -234,7 +227,7 @@ Index: b/configure.ac
 +	bluetooth:		${enable_bluetooth}
 +	keymap:			${enable_keymap}
 +	acl:			${enable_acl}
-+	modem-modeswitch:	${enable_modem_modeswitch}
++	mobile-action-modeswitch:	${enable_mobile_action_modeswitch}
  	gintrospection:		${enable_introspection}
  
  	usb.ids:		${USB_DATABASE}
diff --git a/patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff b/patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff
deleted file mode 100644
index 07f139271..000000000
--- a/patches/xf86-video-ati-6.12.4/fix-cross-compiling.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-commit 97a4e747bfac14f34646c55ddf639e8fe22f2f55
-Author: Michael Olbrich <m.olbrich@pengutronix.de>
-Date:   Sun Sep 20 14:19:41 2009 +0200
-
-    use AC_CHECK_HEADER instead of AC_CHECK_FILE
-    
-    AC_CHECK_FILE is not possible when cross-compiling. Use AC_CHECK_HEADER /
-    AC_PREPROC_IFELSE instead.
-    
-    [ Michel Dänzer: Shuffled things around slightly to make it work on my setup ]
-    
-    Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-    Signed-off-by: Michel Dänzer <daenzer@vmware.com>
-
-diff --git a/configure.ac b/configure.ac
-index 9d769ea..162c839 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,14 +102,21 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- AC_HEADER_STDC
- 
- if test "$DRI" != no; then
--	AC_CHECK_FILE([${sdkdir}/dri.h],
--                      [have_dri_h="yes"], [have_dri_h="no"])
--	AC_CHECK_FILE([${sdkdir}/sarea.h],
--                      [have_sarea_h="yes"], [have_sarea_h="no"])
--	AC_CHECK_FILE([${sdkdir}/dristruct.h],
--                      [have_dristruct_h="yes"], [have_dristruct_h="no"])
--	AC_CHECK_FILE([${sdkdir}/damage.h],
--                      [have_damage_h="yes"], [have_damage_h="no"])
-+	PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
-+	save_CPPFLAGS="$CPPFLAGS"
-+	CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS"
-+	AC_CHECK_HEADER([dri.h],
-+                      [have_dri_h="yes"], [have_dri_h="no"],[-])
-+	AC_CHECK_HEADER([sarea.h],
-+                      [have_sarea_h="yes"], [have_sarea_h="no"],[-])
-+	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-+#include <xorg-server.h>
-+#include <dristruct.h>
-+                      ]])],
-+                      [have_dristruct_h="yes"], [have_dristruct_h="no"],[-])
-+	AC_CHECK_HEADER([damage.h],
-+                      [have_damage_h="yes"], [have_damage_h="no"],[-])
-+	CPPFLAGS="$save_CPPFLAGS"
- fi
- 
- AC_MSG_CHECKING([whether to include DRI support])
-@@ -126,7 +133,6 @@ AC_MSG_RESULT([$DRI])
- 
- AM_CONDITIONAL(DRI, test x$DRI = xyes)
- if test "$DRI" = yes; then
--	PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
-         AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
-         AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
- 	if test "$have_damage_h" = yes; then
diff --git a/patches/xf86-video-ati-6.12.4/series b/patches/xf86-video-ati-6.12.4/series
deleted file mode 100644
index e247c86cc..000000000
--- a/patches/xf86-video-ati-6.12.4/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-cross-compiling.diff
diff --git a/patches/xf86-video-dummy-0.3.3/autogen.sh b/patches/xf86-video-dummy-0.3.3/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/xf86-video-dummy-0.3.3/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/xf86-video-dummy-0.3.3/series b/patches/xf86-video-dummy-0.3.3/series
deleted file mode 100644
index cc4e4c5bc..000000000
--- a/patches/xf86-video-dummy-0.3.3/series
+++ /dev/null
@@ -1 +0,0 @@
-xf86-video-dummy-0.3.2-fix-includes.diff
diff --git a/patches/xf86-video-dummy-0.3.3/xf86-video-dummy-0.3.2-fix-includes.diff b/patches/xf86-video-dummy-0.3.3/xf86-video-dummy-0.3.2-fix-includes.diff
deleted file mode 100644
index f370a448f..000000000
--- a/patches/xf86-video-dummy-0.3.3/xf86-video-dummy-0.3.2-fix-includes.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: remove wrong include path.
-
-Don't use $(prefix)/include as include path. It can break things
-when cross-compiling with DESTDIR and prefix=/usr
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
-# 20091215 mol: this patch is already upstream: 86a7baa4156dc9569b7dde51b3042b7fd8093821
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xf86-video-dummy-0.3.2/configure.ac
-===================================================================
---- xf86-video-dummy-0.3.2.orig/configure.ac
-+++ xf86-video-dummy-0.3.2/configure.ac
-@@ -58,7 +58,7 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
--INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
-+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src'
- AC_SUBST([CFLAGS])
- AC_SUBST([INCLUDES])
- 
diff --git a/patches/xf86-video-fbdev-0.4.1/ignore-timing-option.diff b/patches/xf86-video-fbdev-0.4.2/ignore-timing-option.diff
index 05bd2c83e..05bd2c83e 100644
--- a/patches/xf86-video-fbdev-0.4.1/ignore-timing-option.diff
+++ b/patches/xf86-video-fbdev-0.4.2/ignore-timing-option.diff
diff --git a/patches/xf86-video-fbdev-0.4.1/series b/patches/xf86-video-fbdev-0.4.2/series
index 243b43acb..243b43acb 100644
--- a/patches/xf86-video-fbdev-0.4.1/series
+++ b/patches/xf86-video-fbdev-0.4.2/series
diff --git a/patches/xorg-server-1.7.5/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff b/patches/xorg-server-1.7.5/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
deleted file mode 100644
index 38d8d8dfd..000000000
--- a/patches/xorg-server-1.7.5/11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4ae407a5a308febf63de27a62f8c301c73b37d3e Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Tue, 6 Oct 2009 17:44:33 +0200
-Subject: [PATCH 1/5] Move config_init() after CreateWellKnownSockets() and InitCoreDevices()
-
-config_init() can now add devices directly instead of scheduling a
-timer.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/main.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: xorg-server/dix/main.c
-===================================================================
---- xorg-server.orig/dix/main.c
-+++ xorg-server/dix/main.c
-@@ -168,7 +168,6 @@
- 	InitBlockAndWakeupHandlers();
- 	/* Perform any operating system dependent initializations you'd like */
- 	OsInit();
--        config_init();
- 	if(serverGeneration == 1)
- 	{
- 	    CreateWellKnownSockets();
-@@ -256,6 +255,7 @@
-         InitCoreDevices();
- 	InitInput(argc, argv);
- 	InitAndStartDevices();
-+        config_init();
- 
- 	dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
- 
diff --git a/patches/xorg-server-1.7.5/12-Add-libudev-input-hotplug-backend.diff b/patches/xorg-server-1.7.5/12-Add-libudev-input-hotplug-backend.diff
deleted file mode 100644
index 8c5719566..000000000
--- a/patches/xorg-server-1.7.5/12-Add-libudev-input-hotplug-backend.diff
+++ /dev/null
@@ -1,710 +0,0 @@
-From 7dc78123e56b2d4c6855aa7f8f554f012433eed3 Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sun, 27 Sep 2009 14:45:47 +0200
-Subject: [PATCH 2/5] Add libudev input-hotplug backend
-
-If libudev is found, we use that for hotplug and disable the hal and
-dbus backends.
-We look for event devices with an "x11_driver" property.  XKB
-configuration happens using xkb.{rules,model,layout,variant,options}
-properties.  Arbitrary driver options can be set with a "x11_options."
-prefix.
-
-udev rules would look something like:
-SUBSYSTEM=="input", KERNEL=="event*", ENV{x11_driver}="evdev"
-SUBSYSTEM=="input", KERNEL=="event*", ENV{ID_CLASS}=="kbd", ENV{xkb.layout}="fr", ENV{xkb.options}="terminate:ctrl_alt_bksp,compose:lwin"
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- config/Makefile.am              |   16 +++-
- config/config-backends.h        |   21 +++-
- config/config.c                 |   77 ++++++++++++-
- config/hal.c                    |   63 +----------
- config/udev.c                   |  247 +++++++++++++++++++++++++++++++++++++++
- configure.ac                    |   23 ++++-
- hw/kdrive/src/kinput.c          |    8 ++
- hw/xfree86/common/xf86Config.c  |   15 ++-
- hw/xfree86/common/xf86Globals.c |    2 +-
- hw/xfree86/common/xf86Xinput.c  |    4 +-
- include/dix-config.h.in         |    3 +
- 11 files changed, 400 insertions(+), 79 deletions(-)
- create mode 100644 config/udev.c
-
-Index: xorg-server/config/Makefile.am
-===================================================================
---- xorg-server.orig/config/Makefile.am
-+++ xorg-server/config/Makefile.am
-@@ -3,10 +3,18 @@
- noinst_LTLIBRARIES = libconfig.la
- libconfig_la_SOURCES = config.c config-backends.h
- 
-+if CONFIG_UDEV
-+
-+AM_CFLAGS += @UDEV_CFLAGS@
-+libconfig_la_SOURCES += udev.c
-+libconfig_la_LIBADD = @UDEV_LIBS@
-+
-+else
-+
- if CONFIG_NEED_DBUS
- AM_CFLAGS += @DBUS_CFLAGS@
- libconfig_la_SOURCES += dbus-core.c
--endif
-+libconfig_la_LIBADD = @DBUS_LIBS@
- 
- if CONFIG_DBUS_API
- dbusconfigdir = $(sysconfdir)/dbus-1/system.d
-@@ -16,7 +24,13 @@
- endif
- 
- if CONFIG_HAL
-+AM_CFLAGS += @HAL_CFLAGS@
- libconfig_la_SOURCES += hal.c
-+libconfig_la_LIBADD += @HAL_LIBS@
- endif
- 
-+endif # CONFIG_NEED_DBUS
-+
-+endif # !CONFIG_UDEV
-+
- EXTRA_DIST = xorg-server.conf x11-input.fdi
-Index: xorg-server/config/config-backends.h
-===================================================================
---- xorg-server.orig/config/config-backends.h
-+++ xorg-server/config/config-backends.h
-@@ -26,8 +26,18 @@
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
- #endif
-+#include "input.h"
- 
--#ifdef CONFIG_NEED_DBUS
-+void remove_devices(const char *backend, const char *config_info);
-+BOOL device_is_duplicate(const char *config_info);
-+void add_option(InputOption **options, const char *key, const char *value);
-+
-+#ifdef CONFIG_UDEV
-+int config_udev_init(void);
-+void config_udev_fini(void);
-+#else
-+
-+# ifdef CONFIG_NEED_DBUS
- #include <dbus/dbus.h>
- 
- typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection,
-@@ -46,14 +56,15 @@
- void config_dbus_core_fini(void);
- int config_dbus_core_add_hook(struct config_dbus_core_hook *hook);
- void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook);
--#endif
-+# endif
- 
--#ifdef CONFIG_DBUS_API
-+# ifdef CONFIG_DBUS_API
- int config_dbus_init(void);
- void config_dbus_fini(void);
--#endif
-+# endif
- 
--#ifdef CONFIG_HAL
-+# ifdef CONFIG_HAL
- int config_hal_init(void);
- void config_hal_fini(void);
-+# endif
- #endif
-Index: xorg-server/config/config.c
-===================================================================
---- xorg-server.orig/config/config.c
-+++ xorg-server/config/config.c
-@@ -28,13 +28,17 @@
- #endif
- 
- #include "os.h"
-+#include "inputstr.h"
- #include "hotplug.h"
- #include "config-backends.h"
- 
- void
- config_init(void)
- {
--#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL)
-+#ifdef CONFIG_UDEV
-+    if (!config_udev_init())
-+        ErrorF("[config] failed to initialise udev\n");
-+#elif defined(CONFIG_NEED_DBUS)
-     if (config_dbus_core_init()) {
- # ifdef CONFIG_DBUS_API
-        if (!config_dbus_init())
-@@ -54,7 +58,9 @@
- void
- config_fini(void)
- {
--#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL)
-+#if defined(CONFIG_UDEV)
-+    config_udev_fini();
-+#elif defined(CONFIG_NEED_DBUS)
- # ifdef CONFIG_HAL
-     config_hal_fini();
- # endif
-@@ -64,3 +70,70 @@
-     config_dbus_core_fini();
- #endif
- }
-+
-+static void
-+remove_device(const char *backend, DeviceIntPtr dev)
-+{
-+    /* this only gets called for devices that have already been added */
-+    LogMessage(X_INFO, "config/%s: removing device %s\n", backend, dev->name);
-+
-+    /* Call PIE here so we don't try to dereference a device that's
-+     * already been removed. */
-+    OsBlockSignals();
-+    ProcessInputEvents();
-+    DeleteInputDeviceRequest(dev);
-+    OsReleaseSignals();
-+}
-+
-+void
-+remove_devices(const char *backend, const char *config_info)
-+{
-+    DeviceIntPtr dev, next;
-+
-+    for (dev = inputInfo.devices; dev; dev = next) {
-+        next = dev->next;
-+        if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
-+            remove_device(backend, dev);
-+    }
-+    for (dev = inputInfo.off_devices; dev; dev = next) {
-+        next = dev->next;
-+        if (dev->config_info && strcmp(dev->config_info, config_info) == 0)
-+            remove_device(backend, dev);
-+    }
-+}
-+
-+BOOL
-+device_is_duplicate(const char *config_info)
-+{
-+    DeviceIntPtr dev;
-+
-+    for (dev = inputInfo.devices; dev; dev = dev->next)
-+    {
-+        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
-+            return TRUE;
-+    }
-+
-+    for (dev = inputInfo.off_devices; dev; dev = dev->next)
-+    {
-+        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
-+            return TRUE;
-+    }
-+
-+    return FALSE;
-+}
-+
-+void
-+add_option(InputOption **options, const char *key, const char *value)
-+{
-+    if (!value || *value == '\0')
-+        return;
-+
-+    for (; *options; options = &(*options)->next)
-+        ;
-+    *options = xcalloc(sizeof(**options), 1);
-+    if (!*options) /* Yeesh. */
-+        return;
-+    (*options)->key = xstrdup(key);
-+    (*options)->value = xstrdup(value);
-+    (*options)->next = NULL;
-+}
-Index: xorg-server/config/hal.c
-===================================================================
---- xorg-server.orig/config/hal.c
-+++ xorg-server/config/hal.c
-@@ -58,25 +58,9 @@
-     char* options;
- };
- 
--
--static void
--remove_device(DeviceIntPtr dev)
--{
--    /* this only gets called for devices that have already been added */
--    LogMessage(X_INFO, "config/hal: removing device %s\n", dev->name);
--
--    /* Call PIE here so we don't try to dereference a device that's
--     * already been removed. */
--    OsBlockSignals();
--    ProcessInputEvents();
--    DeleteInputDeviceRequest(dev);
--    OsReleaseSignals();
--}
--
- static void
- device_removed(LibHalContext *ctx, const char *udi)
- {
--    DeviceIntPtr dev, next;
-     char *value;
- 
-     value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */
-@@ -84,36 +68,11 @@
-         return;
-     sprintf(value, "hal:%s", udi);
- 
--    for (dev = inputInfo.devices; dev; dev = next) {
--	next = dev->next;
--        if (dev->config_info && strcmp(dev->config_info, value) == 0)
--            remove_device(dev);
--    }
--    for (dev = inputInfo.off_devices; dev; dev = next) {
--	next = dev->next;
--        if (dev->config_info && strcmp(dev->config_info, value) == 0)
--            remove_device(dev);
--    }
-+    remove_devices("hal", value);
- 
-     xfree(value);
- }
- 
--static void
--add_option(InputOption **options, const char *key, const char *value)
--{
--    if (!value || *value == '\0')
--        return;
--
--    for (; *options; options = &(*options)->next)
--        ;
--    *options = xcalloc(sizeof(**options), 1);
--    if (!*options) /* Yeesh. */
--        return;
--    (*options)->key = xstrdup(key);
--    (*options)->value = xstrdup(value);
--    (*options)->next = NULL;
--}
--
- static char *
- get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name)
- {
-@@ -166,26 +125,6 @@
-     return ret;
- }
- 
--static BOOL
--device_is_duplicate(char *config_info)
--{
--    DeviceIntPtr dev;
--
--    for (dev = inputInfo.devices; dev; dev = dev->next)
--    {
--        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
--            return TRUE;
--    }
--
--    for (dev = inputInfo.off_devices; dev; dev = dev->next)
--    {
--        if (dev->config_info && (strcmp(dev->config_info, config_info) == 0))
--            return TRUE;
--    }
--
--    return FALSE;
--}
--
- static void
- device_added(LibHalContext *hal_ctx, const char *udi)
- {
-Index: xorg-server/config/udev.c
-===================================================================
---- /dev/null
-+++ xorg-server/config/udev.c
-@@ -0,0 +1,247 @@
-+/*
-+ * Copyright © 2009 Julien Cristau
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Julien Cristau <jcristau@debian.org>
-+ */
-+
-+#ifdef HAVE_DIX_CONFIG_H
-+#include <dix-config.h>
-+#endif
-+
-+#include <libudev.h>
-+
-+#include "input.h"
-+#include "inputstr.h"
-+#include "hotplug.h"
-+#include "config-backends.h"
-+#include "os.h"
-+
-+#define UDEV_XKB_PROP_KEY "xkb."
-+#define UDEV_PROP_KEY "x11_options."
-+
-+static struct udev_monitor *udev_monitor;
-+
-+static void
-+device_added(struct udev_device *udev_device)
-+{
-+    const char *path = NULL, *driver = NULL, *name = NULL;
-+    char *config_info = NULL;
-+    const char *syspath;
-+    const char *key, *value, *tmp;
-+    InputOption *options = NULL, *tmpo;
-+    DeviceIntPtr dev = NULL;
-+    struct udev_list_entry *set, *entry;
-+    struct udev_device *parent;
-+    int rc;
-+
-+    driver = udev_device_get_property_value(udev_device, "x11_driver");
-+
-+    path = udev_device_get_devnode(udev_device);
-+
-+    syspath = udev_device_get_syspath(udev_device);
-+
-+    parent = udev_device_get_parent(udev_device);
-+    if (parent)
-+        name = udev_device_get_property_value(parent, "NAME");
-+    else
-+        name = "(unnamed)";
-+
-+    if (!driver || !path || !syspath)
-+        return;
-+    options = xcalloc(sizeof(*options), 1);
-+    if (!options)
-+        return;
-+
-+    options->key = xstrdup("_source");
-+    options->value = xstrdup("server/udev");
-+    if (!options->key || !options->value)
-+        goto unwind;
-+
-+    add_option(&options, "path", path);
-+    add_option(&options, "device", path);
-+    add_option(&options, "driver", driver);
-+
-+    config_info = Xprintf("udev:%s", syspath);
-+    if (!config_info)
-+        goto unwind;
-+
-+    if (device_is_duplicate(config_info)) {
-+        LogMessage(X_WARNING, "config/udev: device %s already added. "
-+                              "Ignoring.\n", name);
-+        goto unwind;
-+    }
-+
-+    set = udev_device_get_properties_list_entry(udev_device);
-+    udev_list_entry_foreach(entry, set) {
-+        key = udev_list_entry_get_name(entry);
-+        if (!key)
-+            continue;
-+        if (!strncasecmp(key, UDEV_PROP_KEY, sizeof(UDEV_PROP_KEY) - 1)) {
-+            value = udev_list_entry_get_value(entry);
-+            add_option(&options, key + sizeof(UDEV_PROP_KEY) - 1, value);
-+        } else if (!strncasecmp(key, UDEV_XKB_PROP_KEY,
-+                                sizeof(UDEV_XKB_PROP_KEY) - 1)) {
-+            tmp = key + sizeof(UDEV_XKB_PROP_KEY) - 1;
-+            value = udev_list_entry_get_value(entry);
-+            if (!strcasecmp(tmp, "rules"))
-+                add_option(&options, "xkb_rules", value);
-+            else if (!strcasecmp(tmp, "layout"))
-+                add_option(&options, "xkb_layout", value);
-+            else if (!strcasecmp(tmp, "variant"))
-+                add_option(&options, "xkb_variant", value);
-+            else if (!strcasecmp(tmp, "model"))
-+                add_option(&options, "xkb_model", value);
-+            else if (!strcasecmp(tmp, "options"))
-+                add_option(&options, "xkb_options", value);
-+        }
-+    }
-+    add_option(&options, "name", name);
-+    LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n",
-+               name, path);
-+    rc = NewInputDeviceRequest(options, &dev);
-+    if (rc != Success)
-+        goto unwind;
-+
-+    for (; dev; dev = dev->next) {
-+        xfree(dev->config_info);
-+        dev->config_info = xstrdup(config_info);
-+    }
-+
-+ unwind:
-+    xfree(config_info);
-+    while (!dev && (tmpo = options)) {
-+        options = tmpo->next;
-+        xfree(tmpo->key);
-+        xfree(tmpo->value);
-+        xfree(tmpo);
-+    }
-+
-+    return;
-+}
-+
-+static void
-+device_removed(struct udev_device *device)
-+{
-+    char *value;
-+    const char *syspath = udev_device_get_syspath(device);
-+
-+    value = Xprintf("udev:%s", syspath);
-+    if (!value)
-+        return;
-+
-+    remove_devices("udev", value);
-+
-+    xfree(value);
-+}
-+
-+static void
-+wakeup_handler(pointer data, int err, pointer read_mask)
-+{
-+    int udev_fd = udev_monitor_get_fd(udev_monitor);
-+    struct udev_device *udev_device;
-+    const char *action;
-+
-+    if (err < 0)
-+        return;
-+
-+    if (FD_ISSET(udev_fd, (fd_set *)read_mask)) {
-+        udev_device = udev_monitor_receive_device(udev_monitor);
-+        if (!udev_device)
-+            return;
-+        action = udev_device_get_action(udev_device);
-+        if (!action)
-+            ;
-+        else if (!strcmp(action, "add"))
-+            device_added(udev_device);
-+        else if (!strcmp(action, "remove"))
-+            device_removed(udev_device);
-+        else
-+            DebugF("config/udev: unhandled action %s\n", action);
-+        udev_device_unref(udev_device);
-+    }
-+}
-+
-+static void
-+block_handler(pointer data, struct timeval **tv, pointer read_mask)
-+{
-+}
-+
-+int
-+config_udev_init(void)
-+{
-+    struct udev *udev;
-+    struct udev_enumerate *enumerate;
-+    struct udev_list_entry *devices, *device;
-+    int rc;
-+
-+    udev = udev_new();
-+    if (!udev)
-+        return 0;
-+    udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
-+    if (!udev_monitor)
-+        return 0;
-+    rc = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor,
-+                                                         "input", NULL);
-+    if (rc < 0)
-+        return 0;
-+
-+    if (udev_monitor_enable_receiving(udev_monitor)) {
-+        ErrorF("config/udev: failed to bind the udev monitor\n");
-+	return 0;
-+    }
-+
-+    enumerate = udev_enumerate_new(udev);
-+    if (!enumerate)
-+        return 0;
-+    udev_enumerate_add_match_subsystem(enumerate, "input");
-+    udev_enumerate_scan_devices(enumerate);
-+    devices = udev_enumerate_get_list_entry(enumerate);
-+    udev_list_entry_foreach(device, devices) {
-+        const char *syspath = udev_list_entry_get_name(device);
-+        struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath);
-+        device_added(udev_device);
-+        udev_device_unref(udev_device);
-+    }
-+    udev_enumerate_unref(enumerate);
-+
-+    RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
-+    AddGeneralSocket(udev_monitor_get_fd(udev_monitor));
-+
-+    return 1;
-+}
-+
-+void
-+config_udev_fini(void)
-+{
-+    struct udev *udev;
-+
-+    if (!udev_monitor)
-+        return;
-+
-+    udev = udev_monitor_get_udev(udev_monitor);
-+
-+    RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor));
-+    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, udev_monitor);
-+    udev_monitor_unref(udev_monitor);
-+    udev_monitor = NULL;
-+    udev_unref(udev);
-+}
-Index: xorg-server/configure.ac
-===================================================================
---- xorg-server.orig/configure.ac
-+++ xorg-server/configure.ac
-@@ -601,6 +601,7 @@
- AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
- AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
- AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
-+AC_ARG_ENABLE(config-udev,    AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])
- AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
- AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
- AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
-@@ -759,6 +760,26 @@
- LIBXTST="xtst >= 1.0.99.2"
- LIBPCIACCESS="pciaccess >= 0.8.0"
- LIBGLIB="glib-2.0 >= 2.16"
-+LIBUDEV="libudev >= 143"
-+
-+if test "x$CONFIG_UDEV" = xyes &&
-+ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
-+	AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
-+fi
-+
-+PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
-+if test "x$CONFIG_UDEV" = xauto; then
-+	CONFIG_UDEV="$HAVE_LIBUDEV"
-+fi
-+AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
-+if test "x$CONFIG_UDEV" = xyes; then
-+	CONFIG_DBUS_API=no
-+	CONFIG_HAL=no
-+	if ! test "x$HAVE_LIBUDEV" = xyes; then
-+		AC_MSG_ERROR([udev configuration API requested, but libudev is not installed])
-+	fi
-+	AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])
-+fi
- 
- dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
- dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
-@@ -792,13 +813,11 @@
- 	fi
- 
- 	AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API])
--        REQUIRED_LIBS="$REQUIRED_LIBS hal"
- 	CONFIG_NEED_DBUS="yes"
- fi
- AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes])
- 
- if test "x$CONFIG_NEED_DBUS" = xyes; then
--	REQUIRED_LIBS="$REQUIRED_LIBS dbus-1"
-         AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug])
- fi
- AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])
-Index: xorg-server/hw/kdrive/src/kinput.c
-===================================================================
---- xorg-server.orig/hw/kdrive/src/kinput.c
-+++ xorg-server/hw/kdrive/src/kinput.c
-@@ -2280,6 +2280,14 @@
-             return BadValue;
-         }
- #endif
-+#ifdef CONFIG_UDEV
-+        else if (strcmp(option->key, "_source") == 0 &&
-+                 strcmp(option->value, "server/udev") == 0)
-+        {
-+            ErrorF("Ignoring device from udev.\n");
-+            return BadValue;
-+        }
-+#endif
-     }
- 
-     if (!ki && !pi) {
-Index: xorg-server/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c
-+++ xorg-server/hw/xfree86/common/xf86Config.c
-@@ -1444,12 +1444,19 @@
-     }
- 
-     if (xf86Info.allowEmptyInput && !(foundPointer && foundKeyboard)) {
--#ifdef CONFIG_HAL
--	xf86Msg(X_INFO, "The server relies on HAL to provide the list of "
-+#if defined(CONFIG_HAL) || defined(CONFIG_UDEV)
-+	const char *config_backend;
-+#if defined(CONFIG_HAL)
-+	config_backend = "HAL";
-+#else
-+	config_backend = "udev";
-+#endif
-+	xf86Msg(X_INFO, "The server relies on %s to provide the list of "
- 	                "input devices.\n\tIf no devices become available, "
--	                "reconfigure HAL or disable AutoAddDevices.\n");
-+	                "reconfigure %s or disable AutoAddDevices.\n",
-+			config_backend, config_backend);
- #else
--	xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n"
-+	xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n"
- 			"\tTry disabling AllowEmptyInput.\n");
- #endif
-     }
-Index: xorg-server/hw/xfree86/common/xf86Globals.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Globals.c
-+++ xorg-server/hw/xfree86/common/xf86Globals.c
-@@ -132,7 +132,7 @@
-     .kbdCustomKeycodes          = FALSE,
-     .disableRandR               = FALSE,
-     .randRFrom                  = X_DEFAULT,
--#ifdef CONFIG_HAL
-+#if defined(CONFIG_HAL) || defined(CONFIG_UDEV)
-     .allowEmptyInput            = TRUE,
-     .autoAddDevices             = TRUE,
-     .autoEnableDevices          = TRUE
-Index: xorg-server/hw/xfree86/common/xf86Xinput.c
-===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Xinput.c
-+++ xorg-server/hw/xfree86/common/xf86Xinput.c
-@@ -605,9 +605,9 @@
-             }
-         }
- 
--        /* Right now, the only automatic config we know of is HAL. */
-         if (strcmp(option->key, "_source") == 0 &&
--            strcmp(option->value, "server/hal") == 0) {
-+            (strcmp(option->value, "server/hal") == 0 ||
-+             strcmp(option->value, "server/udev") == 0)) {
-             is_auto = 1;
-             if (!xf86Info.autoAddDevices) {
-                 rval = BadMatch;
-Index: xorg-server/include/dix-config.h.in
-===================================================================
---- xorg-server.orig/include/dix-config.h.in
-+++ xorg-server/include/dix-config.h.in
-@@ -387,6 +387,9 @@
- /* Support D-Bus */
- #undef HAVE_DBUS
- 
-+/* Use libudev for input hotplug */
-+#undef CONFIG_UDEV
-+
- /* Use D-Bus for input hotplug */
- #undef CONFIG_NEED_DBUS
- 
diff --git a/patches/xorg-server-1.7.5/14-config-add-example-udev-rules.diff b/patches/xorg-server-1.7.5/14-config-add-example-udev-rules.diff
deleted file mode 100644
index e8523f061..000000000
--- a/patches/xorg-server-1.7.5/14-config-add-example-udev-rules.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0fef4e506d6278434fe82bc2697354f6159667df Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Fri, 16 Oct 2009 09:32:44 +0200
-Subject: [PATCH 4/5] config: add example udev rules
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
----
- config/x11-input.rules |    7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
- create mode 100644 config/x11-input.rules
-
-diff --git a/config/x11-input.rules b/config/x11-input.rules
-new file mode 100644
-index 0000000..59ef034
---- /dev/null
-+++ b/config/x11-input.rules
-@@ -0,0 +1,7 @@
-+SUBSYSTEM!="input", GOTO="x11_input_end"
-+
-+KERNEL=="event*", ENV{x11_driver}="evdev"
-+KERNEL=="event*", ENV{ID_CLASS}=="kbd", ENV{xkb.layout}="us"
-+KERNEL=="event*", ENV{ID_CLASS}=="mouse", ATTRS{protocol}=="AlpsPS/2", ENV{x11_driver}="synaptics"
-+
-+LABEL="x11_input_end"
--- 
-1.6.5
-
diff --git a/patches/xorg-server-1.7.5/autogen.sh b/patches/xorg-server-1.7.5/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/xorg-server-1.7.5/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/xorg-server-1.7.5/install-udev-rule.diff b/patches/xorg-server-1.7.5/install-udev-rule.diff
deleted file mode 100644
index d1c6813e2..000000000
--- a/patches/xorg-server-1.7.5/install-udev-rule.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Subject: install x11-input.rules
-
-install x11-input.rules to /lib/udev/rules.d/
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- config/Makefile.am |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: b/config/Makefile.am
-===================================================================
---- a/config/Makefile.am
-+++ b/config/Makefile.am
-@@ -9,6 +9,9 @@ AM_CFLAGS += @UDEV_CFLAGS@
- libconfig_la_SOURCES += udev.c
- libconfig_la_LIBADD = @UDEV_LIBS@
- 
-+udevrulesdir = /lib/udev/rules.d
-+udevrules_DATA = x11-input.rules
-+
- else
- 
- if CONFIG_NEED_DBUS
diff --git a/patches/xorg-server-1.7.5/series b/patches/xorg-server-1.7.5/series
deleted file mode 100644
index 8245ed020..000000000
--- a/patches/xorg-server-1.7.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
-12-Add-libudev-input-hotplug-backend.diff
-14-config-add-example-udev-rules.diff
-install-udev-rule.diff
diff --git a/patches/xorg-server-1.8.2/0001-Fix-typo.patch b/patches/xorg-server-1.8.2/0001-Fix-typo.patch
new file mode 100644
index 000000000..f4cb33ece
--- /dev/null
+++ b/patches/xorg-server-1.8.2/0001-Fix-typo.patch
@@ -0,0 +1,28 @@
+From 7b7359f9e0b3295cf200d763b4762b84d1d4b841 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 7 Jul 2010 13:02:15 +0200
+Subject: [PATCH] Fix typo
+
+MultiBufferDrawableResType != MultibufferDrawableResType
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Xext/mbuf.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xext/mbuf.c b/Xext/mbuf.c
+index aacb9cf..b4c6357 100644
+--- a/Xext/mbuf.c
++++ b/Xext/mbuf.c
+@@ -468,7 +468,7 @@ MultibufferExtensionInit()
+      */
+     MultibufferDrawableResType =
+ 	CreateNewResourceType(MultibufferDrawableDelete, "MultibufferDrawable");
+-    if (MultiBufferDrawableResType)
++    if (MultibufferDrawableResType)
+ 	MultibufferDrawableResType |= RC_DRAWABLE;
+     MultibufferResType = CreateNewResourceType(MultibufferDelete,
+ 					       "MultibufferBuffer");
+-- 
+1.7.1
+
diff --git a/patches/xorg-server-1.8.2/series b/patches/xorg-server-1.8.2/series
new file mode 100644
index 000000000..985d04ca9
--- /dev/null
+++ b/patches/xorg-server-1.8.2/series
@@ -0,0 +1 @@
+0001-Fix-typo.patch
diff --git a/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch b/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch
new file mode 100644
index 000000000..57aa1225f
--- /dev/null
+++ b/patches/zlib-1.2.5/0001-install-fix-for-static-only.patch
@@ -0,0 +1,34 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 5 Jul 2010 22:51:51 +0200
+Subject: [PATCH] install: fix for static only
+
+"make install" tries to install the shared lib even if only
+the static lib is compiled. This patch makes installing the
+shared lib conditional.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.in |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5b15bd0..82639e6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -168,10 +168,11 @@ install-libs: $(LIBS)
+ 	-@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+ 	-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+ 	cp $(STATICLIB) $(DESTDIR)$(libdir)
+-	cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
+ 	cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
+ 	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+-	-@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
++	-@if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
++	  cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
++	  cd $(DESTDIR)$(sharedlibdir); \
+ 	  chmod 755 $(SHAREDLIBV); \
+ 	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
+ 	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
+-- 
+1.7.1
+
diff --git a/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch b/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch
new file mode 100644
index 000000000..71f90ed5f
--- /dev/null
+++ b/patches/zlib-1.2.5/0002-don-t-link-the-shared-lib-against-the-static-lib.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Thu, 15 Jul 2010 14:50:27 +0200
+Subject: [PATCH] don't link the shared lib against the static lib
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index bd9edd2..e6c2ead 100755
+--- a/configure
++++ b/configure
+@@ -19,7 +19,6 @@ if [ -n "${CHOST}" ]; then
+ fi
+ 
+ STATICLIB=libz.a
+-LDFLAGS="${LDFLAGS} -L. ${STATICLIB}"
+ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+ VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
+ VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
+-- 
+1.7.1
+
diff --git a/patches/zlib-1.2.5/series b/patches/zlib-1.2.5/series
new file mode 100644
index 000000000..3ba4f262b
--- /dev/null
+++ b/patches/zlib-1.2.5/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+0001-install-fix-for-static-only.patch
+0002-don-t-link-the-shared-lib-against-the-static-lib.patch
+# e8400e7168293e2c816fd639c49ee4ce  - git-ptx-patches magic
diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make
index 2e23285fd..2de096fe1 100644
--- a/rules/alsa-utils.make
+++ b/rules/alsa-utils.make
@@ -48,11 +48,11 @@ ALSA_UTILS_ENV 	:= $(CROSS_ENV)
 ALSA_UTILS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	$(CROSS_ENV_AC_NCURSES) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-nls \
 	--disable-rpath \
 	--disable-alsatest \
-	--disable-xmlto \
-	--disable-largefile
+	--disable-xmlto
 
 ifdef PTXCONF_ALSA_UTILS_ALSAMIXER
 ALSA_UTILS_AUTOCONF += --enable-alsamixer
diff --git a/rules/apache2.make b/rules/apache2.make
index b4c351373..1180a2ca9 100644
--- a/rules/apache2.make
+++ b/rules/apache2.make
@@ -56,6 +56,7 @@ APACHE2_BINCONFIG_GLOB := ""
 APACHE2_CONF_TOOL := autoconf
 APACHE2_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	--includedir=/usr/include/apache2
 	--enable-so \
 	--with-expat=$(SYSROOT)/usr
 
diff --git a/rules/avahi.make b/rules/avahi.make
index 1775c2fa2..056374712 100644
--- a/rules/avahi.make
+++ b/rules/avahi.make
@@ -122,7 +122,7 @@ ifdef PTXCONF_AVAHI_DBUS
 AVAHI_AUTOCONF += 					\
 	--enable-dbus					\
 	--with-dbus-sys=$(PTXCONF_AVAHI_DBUS_SYS)	\
-	--with-dbus-system-address=$(PTXCONF_AVAHI_DBUS_SOCKET)
+	--with-dbus-system-socket=$(PTXCONF_AVAHI_DBUS_SOCKET)
 else
 AVAHI_AUTOCONF += --disable-dbus
 endif
diff --git a/rules/bash.in b/rules/bash.in
index 828ff9c00..cdc0089de 100644
--- a/rules/bash.in
+++ b/rules/bash.in
@@ -121,15 +121,6 @@ config BASH_JOBS
 	  This enables support for background jobs in bash.
 	  You can list the actual managed jobs by the "jobs" command.
 
-config BASH_LARGEFILES
-	bool
-	prompt "Enable support for large files"
-	default y
-	help
-	  Enable support for large files (LFS) if the operating system
-	  requires special compiler options to build programs
-	  which can access large files.
-
 config BASH_PROCSUBST
 	bool
 	prompt "Enable process substitution"
diff --git a/rules/bash.make b/rules/bash.make
index 756d36040..91e7defed 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -41,6 +41,7 @@ BASH_ENV	:= $(CROSS_ENV)
 
 BASH_AUTOCONF	:= \
 	$(CROSS_AUTOCONF_ROOT) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--without-bash-malloc \
 	--disable-net-redirections
 
@@ -117,12 +118,6 @@ else
 BASH_AUTOCONF	+= --disable-job-control
 endif
 
-ifdef PTXCONF_BASH_LARGEFILES
-BASH_AUTOCONF	+= --enable-largefile
-else
-BASH_AUTOCONF	+= --disable-largefile
-endif
-
 ifdef PTXCONF_BASH_PROCSUBST
 BASH_AUTOCONF	+= --enable-process-substitution
 else
diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make
index 49a236a6e..185665ba4 100644
--- a/rules/commoncpp2.make
+++ b/rules/commoncpp2.make
@@ -52,15 +52,15 @@ COMMONCPP2_AUTOCONF := \
 	--disable-profiling \
 	--without-ipv6 \
 	--without-nat \
-	--enable-monotonic \
-	--enable-extras \
 	--without-gnutls \
 	--without-openssl \
 	--without-memaudit \
 	--without-cppunit
 
-# the logic for this switch is broken in 1.8.0:
+# the logic for these switches is broken in 1.8.0:
 #	--with-exceptions
+#	--with-monotonic
+#	--with-extras
 
 ifndef PTXCONF_COMMONCPP2_LIBZ
 COMMONCPP2_AUTOCONF += --without-compression
diff --git a/rules/coreutils.make b/rules/coreutils.make
index f85598a83..d1a79bc10 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -60,13 +60,13 @@ $(COREUTILS_SOURCE):
 
 COREUTILS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--target=$(PTXCONF_GNU_TARGET) \
 	--disable-silent-rules \
 	--enable-threads=posix \
 	--disable-acl \
 	--disable-assert \
 	--disable-rpath \
-	--enable-largefile \
 	--disable-xattr \
 	--disable-libcap \
 	--disable-nls
@@ -90,8 +90,6 @@ $(STATEDIR)/coreutils.targetinstall:
 	@$(call install_fixup, coreutils,DEPENDS,)
 	@$(call install_fixup, coreutils,DESCRIPTION,missing)
 
-	@$(call install_copy, coreutils, 0, 0, 0644, -, /usr/lib/coreutils/libstdbuf.so)
-
 ifdef PTXCONF_COREUTILS_ECHO
 	@$(call install_copy, coreutils, 0, 0, 0755, -, /usr/bin/echo)
 endif
@@ -280,6 +278,7 @@ ifdef PTXCONF_COREUTILS_FMT
 	@$(call install_copy, coreutils, 0, 0, 0755, -, /usr/bin/fmt)
 endif
 ifdef PTXCONF_COREUTILS_STDBUF
+	@$(call install_copy, coreutils, 0, 0, 0644, -, /usr/lib/coreutils/libstdbuf.so)
 	@$(call install_copy, coreutils, 0, 0, 0755, -, /usr/bin/stdbuf)
 endif
 ifdef PTXCONF_COREUTILS_PINKY
diff --git a/rules/db.make b/rules/db.make
index 15f306af9..33634a93c 100644
--- a/rules/db.make
+++ b/rules/db.make
@@ -51,6 +51,7 @@ $(DB_SOURCE):
 DB_CONF_TOOL := autoconf
 DB_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-cryptography \
 	--disable-debug \
 	--disable-debug_rop \
@@ -72,7 +73,6 @@ DB_CONF_OPT	:= \
 	--enable-compat185 \
 	--enable-cxx \
 	--enable-hash \
-	--enable-largefile \
 	--enable-o_direct \
 	--enable-pthread_self \
 	--enable-shared
diff --git a/rules/dconf.make b/rules/dconf.make
index 1c139cc49..9308c8496 100644
--- a/rules/dconf.make
+++ b/rules/dconf.make
@@ -41,6 +41,14 @@ $(DCONF_SOURCE):
 #
 DCONF_CONF_TOOL	:= autoconf
 
+DCONF_CONF_OPT	:= \
+	$(CROSS_AUTOCONF_USR) \
+	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
+	--disable-editor
+
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
diff --git a/rules/devicekit-disks.make b/rules/devicekit-disks.make
index 5e477cb96..cbdb6cfec 100644
--- a/rules/devicekit-disks.make
+++ b/rules/devicekit-disks.make
@@ -41,9 +41,9 @@ $(DEVICEKIT_DISKS_SOURCE):
 #
 DEVICEKIT_DISKS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-shared \
 	--enable-static \
-	--disable-largefile \
 	--disable-ansi \
 	--disable-man-pages \
 	--disable-gtk-doc \
diff --git a/rules/dnsmasq.in b/rules/dnsmasq.in
index ffca30228..5b9c50fe1 100644
--- a/rules/dnsmasq.in
+++ b/rules/dnsmasq.in
@@ -41,12 +41,6 @@ config DNSMASQ_TFTP
 	help
 	  This includes TFTP services into dnsmasq
 
-config DNSMASQ_IPV6
-	bool
-	prompt "enable IPv6"
-	help
-	  This includes IPv6 support into dnsmasq
-
 comment "runtime options   ---"
 
 choice
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 88cde8905..acd7ff01e 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -45,7 +45,7 @@ DNSMASQ_COPT :=
 ifndef PTXCONF_DNSMASQ_TFTP
 DNSMASQ_COPT += -DNO_TFTP
 endif
-ifndef PTXCONF_DNSMASQ_IPV6
+ifndef PTXCONF_GLOBAL_IPV6
 DNSMASQ_COPT += -DNO_IPV6
 endif
 
diff --git a/rules/dropbear.in b/rules/dropbear.in
index fbbad0668..d41045439 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -24,6 +24,12 @@ menuconfig DROPBEAR
 
 if DROPBEAR
 
+config DROPBEAR_KEY_DIR
+	string "dropbear key directory"
+	default "/etc/dropbear"
+	help
+	  This is the directory where dropbear stores the keys.
+
 config DROPBEAR_ZLIB
 	bool
 	prompt "zlib support"
diff --git a/rules/dropbear.make b/rules/dropbear.make
index cf834886c..55539be86 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -280,11 +280,15 @@ endif
 ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_DROPBEAR_STARTSCRIPT
 	@$(call install_alternative, dropbear, 0, 0, 0755, /etc/init.d/dropbear, n)
+	@$(call install_replace, dropbear, /etc/init.d/dropbear, \
+		@KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR))
 	@$(call install_alternative, dropbear, 0, 0, 0755, /etc/rc.once.d/dropbear, n)
+	@$(call install_replace, dropbear, /etc/rc.once.d/dropbear, \
+		@KEYDIR@, $(PTXCONF_DROPBEAR_KEY_DIR))
 endif
 endif
 
-	@$(call install_copy, dropbear, 0, 0, 0755, /etc/dropbear)
+	@$(call install_copy, dropbear, 0, 0, 0755, $(PTXCONF_DROPBEAR_KEY_DIR))
 
 	@$(call install_finish, dropbear)
 
diff --git a/rules/eggdbus.make b/rules/eggdbus.make
index fc89044a5..d75d64c07 100644
--- a/rules/eggdbus.make
+++ b/rules/eggdbus.make
@@ -38,7 +38,7 @@ $(EGGDBUS_SOURCE):
 
 EGGDBUS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--enable-largefile \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-ansi \
 	--disable-verbose-mode \
 	--disable-man-pages \
diff --git a/rules/flac.make b/rules/flac.make
index 037773a0f..05cbd5613 100644
--- a/rules/flac.make
+++ b/rules/flac.make
@@ -42,8 +42,8 @@ $(FLAC_SOURCE):
 FLAC_CONF_TOOL	:= autoconf
 FLAC_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-rpath \
-	--enable-largefile \
 	--disable-debug \
 	--disable-thorough-tests \
 	--disable-exhaustive-tests \
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 4ffc11aef..8dcc98135 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -43,6 +43,7 @@ GNUPG_ENV 	= $(CROSS_ENV)
 # autoconf
 #
 GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-asm \
 	--disable-card-support \
 	--disable-exec \
@@ -62,7 +63,6 @@ GNUPG_AUTOCONF = $(CROSS_AUTOCONF_USR) \
 	--disable-finger \
 	--disable-ftp \
 	--disable-keyserver-path \
-	--disable-largefile \
 	--disable-dns-srv \
 	--disable-nls \
 	--disable-rpath \
diff --git a/rules/gst-plugins-base.make b/rules/gst-plugins-base.make
index d721a671f..eb0a17963 100644
--- a/rules/gst-plugins-base.make
+++ b/rules/gst-plugins-base.make
@@ -40,6 +40,7 @@ $(GST_PLUGINS_BASE_SOURCE):
 #
 GST_PLUGINS_BASE_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-option-checking \
 	--enable-silent-rules \
 	--disable-nls \
@@ -51,7 +52,6 @@ GST_PLUGINS_BASE_AUTOCONF := \
 	--disable-examples \
 	--enable-external \
 	--disable-experimental \
-	--disable-largefile \
 	--disable-gtk-doc \
 	--disable-gobject-cast-checks \
 	--disable-oggtest \
diff --git a/rules/gst-plugins-gl.make b/rules/gst-plugins-gl.make
index bdd1879d5..dd8bd8bee 100644
--- a/rules/gst-plugins-gl.make
+++ b/rules/gst-plugins-gl.make
@@ -41,14 +41,14 @@ $(GST_PLUGINS_GL_SOURCE):
 GST_PLUGINS_GL_CONF_TOOL := autoconf
 GST_PLUGINS_GL_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-rpath \
 	--disable-nls \
 	--disable-debug \
 	--disable-profiling \
 	--disable-valgrind \
 	--disable-gcov \
-	--disable-gtk-doc \
-	--enable-largefile
+	--disable-gtk-doc
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/gstreamer.make b/rules/gstreamer.make
index 2f32e3e7a..fbd99b5ca 100644
--- a/rules/gstreamer.make
+++ b/rules/gstreamer.make
@@ -40,6 +40,7 @@ $(GSTREAMER_SOURCE):
 #
 GSTREAMER_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-nls \
 	--disable-rpath \
 	--disable-trace \
@@ -54,7 +55,6 @@ GSTREAMER_AUTOCONF := \
 	--disable-tests \
 	--disable-failing-tests	\
 	--disable-poisoning \
-	--enable-largefile \
 	--disable-introspection \
 	--disable-docbook \
 	--disable-gtk-doc \
diff --git a/rules/host-mesalib.in b/rules/host-mesalib.in
new file mode 100644
index 000000000..22d9bff31
--- /dev/null
+++ b/rules/host-mesalib.in
@@ -0,0 +1,5 @@
+## SECTION=hosttools_noprompt
+
+config HOST_MESALIB
+	tristate
+
diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make
new file mode 100644
index 000000000..e648b2e79
--- /dev/null
+++ b/rules/host-mesalib.make
@@ -0,0 +1,26 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_MESALIB) += host-mesalib
+
+HOST_MESALIB_DIR	= $(HOST_BUILDDIR)/Mesa-$(MESALIB_VERSION)
+HOST_MESALIB_SUBDIR	:= src/glsl
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+HOST_MESALIB_CONF_TOOL	:= NO
+HOST_MESALIB_MAKE_OPT	:= $(HOST_ENV) default
+
+# vim: syntax=make
diff --git a/rules/host-util-linux-ng.make b/rules/host-util-linux-ng.make
index d25602e0a..d569f2ba5 100644
--- a/rules/host-util-linux-ng.make
+++ b/rules/host-util-linux-ng.make
@@ -38,6 +38,11 @@ HOST_UTIL_LINUX_NG_AUTOCONF := \
 	$(HOST_AUTOCONF) \
 	--disable-use-tty-group \
 	--disable-makeinstall-chown \
-	--disable-fallocate
+	--disable-fallocate \
+	--enable-libuuid \
+	--enable-libblkid
+
+HOST_UTIL_LINUX_NG_MAKE_OPT	:= -C shlibs
+HOST_UTIL_LINUX_NG_INSTALL_OPT	:= $(HOST_UTIL_LINUX_NG_MAKE_OPT) install
 
 # vim: syntax=make
diff --git a/rules/host-xorg-util-macros.make b/rules/host-xorg-util-macros.make
index 145de6720..e7108476a 100644
--- a/rules/host-xorg-util-macros.make
+++ b/rules/host-xorg-util-macros.make
@@ -16,7 +16,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_XORG_UTIL_MACROS) += host-xorg-util-macros
 #
 # Paths and names
 #
-HOST_XORG_UTIL_MACROS_VERSION	:= 1.4.2
+HOST_XORG_UTIL_MACROS_VERSION	:= 1.10.0
 HOST_XORG_UTIL_MACROS		:= util-macros-$(HOST_XORG_UTIL_MACROS_VERSION)
 HOST_XORG_UTIL_MACROS_SUFFIX	:= tar.bz2
 HOST_XORG_UTIL_MACROS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/util/$(HOST_XORG_UTIL_MACROS).$(HOST_XORG_UTIL_MACROS_SUFFIX)
diff --git a/rules/inetutils.make b/rules/inetutils.make
index 312ee3ced..51904e2f8 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -44,6 +44,7 @@ INETUTILS_ENV 	:= $(CROSS_ENV)
 # autoconf
 #
 INETUTILS_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-PATH-CP=/bin/cp \
 	--localstatedir=/var \
 	--sysconfdir=/etc \
diff --git a/rules/iperf.make b/rules/iperf.make
index e83d71933..55d5df438 100644
--- a/rules/iperf.make
+++ b/rules/iperf.make
@@ -41,7 +41,9 @@ IPERF_ENV 	:= $(CROSS_ENV)
 #
 # autoconf
 #
-IPERF_AUTOCONF := $(CROSS_AUTOCONF_USR)
+IPERF_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/iptables.make b/rules/iptables.make
index dc2eaf0a5..5ab26a7b1 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -46,9 +46,9 @@ IPTABLES_ENV	:= $(CROSS_ENV)
 #
 IPTABLES_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--with-kernel=$(KERNEL_HEADERS_DIR) \
 	--with-xtlibdir=/usr/lib \
-	--enable-large-file \
 	--disable-devel \
 	--disable-libipq
 
diff --git a/rules/ipv6.in b/rules/ipv6.in
new file mode 100644
index 000000000..4dee6fdbb
--- /dev/null
+++ b/rules/ipv6.in
@@ -0,0 +1,9 @@
+## SECTION=core
+
+config GLOBAL_IPV6
+	bool
+	default y
+	prompt "IPv6 support"
+	help
+	  This will enable IPv6 for all packages with optional IPv6 support.
+
diff --git a/rules/irssi.make b/rules/irssi.make
index 009796d4a..cb9c30a0c 100644
--- a/rules/irssi.make
+++ b/rules/irssi.make
@@ -42,6 +42,7 @@ $(IRSSI_SOURCE):
 IRSSI_CONF_TOOL := autoconf
 IRSSI_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-ncurses=$(PTXDIST_SYSROOT_TARGET)/usr \
 	--without-perl
 
diff --git a/rules/largefile.in b/rules/largefile.in
new file mode 100644
index 000000000..92aabcf9c
--- /dev/null
+++ b/rules/largefile.in
@@ -0,0 +1,6 @@
+## SECTION=core
+
+config GLOBAL_LARGE_FILE
+	bool
+	default y
+
diff --git a/rules/libcurl.in b/rules/libcurl.in
index 48f1c94ff..c76c4b41b 100644
--- a/rules/libcurl.in
+++ b/rules/libcurl.in
@@ -43,7 +43,4 @@ config LIBCURL_CRYPTO_AUTH
 config LIBCURL_LIBSSH2
        bool "scp/sftp (via libssh2)"
 
-config LIBCURL_IPV6
-       bool "ipv6"
-
 endif
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 5b046d723..41022a61d 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -44,6 +44,7 @@ LIBCURL_ENV 	:= $(CROSS_ENV)
 #
 LIBCURL_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-random=/dev/urandom \
 	--with-zlib=$(SYSROOT) \
 	\
@@ -114,12 +115,6 @@ else
 LIBCURL_AUTOCONF += --without-libssh2
 endif
 
-ifdef PTXCONF_LIBCURL_IPV6
-LIBCURL_AUTOCONF += --enable-ipv6
-else
-LIBCURL_AUTOCONF += --disable-ipv6
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
diff --git a/rules/libdrm.make b/rules/libdrm.make
index 22cd411d3..278369a58 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
 #
 # Paths and names
 #
-LIBDRM_VERSION	:= 2.4.18
+LIBDRM_VERSION	:= 2.4.21
 LIBDRM		:= libdrm-$(LIBDRM_VERSION)
 LIBDRM_SUFFIX	:= tar.gz
 LIBDRM_URL	:= http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX)
diff --git a/rules/libgee.in b/rules/libgee.in
new file mode 100644
index 000000000..c2ae54d49
--- /dev/null
+++ b/rules/libgee.in
@@ -0,0 +1,10 @@
+## SECTION=multimedia_gtk
+
+config LIBGEE
+	tristate
+	prompt "libgee"
+	select GLIB
+	help
+	  Libgee is a collection library providing GObject-based
+	  interfaces and classes for commonly used data structures.
+
diff --git a/rules/libgee.make b/rules/libgee.make
new file mode 100644
index 000000000..3918fe031
--- /dev/null
+++ b/rules/libgee.make
@@ -0,0 +1,70 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBGEE) += libgee
+
+#
+# Paths and names
+#
+LIBGEE_VERSION	:= 0.5.1
+LIBGEE		:= libgee-$(LIBGEE_VERSION)
+LIBGEE_SUFFIX	:= tar.bz2
+LIBGEE_URL	:= http://download.gnome.org/sources/libgee/0.5/$(LIBGEE).$(LIBGEE_SUFFIX)
+LIBGEE_SOURCE	:= $(SRCDIR)/$(LIBGEE).$(LIBGEE_SUFFIX)
+LIBGEE_DIR	:= $(BUILDDIR)/$(LIBGEE)
+LIBGEE_LICENSE	:= LGPLv2.1+
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+$(LIBGEE_SOURCE):
+	@$(call targetinfo)
+	@$(call get, LIBGEE)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+# we should not need the vala compiler.
+# make sure it fails if it is caled anyways.
+LIBGEE_CONF_ENV	:= $(CROSS_ENV) ac_cv_path_VALAC=false
+
+#
+# autoconf
+#
+LIBGEE_CONF_TOOL	:= autoconf
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libgee.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init,  libgee)
+	@$(call install_fixup, libgee,PACKAGE,libgee)
+	@$(call install_fixup, libgee,PRIORITY,optional)
+	@$(call install_fixup, libgee,VERSION,$(LIBGEE_VERSION))
+	@$(call install_fixup, libgee,SECTION,base)
+	@$(call install_fixup, libgee,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+	@$(call install_fixup, libgee,DEPENDS,)
+	@$(call install_fixup, libgee,DESCRIPTION,missing)
+
+	@$(call install_lib, libgee, 0, 0, 0644, libgee)
+
+	@$(call install_finish, libgee)
+
+	@$(call touch)
+
+# vim: syntax=make
diff --git a/rules/libgsf.in b/rules/libgsf.in
index 59132518c..d67c06272 100644
--- a/rules/libgsf.in
+++ b/rules/libgsf.in
@@ -19,13 +19,6 @@ menuconfig LIBGSF
 
 if LIBGSF
 
-config LIBGSF_LARGEFILE
-	bool
-	prompt "largefile support"
-	default y
-	help
-	  FIXME
-
 config LIBGSF_NLS
 	bool
 	prompt "NLS Support"
diff --git a/rules/libgsf.make b/rules/libgsf.make
index 00277c237..2a75a12fb 100644
--- a/rules/libgsf.make
+++ b/rules/libgsf.make
@@ -45,6 +45,7 @@ LIBGSF_ENV 	:= \
 #
 LIBGSF_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-iso-c \
 	--disable-gtk-doc \
 	--disable-schemas-install \
@@ -52,12 +53,6 @@ LIBGSF_AUTOCONF := \
 	--without-gdk-pixbuf \
 	--without-gnome-vfs
 
-ifdef PTXCONF_LIBGSF_LARGEFILE
-LIBGSF_AUTOCONF += --enable-largefile
-else
-LIBGSF_AUTOCONF += --disable-largefile
-endif
-
 ifdef PTXCONF_LIBGSF_NLS
 LIBGSF_AUTOCONF += --enable-nls
 else
diff --git a/rules/libmicrohttpd.in b/rules/libmicrohttpd.in
index ba6d0d4d0..e69cc1c43 100644
--- a/rules/libmicrohttpd.in
+++ b/rules/libmicrohttpd.in
@@ -14,13 +14,6 @@ menuconfig LIBMICROHTTPD
 
 if LIBMICROHTTPD
 
-config LIBMICROHTTPD_LARGEFILE
-	bool
-	prompt "Large file support"
-	default y
-	help
-	  FIXME
-
 config LIBMICROHTTPD_HTTPS
 	bool
 	prompt "HTTPS support"
diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
index a0f5ceea4..32c76387b 100644
--- a/rules/libmicrohttpd.make
+++ b/rules/libmicrohttpd.make
@@ -43,15 +43,10 @@ LIBMICROHTTPD_ENV 	:= $(CROSS_ENV)
 #
 LIBMICROHTTPD_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-curl \
 	--disable-coverage
 
-ifdef PTXCONF_LIBMICROHTTPD_LARGEFILE
-LIBMICROHTTPD_AUTOCONF += --enable-largefile
-else
-LIBMICROHTTPD_AUTOCONF += --disable-largefile
-endif
-
 ifdef PTXCONF_LIBMICROHTTPD_HTTPS
 LIBMICROHTTPD_AUTOCONF += --enable-https
 else
diff --git a/rules/libmpeg2.make b/rules/libmpeg2.make
index 83414ea69..b39ba8648 100644
--- a/rules/libmpeg2.make
+++ b/rules/libmpeg2.make
@@ -42,8 +42,8 @@ $(LIBMPEG2_SOURCE):
 LIBMPEG2_CONF_TOOL := autoconf
 LIBMPEG2_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-debug \
-	--enable-largefile \
 	--disable-accel-detect \
 	--disable-sdl \
 	--disable-warnings \
diff --git a/rules/libnet.make b/rules/libnet.make
index ded5fd300..8d509662e 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -36,17 +36,14 @@ $(LIBNET_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-LIBNET_PATH	:= PATH=$(CROSS_PATH)
-LIBNET_ENV 	:= \
-	$(CROSS_ENV) \
-	ac_libnet_have_packet_socket=yes
-
 #
 # autoconf
 #
-LIBNET_AUTOCONF	:= \
-	$(CROSS_AUTOCONF_USR) \
-	--with-pf_packet=yes
+LIBNET_CONF_TOOL	:= autoconf
+
+LIBNET_CONF_ENV		:= \
+	$(CROSS_ENV) \
+	libnet_cv_have_packet_socket=yes
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/libpcap.in b/rules/libpcap.in
index 9b08a5fa2..87027bb03 100644
--- a/rules/libpcap.in
+++ b/rules/libpcap.in
@@ -24,12 +24,6 @@ menuconfig LIBPCAP
 
 if LIBPCAP
 
-config LIBPCAP_IPV6
-	bool
-	prompt "build IPv6-capable version"
-	help
-	  Enable this if you require ipv6 support.
-
 config LIBPCAP_BLUETOOTH
 	bool
 	prompt "bluetooth sniffing support"
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 678d61a89..99c5aff5b 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -51,6 +51,7 @@ LIBPCAP_COMPILE_ENV := \
 #
 LIBPCAP_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--enable-protochain \
 	--disable-optimizer-dbg \
 	--disable-yydebug \
@@ -64,12 +65,6 @@ else
 LIBPCAP_AUTOCONF += --with-pcap=linux
 endif
 
-ifdef PTXCONF_LIBPCAP_IPV6
-LIBPCAP_AUTOCONF += --enable-ipv6
-else
-LIBPCAP_AUTOCONF += --disable-ipv6
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
diff --git a/rules/libpv.in b/rules/libpv.in
index 3c551dafe..2bf5a8e83 100644
--- a/rules/libpv.in
+++ b/rules/libpv.in
@@ -3,8 +3,8 @@
 menuconfig LIBPV
 	tristate
 	prompt "libpv                         "
-	select LIBLIST
 	select LIBC_PTHREAD
+	select LIBLIST		if !LIBPV_XML_EXPAT
 	select LIBXMLCONFIG	if !LIBPV_XML_EXPAT
 	select EXPAT		if LIBPV_XML_EXPAT
 	select PYTHON		if LIBPV_PYTHON
diff --git a/rules/libpv.make b/rules/libpv.make
index 0144b3695..1f90e845d 100644
--- a/rules/libpv.make
+++ b/rules/libpv.make
@@ -37,34 +37,38 @@ $(LIBPV_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-LIBPV_PATH	:= PATH=$(CROSS_PATH)
-LIBPV_ENV 	:= $(CROSS_ENV)
-
 #
 # autoconf
 #
-LIBPV_AUTOCONF := \
+LIBPV_CONF_TOOL	:= autoconf
+
+# force disable xsltproc to avoid building docs
+LIBPV_CONF_ENV	:= \
+	$(CROSS_ENV) \
+	ac_cv_prog_XSLTPROC=false
+
+LIBPV_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	--enable-shared \
 	--enable-static \
 	--disable-debug
 
 ifdef PTXCONF_LIBPV_EVENT
-LIBPV_AUTOCONF += --enable-event
+LIBPV_CONF_OPT += --enable-event
 else
-LIBPV_AUTOCONF += --disable-event
+LIBPV_CONF_OPT += --disable-event
 endif
 
 ifdef PTXCONF_LIBPV_PYTHON
-LIBPV_AUTOCONF += --enable-python
+LIBPV_CONF_OPT += --enable-python
 else
-LIBPV_AUTOCONF += --disable-python
+LIBPV_CONF_OPT += --disable-python
 endif
 
 ifdef PTXCONF_LIBPV_XML_EXPAT
-LIBPV_AUTOCONF += --with-expat
+LIBPV_CONF_OPT += --with-expat
 else
-LIBPV_AUTOCONF += --without-expat
+LIBPV_CONF_OPT += --without-expat
 endif
 
 # ----------------------------------------------------------------------------
diff --git a/rules/libxml2.make b/rules/libxml2.make
index d30be57df..fb3801569 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -49,6 +49,7 @@ LIBXML2_ENV	:= $(CROSS_ENV)
 #
 LIBXML2_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--oldincludedir=$(SYSROOT)/usr/include
 
 ifdef PTXCONF_ICONV
@@ -203,9 +204,9 @@ LIBXML2_AUTOCONF += --without-threads
 endif
 
 ifdef PTXCONF_LIBXML2_THREADS_ALLOC
-LIBXML2_AUTOCONF += --with-threads-alloc
+LIBXML2_AUTOCONF += --with-thread-alloc
 else
-LIBXML2_AUTOCONF += --without-threads-alloc
+LIBXML2_AUTOCONF += --without-thread-alloc
 endif
 
 ifdef PTXCONF_LIBXML2_DOM
diff --git a/rules/lighttpd.in b/rules/lighttpd.in
index 5febb36de..7df9face5 100644
--- a/rules/lighttpd.in
+++ b/rules/lighttpd.in
@@ -46,12 +46,6 @@ config LIGHTTPD_LFS
 	help
 	  Turn on Large File System.
 
-config LIGHTTPD_IPV6
-	bool
-	prompt "IPv6 support"
-	help
-	  Enable IPv6 support.
-
 config LIGHTTPD_MYSQL
 	bool
 #	prompt "MySQL support"
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index fd247aebe..12a33da2b 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -44,6 +44,7 @@ LIGHTTPD_ENV 	:= $(CROSS_ENV)
 #
 LIGHTTPD_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--without-valgrind
 
 ifdef PTXCONF_LIGHTTPD_ZLIB
@@ -64,12 +65,6 @@ else
 LIGHTTPD_AUTOCONF += --disable-lfs
 endif
 
-ifdef PTXCONF_LIGHTTPD_IPV6
-LIGHTTPD_AUTOCONF += --enable-ipv6
-else
-LIGHTTPD_AUTOCONF += --disable-ipv6
-endif
-
 ifdef PTXCONF_LIGHTTPD_MYSQL
 LIGHTTPD_AUTOCONF += --with-mysql=FIXME
 else
diff --git a/rules/lsh.make b/rules/lsh.make
index 8babca56c..205e1f63b 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -44,13 +44,13 @@ LSH_ENV 	:= $(CROSS_ENV)
 #
 LSH_AUTOCONF := \
 	$(CROSS_AUTOCONF_ROOT) \
+	$(GLOBAL_IPV6_OPTION) \
 	--sysconfdir=/etc/lsh \
 	--disable-kerberos \
 	--disable-pam \
 	--disable-tcp-forward \
 	--disable-x11-forward \
 	--disable-agent-forward \
-	--disable-ipv6 \
 	--disable-utmp \
 	--without-x \
 	--without-system-argp
diff --git a/rules/ltt-control.make b/rules/ltt-control.make
index 2cd9fa22f..d3ee6d09c 100644
--- a/rules/ltt-control.make
+++ b/rules/ltt-control.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_LTT_CONTROL) += ltt-control
 #
 # Paths and names
 #
-LTT_CONTROL_VERSION	:= 0.63-03012009
+LTT_CONTROL_VERSION	:= 0.87-09062010
 LTT_CONTROL		:= ltt-control-$(LTT_CONTROL_VERSION)
 LTT_CONTROL_SUFFIX	:= tar.gz
-LTT_CONTROL_URL		:= http://ltt.polymtl.ca/files/lttng/$(LTT_CONTROL).$(LTT_CONTROL_SUFFIX)
+LTT_CONTROL_URL		:= http://lttng.org/files/lttng/$(LTT_CONTROL).$(LTT_CONTROL_SUFFIX)
 LTT_CONTROL_SOURCE	:= $(SRCDIR)/$(LTT_CONTROL).$(LTT_CONTROL_SUFFIX)
 LTT_CONTROL_DIR		:= $(BUILDDIR)/$(LTT_CONTROL)
 
@@ -63,12 +63,8 @@ $(STATEDIR)/ltt-control.targetinstall:
 	@$(call install_copy, ltt-control, 0, 0, 0755, -, /usr/bin/lttctl)
 	@$(call install_copy, ltt-control, 0, 0, 0755, -, /usr/bin/lttd)
 
-	@$(call install_copy, ltt-control, 0, 0, 0644, -, \
-		/usr/lib/liblttctl.so.0.0.0)
-	@$(call install_link, ltt-control, liblttctl.so.0.0.0, \
-		/usr/lib/liblttctl.so.0)
-	@$(call install_link, ltt-control, liblttctl.so.0.0.0, \
-		/usr/lib/liblttctl.so)
+	@$(call install_lib, ltt-control, 0, 0, 0644, liblttctl)
+	@$(call install_lib, ltt-control, 0, 0, 0644, liblttd)
 
 	@$(call install_finish, ltt-control)
 
diff --git a/rules/mesalib.in b/rules/mesalib.in
index bc85e765b..7571bdcf5 100644
--- a/rules/mesalib.in
+++ b/rules/mesalib.in
@@ -5,6 +5,7 @@ menuconfig MESALIB
 	prompt "mesa                          "
 	select LIBDRM
 	select DRI2PROTO
+	select HOST_MESALIB
 	select XORG_LIB_X11		if MESALIB_DRIVER_DRI
 	select XORG_LIB_XEXT		if MESALIB_DRIVER_DRI || MESALIB_DRIVER_XLIB
 	select XORG_LIB_XXF86VM		if MESALIB_DRIVER_DRI
@@ -101,6 +102,10 @@ config MESALIB_DRI_R300
 	bool
 	prompt "r300"
 
+config MESALIB_DRI_R600
+	bool
+	prompt "r600"
+
 config MESALIB_DRI_RADEON
 	bool
 	prompt "radeon"
@@ -113,10 +118,6 @@ config MESALIB_DRI_MGA
 	bool
 	prompt "mga"
 
-config MESALIB_DRI_S3V
-	bool
-	prompt "s3v"
-
 config MESALIB_DRI_SAVAGE
 	bool
 	prompt "savage"
@@ -131,18 +132,10 @@ config MESALIB_DRI_TDFX
 	bool
 	prompt "tdfx"
 
-config MESALIB_DRI_TRIDENT
-	bool
-	prompt "trident"
-
 config MESALIB_DRI_UNICHROME
 	bool
 	prompt "unichrome"
 
-config MESALIB_DRI_FFB
-	bool
-	prompt "ffb"
-
 endmenu
 
 endif
diff --git a/rules/mesalib.make b/rules/mesalib.make
index ac39670bf..7f79b6750 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -19,7 +19,7 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
 #
 # Paths and names
 #
-MESALIB_VERSION	:= 7.6.1
+MESALIB_VERSION	:= 7.8.2
 MESALIB		:= MesaLib-$(MESALIB_VERSION)
 MESALIB_SUFFIX	:= tar.bz2
 MESALIB_SOURCE	:= $(SRCDIR)/$(MESALIB).$(MESALIB_SUFFIX)
@@ -27,14 +27,14 @@ MESALIB_DIR	:= $(BUILDDIR)/Mesa-$(MESALIB_VERSION)
 
 MESALIB_URL	:= \
 	$(PTXCONF_SETUP_SFMIRROR)/mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.6.1/$(MESALIB).$(MESALIB_SUFFIX)
+	ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESALIB).$(MESALIB_SUFFIX)
 
 MESADEMOS		:= MesaDemos-$(MESALIB_VERSION)
 MESADEMOS_SOURCE	:= $(SRCDIR)/$(MESADEMOS).$(MESALIB_SUFFIX)
 
 MESADEMOS_URL		:= \
 	$(PTXCONF_SETUP_SFMIRROR)/mesa3d/$(MESADEMOS).$(MESALIB_SUFFIX) \
-	ftp://ftp.freedesktop.org/pub/mesa/7.6.1/$(MESADEMOS).$(MESALIB_SUFFIX)
+	ftp://ftp.freedesktop.org/pub/mesa/7.8.2/$(MESADEMOS).$(MESALIB_SUFFIX)
 
 # ----------------------------------------------------------------------------
 # Get
@@ -69,10 +69,6 @@ endif
 # Prepare
 # ----------------------------------------------------------------------------
 
-MESALIB_CONF_ENV := \
-	$(CROSS_ENV) \
-	MKLIB_OPTIONS="-linker-prefix $(PTXCONF_COMPILER_PREFIX)"
-
 MESALIB_COMPILE_ENV := $(CROSS_ENV_CC_FOR_BUILD)
 
 MESALIB_DRIVERS-$(PTXCONF_MESALIB_DRIVER_XLIB)		+= xlib
@@ -90,6 +86,7 @@ MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_MGA)		+= mga
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R128)		+= r128
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R200)		+= r200
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)		+= r300
+MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_R300)		+= r600
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_RADEON)	+= radeon
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_S3V)		+= s3v
 MESALIB_DRI_DRIVERS-$(PTXCONF_MESALIB_DRI_SAVAGE)	+= savage
@@ -114,6 +111,7 @@ MESALIB_AUTOCONF   := \
 	--disable-glw \
 	--disable-motif \
 	--disable-glut \
+	--disable-egl \
 	--with-driver=$(subst $(space),$(comma),$(MESALIB_DRIVERS-y)) \
 	--with-dri-drivers=$(subst $(space),$(comma),$(MESALIB_DRI_DRIVERS-y))
 
@@ -159,6 +157,16 @@ ifdef PTXCONF_MESALIB_DRIVER_OSMESA
 endif
 
 # ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/mesalib.compile:
+	@$(call targetinfo)
+	@cp $(PTXCONF_SYSROOT_HOST)/bin/mesa/* $(MESALIB_DIR)/src/glsl/apps
+	@$(call compile, MESALIB)
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
@@ -175,7 +183,7 @@ $(STATEDIR)/mesalib.install:
 # ----------------------------------------------------------------------------
 
 MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_DRI)  := 1.2
-MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_XLIB) := 1.5.070601
+MESALIB_GL_VERSION-$(PTXCONF_MESALIB_DRIVER_XLIB) := 1.5.07.8.2
 
 $(STATEDIR)/mesalib.targetinstall:
 	@$(call targetinfo)
@@ -324,19 +332,11 @@ ifdef PTXCONF_MESALIB_TOOLS_XROTFONTDEMO
 endif
 
 ifndef PTXCONF_MESALIB_DRIVER_OSMESA
-	@$(call install_copy, mesalib, 0, 0, 0644, -, \
-		 /usr/lib/libGL.so.$(MESALIB_GL_VERSION-y))
-	@$(call install_link, mesalib, libGL.so.$(MESALIB_GL_VERSION-y), /usr/lib/libGL.so.1)
-	@$(call install_link, mesalib, libGL.so.$(MESALIB_GL_VERSION-y), /usr/lib/libGL.so)
+	@$(call install_lib, mesalib, 0, 0, 0644, libGL)
 endif
 
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libGLU.so.1.3.070601)
-	@$(call install_link, mesalib, libGLU.so.1.3.070601, /usr/lib/libGLU.so.1)
-	@$(call install_link, mesalib, libGLU.so.1.3.070601, /usr/lib/libGLU.so)
-
-	@$(call install_copy, mesalib, 0, 0, 0644, -, /usr/lib/libOSMesa.so.7.6.1)
-	@$(call install_link, mesalib, libOSMesa.so.7.6.1, /usr/lib/libOSMesa.so.7)
-	@$(call install_link, mesalib, libOSMesa.so.7.6.1, /usr/lib/libOSMesa.so)
+	@$(call install_lib, mesalib, 0, 0, 0644, libGLU)
+	@$(call install_lib, mesalib, 0, 0, 0644, libOSMesa)
 
 	@$(call install_finish, mesalib)
 
diff --git a/rules/mpg123.make b/rules/mpg123.make
index c90712f1a..29aa1bdc2 100644
--- a/rules/mpg123.make
+++ b/rules/mpg123.make
@@ -42,6 +42,7 @@ $(MPG123_SOURCE):
 MPG123_CONF_TOOL	:= autoconf
 MPG123_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-audio=alsa,oss \
 	--with-default-audio=alsa
 # ----------------------------------------------------------------------------
diff --git a/rules/mtr.make b/rules/mtr.make
index f7373017b..313559307 100644
--- a/rules/mtr.make
+++ b/rules/mtr.make
@@ -44,6 +44,7 @@ MTR_ENV 	:= $(CROSS_ENV)
 #
 MTR_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--without-gtk
 
 # ----------------------------------------------------------------------------
diff --git a/rules/mysql.make b/rules/mysql.make
index 785580aa8..bc1f022b7 100644
--- a/rules/mysql.make
+++ b/rules/mysql.make
@@ -46,7 +46,6 @@ MYSQL_ENV := \
 #
 MYSQL_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--without-extra-tools \
 	--with-zlib-dir=$(SYSROOT)/usr \
 	--without-debug
 
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index c6e31c426..65b5f9458 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -50,10 +50,6 @@ config NET_SNMP_SNMPTRAPD
 	bool
 	prompt "agentx subagent code in snmptrapd"
 
-config NET_SNMP_IPV6
-	bool
-	prompt "support for IPv6"
-
 config NET_SNMP_LOCAL_SMUX
 	bool
 	prompt "restrict SMUX connections to localhost (by default)"
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 0b78af6e5..61600f5d0 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -45,6 +45,7 @@ NET_SNMP_BINCONFIG_GLOB := net-snmp-config
 #
 NET_SNMP_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-defaults \
 	--disable-manuals \
 	--with-mib-modules=$(PTXCONF_NET_SNMP_MIB_MODULES) \
@@ -127,12 +128,6 @@ else
 NET_SNMP_AUTOCONF += --disable-snmptrapd-subagent
 endif
 
-ifdef PTXCONF_NET_SNMP_IPV6
-NET_SNMP_AUTOCONF += --enable-ipv6
-else
-NET_SNMP_AUTOCONF += --disable-ipv6
-endif
-
 ifdef PTXCONF_NET_SNMP_LOCAL_SMUX
 NET_SNMP_AUTOCONF += --enable-local-smux
 else
diff --git a/rules/nfsutils.in b/rules/nfsutils.in
index b24c1b3d6..8b29270de 100644
--- a/rules/nfsutils.in
+++ b/rules/nfsutils.in
@@ -48,14 +48,6 @@ config	NFSUTILS_V4
 	help
           Enable support for version 4 of the NFS protocol.
 
-config	NFSUTILS_SECURE_STATD
-	bool
-	prompt "Only lockd can use statd (security)"
-
-config	NFSUTILS_RQUOTAD
-	bool
-	prompt "Enable rquotad"
-
 config	NFSUTILS_WITH_TCPWRAPPERS
 	bool
 	prompt "Use TCP Wrappers"
diff --git a/rules/nfsutils.make b/rules/nfsutils.make
index f3ca28148..69175f862 100644
--- a/rules/nfsutils.make
+++ b/rules/nfsutils.make
@@ -45,12 +45,12 @@ NFSUTILS_ENV 	:= \
 #
 NFSUTILS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--sbindir=/sbin \
 	--disable-gss \
 	--disable-kprefix \
 	--disable-tirpc \
 	--disable-ipv6 \
-	--enable-largefile \
 	--enable-shared \
 	--enable-static \
 	--with-rpcgen=internal
@@ -70,18 +70,6 @@ else
 NFSUTILS_AUTOCONF += --disable-nfsv4
 endif
 
-ifdef PTXCONF_NFSUTILS_SECURE_STATD
-NFSUTILS_AUTOCONF += --enable-secure-statd
-else
-NFSUTILS_AUTOCONF += --disable-secure-statd
-endif
-
-ifdef PTXCONF_NFSUTILS_RQUOTAD
-NFSUTILS_AUTOCONF += --enable-rquotad
-else
-NFSUTILS_AUTOCONF += --disable-rquotad
-endif
-
 ifdef PTXCONF_NFSUTILS_WITH_TCPWRAPPERS
 NFSUTILS_AUTOCONF += --with-tcp-wrappers=$(SYSROOT)
 else
diff --git a/rules/nmap.in b/rules/nmap.in
index 4fb136663..d24d4034e 100644
--- a/rules/nmap.in
+++ b/rules/nmap.in
@@ -18,9 +18,6 @@ if NMAP
 config NMAP_OPENSSL
        bool "openssl support"
 
-config NMAP_IPV6
-       bool "ipv6 support (in included libpcap)"
-
 config NMAP_SERVICES
 	bool "Install nmap-services"
 	default y
diff --git a/rules/nmap.make b/rules/nmap.make
index 84a4a7e1e..2d3a7e519 100644
--- a/rules/nmap.make
+++ b/rules/nmap.make
@@ -46,6 +46,7 @@ NMAP_ENV  := \
 # autoconf
 #
 NMAP_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-libpcre=$(SYSROOT)/usr \
 	--with-libpcap=included \
 	--without-liblua \
@@ -55,12 +56,6 @@ NMAP_AUTOCONF := $(CROSS_AUTOCONF_USR) \
 	--disable-optimizer-dbg \
 	--disable-yydebug
 
-ifdef PTXCONF_NMAP_IPV6
-NMAP_AUTOCONF += --enable-ipv6
-else
-NMAP_AUTOCONF += --disable-ipv6
-endif
-
 ifdef PTXCONF_NMAP_OPENSSL
 NMAP_AUTOCONF += --with-openssl=$(SYSROOT)
 else
diff --git a/rules/ntp.make b/rules/ntp.make
index a52672479..8b68c2fde 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -46,6 +46,7 @@ NTP_ENV 	:= \
 # autoconf
 #
 NTP_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--with-binsubdir=sbin \
 	--without-lineeditlibs \
 	--without-net-snmp-config
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
index d270e717b..35785e0cd 100644
--- a/rules/other/Toplevel.make
+++ b/rules/other/Toplevel.make
@@ -22,9 +22,7 @@ include $(RULESDIR)/other/Definitions.make
 include $(PTXDIST_PTXCONFIG)
 
 # might be non existent
-ifneq ($(wildcard $(PTXDIST_PLATFORMCONFIG)),)
-include $(PTXDIST_PLATFORMCONFIG)
-endif
+-include $(PTXDIST_PLATFORMCONFIG)
 
 # might be non existent
 ifneq ($(wildcard $(PTXDIST_COLLECTIONCONFIG)),)
@@ -41,9 +39,8 @@ include $(PTX_MAP_ALL_MAKE)
 include $(RULESDIR)/other/Namespace.make
 include $(wildcard $(PRERULESDIR)/*.make)
 
-ifneq ($(wildcard $(PROJECTPRERULESDIR)/*.make),)
+# might be non existent
 include $(wildcard $(PROJECTPRERULESDIR)/*.make)
-endif
 
 include $(PTX_DGEN_DEPS_PRE)
 include $(PTX_DGEN_RULESFILES_MAKE)
@@ -86,13 +83,12 @@ PTX_PACKAGES_SELECTED	:= \
 	$(CROSS_PACKAGES) \
 	$(HOST_PACKAGES)
 
-ifneq ($(wildcard $(POSTRULESDIR)/*.make),)
+# might be non existent
 include $(wildcard $(POSTRULESDIR)/*.make)
-endif
-
-ifneq ($(wildcard $(PROJECTPOSTRULESDIR)/*.make),)
 include $(wildcard $(PROJECTPOSTRULESDIR)/*.make)
-endif
+# install_alternative and install_copy has some configuration defined
+# dependencies. include the files specifying these dependencies.
+include $(wildcard $(STATEDIR)/*.deps)
 
 # ----------------------------------------------------------------------------
 # just the "print" target
diff --git a/rules/owfs.make b/rules/owfs.make
index 12a044042..d292e75c8 100644
--- a/rules/owfs.make
+++ b/rules/owfs.make
@@ -78,9 +78,7 @@ OWFS_AUTOCONF := \
 	--without-phpconfig \
 	--without-python \
 	--without-pythonconfig \
-	--without-tcl \
-	--with-fuseinclude=$(SYSROOT)/usr/include \
-	--with-fuselib=$(SYSROOT)/usr/lib
+	--without-tcl
 
 #	--with-libusb-config=PATH
 
diff --git a/rules/post/dump.make b/rules/post/dump.make
index 502cb3b9a..9931ee43e 100644
--- a/rules/post/dump.make
+++ b/rules/post/dump.make
@@ -51,7 +51,7 @@ prefixes	:= $(shell echo $(packages) | tr "a-z-" "A-Z_")
 symbols		:= $(foreach prefix,$(prefixes),$(foreach suffix,$(M2B_DUMP_SUFFIXES),$(prefix)$(suffix)))
 allsymbols	:= $(prefixes) $(shell echo $(symbols) | tr "a-z-" "A-Z_") $(M2B_DUMP_VARIABLES)
 
-dump-%: $(M2B).symbols
+$(addprefix dump-,$(sort $(allsymbols))): $(M2B).symbols
 	@echo 'M2B_$(call remove_quotes,$(*))="$(call remove_quotes,$($(*)))"' >> $(M2B).bash.tmp
 	@echo '$(call remove_quotes,$(*)) $(call remove_quotes,$($(*)))' >> $(M2B).tmp
 
diff --git a/rules/ppp.in b/rules/ppp.in
index 827d5003d..9842233d3 100644
--- a/rules/ppp.in
+++ b/rules/ppp.in
@@ -8,7 +8,6 @@ menuconfig PPP
 	select LIBC_RESOLV	if PPP_PLUGINS
 	select LIBC_CRYPT	if PPP_NEEDS_CRYPT
 	select LIBPCAP		if PPP_FILTER
-	select LIBPCAP_IPV6	if PPP_FILTER && PPP_IPV6
 	select OPENSSL		if PPP_SRP
 	help
 	  Point-to-Point Protocol (PPP) - daemon
@@ -32,12 +31,6 @@ config PPP_SUID
 	  Makes the pppd binary SUID for ruMakes the pppd binary SUID
 	  for Makes the pppd binary SUID for running as a server.
 
-config PPP_IPV6
-	bool
-	prompt "enable ipv6 support"
-	help
-	  Enable IPV6 support
-
 config PPP_IPX
 	bool
 	prompt "support IPX protocol"
diff --git a/rules/ppp.make b/rules/ppp.make
index 046175f88..f167d9b1d 100644
--- a/rules/ppp.make
+++ b/rules/ppp.make
@@ -58,7 +58,7 @@ $(STATEDIR)/ppp.prepare:
 	@cd $(PPP_DIR) && $(PPP_PATH) $(PPP_CONF_ENV) \
 		./configure --prefix=/usr --sysconfdir=/etc
 
-ifdef PTXCONF_PPP_IPV6
+ifdef PTXCONF_GLOBAL_IPV6
 	@$(call enable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y)
 else
 	@$(call disable_sh,$(PPP_DIR)/pppd/Makefile,HAVE_INET6=y)
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 1fd370731..39a283af2 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -190,6 +190,7 @@ CROSS_ENV_PKG_CONFIG := \
 # use AC_TRY_RUN and run cross compiled things on the development host
 #
 CROSS_ENV_AC := \
+	enable_option_checking=fatal \
 	ac_cv_file__dev_random=yes \
 	ac_cv_file__proc_self_exe=yes \
 	ac_cv_file__proc_self_fd=yes \
@@ -281,6 +282,18 @@ CROSS_CMAKE_ROOT := -DCMAKE_INSTALL_PREFIX=/    -DCMAKE_BUILD_TYPE:STRING=RelWit
 
 CROSS_QMAKE_OPT := -recursive
 
+ifdef PTXCONF_GLOBAL_IPV6
+GLOBAL_IPV6_OPTION := --enable-ipv6
+else
+GLOBAL_IPV6_OPTION := --disable-ipv6
+endif
+
+ifdef PTXCONF_GLOBAL_LARGE_FILE
+GLOBAL_LARGE_FILE_OPTION := --enable-largefile
+else
+GLOBAL_LARGE_FILE_OPTION := --disable-largefile
+endif
+
 # ----------------------------------------------------------------------------
 # HOST stuff
 # ----------------------------------------------------------------------------
diff --git a/rules/pre/xorg-dirs.make b/rules/pre/xorg-dirs.make
index 1ff803f30..8c8896e77 100644
--- a/rules/pre/xorg-dirs.make
+++ b/rules/pre/xorg-dirs.make
@@ -19,12 +19,6 @@ else
 XORG_OPTIONS_TRANS	+= --disable-tcp-transport
 endif
 
-ifdef PTXCONF_XORG_OPTIONS_TRANS_IPV6
-XORG_OPTIONS_TRANS	+= --enable-ipv6
-else
-XORG_OPTIONS_TRANS	+= \
-	--disable-ipv6 \
-	--disable-IPV6
-endif
+XORG_OPTIONS_TRANS	+= $(GLOBAL_IPV6_OPTION)
 
 # vim: syntax=make
diff --git a/rules/proftpd.make b/rules/proftpd.make
index d9b655351..c84460684 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -44,7 +44,9 @@ PROFTPD_COMPILE_ENV	:= $(CROSS_ENV_CC_FOR_BUILD)
 #
 # autoconf
 #
-PROFTPD_AUTOCONF	:= $(CROSS_AUTOCONF_USR)
+PROFTPD_AUTOCONF	:= \
+	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION)
 
 ifdef PTXCONF_PROFTPD_PAM
 PROFTPD_AUTOCONF += --enable-auth-pam
diff --git a/rules/ptrtd.in b/rules/ptrtd.in
index ba72589c0..a0fb0027c 100644
--- a/rules/ptrtd.in
+++ b/rules/ptrtd.in
@@ -7,7 +7,7 @@ config PTRTD
 	  This is a Portable Transport Relay Translator Daemon (pTRTd)
 	  as specified by RFC 3142 (tcp, udp)
 
-	  Beware: This is rather old vodoo, last upstream update was
+	  Beware: This is rather old voodoo, last upstream update was
 	  in 2002. This ptxdist package ist provided primarily for
 	  test environments, ipv6 transition planing, etc.
 
diff --git a/rules/python.make b/rules/python.make
index ecf183b4b..f73af6aa0 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -55,13 +55,13 @@ PYTHON_BINCONFIG_GLOB := ""
 #
 PYTHON_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--enable-shared \
-	--with-cyclic-gc \
 	--with-pymalloc \
 	--with-signal-module \
 	--with-threads \
 	--with-wctype-functions \
-	--without-cxx
+	--without-doc-strings
 
 PYTHON_MAKEVARS := \
 	PGEN_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/pgen
diff --git a/rules/python3.make b/rules/python3.make
index c005a1ff2..5eaca659b 100644
--- a/rules/python3.make
+++ b/rules/python3.make
@@ -43,7 +43,7 @@ $(PYTHON3_SOURCE):
 PYTHON3_PATH	:= PATH=$(CROSS_PATH)
 PYTHON3_ENV 	:= \
 	$(CROSS_ENV) \
-	PYTHON3_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) \
+	PYTHON_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/python$(PYTHON3_MAJORMINOR) \
 	ac_cv_have_chflags=no \
 	ac_cv_have_lchflags=no \
 	ac_cv_py_format_size_t=yes \
@@ -56,13 +56,13 @@ PYTHON3_BINCONFIG_GLOB := ""
 #
 PYTHON3_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--enable-shared \
-	--with-cyclic-gc \
 	--with-pymalloc \
 	--with-signal-module \
 	--with-threads \
 	--with-wctype-functions \
-	--without-cxx
+	--without-doc-strings
 
 PYTHON3_MAKEVARS := \
 	PGEN_FOR_BUILD=$(PTXCONF_SYSROOT_HOST)/bin/pgen
diff --git a/rules/qt4.in b/rules/qt4.in
index 027de09ef..cdb1c7f7b 100644
--- a/rules/qt4.in
+++ b/rules/qt4.in
@@ -34,9 +34,9 @@ menuconfig QT4
 	select XORG_PROTO_INPUT		if QT4_X11_XINPUT
 	select XORG_LIB_XI		if QT4_X11_XINPUT
 
-	prompt "Qt Embedded                   "
+	prompt "qt                            "
 	help
-	  Qt Embedded is Trolltech's Widget Library for Embedded Linux.
+	  Qt is Nokia's Widget Library for Linux.
 
 if QT4
 
@@ -46,7 +46,7 @@ config QT4_SHARED
 	bool
 	prompt "build shared libraries"
 	help
-	  If selected the shared Qt Embedded Libraries are built
+	  If selected the shared Qt Libraries are built
 	  and installed.
 
 choice
@@ -665,14 +665,12 @@ config QT4_DBUS_NONE
 config QT4_DBUS_LOAD
 	bool "load    "
 	select QT4_BUILD_XML
-	select QT4_BUILD_SCRIPT
 	help
 	  Build Qt dbus support and dynamically load libdbus-1.
 
 config QT4_DBUS_LINK
 	bool "link    "
 	select QT4_BUILD_XML
-	select QT4_BUILD_SCRIPT
 	help
 	  Build Qt dbus support and link to libdbus-1.
 endchoice
diff --git a/rules/qt4.make b/rules/qt4.make
index 7abd49998..2e8d4c0cf 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -79,7 +79,6 @@ QT4_AUTOCONF := \
 	-release \
 	-no-rpath \
 	-no-fast \
-	-no-largefile \
 	-no-accessibility \
 	-no-sql-ibase \
 	-no-sql-mysql \
@@ -109,6 +108,12 @@ else
 QT4_AUTOCONF += -no-iconv
 endif
 
+ifdef PTXCONF_GLOBAL_LARGE_FILE
+QT4_AUTOCONF += -largefile
+else
+QT4_AUTOCONF += -no-largefile
+endif
+
 ifdef PTXCONF_QT4_PLATFORM_EMBEDDED
 QT4_AUTOCONF += \
 	-embedded $(QT4_ARCH) \
@@ -829,9 +834,11 @@ ifdef PTXCONF_QT4_GFX_POWERVR_PLUGIN
 		/usr/lib/libpvrQWSWSEGL.so)
 endif
 ifneq ($(PTXCONF_QT4_DBUS_LOAD)$(PTXCONF_QT4_DBUS_LINK),)
+ifdef PTXCONF_QT4_BUILD_SCRIPT
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
 		/usr/plugins/script/libqtscriptdbus.$(QT4_PLUGIN_EXT))
 endif
+endif
 ifdef PTXCONF_QT4_GIF_INTERNAL
 	@$(call install_copy, qt4, 0, 0, 0644, -, \
 		/usr/plugins/imageformats/libqgif.$(QT4_PLUGIN_EXT))
diff --git a/rules/rsync.in b/rules/rsync.in
index 32f3e4359..193e8f87e 100644
--- a/rules/rsync.in
+++ b/rules/rsync.in
@@ -13,19 +13,6 @@ if RSYNC
 
 comment "build options   ---"
 
-config RSYNC_IPV6
-	bool
-	prompt "Support IPV6"
-	help
-	  This switch enables IPV6 support in rsync
-
-config RSYNC_LARGE_FILE
-	bool
-	default y
-	prompt "Large file support"
-	help
-	  Support for large files
-
 config RSYNC_CONFIG_FILE
 	string
 	default "/etc/rsyncd.conf"
diff --git a/rules/rsync.make b/rules/rsync.make
index b09e1a5c7..da2f2fd6b 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -46,23 +46,13 @@ RSYNC_ENV 	:= \
 #
 RSYNC_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--target=$(PTXCONF_GNU_TARGET) \
 	--with-included-popt \
 	--disable-debug \
 	--disable-locale
 
-ifdef PTXCONF_RSYNC_LARGE_FILE
-RSYNC_AUTOCONF += --enable-largefile
-else
-RSYNC_AUTOCONF += --disable-largefile
-endif
-
-ifdef PTXCONF_RSYNC_IPV6
-RSYNC_AUTOCONF += --enable-ipv6
-else
-RSYNC_AUTOCONF += --disable-ipv6
-endif
-
 ifneq ($(call remove_quotes,$(PTXCONF_RSYNC_CONFIG_FILE)),)
 RSYNC_AUTOCONF += --with-rsyncd-conf=$(PTXCONF_RSYNC_CONFIG_FILE)
 endif
diff --git a/rules/rsync3.in b/rules/rsync3.in
index ec22f3cfa..4e1b6e7d9 100644
--- a/rules/rsync3.in
+++ b/rules/rsync3.in
@@ -11,19 +11,6 @@ menuconfig RSYNC3
 
 if RSYNC3
 
-config RSYNC3_IPV6
-	bool
-	prompt "Support IPV6"
-	help
-	  This switch enables IPV6 support in rsync
-
-config RSYNC3_LARGE_FILE
-	bool
-	default y
-	prompt "Large file support"
-	help
-	  Support for large files
-
 config RSYNC3_STARTSCRIPT
 	bool
 	default y
diff --git a/rules/rsync3.make b/rules/rsync3.make
index 902214b79..6fcc3fdb6 100644
--- a/rules/rsync3.make
+++ b/rules/rsync3.make
@@ -44,22 +44,12 @@ RSYNC3_ENV 	:= $(CROSS_ENV)
 #
 RSYNC3_AUTOCONF  := \
 	 $(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--with-included-popt \
 	--disable-debug \
 	--disable-locale
 
-ifdef PTXCONF_RSYNC3_LARGE_FILE
-RSYNC3_AUTOCONF += --enable-largefile
-else
-RSYNC3_AUTOCONF += --disable-largefile
-endif
-
-ifdef PTXCONF_RSYNC3_IPV6
-RSYNC3_AUTOCONF += --enable-ipv6
-else
-RSYNC3_AUTOCONF += --disable-ipv6
-endif
-
 ifneq ($(call remove_quotes,$(PTXCONF_RSYNC3_CONFIG_FILE)),)
 RSYNC3_AUTOCONF += --with-rsync3d-conf=$(PTXCONF_RSYNC3_CONFIG_FILE)
 endif
diff --git a/rules/sdl.in b/rules/sdl.in
index 561bb13d8..39ceca57d 100644
--- a/rules/sdl.in
+++ b/rules/sdl.in
@@ -47,13 +47,6 @@ config SDL_TIMERS
 	help
 	  FIXME
 
-config SDL_ENDIAN
-	bool
-	prompt "SDL Endian Support"
-	default y
-	help
-	  FIXME
-
 config SDL_FILE
 	bool
 	prompt "SDL File Support"
diff --git a/rules/sdl.make b/rules/sdl.make
index 89fdef52a..bf1ed19e6 100644
--- a/rules/sdl.make
+++ b/rules/sdl.make
@@ -226,12 +226,6 @@ else
 SDL_AUTOCONF += --disable-timers
 endif
 
-ifdef PTXCONF_SDL_ENDIAN
-SDL_AUTOCONF += --enable-endian
-else
-SDL_AUTOCONF += --disable-endian
-endif
-
 ifdef PTXCONF_SDL_FILE
 SDL_AUTOCONF += --enable-file
 else
@@ -251,19 +245,16 @@ SDL_AUTOCONF += --disable-nasm
 endif
 
 SDL_AUTOCONF += \
-	--disable-debug \
-	--disable-strict-ansi \
 	--disable-video-ps2gs \
 	--disable-video-ggi \
 	--disable-video-svga \
 	--disable-video-vgl \
-	--disable-video-xbios \
-	--disable-video-gem \
+	--disable-xbios \
+	--disable-gem \
 	--enable-assembly \
 	--enable-video-dummy \
 	--enable-pthreads \
 	--enable-pthread-sem \
-	--enable-sigaction \
 	--disable-stdio-redirect \
 	--disable-directx \
 	--disable-video-picogui \
diff --git a/rules/sqlite.in b/rules/sqlite.in
index fe984b772..1215f589c 100644
--- a/rules/sqlite.in
+++ b/rules/sqlite.in
@@ -27,11 +27,6 @@ comment "build options"
 #		prompt "UTF-8"
 #endchoice
 
-config SQLITE_DISABLE_LFS
-	bool
-	prompt "Disable large file support"
-
-
 choice
 	prompt "Temp. RAM storage"
 	default SQLITE_TEMPSTORE_NEVER
diff --git a/rules/sqlite.make b/rules/sqlite.make
index 1f0c32fa3..caa785ec5 100644
--- a/rules/sqlite.make
+++ b/rules/sqlite.make
@@ -47,6 +47,7 @@ SQLITE_ENV 	= \
 
 SQLITE_AUTOCONF	:= \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-releasemode \
 	--disable-amalgamation
 
@@ -90,12 +91,6 @@ else
 SQLITE_AUTOCONF += --disable-load-extension
 endif
 
-ifdef PTXCONF_SQLITE_DISABLE_LFS
-SQLITE_AUTOCONF += --disable-largefile
-else
-SQLITE_AUTOCONF += --enable-largefile
-endif
-
 ifdef PTXCONF_SQLITE_TCL
 SQLITE_AUTOCONF += \
 	--enable-tcl \
diff --git a/rules/syslogng.in b/rules/syslogng.in
index 52847b21a..c90cf3b59 100644
--- a/rules/syslogng.in
+++ b/rules/syslogng.in
@@ -15,12 +15,6 @@ menuconfig SYSLOGNG
 
 if SYSLOGNG
 
-config SYSLOGNG_IPV6
-	bool
-	prompt "Support ipv6"
-	help
-	  Enable ipv6 support, otherwise ipv4 is supported only
-
 config SYSLOGNG_TCP_WRAPPER
 	bool
 	prompt "tcpwrapper support"
diff --git a/rules/syslogng.make b/rules/syslogng.make
index ca51c7fe0..5d903326e 100644
--- a/rules/syslogng.make
+++ b/rules/syslogng.make
@@ -44,17 +44,12 @@ SYSLOGNG_ENV 	:= $(CROSS_ENV)
 #
 SYSLOGNG_AUTOCONF := \
 	$(CROSS_AUTOCONF_ROOT) \
+	$(GLOBAL_IPV6_OPTION) \
 	--enable-dynamic-linking \
 	--disable-debug \
 	--disable-sun-streams \
 	--disable-sun-door
 
-ifdef PTXCONF_SYSLOGNG_IPV6
-SYSLOGNG_AUTOCONF += --enable-ipv6
-else
-SYSLOGNG_AUTOCONF += --disable-ipv6
-endif
-
 ifdef PTXCONF_SYSLOGNG_TCP_WRAPPER
 SYSLOGNG_AUTOCONF += --enable-tcp-wrapper
 else
diff --git a/rules/tcpdump.in b/rules/tcpdump.in
index 3b0d07a98..debde63b8 100644
--- a/rules/tcpdump.in
+++ b/rules/tcpdump.in
@@ -31,12 +31,4 @@ config TCPDUMP_SMB
 	  Notes from configure, when this entry is checked:
 	   The SMB printer may have exploitable buffer overflows!!!
 
-config TCPDUMP_IPV6
-	bool
-	select LIBPCAP_IPV6
-	prompt "enable ipv6 (with ipv4) support"
-	help
-	  Enable this if you require ipv6 support. This also requires ipv6
-	  support in libpcap (already done if you check this entry)
-
 endif
diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index d0528f112..2e496fd95 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -44,6 +44,7 @@ TCPDUMP_ENV 	:= $(CROSS_ENV)
 #
 TCPDUMP_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	ac_cv_linux_vers=$(KERNEL_VERSION_MAJOR) \
 	td_cv_buggygetaddrinfo=no
 
@@ -61,12 +62,6 @@ else
 TCPDUMP_AUTOCONF += --disable-smb
 endif
 
-ifdef PTXCONF_TCPDUMP_IPV6
-TCPDUMP_AUTOCONF += --enable-ipv6
-else
-TCPDUMP_AUTOCONF += --disable-ipv6
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
diff --git a/rules/totd.in b/rules/totd.in
index f56af05e0..783b141ac 100644
--- a/rules/totd.in
+++ b/rules/totd.in
@@ -11,7 +11,7 @@ menuconfig TOTD
 	  and can be used as a DNS-ALG for NAT-PT or
 	  pTRTd based setups.
 
-	  Beware: This is rather old vodoo, last upstream update was
+	  Beware: This is rather old voodoo, last upstream update was
 	  in 2005. This ptxdist package ist provided primarily for
 	  test environments, ipv6 transition planing, etc.
 
diff --git a/rules/udev.in b/rules/udev.in
index c26977a55..f967367ea 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -9,7 +9,7 @@ menuconfig UDEV
 	select ACL		if UDEV_EXTRA_UDEV_ACL
 	select USBUTILS		if UDEV_EXTRA_USB_DB
 	select LIBUSB_COMPAT	if UDEV_EXTRA_HID2HCI
-	select LIBUSB_COMPAT	if UDEV_EXTRA_MODEM_MODESWITCH
+	select LIBUSB_COMPAT	if UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
 	select PCIUTILS		if UDEV_EXTRA_PCI_DB
 	help
 	  udev provides a dynamic device directory containing only the files for
@@ -90,13 +90,6 @@ menu "install options               "
 		help
 	  	  This will install some of the common keymaps shipped by udev.
 
-	config UDEV_COMMON_RULES
-		bool
-		prompt "install common udev rules"
-		help
-	  	  This will install some of the common rules shipped by udev, including
-		  rules for sound, isdn, md and device mapper.
-
 	config UDEV_CUST_RULES
 		bool
 		prompt "install customized udev rules"
@@ -203,9 +196,9 @@ if UDEV_EXTRAS
 		help
 		  Keymap support
 
-	config UDEV_EXTRA_MODEM_MODESWITCH
+	config UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
 		bool
-		prompt "modem-modeswitch"
+		prompt "mobile-action-modeswitch"
 		help
 		  Option UMTS Modem support
 
diff --git a/rules/udev.make b/rules/udev.make
index bef14f1fe..89b104c96 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -16,14 +16,11 @@ PACKAGES-$(PTXCONF_UDEV) += udev
 #
 # Paths and names
 #
-UDEV_VERSION	:= 150
+UDEV_VERSION	:= 158
 UDEV		:= udev-$(UDEV_VERSION)
 UDEV_SUFFIX	:= tar.bz2
 UDEV_SOURCE	:= $(SRCDIR)/$(UDEV).$(UDEV_SUFFIX)
 UDEV_DIR	:= $(BUILDDIR)/$(UDEV)
-ifdef PTXCONF_UDEV_COMMON_RULES
-UDEV_DEVPKG	:= NO
-endif
 
 UDEV_URL := \
 	http://www.kernel.org/pub/linux/utils/kernel/hotplug/$(UDEV).$(UDEV_SUFFIX) \
@@ -48,7 +45,6 @@ $(UDEV_SOURCE):
 UDEV_AUTOCONF := \
 	$(CROSS_AUTOCONF_ROOT) \
 	--libexecdir=/lib/udev \
-	--with-kernel-headers-dir=$(PTXDIST_SYSROOT_TOOLCHAIN)/usr/include \
 	\
 	--disable-introspection \
 	--enable-shared
@@ -101,10 +97,10 @@ else
 UDEV_AUTOCONF	+= --disable-pcidb
 endif
 
-ifdef PTXCONF_UDEV_EXTRA_MODEM_MODESWITCH
-UDEV_AUTOCONF	+= --enable-modem-modeswitch
+ifdef PTXCONF_UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
+UDEV_AUTOCONF	+= --enable-mobile-action-modeswitch
 else
-UDEV_AUTOCONF	+= --disable-modem-modeswitch
+UDEV_AUTOCONF	+= --disable-mobile-action-modeswitch
 endif
 
 ifdef PTXCONF_UDEV_SELINUX
@@ -190,39 +186,6 @@ ifdef PTXCONF_UDEV_DEFAULT_KEYMAPS
 	done
 endif
 
-ifdef PTXCONF_UDEV_COMMON_RULES
-#
-# these rules are not installed by default
-#
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-isdn.rules, \
-		/lib/udev/rules.d/40-isdn.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-zaptel.rules, \
-		/lib/udev/rules.d/40-zaptel.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-s390.rules, \
-		/lib/udev/rules.d/40-s390.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-pilot-links.rules, \
-		/lib/udev/rules.d/40-pilot-links.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-ppc.rules, \
-		/lib/udev/rules.d/40-ppc.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-infiniband.rules, \
-		/lib/udev/rules.d/40-infiniband.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-ia64.rules, \
-		/lib/udev/rules.d/40-ia64.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/64-device-mapper.rules, \
-		/lib/udev/rules.d/64-device-mapper.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/64-md-raid.rules, \
-		/lib/udev/rules.d/64-md-raid.rules, n);
-endif
-
 ifdef PTXCONF_UDEV_CUST_RULES
 	@if [ -d $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/ ]; then \
 		cd $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/; \
@@ -333,12 +296,10 @@ ifdef PTXCONF_UDEV_EXTRA_KEYMAP
 		/lib/udev/rules.d/95-keymap.rules,n)
 endif
 
-ifdef PTXCONF_UDEV_EXTRA_MODEM_MODESWITCH
-	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/modem-modeswitch)
-	@$(call install_copy, udev, 0, 0, 0644, -, \
-		/lib/udev/rules.d/61-option-modem-modeswitch.rules,n)
+ifdef PTXCONF_UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/mobile-action-modeswitch)
 	@$(call install_copy, udev, 0, 0, 0644, -, \
-		/lib/udev/rules.d/61-mobile-action.rules,n)
+		/lib/udev/rules.d/61-mobile-action.rules)
 endif
 
 ifdef PTXCONF_UDEV_EXTRA_PATH_ID
@@ -393,9 +354,7 @@ ifdef PTXCONF_UDEV_EXTRA_WRITE_NET_RULES
 endif
 
 ifdef PTXCONF_UDEV_LIBUDEV
-	@$(call install_copy, udev, 0, 0, 0644, -, /lib/libudev.so.0.6.0)
-	@$(call install_link, udev, libudev.so.0.6.0, /lib/libudev.so.0)
-	@$(call install_link, udev, libudev.so.0.6.0, /lib/libudev.so)
+	@$(call install_lib, udev, 0, 0, 0644, libudev)
 endif
 
 ifdef PTXCONF_UDEV_LIBGUDEV
diff --git a/rules/udisks.make b/rules/udisks.make
index 3526d4366..101fa78c8 100644
--- a/rules/udisks.make
+++ b/rules/udisks.make
@@ -40,9 +40,9 @@ $(UDISKS_SOURCE):
 #
 UDISKS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-shared \
 	--enable-static \
-	--disable-largefile \
 	--disable-ansi \
 	--disable-man-pages \
 	--disable-gtk-doc \
diff --git a/rules/usbutils.make b/rules/usbutils.make
index 38303f38b..3775a5daa 100644
--- a/rules/usbutils.make
+++ b/rules/usbutils.make
@@ -45,7 +45,7 @@ USBUTILS_ENV 	:= $(CROSS_ENV)
 #
 USBUTILS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--enable-largefile \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-zlib
 
 # ----------------------------------------------------------------------------
diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index d61c0ac26..147eba469 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -51,10 +51,10 @@ UTIL_LINUX_NG_ENV 	:= \
 #
 UTIL_LINUX_NG_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--$(call ptx/wwo, PTXCONF_UTIL_LINUX_NG_USES_NCURSES)-ncurses \
 	--enable-shared \
 	--enable-static \
-	--enable-largefile \
 	--disable-nls \
 	--disable-rpath \
 	--disable-arch \
diff --git a/rules/wget.make b/rules/wget.make
index 5d64cd493..477359219 100644
--- a/rules/wget.make
+++ b/rules/wget.make
@@ -44,6 +44,7 @@ WGET_ENV 	:= $(CROSS_ENV)
 #
 WGET_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--without-socks \
 	--without-ssl
 
diff --git a/rules/wireshark.in b/rules/wireshark.in
index ab8ba69a3..70de2d02c 100644
--- a/rules/wireshark.in
+++ b/rules/wireshark.in
@@ -26,12 +26,5 @@ config WIRESHARK_TSHARK
 #	help
 #	  This is the graphical version of wireshark
 #
-# FIXME: Not tested yet
-#config WIRESHARK_IPV6
-#	bool
-#	prompt "support ipv6"
-#	help
-#	  Activate this to support ipv6 in wireshark
-#
 
 endif
diff --git a/rules/wireshark.make b/rules/wireshark.make
index 3db1cca6d..a846f4bad 100644
--- a/rules/wireshark.make
+++ b/rules/wireshark.make
@@ -44,6 +44,7 @@ WIRESHARK_ENV 	:= $(CROSS_ENV)
 #
 WIRESHARK_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
+	$(GLOBAL_IPV6_OPTION) \
 	--disable-usr-local \
 	--disable-threads \
 	--disable-profile-build \
@@ -68,12 +69,6 @@ else
 WIRESHARK_AUTOCONF	+= --disable-wireshark
 endif
 
-ifdef PTXCONF_WIRESHARK_IPV6
-WIRESHARK_AUTOCONF	+= --enable-ipv6
-else
-WIRESHARK_AUTOCONF	+= --disable-ipv6
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-app-xauth.make b/rules/xorg-app-xauth.make
index c36ce9fd2..601412371 100644
--- a/rules/xorg-app-xauth.make
+++ b/rules/xorg-app-xauth.make
@@ -43,6 +43,7 @@ XORG_APP_XAUTH_ENV 	:= $(CROSS_ENV)
 #
 XORG_APP_XAUTH_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make
index 1fe42364a..21b3e7526 100644
--- a/rules/xorg-app-xdm.make
+++ b/rules/xorg-app-xdm.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_APP_XDM) += xorg-app-xdm
 #
 # Paths and names
 #
-XORG_APP_XDM_VERSION	:= 1.1.9
+XORG_APP_XDM_VERSION	:= 1.1.10
 XORG_APP_XDM		:= xdm-$(XORG_APP_XDM_VERSION)
 XORG_APP_XDM_SUFFIX	:= tar.bz2
 XORG_APP_XDM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
@@ -57,7 +57,6 @@ XORG_APP_XDM_AUTOCONF += --disable-secure-rpc
 endif
 
 XORG_APP_XDM_AUTOCONF += --enable-xpm-logos	# Display xpm logos in greeter
-XORG_APP_XDM_AUTOCONF += --disable-xprint	# FIXME XPrint support
 XORG_APP_XDM_AUTOCONF += --enable-dynamic-greeter # Build greeter as dynamically loaded shared object
 XORG_APP_XDM_AUTOCONF += --without-pam		# FXIME
 
diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make
index b80a534ed..a23114323 100644
--- a/rules/xorg-app-xinit.make
+++ b/rules/xorg-app-xinit.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_APP_XINIT) += xorg-app-xinit
 #
 # Paths and names
 #
-XORG_APP_XINIT_VERSION	:= 1.2.0
+XORG_APP_XINIT_VERSION	:= 1.2.1
 XORG_APP_XINIT		:= xinit-$(XORG_APP_XINIT_VERSION)
 XORG_APP_XINIT_SUFFIX	:= tar.bz2
 XORG_APP_XINIT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make
index 78e42b780..7480a167d 100644
--- a/rules/xorg-driver-input-evdev.make
+++ b/rules/xorg-driver-input-evdev.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_EVDEV) += xorg-driver-input-evdev
 #
 # Paths and names
 #
-XORG_DRIVER_INPUT_EVDEV_VERSION	:= 2.3.2
+XORG_DRIVER_INPUT_EVDEV_VERSION	:= 2.4.0
 XORG_DRIVER_INPUT_EVDEV		:= xf86-input-evdev-$(XORG_DRIVER_INPUT_EVDEV_VERSION)
 XORG_DRIVER_INPUT_EVDEV_SUFFIX	:= tar.bz2
 XORG_DRIVER_INPUT_EVDEV_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make
index 908c0ef7f..c9cbea6fb 100644
--- a/rules/xorg-driver-video-ati.make
+++ b/rules/xorg-driver-video-ati.make
@@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_XORG_DRIVER_VIDEO_ATI) += xorg-driver-vid
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_ATI_VERSION	:= 6.12.4
+XORG_DRIVER_VIDEO_ATI_VERSION	:= 6.13.1
 XORG_DRIVER_VIDEO_ATI		:= xf86-video-ati-$(XORG_DRIVER_VIDEO_ATI_VERSION)
 XORG_DRIVER_VIDEO_ATI_SUFFIX	:= tar.bz2
 XORG_DRIVER_VIDEO_ATI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX)
diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make
index 3f3479fac..9d1db85ff 100644
--- a/rules/xorg-driver-video-dummy.make
+++ b/rules/xorg-driver-video-dummy.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_DUMMY) += xorg-driver-video-dummy
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_DUMMY_VERSION	:= 0.3.3
+XORG_DRIVER_VIDEO_DUMMY_VERSION	:= 0.3.4
 XORG_DRIVER_VIDEO_DUMMY		:= xf86-video-dummy-$(XORG_DRIVER_VIDEO_DUMMY_VERSION)
 XORG_DRIVER_VIDEO_DUMMY_SUFFIX	:= tar.bz2
 XORG_DRIVER_VIDEO_DUMMY_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make
index 3fb73be45..a1eeb5334 100644
--- a/rules/xorg-driver-video-fbdev.make
+++ b/rules/xorg-driver-video-fbdev.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_FBDEV) += xorg-driver-video-fbdev
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_FBDEV_VERSION	:= 0.4.1
+XORG_DRIVER_VIDEO_FBDEV_VERSION	:= 0.4.2
 XORG_DRIVER_VIDEO_FBDEV		:= xf86-video-fbdev-$(XORG_DRIVER_VIDEO_FBDEV_VERSION)
 XORG_DRIVER_VIDEO_FBDEV_SUFFIX	:= tar.bz2
 XORG_DRIVER_VIDEO_FBDEV_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
diff --git a/rules/xorg-driver-video-intel.make b/rules/xorg-driver-video-intel.make
index 752b2c953..79ee2abb2 100644
--- a/rules/xorg-driver-video-intel.make
+++ b/rules/xorg-driver-video-intel.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_XORG_DRIVER_VIDEO_INTEL) += xorg-driver-v
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_INTEL_VERSION	:= 2.10.0
+XORG_DRIVER_VIDEO_INTEL_VERSION	:= 2.12.0
 XORG_DRIVER_VIDEO_INTEL		:= xf86-video-intel-$(XORG_DRIVER_VIDEO_INTEL_VERSION)
 XORG_DRIVER_VIDEO_INTEL_SUFFIX	:= tar.bz2
 XORG_DRIVER_VIDEO_INTEL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_VIDEO_INTEL).$(XORG_DRIVER_VIDEO_INTEL_SUFFIX)
diff --git a/rules/xorg-font-speedo.in b/rules/xorg-font-speedo.in
index c319915f2..915ef0aad 100644
--- a/rules/xorg-font-speedo.in
+++ b/rules/xorg-font-speedo.in
@@ -2,7 +2,6 @@
 
 menuconfig XORG_FONT_SPEEDO
 	depends on MENU_XORG_FONTS
-	select XORG_LIB_XFONT_SPEEDO_FONTS
 	bool
 	prompt "xorg speedo fonts             "
 
diff --git a/rules/xorg-font-type1.in b/rules/xorg-font-type1.in
index bdd30ad65..3ba10059a 100644
--- a/rules/xorg-font-type1.in
+++ b/rules/xorg-font-type1.in
@@ -2,7 +2,6 @@
 
 menuconfig XORG_FONT_TYPE1
 	depends on MENU_XORG_FONTS
-	select XORG_LIB_XFONT_TYPE1_FONTS
 	bool
 	prompt "xorg scalable fonts           "
 
diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make
index 85b7133c8..f70a7d336 100644
--- a/rules/xorg-lib-FS.make
+++ b/rules/xorg-lib-FS.make
@@ -43,6 +43,7 @@ XORG_LIB_FS_ENV 	:= $(CROSS_ENV)
 # autoconf
 #
 XORG_LIB_FS_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	$(XORG_OPTIONS_TRANS) \
 	--disable-malloc0returnsnull
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index cfa0bd3a0..95ebca1da 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-x11
 #
 # Paths and names
 #
-XORG_LIB_X11_VERSION	:= 1.3.3
+XORG_LIB_X11_VERSION	:= 1.3.4
 XORG_LIB_X11		:= libX11-$(XORG_LIB_X11_VERSION)
 XORG_LIB_X11_SUFFIX	:= tar.bz2
 XORG_LIB_X11_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make
index b98f175bd..600b3b6a2 100644
--- a/rules/xorg-lib-Xcomposite.make
+++ b/rules/xorg-lib-Xcomposite.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XCOMPOSITE) += xorg-lib-xcomposite
 #
 # Paths and names
 #
-XORG_LIB_XCOMPOSITE_VERSION	:= 0.4.1
+XORG_LIB_XCOMPOSITE_VERSION	:= 0.4.2
 XORG_LIB_XCOMPOSITE		:= libXcomposite-$(XORG_LIB_XCOMPOSITE_VERSION)
 XORG_LIB_XCOMPOSITE_SUFFIX	:= tar.bz2
 XORG_LIB_XCOMPOSITE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make
index 9374721fa..4d6d25f8e 100644
--- a/rules/xorg-lib-Xdamage.make
+++ b/rules/xorg-lib-Xdamage.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XDAMAGE) += xorg-lib-xdamage
 #
 # Paths and names
 #
-XORG_LIB_XDAMAGE_VERSION	:= 1.1.2
+XORG_LIB_XDAMAGE_VERSION	:= 1.1.3
 XORG_LIB_XDAMAGE		:= libXdamage-$(XORG_LIB_XDAMAGE_VERSION)
 XORG_LIB_XDAMAGE_SUFFIX		:= tar.bz2
 XORG_LIB_XDAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make
index 3c17ad86e..e4ac330ec 100644
--- a/rules/xorg-lib-Xext.make
+++ b/rules/xorg-lib-Xext.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XEXT) += xorg-lib-xext
 #
 # Paths and names
 #
-XORG_LIB_XEXT_VERSION	:= 1.1.1
+XORG_LIB_XEXT_VERSION	:= 1.1.2
 XORG_LIB_XEXT		:= libXext-$(XORG_LIB_XEXT_VERSION)
 XORG_LIB_XEXT_SUFFIX	:= tar.bz2
 XORG_LIB_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make
index ff4046292..d0010cbf1 100644
--- a/rules/xorg-lib-Xfixes.make
+++ b/rules/xorg-lib-Xfixes.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFIXES) += xorg-lib-xfixes
 #
 # Paths and names
 #
-XORG_LIB_XFIXES_VERSION	:= 4.0.4
+XORG_LIB_XFIXES_VERSION	:= 4.0.5
 XORG_LIB_XFIXES		:= libXfixes-$(XORG_LIB_XFIXES_VERSION)
 XORG_LIB_XFIXES_SUFFIX	:= tar.bz2
 XORG_LIB_XFIXES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
diff --git a/rules/xorg-lib-Xfont.in b/rules/xorg-lib-Xfont.in
index a35b6f0b8..5eb79db02 100644
--- a/rules/xorg-lib-Xfont.in
+++ b/rules/xorg-lib-Xfont.in
@@ -35,27 +35,6 @@ config XORG_LIB_XFONT_FONTSERVER
 	  This will support connections to font server.
 	  FIXME: xorg server fails when font server connections are disabled.
 
-config XORG_LIB_XFONT_TYPE1_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support type1 fonts"
-	help
-	  Enable Type 1 fonts in this X server.
-
-config XORG_LIB_XFONT_CID_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support CID fonts"
-	help
-	  Enable CID fonts in this X server.
-
-config XORG_LIB_XFONT_SPEEDO_FONTS
-	depends on XORG_LIB_XFONT
-	bool
-	prompt "Support Speedo fonts"
-	help
-	  Enable Speedo fonts in this X server.
-
 config XORG_LIB_XFONT_PCF_FONTS
 	depends on XORG_LIB_XFONT
 	bool
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index a868718ec..59dfa9d2c 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFONT) += xorg-lib-xfont
 #
 # Paths and names
 #
-XORG_LIB_XFONT_VERSION	:= 1.4.1
+XORG_LIB_XFONT_VERSION	:= 1.4.2
 XORG_LIB_XFONT		:= libXfont-$(XORG_LIB_XFONT_VERSION)
 XORG_LIB_XFONT_SUFFIX	:= tar.bz2
 XORG_LIB_XFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
@@ -44,7 +44,8 @@ XORG_LIB_XFONT_ENV 	:= $(CROSS_ENV)
 #
 XORG_LIB_XFONT_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	$(XORG_OPTIONS_TRANS)
+	$(XORG_OPTIONS_TRANS) \
+	--without-xmlto
 
 #
 # Use the global switch here to support freetype when
@@ -62,24 +63,6 @@ else
 XORG_LIB_XFONT_AUTOCONF	+= --disable-fc
 endif
 
-ifdef PTXCONF_XORG_LIB_XFONT_TYPE1_FONTS
-XORG_LIB_XFONT_AUTOCONF	+= --enable-type1
-else
-XORG_LIB_XFONT_AUTOCONF	+= --disable-type1
-endif
-
-ifdef PTXCONF_XORG_LIB_XFONT_CID_FONTS
-XORG_LIB_XFONT_AUTOCONF	+= --enable-cid
-else
-XORG_LIB_XFONT_AUTOCONF	+= --disable-cid
-endif
-
-ifdef PTXCONF_XORG_LIB_XFONT_SPEEDO_FONTS
-XORG_LIB_XFONT_AUTOCONF	+= --enable-speedo
-else
-XORG_LIB_XFONT_AUTOCONF	+= --disable-speedo
-endif
-
 ifdef PTXCONF_XORG_LIB_XFONT_PCF_FONTS
 XORG_LIB_XFONT_AUTOCONF	+= --enable-pcfformat
 else
diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
index 483088307..f7c43e9bc 100644
--- a/rules/xorg-lib-Xrender.make
+++ b/rules/xorg-lib-Xrender.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRENDER) += xorg-lib-xrender
 #
 # Paths and names
 #
-XORG_LIB_XRENDER_VERSION	:= 0.9.5
+XORG_LIB_XRENDER_VERSION	:= 0.9.6
 XORG_LIB_XRENDER		:= libXrender-$(XORG_LIB_XRENDER_VERSION)
 XORG_LIB_XRENDER_SUFFIX		:= tar.bz2
 XORG_LIB_XRENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index 3c723bb7f..1fecafa08 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XT) += xorg-lib-xt
 #
 # Paths and names
 #
-XORG_LIB_XT_VERSION	:= 1.0.7
+XORG_LIB_XT_VERSION	:= 1.0.8
 XORG_LIB_XT		:= libXt-$(XORG_LIB_XT_VERSION)
 XORG_LIB_XT_SUFFIX	:= tar.bz2
 XORG_LIB_XT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
@@ -44,8 +44,7 @@ XORG_LIB_XT_ENV 	:= $(CROSS_ENV)
 #
 XORG_LIB_XT_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-malloc0returnsnull \
-	--disable-install-makestrs
+	--disable-malloc0returnsnull
 
 ifdef PTXCONF_XORG_LIB_X11_XKB
 XORG_LIB_XT_AUTOCONF += --enable-xkb
diff --git a/rules/xorg-options.in b/rules/xorg-options.in
index 8c2d08728..5ab689a07 100644
--- a/rules/xorg-options.in
+++ b/rules/xorg-options.in
@@ -74,14 +74,5 @@ config XORG_OPTIONS_TRANS_TCP
 	 TCP socket transport. You will need this feature if your X server
 	 runs on one host and at least one X client on another host.
 
-config XORG_OPTIONS_TRANS_IPV6
-	bool
-	prompt "ipv6 support"
-	help
-	  Enable this if your X server needs IPv6 support. If the starting X
-	  server complains about missing IPv6 support you should disable this
-	  feature here due to the target environment does not support it (its
-	  useless in this case)
-
 endmenu
 
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 1076d1218..2e26c9391 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -188,13 +188,6 @@ config XORG_SERVER_XEPHYR
 	  Xnest this kind of server supports all new features (extensions). It
 	  doesn't depend on the features of the underlying X server.
 
-config XORG_SERVER_XSDL
-	bool
-	depends on BROKEN
-	prompt "xsdl server"
-	help
-	  FIXME
-
 config XORG_SERVER_XFAKE
 	bool
 	depends on BROKEN
@@ -229,10 +222,6 @@ endmenu
 
 menu "xorg options                  "
 
-config XORG_SERVER_OPT_NULL_ROOT_CURSOR
-	bool
-	prompt "null root cursor"
-
 config XORG_SERVER_OPT_AIGLX
 	bool
 	depends on BROKEN
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index fe57ddac2..602ae71f4 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server
 #
 # Paths and names
 #
-XORG_SERVER_VERSION	:= 1.7.5
+XORG_SERVER_VERSION	:= 1.8.2
 XORG_SERVER		:= xorg-server-$(XORG_SERVER_VERSION)
 XORG_SERVER_SUFFIX	:= tar.bz2
 XORG_SERVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
@@ -49,15 +49,19 @@ XORG_SERVER_ENV 	:= $(CROSS_ENV) \
 #
 # autoconf
 #
+# XORG_OPTIONS_TRANS adds:
+# --{en,dis}able-{unix,tcp}-transport
+# --{en,dis}able-ipv6
+#
 # use "=" here
 XORG_SERVER_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
 	$(XORG_OPTIONS_TRANS) \
+	$(GLOBAL_LARGE_FILE_OPTION) \
 	--enable-option-checking \
 	--disable-maintainer-mode \
 	--enable-dependency-tracking \
-	--enable-largefile \
-	--disable-werror \
+	--disable-strict-compilation \
 	--disable-debug \
 	--disable-unit-tests \
 	--disable-builddocs \
@@ -66,11 +70,13 @@ XORG_SERVER_AUTOCONF = \
 	--disable-xfree86-utils \
 	--disable-xquartz \
 	--disable-standalone-xpbproxy \
+	--disable-local-transport \
+	--without-doxygen \
 	--localstatedir=/var \
-	--with-xkb-output=/tmp
+	--with-xkb-output=/tmp \
+	--with-fontrootdir=$(XORG_FONTDIR)
 
 # FIXME
-# - what is XORG_OPTIONS_TRANS?
 # --enable-shared
 # --enable-static
 # --enable-install-libxf86config
@@ -83,12 +89,6 @@ else
 XORG_SERVER_AUTOCONF += --disable-config-udev
 endif
 
-ifdef PTXCONF_XORG_SERVER_OPT_NULL_ROOT_CURSOR
-XORG_SERVER_AUTOCONF += --enable-null-root-cursor
-else
-XORG_SERVER_AUTOCONF += --disable-null-root-cursor
-endif
-
 ifdef PTXCONF_XORG_SERVER_OPT_AIGLX
 XORG_SERVER_AUTOCONF += --enable-aiglx
 else
@@ -293,12 +293,6 @@ else
 XORG_SERVER_AUTOCONF += --disable-xephyr
 endif
 
-ifdef PTXCONF_XORG_SERVER_XSDL
-XORG_SERVER_AUTOCONF += --enable-xsdl
-else
-XORG_SERVER_AUTOCONF += --disable-xsdl
-endif
-
 ifdef PTXCONF_XORG_SERVER_XFAKE
 XORG_SERVER_AUTOCONF += --enable-xfake
 else
diff --git a/rules/zlib.make b/rules/zlib.make
index b860e2eba..3c9dc4768 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_ZLIB) += zlib
 #
 # Paths and names
 #
-ZLIB_VERSION	:= 1.2.3-ptx4
+ZLIB_VERSION	:= 1.2.5
 ZLIB		:= zlib-$(ZLIB_VERSION)
 ZLIB_SUFFIX	:= tar.bz2
-ZLIB_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(ZLIB).$(ZLIB_SUFFIX)
+ZLIB_URL	:= http://zlib.net/$(ZLIB).$(ZLIB_SUFFIX)
 ZLIB_SOURCE	:= $(SRCDIR)/$(ZLIB).$(ZLIB_SUFFIX)
 ZLIB_DIR	:= $(BUILDDIR)/$(ZLIB)
 ZLIB_LICENSE	:= zlib
@@ -37,17 +37,19 @@ $(ZLIB_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-ZLIB_PATH	:= PATH=$(CROSS_PATH)
-ZLIB_ENV 	:= $(CROSS_ENV)
+ZLIB_CONF_ENV := \
+	$(CROSS_ENV) \
+	CROSS_PREFIX=$(PTXCONF_COMPILER_PREFIX) \
+	CFLAGS="$(CROSS_CPPFLAGS) -O2 -g"
 
 #
 # autoconf
 #
 ZLIB_AUTOCONF := \
-	$(CROSS_AUTOCONF_USR)
+	--prefix=/usr
 
 ifdef PTXCONF_ZLIB_STATIC
-ZLIB_AUTOCONF += --enable-shared=no
+ZLIB_AUTOCONF += --static
 endif
 
 
@@ -69,9 +71,9 @@ ifndef PTXCONF_ZLIB_STATIC
 	@$(call install_fixup, zlib,DESCRIPTION,missing)
 
 	@$(call install_copy, zlib, 0, 0, 0644, -, \
-		/usr/lib/libz.so.1.2.3)
-	@$(call install_link, zlib, libz.so.1.2.3, /usr/lib/libz.so.1)
-	@$(call install_link, zlib, libz.so.1.2.3, /usr/lib/libz.so)
+		/usr/lib/libz.so.1.2.5)
+	@$(call install_link, zlib, libz.so.1.2.5, /usr/lib/libz.so.1)
+	@$(call install_link, zlib, libz.so.1.2.5, /usr/lib/libz.so)
 
 	@$(call install_finish, zlib)
 endif
diff --git a/scripts/git-ptx-patches b/scripts/git-ptx-patches
new file mode 100755
index 000000000..97105b9e2
--- /dev/null
+++ b/scripts/git-ptx-patches
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+PTX_PATCHES_HEADER="# generated by git-ptx-patches"
+
+function _md5sum() {
+	local sum=$(md5sum)
+	echo "# $sum git-ptx-patches magic"
+}
+
+if [ ! -L .ptxdist/patches ]; then
+	echo "Error: This is not patched by ptxdist. Aborting."
+	exit 1
+fi
+
+if [ ! -L .ptxdist/series ]; then
+	echo "Error: .ptxdist/series must be a symbolic link. Aborting."
+	exit 1
+fi
+
+remove_old=no
+
+if grep -q "$PTX_PATCHES_HEADER" .ptxdist/series; then
+	echo "Found series file generated by git-ptx-patches."
+	lines=$(cat .ptxdist/series | wc -l)
+	lines=$[lines-1]
+	magic=$(head -n$lines .ptxdist/series | _md5sum)
+	if grep -q "^$magic" .ptxdist/series; then
+		remove_old=yes
+	else
+		echo "Warning: .ptxdist/series was modified."
+	fi
+fi
+
+if [ "x$1" = "x--force-remove" ]; then
+	remove_old="force"
+fi
+
+case "$remove_old" in
+	"no") ;;
+	"yes")
+		echo "Removing old patches ..."
+		while read patch para; do
+			case "${patch}" in
+				""|"#"*) continue ;;
+				*) rm .ptxdist/patches/$patch ;;
+			esac
+		done < .ptxdist/series
+		;;
+	"force")
+		echo "Removing old patches (forced) ..."
+		find .ptxdist/patches/ | while read file; do
+			case "$file" in
+				".ptxdist/patches/") continue ;;
+				".ptxdist/patches/series") continue ;;
+				".ptxdist/patches/autogen.sh") continue ;;
+				*) rm -rf "$file" ;;
+			esac
+		done
+		;;
+esac
+
+echo "$PTX_PATCHES_HEADER" > .ptxdist/series
+git format-patch -N -o .ptxdist/patches/ base | sed -e 's,^.ptxdist/patches/,,' >> .ptxdist/series
+cat .ptxdist/series | _md5sum >> .ptxdist/series
+
+# The first line of the patch is 'From <some-git-hash> ...'
+# remove it to avoid unnecessary changes in the patch files.
+find .ptxdist/patches/ ! -type d | sed -e 's,^.ptxdist/patches/,,' | \
+while read patch para; do
+	case "$patch" in
+		"series"|"autogen.sh") continue ;;
+		*) ;;
+	esac
+	if grep -q "$patch" .ptxdist/series; then
+		p=".ptxdist/patches/$patch"
+		lines=$(cat "$p" | wc -l)
+		lines=$[lines-1]
+		tail -n$lines "$p" > ".$patch.ptx-patches"
+		mv ".$patch.ptx-patches" "$p"
+	else
+		echo "Old patch \"$patch\"!"
+	fi
+done
+
diff --git a/scripts/lib/ptxd_lib_cfgchg.sh b/scripts/lib/ptxd_lib_cfgchg.sh
index 5c1df058f..4e8e72098 100644
--- a/scripts/lib/ptxd_lib_cfgchg.sh
+++ b/scripts/lib/ptxd_lib_cfgchg.sh
@@ -62,6 +62,9 @@ ptxd_cfgchg_generate()
 
 ptxd_cfgchg()
 {
+    local cfg_old_tmp="${PTXDIST_TEMPDIR}/ptxconfig-diff.old"
+    local cfg_orig_tmp="${PTXDIST_TEMPDIR}/ptxconfig-diff.orig"
+
     for cfg in PTXDIST_PTXCONFIG PTXDIST_PLATFORMCONFIG; do
 	local cfg_orig="${!cfg}"
 	if [ \! -e "${cfg_orig}" ]; then
@@ -72,11 +75,17 @@ ptxd_cfgchg()
 	local cfg_old="${STATEDIR}/${!cfg_default#${PTXDIST_WORKSPACE}/}.deps_old"
 
 	if [ -e "${cfg_old}" ]; then
-	    diff -u "${cfg_old}" "${cfg_orig}" | \
-		ptxd_cfgchg_generate | \
-		xargs -0 -r rm -f --
+	    grep -v '^# ' "${cfg_orig}" >> "${cfg_orig_tmp}"
+	    grep -v '^# ' "${cfg_old}" >> "${cfg_old_tmp}"
 	fi
 
 	install -m644 "${cfg_orig}" "${cfg_old}" || return
     done
+    if [ -f "${cfg_orig_tmp}" ]; then
+	sort -u "${cfg_old_tmp}" -o "${cfg_old_tmp}"
+	sort -u "${cfg_orig_tmp}" -o "${cfg_orig_tmp}"
+	diff -u  "${cfg_old_tmp}" "${cfg_orig_tmp}" | \
+	    ptxd_cfgchg_generate | \
+	    xargs -0 -r rm -f --
+    fi
 }
diff --git a/scripts/lib/ptxd_lib_dgen.awk b/scripts/lib/ptxd_lib_dgen.awk
index f49af9eef..728fecd3c 100644
--- a/scripts/lib/ptxd_lib_dgen.awk
+++ b/scripts/lib/ptxd_lib_dgen.awk
@@ -321,8 +321,8 @@ END {
 				continue;
 
 			print \
-				"$(STATEDIR)/" this_pkg ".targetinstall: " \
-				"$(STATEDIR)/" this_dep ".targetinstall"	> DGEN_DEPS_POST;
+				"$(STATEDIR)/" this_pkg ".targetinstall.post: " \
+				"$(STATEDIR)/" this_dep ".targetinstall.post"	> DGEN_DEPS_POST;
 		}
 
 		#
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
index c677e0fa1..91b8ff190 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -86,6 +86,7 @@ ptxd_make_world_patchin_apply_git_init()
 	git commit -q -m "initial commit" --author="ptxdist-${PTXDIST_VERSION_FULL} <ptxdist@pengutronix.de>" &&
 	git tag "${pkg_pkg}" &&
 	git tag base &&
+	git config alias.ptx-patches "!sh ${PTXDIST_TOPDIR}/scripts/git-ptx-patches \"\$@\""
 	echo "patchin: git: done"
     fi
 }
diff --git a/scripts/lib/ptxd_make_xpkg_common.sh b/scripts/lib/ptxd_make_xpkg_common.sh
index b87daa6cf..5b925ec05 100644
--- a/scripts/lib/ptxd_make_xpkg_common.sh
+++ b/scripts/lib/ptxd_make_xpkg_common.sh
@@ -81,6 +81,7 @@ ptxd_make_xpkg_init() {
     pkg_xpkg_license_file="${ptx_state_dir}/${pkg_xpkg}.license"
 
     # packaging stuff
+    pkg_xpkg_install_deps="${ptx_state_dir}/${pkg_xpkg}.deps"
     pkg_xpkg_perms="${ptx_state_dir}/${pkg_xpkg}.perms"
     pkg_xpkg_cmds="${ptx_state_dir}/${pkg_xpkg}.cmds"
     pkg_xpkg_tmp="${ptx_pkg_dir}/${pkg_xpkg}.tmp"
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
index bdc100a2c..5d405246a 100644
--- a/scripts/lib/ptxd_make_xpkg_pkg.sh
+++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
@@ -72,6 +72,16 @@ ptxd_install_setup_src() {
 
     for src in "${list[@]}"; do
 	if [ -e "${src}" ]; then
+		# Since the dependency to the source files is dynamic we store
+		# the dependency information in a dependency file that can be
+		# included in the make files itself.
+		deprule="${ptx_state_dir}/${pkg_stamp}: \$(wildcard ${src})"
+
+		# Make the deps rule robust for varying installation paths, and
+		# make the deps rules file more readable.
+		deprule=${deprule//${PTXDIST_TOPDIR}/\$(PTXDIST_TOPDIR)}
+		deprule=${deprule//${PTXDIST_WORKSPACE}/\$(PTXDIST_WORKSPACE)}
+		echo "${deprule}" >> ${pkg_xpkg_install_deps}
 	    return
 	fi
     done
diff --git a/scripts/lib/ptxd_make_xpkg_prepare.sh b/scripts/lib/ptxd_make_xpkg_prepare.sh
index 079b13dd0..61b520c98 100644
--- a/scripts/lib/ptxd_make_xpkg_prepare.sh
+++ b/scripts/lib/ptxd_make_xpkg_prepare.sh
@@ -19,7 +19,8 @@ ptxd_make_xpkg_prepare() {
     rm -fr -- \
 	"${pkg_xpkg_tmp}" \
 	"${pkg_xpkg_cmds}" \
-	"${pkg_xpkg_perms}" &&
+	"${pkg_xpkg_perms}" \
+	"${pkg_xpkg_install_deps}" &&
     mkdir -p -- "${pkg_ipkg_control_dir}" &&
     touch "${pkg_xpkg_cmds}" || return
 
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index f626fdc05..7875ac93b 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -107,3 +107,9 @@ s/^\(\(# \)\?PTXCONF_GLIB_\)_\(.*$\)/\1\3/
 #
 s/^\(\(# \)\?PTXCONF_SUDO_\)_\(SENDMAIL\)/\1USE_\3/
 s/^\(\(# \)\?PTXCONF_SUDO_\)_\(ETC_SUDOERS\)/\1INSTALL_\3/
+
+#
+# symbol : UDEV_EXTRA_MODEM_MODESWITCH	-> UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
+# reason : upstream name changed
+#
+s/^\(\(# \)\?PTXCONF_UDEV_EXTRA_\)MODEM\(_MODESWITCH.*$\)/\1MOBILE_ACTION\3/
diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper
index c84105858..927693aa6 100755
--- a/scripts/pkg-config-wrapper
+++ b/scripts/pkg-config-wrapper
@@ -15,12 +15,20 @@ for ((i = 1; i <= ${#}; i++)); do
     esac
 done
 
+#
+# this sed will sanitize pkg-config's output. it will remove:
+#
+# "/usr/lib/pkgconfig/../../.."
+# "/lib/pkgconfig/../.."
+#
+declare -a args
 args=( \
-	"-e" "s:/usr/lib/pkgconfig/\.\./\.\./\.\.::g" \
-	"-e" "s:/lib/pkgconfig/\.\./\.\.::g")
+    "-e" "s~/usr/lib/pkgconfig/\.\./\.\./\.\.~~g" \
+    "-e" "s~/lib/pkgconfig/\.\./\.\.~~g" \
+    )
 
 if [ -n "${PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT}" -a \
-	-n "${found_var}" ]; then
+    -n "${found_var}" ]; then
     #
     # remove sysroot for variables that return a path
     #
@@ -30,4 +38,3 @@ fi
 
 "${PKG_CONFIG}" "${@}" | sed "${args[@]}"
 check_pipe_status
-