many bugfixes for native adksystems and some package updates

30 files changed, 343 insertions, 5954 deletions

diff --git a/mk/modules.mk b/mk/modules.mk
index 27b02bbf7..8a8e7f2f0 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -995,13 +995,16 @@ $(eval $(call KMOD_template,EXT2_FS,ext2-fs,\
 ,30))
 endif
 
+$(eval $(call KMOD_template,FS_MBCACHE,fs-mbcache,\
+	$(MODULES_DIR)/kernel/fs/mbcache \
+,20))
+
 $(eval $(call KMOD_template,EXT3_FS,ext3-fs,\
 	$(MODULES_DIR)/kernel/fs/jbd/jbd \
 	$(MODULES_DIR)/kernel/fs/ext3/ext3 \
 ,30))
 
 $(eval $(call KMOD_template,EXT4_FS,ext4-fs,\
-	$(MODULES_DIR)/kernel/fs/mbcache \
 	$(MODULES_DIR)/kernel/fs/jbd2/jbd2 \
 	$(MODULES_DIR)/kernel/fs/ext4/ext4 \
 ,30))
diff --git a/mk/package.mk b/mk/package.mk
index d572e67b0..68142df0e 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -21,10 +21,10 @@ CONFIGURE_ENV+=		GCC_HONOUR_COPTS=s \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
+			${HOST_CONFIGURE_OPTS} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
 ifeq ($(ADK_NATIVE),)
 CONFIGURE_ENV+=		${TARGET_CONFIGURE_OPTS} \
-			${HOST_CONFIGURE_OPTS} \
 			ac_cv_func_realloc_0_nonnull=yes \
 			ac_cv_func_malloc_0_nonnull=yes
 endif
@@ -50,9 +50,10 @@ MAKE_ENV+=		GCC_HONOUR_COPTS=2 \
 			CXXFLAGS='$(strip ${TARGET_CXXFLAGS})' \
 			CPPFLAGS='$(strip ${TARGET_CPPFLAGS})' \
 			LDFLAGS='$(strip ${TARGET_LDFLAGS})' \
+			${HOST_CONFIGURE_OPTS} \
 			PKG_CONFIG_LIBDIR='${STAGING_TARGET_DIR}/usr/lib/pkgconfig'
 ifeq ($(ADK_NATIVE),)
-MAKE_ENV+=		${TARGET_CONFIGURE_OPTS} ${HOST_CONFIGURE_OPTS}
+MAKE_ENV+=		${TARGET_CONFIGURE_OPTS}
 endif
 
 MAKE_FLAGS+=		${XAKE_FLAGS} V=1
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 2e44d787b..8e5a66e46 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -14,15 +14,21 @@ PKG_BUILDDEP:=		openssl libxml2
 PKG_URL:=		https://www.isc.org/software/bind/
 PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
 
-PKG_SUBPKGS:=		BIND_SERVER BIND_CLIENT LIBBIND BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG
-PKGSD_LIBBIND:=		library for the bind software suite
-PKGSC_LIBBIND:=		libs
-PKGSD_BIND_CLIENT:=	dynamic dns client (nsupdate utility)
+PKG_SUBPKGS:=		BIND_SERVER BIND_NSUPDATE LIBBIND BIND_RNDC BIND_CHECK BIND_DNSSEC BIND_HOST BIND_DIG
+PKGSD_BIND_NSUPDATE:=	nsupdate utility
+PKGSC_BIND_NSUPDATE:=	dns
 PKGSD_BIND_RNDC:=	rndc & rndc-confgen utilities
+PKGSC_BIND_RNDC:=	dns
 PKGSD_BIND_CHECK:=	check utilities
+PKGSC_BIND_CHECK:=	dns
 PKGSD_BIND_DNSSEC:=	dnssec utilities
+PKGSC_BIND_DNSSEC:=	dns
 PKGSD_BIND_HOST:=	host utility
+PKGSC_BIND_HOST:=	dns
 PKGSD_BIND_DIG:=	dig utility
+PKGSC_BIND_DIG:=	dns
+PKGSD_LIBBIND:=		library for the bind software suite
+PKGSC_LIBBIND:=		libs
 
 PKG_FLAVOURS_BIND_SERVER:=	WITH_IPV6
 PKGFD_WITH_IPV6:=		enable IPv6 support
