23 files changed, 184 insertions, 124 deletions
diff --git a/bin/ptxdist b/bin/ptxdist
index aa65eb748..89b1b3ee8 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1722,7 +1722,7 @@ parse_second()
 			;;
 
 		boardsetup)
-			check_config
+			check_config &&
 			do_config menuconfig board
 			exit
 			;;
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-remove-includes.diff b/patches/pure-ftpd-1.0.21/configure_ac-remove-includes.diff
deleted file mode 100644
index 742f4e42e..000000000
--- a/patches/pure-ftpd-1.0.21/configure_ac-remove-includes.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
-#
-# Error:
-#
-# inclusion of hosts dirs is not desired if cross compiling
-#
-# State:
-#
-# should be commited
-#
-Index: pure-ftpd-1.0.21/configure.ac
-===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -30,6 +30,7 @@ AC_PATH_PROG(PYTHON,python,/usr/bin/env 
- 
- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1"
- 
-+if test "$cross_compiling" != yes; then
- if test -d /usr/local/include; then
-   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- fi
-@@ -45,6 +46,7 @@ fi
- if uname | fgrep SunOS > /dev/null 2> /dev/null ; then
-   CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__=1 -D_XPG4_2=1"
- fi
-+fi
- 
- dnl Checks for header files
- 
-@@ -1189,10 +1191,12 @@ AC_ARG_WITH(mysql,
-       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib"
-       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include"
-     else
-+    if test "$cross_compiling" != yes; then
-       LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:/usr/lib/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-       LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
-       CPPFLAGS="$CPPFLAGS -I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql"
-     fi
-+    fi
-     AC_CHECK_LIB(m, floor)
-     AC_CHECK_LIB(z, gzclose)
-     with_mysql="yes"
-@@ -1225,10 +1229,12 @@ AC_ARG_WITH(pgsql,
-       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/pgsql -L${withval}/lib/postgresql -L${withval}/pgsql/lib -L${withval}/postgresql/lib"
-       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/pgsql -I${withval}/include/postgresql -I${withval}/pgsql/include -I${withval}/postgresql/include"
-     else
-+    if test "$cross_compiling" != yes; then
-       LD_RUN_PATH="/usr/local/pgsql/lib:/usr/local/pgsql/lib/pgsql:/usr/lib/pgsql:/usr/pgsql/lib:/usr/pgsql/lib/pgsql:/usr/local/lib/pgsql:/usr/local/postgresql/lib:/usr/local/postgresql/lib/postgresql:/usr/lib/postgresql:/usr/postgresql/lib:/usr/postgresql/lib/postgresql:/usr/local/lib/postgresql:${LD_RUN_PATH:+:}${LD_RUN_PATH}"
-       LDFLAGS="$LDFLAGS -L/usr/local/pgsql/lib -L/usr/lib/pgsql -L/usr/pgsql/lib -L/usr/local/lib/pgsql -L/usr/local/pgsql/lib/pgsql -L/usr/pgsql/lib/pgsql -L/usr/local/postgresql/lib -L/usr/lib/postgresql -L/usr/postgresql/lib -L/usr/local/lib/postgresql -L/usr/local/postgresql/lib/postgresql -L/usr/postgresql/lib/postgresql"
-       CPPFLAGS="$CPPFLAGS -I/usr/local/pgsql/include -I/usr/include/pgsql -I/usr/pgsql/include -I/usr/local/include/pgsql -I/usr/local/pgsql/include/pgsql -I/usr/pgsql/include/pgsql -I/usr/local/postgresql/include -I/usr/include/postgresql -I/usr/postgresql/include -I/usr/local/include/postgresql -I/usr/local/postgresql/include/postgresql -I/usr/postgresql/include/postgresql"
-     fi
-+    fi
-     AC_CHECK_LIB(m, floor)
-     AC_CHECK_LIB(z, gzclose)
-     with_pgsql="yes"
diff --git a/patches/pure-ftpd-1.0.21/autogen.sh b/patches/pure-ftpd-1.0.28/autogen.sh
index 9f8a4cb7d..9f8a4cb7d 120000
--- a/patches/pure-ftpd-1.0.21/autogen.sh
+++ b/patches/pure-ftpd-1.0.28/autogen.sh
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-getgroups-cacheable.diff b/patches/pure-ftpd-1.0.28/configure_ac-getgroups-cacheable.diff
index d077d42d5..9dbb58f06 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac-getgroups-cacheable.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac-getgroups-cacheable.diff
@@ -9,11 +9,15 @@
 #
 # should be commited
 #
-Index: pure-ftpd-1.0.21/configure.ac
+---
+# configure.ac |   17 +++++++++++------
+# 1 file changed, 11 insertions(+), 6 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
 ===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -949,7 +949,9 @@ else
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -955,7 +955,9 @@ else
  fi
  
  
@@ -24,7 +28,7 @@ Index: pure-ftpd-1.0.21/configure.ac
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #ifdef STDC_HEADERS
-@@ -968,11 +970,14 @@ int main(void)
+@@ -974,11 +976,14 @@ int main(void)
  {
      return getgroups(0, NULL) <= 0;
  }
@@ -32,7 +36,7 @@ Index: pure-ftpd-1.0.21/configure.ac
 -AC_MSG_RESULT(yes)
 -AC_DEFINE(SAFE_GETGROUPS_0,,[Define is getgroups(0, NULL) works on your system])
 -],[AC_MSG_RESULT(no)
--],[])
+-],[AC_MSG_RESULT(suppose that it doesnt)])
 +]])],[ac_cv_safe_getgroups_0=yes
 +],[ac_cv_safe_getgroups_0=no
 +],[ac_cv_safe_getgroups_0=yes])
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-md5-cacheable.diff b/patches/pure-ftpd-1.0.28/configure_ac-md5-cacheable.diff
index a74ba48e5..c16ba49da 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac-md5-cacheable.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac-md5-cacheable.diff
@@ -9,14 +9,18 @@
 #
 # should be commited
 #
-Index: pure-ftpd-1.0.21/configure.ac
+---
+# configure.ac |   17 +++++++++++------
+# 1 file changed, 11 insertions(+), 6 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
 ===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -1046,7 +1046,9 @@ else
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -1051,7 +1051,9 @@ else
+   AC_DEFINE(USE_BUILTIN_REALPATH)
  fi
  
- 
 -AC_MSG_CHECKING(whether you already have a standard MD5 implementation)
 +AC_CACHE_CHECK([whether you already have a standard MD5 implementation],
 +  [ac_cv_use_system_crypt_md5],
@@ -24,7 +28,7 @@ Index: pure-ftpd-1.0.21/configure.ac
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <stdio.h>
-@@ -1066,12 +1068,15 @@ int main(void)
+@@ -1071,12 +1073,15 @@ int main(void)
  
      return strcasecmp(b, "098f6bcd4621d373cade4e832627b4f6");
  }
@@ -40,7 +44,7 @@ Index: pure-ftpd-1.0.21/configure.ac
 +  AC_DEFINE(USE_SYSTEM_CRYPT_MD5,,[Define if you already have standard
  MD5 functions])
 -],[AC_MSG_RESULT(no)
--],[])
+-],[AC_MSG_RESULT(assuming no)])
 +fi
  
  AC_MSG_CHECKING(whether you already have a standard SHA1 implementation)
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-realpath-cacheable.diff b/patches/pure-ftpd-1.0.28/configure_ac-realpath-cacheable.diff
index cea8d45d4..b17ec7aa1 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac-realpath-cacheable.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac-realpath-cacheable.diff
@@ -9,11 +9,15 @@
 #
 # should be commited
 #
-Index: pure-ftpd-1.0.21/configure.ac
+---
+# configure.ac |   22 +++++++++++++---------
+# 1 file changed, 13 insertions(+), 9 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
 ===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -979,7 +979,9 @@ then
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -985,7 +985,9 @@ then
    AC_DEFINE(SAFE_GETGROUPS_0,,[Define is getgroups(0, NULL) works on your system])
  fi
  
@@ -24,7 +28,7 @@ Index: pure-ftpd-1.0.21/configure.ac
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #ifdef STDC_HEADERS
-@@ -1032,13 +1034,17 @@ int main(void)
+@@ -1038,14 +1040,16 @@ int main(void)
      
      return 0;    
  }