@@ -30,13 +36,13 @@ PKGFD_WITH_IPV6:=		enable IPv6 support
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CLIENT},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_NSUPDATE},${PKGSC_BIND_NSUPDATE}))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_RNDC},${PKGSC_BIND_RNDC}))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CHECK},${PKGSC_BIND_CHECK}))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DNSSEC},${PKGSC_BIND_DNSSEC}))
+$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_HOST},${PKGSC_BIND_HOST}))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DIG},${PKGSC_BIND_DIG}))
 $(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBIND},${PKGSC_LIBBIND}))
-$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_RNDC},${PKG_SECTION}))
-$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_CHECK},${PKG_SECTION}))
-$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DNSSEC},${PKG_SECTION}))
-$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_HOST},${PKG_SECTION}))
-$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BIND_DIG},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom \
 			--disable-threads \
@@ -58,9 +64,9 @@ bind-server-install:
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/
 	${CP} ./files/bind ${IDIR_BIND_SERVER}/etc
 
-bind-client-install:
-	${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/
+bind-nsupdate-install:
+	${INSTALL_DIR} ${IDIR_BIND_NSUPDATE}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_NSUPDATE}/usr/bin/
 
 bind-rndc-install:
 	${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index d0d2d1bc1..017cd1f28 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -16,9 +16,11 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=e2fsprogs/}
 PKG_CFLINE_E2FSPROGS:=	default y if ADK_TARGET_ROOTFS_CF
 
 PKG_SUBPKGS:=		E2FSPROGS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
-PKG_SUBPKGS+=		LIBCOM_ERR_DEV LIBSS_DEV
+PKG_SUBPKGS+=		LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV
 PKGSD_LIBUUID:=		UUID library
 PKGSC_LIBUUID:=		libs
+PKGSD_LIBUUID_DEV:=	UUID headers
+PKGSC_LIBUUID_DEV:=	devel
 PKGSD_LIBCOM_ERR:=	Common error library
 PKGSC_LIBCOM_ERR:=	libs
 PKGSD_LIBCOM_ERR_DEV:=	Common error headers
@@ -27,8 +29,10 @@ PKGSD_LIBSS:=		Subsystem command parsing library
 PKGSC_LIBSS:=		libs
 PKGSD_LIBSS_DEV:=	Subsystem command parsing headers
 PKGSC_LIBSS_DEV:=	devel
-PKGSD_LIBBLKID:=	Libblkid
+PKGSD_LIBBLKID:=	blkid library
 PKGSC_LIBBLKID:=	libs
+PKGSD_LIBBLKID_DEV:=	blkid headers
+PKGSC_LIBBLKID_DEV:=	devel
 PKGSD_E2FSCK_STATIC:=	Static build of e2fsck
 PKGSC_E2FSCK_STATIC:=	fs
 