@@ -34,7 +38,8 @@ Index: pure-ftpd-1.0.21/configure.ac
 -[Define if realpath() works on unreadable directories])
 -],[AC_MSG_RESULT(no)
 -AC_DEFINE(USE_BUILTIN_REALPATH)
--],[])
+-],[AC_MSG_RESULT(no)
+-AC_DEFINE(USE_BUILTIN_REALPATH)])
 +]])],[ac_cv_realpath_works_with_unreadable_directories=yes
 +],[ac_cv_realpath_works_with_unreadable_directories=no
 +],[ac_cv_realpath_works_with_unreadable_directories=yes])
@@ -45,7 +50,6 @@ Index: pure-ftpd-1.0.21/configure.ac
 +else
 +  AC_DEFINE(USE_BUILTIN_REALPATH)
 +fi
-+
  
  AC_MSG_CHECKING(whether you already have a standard MD5 implementation)
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
diff --git a/patches/pure-ftpd-1.0.28/configure_ac-remove-includes.diff b/patches/pure-ftpd-1.0.28/configure_ac-remove-includes.diff
new file mode 100644
index 000000000..49dddf68f
--- /dev/null
+++ b/patches/pure-ftpd-1.0.28/configure_ac-remove-includes.diff
@@ -0,0 +1,63 @@
+#
+# Committed-By: Marc Kleine-Budde <mkl@pengutronix.de>, 2006-11-29
+#
+# Error:
+#
+# inclusion of hosts dirs is not desired if cross compiling
+#
+# State:
+#
+# should be commited
+#
+---
+# configure.ac |   16 +++++++++++-----
+# 1 file changed, 11 insertions(+), 5 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
+===================================================================
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -29,6 +29,7 @@ AC_ARG_VAR(PYTHON,local path to the pyth
+ python_possible_path="/usr/bin:/usr/local/bin:/bin:/opt/python/bin:/opt/python/usr/bin:/opt/python/usr/local/bin"
+ AC_PATH_PROG(PYTHON,python,/usr/bin/env python,$python_possible_path)
+ 
++if test "$cross_compiling" != yes; then
+ if test -d /usr/local/include; then
+   CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ fi
+@@ -44,6 +45,7 @@ fi
+ if uname | fgrep SunOS > /dev/null 2> /dev/null ; then
+   CPPFLAGS="$CPPFLAGS -D_XPG4_2=1"
+ fi
++fi
+ 
+ dnl Checks for header files
+ 
+@@ -1196,8 +1198,10 @@ AC_ARG_WITH(mysql,
+       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib"
+       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include"
+     else
+-      CFLAGS="$CFLAGS `mysql_config --cflags`"
+-      LDFLAGS="$LDFLAGS `mysql_config --libs`"
++      if test "$cross_compiling" != yes; then
++        CFLAGS="$CFLAGS `mysql_config --cflags`"
++        LDFLAGS="$LDFLAGS `mysql_config --libs`"
++      fi
+     fi
+     AC_CHECK_LIB(m, floor)
+     AC_CHECK_LIB(z, gzclose)
+@@ -1230,9 +1234,11 @@ AC_ARG_WITH(pgsql,
+       LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/pgsql -L${withval}/lib/postgresql -L${withval}/pgsql/lib -L${withval}/postgresql/lib"
+       CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/pgsql -I${withval}/include/postgresql -I${withval}/pgsql/include -I${withval}/postgresql/include"
+     else
+-      LD_RUN_PATH="`pg_config --libdir`${LD_RUN_PATH:+:}${LD_RUN_PATH}"
+-      CPPFLAGS="$CPPFLAGS -I`pg_config --includedir`"
+-      LDFLAGS="$LDFLAGS -L`pg_config --libdir`"
++      if test "$cross_compiling" != yes; then
++        LD_RUN_PATH="`pg_config --libdir`${LD_RUN_PATH:+:}${LD_RUN_PATH}"
++        CPPFLAGS="$CPPFLAGS -I`pg_config --includedir`"
++        LDFLAGS="$LDFLAGS -L`pg_config --libdir`"
++      fi
+     fi
+     AC_CHECK_LIB(m, floor)
+     AC_CHECK_LIB(z, gzclose)
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-sha1-cacheable.diff b/patches/pure-ftpd-1.0.28/configure_ac-sha1-cacheable.diff
index 6bbfe4737..1fe9a0806 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac-sha1-cacheable.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac-sha1-cacheable.diff
@@ -9,11 +9,15 @@
 #
 # should be commited
 #
-Index: pure-ftpd-1.0.21/configure.ac
+---
+# configure.ac |   17 +++++++++++------
+# 1 file changed, 11 insertions(+), 6 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
 ===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -1078,7 +1078,9 @@ then
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -1083,7 +1083,9 @@ then
  MD5 functions])
  fi
  
@@ -24,7 +28,7 @@ Index: pure-ftpd-1.0.21/configure.ac
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #include <string.h>
-@@ -1097,12 +1099,15 @@ int main(void)
+@@ -1102,12 +1104,15 @@ int main(void)
      
      return strcasecmp(b, "a94a8fe5ccb19ba61c4c0873d391e987982fbbd3");
  }
@@ -40,7 +44,7 @@ Index: pure-ftpd-1.0.21/configure.ac
 +  AC_DEFINE(USE_SYSTEM_CRYPT_SHA1,,[Define if you already have standard
  SHA1 functions])
 -],[AC_MSG_RESULT(no)
--],[])
+-],[AC_MSG_RESULT(assuming no)])
 +fi
  
  AC_MSG_CHECKING([whether we are inside a Virtuozzo virtual host])
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-snprintf-cacheable.diff b/patches/pure-ftpd-1.0.28/configure_ac-snprintf-cacheable.diff
index 022741ebc..b1996a3c7 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac-snprintf-cacheable.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac-snprintf-cacheable.diff
@@ -9,11 +9,15 @@
 #
 # should be commited
 #
-Index: pure-ftpd-1.0.21/configure.ac
+---
+# configure.ac |   14 ++++++++------
+# 1 file changed, 8 insertions(+), 6 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
 ===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -914,7 +914,9 @@ for (;;) {
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -920,7 +920,9 @@ for (;;) {
    AC_MSG_RESULT(no)
  ])  
  
@@ -24,12 +28,12 @@ Index: pure-ftpd-1.0.21/configure.ac
  AC_RUN_IFELSE([AC_LANG_SOURCE([[
  #include <stdio.h>
  #ifdef STDC_HEADERS
-@@ -937,13 +939,13 @@ int main(void)
+@@ -943,13 +945,13 @@ int main(void)
          (int) snprintf(buf, sizeof buf, "12345678"));
      return 0;
  }
 -]])],[CONF_SNPRINTF_TYPE=`cat conftestval`
--],[],[])
+-],[],[CONF_SNPRINTF_TYPE=8])
 -AC_MSG_RESULT(done)
 -if test "x$CONF_SNPRINTF_TYPE" = "x" ; then
 +]])],[ac_cv_conf_snprintf_type=`cat conftestval`
diff --git a/patches/pure-ftpd-1.0.21/configure_ac-virtuozzo-cacheable.diff b/patches/pure-ftpd-1.0.28/configure_ac-virtuozzo-cacheable.diff
index d9da911c0..1e84b51f1 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac-virtuozzo-cacheable.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac-virtuozzo-cacheable.diff
@@ -9,11 +9,15 @@
 #
 # should be commited
 #
-Index: pure-ftpd-1.0.21/configure.ac
+---
+# configure.ac |   14 ++++++++++----
+# 1 file changed, 10 insertions(+), 4 deletions(-)
+#
+Index: pure-ftpd-1.0.28/configure.ac
 ===================================================================
---- pure-ftpd-1.0.21.orig/configure.ac
-+++ pure-ftpd-1.0.21/configure.ac
-@@ -1109,13 +1109,19 @@ then
+--- pure-ftpd-1.0.28.orig/configure.ac
++++ pure-ftpd-1.0.28/configure.ac
+@@ -1114,13 +1114,19 @@ then
  SHA1 functions])
  fi
  
diff --git a/patches/pure-ftpd-1.0.21/configure_ac_remove-fssa.diff b/patches/pure-ftpd-1.0.28/configure_ac_remove-fssa.diff
index ed7727f61..ed7727f61 100644
--- a/patches/pure-ftpd-1.0.21/configure_ac_remove-fssa.diff
+++ b/patches/pure-ftpd-1.0.28/configure_ac_remove-fssa.diff
diff --git a/patches/pure-ftpd-1.0.21/series b/patches/pure-ftpd-1.0.28/series
index 064880df3..43ab249e7 100644
--- a/patches/pure-ftpd-1.0.21/series
+++ b/patches/pure-ftpd-1.0.28/series
@@ -1,4 +1,4 @@
-configure_ac_remove-fssa.diff
+#configure_ac_remove-fssa.diff
 configure_ac-remove-includes.diff
 configure_ac-snprintf-cacheable.diff
 configure_ac-getgroups-cacheable.diff