@@ -36,11 +40,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,E2FSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBUUID,libuuid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID},${PKGSC_LIBUUID}))
+$(eval $(call PKG_template,LIBUUID_DEV,libuuid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBUUID_DEV},${PKGSC_LIBUUID_DEV}))
 $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR},${PKGSC_LIBCOM_ERR}))
 $(eval $(call PKG_template,LIBCOM_ERR_DEV,libcom-err-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBCOM_ERR_DEV},${PKGSC_LIBCOM_ERR_DEV}))
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS},${PKGSC_LIBSS}))
 $(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBSS_DEV},${PKGSC_LIBSS_DEV}))
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID},${PKGSC_LIBBLKID}))
+$(eval $(call PKG_template,LIBBLKID_DEV,libblkid-dev,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBLKID_DEV},${PKGSC_LIBBLKID_DEV}))
 $(eval $(call PKG_template,E2FSCK_STATIC,e2fsck-static,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_E2FSCK_STATIC},${PKGSC_E2FSCK_STATIC}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath
@@ -72,6 +78,11 @@ libblkid-install:
 	${CP} ${WRKINST}/usr/lib/libblkid.so* \
 		${IDIR_LIBBLKID}/usr/lib/
 
+libblkid-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBBLKID_DEV}/usr/include/blkid
+	${CP} ${WRKINST}/usr/include/blkid/*.h \
+		${IDIR_LIBBLKID_DEV}/usr/include/blkid
+
 libcom-err-install:
 	${INSTALL_DIR} ${IDIR_LIBCOM_ERR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcom_err.so* \
@@ -101,6 +112,11 @@ libuuid-install:
 	${CP} ${WRKBUILD}/lib/uuid/uuid.h \
 		${STAGING_TARGET_DIR}/usr/include/uuid
 
+libuuid-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBUUID_DEV}/usr/include
+	${CP} ${WRKBUILD}/lib/uuid/uuid.h \
+		${IDIR_LIBUUID_DEV}/usr/include
+
 e2fsck-static-install:
 	${INSTALL_DIR} ${IDIR_E2FSCK_STATIC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck.static \
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure
index d3edea539..5f038b65e 100644
--- a/package/ffmpeg/patches/patch-configure
+++ b/package/ffmpeg/patches/patch-configure
@@ -1,6 +1,17 @@
---- ffmpeg-0.6.orig/configure	2010-06-15 21:44:30.000000000 +0200
-+++ ffmpeg-0.6/configure	2010-07-12 21:34:52.258102064 +0200
-@@ -2640,7 +2640,7 @@ if enabled libdc1394; then
+--- ffmpeg-0.6.1.orig/configure	2010-06-15 21:44:30.000000000 +0200
++++ ffmpeg-0.6.1/configure	2011-02-05 19:31:24.000000000 +0100
+@@ -1689,8 +1690,8 @@ if ! check_cmd type mktemp; then
+ fi
+ 
+ tmpfile(){
+-    tmp=$(mktemp -u "${TMPDIR}/ffconf.XXXXXXXX")$2 &&
+-        (set -C; exec > $tmp) 2>/dev/null ||
++    tmp=$(mktemp "${TMPDIR}/ffconf.XXXXXXXX")$2 &&
++        (set -C; rm $tmp; exec > $tmp) ||
+         die "Unable to create temporary file in $TMPDIR."
+     append TMPFILES $tmp
+     eval $1=$tmp
+@@ -2640,7 +2641,7 @@ if enabled libdc1394; then
      die "ERROR: No version of libdc1394 found "
  fi
  
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 469859884..913f99d52 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freetype
-PKG_VERSION:=		2.3.11
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		a693c9a4b0121890ca71e39364ffea4a
+PKG_VERSION:=		2.4.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9273efacffb683483e58a9e113efae9f
 PKG_DESCR:=		A free, high-quality and portable font engine
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
diff --git a/package/freetype/patches/patch-builds_unix_unix-cc_in b/package/freetype/patches/patch-builds_unix_unix-cc_in
new file mode 100644
index 000000000..b4b1df60d
--- /dev/null
+++ b/package/freetype/patches/patch-builds_unix_unix-cc_in
@@ -0,0 +1,11 @@
+--- freetype-2.4.4.orig/builds/unix/unix-cc.in	2010-08-31 13:04:28.000000000 +0200
++++ freetype-2.4.4/builds/unix/unix-cc.in	2011-02-05 18:05:59.000000000 +0100
+@@ -101,7 +101,7 @@ LDFLAGS := @LDFLAGS@
+ CCraw_build  := @CC_BUILD@	# native CC of building system
+ E_BUILD      := @EXEEXT_BUILD@	# extension for exexutable on building system
+ EXPORTS_LIST := $(OBJ_DIR)/ftexport.sym
+-CCexe        := $(CCraw_build)	# used to compile `apinames' only
++CCexe        := $(CCraw_build) $(CFLAGS_FOR_BUILD)	# used to compile `apinames' only
+ 
+ 
+ # Library linking
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 783a63870..73fcc246e 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -15,9 +15,11 @@ PKG_URL:=		http://web.mit.edu/kerberos/
 PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/${PKG_VERSION}/
 PKG_NOPARALLEL:=	1
 
-PKG_SUBPKGS:=		KRB5_SERVER KRB5_CLIENT LIBKRB5
+PKG_SUBPKGS:=		KRB5_SERVER KRB5_CLIENT LIBKRB5 LIBKRB5_DEV
 PKGSD_LIBKRB5:=		MIT kerberos libraries
 PKGSC_LIBKRB5:=		libs
+PKGSD_LIBKRB5_DEV:=	MIT kerberos headers
+PKGSC_LIBKRB5_DEV:=	devel
 PKGSD_KRB5_CLIENT:=	MIT kerberos client tools
 PKGSC_KRB5_CLIENT:=	crypto
 PKGSS_KRB5_CLIENT:=	libkrb5 libncurses libss libcom-err
@@ -34,6 +36,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KRB5_CLIENT,krb5-client,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_KRB5_CLIENT},${PKGSD_KRB5_CLIENT},${PKGSC_KRB5_CLIENT}))
 $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5},${PKGSC_LIBKRB5}))
+$(eval $(call PKG_template,LIBKRB5_DEV,libkrb5-dev,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBKRB5_DEV},${PKGSC_LIBKRB5_DEV}))
 
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
@@ -82,4 +85,12 @@ libkrb5-install:
 	echo '/usr/lib/libgssapi_krb5.so		mechglue_internal_krb5_init' \
 		> ${IDIR_LIBKRB5}/etc/gssapi_mech.conf
 
+libkrb5-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBKRB5_DEV}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/krb5-config \
+		${IDIR_LIBKRB5_DEV}/usr/bin
+	${INSTALL_DIR} ${IDIR_LIBKRB5_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* \
+		${IDIR_LIBKRB5_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index d653ae8a5..f0c126cf8 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libgpg-error
-PKG_VERSION:=		1.8
+PKG_VERSION:=		1.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1d2005268a2f096db28cf9cf77b3229a
+PKG_MD5SUM:=		521b98aa9395e7eaf0ef2236233a0796
 PKG_DESCR:=		a helper library for common error codes and descriptions
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnupg.org/
diff --git a/package/libgpg-error/patches/patch-configure b/package/libgpg-error/patches/patch-configure
new file mode 100644
index 000000000..717b884db
--- /dev/null
+++ b/package/libgpg-error/patches/patch-configure
@@ -0,0 +1,31 @@
+--- libgpg-error-1.9.orig/configure	2010-07-21 10:00:02.000000000 +0200
++++ libgpg-error-1.9/configure	2011-02-05 15:47:20.000000000 +0100
+@@ -769,6 +769,7 @@ GMSGFMT
+ MSGFMT
+ USE_NLS
+ CC_FOR_BUILD
++CFLAGS_FOR_BUILD
+ RC
+ OTOOL64
+ OTOOL
+@@ -909,7 +910,8 @@ LDFLAGS
+ LIBS
+ CPPFLAGS
+ CPP
+-CC_FOR_BUILD'
++CC_FOR_BUILD
++CFLAGS_FOR_BUILD'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -11290,8 +11292,10 @@ CC="$lt_save_CC"
+ $as_echo_n "checking for cc for build... " >&6; }
+ if test "$cross_compiling" = "yes"; then
+   CC_FOR_BUILD="${CC_FOR_BUILD-cc}"
++  CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
+ else
+   CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
++  CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-$CFLAGS}"
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
+ $as_echo "$CC_FOR_BUILD" >&6; }
diff --git a/package/libgpg-error/patches/patch-src_Makefile_in b/package/libgpg-error/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..d19b518db
--- /dev/null
+++ b/package/libgpg-error/patches/patch-src_Makefile_in
@@ -0,0 +1,25 @@
+--- libgpg-error-1.9.orig/src/Makefile.in	2010-07-21 10:00:00.000000000 +0200
++++ libgpg-error-1.9/src/Makefile.in	2011-02-05 15:44:54.000000000 +0100
+@@ -149,6 +149,7 @@ BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+@@ -868,12 +869,12 @@ gpg-error.def: Makefile gpg-error.def.in
+ # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
+ # program at build time.
+ mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile
+-	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
+ 
+ # It is correct to use $(CC_FOR_BUILD) here.  We want to run the
+ # program at build time.
+ @HAVE_W32CE_SYSTEM_TRUE@mkw32errmap: mkw32errmap.c mkw32errmap.tab.h Makefile
+-@HAVE_W32CE_SYSTEM_TRUE@	$(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c
++@HAVE_W32CE_SYSTEM_TRUE@	$(CC_FOR_BUILD) $(CC_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkw32errmap.c
+ 
+ code-from-errno.h: mkerrcodes Makefile
+ 	./mkerrcodes | $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index dea01211d..4cd325af8 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -13,10 +13,15 @@ PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBGSSGLUE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBGSSGLUE_DEV,libgssglue-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-post-install:
+libgssglue-install:
 	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libgssglue.so* $(IDIR_LIBGSSGLUE)/usr/lib/
 
+libgssglue-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE_DEV)/usr/include
+	${CP} $(WRKINST)/usr/include/* $(IDIR_LIBGSSGLUE_DEV)/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libiconv/patches/patch-src_Makefile_in b/package/libiconv/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..2763d71e4
--- /dev/null
+++ b/package/libiconv/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- libiconv-1.13.1.orig/src/Makefile.in	2009-06-21 13:17:33.000000000 +0200
++++ libiconv-1.13.1/src/Makefile.in	2011-02-04 17:12:50.000000000 +0100
+@@ -113,7 +113,7 @@ install : all force
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+ 
diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile
index eca543039..71f77b634 100644
--- a/package/libnfsidmap/Makefile
+++ b/package/libnfsidmap/Makefile
@@ -7,20 +7,30 @@ PKG_NAME:=		libnfsidmap
 PKG_VERSION:=		0.21b1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a8a44bd4aa22441fb54735dd65496b72
-PKG_DESCR:=		library for NFSv4
+PKG_DESCR:=		idmap library for NFSv4
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.citi.umich.edu/projects/nfsv4/linux/
 PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/
 
+PKG_SUBPKGS:=		LIBNFSIDMAP LIBNFSIDMAP_DEV
+PKGSC_LIBNFSIDMAP_DEV:=	devel
+PKGSD_LIBNFSIDMAP_DEV:=	headers for NFSv4 idmap library
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBNFSIDMAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBNFSIDMAP_DEV,libnfsidmap-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNFSIDMAP_DEV},${PKGSC_LIBNFSIDMAP_DEV}))
 
-post-install:
+libnfsidmap-install:
 	$(INSTALL_DIR) $(IDIR_LIBNFSIDMAP)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libnfsidmap.so* \
 		$(IDIR_LIBNFSIDMAP)/usr/lib/
 	$(CP) $(WRKINST)/usr/lib/libnfsidmap_static.so* \
 		$(IDIR_LIBNFSIDMAP)/usr/lib/
 
+libnfsidmap-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBNFSIDMAP_DEV)/usr/include
+	$(INSTALL_DATA) ${WRKINST}/usr/include/nfsidmap.h \
+		$(IDIR_LIBNFSIDMAP_DEV)/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 4d8e4689e..83785dd1e 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -16,19 +16,28 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libtirpc/}
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
+PKG_SUBPKGS:=		LIBTIRPC LIBTIRPC_DEV
+PKGSD_LIBTIRPC_DEV:=	tirpc headers
+PKGSC_LIBTIRPC_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBTIRPC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBTIRPC,libtirpc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBTIRPC_DEV,libtirpc-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIRPC_DEV},${PKGSC_LIBTIRPC_DEV}))
 
-ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y)
+ifneq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
 CONFIGURE_ARGS+=	--disable-gss
 else
 CONFIGURE_ARGS+=	--enable-gss
 endif
 
-post-install:
+libtirpc-install:
 	${INSTALL_DIR} ${IDIR_LIBTIRPC}/usr/lib ${IDIR_LIBTIRPC}/etc
 	${CP} ${WRKINST}/usr/lib/libtirpc*.so* ${IDIR_LIBTIRPC}/usr/lib/
 	${CP} ./files/netconfig ${IDIR_LIBTIRPC}/etc
 
+libtirpc-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBTIRPC_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBTIRPC_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index a980c64a7..05e01dd94 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		libvorbis
 PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		478646358c49f34aedcce58948793619
-PKG_DESCR:=		The Vorbis General Audio Compression Codec library
+PKG_DESCR:=		Vorbis General Audio Compression Codec library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		libogg
 PKG_URL:=		http://www.xiph.org/vorbis/
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index f518d4cf5..de4711225 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -14,9 +14,14 @@ PKG_BUILDDEP:=		zlib
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/
 
+PKG_SUBPKGS:=		LIBXML2 LIBXML2_DEV
+PKGSD_LIBXML2_DEV:=	XML parser headers
+PKGSC_LIBXML2_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBXML2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXML2,libxml,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBXML2_DEV,libxml2-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXML2_DEV},${PKGSC_LIBXML2_DEV}))
 
 CONFIGURE_ARGS+=	--without-c14n \
 			--without-catalog \
@@ -46,8 +51,12 @@ CONFIGURE_ARGS+=	--without-c14n \
 			--with-xptr \
 			--with-zlib
 
-post-install:
+libxml2-install:
 	${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib
+
+libxml2-dev-install:
+	${INSTALL_DIR} ${IDIR_LIBXML2_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBXML2_DEV}/usr/include
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index ecfeb77ad..402ddf332 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -49,7 +49,7 @@ PKGFD_WITH_FFMPEG:=	enable FFMPEG support
 PKGFS_WITH_FFMPEG:=	ffmpeg
 PKGFB_WITH_FFMPEG:=	ffmpeg
 PKGFD_WITH_SHOUT:=	enable Shoutcast output support
-PKGFS_WITH_SHOUT:=	libshout liblame libvorbis
+PKGFS_WITH_SHOUT:=	libshout liblame libvorbisenc
 PKGFB_WITH_SHOUT:=	lame libvorbis libshout
 PKGFD_WITH_CURL:=	enable CURL support
 PKGFS_WITH_CURL:=	libcurl
diff --git a/package/mplayer/patches/patch-Makefile b/package/mplayer/patches/patch-Makefile
new file mode 100644
index 000000000..3f57255db
--- /dev/null
+++ b/package/mplayer/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- mplayer-1.0-32749.orig/Makefile	2011-01-03 11:27:11.000000000 +0100
++++ mplayer-1.0-32749/Makefile	2011-02-05 18:20:49.000000000 +0100
+@@ -816,7 +816,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+ 	$(CC) -o $@ $^ $(EXTRALIBS)
+ 
+ codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
+-	$(HOST_CC) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -O -DCODECS2HTML -I. -Iffmpeg -o $@ $<
+ 
+ codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
+ 	./$^ > $@
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 1d6e9aa23..e277874c6 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.3
-PKG_RELEASE:=		5
+PKG_RELEASE:=		6
 PKG_MD5SUM:=		1131dc5f27c4f3905a6e7ee0d594fd4d
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
@@ -23,7 +23,7 @@ PKGCB_WITHOUT_TIRPC:=	portmap
 
 PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
-PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue
+PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss
 PKGFB_WITH_KERBEROS:=	libnfsidmap krb5 libevent libgssglue librpcsecgss
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -32,9 +32,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_NATIVE),)
+KRB5INC:=		${STAGING_TARGET_DIR}/usr
+TIRPCINC:=		${STAGING_TARGET_DIR}/usr/include/tirpc
+else
+KRB5INC:=		/usr
+TIRPCINC:=		/usr/include/tirpc
+endif
+
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
-			--with-krb5=${STAGING_TARGET_DIR}/usr/ \
+			--with-krb5=$(KRB5INC) \
 			--enable-gss
 CONFIGURE_ENV+=		LIBS="-lrpcsecgss"
 else
@@ -44,7 +52,7 @@ endif
 
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
 CONFIGURE_ARGS+=	--enable-tirpc \
-			--with-tirpcinclude=${STAGING_TARGET_DIR}/usr/include/tirpc
+			--with-tirpcinclude=${TIRPCINC}
 else
 CONFIGURE_ARGS+=	--disable-tirpc
 endif
@@ -57,6 +65,8 @@ CONFIGURE_ARGS+=	--without-tcp-wrappers \
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
+	${INSTALL_DIR} ${IDIR_NFS_UTILS}/sbin
+	${CP} ${WRKINST}/sbin/{u,}mount.nfs* ${IDIR_NFS_UTILS}/sbin
 	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
 	${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \
 		${IDIR_NFS_UTILS}/usr/sbin/
diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init
index 26be81aa8..4f0aaabe3 100644
--- a/package/nfs-utils/files/nfsd.init
+++ b/package/nfs-utils/files/nfsd.init
@@ -7,7 +7,7 @@
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" || test x"${rpcbind:-NO}" = x"NO" && exit 0
+	test x"${portmap:-NO}" = x"NO" && test x"${rpcbind:-NO}" = x"NO" && exit 0
 	test x"${nfs_server:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
@@ -32,6 +32,7 @@ stop)
 	if [ ${nfs_server_version} -eq 4 ];then
 		kill $(pgrep -f /usr/sbin/idmapd)
 		kill $(pgrep -f /usr/sbin/svcgssd)
+		umount /var/lib/nfs/rpc_pipefs
 	fi
 	;;
 restart)
diff --git a/package/nfs-utils/patches/patch-config_log b/package/nfs-utils/patches/patch-config_log
deleted file mode 100644
index f781209a4..000000000
--- a/package/nfs-utils/patches/patch-config_log
+++ /dev/null
@@ -1,5831 +0,0 @@
---- nfs-utils-1.2.3.orig/config.log	2010-09-28 14:25:03.000000000 +0200
-+++ nfs-utils-1.2.3/config.log	2011-01-21 17:33:44.714914032 +0100
-@@ -4,22 +4,22 @@ running configure, to aid debugging if c
- It was created by linux nfs-utils configure 1.2.3, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
--  $ ./configure --disable-gss
-+  $ /home/wbx/adk/openadk/build_ibm-x40_i686_uclibc/w-nfs-utils-1.2.3-3/nfs-utils-1.2.3/configure --build=x86_64-linux-gnu --host=i686-openadk-linux --target=i686-openadk-linux --program-prefix= --program-suffix= --prefix=/usr --bindir=/usr/bin --datadir=/usr/share --mandir=/usr/share/man --libexecdir=/usr/libexec --localstatedir=/var --sysconfdir=/etc --disable-nls --enable-shared --enable-static --disable-dependency-tracking --disable-libtool-lock --enable-nfsv4 --with-krb5=/home/wbx/adk/openadk/target_i686_uclibc/usr/ --enable-gss --enable-tirpc --with-tirpcinclude=/home/wbx/adk/openadk/target_i686_uclibc/usr/include/tirpc --without-tcp-wrappers --with-rpcgen=internal --disable-uuid
- 
- ## --------- ##
- ## Platform. ##
- ## --------- ##
- 
--hostname = TopHat.home.4dicksons.org
-+hostname = chrom
- uname -m = x86_64
--uname -r = 2.6.34.6-54.fc13.x86_64
-+uname -r = 2.6.31-22-server
- uname -s = Linux
--uname -v = #1 SMP Sun Sep 5 17:16:27 UTC 2010
-+uname -v = #70-Ubuntu SMP Thu Dec 2 00:00:57 UTC 2010
- 
- /usr/bin/uname -p = unknown
- /bin/uname -X     = unknown
- 
--/bin/arch              = x86_64
-+/bin/arch              = unknown
- /usr/bin/arch -k       = unknown
- /usr/convex/getsysinfo = unknown
- /usr/bin/hostinfo      = unknown
-@@ -27,23 +27,18 @@ uname -v = #1 SMP Sun Sep 5 17:16:27 UTC
- /usr/bin/oslevel       = unknown
- /bin/universe          = unknown
- 
--PATH: /usr/lib64/qt-3.3/bin
--PATH: /usr/kerberos/sbin
--PATH: /usr/kerberos/bin
--PATH: /usr/lib64/ccache
--PATH: /usr/local/bin
--PATH: /bin
--PATH: /usr/bin
-+PATH: /home/wbx/adk/openadk/scripts
-+PATH: /home/wbx/adk/openadk/bin/tools
-+PATH: /home/wbx/adk/openadk/host_i686_uclibc/bin
-+PATH: /home/wbx/ad