diff --git a/rules/cairo.make b/rules/cairo.make
index 17e14547c..cea615cde 100644
--- a/rules/cairo.make
+++ b/rules/cairo.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_CAIRO) += cairo
 # Paths and names
 #
 CAIRO_SUFFIX	:= tar.gz
-CAIRO_VERSION	:= 1.8.8
+CAIRO_VERSION	:= 1.8.10
 CAIRO_URL	:= http://cairographics.org/releases/cairo-$(CAIRO_VERSION).$(CAIRO_SUFFIX)
 CAIRO		:= cairo-$(CAIRO_VERSION)
 CAIRO_SOURCE	:= $(SRCDIR)/$(CAIRO).$(CAIRO_SUFFIX)
@@ -136,9 +136,9 @@ $(STATEDIR)/cairo.targetinstall:
 	@$(call install_fixup,cairo,DEPENDS,)
 	@$(call install_fixup,cairo,DESCRIPTION,missing)
 
-	@$(call install_copy, cairo, 0, 0, 0644, -, /usr/lib/libcairo.so.2.10800.8)
-	@$(call install_link, cairo, libcairo.so.2.10800.8, /usr/lib/libcairo.so.2)
-	@$(call install_link, cairo, libcairo.so.2.10800.8, /usr/lib/libcairo.so)
+	@$(call install_copy, cairo, 0, 0, 0644, -, /usr/lib/libcairo.so.2.10800.10)
+	@$(call install_link, cairo, libcairo.so.2.10800.10, /usr/lib/libcairo.so.2)
+	@$(call install_link, cairo, libcairo.so.2.10800.10, /usr/lib/libcairo.so)
 
 	@$(call install_finish,cairo)
 
diff --git a/rules/dri2proto.make b/rules/dri2proto.make
index 222869790..3df8c8e00 100644
--- a/rules/dri2proto.make
+++ b/rules/dri2proto.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_DRI2PROTO) += dri2proto
 #
 # Paths and names
 #
-DRI2PROTO_VERSION	:= 2.2
+DRI2PROTO_VERSION	:= 2.3
 DRI2PROTO		:= dri2proto-$(DRI2PROTO_VERSION)
 DRI2PROTO_SUFFIX	:= tar.bz2
 DRI2PROTO_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/proto/$(DRI2PROTO).$(DRI2PROTO_SUFFIX)
diff --git a/rules/gst-plugins-good.make b/rules/gst-plugins-good.make
index 508258afd..02c90f7bf 100644
--- a/rules/gst-plugins-good.make
+++ b/rules/gst-plugins-good.make
@@ -79,7 +79,7 @@ GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSS)		+= oss
 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_SUNAUDIO)	+= sunaudio
 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_AUDIO)	+= osx_audio
 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_OSX_VIDEO)	+= osx_video
-GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_GST_V4L2)	+= gst_v4l2
+GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_V4L2)	+= gst_v4l2
 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_X)		+= x
 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_XSHM)	+= xshm
 GST_PLUGINS_GOOD_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD_XVIDEO)	+= xvideo
diff --git a/rules/host-xorg-server.make b/rules/host-xorg-server.make
index 32193e2da..2600c3c2e 100644
--- a/rules/host-xorg-server.make
+++ b/rules/host-xorg-server.make
@@ -23,16 +23,22 @@ $(STATEDIR)/autogen-tools: $(STATEDIR)/host-xorg-server.install
 endif
 
 # ----------------------------------------------------------------------------
-# Prepare
+# Extract
 # ----------------------------------------------------------------------------
 
-HOST_XORG_SERVER_PATH	:= PATH=$(HOST_PATH)
-HOST_XORG_SERVER_ENV 	:= $(HOST_ENV)
-
 #
-# autoconf
+# special extract stage without patchin, we don't need the patches and
+# cannot autoreconf, because the autotools are not build yet
 #
-HOST_XORG_SERVER_AUTOCONF	:= $(HOST_AUTOCONF)
+$(STATEDIR)/host-xorg-server.extract:
+	@$(call targetinfo)
+	@$(call clean, $(HOST_XORG_SERVER_DIR))
+	@$(call extract, HOST_XORG_SERVER, $(HOST_BUILDDIR))
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
 
 $(STATEDIR)/host-xorg-server.prepare:
 	@$(call targetinfo)
diff --git a/rules/libdrm.make b/rules/libdrm.make
index d938707e3..0480ad53b 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm
 #
 # Paths and names
 #
-LIBDRM_VERSION	:= 2.4.17
+LIBDRM_VERSION	:= 2.4.18
 LIBDRM		:= libdrm-$(LIBDRM_VERSION)
 LIBDRM_SUFFIX	:= tar.gz
 LIBDRM_URL	:= http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX)
diff --git a/rules/pixman.make b/rules/pixman.make
index 4ebf56afa..6cda4df5f 100644
--- a/rules/pixman.make
+++ b/rules/pixman.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman
 #
 # Paths and names
 #
-PIXMAN_VERSION	:= 0.16.0
+PIXMAN_VERSION	:= 0.17.6
 PIXMAN		:= pixman-$(PIXMAN_VERSION)
 PIXMAN_SUFFIX	:= tar.bz2
 PIXMAN_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)
@@ -72,9 +72,9 @@ $(STATEDIR)/pixman.targetinstall:
 	@$(call install_fixup, pixman,DEPENDS,)
 	@$(call install_fixup, pixman,DESCRIPTION,missing)
 
-	@$(call install_copy, pixman, 0, 0, 0644, -, /usr/lib/libpixman-1.so.0.16.0)
-	@$(call install_link, pixman, libpixman-1.so.0.16.0, /usr/lib/libpixman-1.so.0)
-	@$(call install_link, pixman, libpixman-1.so.0.16.0, /usr/lib/libpixman-1.so)
+	@$(call install_copy, pixman, 0, 0, 0644, -, /usr/lib/libpixman-1.so.0.17.6)
+	@$(call install_link, pixman, libpixman-1.so.0.17.6, /usr/lib/libpixman-1.so.0)
+	@$(call install_link, pixman, libpixman-1.so.0.17.6, /usr/lib/libpixman-1.so)
 
 	@$(call install_finish, pixman)
 
diff --git a/rules/post/ptxd_make_import.make b/rules/post/ptxd_make_import.make
index 026d80060..0816af82e 100644
--- a/rules/post/ptxd_make_import.make
+++ b/rules/post/ptxd_make_import.make
@@ -15,14 +15,19 @@
 # that points to the toplevel KCONFIG file
 #
 # the kconfig tree will be found in
-# $PTXDIST_TOPLEVEL/config/<package>
+# $(PTXDIST_IMPORTDIR)/config/<package>
 # all symbols are prefixed with <PACKAGE>
 #
+# if PTXDIST_IMPORTDIR is omitted, PTXDIST_TOPLEVEL will be used
+#
 # the import is started with:
-# ptxdist make import <package>
+# ptxdist make <package>_import [PTXDIST_IMPORTDIR=<dir>]
 #
 %_import: $(STATEDIR)/%.extract
 	@$(call targetinfo)
-	@"${PTXDIST_LIB_DIR}/ptxd_make_import.awk" "$(*)" "$($(PTX_MAP_TO_PACKAGE_$(*))_KCONFIG)"
+	@PTXDIST_IMPORTDIR="$(PTXDIST_IMPORTDIR)"; \
+		PTXDIST_IMPORTDIR="$${PTXDIST_IMPORTDIR:-$(PTXDIST_TOPDIR)}" \
+		gawk -f "${PTXDIST_LIB_DIR}/ptxd_make_import.awk" \
+		"$(*)" "$($(PTX_MAP_TO_PACKAGE_$(*))_KCONFIG)"
 
 # vim: syntax=make
diff --git a/rules/pureftpd.make b/rules/pureftpd.make
index 506eb06ac..69c8a8f82 100644
--- a/rules/pureftpd.make
+++ b/rules/pureftpd.make
@@ -1,4 +1,5 @@
 # -*-makefile-*-
+# $Id: template 6001 2006-08-12 10:15:00Z mkl $
 #
 # Copyright (C) 2006 by Robert Schwebel
 #
@@ -16,7 +17,7 @@ PACKAGES-$(PTXCONF_PUREFTPD) += pureftpd
 #
 # Paths and names
 #
-PUREFTPD_VERSION	:= 1.0.21
+PUREFTPD_VERSION	:= 1.0.28
 PUREFTPD		:= pure-ftpd-$(PUREFTPD_VERSION)
 PUREFTPD_SUFFIX		:= tar.bz2
 PUREFTPD_URL		:= http://download.pureftpd.org/pub/pure-ftpd/releases/$(PUREFTPD).$(PUREFTPD_SUFFIX)
@@ -146,4 +147,13 @@ endif
 
 	@$(call touch)
 
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+pureftpd_clean:
+	rm -rf $(STATEDIR)/pureftpd.*
+	rm -rf $(PKGDIR)/pureftpd_*
+	rm -rf $(PUREFTPD_DIR)
+
 # vim: syntax=make
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index aed179631..1076d1218 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -284,7 +284,7 @@ config XORG_SERVER_EXT_SHM
 	prompt "shm extension"
 	default y
 	help
-	  --enable-shm Support for MIT Shared Memoy
+	  --enable-mitshm Support for MIT Shared Memoy
 
 config XORG_SERVER_EXT_XRES
 	bool
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 46e268335..893d07411 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -83,13 +83,13 @@ else
 XORG_SERVER_AUTOCONF += --disable-config-udev
 endif
 
-ifdef PTXCONF_XORG_SERVER_NULL_ROOT_CURSOR
+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_AIGLX
+ifdef PTXCONF_XORG_SERVER_OPT_AIGLX
 XORG_SERVER_AUTOCONF += --enable-aiglx
 else
 XORG_SERVER_AUTOCONF += --disable-aiglx
@@ -116,7 +116,7 @@ endif
 ifdef PTXCONF_XORG_SERVER_EXT_SHM
 XORG_SERVER_AUTOCONF += --enable-mitshm
 else
-XORG_SERVER_AUTOCONF += --disable-shm
+XORG_SERVER_AUTOCONF += --disable-mitshm
 endif
 
 ifdef PTXCONF_XORG_SERVER_EXT_XRES
diff --git a/scripts/lib/ptxd_make_import.awk b/scripts/lib/ptxd_make_import.awk
index 00a4a304c..40c5c877f 100755
--- a/scripts/lib/ptxd_make_import.awk
+++ b/scripts/lib/ptxd_make_import.awk
@@ -14,8 +14,8 @@ function usage() {
 
 
 BEGIN {
-	topdir = ENVIRON["PTXDIST_TOPDIR"];
-	if (topdir == "") {
+	importdir = ENVIRON["PTXDIST_IMPORTDIR"];
+	if (importdir == "") {
 		print "ptxd_lib_import.awk cannot be used stand-alone" > "/dev/stderr";
 		usage();
 	}
@@ -45,7 +45,7 @@ FNR == 1 {
         if (out_file != "")
 		close(out_file);
 
-	out_file = topdir "/" prefix_file "/" gensub(in_path "/", "", "g", FILENAME);
+	out_file = importdir "/" prefix_file "/" gensub(in_path "/", "", "g", FILENAME);
 	out_dir = gensub(/^(.*)\/.*/, "\\1", "g", out_file);
 
 	err = system("						\
@@ -78,9 +78,18 @@ FNR == 1 {
 # add prefix to sourced files
 #
 /^[[:space:]]*source[[:space:]]+/ {
+	# remove quotes from file
+	gsub(/(^"|"$)/, "", $2);
 	ARGC++;
 	ARGV[ARGC - 1] = in_path "/" $2;
-	$0 = gensub(/^([[:space:]]*source[[:space:]]+)(")?(.*)$/, "\\1" "\\2" prefix_file "/\\3", "g", $0);
+
+#  source "foo/bar.in"
+# +------+|+--------+|
+#    |    |     |    |
+#    |    |     |    |
+#   \\1  \\2   \\3  \\4
+#
+	$0 = gensub(/^([[:space:]]*source[[:space:]]+)(")?(.*)(")?$/, "\\1" "\"" prefix_file "/\\3\"", "g", $0);
 }
 
 #