Merge branch 'master' of git+ssh://openadk.org/git/openadk

author: Waldemar Brodkorb <wbx@openadk.org> 2011-10-12 21:10:52 +0200
committer: Waldemar Brodkorb <wbx@openadk.org> 2011-10-12 21:10:52 +0200
commit: 681a668edf704bbb000a49c835b3d71fa7035d86 (patch)
tree: 27df7d51e37260f63812466b31369c1a144cdc45 /package
parent: 2d1f73d4334593134d3a47704a2614ffcae384ae (diff)
parent: 6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff)
189 files changed, 6001 insertions, 4026 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 46abb9280..2f50ddf20 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -24,7 +24,7 @@ PKGSC_CONVERT:=		multimedia
 PKGSS_CONVERT:=		libimagemagick
 PKGSD_DISPLAY:=		image display application
 PKGSC_DISPLAY:=		multimedia
-PKGSS_DISPLAY:=		libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng
+PKGSS_DISPLAY:=		libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl
 PKGSB_DISPLAY:=		libX11
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz
@@ -36,7 +36,6 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE
 $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		ac_cv_sys_file_offset_bits=yes
 CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
diff --git a/package/Pacemaker-Python-GUI/Makefile b/package/Pacemaker-Python-GUI/Makefile
new file mode 100644
index 000000000..616fa9360
--- /dev/null
+++ b/package/Pacemaker-Python-GUI/Makefile
@@ -0,0 +1,47 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		Pacemaker-Python-GUI
+PKG_VERSION:=		2.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		22379f78409cec9df10c25983783ef6c
+PKG_DESCR:=		Pacemaker GUI
+PKG_SECTION:=		ha
+PKG_BUILDDEP:=		pacemaker gnutls pam
+PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
+PKG_SITES:=		http://openadk.org/distfiles/
+
+PKG_SUBPKGS:=		PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD
+PKGSD_PACEMAKER_MGMTD:=	Management daemon for Pacemaker GUI
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PACEMAKER_PYTHON_GUI,pacemaker-python-gui,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--with-initdir=/etc/init.d \
+			--with-ocf-root=/usr/lib/ocf \
+			--disable-fatal-warnings
+TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/python2.7 \
+			-I$(STAGING_DIR)/usr/include/pacemaker \
+			-I$(STAGING_DIR)/usr/include/heartbeat
+
+pacemaker-python-gui-install:
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/hb_gui \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
+
+pacemaker-mgmtd-install:
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \
+		$(IDIR_PACEMAKER_MGMTD)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \
+		$(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+	
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c
new file mode 100644
index 000000000..1882093d5
--- /dev/null
+++ b/package/Pacemaker-Python-GUI/patches/patch-mgmt_daemon_mgmt_crm_c
@@ -0,0 +1,32 @@
+--- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c	2011-08-03 13:54:23.000000000 +0200
++++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c	2011-10-07 16:15:59.000000000 +0200
+@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 				argv[1], cib_error2string(rc));
+ 	} else {
+ 		buffer = crm_concat("fail-count", argv[2], '-');
+-		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL,
++		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL,
+ 				NULL, buffer, NULL, FALSE);
+ 		crm_free(dest_node);
+ 		crm_free(buffer);
+@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 	sleep(2); /* wait for the refresh */
+ 	now_s = crm_itoa(now);
+ 	update_attr(cib_conn, cib_sync_call,
+-		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
++		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
+ 	crm_free(now_s);
+ 
+ 	crmd_channel->ops->destroy(crmd_channel);
+@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc
+ 				strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1);
+ 			}
+ 
++			/*
+ 			if(is_set(rsc->flags, pe_rsc_failure_ignored)) {
+ 				strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1);
+ 			}
++			*/
+ 
+ 			ret = mgmt_msg_append(ret, buf);
+ 			break;
diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile
new file mode 100644
index 000000000..4d6183595
--- /dev/null
+++ b/package/SDL_gfx/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		SDL_gfx
+PKG_VERSION:=		2.0.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		330f291f1f09a1bdf397c9b40d92ca41
+PKG_DESCR:=		SDL GFX library
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libsdl
+PKG_BUILDDEP:=		sdl
+PKG_URL:=		http://www.ferzkopp.net/joomla/content/view/19/14/
+PKG_SITES:=		http://www.ferzkopp.net/Software/SDL_gfx-2.0/
+
+PKG_SUBPKGS:=		LIBSDL_GFX LIBSDL_GFX_DEV
+PKGSD_LIBSDL_GFX_DEV:=	development files for SDL_gfx
+PKGSC_LIBSDL_GFX_DEV:=	devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_GFX_DEV,libsdl-gfx-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_GFX_DEV},${PKGSC_LIBSDL_GFX_DEV}))
+
+CONFIGURE_ARGS+=	--disable-mmx
+
+libsdl-gfx-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_GFX)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libSDL_gfx.so* $(IDIR_LIBSDL_GFX)/usr/lib
+
+libsdl-gfx-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_GFX_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_GFX_DEV)/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
new file mode 100644
index 000000000..0afba1946
--- /dev/null
+++ b/package/SDL_ttf/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		SDL_ttf
+PKG_VERSION:=		2.0.10
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		814e6e17e8879254208d23b3b7e0354b
+PKG_DESCR:=		TrueType fonts in your SDL applications
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libsdl libfreetype
+PKG_BUILDDEP:=		sdl freetype
+PKG_URL:=		http://www.libsdl.org/projects/SDL_ttf/
+PKG_SITES:=		http://www.libsdl.org/projects/SDL_ttf/release/
+
+PKG_SUBPKGS:=		LIBSDL_TTF LIBSDL_TTF_DEV
+PKGSD_LIBSDL_TTF_DEV:=	development files
+PKGSC_LIBSDL_TTF_DEV:=	devel
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBSDL_TTF_DEV,libsdl-ttf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBSDL_TTF_DEV},${PKGSC_LIBSDL_TTF_DEV}))
+
+libsdl-ttf-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
+
+libsdl-ttf-dev-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/include
+	$(CP) $(WRKINST)/usr/include/* $(IDIR_LIBSDL_TTF_DEV)/usr/include
+	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_LIBSDL_TTF_DEV)/usr/lib/pkgconfig
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index a4ab0d8eb..8cea27683 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -5,10 +5,10 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		adkinstall
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		9
+PKG_RELEASE:=		10
 PKG_DESCR:=		openadk installer
 PKG_SECTION:=		base
-PKG_DEPENDS:=		parted sfdisk e2fsprogs
+PKG_DEPENDS:=		parted sfdisk mke2fs
 PKG_URL:=		http://openadk.org/
 
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
diff --git a/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch
new file mode 100644
index 000000000..f4a520a5c
--- /dev/null
+++ b/package/alsa-utils/patches/alsa-utils-exp10-workaround.patch
@@ -0,0 +1,33 @@
+From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Mon, 14 Mar 2011 09:19:18 +0100
+Subject: [PATCH] alsamixer: fix build on uClibc
+
+exp10 is a glibc extension, which isn't supported on uClibc. Luckily,
+exp10() is trivial to compute based on exp(), so add a wrapper for
+the uClibc case.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ alsamixer/volume_mapping.c |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c
+index 9cacad8..1c0d7c4 100644
+--- a/alsamixer/volume_mapping.c
++++ b/alsamixer/volume_mapping.c
+@@ -37,6 +37,11 @@
+ #include <stdbool.h>
+ #include "volume_mapping.h"
+ 
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
++
+ #define MAX_LINEAR_DB_SCALE	24
+ 
+ static inline bool use_linear_dB_scale(long dBmin, long dBmax)
+-- 
+1.7.2.3
+
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 0b289702f..814d753a2 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
 PKG_VERSION:=		1.11.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_EXTRAVER:=		1.11
 PKG_MD5SUM:=		4ee7f0ff5f0e467d58b6bd5da96b1c74
 PKG_DESCR:=		GNU automake
@@ -26,9 +26,9 @@ automake-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
 	${CP} ${WRKINST}/usr/share/aclocal-${PKG_EXTRAVER} \
-		${IDIR_AUTOMAKE}/usr/share/aclocal-${PKG_EXTRAVER}
+		${IDIR_AUTOMAKE}/usr/share
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
-	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER}/Automake \
-		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_EXTRAVER}
+	${CP} ${WRKINST}/usr/share/automake-${PKG_EXTRAVER} \
+		${IDIR_AUTOMAKE}/usr/share
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index a1cf05491..fa1fecd86 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		45
+PKG_RELEASE:=		48
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
@@ -64,10 +64,15 @@ endif
 	    cat ./files/inittab.serial >> $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_CONSOLE_BOTH) || \
 	    cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab
+ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
+	$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
-	    echo "127.0.0.1	$(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts
+	    echo "127.0.0.1	localhost" > $(IDIR_BASE_FILES)/etc/hosts
+	    echo "::1		localhost" >> $(IDIR_BASE_FILES)/etc/hosts
+	    echo "127.0.1.1	$(ADK_RUNTIME_HOSTNAME)" >> $(IDIR_BASE_FILES)/etc/hosts
 	test -z $(ADK_RUNTIME_PASSWORD) || \
 	    $(SED) 's,\*NP\*,'"$$(${TOPDIR}/bin/tools/mkcrypt \
 	    ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow
@@ -81,4 +86,75 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz
 endif
 
+
+
+# simple network configuration
+ifneq (${ADK_SIMPLE_NETWORK_CONFIG},)
+	${INSTALL_DIR} ${IDIR_BASE_FILES}/etc/network
+
+	# network config local
+	echo -e "auto lo\niface lo inet loopback" > ${IDIR_BASE_FILES}/etc/network/interfaces
+
+	# network config eth0
+	# configure nic with manual ip
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC},y)
+	echo -e "\nauto eth0\niface eth0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+	# configure nic with dhcp
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL},y)
+	echo -e "\nauto eth0\niface eth0 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  address ${SIMPLE_NETWORK_CONFIG_ETH0_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  netmask ${SIMPLE_NETWORK_CONFIG_ETH0_NM}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  broadcast ${SIMPLE_NETWORK_CONFIG_ETH0_BC}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  gateway ${SIMPLE_NETWORK_CONFIG_ETH0_GW}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+	# configure bridge
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE},y)
+	echo -e "\nauto br0\niface br0 inet manual" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+	#configure bridge with ip
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP},y)
+	echo -e "\nauto br0\niface br0 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  address ${SIMPLE_NETWORK_CONFIG_ETH0_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  netmask ${SIMPLE_NETWORK_CONFIG_ETH0_NM}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  broadcast ${SIMPLE_NETWORK_CONFIG_ETH0_BC}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+
+	# network config eth1
+	# configure nic with manual ip
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC},y)
+	echo -e "\nauto eth1\niface eth1 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+	# configure nic with dhcp
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL},y)
+	echo -e "\nauto eth1\niface eth1 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  address ${SIMPLE_NETWORK_CONFIG_ETH1_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  netmask ${SIMPLE_NETWORK_CONFIG_ETH1_NM}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  broadcast ${SIMPLE_NETWORK_CONFIG_ETH1_BC}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  gateway ${SIMPLE_NETWORK_CONFIG_ETH1_GW}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+	# configure bridge
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE},y)
+	echo -e "\nauto br0\niface br1 inet manual" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH1_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+	#configure bridge with ip
+ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_BRIDGE_IP},y)
+	echo -e "\nauto br0\niface br1 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  address ${SIMPLE_NETWORK_CONFIG_ETH1_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  netmask ${SIMPLE_NETWORK_CONFIG_ETH1_NM}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  broadcast ${SIMPLE_NETWORK_CONFIG_ETH1_BC}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH1_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+
+	# newline at the end of interfaces file
+	echo -en "\n" >>  ${IDIR_BASE_FILES}/etc/network/interfaces
+
+	# resolver config
+	echo -e "nameserver ${SIMPLE_NETWORK_CONFIG_RESOLV}" > ${IDIR_BASE_FILES}/etc/resolv.conf
+endif
+
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/base-files/src/etc/group b/package/base-files/src/etc/group
index c4e77f316..bbf6c0603 100644
--- a/package/base-files/src/etc/group
+++ b/package/base-files/src/etc/group
@@ -1,2 +1,4 @@
 root:x:0:
+video:x:1:
+audio:x:2:
 nogroup:x:65534:
diff --git a/package/base-files/src/etc/hosts b/package/base-files/src/etc/hosts
deleted file mode 100644
index 085363292..000000000
--- a/package/base-files/src/etc/hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-::1	localhost
-127.0.0.1	localhost
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 173a851f3..4cc06251a 100644
--- a/package/base-files/src/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
@@ -9,7 +9,7 @@ ttyS* 0:0 640
 rtc0 root:root 660 @ln -sf /dev/rtc0 /dev/rtc
 device-mapper 0:0 660 @test -d /dev/mapper || mkdir /dev/mapper
 tun 0:0 660 >net/tun
-fb? root:video 660
+fb0 root:video 660
 audio root:audio 660 >snd/audio
 dsp root:audio 660 >snd/dsp
 timer root:audio 660 >snd/timer
diff --git a/package/base-files/src/init b/package/base-files/src/init
index a3232cb9c..c57149fe3 100755
--- a/package/base-files/src/init
+++ b/package/base-files/src/init
@@ -1,7 +1,7 @@
 #!/bin/sh
 echo "System initialization ..."
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-mount -t devtmpfs devtmpfs /dev > /dev/null 2>&1
+mount -t devtmpfs devtmpfs /dev >/dev/null 2>&1
 mount -nt proc proc /proc
 mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 [ ! -f /etc/notmpfs ] && {
@@ -12,12 +12,14 @@ mount -o nosuid,nodev,noexec -t sysfs sysfs /sys
 mount -o remount,nosuid,size=128k,mode=0755 -t tmpfs mdev /dev
 [ -d /dev/pts ] || mkdir /dev/pts 
 [ -d /dev/shm ] || mkdir /dev/shm
+mount -o nosuid,noexec -t tmpfs tmpfs /dev/shm
 mount -o nosuid,noexec -t devpts devpts /dev/pts
 exec 0<>/dev/console >&0 2>&0
 echo >/dev/mdev.seq
 echo "/sbin/mdev" >/proc/sys/kernel/hotplug
 mdev -s
 cat /etc/.rnd >/dev/urandom 2>&1
+[ -x /kexecinit ] && { /kexecinit; }
 [ -x /cryptinit ] && { /cryptinit; exec switch_root /mnt "/init";}
 [ -x /sbin/cfgfs ] && { cfgfs setup; mount -o remount,ro /;} || mount -o remount,rw /
 [ -f /etc/fstab ] && { fsck -p >/dev/null; mount -a;}
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index 619faf04f..b5477412f 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -89,6 +89,14 @@ case $1 in
                 ;;
 esac
 
+# fix permissions
+if [ -f /usr/bin/sudo ];then
+	chmod 4755 /usr/bin/sudo
+fi
+if [ -f /usr/bin/Xorg ];then
+	chmod 4755 /usr/bin/Xorg
+fi
+
 sync
 if [ -x /sbin/cfgfs ];then
 	umount /etc
diff --git a/package/boost/Makefile b/package/boost/Makefile
new file mode 100644
index 000000000..4bd6b2c44
--- /dev/null
+++ b/package/boost/Makefile
@@ -0,0 +1,162 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		boost
+PKG_VERSION:=		1_47_0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ff180a5276bec773a7625cac7e2288e8
+PKG_DESCR:=		boost C++ library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.boost.org/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
+
+DISTFILES:=		boost_1_47_0.tar.gz
+WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
+
+PKG_ARCH_DEPENDS:=	!mips
+
+PKG_SUBPKGS:=		BOOST BOOST_DEV
+PKGSD_BOOST_DEV:=	boost header files
+PKGSC_BOOST_DEV:=	devel
+
+PKG_CHOICES_BOOST:=	STATIC SHARED BOTH
+PKGCD_STATIC:=		install static libs
+PKGCD_SHARED:=		install shared libs
+PKGCD_BOTH:=		install static and shared libs
+
+PKG_FLAVOURS_BOOST:=	date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
+
+PKGFD_date_time:=	with date-time
+PKGFD_python:=	with Python
+PKGFB_python:=	python2
+PKGFS_python:=	python2
+PKGFD_iostreams:=	with iostreams
+PKGFD_graph:=	with graph
+PKGFD_graph_parallel:=	with graph_parallel
+PKGFD_math:=	with math
+PKGFD_program_options:=	with program_options
+PKGFD_regex:=	with regex
+PKGFD_serialization:=	with serialization
+PKGFD_signals:=	with signals
+PKGFD_system:=	with system
+PKGFD_test:=	with test
+PKGFD_thread:=	with thread
+PKGFD_wave:=	with wave
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,BOOST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BOOST_DEV,boost-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_BOOST_DEV},${PKGSC_BOOST_DEV}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+CONFIGURE_ARGS += \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--prefix=${WRKINST}/usr \
+
+ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},)
+	CONFIGURE_ARGS += -sNO_BZIP2=1 -sZLIB_INCLUDE=${STAGING_DIR}/usr/include -sZLIB_LIBPATH=${STAGING_DIR}/usr/lib
+else
+	CONFIGURE_ARGS += --without-iostreams
+endif
+ifeq (${ADK_PACKAGE_BOOST_DATE_TIME},)
+	CONFIGURE_ARGS+=--without-date_time
+endif
+ifeq (${ADK_PACKAGE_BOOST_PYTHON},)
+	CONFIGURE_ARGS+=--without-python
+endif
+ifeq (${ADK_PACKAGE_BOOST_GRAPH},)
+	CONFIGURE_ARGS+=--without-graph
+endif
+ifeq (${ADK_PACKAGE_BOOST_math},)
+	CONFIGURE_ARGS+=--without-math
+endif
+ifeq (${ADK_PACKAGE_BOOST_PROGRAM_OPTIONS},)
+	CONFIGURE_ARGS+=--without-program_options
+endif
+ifeq (${ADK_PACKAGE_BOOST_REGEX},)
+	CONFIGURE_ARGS+=--without-regex
+endif
+ifeq (${ADK_PACKAGE_BOOST_SERIALIZATION},)
+	CONFIGURE_ARGS+=--without-serialization
+endif
+ifeq (${ADK_PACKAGE_BOOST_SIGNALS},)
+	CONFIGURE_ARGS+=--without-signals
+endif
+ifeq (${ADK_PACKAGE_BOOST_SYSTEM},)
+	CONFIGURE_ARGS+=--without-system
+endif
+ifeq (${ADK_PACKAGE_BOOST_TEST},)
+	CONFIGURE_ARGS+=--without-test
+endif
+ifeq (${ADK_PACKAGE_BOOST_THREAD},)
+	CONFIGURE_ARGS+=--without-thread
+endif
+ifeq (${ADK_PACKAGE_BOOST_WAVE},)
+	CONFIGURE_ARGS+=--without-wave
+endif
+
+# some variables for build
+GPP_PATH:=	${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++
+GPP_VERSION:=	"`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`"
+BJAM_PATH:=	"`find ${WRKBUILD} -type f -name "bjam"`"
+PYTHON_PATH:=	${STAGING_TARGET_DIR}/usr/bin/python
+PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`"
+PYTHON_LIB:=	"`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`"
+USER_JAM:=	${WRKBUILD}/tools/build/v2/user-config.jam
+
+pre-build:
+	@echo "build bjam..."
+	cd $(WRKBUILD)/tools/build/v2/engine; ./build.sh gcc
+
+do-build:
+	@echo "build boost library..."
+# remove exisiting using gcc line from user.jam
+	${SED} "/^using gcc/d" ${USER_JAM}
+# add using gcc line with determined options to user.jam
+	echo "using gcc : ${GPP_VERSION} : ${GPP_PATH} ;" >> ${USER_JAM};
+
+# remove exisiting using python line from user.jam
+	${SED} "/^using python/d" ${USER_JAM}
+ifneq (${ADK_PACKAGE_BOOST_PYTHON},)
+# add using python line with determined options to user.jam
+	echo "using python : ${PYTHON_VERSION} : ${PYTHON_PATH} : ${PYTHON_INCLUDE} : ${PYTHON_LIB} ;" >> ${USER_JAM};
+endif
+
+# run bjam to build boost
+	( cd ${WRKBUILD}; \
+		${BJAM_PATH} \
+			-sBUILD=release \
+			--toolset=gcc-${GPP_VERSION} \
+			--build-type=minimal \
+			--layout=versioned \
+			--disable-long-double \
+			--without-mpi \
+			${CONFIGURE_ARGS} \
+			install \
+	)
+
+boost-install:
+	${INSTALL_DIR} ${IDIR_BOOST}/usr/lib
+ifneq (${ADK_PACKAGE_BOOST_SHARED},)
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
+endif
+ifneq (${ADK_PACKAGE_BOOST_STATIC},)
+	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
+endif
+ifneq (${ADK_PACKAGE_BOOST_BOTH},)
+	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_BOOST}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_BOOST}/usr/lib
+endif
+
+boost-dev-install:
+	${INSTALL_DIR} ${IDIR_BOOST_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_BOOST_DEV}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 9c55d74aa..1b2d9d5fd 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -776,7 +776,7 @@ config BUSYBOX_TRUE
 
 config BUSYBOX_TTY
 	bool "tty"
-	default n
+	default y
 	help
 	  tty is used to print the name of the current terminal to
 	  standard output.
diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index cbdcca9ce..56a816b02 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -472,7 +472,7 @@ config BUSYBOX_FEATURE_LESS_LINENUMS
 config BUSYBOX_HDPARM
 	bool "hdparm"
 	depends on !ADK_PACKAGE_HDPARM
-	default y
+	default n
 	depends on BUSYBOX_PLATFORM_LINUX
 	help
 	  Get/Set hard drive parameters. Primarily intended for ATA
diff --git a/package/cluster-glue/Makefile b/package/cluster-glue/Makefile
index 0e889194f..170ae3a08 100644
--- a/package/cluster-glue/Makefile
+++ b/package/cluster-glue/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://www.linux-ha.org/wiki/Cluster_Glue
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_CLUSTER_GLUE:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 
@@ -27,8 +27,10 @@ CONFIGURE_ARGS+=	--disable-bundled-ltdl \
 			--enable-fatal-warnings=no
 
 cluster-glue-install:
-	$(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib
+	$(INSTALL_DIR) $(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
 	$(CP) $(WRKINST)/usr/lib/*.so* \
 		$(IDIR_CLUSTER_GLUE)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/heartbeat/* \
+		$(IDIR_CLUSTER_GLUE)/usr/lib/heartbeat
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/corosync/Makefile b/package/corosync/Makefile
index 378fd618a..eb5ae8197 100644
--- a/package/corosync/Makefile
+++ b/package/corosync/Makefile
@@ -4,13 +4,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		corosync
-PKG_VERSION:=		1.3.1
+PKG_VERSION:=		1.4.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c58459a009a3a9d0b9c00e276a190d90
+PKG_MD5SUM:=		66231146af210637393748add091021d
 PKG_DESCR:=		Cluster Engine	
 PKG_SECTION:=		ha
+PKG_DEPENDS:=		cluster-glue
 PKG_URL:=		http://www.corosync.org/
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		ftp://ftp:downloads@ftp.corosync.org/downloads/corosync-1.4.1/
 
 PKG_CFLINE_COROSYNC:=	select ADK_KERNEL_IP_MULTICAST
 
diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in
index 4fc1ef74a..38cf13b7c 100644
--- a/package/corosync/patches/patch-Makefile_in
+++ b/package/corosync/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- corosync-1.3.1.orig/Makefile.in	2011-04-25 04:39:52.000000000 +0200
-+++ corosync-1.3.1/Makefile.in	2011-06-25 21:58:51.012672595 +0200
-@@ -320,7 +320,7 @@ corosysconf_DATA = conf/corosync.conf.ex
+--- corosync-1.4.1.orig/Makefile.in	2011-07-26 10:13:38.000000000 +0200
++++ corosync-1.4.1/Makefile.in	2011-10-12 06:02:03.291467847 +0200
+@@ -323,7 +323,7 @@ corosysconf_DATA = conf/corosync.conf.ex
  			  conf/corosync.conf.example.udpu
  
  SUBDIRS = include lcr lib exec services tools test pkgconfig \
--			  man init
-+			  init
+-			  man init conf
++			  init conf
  
  RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
  		  --define "_specdir $(abs_builddir)" \
diff --git a/package/corosync/patches/patch-tools_corosync-keygen_c b/package/corosync/patches/patch-tools_corosync-keygen_c
index 6e147930c..eecf92026 100644
--- a/package/corosync/patches/patch-tools_corosync-keygen_c
+++ b/package/corosync/patches/patch-tools_corosync-keygen_c
@@ -1,5 +1,5 @@
---- corosync-1.3.1.orig/tools/corosync-keygen.c	2011-04-25 04:37:50.000000000 +0200
-+++ corosync-1.3.1/tools/corosync-keygen.c	2011-05-26 07:27:22.000000000 +0200
+--- corosync-1.4.1.orig/tools/corosync-keygen.c	2011-07-26 10:08:43.000000000 +0200
++++ corosync-1.4.1/tools/corosync-keygen.c	2011-10-04 21:03:05.000000000 +0200
 @@ -65,11 +65,11 @@ int main (void) {
  		}
  	}
diff --git a/package/cups/Makefile b/package/cups/Makefile
index 762f1832a..6a36d424a 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -17,9 +17,13 @@ PKG_NEED_CXX:=		1
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
+PKG_SUBPKGS:=		CUPS CUPS_DEV
+PKGSC_CUPS_DEV:=	devel
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,CUPS_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_CUPS_DEV}))
 
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
@@ -80,4 +84,8 @@ post-install:
 	${CP} ${WRKINST}/usr/sbin/* ${IDIR_CUPS}/usr/sbin/
 	${CP} ./files/etc/cups/* ${IDIR_CUPS}/etc/cups/
 
+cups-dev-install:
+	${INSTALL_DIR} ${IDIR_CUPS_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_CUPS_DEV}/usr/include
+	
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cutter/patches/patch-cutter_c b/package/cutter/patches/patch-cutter_c
index 781c17401..03129f87e 100644
--- a/package/cutter/patches/patch-cutter_c
+++ b/package/cutter/patches/patch-cutter_c
@@ -1,7 +1,18 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- cutter-1.03.orig/cutter.c	2005-04-30 09:01:03.000000000 +0200
-+++ cutter-1.03/cutter.c	2008-10-09 11:32:40.000000000 +0200
-@@ -297,7 +297,7 @@ int send_rst(
++++ cutter-1.03/cutter.c	2011-08-24 18:49:58.830478484 +0200
+@@ -35,6 +35,10 @@
+  * 		improvment.
+  */
+ 
++#ifndef __packed
++#define __packed __attribute__((packed))
++#endif
++
+ #include <string.h>
+ #include <stdio.h>
+ #include <unistd.h>
+@@ -297,7 +301,7 @@ int send_rst(
  	pheader.placeholder=0;
  	pheader.protocol=IPPROTO_TCP;
  	pheader.tcp_length=htons(TCPHDR);
@@ -10,7 +21,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	tpack.tcp.check=in_cksum((unsigned short *)&pheader,TCPHDR+12);
  
  	/*
-@@ -419,7 +419,7 @@ int send_rst(
+@@ -419,7 +423,7 @@ int send_rst(
  			pheader.placeholder=0;
  			pheader.protocol=IPPROTO_TCP;
  			pheader.tcp_length=htons(TCPHDR);
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 81d8751c5..de7c1ba29 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
-PKG_VERSION:=		2.2
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		f8bcd62093f178bed81e46cc54e73f42
+PKG_VERSION:=		3.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		448f44a923222270cb0c84e55adc1be1
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
@@ -17,7 +17,7 @@ PKG_SITES:=		http://www.dillo.org/download/
 PKG_NEED_CXX:=		1
 
 PKG_HOST_DEPENDS:=	!cygwin
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/dillo/patches/patch-Makefile_in b/package/dillo/patches/patch-Makefile_in
index 6b18010d3..ff0c0c32f 100644
--- a/package/dillo/patches/patch-Makefile_in
+++ b/package/dillo/patches/patch-Makefile_in
@@ -1,11 +1,11 @@
---- dillo-2.2.orig/Makefile.in	2010-02-11 11:20:01.000000000 +0100
-+++ dillo-2.2/Makefile.in	2011-01-07 21:37:49.000000000 +0100
+--- dillo-3.0.orig/Makefile.in	2011-09-06 22:55:42.000000000 +0200
++++ dillo-3.0/Makefile.in	2011-09-12 20:25:51.000482366 +0200
 @@ -242,7 +242,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
 -SUBDIRS = lout dw dlib dpip src doc dpid dpi test
 +SUBDIRS = lout dw dlib dpip src doc dpid dpi
- EXTRA_DIST = Doxyfile dillorc install-dpi-local
+ EXTRA_DIST = Doxyfile dillorc install-dpi-local d_size.h
  sysconf_DATA = dillorc
  all: config.h
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
deleted file mode 100644
index 222be7882..000000000
--- a/package/dillo/patches/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
---- dillo-2.2.orig/configure	2010-02-11 11:19:59.000000000 +0100
-+++ dillo-2.2/configure	2011-03-28 02:30:04.373370428 +0200
-@@ -5830,11 +5830,6 @@ typedef unsigned char   bool_t;
- _______EOF
- 
- 
--if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then
--  CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--  LDFLAGS="$LDFLAGS -L/usr/local/lib"
--fi
--
- for ac_func in gethostbyname
- do :
-   ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
-@@ -6215,9 +6210,9 @@ if test "x$enable_png" = "xyes"; then
- $as_echo_n "checking for libpng-config... " >&6; }
- 
-   if test -z "$PNG_CONFIG"; then
--    PNG_CONFIG=`which libpng12-config`
-+    PNG_CONFIG=`which libpng-config`
-     if test -z "$PNG_CONFIG"; then
--      PNG_CONFIG=`which libpng-config`
-+      PNG_CONFIG=`which libpng15-config`
-     fi
-     if test -z "$PNG_CONFIG"; then
-       PNG_CONFIG=`which libpng10-config`
diff --git a/package/dillo/patches/patch-src_IO_Makefile_in b/package/dillo/patches/patch-src_IO_Makefile_in
index 242d86f5a..7c59b6168 100644
--- a/package/dillo/patches/patch-src_IO_Makefile_in
+++ b/package/dillo/patches/patch-src_IO_Makefile_in
@@ -1,9 +1,9 @@
---- dillo-2.2.orig/src/IO/Makefile.in	2010-02-11 11:20:01.000000000 +0100
-+++ dillo-2.2/src/IO/Makefile.in	2011-01-07 21:38:15.000000000 +0100
-@@ -188,7 +188,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -DDILLO_BINDIR='"$(bindir)/"'
+--- dillo-3.0.orig/src/IO/Makefile.in	2011-09-06 22:55:42.000000000 +0200
++++ dillo-3.0/src/IO/Makefile.in	2011-09-12 20:24:41.527983361 +0200
+@@ -191,7 +191,7 @@ AM_CPPFLAGS = \
+ 	-I$(top_srcdir) \
+ 	-DDILLO_BINDIR='"$(bindir)/"'
+ 
 -AM_CFLAGS = @LIBFLTK_CFLAGS@
 +AM_CFLAGS = 
  AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index cd2c3caeb..7b76c5629 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -15,8 +15,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:=		LIBE2FS LIBUUID LIBCOM_ERR LIBSS LIBBLKID E2FSCK_STATIC
 PKG_SUBPKGS+=		LIBCOM_ERR_DEV LIBSS_DEV LIBUUID_DEV LIBBLKID_DEV
+PKG_SUBPKGS+=		RESIZE2FS TUNE2FS E2FSCK MKE2FS
+PKGSD_LIBE2FS:=		e2fsprogs library
+PKGSC_LIBE2FS:=		libs
 PKGSD_LIBUUID:=		UUID library
 PKGSC_LIBUUID:=		libs
 PKGSD_LIBUUID_DEV:=	UUID headers
@@ -35,10 +38,22 @@ PKGSD_LIBBLKID_DEV:=	blkid headers
 PKGSC_LIBBLKID_DEV:=	devel
 PKGSD_E2FSCK_STATIC:=	Static build of e2fsck
 PKGSC_E2FSCK_STATIC:=	fs
+PKGSD_RESIZE2FS:=	Resize FS utility
+PKGSC_RESIZE2FS:=	fs
+PKGSS_RESIZE2FS:=	libe2fs
+PKGSD_TUNE2FS:=		Tune2FS utility
+PKGSC_TUNE2FS:=		fs
+PKGSS_TUNE2FS:=		libe2fs
+PKGSD_E2FSCK:=		E2fsck utility
+PKGSC_E2FSCK:=		fs
+PKGSS_E2FSCK:=		libe2fs
+PKGSD_MKE2FS:=		Mke2fs utility
+PKGSC_MKE2FS:=		fs
+PKGSS_MKE2FS:=		libe2fs
 
 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,LIBE2FS,libe2fs,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBE2FS},${PKGSC_LIBE2FS}))
 $(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}))
@@ -48,6 +63,10 @@ $(eval $(call PKG_template,LIBSS_DEV,libss-dev,${PKG_VERSION}-${PKG_RELEASE},,${
 $(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}))
+$(eval $(call PKG_template,TUNE2FS,tune2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_TUNE2FS),${PKGSD_TUNE2FS},${PKGSC_TUNE2FS}))
+$(eval $(call PKG_template,RESIZE2FS,resize2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_RESIZE2FS),${PKGSD_RESIZE2FS},${PKGSC_RESIZE2FS}))
+$(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_MKE2FS),${PKGSD_MKE2FS},${PKGSC_MKE2FS}))
+$(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath
 INSTALL_TARGET+=	install-libs
@@ -67,16 +86,29 @@ ifneq ($(ADK_PACKAGE_E2FSCK_STATIC),)
 	${INSTALL_BIN} ${WRKBUILD}/e2fsck/e2fsck.static ${WRKINST}/usr/sbin
 endif
 
-e2fsprogs-install:
-	${INSTALL_DIR} ${IDIR_E2FSPROGS}/etc
-	${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_E2FSPROGS}/etc
-	${INSTALL_DIR} ${IDIR_E2FSPROGS}/usr/lib ${IDIR_E2FSPROGS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSPROGS}/usr/sbin
-	cd $(IDIR_E2FSPROGS)/usr/sbin && ln -sf e2fsck fsck.ext2
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_E2FSPROGS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_E2FSPROGS}/usr/sbin
+libe2fs-install:
+	${INSTALL_DIR} ${IDIR_LIBE2FS}/etc
+	${INSTALL_DATA} ${WRKINST}/etc/mke2fs.conf ${IDIR_LIBE2FS}/etc
+	${INSTALL_DIR} ${IDIR_LIBE2FS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib{e2p,ext2fs}.so.* \
-		${IDIR_E2FSPROGS}/usr/lib
+		${IDIR_LIBE2FS}/usr/lib
+
+e2fsck-install:
+	${INSTALL_DIR} ${IDIR_E2FSCK}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/e2fsck ${IDIR_E2FSCK}/usr/sbin
+	cd $(IDIR_E2FSCK)/usr/sbin && ln -sf e2fsck fsck.ext2
+
+mke2fs-install:
+	${INSTALL_DIR} ${IDIR_MKE2FS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/mke2fs ${IDIR_MKE2FS}/usr/sbin
+
+tune2fs-install:
+	${INSTALL_DIR} ${IDIR_TUNE2FS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/tune2fs ${IDIR_TUNE2FS}/usr/sbin
+
+resize2fs-install:
+	${INSTALL_DIR} ${IDIR_RESIZE2FS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/resize2fs ${IDIR_RESIZE2FS}/usr/sbin
 
 libblkid-install:
 	${INSTALL_DIR} ${IDIR_LIBBLKID}/usr/lib
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 5bf290fe9..5466ddb85 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -91,6 +91,15 @@ eglibc-dev-install:
 	${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib $(IDIR_EGLIBC_DEV)/usr/lib
 	# install linker script
 	-cp ./files/libc.so.$(ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+ifeq ($(ADK_TARGET_ABI_O32),y)
+	$(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+endif
+ifeq ($(ADK_TARGET_ABI_N32),y)
+	$(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+endif
+ifeq ($(ADK_TARGET_ABI_N64),y)
+	$(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+endif
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib
 	-for file in libc libcrypt libdl libm libresolv librt libutil; do \
diff --git a/package/eglibc/files/libc.so.mips b/package/eglibc/files/libc.so.mips
index 6165d3e9c..9e73ea39c 100644
--- a/package/eglibc/files/libc.so.mips
+++ b/package/eglibc/files/libc.so.mips
@@ -1,5 +1,5 @@
 /* GNU ld script
    Use the shared library, but some functions are only in
       the static library, so try that secondarily.  */
-      OUTPUT_FORMAT(elf64-tradlittlemips)
+      OUTPUT_FORMAT(@@ELFTARGET@@)
       GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a  AS_NEEDED ( /lib/ld.so.1 ) )
diff --git a/package/faac/Makefile b/package/faac/Makefile
new file mode 100644
index 000000000..b54a35ac0
--- /dev/null
+++ b/package/faac/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		faac
+PKG_VERSION:=		1.28
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		80763728d392c7d789cde25614c878f6
+PKG_DESCR:=		AAC encoder
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.audiocoding.com/faac.html
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=faac/}
+
+PKG_SUBPKGS:=		LIBFAAC
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBFAAC,libfaac,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--without-mp4v2
+
+libfaac-install:
+	$(INSTALL_DIR) $(IDIR_LIBFAAC)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libfaac*.so* \
+		$(IDIR_LIBFAAC)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fbset/files/fb.modes b/package/fbset/files/fb.modes
index e6a4fb7bf..3d50b2fb1 100644
--- a/package/fbset/files/fb.modes
+++ b/package/fbset/files/fb.modes
@@ -1001,3 +1001,11 @@ mode "1600x1200-76"
     timings 5051 304 40 42 3 136 5
 endmode
 
+# settings for nanonote
+mode "320x240-103"
+    # D: 19.884 MHz, H: 27.090 kHz, V: 103.005 Hz
+    geometry 320 240 320 240 32
+    timings 50291 140 273 20 2 1 1
+    rgba 8/16,8/8,8/0,8/24
+endmode
+
diff --git a/package/feh/Makefile b/package/feh/Makefile
new file mode 100644
index 000000000..66a86dacb
--- /dev/null
+++ b/package/feh/Makefile
@@ -0,0 +1,31 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		feh
+PKG_VERSION:=		1.16.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1bb080c7b0021db50884a52161251990
+PKG_DESCR:=		image viewer
+PKG_SECTION:=		multimedia
+PKG_DEPENDS:=		imlib2 giblib
+PKG_BUILDDEP:=		imlib2 giblib
+PKG_SITES:=		http://feh.finalrewind.org/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FEH,feh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+XAKE_FLAGS+=		PREFIX=/usr
+CONFIG_STYLE:=		manual
+MAKE_FLAGS+=		curl=0 xinerama=0
+
+feh-install:
+	$(INSTALL_DIR) $(IDIR_FEH)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/feh \
+		$(IDIR_FEH)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 266102769..aabe94394 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -4,32 +4,86 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		0.6.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		4f5d732d25eedfb072251b5314ba2093
+PKG_VERSION:=		0.8.3
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		556870ccfd6c9c0426c7dd86dd5beb62
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libfaad2
-PKG_BUILDDEP:=		faad2
+PKG_FDEPENDS:=		libpthread
 PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 
 PKG_ARCH_DEPENDS:=	!cris
 
-PKG_SUBPKGS:=		FFMPEG FFPLAY
+PKG_SUBPKGS:=		LIBFFMPEG FFPLAY FFSERVER FFPROBE FFMPEG
 PKGSD_FFPLAY:=		ffmpeg based video player
 PKGSC_FFPLAY:=		multimedia
-PKGSS_FFPLAY:=		libsdl libpthread ffmpeg
+PKGSS_FFPLAY:=		libsdl libpthread libffmpeg
 PKGSB_FFPLAY:=		sdl
+PKGSD_FFMPEG:=		ffmpeg video converter
+PKGSC_FFMPEG:=		multimedia
+PKGSD_FFSERVER:=	streaming server
+PKGSC_FFSERVER:=	multimedia
+PKGSD_FFPROBE:=		simple multimedia stream analyzer
+PKGSC_FFPROBE:=		multimedia
+
+PKG_FLAVOURS_LIBFFMPEG:=	WITH_AAC WITH_MP3 WITH_VP8 WITH_THEORA
+PKG_FLAVOURS_LIBFFMPEG+=	WITH_XVID WITH_VORBIS
+
+PKGFD_WITH_AAC:=	with AAC encoding support
+PKGFS_WITH_AAC:=	libfaac
+PKGFB_WITH_AAC:=	faac
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_AAC),y)
+PKG_FDEPENDS+=		libfaac
+endif
+
+PKGFD_WITH_MP3:=	with MP3 encoding support
+PKGFS_WITH_MP3:=	libmp3lame
+PKGFB_WITH_MP3:=	lame
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_MP3),y)
+PKG_FDEPENDS+=		libmp3lame
+endif
+
+PKGFD_WITH_VP8:=	with VP8 encoding support
+PKGFS_WITH_VP8:=	libvpx
+PKGFB_WITH_VP8:=	libvpx
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VP8),y)
+PKG_FDEPENDS+=		libvpx
+endif
+
+PKGFD_WITH_THEORA:=	with Theora encoding support
+PKGFS_WITH_THEORA:=	libtheora
+PKGFB_WITH_THEORA:=	libtheora
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_THEORA),y)
+PKG_FDEPENDS+=		libtheora
+endif
+
+PKGFD_WITH_XVID:=	with Xvid encoding support
+PKGFS_WITH_XVID:=	libxvid
+PKGFB_WITH_XVID:=	xvidcore
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y)
+PKG_FDEPENDS+=		libxvid
+endif
+
+PKGFD_WITH_VORBIS:=	with Vorbis encoding support
+PKGFS_WITH_VORBIS:=	libvorbisenc
+PKGFB_WITH_VORBIS:=	libvorbis
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y)
+PKG_FDEPENDS+=		libvorbisenc
+endif
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBFFMPEG,libffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,FFMPEG,ffmpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFMPEG},${PKGSC_FFMPEG}))
+$(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFSERVER},${PKGSC_FFSERVER}))
+$(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE}))
 $(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
+TARGET_CFLAGS:=		$(subst Os,O2,$(TARGET_CFLAGS))
 
 ifeq ($(ADK_TARGET_CPU_WITH_MMX),y)
 CONFIGURE_CPU_OPTS:=	--enable-mmx
@@ -53,7 +107,6 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--arch=${CPU_ARCH} \
 			--enable-cross-compile \
 			--sysroot=${STAGING_TARGET_DIR} \
-			--source-path=${WRKSRC} \
 			--cross-prefix=${TARGET_CROSS} \
 			--cc='$(TARGET_CC)' \
 			--host-cc=$(CC_FOR_BUILD) \
@@ -63,26 +116,56 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--disable-stripping \
 			--enable-shared \
 			--enable-static \
-			--disable-ffmpeg \
-			--disable-ffserver \
-			--enable-ffplay \
 			--enable-gpl \
 			--enable-swscale \
 			--enable-postproc \
-			--enable-libfaad \
 			${CONFIGURE_CPU_OPTS}
 
-post-install:
-	${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_FFMPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_FFMPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libavcodec.so* ${IDIR_FFMPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libavutil.so* ${IDIR_FFMPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpostproc.so* ${IDIR_FFMPEG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libswscale.so* ${IDIR_FFMPEG}/usr/lib
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_AAC),y)
+CONFIGURE_ARGS+=	--enable-nonfree --enable-libfaac
+endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_MP3),y)
+CONFIGURE_ARGS+=	--enable-libmp3lame
+endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VP8),y)
+CONFIGURE_ARGS+=	--enable-libvpx
+endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_THEORA),y)
+CONFIGURE_ARGS+=	--enable-libtheora
+endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_XVID),y)
+CONFIGURE_ARGS+=	--enable-libxvid
+endif
+ifeq ($(ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS),y)
+CONFIGURE_ARGS+=	--enable-libvorbis
+endif
+
+libffmpeg-install:
+	${INSTALL_DIR} ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavdevice.so* ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavformat.so* ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavfilter.so* ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavcodec.so* ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavutil.so* ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libpostproc.so* ${IDIR_LIBFFMPEG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libswscale.so* ${IDIR_LIBFFMPEG}/usr/lib
 
 ffplay-install:
 	${INSTALL_DIR} ${IDIR_FFPLAY}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/ffplay ${IDIR_FFPLAY}/usr/bin
 
+ffmpeg-install:
+	${INSTALL_DIR} ${IDIR_FFMPEG}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/ffmpeg ${IDIR_FFMPEG}/usr/bin
+
+ffserver-install:
+	${INSTALL_DIR} ${IDIR_FFSERVER}/etc
+	$(INSTALL_DATA) $(WRKBUILD)/doc/ffserver.conf ${IDIR_FFSERVER}/etc
+	${INSTALL_DIR} ${IDIR_FFSERVER}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/ffserver ${IDIR_FFSERVER}/usr/bin
+
+ffprobe-install:
+	${INSTALL_DIR} ${IDIR_FFPROBE}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/ffprobe ${IDIR_FFPROBE}/usr/bin
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/patches/patch-configure b/package/ffmpeg/patches/patch-configure
index 5f038b65e..a2b80f82c 100644
--- a/package/ffmpeg/patches/patch-configure
+++ b/package/ffmpeg/patches/patch-configure
@@ -1,22 +1,11 @@
---- 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
+--- ffmpeg-0.8.3.orig/configure	2011-09-07 15:34:40.000000000 +0200
++++ ffmpeg-0.8.3/configure	2011-09-16 05:19:35.928726043 +0200
+@@ -2947,7 +2947,7 @@ enabled libxavs    && require  libxavs x
+ enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore
+ enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
  
 -SDL_CONFIG="${cross_prefix}sdl-config"
 +SDL_CONFIG="${sysroot}/usr/bin/sdl-config"
- if "${SDL_CONFIG}" --version > /dev/null 2>&1; then
-     sdl_cflags=$("${SDL_CONFIG}" --cflags)
-     sdl_libs=$("${SDL_CONFIG}" --libs)
+ if check_pkg_config sdl SDL_version.h SDL_Linked_Version; then
+     check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
+     enable sdl &&
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 0c8de9916..942034570 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -19,9 +19,9 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 native
+PKG_ARCH_DEPENDS:=	x86 x86_64 native mips
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
-PKG_SYSTEM_DEPENDS:=	ibm-x40
+PKG_SYSTEM_DEPENDS:=	ibm-x40 lemote-yeelong
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
 WRKDIST=		${WRKDIR}/mozilla-release
@@ -30,9 +30,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,firefox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-# disable honour cflags stuff
-XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
-
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CC="${CC_FOR_BUILD}" \
 			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 59c6cdcff..d727bb7f6 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -4,22 +4,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fltk
-PKG_VERSION:=		2.0
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		557544badbacca4ee1ebb2448f6e1f8a
+PKG_VERSION:=		1.3.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		92f6e29921227eec3426a07425c71232
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		libX11 libXi MesaLib freeglut freetype
 PKG_URL:=		http://www.fltk.org/
-PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
+PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NEED_CXX:=		1
 PKG_CXX:=		LIBFLTK
 
 PKG_SUBPKGS:=		LIBFLTK
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips arm
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
-WRKDIST=		${WRKDIR}/${PKG_NAME}-2.0.x-r7513
+DISTFILES:=		${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile
index 466aef887..568110189 100644
--- a/package/fltk/patches/patch-Makefile
+++ b/package/fltk/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- fltk-2.0.x-r7513.orig/Makefile	2010-04-15 18:29:49.000000000 +0200
-+++ fltk-2.0.x-r7513/Makefile	2011-01-14 22:01:49.000000000 +0100
-@@ -25,7 +25,7 @@
+--- fltk-1.3.0.orig/Makefile	2011-02-15 16:29:03.000000000 +0100
++++ fltk-1.3.0/Makefile	2011-09-12 20:20:27.137980830 +0200
+@@ -27,7 +27,7 @@
  
  include makeinclude
  
--DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test
-+DIRS = src $(LOCALIMAGES) images OpenGL fluid
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
  
- all: makeinclude
+ all: makeinclude fltk-config
  	for dir in $(DIRS); do\
diff --git a/package/fltk/patches/patch-OpenGL_Makefile b/package/fltk/patches/patch-OpenGL_Makefile
deleted file mode 100644
index 71ac77285..000000000
--- a/package/fltk/patches/patch-OpenGL_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/OpenGL/Makefile	2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r7513/OpenGL/Makefile	2011-03-25 13:56:09.304620874 +0100
-@@ -102,7 +102,7 @@ include makedepend
- 
- ../lib/$(DSONAME): $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) ../lib/$(DSOLINK)
- 	$(LN) $(DSONAME) ../lib/$(DSOLINK)
- 
diff --git a/package/fltk/patches/patch-configure b/package/fltk/patches/patch-configure
deleted file mode 100644
index 613c7b595..000000000
--- a/package/fltk/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r7513.orig/configure	2010-04-16 10:02:53.000000000 +0200
-+++ fltk-2.0.x-r7513/configure	2011-03-25 13:52:41.555870814 +0100
-@@ -1770,7 +1770,7 @@ FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_
- 
- 
- 
--uname=`uname`
-+uname=Linux
- uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
- case $uname in
-   IRIX*)
-@@ -1922,7 +1922,7 @@ if test x$enable_shared = xyes; then
- 	    ;;
- 	Linux* | *BSD*)
- #           DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
--            DSOCOMMAND="\$(CXX) \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
-+            DSOCOMMAND="\$(CXX) -shared -fPIC $DEBUGFLAG -o"
- 	    if test "$libdir" != "/usr/lib"; then
- 		    DSOLINK="-Wl,-rpath,$libdir"
-             fi
diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in
deleted file mode 100644
index c4784688a..000000000
--- a/package/fltk/patches/patch-fltk2-config_in
+++ /dev/null
@@ -1,27 +0,0 @@
---- fltk-2.0.x-r7513.orig/fltk2-config.in	2006-04-15 19:43:12.000000000 +0200
-+++ fltk-2.0.x-r7513/fltk2-config.in	2011-01-08 23:34:40.000000000 +0100
-@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@"
- # libraries to link with:
- LIBNAME="@LIBNAME@"
- DSONAME="@DSONAME@"
--DSOLINK="@DSOLINK@"
- IMAGELIBS="@IMAGELIBS@"
- SHAREDSUFFIX="@SHAREDSUFFIX@"
- 
-@@ -168,7 +167,6 @@ do
-       bindir=${exec_prefix}
-       includedir=${prefix}/include
-       libdir=${prefix}/lib
--      DSOLINK="-Wl,-rpath,${prefix}/lib"
- 	    ;;
- 	--prefix)
- 	    echo_prefix=yes
-@@ -283,7 +281,7 @@ if test x$use_images = xyes; then
-     LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS"
- fi
- 
--LDLIBS="$DSOLINK $LDLIBS"
-+LDLIBS="$LDLIBS"
- LDSTATIC="$LDSTATIC_PATHS $LDSTATIC"
- 
- # Answer to user requests
diff --git a/package/fltk/patches/patch-images_Makefile b/package/fltk/patches/patch-images_Makefile
deleted file mode 100644
index ddd993d18..000000000
--- a/package/fltk/patches/patch-images_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk-2.0.x-r7513.orig/images/Makefile	2008-08-05 01:03:58.000000000 +0200
-+++ fltk-2.0.x-r7513/images/Makefile	2011-03-25 13:53:36.614620804 +0100
-@@ -109,7 +109,7 @@ include makedepend
- 
- ../lib/$(DSONAME): $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
--	$(DSOCOMMAND) $@ $(OBJECTS)
-+	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
- 	$(RM) ../lib/$(DSOLINK)
- 	$(LN) $(DSONAME) ../lib/$(DSOLINK)
- 
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
deleted file mode 100644
index 46a7d397f..000000000
--- a/package/fltk/patches/patch-makeinclude_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- fltk-2.0.x-r7513.orig/makeinclude.in	2006-04-11 00:06:06.000000000 +0200
-+++ fltk-2.0.x-r7513/makeinclude.in	2011-03-25 12:03:06.633370885 +0100
-@@ -45,7 +45,7 @@ NROFF		= @NROFF@
- RM		= rm -f
- RMDIR		= rm -rf
- SHELL		= /bin/sh
--STRIP		= strip
-+STRIP		= echo
- 
- # compiler names:
- CC		= @CC@
-@@ -115,7 +115,7 @@ CAT1EXT		= @CAT1EXT@
- CAT3EXT		= @CAT3EXT@
- 
- # Be quiet when building...
--.SILENT:
-+#.SILENT:
- 
- # Build commands and filename extensions...
- .SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index af4f4d5e0..150a5561c 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -26,12 +26,12 @@ $(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELE
 # especially as all font packages still need patching to avoid
 # calling pkg-config (which we don't provide) in order to
 # automatically find the mappings.
-fonts-hack:
+post-build:
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util
-	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
+	${CP} ${WRKBUILD}/map-* \
 		${STAGING_DIR}/usr/share/fonts/X11/util
 
-font-util-install: fonts-hack
+font-util-install:
 	${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/ucs2any \
 		${IDIR_FONT_UTIL}/usr/bin
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index 435a3c560..824d05636 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b45aab5b60382ec3ada7e71cb1356b1d
 PKG_DESCR:=		DAAPD server
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libunistring zlib libconfuse sqlite ffmpeg libgcrypt
+PKG_DEPENDS:=		libunistring zlib libconfuse sqlite libffmpeg libgcrypt
 PKG_DEPENDS+=		libavahi libmxml libevent libavl libantlr3c alsa-lib
 PKG_DEPENDS+=		libsqlite libintl dbus
 PKG_BUILDDEP:=		libunistring zlib confuse avahi sqlite ffmpeg dbus
@@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FORKED_DAAPD,forked-daapd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#TARGET_LDFLAGS+=		-lgcc
-
 forked-daapd-install:
 	$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/etc
 	$(CP) ./files/forked-daapd.conf \
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 6158d094f..8a6e267c8 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -20,8 +20,11 @@ TARGET_CPPFLAGS:=	''
 TARGET_CFLAGS:=		''
 TARGET_CXXFLAGS:=	$(filter-out -fstack-protector,$(TARGET_CXXFLAGS))
 
-ifeq ($(ADK_LINUX_64),y)
-CONFIGURE_ARGS+=       --with-abi=64
+#ifeq ($(ADK_LINUX_64),y)
+#CONFIGURE_ARGS+=       --with-abi=64
+#endif
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+CONFIGURE_ARGS+=       --with-abi=$(ADK_TARGET_ABI)
 endif
 
 CONFIGURE_ARGS+=	--enable-languages=c,c++ \
@@ -51,7 +54,6 @@ post-install:
 	cd ${IDIR_GCC}/usr/bin/ && ln -sf g++ c++
 	cd ${IDIR_GCC}/usr/bin/ && ln -sf gcc cc
 	${INSTALL_BIN} ${WRKINST}/usr/bin/cpp ${IDIR_GCC}/usr/bin/
-	${CP} ${WRKINST}/usr/lib/libstdc++*so* ${IDIR_GCC}/usr/lib/
 	${CP} ${WRKINST}/usr/include/c++/* ${IDIR_GCC}/usr/include/c++/
 	cd ${IDIR_GCC}/lib && ln -sf ../usr/bin/cpp .
 	${CP} ${WRKINST}/usr/lib/gcc/* ${IDIR_GCC}/usr/lib/gcc/
diff --git a/package/gcc/patches/no-lib64.patch b/package/gcc/patches/no-lib64.patch
new file mode 100644
index 000000000..5c6e0b045
--- /dev/null
+++ b/package/gcc/patches/no-lib64.patch
@@ -0,0 +1,100 @@
+diff -Nur gcc-4.5.3.orig/gcc/config/i386/linux64.h gcc-4.5.3/gcc/config/i386/linux64.h
+--- gcc-4.5.3.orig/gcc/config/i386/linux64.h	2010-03-24 21:44:48.000000000 +0100
++++ gcc-4.5.3/gcc/config/i386/linux64.h	2011-08-24 06:35:30.000000000 +0200
+@@ -59,7 +59,7 @@
+    done.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+ 
+ #if TARGET_64BIT_DEFAULT
+ #define SPEC_32 "m32"
+diff -Nur gcc-4.5.3.orig/gcc/config/i386/t-linux64 gcc-4.5.3/gcc/config/i386/t-linux64
+--- gcc-4.5.3.orig/gcc/config/i386/t-linux64	2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.5.3/gcc/config/i386/t-linux64	2011-08-24 06:35:30.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+diff -Nur gcc-4.5.3.orig/gcc/config/mips/linux64.h gcc-4.5.3/gcc/config/mips/linux64.h
+--- gcc-4.5.3.orig/gcc/config/mips/linux64.h	2009-02-20 16:20:38.000000000 +0100
++++ gcc-4.5.3/gcc/config/mips/linux64.h	2011-08-24 06:35:30.000000000 +0200
+@@ -36,9 +36,9 @@
+   %{profile:-lc_p} %{!profile:-lc}}"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
++#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
+ #define LINUX_DYNAMIC_LINKERN32 \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
+ 
+diff -Nur gcc-4.5.3.orig/gcc/config/mips/t-linux64 gcc-4.5.3/gcc/config/mips/t-linux64
+--- gcc-4.5.3.orig/gcc/config/mips/t-linux64	2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.5.3/gcc/config/mips/t-linux64	2011-08-24 06:35:30.000000000 +0200
+@@ -18,7 +18,7 @@
+ 
+ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
+ MULTILIB_DIRNAMES = n32 32 64
+-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
++MULTILIB_OSDIRNAMES = ../lib ../lib ../lib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+ 
+diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/linux64.h gcc-4.5.3/gcc/config/rs6000/linux64.h
+--- gcc-4.5.3.orig/gcc/config/rs6000/linux64.h	2010-11-17 07:09:53.000000000 +0100
++++ gcc-4.5.3/gcc/config/rs6000/linux64.h	2011-08-24 06:35:30.000000000 +0200
+@@ -341,7 +341,7 @@
+ #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+ #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+ #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+ #if UCLIBC_DEFAULT
+diff -Nur gcc-4.5.3.orig/gcc/config/rs6000/t-linux64 gcc-4.5.3/gcc/config/rs6000/t-linux64
+--- gcc-4.5.3.orig/gcc/config/rs6000/t-linux64	2009-04-21 21:03:23.000000000 +0200
++++ gcc-4.5.3/gcc/config/rs6000/t-linux64	2011-08-24 06:35:30.000000000 +0200
+@@ -36,7 +36,7 @@
+ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+ MULTILIB_EXCEPTIONS     = m64/msoft-float
+ MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
++MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
+ MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+ 
+ softfp_wrap_start := '\#ifndef __powerpc64__'
+diff -Nur gcc-4.5.3.orig/gcc/config/sparc/linux64.h gcc-4.5.3/gcc/config/sparc/linux64.h
+--- gcc-4.5.3.orig/gcc/config/sparc/linux64.h	2010-09-22 23:15:37.000000000 +0200
++++ gcc-4.5.3/gcc/config/sparc/linux64.h	2011-08-24 06:36:52.000000000 +0200
+@@ -110,7 +110,7 @@
+ /* If ELF is the default format, we should not use /lib/elf.  */
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
+ 
+ #ifdef SPARC_BI_ARCH
+ 
+diff -Nur gcc-4.5.3.orig/gcc/config/sparc/t-linux64 gcc-4.5.3/gcc/config/sparc/t-linux64
+--- gcc-4.5.3.orig/gcc/config/sparc/t-linux64	2010-10-04 18:54:26.000000000 +0200
++++ gcc-4.5.3/gcc/config/sparc/t-linux64	2011-08-24 06:37:15.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 9844014fb..44ca7a03d 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -4,21 +4,24 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gdk-pixbuf
-PKG_VERSION:=		2.23.1
+PKG_VERSION:=		2.24.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		74818d3ac4d7ebaf6bf24883c171a885
+PKG_MD5SUM:=		bd7c2a9d23b573db467e39833f12103d
 PKG_DESCR:=		GDK pixbuf library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		jpeg libtiff
-PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.24/
 PKG_NEED_CXX:=		1
 
 PKG_SUBPKGS:=		GDK_PIXBUF GDK_PIXBUF_DEV
+PKGSC_GDK_PIXBUF_DEV:=	devel
+
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GDK_PIXBUF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GDK_PIXBUF_DEV,gdk-pixbuf-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GDK_PIXBUF_DEV}))
 
 CONFIGURE_ENV+=		gio_can_sniff=no
 
diff --git a/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in b/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in
deleted file mode 100644
index ae45cef82..000000000
--- a/package/gdk-pixbuf/patches/patch-gdk-pixbuf-2_0_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- gdk-pixbuf-2.23.1.orig/gdk-pixbuf-2.0.pc.in	2010-11-30 03:37:47.000000000 +0100
-+++ gdk-pixbuf-2.23.1/gdk-pixbuf-2.0.pc.in	2011-04-25 18:07:16.917662321 +0200
-@@ -13,6 +13,6 @@ Description: Image loading and scaling
- Version: @VERSION@
- Requires: gobject-2.0
- Requires.private: gmodule-no-export-2.0 @PNG_DEP_CFLAGS_PACKAGES@
--Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_LIBS@
-+Libs: -L${libdir} -lgdk_pixbuf-@GDK_PIXBUF_API_VERSION@ -ltiff -ljpeg -lpng12 -lm 
- Cflags: -I${includedir}/gdk-pixbuf-@GDK_PIXBUF_API_VERSION@ @GDK_PIXBUF_EXTRA_CFLAGS@
- 
diff --git a/package/gdk-pixbuf/patches/patch-ltmain_sh b/package/gdk-pixbuf/patches/patch-ltmain_sh
deleted file mode 100644
index 058119f49..000000000
--- a/package/gdk-pixbuf/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdk-pixbuf-2.23.0.orig/ltmain.sh	2010-12-06 15:06:25.000000000 +0100
-+++ gdk-pixbuf-2.23.0/ltmain.sh	2011-01-14 23:45:56.000000000 +0100
-@@ -5840,7 +5840,7 @@ func_mode_link ()
-       # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/giblib/Makefile b/package/giblib/Makefile
new file mode 100644
index 000000000..5f36a9860
--- /dev/null
+++ b/package/giblib/Makefile
@@ -0,0 +1,23 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		giblib
+PKG_VERSION:=		1.2.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c810ef5389baf24882a1caca2954385e
+PKG_DESCR:=		imlib2 wrapper library
+PKG_SECTION:=		libs
+PKG_SITES:=		http://linuxbrit.co.uk/downloads/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GIBLIB,giblib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+giblib-install:
+	$(INSTALL_DIR) $(IDIR_GIBLIB)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgiblib*so* \
+		$(IDIR_GIBLIB)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/giflib/Makefile b/package/giflib/Makefile
index 1259c92f9..2187e05ae 100644
--- a/package/giflib/Makefile
+++ b/package/giflib/Makefile
@@ -12,13 +12,21 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://sourceforge.net/projects/giflib/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=giflib/giflib%204.x/$(PKG_NAME)-$(PKG_VERSION)/}
 
+PKG_SUBPKGS:=		GIFLIB GIFLIB_DEV
+PKGSC_GIFLIB_DEV:=	devel
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GIFLIB,giflib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,GIFLIB_DEV,giflib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_GIFLIB_DEV}))
 
 giflib-install:
 	$(INSTALL_DIR) $(IDIR_GIFLIB)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libgif.so* \
 		$(IDIR_GIFLIB)/usr/lib
 
+giflib-dev-install:
+	${INSTALL_DIR} ${IDIR_GIFLIB_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/*.h ${IDIR_GIFLIB_DEV}/usr/include
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index bd4fc9f81..40e93d15e 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gnutls
-PKG_VERSION:=		2.8.6
+PKG_VERSION:=		2.12.11
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		eb0a6d7d3cb9ac684d971c14f9f6d3ba
+PKG_MD5SUM:=		f08234b64a8025d6d5aa1307868b02ed
 PKG_DESCR:=		GNU TLS library
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libgcrypt libtasn1 zlib
@@ -34,9 +34,13 @@ $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
 			--disable-camellia \
+			--with-libgcrypt \
 			--with-libgcrypt-prefix=${STAGING_TARGET_DIR}/usr \
 			--disable-rpath \
-			--without-libz-prefix
+			--without-libz-prefix \
+			--without-p11-kit \
+			--without-nettle-prefix
+CONFIGURE_ENV+=		ac_cv_prog_AR='$(TARGET_CROSS)ar'
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
diff --git a/package/gnutls/patches/patch-build-aux_ltmain_sh b/package/gnutls/patches/patch-build-aux_ltmain_sh
deleted file mode 100644
index 564eeb34b..000000000
--- a/package/gnutls/patches/patch-build-aux_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnutls-2.8.6.orig/build-aux/ltmain.sh	2010-03-15 11:28:59.000000000 +0100
-+++ gnutls-2.8.6/build-aux/ltmain.sh	2011-01-15 19:40:55.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/gnutls/patches/patch-lib_build-aux_ltmain_sh b/package/gnutls/patches/patch-lib_build-aux_ltmain_sh
deleted file mode 100644
index e16ccadeb..000000000
--- a/package/gnutls/patches/patch-lib_build-aux_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnutls-2.8.6.orig/lib/build-aux/ltmain.sh	2010-03-15 11:28:24.000000000 +0100
-+++ gnutls-2.8.6/lib/build-aux/ltmain.sh	2011-01-15 19:44:32.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh b/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh
deleted file mode 100644
index 75df0e2d6..000000000
--- a/package/gnutls/patches/patch-libextra_build-aux_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnutls-2.8.6.orig/libextra/build-aux/ltmain.sh	2010-03-15 11:28:49.000000000 +0100
-+++ gnutls-2.8.6/libextra/build-aux/ltmain.sh	2011-01-15 19:44:14.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/grep/Makefile b/package/grep/Makefile
index 5c14aa091..fa68dc229 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		grep
 PKG_VERSION:=		2.7
-PKG_RELEASE:=		1
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		e848f07e3e79aa7899345d17c7e4115e
 PKG_DESCR:=		global search for a regular expression and print out matched lines
 PKG_SECTION:=		utils
@@ -23,7 +23,7 @@ TARGET_LDFLAGS+=	-liconv
 CONFIGURE_ARGS+=	--without-included-regex
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_GREP)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/usr/bin
+	$(INSTALL_DIR) $(IDIR_GREP)/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index b9e5ef525..a97499549 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gtk+
-PKG_VERSION:=		2.18.6
-PKG_EXTRAVER:=		2.18
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		f98617af9f6be3065f64248f78dae2b7
+PKG_VERSION:=		2.24.6
+PKG_EXTRAVER:=		2.24
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4d7efde4ac24dbaa720bc0744eee8235
 PKG_DESCR:=		GTK+ library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
@@ -21,6 +21,8 @@ PKG_SUBPKGS:=		LIBGTK LIBGTK_DEV
 PKGSC_LIBGTK_DEV:=	devel
 PKGSD_LIBGTK_DEV:=	GTK+ headers
 
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
diff --git a/package/ipsec-tools/patches/patch-src_racoon_isakmp_c b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c
new file mode 100644
index 000000000..fdf5356fc
--- /dev/null
+++ b/package/ipsec-tools/patches/patch-src_racoon_isakmp_c
@@ -0,0 +1,21 @@
+--- ipsec-tools-0.8.0.orig/src/racoon/isakmp.c	2011-03-15 14:20:14.000000000 +0100
++++ ipsec-tools-0.8.0/src/racoon/isakmp.c	2011-08-24 18:48:47.887978959 +0200
+@@ -33,6 +33,10 @@
+ 
+ #include "config.h"
+ 
++#ifndef __packed
++#define __packed __attribute__((packed))
++#endif
++
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+@@ -130,6 +134,7 @@
+ #  define SOL_UDP IPPROTO_UDP
+ # endif /* __NetBSD__ / __FreeBSD__ */
+ 
++
+ static int nostate1 __P((struct ph1handle *, vchar_t *));
+ static int nostate2 __P((struct ph2handle *, vchar_t *));
+ 
diff --git a/package/jack/Makefile b/package/jack/Makefile
new file mode 100644
index 000000000..ece6930b2
--- /dev/null
+++ b/package/jack/Makefile
@@ -0,0 +1,47 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		jack
+PKG_VERSION:=		1.9.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		9759670feecbd43eeccf1c0f743ec199
+PKG_DESCR:=		JACK Audio Connection Kit
+PKG_SECTION:=		multimedia
+PKG_DEPENDS:=		alsa-lib
+PKG_BUILDDEP:=		python2 alsa-lib
+PKG_URL:=		http://jackaudio.org
+PKG_SITES:=		http://www.grame.fr/~letz/
+
+PKG_ARCH_DEPENDS:=	!cris
+PKG_HOST_DEPENDS:=	!darwin
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,JACK,jack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-configure:
+	$(WRKSRC)/waf configure --alsa  --prefix=$(WRKINST)/usr
+
+do-build:
+	cd $(WRKSRC) && $(WRKSRC)/waf build
+
+do-install:
+	cd $(WRKSRC) && $(WRKSRC)/waf install
+
+jack-install:
+	$(INSTALL_DIR) $(IDIR_JACK)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/jack* \
+		$(IDIR_JACK)/usr/bin
+	$(INSTALL_DIR) $(IDIR_JACK)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/lib* \
+		$(IDIR_JACK)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbd/Makefile b/package/kbd/Makefile
new file mode 100644
index 000000000..0293849de
--- /dev/null
+++ b/package/kbd/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		kbd
+PKG_VERSION:=		1.15.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8143e179a0f3c25646ce5085e8777200
+PKG_DESCR:=		keyboard utility
+PKG_SECTION:=		utils
+PKG_SITES:=		ftp://ftp.altlinux.org/pub/people/legion/kbd/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KBD,kbd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+kbd-install:
+	$(INSTALL_DIR) $(IDIR_KBD)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/loadkeys \
+		$(IDIR_KBD)/usr/bin
+ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
+	$(INSTALL_DIR) $(IDIR_KBD)/etc
+	$(CP) ./files/zaurus.map $(IDIR_KBD)/etc
+endif
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kbd/files/kbd.init b/package/kbd/files/kbd.init
new file mode 100644
index 000000000..3745e67d0
--- /dev/null
+++ b/package/kbd/files/kbd.init
@@ -0,0 +1,26 @@
+#!/bin/sh
+#PKG kbd
+#INIT 10
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${kbd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	loadkeys /etc/${kbd_map}.map
+	;;
+stop)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/kbd/files/kbd.postinst b/package/kbd/files/kbd.postinst
new file mode 100644
index 000000000..b2d973ee1
--- /dev/null
+++ b/package/kbd/files/kbd.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf kbd_map kbd_map "zaurus"
+add_rcconf kbd kbd NO
diff --git a/package/kbd/files/zaurus.map b/package/kbd/files/zaurus.map
new file mode 100644
index 000000000..11a0e8b4d
--- /dev/null
+++ b/package/kbd/files/zaurus.map
@@ -0,0 +1,228 @@
+# Default kernel keymap. This uses 7 modifier combinations.
+keymaps 0-2,4-5,8,12
+# Change the above line into
+#	keymaps 0-2,4-6,8,12
+# in case you want the entries
+#	altgr   control keycode  83 = Boot            
+#	altgr   control keycode 111 = Boot            
+# below.
+#
+keycode   1 =        
+keycode   2 = one              exclam    
+	control alt     keycode  2 = Console_1
+keycode   3 = two              quotedbl			
+	control alt     keycode  3 = Console_2
+keycode   4 = three            numbersign      
+	control alt     keycode  4 = Console_3
+keycode   5 = four             dollar           
+	control alt     keycode  5 = Console_4
+keycode   6 = five             percent         
+	control alt     keycode  6 = Console_5
+keycode   7 = six              ampersand     
+	control alt     keycode  7 = Console_6
+keycode   8 = seven            apostrophe
+keycode   9 = eight            parenleft
+keycode  10 = nine             parenright
+keycode  11 = zero             asciitilde
+keycode  12 = minus            at
+	altgr keycode 12 = at
+keycode  13 = 
+keycode  14 = BackSpace
+	altgr keycode 14 = Delete
+keycode  15 = Tab
+	altgr keycode 15 = Caps_Lock
+keycode  16 = q               
+keycode  17 = w               
+	altgr keycode 17 = asciicircum
+keycode  18 = e
+	altgr keycode 18 = equal
+keycode  19 = r          
+	altgr keycode 19 = plus     
+keycode  20 = t               
+	altgr keycode 20 = bracketleft
+keycode  21 = y               
+	altgr keycode 21 = bracketright
+keycode  22 = u      
+	altgr keycode 22 = braceleft         
+keycode  23 = i           
+	altgr keycode 23 = braceright    
+keycode  24 = o               
+keycode  25 = p               
+keycode  26 = 
+keycode  27 =
+keycode  28 = Return          
+keycode  29 = Control         
+keycode  30 = a
+keycode  31 = s               
+keycode  32 = d
+keycode  33 = f
+	altgr keycode 33 = backslash             
+keycode  34 = g               
+	altgr keycode 34 = semicolon
+keycode  35 = h         
+	altgr keycode 35 = colon      
+keycode  36 = j        
+	altgr keycode 36 = asterisk       
+keycode  37 = k   
+    altgr keycode 37 = backslash
+keycode  38 = l         
+	altgr keycode 38 = bar      
+keycode  39 =  
+keycode  40 = 
+keycode  41 =     
+keycode  42 = Shift           
+keycode  43 =  
+keycode  44 = z               
+keycode  45 = x               
+keycode  46 = c
+keycode  47 = v               
+keycode  48 = b
+	altgr keycode 48 = underscore
+keycode  49 = n               
+keycode  50 = m               
+keycode  51 = comma		slash
+	altgr keycode 51 = less
+keycode  52 = period           question         
+	altgr     keycode  52 = greater     
+keycode  53 =      
+keycode  54 = Shift           
+keycode  55 = 
+keycode  56 = Alt             
+keycode  57 = space            space           
+	control keycode  57 = nul   
+keycode 59 = F9
+keycode 60 = F10
+keycode 61 = AltGr
+keycode 62 = Escape
+keycode 63 = Return
+keycode 64 = Escape
+keycode 65 = Down
+keycode 66 = Up
+keycode 67 = Control
+keycode 68 = F13
+keycode 79 = F15
+keycode 80 = F16
+keycode 82 = F17
+keycode 87 = Return
+keycode 88 = F11	          
+keycode 97 = Control  
+keycode 99 = F12       
+keycode 103 = Up              
+	altgr     keycode 103 = PageUp
+keycode 105 = Left            
+	altgr     keycode 105 = Decr_Console
+keycode 106 = Right           
+	altgr     keycode 106 = Incr_Console
+keycode 108 = Down  
+	altgr     keycode 108 = PageDown
+	
+
+# LCD Softkeys as represented by zaurusd	
+keycode 82 = F5	
+keycode 79 = F15		# Home
+keycode 80 = F6
+keycode 81 = F16		# Email
+keycode 75 = F7
+keycode 76 = F17		# Addresses
+keycode 77 = F8
+keycode 71 = F18		# Calendar
+keycode 72 = F9
+keycode 73 = F19		# Book
+keycode 78 = F10
+
+string F1 = "\033[[A"
+string F2 = "\033[[B"
+string F3 = "\033[[C"
+string F4 = "\033[[D"
+string F5 = "\033[[E"
+string F6 = "\033[17~"
+string F7 = "\033[18~"
+string F8 = "\033[19~"
+string F9 = "\033[20~"
+string F10 = "\033[21~"
+string F11 = "\033[23~"
+string F12 = "\033[24~"
+string F13 = "\033[25~"
+string F14 = "\033[26~"
+string F15 = "\033[28~"
+string F16 = "\033[29~"
+string F17 = "\033[31~"
+string F18 = "\033[32~"
+string F19 = "\033[33~"
+string F20 = "\033[34~"
+string Find = "\033[1~"
+string Insert = "\033[2~"
+string Remove = "\033[3~"
+string Select = "\033[4~"
+string Prior = "\033[5~"
+string Next = "\033[6~"
+string Macro = "\033[M"
+string Pause = "\033[P"
+compose '`' 'A' to '�'
+compose '`' 'a' to '�'
+compose '\'' 'A' to '�'
+compose '\'' 'a' to '�'
+compose '^' 'A' to '�'
+compose '^' 'a' to '�'
+compose '~' 'A' to '�'
+compose '~' 'a' to '�'
+compose '"' 'A' to '�'
+compose '"' 'a' to '�'
+compose 'O' 'A' to '�'
+compose 'o' 'a' to '�'
+compose '0' 'A' to '�'
+compose '0' 'a' to '�'
+compose 'A' 'A' to '�'
+compose 'a' 'a' to '�'
+compose 'A' 'E' to '�'
+compose 'a' 'e' to '�'
+compose ',' 'C' to '�'
+compose ',' 'c' to '�'
+compose '`' 'E' to '�'
+compose '`' 'e' to '�'
+compose '\'' 'E' to '�'
+compose '\'' 'e' to '�'
+compose '^' 'E' to '�'
+compose '^' 'e' to '�'
+compose '"' 'E' to '�'
+compose '"' 'e' to '�'
+compose '`' 'I' to '�'
+compose '`' 'i' to '�'
+compose '\'' 'I' to '�'
+compose '\'' 'i' to '�'
+compose '^' 'I' to '�'
+compose '^' 'i' to '�'
+compose '"' 'I' to '�'
+compose '"' 'i' to '�'
+compose '-' 'D' to '�'
+compose '-' 'd' to '�'
+compose '~' 'N' to '�'
+compose '~' 'n' to '�'
+compose '`' 'O' to '�'
+compose '`' 'o' to '�'
+compose '\'' 'O' to '�'
+compose '\'' 'o' to '�'
+compose '^' 'O' to '�'
+compose '^' 'o' to '�'
+compose '~' 'O' to '�'
+compose '~' 'o' to '�'
+compose '"' 'O' to '�'
+compose '"' 'o' to '�'
+compose '/' 'O' to '�'
+compose '/' 'o' to '�'
+compose '`' 'U' to '�'
+compose '`' 'u' to '�'
+compose '\'' 'U' to '�'
+compose '\'' 'u' to '�'
+compose '^' 'U' to '�'
+compose '^' 'u' to '�'
+compose '"' 'U' to '�'
+compose '"' 'u' to '�'
+compose '\'' 'Y' to '�'
+compose '\'' 'y' to '�'
+compose 'T' 'H' to '�'
+compose 't' 'h' to '�'
+compose 's' 's' to '�'
+compose '"' 'y' to '�'
+compose 's' 'z' to '�'
+compose 'i' 'j' to '�'
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
new file mode 100644
index 000000000..bb7636cd4
--- /dev/null
+++ b/package/kexec-tools/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		kexec-tools
+PKG_VERSION:=		2.0.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bc401cf3262b25ff7c9a51fc76c8ab91
+PKG_DESCR:=		kexec tools
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		zlib
+PKG_BUILDEP:=		zlib
+PKG_URL:=		http://kernel.org/pub/linux/utils/kernel/kexec/
+PKG_SITES:=		http://kernel.org/pub/linux/utils/kernel/kexec/
+
+PKG_ARCH_DEPENDS:=	!cris
+PKG_CFLINE_KEXEC_TOOLS:=	select ADK_KERNEL_KEXEC
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KEXEC_TOOLS,kexec-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+kexec-tools-install:
+	$(INSTALL_DIR) $(IDIR_KEXEC_TOOLS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/kexec \
+		$(IDIR_KEXEC_TOOLS)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kexec-tools/patches/patch-kexec_kexec_c b/package/kexec-tools/patches/patch-kexec_kexec_c
new file mode 100644
index 000000000..68dc2bee9
--- /dev/null
+++ b/package/kexec-tools/patches/patch-kexec_kexec_c
@@ -0,0 +1,24 @@
+--- kexec-tools-2.0.2.orig/kexec/kexec.c	2010-07-29 06:19:59.000000000 +0200
++++ kexec-tools-2.0.2/kexec/kexec.c	2011-09-05 18:50:27.679232756 +0200
+@@ -796,17 +796,14 @@ int k_unload (unsigned long kexec_flags)
+ static int my_shutdown(void)
+ {
+ 	char *args[] = {
+-		"shutdown",
+-		"-r",
+-		"now",
++		"reboot",
++		"-f",
+ 		NULL
+ 	};
+ 
+-	execv("/sbin/shutdown", args);
+-	execv("/etc/shutdown", args);
+-	execv("/bin/shutdown", args);
++	execv("/sbin/reboot", args);
+ 
+-	perror("shutdown");
++	perror("reboot");
+ 	return -1;
+ }
+ 
diff --git a/package/kexecinit/Makefile b/package/kexecinit/Makefile
new file mode 100644
index 000000000..ef042592b
--- /dev/null
+++ b/package/kexecinit/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		kexecinit
+PKG_VERSION:=		1.0
+PKG_RELEASE:=		1
+PKG_DESCR:=		init for kexec rootfilesystem
+PKG_SECTION:=		base
+
+WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
+NO_DISTFILES:=		1
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,KEXECINIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-install:
+	$(INSTALL_BIN) ./src/kexecinit $(IDIR_KEXECINIT)/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kexecinit/src/kexecinit b/package/kexecinit/src/kexecinit
new file mode 100755
index 000000000..3aee9ce18
--- /dev/null
+++ b/package/kexecinit/src/kexecinit
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+load_system() {
+	echo "Loading OpenADK from microdrive (${micro}1)"
+	mount ${micro}1 /mnt
+	if [ $? -ne 0 ];then echo "Mounting ${micro}1 failed"; exit 1;fi
+	kexec -l /mnt/boot/kernel
+	umount /mnt
+	kexec -e -x
+}
+
+cf_install() {
+	mkdir /mnt/root
+	mkdir /mnt/cf
+	mount -t ext2 ${micro}1 /mnt/root
+	if [ $? -ne 0 ];then echo "Mounting ${micro}1 failed"; exit 1;fi
+	mount ${cfd}1 /mnt/cf
+	if [ $? -ne 0 ];then echo "Mounting ${cfd}1 failed"; exit 1;fi
+	if [ -f /mnt/cf/sharp.tgz ];then
+		echo "Installing OpenADK from CF (${cfd}1) to microdrive (${micro}1)"
+		umount /mnt/root
+		mke2fs -q ${micro}1
+		mount -t ext2 ${micro}1 /mnt/root
+		if [ $? -ne 0 ];then echo "Mounting ${micro}1 failed"; exit 1;fi
+		tar -xzpf /mnt/cf/sharp.tgz -C /mnt/root
+	fi
+	umount /mnt/root
+	umount /mnt/cf
+}
+
+check_cf() {
+	cf=0
+	if [ $(lsscsi|wc -l) -eq 1 ];then
+		cf=0
+	else
+		cf=1
+	fi
+	micro=$(lsscsi |awk '$4 ~ "HMS360" { print $6 }')
+	if [ "$micro" = "/dev/sda" ];then
+		cfd=/dev/sdb
+	else
+		cfd=/dev/sda
+	fi
+}
+
+echo "  ___                      _    ____  _  __ "
+echo " / _ \ _ __   ___ _ __    / \  |  _ \| |/ / "
+echo "| | | | '_ \ / _ \ '_ \  / _ \ | | | | ' /  "
+echo "| |_| | |_) |  __/ | | |/ ___ \| |_| | . \  "
+echo " \___/| .__/ \___|_| |_/_/   \_\____/|_|\_\ "
+echo "      |_|                                   "
+echo ""
+
+sleep 2
+check_cf
+if [ $cf -eq 0 ];then
+	load_system
+else
+	echo "Should I install OpenADK to microdrive (y/n)"
+	read answer
+	if [ "$answer" = "y" ];then
+		cf_install
+	fi
+	load_system
+fi
diff --git a/package/keyutils/Makefile b/package/keyutils/Makefile
new file mode 100644
index 000000000..d824afcf0
--- /dev/null
+++ b/package/keyutils/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		keyutils
+PKG_VERSION:=		1.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4c89b350eab1c361af8cb5343961056a
+PKG_DESCR:=		set of utilities for managing the key retention facility in the kernel
+PKG_SECTION:=		libs
+PKG_SITES:=		http://people.redhat.com/dhowells/keyutils/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KEYUTILS,keyutils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+INSTALL_TARGET:=	libinstall
+#INSTALL_STYLE:=		manual
+
+keyutils-install:
+	$(INSTALL_DIR) $(IDIR_KEYUTILS)/usr/lib
+	$(CP) $(WRKBUILD)/libkeyutils.so* \
+		$(IDIR_KEYUTILS)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/keyutils/patches/patch-Makefile b/package/keyutils/patches/patch-Makefile
new file mode 100644
index 000000000..1b44e0730
--- /dev/null
+++ b/package/keyutils/patches/patch-Makefile
@@ -0,0 +1,84 @@
+--- keyutils-1.5.3.orig/Makefile	2011-08-11 15:24:09.000000000 +0200
++++ keyutils-1.5.3/Makefile	2011-09-26 03:06:03.669381901 +0200
+@@ -1,5 +1,5 @@
+ CPPFLAGS	:= -I.
+-CFLAGS		:= $(CPPFLAGS) -g -Wall -Werror
++CFLAGS		?= $(CPPFLAGS) -g -Wall -Werror
+ INSTALL		:= install
+ DESTDIR		:=
+ SPECFILE	:= keyutils.spec
+@@ -49,24 +49,11 @@ LIBNAME		:= libkeyutils.so.$(APIVERSION)
+ # Guess at the appropriate lib directory and word size
+ #
+ ###############################################################################
+-LIBDIR		:= $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!')
++LIBDIR		:= /usr/lib
+ USRLIBDIR	:= $(patsubst /lib/%,/usr/lib/%,$(LIBDIR))
+-BUILDFOR	:= $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit
+ 
+ LNS		:= ln -sf
+ 
+-ifeq ($(BUILDFOR),32-bit)
+-CFLAGS		+= -m32
+-LIBDIR		:= /lib
+-USRLIBDIR	:= /usr/lib
+-else
+-ifeq ($(BUILDFOR),64-bit)
+-CFLAGS		+= -m64
+-LIBDIR		:= /lib64
+-USRLIBDIR	:= /usr/lib64
+-endif
+-endif
+-
+ ###############################################################################
+ #
+ # This is necessary if glibc doesn't know about the key management error codes
+@@ -84,7 +71,7 @@ endif
+ # Normal build rule
+ #
+ ###############################################################################
+-all: $(DEVELLIB) keyctl request-key key.dns_resolver
++all: $(DEVELLIB)
+ 
+ ###############################################################################
+ #
+@@ -125,13 +112,13 @@ keyutils.os: keyutils.c keyutils.h Makef
+ %.o: %.c keyutils.h Makefile
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+ 
+-keyctl: keyctl.o -lkeyutils
++keyctl: keyctl.o
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
+ 
+-request-key: request-key.o -lkeyutils
++request-key: request-key.o
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
+ 
+-key.dns_resolver: key.dns_resolver.o -lkeyutils
++key.dns_resolver: key.dns_resolver.o
+ 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
+ 
+ ###############################################################################
+@@ -139,6 +126,13 @@ key.dns_resolver: key.dns_resolver.o -lk
+ # Install everything
+ #
+ ###############################################################################
++libinstall:
++	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
++	$(INSTALL) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
++	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++	$(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)
++	$(INSTALL) -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h
++
+ install: all
+ ifeq ($(NO_ARLIB),0)
+ 	$(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB)
+@@ -205,7 +199,7 @@ distclean: clean
+ TARBALL	:= keyutils-$(VERSION).tar.bz2
+ SRCBALL	:= rpmbuild/SOURCES/$(TARBALL)
+ 
+-dist	:= $(word 2,$(shell grep "%dist" /etc/rpm/macros.dist))
++dist	:= OpenADK
+ release	:= $(word 2,$(shell grep ^Release: $(SPECFILE)))
+ release	:= $(subst %{?dist},$(dist),$(release))
+ rpmver	:= $(VERSION)-$(release)
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 2a352e419..477b6ede5 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
-PKG_VERSION:=		1.9
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		220c3dbb05a1bae1e6ad0bec4a6ac331
+PKG_VERSION:=		1.9.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b9f237015fbb83f75d17941588b12b7d
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
 PKG_DEPENDS:=		libkrb5 libncurses libss libcom-err
 PKG_BUILDDEP:=		ncurses e2fsprogs
 PKG_URL:=		http://web.mit.edu/kerberos/
-PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/${PKG_VERSION}/
+PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.9/
 PKG_NOPARALLEL:=	1
 
 PKG_SUBPKGS:=		KRB5_SERVER KRB5_CLIENT KRB5_UTIL LIBKRB5 LIBKRB5_DEV
diff --git a/package/lame/Makefile b/package/lame/Makefile
index f0a17f483..a7549770c 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -4,23 +4,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lame
-PKG_VERSION:=		398-2
+PKG_VERSION:=		3.98.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		719dae0ee675d0c16e0e89952930ed35
+PKG_MD5SUM:=		8e9866ad6b570c6c95c8cba48060473f
 PKG_DESCR:=		LAME MP3 encoder
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libncurses
 PKG_URL:=		http://lame.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=lame/}
 
-PKG_SUBPKGS:=		LAME LIBLAME
-PKGSD_LIBLAME:=		LAME MP3 encoding library
-PKGSC_LIBLAME:=		libs
+PKG_SUBPKGS:=		LAME LIBMP3LAME
+PKGSD_LIBMP3LAME:=	LAME MP3 encoding library
+PKGSC_LIBMP3LAME:=	libs
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBLAME},${PKGSC_LIBLAME}))
+$(eval $(call PKG_template,LIBMP3LAME,libmp3lame,$(PKG_VERSION)-${PKG_RELEASE},,${PKGSD_LIBMP3LAME},${PKGSC_LIBMP3LAME}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 
@@ -28,8 +28,8 @@ lame-install:
 	$(INSTALL_DIR) $(IDIR_LAME)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/lame $(IDIR_LAME)/usr/bin
 
-liblame-install:
-	$(INSTALL_DIR) $(IDIR_LIBLAME)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libmp3lame.so* $(IDIR_LIBLAME)/usr/lib
+libmp3lame-install:
+	$(INSTALL_DIR) $(IDIR_LIBMP3LAME)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libmp3lame.so* $(IDIR_LIBMP3LAME)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 71baaff3a..e53abb9f2 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -37,9 +37,7 @@ libx11-install:
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libX11-xcb* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
-ifeq ($(ADK_LOCALES),y)
 	${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
-endif
 
 libx11-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index e3b12fc2d..34c64d534 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -8,6 +8,7 @@ PKG_VERSION:=		3.5.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d6d4b0f76248a6b346eb42dfcdaa72a6
 PKG_DESCR:=		common operation for the XPM pixmap format
+PKG_BUILDDEP:=		libX11
 PKG_SECTION:=		x11/libs
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/libfm/Makefile b/package/libfm/Makefile
index bc2b5a9b9..0ef075cae 100644
--- a/package/libfm/Makefile
+++ b/package/libfm/Makefile
@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libfm
-PKG_VERSION:=		2.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		188d0820aa4e8f25f3fb0519813baa68
+PKG_VERSION:=		0.1.16
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c09bce415ff6dc2dd835e28aeddeabe3
 PKG_DESCR:=		libfm library
 PKG_SECTION:=		x11/lxde
 PKG_BUILDDEP:=		menu-cache libXcursor
 PKG_DEPENDS:=		menu-cache libxcursor
 PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
 
 PKG_SUBPKGS:=		LIBFM LIBFM_DEV
 
diff --git a/package/libfm/patches/patch-Makefile_in b/package/libfm/patches/patch-Makefile_in
deleted file mode 100644
index 98c28063c..000000000
--- a/package/libfm/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libfm-2.0.orig/Makefile.in	2011-04-14 20:39:59.000000000 +0200
-+++ libfm-2.0/Makefile.in	2011-04-16 11:39:06.000000000 +0200
-@@ -292,7 +292,7 @@ GTESTER_REPORT = gtester-report	# for th
- EXTRA_DIST = libfm.pc.in libfm-gtk.pc.in $(NULL)
- TEST_PROGS = 
- NULL = 
--SUBDIRS = src po data docs
-+SUBDIRS = src po data
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = \
- 	libfm.pc \
diff --git a/package/libfm/patches/patch-config_log b/package/libfm/patches/patch-config_log
deleted file mode 100644
index ba71c5360..000000000
--- a/package/libfm/patches/patch-config_log
+++ /dev/null
@@ -1,1143 +0,0 @@
---- libfm-2.0.orig/config.log	2011-04-14 20:24:25.000000000 +0200
-+++ libfm-2.0/config.log	2011-04-16 11:36:33.000000000 +0200
-@@ -4,36 +4,51 @@ running configure, to aid debugging if c
- It was created by libfm configure 0.1.15, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
--  $ ./configure 
-+  $ /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/configure --build=i686-apple-darwin10 --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 --enable-shared --enable-static --disable-dependency-tracking --disable-libtool-lock --enable-nls --disable-gtk-doc
- 
- ## --------- ##
- ## Platform. ##
- ## --------- ##
- 
--hostname = chrom
--uname -m = x86_64
--uname -r = 2.6.32-30-server
--uname -s = Linux
--uname -v = #59-Ubuntu SMP Tue Mar 1 22:46:09 UTC 2011
-+hostname = neon.foo.bar
-+uname -m = i386
-+uname -r = 10.6.0
-+uname -s = Darwin
-+uname -v = Darwin Kernel Version 10.6.0: Wed Nov 10 18:13:17 PST 2010; root:xnu-1504.9.26~3/RELEASE_I386
- 
--/usr/bin/uname -p = unknown
-+/usr/bin/uname -p = i386
- /bin/uname -X     = unknown
- 
- /bin/arch              = unknown
- /usr/bin/arch -k       = unknown
- /usr/convex/getsysinfo = unknown
--/usr/bin/hostinfo      = unknown
-+/usr/bin/hostinfo      = Mach kernel version:
-+	 Darwin Kernel Version 10.6.0: Wed Nov 10 18:13:17 PST 2010; root:xnu-1504.9.26~3/RELEASE_I386
-+Kernel configured for up to 2 processors.
-+2 processors are physically available.
-+2 processors are logically available.
-+Processor type: i486 (Intel 80486)
-+Processors active: 0 1
-+Primary memory available: 4.00 gigabytes
-+Default processor set: 69 tasks, 294 threads, 2 processors
-+Load average: 2.77, Mach factor: 0.56
- /bin/machine           = unknown
- /usr/bin/oslevel       = unknown
- /bin/universe          = unknown
- 
--PATH: /usr/local/sbin
--PATH: /usr/local/bin
--PATH: /usr/sbin
-+PATH: /Volumes/adk/openadk/scripts
-+PATH: /Volumes/adk/openadk/bin/tools
-+PATH: /Volumes/adk/openadk/host_i686_eglibc/bin
-+PATH: /Volumes/adk/openadk/host_i686_eglibc/usr/bin
-+PATH: /Volumes/adk/openadk/target_i686_eglibc/scripts
-+PATH: /opt/local/bin
-+PATH: /opt/local/sbin
- PATH: /usr/bin
--PATH: /sbin
- PATH: /bin
--PATH: /usr/games
-+PATH: /usr/sbin
-+PATH: /sbin
-+PATH: /usr/local/bin
-+PATH: /usr/X11/bin
- 
- 
- ## ----------- ##
-@@ -41,140 +56,135 @@ PATH: /usr/games
- ## ----------- ##
- 
- configure:2478: checking for a BSD-compatible install
--configure:2546: result: /usr/bin/install -c
-+configure:2546: result: /Volumes/adk/openadk/scripts/install -c
- configure:2557: checking whether build environment is sane
- configure:2607: result: yes
-+configure:2656: checking for i686-openadk-linux-strip
-+configure:2683: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip
- configure:2748: checking for a thread-safe mkdir -p
--configure:2787: result: /bin/mkdir -p
-+configure:2787: result: /opt/local/bin/gmkdir -p
- configure:2800: checking for gawk
--configure:2816: found /usr/bin/gawk
-+configure:2816: found /opt/local/bin/gawk
- configure:2827: result: gawk
- configure:2838: checking whether make sets $(MAKE)
- configure:2860: result: yes
--configure:2993: checking for gcc
--configure:3009: found /usr/bin/gcc
--configure:3020: result: gcc
-+configure:2953: checking for i686-openadk-linux-gcc
-+configure:2980: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
- configure:3249: checking for C compiler version
--configure:3258: gcc --version >&5
--gcc (Ubuntu 4.4.3-4ubuntu5) 4.4.3
--Copyright (C) 2009 Free Software Foundation, Inc.
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc --version >&5
-+i686-openadk-linux-gnu-gcc (GCC) 4.5.2
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
- configure:3269: $? = 0
--configure:3258: gcc -v >&5
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -v >&5
- Using built-in specs.
--Target: x86_64-linux-gnu
--Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.3-4ubuntu5' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-plugin --enable-objc-gc --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-+COLLECT_GCC=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+COLLECT_LTO_WRAPPER=/Volumes/adk/openadk/host_i686_eglibc/libexec/gcc/i686-openadk-linux-gnu/4.5.2/lto-wrapper
-+Target: i686-openadk-linux-gnu
-+Configured with: /Volumes/adk/openadk/toolchain_build_i686_eglibc/w-gcc-4.5.2-1/gcc-4.5.2/configure --prefix=/Volumes/adk/openadk/host_i686_eglibc --build=i686-apple-darwin10 --host=i686-apple-darwin10 --target=i686-openadk-linux-gnu --with-gmp=/Volumes/adk/openadk/host_i686_eglibc --with-mpfr=/Volumes/adk/openadk/host_i686_eglibc --with-libelf=/Volumes/adk/openadk/host_i686_eglibc --disable-__cxa_atexit --with-gnu-ld --disable-libmudflap --disable-libgomp --disable-biarch --disable-decimal-float --disable-multilib --disable-sjlj-exceptions --disable-libstdcxx-pch --disable-ppl-version-check --disable-cloog-version-check --without-ppl --without-cloog --disable-nls --disable-libssp --disable-lto --enable-tls --enable-target-optspace --enable-languages=c,c++ --with-sysroot='/Volumes/adk/openadk/host_i686_eglibc/../target_i686_eglibc' --with-slibdir=/Volumes/adk/openadk/target_i686_eglibc/lib --enable-shared
- Thread model: posix
--gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5) 
-+gcc version 4.5.2 (GCC) 
- configure:3269: $? = 0
--configure:3258: gcc -V >&5
--gcc: '-V' option must have argument
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -V >&5
-+i686-openadk-linux-gnu-gcc: '-V' option must have argument
- configure:3269: $? = 1
--configure:3258: gcc -qversion >&5
--gcc: unrecognized option '-qversion'
--gcc: no input files
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -qversion >&5
-+i686-openadk-linux-gnu-gcc: unrecognized option '-qversion'
-+i686-openadk-linux-gnu-gcc: no input files
- configure:3269: $? = 1
- configure:3289: checking whether the C compiler works
--configure:3311: gcc    conftest.c  >&5
-+configure:3311: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c  >&5
- configure:3315: $? = 0
- configure:3364: result: yes
- configure:3367: checking for C compiler default output file name
- configure:3369: result: a.out
- configure:3375: checking for suffix of executables
--configure:3382: gcc -o conftest    conftest.c  >&5
-+configure:3382: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c  >&5
- configure:3386: $? = 0
- configure:3408: result: 
- configure:3430: checking whether we are cross compiling
--configure:3438: gcc -o conftest    conftest.c  >&5
--configure:3442: $? = 0
--configure:3449: ./conftest
--configure:3453: $? = 0
--configure:3468: result: no
-+configure:3468: result: yes
- configure:3473: checking for suffix of object files
--configure:3495: gcc -c   conftest.c >&5
-+configure:3495: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3499: $? = 0
- configure:3520: result: o
- configure:3524: checking whether we are using the GNU C compiler
--configure:3543: gcc -c   conftest.c >&5
-+configure:3543: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3543: $? = 0
- configure:3552: result: yes
--configure:3561: checking whether gcc accepts -g
--configure:3581: gcc -c -g  conftest.c >&5
-+configure:3561: checking whether /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc accepts -g
-+configure:3581: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -g -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3581: $? = 0
- configure:3622: result: yes
--configure:3639: checking for gcc option to accept ISO C89
--configure:3703: gcc  -c -g -O2  conftest.c >&5
-+configure:3639: checking for /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc option to accept ISO C89
-+configure:3703: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc  -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3703: $? = 0
- configure:3716: result: none needed
- configure:3747: checking for style of include used by make
- configure:3775: result: GNU
--configure:3800: checking dependency style of gcc
--configure:3910: result: gcc3
-+configure:3800: checking dependency style of /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+configure:3910: result: none
- configure:3954: checking build system type
--configure:3968: result: x86_64-unknown-linux-gnu
-+configure:3968: result: i686-apple-darwin10
- configure:3988: checking host system type
--configure:4001: result: x86_64-unknown-linux-gnu
-+configure:4001: result: i686-openadk-linux-gnu
- configure:4021: checking for a sed that does not truncate output
--configure:4085: result: /bin/sed
-+configure:4085: result: /Volumes/adk/openadk/scripts/sed
- configure:4103: checking for grep that handles long lines and -e
--configure:4161: result: /bin/grep
-+configure:4161: result: /usr/bin/grep
- configure:4166: checking for egrep
--configure:4228: result: /bin/grep -E
-+configure:4228: result: /usr/bin/grep -E
- configure:4233: checking for fgrep
--configure:4295: result: /bin/grep -F
--configure:4330: checking for ld used by gcc
--configure:4397: result: /usr/bin/ld
--configure:4404: checking if the linker (/usr/bin/ld) is GNU ld
-+configure:4295: result: /usr/bin/grep -F
-+configure:4330: checking for ld used by /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+configure:4397: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld
-+configure:4404: checking if the linker (/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld) is GNU ld
- configure:4419: result: yes
- configure:4431: checking for BSD- or MS-compatible name lister (nm)
--configure:4480: result: /usr/bin/nm -B
--configure:4598: checking the name lister (/usr/bin/nm -B) interface
--configure:4605: gcc -c -g -O2  conftest.c >&5
--configure:4608: /usr/bin/nm -B "conftest.o"
-+configure:4480: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm
-+configure:4598: checking the name lister (/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm) interface
-+configure:4605: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
-+configure:4608: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm "conftest.o"
- configure:4611: output
--0000000000000000 B some_variable
-+00000000 B some_variable
- configure:4618: result: BSD nm
- configure:4621: checking whether ln -s works
- configure:4625: result: yes
- configure:4633: checking the maximum length of command line arguments
--configure:4753: result: 1572864
-+configure:4753: result: 196608
- configure:4770: checking whether the shell understands some XSI constructs
- configure:4780: result: yes
- configure:4784: checking whether the shell understands "+="
- configure:4790: result: yes
--configure:4825: checking for /usr/bin/ld option to reload object files
-+configure:4825: checking for /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld option to reload object files
- configure:4832: result: -r
--configure:4901: checking for objdump
--configure:4917: found /usr/bin/objdump
--configure:4928: result: objdump
-+configure:4861: checking for i686-openadk-linux-objdump
-+configure:4877: found /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-objdump
-+configure:4888: result: i686-openadk-linux-objdump
- configure:4960: checking how to recognize dependent libraries
- configure:5156: result: pass_all
--configure:5216: checking for ar
--configure:5232: found /usr/bin/ar
--configure:5243: result: ar
--configure:5321: checking for strip
--configure:5337: found /usr/bin/strip
--configure:5348: result: strip
--configure:5420: checking for ranlib
--configure:5436: found /usr/bin/ranlib
--configure:5447: result: ranlib
--configure:5537: checking command to parse /usr/bin/nm -B output from gcc object
--configure:5655: gcc -c -g -O2  conftest.c >&5
-+configure:5176: checking for i686-openadk-linux-ar
-+configure:5203: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ar
-+configure:5281: checking for i686-openadk-linux-strip
-+configure:5308: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip
-+configure:5380: checking for i686-openadk-linux-ranlib
-+configure:5407: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ranlib
-+configure:5537: checking command to parse /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm output from /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc object
-+configure:5655: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:5658: $? = 0
--configure:5662: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-+configure:5662: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm conftest.o \| sed -n -e 's/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
- configure:5665: $? = 0
--configure:5719: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-+configure:5719: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c conftstm.o >&5
- configure:5722: $? = 0
- configure:5760: result: ok
--configure:5856: gcc -c -g -O2  conftest.c >&5
--configure:5859: $? = 0
- configure:6569: checking how to run the C preprocessor
--configure:6600: gcc -E  conftest.c
-+configure:6600: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
- configure:6600: $? = 0
--configure:6614: gcc -E  conftest.c
--conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-+configure:6614: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
-+conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
-+compilation terminated.
- configure:6614: $? = 1
- configure: failed program was:
- | /* confdefs.h */
-@@ -188,11 +198,12 @@ configure: failed program was:
- | #define VERSION "0.1.15"
- | /* end confdefs.h.  */
- | #include <ac_nonexistent.h>
--configure:6639: result: gcc -E
--configure:6659: gcc -E  conftest.c
-+configure:6639: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E
-+configure:6659: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
- configure:6659: $? = 0
--configure:6673: gcc -E  conftest.c
--conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-+configure:6673: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
-+conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
-+compilation terminated.
- configure:6673: $? = 1
- configure: failed program was:
- | /* confdefs.h */
-@@ -207,84 +218,80 @@ configure: failed program was:
- | /* end confdefs.h.  */
- | #include <ac_nonexistent.h>
- configure:6702: checking for ANSI C header files
--configure:6722: gcc -c -g -O2  conftest.c >&5
-+configure:6722: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6722: $? = 0
--configure:6795: gcc -o conftest -g -O2   conftest.c  >&5
--configure:6795: $? = 0
--configure:6795: ./conftest
--configure:6795: $? = 0
- configure:6806: result: yes
- configure:6819: checking for sys/types.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for sys/stat.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for stdlib.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for string.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for memory.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for strings.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for inttypes.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for stdint.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for unistd.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6834: checking for dlfcn.h
--configure:6834: gcc -c -g -O2  conftest.c >&5
-+configure:6834: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6834: $? = 0
- configure:6834: result: yes
- configure:7018: checking for objdir
- configure:7033: result: .libs
--configure:7325: checking if gcc supports -fno-rtti -fno-exceptions
--configure:7343: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-+configure:7325: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc supports -fno-rtti -fno-exceptions
-+configure:7343: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -fno-rtti -fno-exceptions conftest.c >&5
- cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
- configure:7347: $? = 0
- configure:7360: result: no
--configure:7380: checking for gcc option to produce PIC
-+configure:7380: checking for /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc option to produce PIC
- configure:7652: result: -fPIC -DPIC
--configure:7664: checking if gcc PIC flag -fPIC -DPIC works
--configure:7682: gcc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
-+configure:7664: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc PIC flag -fPIC -DPIC works
-+configure:7682: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -fPIC -DPIC -DPIC conftest.c >&5
- configure:7686: $? = 0
- configure:7699: result: yes
--configure:7723: checking if gcc static flag -static works
-+configure:7723: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc static flag -static works
- configure:7751: result: yes
--configure:7766: checking if gcc supports -c -o file.o
--configure:7787: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-+configure:7766: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc supports -c -o file.o
-+configure:7787: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -o out/conftest2.o conftest.c >&5
- configure:7791: $? = 0
- configure:7813: result: yes
--configure:7821: checking if gcc supports -c -o file.o
-+configure:7821: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc supports -c -o file.o
- configure:7868: result: yes
--configure:7901: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-+configure:7901: checking whether the /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc linker (/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld) supports shared libraries
- configure:8892: result: yes
- configure:8929: checking whether -lc should be explicitly linked in
--configure:8934: gcc -c -g -O2  conftest.c >&5
-+configure:8934: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:8937: $? = 0
--configure:8952: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep  -lc  \>/dev/null 2\>\&1
-+configure:8952: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
- configure:8955: $? = 0
- configure:8967: result: no
- configure:9131: checking dynamic linker characteristics
--configure:9564: gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
-+configure:9564: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -Wl,-rpath -Wl,/foo conftest.c  >&5
- configure:9564: $? = 0
- configure:9794: result: GNU/Linux ld.so
- configure:9896: checking how to hardcode library paths into programs
-@@ -304,60 +311,59 @@ configure:10675: result: yes
- configure:10675: checking for unistd.h
- configure:10675: result: yes
- configure:10675: checking for sys/param.h
--configure:10675: gcc -c -g -O2  conftest.c >&5
-+configure:10675: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:10675: $? = 0
- configure:10675: result: yes
- configure:10696: checking for getpagesize
--configure:10696: gcc -o conftest -g -O2   conftest.c  >&5
-+configure:10696: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c  >&5
- configure:10696: $? = 0
- configure:10696: result: yes
- configure:10705: checking for working mmap
--configure:10852: gcc -o conftest -g -O2   conftest.c  >&5
--configure:10852: $? = 0
--configure:10852: ./conftest
--configure:10852: $? = 0
--configure:10862: result: yes
-+configure:10862: result: no
- configure:10871: checking for pow in -lm
--configure:10896: gcc -o conftest -g -O2   conftest.c -lm   >&5
--conftest.c:36: warning: conflicting types for built-in function 'pow'
-+configure:10896: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm   >&5
-+conftest.c:35:6: warning: conflicting types for built-in function 'pow'
- configure:10896: $? = 0
- configure:10905: result: yes
- configure:10939: checking whether NLS is requested
- configure:10948: result: yes
- configure:10963: checking for intltool >= 0.40.0
--configure:10970: result: 0.41.0 found
-+configure:10970: result: 0.40.6 found
- configure:10978: checking for intltool-update
--configure:10996: found /usr/bin/intltool-update
--configure:11008: result: /usr/bin/intltool-update
-+configure:10996: found /opt/local/bin/intltool-update
-+configure:11008: result: /opt/local/bin/intltool-update
- configure:11018: checking for intltool-merge
--configure:11036: found /usr/bin/intltool-merge
--configure:11048: result: /usr/bin/intltool-merge
-+configure:11036: found /opt/local/bin/intltool-merge
-+configure:11048: result: /opt/local/bin/intltool-merge
- configure:11058: checking for intltool-extract
--configure:11076: found /usr/bin/intltool-extract
--configure:11088: result: /usr/bin/intltool-extract
-+configure:11076: found /opt/local/bin/intltool-extract
-+configure:11088: result: /opt/local/bin/intltool-extract
- configure:11219: checking for xgettext
--configure:11237: found /usr/bin/xgettext
--configure:11249: result: /usr/bin/xgettext
-+configure:11237: found /opt/local/bin/xgettext
-+configure:11249: result: /opt/local/bin/xgettext
- configure:11259: checking for msgmerge
--configure:11277: found /usr/bin/msgmerge
--configure:11289: result: /usr/bin/msgmerge
-+configure:11277: found /opt/local/bin/msgmerge
-+configure:11289: result: /opt/local/bin/msgmerge
- configure:11299: checking for msgfmt
--configure:11317: found /usr/bin/msgfmt
--configure:11329: result: /usr/bin/msgfmt
-+configure:11317: found /opt/local/bin/msgfmt
-+configure:11329: result: /opt/local/bin/msgfmt
- configure:11339: checking for gmsgfmt
--configure:11370: result: /usr/bin/msgfmt
-+configure:11370: result: /opt/local/bin/msgfmt
- configure:11390: checking for perl
--configure:11408: found /usr/bin/perl
--configure:11420: result: /usr/bin/perl
-+configure:11408: found /opt/local/bin/perl
-+configure:11420: result: /opt/local/bin/perl
- configure:11431: checking for perl >= 5.8.1
--configure:11438: result: 5.10.1
-+configure:11438: result: 5.12.3
- configure:11442: checking for XML::Parser
- configure:11445: result: ok
--configure:11470: gcc -o conftest -g -O2  -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64  conftest.c -lm  >&5
-+configure:11470: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  >&5
- configure:11470: $? = 0
-+configure:11504: checking for i686-openadk-linux-pkg-config
-+configure:11537: result: no
- configure:11547: checking for pkg-config
--configure:11565: found /usr/bin/pkg-config
--configure:11577: result: /usr/bin/pkg-config
-+configure:11565: found /opt/local/bin/pkg-config
-+configure:11577: result: /opt/local/bin/pkg-config
-+configure:11589: WARNING: using cross tools not prefixed with host triplet
- configure:11602: checking pkg-config is at least version 0.9.0
- configure:11605: result: yes
- configure:11616: checking for GTK
-@@ -386,42 +392,182 @@ configure:11927: $? = 0
- configure:11982: result: yes
- configure:11992: checking for MENU_CACHE
- configure:12000: $PKG_CONFIG --exists --print-errors "$menu_modules"
--Package libmenu-cache was not found in the pkg-config search path.
--Perhaps you should add the directory containing `libmenu-cache.pc'
--to the PKG_CONFIG_PATH environment variable
--No package 'libmenu-cache' found
--configure:12003: $? = 1
-+configure:12003: $? = 0
- configure:12018: $PKG_CONFIG --exists --print-errors "$menu_modules"
--Package libmenu-cache was not found in the pkg-config search path.
--Perhaps you should add the directory containing `libmenu-cache.pc'
--to the PKG_CONFIG_PATH environment variable
--No package 'libmenu-cache' found
--configure:12021: $? = 1
--No package 'libmenu-cache' found
--configure:12059: error: Package requirements (libmenu-cache >= 0.3.2) were not met:
-+configure:12021: $? = 0
-+configure:12076: result: yes
-+configure:12088: checking for GLIB2_27
-+configure:12096: $PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.27.0"
-+configure:12099: $? = 0
-+configure:12114: $PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.27.0"
-+configure:12117: $? = 0
-+configure:12153: result: yes
-+configure:12299: checking for gtkdoc-check
-+configure:12317: found /opt/local/bin/gtkdoc-check
-+configure:12329: result: /opt/local/bin/gtkdoc-check
-+configure:12341: checking for gtkdoc-rebase
-+configure:12359: found /opt/local/bin/gtkdoc-rebase
-+configure:12371: result: /opt/local/bin/gtkdoc-rebase
-+configure:12385: checking for gtkdoc-mkpdf
-+configure:12403: found /opt/local/bin/gtkdoc-mkpdf
-+configure:12415: result: /opt/local/bin/gtkdoc-mkpdf
-+configure:12456: checking whether to build gtk-doc documentation
-+configure:12458: result: no
-+configure:12577: checking locale.h usability
-+configure:12577: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c >&5
-+configure:12577: $? = 0
-+configure:12577: result: yes
-+configure:12577: checking locale.h presence
-+configure:12577: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c
-+configure:12577: $? = 0
-+configure:12577: result: yes
-+configure:12577: checking for locale.h
-+configure:12577: result: yes
-+configure:12588: checking for LC_MESSAGES
-+configure:12604: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  >&5
-+configure:12604: $? = 0
-+configure:12612: result: yes
-+configure:12629: checking libintl.h usability
-+configure:12629: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c >&5
-+configure:12629: $? = 0
-+configure:12629: result: yes
-+configure:12629: checking libintl.h presence
-+configure:12629: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c
-+configure:12629: $? = 0
-+configure:12629: result: yes
-+configure:12629: checking for libintl.h
-+configure:12629: result: yes
-+configure:12637: checking for ngettext in libc
-+configure:12655: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  >&5
-+/var/folders/v7/v7rUSnywE5SYxctWLsie4++++TI/-Tmp-//ccBgEDBb.o: In function `main':
-+conftest.c:(.text+0x1e): undefined reference to `libintl_ngettext'
-+collect2: ld returned 1 exit status
-+configure:12655: $? = 1
-+configure: failed program was:
-+| /* confdefs.h */
-+| #define PACKAGE_NAME "libfm"
-+| #define PACKAGE_TARNAME "libfm"
-+| #define PACKAGE_VERSION "0.1.15"
-+| #define PACKAGE_STRING "libfm 0.1.15"
-+| #define PACKAGE_BUGREPORT "http://libfm.sf.net/"
-+| #define PACKAGE_URL ""
-+| #define PACKAGE "libfm"
-+| #define VERSION "0.1.15"
-+| #define STDC_HEADERS 1
-+| #define HAVE_SYS_TYPES_H 1
-+| #define HAVE_SYS_STAT_H 1
-+| #define HAVE_STDLIB_H 1
-+| #define HAVE_STRING_H 1
-+| #define HAVE_MEMORY_H 1
-+| #define HAVE_STRINGS_H 1
-+| #define HAVE_INTTYPES_H 1
-+| #define HAVE_STDINT_H 1
-+| #define HAVE_UNISTD_H 1
-+| #define HAVE_DLFCN_H 1
-+| #define LT_OBJDIR ".libs/"
-+| #define STDC_HEADERS 1
-+| #define HAVE_STDLIB_H 1
-+| #define HAVE_UNISTD_H 1
-+| #define HAVE_SYS_PARAM_H 1
-+| #define HAVE_GETPAGESIZE 1
-+| #define HAVE_LIBM 1
-+| #define _LARGEFILE64_SOURCE 1
-+| #define _FILE_OFFSET_BITS 64
-+| #define HAVE_SCHEME_HANDLER 1
-+| #define HAVE_LOCALE_H 1
-+| #define HAVE_LC_MESSAGES 1
-+| /* end confdefs.h.  */
-+| 
-+| #include <libintl.h>
-+| 
-+| int
-+| main ()
-+| {
-+| return !ngettext ("","", 1)
-+|   ;
-+|   return 0;
-+| }
-+configure:12664: result: no
-+configure:12720: checking for bindtextdomain in -lintl
-+configure:12745: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lintl  -lm  >&5
-+configure:12745: $? = 0
-+configure:12754: result: yes
-+configure:12757: checking for ngettext in -lintl
-+configure:12782: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lintl  -lm  >&5
-+configure:12782: $? = 0
-+configure:12791: result: yes
-+configure:12794: checking for dgettext in -lintl
-+configure:12819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lintl  -lm  >&5
-+conftest.c:41:6: warning: conflicting types for built-in function 'dgettext'
-+configure:12819: $? = 0
-+configure:12828: result: yes
-+configure:12941: checking for bind_textdomain_codeset
-+configure:12941: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  -lintl  >&5
-+configure:12941: $? = 0
-+configure:12941: result: yes
-+configure:12978: checking for msgfmt
-+configure:13005: result: /opt/local/bin/msgfmt
-+configure:13016: checking for dcgettext
-+configure:13016: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  -lintl  >&5
-+conftest.c:59:6: warning: conflicting types for built-in function 'dcgettext'
-+configure:13016: $? = 0
-+configure:13016: result: yes
-+configure:13026: checking if msgfmt accepts -c
-+configure:13041: $MSGFMT -c -o /dev/null conftest.foo
-+configure:13044: $? = 0
-+configure:13046: result: yes
-+configure:13056: checking for gmsgfmt
-+configure:13087: result: /opt/local/bin/msgfmt
-+configure:13097: checking for xgettext
-+configure:13124: result: /opt/local/bin/xgettext
-+configure:13143: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  -lintl  >&5
-+configure:13143: $? = 0
-+configure:13441: creating ./config.status
- 
--No package 'libmenu-cache' found
-+## ---------------------- ##
-+## Running config.status. ##
-+## ---------------------- ##
- 
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
-+This file was extended by libfm config.status 0.1.15, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
--Alternatively, you may set the environment variables MENU_CACHE_CFLAGS
--and MENU_CACHE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-+  CONFIG_FILES    = 
-+  CONFIG_HEADERS  = 
-+  CONFIG_LINKS    = 
-+  CONFIG_COMMANDS = 
-+  $ ./config.status 
- 
-+on neon.foo.bar
-+
-+config.status:1197: creating Makefile
-+config.status:1197: creating src/Makefile
-+config.status:1197: creating src/tests/Makefile
-+config.status:1197: creating data/Makefile
-+config.status:1197: creating data/ui/Makefile
-+config.status:1197: creating po/Makefile.in
-+config.status:1197: creating docs/Makefile
-+config.status:1197: creating docs/reference/Makefile
-+config.status:1197: creating docs/reference/libfm/Makefile
-+config.status:1197: creating libfm.pc
-+config.status:1197: creating libfm-gtk.pc
-+config.status:1197: creating config.h
-+config.status:1417: executing depfiles commands
-+config.status:1417: executing libtool commands
-+config.status:1417: executing default-1 commands
-+config.status:1417: executing po/stamp-it commands
- 
- ## ---------------- ##
- ## Cache variables. ##
- ## ---------------- ##
- 
--ac_cv_build=x86_64-unknown-linux-gnu
-+ac_cv_build=i686-apple-darwin10
- ac_cv_c_compiler_gnu=yes
--ac_cv_env_CC_set=
--ac_cv_env_CC_value=
--ac_cv_env_CFLAGS_set=
--ac_cv_env_CFLAGS_value=
--ac_cv_env_CPPFLAGS_set=
--ac_cv_env_CPPFLAGS_value=
-+ac_cv_env_CC_set=set
-+ac_cv_env_CC_value=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+ac_cv_env_CFLAGS_set=set
-+ac_cv_env_CFLAGS_value='-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe'
-+ac_cv_env_CPPFLAGS_set=set
-+ac_cv_env_CPPFLAGS_value='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG'
- ac_cv_env_CPP_set=
- ac_cv_env_CPP_value=
- ac_cv_env_DBUS_CFLAGS_set=
-@@ -448,8 +594,8 @@ ac_cv_env_GTK_CFLAGS_set=
- ac_cv_env_GTK_CFLAGS_value=
- ac_cv_env_GTK_LIBS_set=
- ac_cv_env_GTK_LIBS_value=
--ac_cv_env_LDFLAGS_set=
--ac_cv_env_LDFLAGS_value=
-+ac_cv_env_LDFLAGS_set=set
-+ac_cv_env_LDFLAGS_value='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib'
- ac_cv_env_LIBS_set=
- ac_cv_env_LIBS_value=
- ac_cv_env_MENU_CACHE_CFLAGS_set=
-@@ -458,16 +604,22 @@ ac_cv_env_MENU_CACHE_LIBS_set=
- ac_cv_env_MENU_CACHE_LIBS_value=
- ac_cv_env_PKG_CONFIG_set=
- ac_cv_env_PKG_CONFIG_value=
--ac_cv_env_build_alias_set=
--ac_cv_env_build_alias_value=
--ac_cv_env_host_alias_set=
--ac_cv_env_host_alias_value=
--ac_cv_env_target_alias_set=
--ac_cv_env_target_alias_value=
-+ac_cv_env_build_alias_set=set
-+ac_cv_env_build_alias_value=i686-apple-darwin10
-+ac_cv_env_host_alias_set=set
-+ac_cv_env_host_alias_value=i686-openadk-linux
-+ac_cv_env_target_alias_set=set
-+ac_cv_env_target_alias_value=i686-openadk-linux
-+ac_cv_func_bind_textdomain_codeset=yes
-+ac_cv_func_dcgettext=yes
- ac_cv_func_getpagesize=yes
--ac_cv_func_mmap_fixed_mapped=yes
-+ac_cv_func_malloc_0_nonnull=yes
-+ac_cv_func_mmap_fixed_mapped=no
-+ac_cv_func_realloc_0_nonnull=yes
- ac_cv_header_dlfcn_h=yes
- ac_cv_header_inttypes_h=yes
-+ac_cv_header_libintl_h=yes
-+ac_cv_header_locale_h=yes
- ac_cv_header_memory_h=yes
- ac_cv_header_stdc=yes
- ac_cv_header_stdint_h=yes
-@@ -478,43 +630,54 @@ ac_cv_header_sys_param_h=yes
- ac_cv_header_sys_stat_h=yes
- ac_cv_header_sys_types_h=yes
- ac_cv_header_unistd_h=yes
--ac_cv_host=x86_64-unknown-linux-gnu
-+ac_cv_host=i686-openadk-linux-gnu
-+ac_cv_lib_intl_bindtextdomain=yes
-+ac_cv_lib_intl_dgettext=yes
-+ac_cv_lib_intl_ngettext=yes
- ac_cv_lib_m_pow=yes
- ac_cv_objext=o
--ac_cv_path_EGREP='/bin/grep -E'
--ac_cv_path_FGREP='/bin/grep -F'
--ac_cv_path_GMSGFMT=/usr/bin/msgfmt
--ac_cv_path_GREP=/bin/grep
--ac_cv_path_INTLTOOL_EXTRACT=/usr/bin/intltool-extract
--ac_cv_path_INTLTOOL_MERGE=/usr/bin/intltool-merge
--ac_cv_path_INTLTOOL_PERL=/usr/bin/perl
--ac_cv_path_INTLTOOL_UPDATE=/usr/bin/intltool-update
--ac_cv_path_MSGFMT=/usr/bin/msgfmt
--ac_cv_path_MSGMERGE=/usr/bin/msgmerge
--ac_cv_path_SED=/bin/sed
--ac_cv_path_XGETTEXT=/usr/bin/xgettext
--ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
--ac_cv_path_install='/usr/bin/install -c'
--ac_cv_path_mkdir=/bin/mkdir
-+ac_cv_path_EGREP='/usr/bin/grep -E'
-+ac_cv_path_FGREP='/usr/bin/grep -F'
-+ac_cv_path_GMSGFMT=/opt/local/bin/msgfmt
-+ac_cv_path_GREP=/usr/bin/grep
-+ac_cv_path_GTKDOC_CHECK=/opt/local/bin/gtkdoc-check
-+ac_cv_path_GTKDOC_MKPDF=/opt/local/bin/gtkdoc-mkpdf
-+ac_cv_path_GTKDOC_REBASE=/opt/local/bin/gtkdoc-rebase
-+ac_cv_path_INTLTOOL_EXTRACT=/opt/local/bin/intltool-extract
-+ac_cv_path_INTLTOOL_MERGE=/opt/local/bin/intltool-merge
-+ac_cv_path_INTLTOOL_PERL=/opt/local/bin/perl
-+ac_cv_path_INTLTOOL_UPDATE=/opt/local/bin/intltool-update
-+ac_cv_path_MSGFMT=/opt/local/bin/msgfmt
-+ac_cv_path_MSGMERGE=/opt/local/bin/msgmerge
-+ac_cv_path_SED=/Volumes/adk/openadk/scripts/sed
-+ac_cv_path_XGETTEXT=/opt/local/bin/xgettext
-+ac_cv_path_ac_pt_PKG_CONFIG=/opt/local/bin/pkg-config
-+ac_cv_path_install='/Volumes/adk/openadk/scripts/install -c'
-+ac_cv_path_mkdir=/opt/local/bin/gmkdir
-+ac_cv_prog_AR=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ar
- ac_cv_prog_AWK=gawk
--ac_cv_prog_CPP='gcc -E'
--ac_cv_prog_ac_ct_AR=ar
--ac_cv_prog_ac_ct_CC=gcc
--ac_cv_prog_ac_ct_OBJDUMP=objdump
--ac_cv_prog_ac_ct_RANLIB=ranlib
--ac_cv_prog_ac_ct_STRIP=strip
-+ac_cv_prog_CC=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+ac_cv_prog_CPP='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E'
-+ac_cv_prog_OBJDUMP=i686-openadk-linux-objdump
-+ac_cv_prog_RANLIB=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ranlib
-+ac_cv_prog_STRIP=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip
- ac_cv_prog_cc_c89=
- ac_cv_prog_cc_g=yes
- ac_cv_prog_make_make_set=yes
--am_cv_CC_dependencies_compiler_type=gcc3
-+am_cv_CC_dependencies_compiler_type=none
-+am_cv_val_LC_MESSAGES=yes
-+gt_cv_func_dgettext_libc=no
-+gt_cv_func_dgettext_libintl=yes
-+gt_cv_func_ngettext_libc=no
-+gt_cv_have_gettext=yes
- lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
- lt_cv_ld_reload_flag=-r
- lt_cv_nm_interface='BSD nm'
- lt_cv_objdir=.libs
--lt_cv_path_LD=/usr/bin/ld
--lt_cv_path_NM='/usr/bin/nm -B'
-+lt_cv_path_LD=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld
-+lt_cv_path_NM=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm
- lt_cv_prog_compiler_c_o=yes
- lt_cv_prog_compiler_pic_works=yes
- lt_cv_prog_compiler_rtti_exceptions=no
-@@ -524,101 +687,105 @@ lt_cv_sys_global_symbol_pipe='sed -n -e 
- lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'''
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'''
- lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
--lt_cv_sys_max_cmd_len=1572864
--pkg_cv_GIO_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/  '
--pkg_cv_GIO_LIBS='-pthread -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--pkg_cv_GLIB_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--pkg_cv_GLIB_LIBS='-pthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--pkg_cv_GMODULE_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--pkg_cv_GMODULE_LIBS='-Wl,--export-dynamic -pthread -lgmodule-2.0 -lrt -lglib-2.0  '
--pkg_cv_GTK_CFLAGS='-pthread -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12  '
--pkg_cv_GTK_LIBS='-pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
-+lt_cv_sys_max_cmd_len=196608
-+pkg_cv_GIO_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/  '
-+pkg_cv_GIO_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_GLIB2_27_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_GLIB2_27_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lglib-2.0 -lintl  '
-+pkg_cv_GLIB_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_GLIB_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_GMODULE_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_GMODULE_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgmodule-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_GTK_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gtk-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/gtk-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/atk-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/cairo -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gdk-pixbuf-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pango-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/ -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pixman-1 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/freetype2 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/libpng12  '
-+pkg_cv_GTK_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangocairo-1.0 -lXext -lXrender -lXcomposite -lXdamage -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lgio-2.0 -lXfixes -lcairo -lX11 -lpango-1.0 -lm -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_MENU_CACHE_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/menu-cache -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_MENU_CACHE_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lmenu-cache -lglib-2.0 -lintl  '
- 
- ## ----------------- ##
- ## Output variables. ##
- ## ----------------- ##
- 
--ACLOCAL='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run aclocal-1.11'
-+ACLOCAL='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run aclocal-1.11'
- ALL_LINGUAS=''
--AMDEPBACKSLASH='\'
--AMDEP_FALSE='#'
--AMDEP_TRUE=''
--AMTAR='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run tar'
--AR='ar'
--AUTOCONF='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run autoconf'
--AUTOHEADER='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run autoheader'
--AUTOMAKE='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run automake-1.11'
-+AMDEPBACKSLASH=''
-+AMDEP_FALSE=''
-+AMDEP_TRUE='#'
-+AMTAR='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run tar'
-+AR='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ar'
-+AUTOCONF='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run autoconf'
-+AUTOHEADER='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run autoheader'
-+AUTOMAKE='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run automake-1.11'
- AWK='gawk'
- CATALOGS=''
--CATOBJEXT=''
--CC='gcc'
--CCDEPMODE='depmode=gcc3'
--CFLAGS='-g -O2'
--CPP='gcc -E'
--CPPFLAGS=' -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64'
-+CATOBJEXT='.gmo'
-+CC='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc'
-+CCDEPMODE='depmode=none'
-+CFLAGS='-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe'
-+CPP='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E'
-+CPPFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS'
- CYGPATH_W='echo'
- DATADIRNAME='share'
- DBUS_CFLAGS=''
- DBUS_LIBS=''
--DEFS=''
-+DEFS='-DHAVE_CONFIG_H'
- DEPDIR='.deps'
- DSYMUTIL=''
- DUMPBIN=''
- ECHO_C=''
- ECHO_N='-n'
- ECHO_T=''
--EGREP='/bin/grep -E'
-+EGREP='/usr/bin/grep -E'
- ENABLE_DEMO_FALSE=''
--ENABLE_DEMO_TRUE=''
-+ENABLE_DEMO_TRUE='#'
- ENABLE_GTK_DOC_FALSE=''
--ENABLE_GTK_DOC_TRUE=''
-+ENABLE_GTK_DOC_TRUE='#'
- ENABLE_UDISKS_FALSE=''
--ENABLE_UDISKS_TRUE=''
-+ENABLE_UDISKS_TRUE='#'
- EXEEXT=''
--FGREP='/bin/grep -F'
--GETTEXT_PACKAGE=''
--GIO_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/  '
--GIO_LIBS='-pthread -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--GLIB2_27_CFLAGS=''
--GLIB2_27_LIBS=''
--GLIB_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--GLIB_LIBS='-pthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--GMODULE_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--GMODULE_LIBS='-Wl,--export-dynamic -pthread -lgmodule-2.0 -lrt -lglib-2.0  '
-+FGREP='/usr/bin/grep -F'
-+GETTEXT_PACKAGE='libfm'
-+GIO_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/  '
-+GIO_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+GLIB2_27_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+GLIB2_27_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lglib-2.0 -lintl  '
-+GLIB_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+GLIB_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+GMODULE_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+GMODULE_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgmodule-2.0 -lrt -lglib-2.0 -lintl  '
- GMOFILES=''
--GMSGFMT='/usr/bin/msgfmt'
--GREP='/bin/grep'
--GTKDOC_CHECK=''
--GTKDOC_MKPDF=''
--GTKDOC_REBASE=''
--GTK_CFLAGS='-pthread -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12  '
--GTK_DOC_BUILD_HTML_FALSE=''
-+GMSGFMT='/opt/local/bin/msgfmt'
-+GREP='/usr/bin/grep'
-+GTKDOC_CHECK='/opt/local/bin/gtkdoc-check'
-+GTKDOC_MKPDF='/opt/local/bin/gtkdoc-mkpdf'
-+GTKDOC_REBASE='/opt/local/bin/gtkdoc-rebase'
-+GTK_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gtk-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/gtk-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/atk-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/cairo -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gdk-pixbuf-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pango-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/ -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pixman-1 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/freetype2 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/libpng12  '
-+GTK_DOC_BUILD_HTML_FALSE='#'
- GTK_DOC_BUILD_HTML_TRUE=''
- GTK_DOC_BUILD_PDF_FALSE=''
--GTK_DOC_BUILD_PDF_TRUE=''
--GTK_DOC_USE_LIBTOOL_FALSE=''
-+GTK_DOC_BUILD_PDF_TRUE='#'
-+GTK_DOC_USE_LIBTOOL_FALSE='#'
- GTK_DOC_USE_LIBTOOL_TRUE=''
--GTK_DOC_USE_REBASE_FALSE=''
-+GTK_DOC_USE_REBASE_FALSE='#'
- GTK_DOC_USE_REBASE_TRUE=''
--GTK_LIBS='-pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--HAVE_SCHEME_HANDLER_FALSE=''
-+GTK_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangocairo-1.0 -lXext -lXrender -lXcomposite -lXdamage -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lgio-2.0 -lXfixes -lcairo -lX11 -lpango-1.0 -lm -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+HAVE_SCHEME_HANDLER_FALSE='#'
- HAVE_SCHEME_HANDLER_TRUE=''
--HTML_DIR=''
-+HTML_DIR='${datadir}/gtk-doc/html'
- INSTALL_DATA='${INSTALL} -m 644'
- INSTALL_PROGRAM='${INSTALL}'
- INSTALL_SCRIPT='${INSTALL}'
- INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
--INSTOBJEXT=''
--INTLLIBS=''
-+INSTOBJEXT='.mo'
-+INTLLIBS='-lintl '
- INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_EXTRACT='/usr/bin/intltool-extract'
-+INTLTOOL_EXTRACT='/opt/local/bin/intltool-extract'
- INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_MERGE='/usr/bin/intltool-merge'
-+INTLTOOL_MERGE='/opt/local/bin/intltool-merge'
- INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
--INTLTOOL_PERL='/usr/bin/perl'
-+INTLTOOL_PERL='/opt/local/bin/perl'
- INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -629,29 +796,29 @@ INTLTOOL_SHEET_RULE='%.sheet:     %.shee
- INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_UPDATE='/usr/bin/intltool-update'
-+INTLTOOL_UPDATE='/opt/local/bin/intltool-update'
- INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
- INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--LD='/usr/bin/ld -m elf_x86_64'
--LDFLAGS=''
-+LD='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld'
-+LDFLAGS='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib'
- LIBOBJS=''
- LIBS='-lm '
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- LIPO=''
- LN_S='ln -s'
- LTLIBOBJS=''
--MAKEINFO='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run makeinfo'
--MENU_CACHE_CFLAGS=''
--MENU_CACHE_LIBS=''
--MKDIR_P='/bin/mkdir -p'
--MKINSTALLDIRS=''
--MSGFMT='/usr/bin/msgfmt'
--MSGFMT_OPTS=''
--MSGMERGE='/usr/bin/msgmerge'
--NM='/usr/bin/nm -B'
-+MAKEINFO='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run makeinfo'
-+MENU_CACHE_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/menu-cache -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+MENU_CACHE_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lmenu-cache -lglib-2.0 -lintl  '
-+MKDIR_P='/opt/local/bin/gmkdir -p'
-+MKINSTALLDIRS='./mkinstalldirs'
-+MSGFMT='/opt/local/bin/msgfmt'
-+MSGFMT_OPTS='-c'
-+MSGMERGE='/opt/local/bin/msgmerge'
-+NM='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm'
- NMEDIT=''
--OBJDUMP='objdump'
-+OBJDUMP='i686-openadk-linux-objdump'
- OBJEXT='o'
- OTOOL64=''
- OTOOL=''
-@@ -663,68 +830,68 @@ PACKAGE_TARNAME='libfm'
- PACKAGE_URL=''
- PACKAGE_VERSION='0.1.15'
- PATH_SEPARATOR=':'
--PKG_CONFIG='/usr/bin/pkg-config'
-+PKG_CONFIG='/opt/local/bin/pkg-config'
- POFILES=''
--POSUB=''
-+POSUB='po'
- PO_IN_DATADIR_FALSE=''
- PO_IN_DATADIR_TRUE=''
--RANLIB='ranlib'
--SED='/bin/sed'
-+RANLIB='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ranlib'
-+SED='/Volumes/adk/openadk/scripts/sed'
- SET_MAKE=''
- SHELL='/bin/bash'
--STRIP='strip'
-+STRIP='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip'
- USE_NLS='yes'
- VERSION='0.1.15'
--XGETTEXT='/usr/bin/xgettext'
--ac_ct_CC='gcc'
-+XGETTEXT='/opt/local/bin/xgettext'
-+ac_ct_CC=''
- ac_ct_DUMPBIN=''
- am__EXEEXT_FALSE=''
--am__EXEEXT_TRUE=''
--am__fastdepCC_FALSE='#'
--am__fastdepCC_TRUE=''
-+am__EXEEXT_TRUE='#'
-+am__fastdepCC_FALSE=''
-+am__fastdepCC_TRUE='#'
- am__include='include'
- am__isrc=''
- am__leading_dot='.'
- am__quote=''
- am__tar='${AMTAR} chof - "$$tardir"'
- am__untar='${AMTAR} xf -'
--bindir='${exec_prefix}/bin'
--build='x86_64-unknown-linux-gnu'
--build_alias=''
--build_cpu='x86_64'
--build_os='linux-gnu'
--build_vendor='unknown'
--datadir='${datarootdir}'
-+bindir='/usr/bin'
-+build='i686-apple-darwin10'
-+build_alias='i686-apple-darwin10'
-+build_cpu='i686'
-+build_os='darwin10'
-+build_vendor='apple'
-+datadir='/usr/share'
- datarootdir='${prefix}/share'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
- dvidir='${docdir}'
--exec_prefix='NONE'
--giomodulesdir=''
--host='x86_64-unknown-linux-gnu'
--host_alias=''
--host_cpu='x86_64'
-+exec_prefix='${prefix}'
-+giomodulesdir='${exec_prefix}/lib/gio/modules'
-+host='i686-openadk-linux-gnu'
-+host_alias='i686-openadk-linux'
-+host_cpu='i686'
- host_os='linux-gnu'
--host_vendor='unknown'
-+host_vendor='openadk'
- htmldir='${docdir}'
- includedir='${prefix}/include'
- infodir='${datarootdir}/info'
--install_sh='${SHELL} /home/wbx/adk/openadk/libfm-2.0/install-sh'
-+install_sh='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/install-sh'
- libdir='${exec_prefix}/lib'
--libexecdir='${exec_prefix}/libexec'
-+libexecdir='/usr/libexec'
- localedir='${datarootdir}/locale'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- lt_ECHO='echo'
--mandir='${datarootdir}/man'
--mkdir_p='/bin/mkdir -p'
-+mandir='/usr/share/man'
-+mkdir_p='/opt/local/bin/gmkdir -p'
- oldincludedir='/usr/include'
- pdfdir='${docdir}'
--prefix='NONE'
--program_transform_name='s,x,x,'
-+prefix='/usr'
-+program_transform_name='s&$$&&;s&^&&'
- psdir='${docdir}'
- sbindir='${exec_prefix}/sbin'
- sharedstatedir='${prefix}/com'
--sysconfdir='${prefix}/etc'
--target_alias=''
-+sysconfdir='/etc'
-+target_alias='i686-openadk-linux'
- 
- ## ----------- ##
- ## confdefs.h. ##
-@@ -756,9 +923,16 @@ target_alias=''
- #define HAVE_UNISTD_H 1
- #define HAVE_SYS_PARAM_H 1
- #define HAVE_GETPAGESIZE 1
--#define HAVE_MMAP 1
- #define HAVE_LIBM 1
- #define _LARGEFILE64_SOURCE 1
- #define _FILE_OFFSET_BITS 64
-+#define HAVE_SCHEME_HANDLER 1
-+#define HAVE_LOCALE_H 1
-+#define HAVE_LC_MESSAGES 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-+#define HAVE_GETTEXT 1
-+#define HAVE_DCGETTEXT 1
-+#define ENABLE_NLS 1
-+#define GETTEXT_PACKAGE "libfm"
- 
--configure: exit 1
-+configure: exit 0
diff --git a/package/libfm/patches/patch-config_log.orig b/package/libfm/patches/patch-config_log.orig
deleted file mode 100644
index 6bcba962a..000000000
--- a/package/libfm/patches/patch-config_log.orig
+++ /dev/null
@@ -1,1143 +0,0 @@
---- libfm-2.0.orig/config.log	2011-04-14 20:24:25.000000000 +0200
-+++ libfm-2.0/config.log	2011-04-16 11:04:59.000000000 +0200
-@@ -4,36 +4,51 @@ running configure, to aid debugging if c
- It was created by libfm configure 0.1.15, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
- 
--  $ ./configure 
-+  $ /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/configure --build=i686-apple-darwin10 --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 --enable-shared --enable-static --disable-dependency-tracking --disable-libtool-lock --enable-nls
- 
- ## --------- ##
- ## Platform. ##
- ## --------- ##
- 
--hostname = chrom
--uname -m = x86_64
--uname -r = 2.6.32-30-server
--uname -s = Linux
--uname -v = #59-Ubuntu SMP Tue Mar 1 22:46:09 UTC 2011
-+hostname = neon.foo.bar
-+uname -m = i386
-+uname -r = 10.6.0
-+uname -s = Darwin
-+uname -v = Darwin Kernel Version 10.6.0: Wed Nov 10 18:13:17 PST 2010; root:xnu-1504.9.26~3/RELEASE_I386
- 
--/usr/bin/uname -p = unknown
-+/usr/bin/uname -p = i386
- /bin/uname -X     = unknown
- 
- /bin/arch              = unknown
- /usr/bin/arch -k       = unknown
- /usr/convex/getsysinfo = unknown
--/usr/bin/hostinfo      = unknown
-+/usr/bin/hostinfo      = Mach kernel version:
-+	 Darwin Kernel Version 10.6.0: Wed Nov 10 18:13:17 PST 2010; root:xnu-1504.9.26~3/RELEASE_I386
-+Kernel configured for up to 2 processors.
-+2 processors are physically available.
-+2 processors are logically available.
-+Processor type: i486 (Intel 80486)
-+Processors active: 0 1
-+Primary memory available: 4.00 gigabytes
-+Default processor set: 75 tasks, 302 threads, 2 processors
-+Load average: 2.84, Mach factor: 0.46
- /bin/machine           = unknown
- /usr/bin/oslevel       = unknown
- /bin/universe          = unknown
- 
--PATH: /usr/local/sbin
--PATH: /usr/local/bin
--PATH: /usr/sbin
-+PATH: /Volumes/adk/openadk/scripts
-+PATH: /Volumes/adk/openadk/bin/tools
-+PATH: /Volumes/adk/openadk/host_i686_eglibc/bin
-+PATH: /Volumes/adk/openadk/host_i686_eglibc/usr/bin
-+PATH: /Volumes/adk/openadk/target_i686_eglibc/scripts
-+PATH: /opt/local/bin
-+PATH: /opt/local/sbin
- PATH: /usr/bin
--PATH: /sbin
- PATH: /bin
--PATH: /usr/games
-+PATH: /usr/sbin
-+PATH: /sbin
-+PATH: /usr/local/bin
-+PATH: /usr/X11/bin
- 
- 
- ## ----------- ##
-@@ -41,140 +56,135 @@ PATH: /usr/games
- ## ----------- ##
- 
- configure:2478: checking for a BSD-compatible install
--configure:2546: result: /usr/bin/install -c
-+configure:2546: result: /Volumes/adk/openadk/scripts/install -c
- configure:2557: checking whether build environment is sane
- configure:2607: result: yes
-+configure:2656: checking for i686-openadk-linux-strip
-+configure:2683: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip
- configure:2748: checking for a thread-safe mkdir -p
--configure:2787: result: /bin/mkdir -p
-+configure:2787: result: /opt/local/bin/gmkdir -p
- configure:2800: checking for gawk
--configure:2816: found /usr/bin/gawk
-+configure:2816: found /opt/local/bin/gawk
- configure:2827: result: gawk
- configure:2838: checking whether make sets $(MAKE)
- configure:2860: result: yes
--configure:2993: checking for gcc
--configure:3009: found /usr/bin/gcc
--configure:3020: result: gcc
-+configure:2953: checking for i686-openadk-linux-gcc
-+configure:2980: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
- configure:3249: checking for C compiler version
--configure:3258: gcc --version >&5
--gcc (Ubuntu 4.4.3-4ubuntu5) 4.4.3
--Copyright (C) 2009 Free Software Foundation, Inc.
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc --version >&5
-+i686-openadk-linux-gnu-gcc (GCC) 4.5.2
-+Copyright (C) 2010 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
- configure:3269: $? = 0
--configure:3258: gcc -v >&5
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -v >&5
- Using built-in specs.
--Target: x86_64-linux-gnu
--Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.3-4ubuntu5' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-plugin --enable-objc-gc --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-+COLLECT_GCC=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+COLLECT_LTO_WRAPPER=/Volumes/adk/openadk/host_i686_eglibc/libexec/gcc/i686-openadk-linux-gnu/4.5.2/lto-wrapper
-+Target: i686-openadk-linux-gnu
-+Configured with: /Volumes/adk/openadk/toolchain_build_i686_eglibc/w-gcc-4.5.2-1/gcc-4.5.2/configure --prefix=/Volumes/adk/openadk/host_i686_eglibc --build=i686-apple-darwin10 --host=i686-apple-darwin10 --target=i686-openadk-linux-gnu --with-gmp=/Volumes/adk/openadk/host_i686_eglibc --with-mpfr=/Volumes/adk/openadk/host_i686_eglibc --with-libelf=/Volumes/adk/openadk/host_i686_eglibc --disable-__cxa_atexit --with-gnu-ld --disable-libmudflap --disable-libgomp --disable-biarch --disable-decimal-float --disable-multilib --disable-sjlj-exceptions --disable-libstdcxx-pch --disable-ppl-version-check --disable-cloog-version-check --without-ppl --without-cloog --disable-nls --disable-libssp --disable-lto --enable-tls --enable-target-optspace --enable-languages=c,c++ --with-sysroot='/Volumes/adk/openadk/host_i686_eglibc/../target_i686_eglibc' --with-slibdir=/Volumes/adk/openadk/target_i686_eglibc/lib --enable-shared
- Thread model: posix
--gcc version 4.4.3 (Ubuntu 4.4.3-4ubuntu5) 
-+gcc version 4.5.2 (GCC) 
- configure:3269: $? = 0
--configure:3258: gcc -V >&5
--gcc: '-V' option must have argument
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -V >&5
-+i686-openadk-linux-gnu-gcc: '-V' option must have argument
- configure:3269: $? = 1
--configure:3258: gcc -qversion >&5
--gcc: unrecognized option '-qversion'
--gcc: no input files
-+configure:3258: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -qversion >&5
-+i686-openadk-linux-gnu-gcc: unrecognized option '-qversion'
-+i686-openadk-linux-gnu-gcc: no input files
- configure:3269: $? = 1
- configure:3289: checking whether the C compiler works
--configure:3311: gcc    conftest.c  >&5
-+configure:3311: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c  >&5
- configure:3315: $? = 0
- configure:3364: result: yes
- configure:3367: checking for C compiler default output file name
- configure:3369: result: a.out
- configure:3375: checking for suffix of executables
--configure:3382: gcc -o conftest    conftest.c  >&5
-+configure:3382: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c  >&5
- configure:3386: $? = 0
- configure:3408: result: 
- configure:3430: checking whether we are cross compiling
--configure:3438: gcc -o conftest    conftest.c  >&5
--configure:3442: $? = 0
--configure:3449: ./conftest
--configure:3453: $? = 0
--configure:3468: result: no
-+configure:3468: result: yes
- configure:3473: checking for suffix of object files
--configure:3495: gcc -c   conftest.c >&5
-+configure:3495: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3499: $? = 0
- configure:3520: result: o
- configure:3524: checking whether we are using the GNU C compiler
--configure:3543: gcc -c   conftest.c >&5
-+configure:3543: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3543: $? = 0
- configure:3552: result: yes
--configure:3561: checking whether gcc accepts -g
--configure:3581: gcc -c -g  conftest.c >&5
-+configure:3561: checking whether /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc accepts -g
-+configure:3581: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -g -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3581: $? = 0
- configure:3622: result: yes
--configure:3639: checking for gcc option to accept ISO C89
--configure:3703: gcc  -c -g -O2  conftest.c >&5
-+configure:3639: checking for /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc option to accept ISO C89
-+configure:3703: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc  -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:3703: $? = 0
- configure:3716: result: none needed
- configure:3747: checking for style of include used by make
- configure:3775: result: GNU
--configure:3800: checking dependency style of gcc
--configure:3910: result: gcc3
-+configure:3800: checking dependency style of /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+configure:3910: result: none
- configure:3954: checking build system type
--configure:3968: result: x86_64-unknown-linux-gnu
-+configure:3968: result: i686-apple-darwin10
- configure:3988: checking host system type
--configure:4001: result: x86_64-unknown-linux-gnu
-+configure:4001: result: i686-openadk-linux-gnu
- configure:4021: checking for a sed that does not truncate output
--configure:4085: result: /bin/sed
-+configure:4085: result: /Volumes/adk/openadk/scripts/sed
- configure:4103: checking for grep that handles long lines and -e
--configure:4161: result: /bin/grep
-+configure:4161: result: /usr/bin/grep
- configure:4166: checking for egrep
--configure:4228: result: /bin/grep -E
-+configure:4228: result: /usr/bin/grep -E
- configure:4233: checking for fgrep
--configure:4295: result: /bin/grep -F
--configure:4330: checking for ld used by gcc
--configure:4397: result: /usr/bin/ld
--configure:4404: checking if the linker (/usr/bin/ld) is GNU ld
-+configure:4295: result: /usr/bin/grep -F
-+configure:4330: checking for ld used by /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+configure:4397: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld
-+configure:4404: checking if the linker (/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld) is GNU ld
- configure:4419: result: yes
- configure:4431: checking for BSD- or MS-compatible name lister (nm)
--configure:4480: result: /usr/bin/nm -B
--configure:4598: checking the name lister (/usr/bin/nm -B) interface
--configure:4605: gcc -c -g -O2  conftest.c >&5
--configure:4608: /usr/bin/nm -B "conftest.o"
-+configure:4480: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm
-+configure:4598: checking the name lister (/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm) interface
-+configure:4605: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
-+configure:4608: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm "conftest.o"
- configure:4611: output
--0000000000000000 B some_variable
-+00000000 B some_variable
- configure:4618: result: BSD nm
- configure:4621: checking whether ln -s works
- configure:4625: result: yes
- configure:4633: checking the maximum length of command line arguments
--configure:4753: result: 1572864
-+configure:4753: result: 196608
- configure:4770: checking whether the shell understands some XSI constructs
- configure:4780: result: yes
- configure:4784: checking whether the shell understands "+="
- configure:4790: result: yes
--configure:4825: checking for /usr/bin/ld option to reload object files
-+configure:4825: checking for /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld option to reload object files
- configure:4832: result: -r
--configure:4901: checking for objdump
--configure:4917: found /usr/bin/objdump
--configure:4928: result: objdump
-+configure:4861: checking for i686-openadk-linux-objdump
-+configure:4877: found /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-objdump
-+configure:4888: result: i686-openadk-linux-objdump
- configure:4960: checking how to recognize dependent libraries
- configure:5156: result: pass_all
--configure:5216: checking for ar
--configure:5232: found /usr/bin/ar
--configure:5243: result: ar
--configure:5321: checking for strip
--configure:5337: found /usr/bin/strip
--configure:5348: result: strip
--configure:5420: checking for ranlib
--configure:5436: found /usr/bin/ranlib
--configure:5447: result: ranlib
--configure:5537: checking command to parse /usr/bin/nm -B output from gcc object
--configure:5655: gcc -c -g -O2  conftest.c >&5
-+configure:5176: checking for i686-openadk-linux-ar
-+configure:5203: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ar
-+configure:5281: checking for i686-openadk-linux-strip
-+configure:5308: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip
-+configure:5380: checking for i686-openadk-linux-ranlib
-+configure:5407: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ranlib
-+configure:5537: checking command to parse /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm output from /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc object
-+configure:5655: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:5658: $? = 0
--configure:5662: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-+configure:5662: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm conftest.o \| sed -n -e 's/^.*[	 ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[	 ][	 ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
- configure:5665: $? = 0
--configure:5719: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-+configure:5719: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c conftstm.o >&5
- configure:5722: $? = 0
- configure:5760: result: ok
--configure:5856: gcc -c -g -O2  conftest.c >&5
--configure:5859: $? = 0
- configure:6569: checking how to run the C preprocessor
--configure:6600: gcc -E  conftest.c
-+configure:6600: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
- configure:6600: $? = 0
--configure:6614: gcc -E  conftest.c
--conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-+configure:6614: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
-+conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
-+compilation terminated.
- configure:6614: $? = 1
- configure: failed program was:
- | /* confdefs.h */
-@@ -188,11 +198,12 @@ configure: failed program was:
- | #define VERSION "0.1.15"
- | /* end confdefs.h.  */
- | #include <ac_nonexistent.h>
--configure:6639: result: gcc -E
--configure:6659: gcc -E  conftest.c
-+configure:6639: result: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E
-+configure:6659: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
- configure:6659: $? = 0
--configure:6673: gcc -E  conftest.c
--conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-+configure:6673: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c
-+conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
-+compilation terminated.
- configure:6673: $? = 1
- configure: failed program was:
- | /* confdefs.h */
-@@ -207,84 +218,80 @@ configure: failed program was:
- | /* end confdefs.h.  */
- | #include <ac_nonexistent.h>
- configure:6702: checking for ANSI C header files
--configure:6722: gcc -c -g -O2  conftest.c >&5
-+configure:6722: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6722: $? = 0
--configure:6795: gcc -o conftest -g -O2   conftest.c  >&5
--configure:6795: $? = 0
--configure:6795: ./conftest
--configure:6795: $? = 0
- configure:6806: result: yes
- configure:6819: checking for sys/types.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for sys/stat.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for stdlib.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for string.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for memory.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for strings.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for inttypes.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for stdint.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6819: checking for unistd.h
--configure:6819: gcc -c -g -O2  conftest.c >&5
-+configure:6819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6819: $? = 0
- configure:6819: result: yes
- configure:6834: checking for dlfcn.h
--configure:6834: gcc -c -g -O2  conftest.c >&5
-+configure:6834: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:6834: $? = 0
- configure:6834: result: yes
- configure:7018: checking for objdir
- configure:7033: result: .libs
--configure:7325: checking if gcc supports -fno-rtti -fno-exceptions
--configure:7343: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-+configure:7325: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc supports -fno-rtti -fno-exceptions
-+configure:7343: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -fno-rtti -fno-exceptions conftest.c >&5
- cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
- configure:7347: $? = 0
- configure:7360: result: no
--configure:7380: checking for gcc option to produce PIC
-+configure:7380: checking for /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc option to produce PIC
- configure:7652: result: -fPIC -DPIC
--configure:7664: checking if gcc PIC flag -fPIC -DPIC works
--configure:7682: gcc -c -g -O2  -fPIC -DPIC -DPIC conftest.c >&5
-+configure:7664: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc PIC flag -fPIC -DPIC works
-+configure:7682: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -fPIC -DPIC -DPIC conftest.c >&5
- configure:7686: $? = 0
- configure:7699: result: yes
--configure:7723: checking if gcc static flag -static works
-+configure:7723: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc static flag -static works
- configure:7751: result: yes
--configure:7766: checking if gcc supports -c -o file.o
--configure:7787: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-+configure:7766: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc supports -c -o file.o
-+configure:7787: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -o out/conftest2.o conftest.c >&5
- configure:7791: $? = 0
- configure:7813: result: yes
--configure:7821: checking if gcc supports -c -o file.o
-+configure:7821: checking if /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc supports -c -o file.o
- configure:7868: result: yes
--configure:7901: checking whether the gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries
-+configure:7901: checking whether the /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc linker (/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld) supports shared libraries
- configure:8892: result: yes
- configure:8929: checking whether -lc should be explicitly linked in
--configure:8934: gcc -c -g -O2  conftest.c >&5
-+configure:8934: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:8937: $? = 0
--configure:8952: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /bin/grep  -lc  \>/dev/null 2\>\&1
-+configure:8952: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| /usr/bin/grep  -lc  \>/dev/null 2\>\&1
- configure:8955: $? = 0
- configure:8967: result: no
- configure:9131: checking dynamic linker characteristics
--configure:9564: gcc -o conftest -g -O2   -Wl,-rpath -Wl,/foo conftest.c  >&5
-+configure:9564: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -Wl,-rpath -Wl,/foo conftest.c  >&5
- configure:9564: $? = 0
- configure:9794: result: GNU/Linux ld.so
- configure:9896: checking how to hardcode library paths into programs
-@@ -304,60 +311,59 @@ configure:10675: result: yes
- configure:10675: checking for unistd.h
- configure:10675: result: yes
- configure:10675: checking for sys/param.h
--configure:10675: gcc -c -g -O2  conftest.c >&5
-+configure:10675: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG conftest.c >&5
- configure:10675: $? = 0
- configure:10675: result: yes
- configure:10696: checking for getpagesize
--configure:10696: gcc -o conftest -g -O2   conftest.c  >&5
-+configure:10696: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c  >&5
- configure:10696: $? = 0
- configure:10696: result: yes
- configure:10705: checking for working mmap
--configure:10852: gcc -o conftest -g -O2   conftest.c  >&5
--configure:10852: $? = 0
--configure:10852: ./conftest
--configure:10852: $? = 0
--configure:10862: result: yes
-+configure:10862: result: no
- configure:10871: checking for pow in -lm
--configure:10896: gcc -o conftest -g -O2   conftest.c -lm   >&5
--conftest.c:36: warning: conflicting types for built-in function 'pow'
-+configure:10896: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm   >&5
-+conftest.c:35:6: warning: conflicting types for built-in function 'pow'
- configure:10896: $? = 0
- configure:10905: result: yes
- configure:10939: checking whether NLS is requested
- configure:10948: result: yes
- configure:10963: checking for intltool >= 0.40.0
--configure:10970: result: 0.41.0 found
-+configure:10970: result: 0.40.6 found
- configure:10978: checking for intltool-update
--configure:10996: found /usr/bin/intltool-update
--configure:11008: result: /usr/bin/intltool-update
-+configure:10996: found /opt/local/bin/intltool-update
-+configure:11008: result: /opt/local/bin/intltool-update
- configure:11018: checking for intltool-merge
--configure:11036: found /usr/bin/intltool-merge
--configure:11048: result: /usr/bin/intltool-merge
-+configure:11036: found /opt/local/bin/intltool-merge
-+configure:11048: result: /opt/local/bin/intltool-merge
- configure:11058: checking for intltool-extract
--configure:11076: found /usr/bin/intltool-extract
--configure:11088: result: /usr/bin/intltool-extract
-+configure:11076: found /opt/local/bin/intltool-extract
-+configure:11088: result: /opt/local/bin/intltool-extract
- configure:11219: checking for xgettext
--configure:11237: found /usr/bin/xgettext
--configure:11249: result: /usr/bin/xgettext
-+configure:11237: found /opt/local/bin/xgettext
-+configure:11249: result: /opt/local/bin/xgettext
- configure:11259: checking for msgmerge
--configure:11277: found /usr/bin/msgmerge
--configure:11289: result: /usr/bin/msgmerge
-+configure:11277: found /opt/local/bin/msgmerge
-+configure:11289: result: /opt/local/bin/msgmerge
- configure:11299: checking for msgfmt
--configure:11317: found /usr/bin/msgfmt
--configure:11329: result: /usr/bin/msgfmt
-+configure:11317: found /opt/local/bin/msgfmt
-+configure:11329: result: /opt/local/bin/msgfmt
- configure:11339: checking for gmsgfmt
--configure:11370: result: /usr/bin/msgfmt
-+configure:11370: result: /opt/local/bin/msgfmt
- configure:11390: checking for perl
--configure:11408: found /usr/bin/perl
--configure:11420: result: /usr/bin/perl
-+configure:11408: found /opt/local/bin/perl
-+configure:11420: result: /opt/local/bin/perl
- configure:11431: checking for perl >= 5.8.1
--configure:11438: result: 5.10.1
-+configure:11438: result: 5.12.3
- configure:11442: checking for XML::Parser
- configure:11445: result: ok
--configure:11470: gcc -o conftest -g -O2  -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64  conftest.c -lm  >&5
-+configure:11470: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  >&5
- configure:11470: $? = 0
-+configure:11504: checking for i686-openadk-linux-pkg-config
-+configure:11537: result: no
- configure:11547: checking for pkg-config
--configure:11565: found /usr/bin/pkg-config
--configure:11577: result: /usr/bin/pkg-config
-+configure:11565: found /opt/local/bin/pkg-config
-+configure:11577: result: /opt/local/bin/pkg-config
-+configure:11589: WARNING: using cross tools not prefixed with host triplet
- configure:11602: checking pkg-config is at least version 0.9.0
- configure:11605: result: yes
- configure:11616: checking for GTK
-@@ -386,42 +392,182 @@ configure:11927: $? = 0
- configure:11982: result: yes
- configure:11992: checking for MENU_CACHE
- configure:12000: $PKG_CONFIG --exists --print-errors "$menu_modules"
--Package libmenu-cache was not found in the pkg-config search path.
--Perhaps you should add the directory containing `libmenu-cache.pc'
--to the PKG_CONFIG_PATH environment variable
--No package 'libmenu-cache' found
--configure:12003: $? = 1
-+configure:12003: $? = 0
- configure:12018: $PKG_CONFIG --exists --print-errors "$menu_modules"
--Package libmenu-cache was not found in the pkg-config search path.
--Perhaps you should add the directory containing `libmenu-cache.pc'
--to the PKG_CONFIG_PATH environment variable
--No package 'libmenu-cache' found
--configure:12021: $? = 1
--No package 'libmenu-cache' found
--configure:12059: error: Package requirements (libmenu-cache >= 0.3.2) were not met:
-+configure:12021: $? = 0
-+configure:12076: result: yes
-+configure:12088: checking for GLIB2_27
-+configure:12096: $PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.27.0"
-+configure:12099: $? = 0
-+configure:12114: $PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.27.0"
-+configure:12117: $? = 0
-+configure:12153: result: yes
-+configure:12299: checking for gtkdoc-check
-+configure:12317: found /opt/local/bin/gtkdoc-check
-+configure:12329: result: /opt/local/bin/gtkdoc-check
-+configure:12341: checking for gtkdoc-rebase
-+configure:12359: found /opt/local/bin/gtkdoc-rebase
-+configure:12371: result: /opt/local/bin/gtkdoc-rebase
-+configure:12385: checking for gtkdoc-mkpdf
-+configure:12403: found /opt/local/bin/gtkdoc-mkpdf
-+configure:12415: result: /opt/local/bin/gtkdoc-mkpdf
-+configure:12456: checking whether to build gtk-doc documentation
-+configure:12458: result: no
-+configure:12577: checking locale.h usability
-+configure:12577: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c >&5
-+configure:12577: $? = 0
-+configure:12577: result: yes
-+configure:12577: checking locale.h presence
-+configure:12577: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c
-+configure:12577: $? = 0
-+configure:12577: result: yes
-+configure:12577: checking for locale.h
-+configure:12577: result: yes
-+configure:12588: checking for LC_MESSAGES
-+configure:12604: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  >&5
-+configure:12604: $? = 0
-+configure:12612: result: yes
-+configure:12629: checking libintl.h usability
-+configure:12629: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -c -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c >&5
-+configure:12629: $? = 0
-+configure:12629: result: yes
-+configure:12629: checking libintl.h presence
-+configure:12629: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS conftest.c
-+configure:12629: $? = 0
-+configure:12629: result: yes
-+configure:12629: checking for libintl.h
-+configure:12629: result: yes
-+configure:12637: checking for ngettext in libc
-+configure:12655: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  >&5
-+/var/folders/v7/v7rUSnywE5SYxctWLsie4++++TI/-Tmp-//cc7EaZlb.o: In function `main':
-+conftest.c:(.text+0x1e): undefined reference to `libintl_ngettext'
-+collect2: ld returned 1 exit status
-+configure:12655: $? = 1
-+configure: failed program was:
-+| /* confdefs.h */
-+| #define PACKAGE_NAME "libfm"
-+| #define PACKAGE_TARNAME "libfm"
-+| #define PACKAGE_VERSION "0.1.15"
-+| #define PACKAGE_STRING "libfm 0.1.15"
-+| #define PACKAGE_BUGREPORT "http://libfm.sf.net/"
-+| #define PACKAGE_URL ""
-+| #define PACKAGE "libfm"
-+| #define VERSION "0.1.15"
-+| #define STDC_HEADERS 1
-+| #define HAVE_SYS_TYPES_H 1
-+| #define HAVE_SYS_STAT_H 1
-+| #define HAVE_STDLIB_H 1
-+| #define HAVE_STRING_H 1
-+| #define HAVE_MEMORY_H 1
-+| #define HAVE_STRINGS_H 1
-+| #define HAVE_INTTYPES_H 1
-+| #define HAVE_STDINT_H 1
-+| #define HAVE_UNISTD_H 1
-+| #define HAVE_DLFCN_H 1
-+| #define LT_OBJDIR ".libs/"
-+| #define STDC_HEADERS 1
-+| #define HAVE_STDLIB_H 1
-+| #define HAVE_UNISTD_H 1
-+| #define HAVE_SYS_PARAM_H 1
-+| #define HAVE_GETPAGESIZE 1
-+| #define HAVE_LIBM 1
-+| #define _LARGEFILE64_SOURCE 1
-+| #define _FILE_OFFSET_BITS 64
-+| #define HAVE_SCHEME_HANDLER 1
-+| #define HAVE_LOCALE_H 1
-+| #define HAVE_LC_MESSAGES 1
-+| /* end confdefs.h.  */
-+| 
-+| #include <libintl.h>
-+| 
-+| int
-+| main ()
-+| {
-+| return !ngettext ("","", 1)
-+|   ;
-+|   return 0;
-+| }
-+configure:12664: result: no
-+configure:12720: checking for bindtextdomain in -lintl
-+configure:12745: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lintl  -lm  >&5
-+configure:12745: $? = 0
-+configure:12754: result: yes
-+configure:12757: checking for ngettext in -lintl
-+configure:12782: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lintl  -lm  >&5
-+configure:12782: $? = 0
-+configure:12791: result: yes
-+configure:12794: checking for dgettext in -lintl
-+configure:12819: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lintl  -lm  >&5
-+conftest.c:41:6: warning: conflicting types for built-in function 'dgettext'
-+configure:12819: $? = 0
-+configure:12828: result: yes
-+configure:12941: checking for bind_textdomain_codeset
-+configure:12941: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  -lintl  >&5
-+configure:12941: $? = 0
-+configure:12941: result: yes
-+configure:12978: checking for msgfmt
-+configure:13005: result: /opt/local/bin/msgfmt
-+configure:13016: checking for dcgettext
-+configure:13016: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  -lintl  >&5
-+conftest.c:59:6: warning: conflicting types for built-in function 'dcgettext'
-+configure:13016: $? = 0
-+configure:13016: result: yes
-+configure:13026: checking if msgfmt accepts -c
-+configure:13041: $MSGFMT -c -o /dev/null conftest.foo
-+configure:13044: $? = 0
-+configure:13046: result: yes
-+configure:13056: checking for gmsgfmt
-+configure:13087: result: /opt/local/bin/msgfmt
-+configure:13097: checking for xgettext
-+configure:13124: result: /opt/local/bin/xgettext
-+configure:13143: /Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -o conftest -march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib conftest.c -lm  -lintl  >&5
-+configure:13143: $? = 0
-+configure:13441: creating ./config.status
- 
--No package 'libmenu-cache' found
-+## ---------------------- ##
-+## Running config.status. ##
-+## ---------------------- ##
- 
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
-+This file was extended by libfm config.status 0.1.15, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
--Alternatively, you may set the environment variables MENU_CACHE_CFLAGS
--and MENU_CACHE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-+  CONFIG_FILES    = 
-+  CONFIG_HEADERS  = 
-+  CONFIG_LINKS    = 
-+  CONFIG_COMMANDS = 
-+  $ ./config.status 
- 
-+on neon.foo.bar
-+
-+config.status:1197: creating Makefile
-+config.status:1197: creating src/Makefile
-+config.status:1197: creating src/tests/Makefile
-+config.status:1197: creating data/Makefile
-+config.status:1197: creating data/ui/Makefile
-+config.status:1197: creating po/Makefile.in
-+config.status:1197: creating docs/Makefile
-+config.status:1197: creating docs/reference/Makefile
-+config.status:1197: creating docs/reference/libfm/Makefile
-+config.status:1197: creating libfm.pc
-+config.status:1197: creating libfm-gtk.pc
-+config.status:1197: creating config.h
-+config.status:1417: executing depfiles commands
-+config.status:1417: executing libtool commands
-+config.status:1417: executing default-1 commands
-+config.status:1417: executing po/stamp-it commands
- 
- ## ---------------- ##
- ## Cache variables. ##
- ## ---------------- ##
- 
--ac_cv_build=x86_64-unknown-linux-gnu
-+ac_cv_build=i686-apple-darwin10
- ac_cv_c_compiler_gnu=yes
--ac_cv_env_CC_set=
--ac_cv_env_CC_value=
--ac_cv_env_CFLAGS_set=
--ac_cv_env_CFLAGS_value=
--ac_cv_env_CPPFLAGS_set=
--ac_cv_env_CPPFLAGS_value=
-+ac_cv_env_CC_set=set
-+ac_cv_env_CC_value=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+ac_cv_env_CFLAGS_set=set
-+ac_cv_env_CFLAGS_value='-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe'
-+ac_cv_env_CPPFLAGS_set=set
-+ac_cv_env_CPPFLAGS_value='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG'
- ac_cv_env_CPP_set=
- ac_cv_env_CPP_value=
- ac_cv_env_DBUS_CFLAGS_set=
-@@ -448,8 +594,8 @@ ac_cv_env_GTK_CFLAGS_set=
- ac_cv_env_GTK_CFLAGS_value=
- ac_cv_env_GTK_LIBS_set=
- ac_cv_env_GTK_LIBS_value=
--ac_cv_env_LDFLAGS_set=
--ac_cv_env_LDFLAGS_value=
-+ac_cv_env_LDFLAGS_set=set
-+ac_cv_env_LDFLAGS_value='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib'
- ac_cv_env_LIBS_set=
- ac_cv_env_LIBS_value=
- ac_cv_env_MENU_CACHE_CFLAGS_set=
-@@ -458,16 +604,22 @@ ac_cv_env_MENU_CACHE_LIBS_set=
- ac_cv_env_MENU_CACHE_LIBS_value=
- ac_cv_env_PKG_CONFIG_set=
- ac_cv_env_PKG_CONFIG_value=
--ac_cv_env_build_alias_set=
--ac_cv_env_build_alias_value=
--ac_cv_env_host_alias_set=
--ac_cv_env_host_alias_value=
--ac_cv_env_target_alias_set=
--ac_cv_env_target_alias_value=
-+ac_cv_env_build_alias_set=set
-+ac_cv_env_build_alias_value=i686-apple-darwin10
-+ac_cv_env_host_alias_set=set
-+ac_cv_env_host_alias_value=i686-openadk-linux
-+ac_cv_env_target_alias_set=set
-+ac_cv_env_target_alias_value=i686-openadk-linux
-+ac_cv_func_bind_textdomain_codeset=yes
-+ac_cv_func_dcgettext=yes
- ac_cv_func_getpagesize=yes
--ac_cv_func_mmap_fixed_mapped=yes
-+ac_cv_func_malloc_0_nonnull=yes
-+ac_cv_func_mmap_fixed_mapped=no
-+ac_cv_func_realloc_0_nonnull=yes
- ac_cv_header_dlfcn_h=yes
- ac_cv_header_inttypes_h=yes
-+ac_cv_header_libintl_h=yes
-+ac_cv_header_locale_h=yes
- ac_cv_header_memory_h=yes
- ac_cv_header_stdc=yes
- ac_cv_header_stdint_h=yes
-@@ -478,43 +630,54 @@ ac_cv_header_sys_param_h=yes
- ac_cv_header_sys_stat_h=yes
- ac_cv_header_sys_types_h=yes
- ac_cv_header_unistd_h=yes
--ac_cv_host=x86_64-unknown-linux-gnu
-+ac_cv_host=i686-openadk-linux-gnu
-+ac_cv_lib_intl_bindtextdomain=yes
-+ac_cv_lib_intl_dgettext=yes
-+ac_cv_lib_intl_ngettext=yes
- ac_cv_lib_m_pow=yes
- ac_cv_objext=o
--ac_cv_path_EGREP='/bin/grep -E'
--ac_cv_path_FGREP='/bin/grep -F'
--ac_cv_path_GMSGFMT=/usr/bin/msgfmt
--ac_cv_path_GREP=/bin/grep
--ac_cv_path_INTLTOOL_EXTRACT=/usr/bin/intltool-extract
--ac_cv_path_INTLTOOL_MERGE=/usr/bin/intltool-merge
--ac_cv_path_INTLTOOL_PERL=/usr/bin/perl
--ac_cv_path_INTLTOOL_UPDATE=/usr/bin/intltool-update
--ac_cv_path_MSGFMT=/usr/bin/msgfmt
--ac_cv_path_MSGMERGE=/usr/bin/msgmerge
--ac_cv_path_SED=/bin/sed
--ac_cv_path_XGETTEXT=/usr/bin/xgettext
--ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
--ac_cv_path_install='/usr/bin/install -c'
--ac_cv_path_mkdir=/bin/mkdir
-+ac_cv_path_EGREP='/usr/bin/grep -E'
-+ac_cv_path_FGREP='/usr/bin/grep -F'
-+ac_cv_path_GMSGFMT=/opt/local/bin/msgfmt
-+ac_cv_path_GREP=/usr/bin/grep
-+ac_cv_path_GTKDOC_CHECK=/opt/local/bin/gtkdoc-check
-+ac_cv_path_GTKDOC_MKPDF=/opt/local/bin/gtkdoc-mkpdf
-+ac_cv_path_GTKDOC_REBASE=/opt/local/bin/gtkdoc-rebase
-+ac_cv_path_INTLTOOL_EXTRACT=/opt/local/bin/intltool-extract
-+ac_cv_path_INTLTOOL_MERGE=/opt/local/bin/intltool-merge
-+ac_cv_path_INTLTOOL_PERL=/opt/local/bin/perl
-+ac_cv_path_INTLTOOL_UPDATE=/opt/local/bin/intltool-update
-+ac_cv_path_MSGFMT=/opt/local/bin/msgfmt
-+ac_cv_path_MSGMERGE=/opt/local/bin/msgmerge
-+ac_cv_path_SED=/Volumes/adk/openadk/scripts/sed
-+ac_cv_path_XGETTEXT=/opt/local/bin/xgettext
-+ac_cv_path_ac_pt_PKG_CONFIG=/opt/local/bin/pkg-config
-+ac_cv_path_install='/Volumes/adk/openadk/scripts/install -c'
-+ac_cv_path_mkdir=/opt/local/bin/gmkdir
-+ac_cv_prog_AR=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ar
- ac_cv_prog_AWK=gawk
--ac_cv_prog_CPP='gcc -E'
--ac_cv_prog_ac_ct_AR=ar
--ac_cv_prog_ac_ct_CC=gcc
--ac_cv_prog_ac_ct_OBJDUMP=objdump
--ac_cv_prog_ac_ct_RANLIB=ranlib
--ac_cv_prog_ac_ct_STRIP=strip
-+ac_cv_prog_CC=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc
-+ac_cv_prog_CPP='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E'
-+ac_cv_prog_OBJDUMP=i686-openadk-linux-objdump
-+ac_cv_prog_RANLIB=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ranlib
-+ac_cv_prog_STRIP=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip
- ac_cv_prog_cc_c89=
- ac_cv_prog_cc_g=yes
- ac_cv_prog_make_make_set=yes
--am_cv_CC_dependencies_compiler_type=gcc3
-+am_cv_CC_dependencies_compiler_type=none
-+am_cv_val_LC_MESSAGES=yes
-+gt_cv_func_dgettext_libc=no
-+gt_cv_func_dgettext_libintl=yes
-+gt_cv_func_ngettext_libc=no
-+gt_cv_have_gettext=yes
- lt_cv_deplibs_check_method=pass_all
- lt_cv_file_magic_cmd='$MAGIC_CMD'
- lt_cv_file_magic_test_file=
- lt_cv_ld_reload_flag=-r
- lt_cv_nm_interface='BSD nm'
- lt_cv_objdir=.libs
--lt_cv_path_LD=/usr/bin/ld
--lt_cv_path_NM='/usr/bin/nm -B'
-+lt_cv_path_LD=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld
-+lt_cv_path_NM=/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm
- lt_cv_prog_compiler_c_o=yes
- lt_cv_prog_compiler_pic_works=yes
- lt_cv_prog_compiler_rtti_exceptions=no
-@@ -524,101 +687,105 @@ lt_cv_sys_global_symbol_pipe='sed -n -e 
- lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"\2", (void *) \&\2},/p'\'''
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (void *) 0},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \(lib[^ ]*\)$/  {"\2", (void *) \&\2},/p'\'' -e '\''s/^[ABCDGIRSTW]* \([^ ]*\) \([^ ]*\)$/  {"lib\2", (void *) \&\2},/p'\'''
- lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^T .* \(.*\)$/extern int \1();/p'\'' -e '\''s/^[ABCDGIRSTW]* .* \(.*\)$/extern char \1;/p'\'''
--lt_cv_sys_max_cmd_len=1572864
--pkg_cv_GIO_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/  '
--pkg_cv_GIO_LIBS='-pthread -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--pkg_cv_GLIB_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--pkg_cv_GLIB_LIBS='-pthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--pkg_cv_GMODULE_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--pkg_cv_GMODULE_LIBS='-Wl,--export-dynamic -pthread -lgmodule-2.0 -lrt -lglib-2.0  '
--pkg_cv_GTK_CFLAGS='-pthread -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12  '
--pkg_cv_GTK_LIBS='-pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
-+lt_cv_sys_max_cmd_len=196608
-+pkg_cv_GIO_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/  '
-+pkg_cv_GIO_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_GLIB2_27_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_GLIB2_27_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lglib-2.0 -lintl  '
-+pkg_cv_GLIB_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_GLIB_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_GMODULE_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_GMODULE_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgmodule-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_GTK_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gtk-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/gtk-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/atk-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/cairo -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gdk-pixbuf-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pango-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/ -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pixman-1 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/freetype2 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/libpng12  '
-+pkg_cv_GTK_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangocairo-1.0 -lXext -lXrender -lXcomposite -lXdamage -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lgio-2.0 -lXfixes -lcairo -lX11 -lpango-1.0 -lm -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+pkg_cv_MENU_CACHE_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/menu-cache -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+pkg_cv_MENU_CACHE_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lmenu-cache -lglib-2.0 -lintl  '
- 
- ## ----------------- ##
- ## Output variables. ##
- ## ----------------- ##
- 
--ACLOCAL='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run aclocal-1.11'
-+ACLOCAL='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run aclocal-1.11'
- ALL_LINGUAS=''
--AMDEPBACKSLASH='\'
--AMDEP_FALSE='#'
--AMDEP_TRUE=''
--AMTAR='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run tar'
--AR='ar'
--AUTOCONF='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run autoconf'
--AUTOHEADER='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run autoheader'
--AUTOMAKE='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run automake-1.11'
-+AMDEPBACKSLASH=''
-+AMDEP_FALSE=''
-+AMDEP_TRUE='#'
-+AMTAR='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run tar'
-+AR='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ar'
-+AUTOCONF='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run autoconf'
-+AUTOHEADER='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run autoheader'
-+AUTOMAKE='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run automake-1.11'
- AWK='gawk'
- CATALOGS=''
--CATOBJEXT=''
--CC='gcc'
--CCDEPMODE='depmode=gcc3'
--CFLAGS='-g -O2'
--CPP='gcc -E'
--CPPFLAGS=' -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64'
-+CATOBJEXT='.gmo'
-+CC='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc'
-+CCDEPMODE='depmode=none'
-+CFLAGS='-march=pentium-m -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe'
-+CPP='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-gcc -E'
-+CPPFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include -DNDEBUG -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS'
- CYGPATH_W='echo'
- DATADIRNAME='share'
- DBUS_CFLAGS=''
- DBUS_LIBS=''
--DEFS=''
-+DEFS='-DHAVE_CONFIG_H'
- DEPDIR='.deps'
- DSYMUTIL=''
- DUMPBIN=''
- ECHO_C=''
- ECHO_N='-n'
- ECHO_T=''
--EGREP='/bin/grep -E'
-+EGREP='/usr/bin/grep -E'
- ENABLE_DEMO_FALSE=''
--ENABLE_DEMO_TRUE=''
-+ENABLE_DEMO_TRUE='#'
- ENABLE_GTK_DOC_FALSE=''
--ENABLE_GTK_DOC_TRUE=''
-+ENABLE_GTK_DOC_TRUE='#'
- ENABLE_UDISKS_FALSE=''
--ENABLE_UDISKS_TRUE=''
-+ENABLE_UDISKS_TRUE='#'
- EXEEXT=''
--FGREP='/bin/grep -F'
--GETTEXT_PACKAGE=''
--GIO_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gio-unix-2.0/  '
--GIO_LIBS='-pthread -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--GLIB2_27_CFLAGS=''
--GLIB2_27_LIBS=''
--GLIB_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--GLIB_LIBS='-pthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--GMODULE_CFLAGS='-pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
--GMODULE_LIBS='-Wl,--export-dynamic -pthread -lgmodule-2.0 -lrt -lglib-2.0  '
-+FGREP='/usr/bin/grep -F'
-+GETTEXT_PACKAGE='libfm'
-+GIO_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/  '
-+GIO_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+GLIB2_27_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+GLIB2_27_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lglib-2.0 -lintl  '
-+GLIB_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+GLIB_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+GMODULE_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+GMODULE_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgmodule-2.0 -lrt -lglib-2.0 -lintl  '
- GMOFILES=''
--GMSGFMT='/usr/bin/msgfmt'
--GREP='/bin/grep'
--GTKDOC_CHECK=''
--GTKDOC_MKPDF=''
--GTKDOC_REBASE=''
--GTK_CFLAGS='-pthread -D_REENTRANT -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12  '
--GTK_DOC_BUILD_HTML_FALSE=''
-+GMSGFMT='/opt/local/bin/msgfmt'
-+GREP='/usr/bin/grep'
-+GTKDOC_CHECK='/opt/local/bin/gtkdoc-check'
-+GTKDOC_MKPDF='/opt/local/bin/gtkdoc-mkpdf'
-+GTKDOC_REBASE='/opt/local/bin/gtkdoc-rebase'
-+GTK_CFLAGS='-pthread -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gtk-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/gtk-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/atk-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/cairo -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gdk-pixbuf-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pango-1.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/gio-unix-2.0/ -I/Volumes/adk/openadk/target_i686_eglibc/usr/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/pixman-1 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/freetype2 -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/libpng12  '
-+GTK_DOC_BUILD_HTML_FALSE='#'
- GTK_DOC_BUILD_HTML_TRUE=''
- GTK_DOC_BUILD_PDF_FALSE=''
--GTK_DOC_BUILD_PDF_TRUE=''
--GTK_DOC_USE_LIBTOOL_FALSE=''
-+GTK_DOC_BUILD_PDF_TRUE='#'
-+GTK_DOC_USE_LIBTOOL_FALSE='#'
- GTK_DOC_USE_LIBTOOL_TRUE=''
--GTK_DOC_USE_REBASE_FALSE=''
-+GTK_DOC_USE_REBASE_FALSE='#'
- GTK_DOC_USE_REBASE_TRUE=''
--GTK_LIBS='-pthread -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0  '
--HAVE_SCHEME_HANDLER_FALSE=''
-+GTK_LIBS='-pthread -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangocairo-1.0 -lXext -lXrender -lXcomposite -lXdamage -lgdk_pixbuf-2.0 -lpangoft2-1.0 -lgio-2.0 -lXfixes -lcairo -lX11 -lpango-1.0 -lm -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lintl  '
-+HAVE_SCHEME_HANDLER_FALSE='#'
- HAVE_SCHEME_HANDLER_TRUE=''
--HTML_DIR=''
-+HTML_DIR='${datadir}/gtk-doc/html'
- INSTALL_DATA='${INSTALL} -m 644'
- INSTALL_PROGRAM='${INSTALL}'
- INSTALL_SCRIPT='${INSTALL}'
- INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
--INSTOBJEXT=''
--INTLLIBS=''
-+INSTOBJEXT='.mo'
-+INTLLIBS='-lintl '
- INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_EXTRACT='/usr/bin/intltool-extract'
-+INTLTOOL_EXTRACT='/opt/local/bin/intltool-extract'
- INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_MERGE='/usr/bin/intltool-merge'
-+INTLTOOL_MERGE='/opt/local/bin/intltool-merge'
- INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
--INTLTOOL_PERL='/usr/bin/perl'
-+INTLTOOL_PERL='/opt/local/bin/perl'
- INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -629,29 +796,29 @@ INTLTOOL_SHEET_RULE='%.sheet:     %.shee
- INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--INTLTOOL_UPDATE='/usr/bin/intltool-update'
-+INTLTOOL_UPDATE='/opt/local/bin/intltool-update'
- INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
- INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
--LD='/usr/bin/ld -m elf_x86_64'
--LDFLAGS=''
-+LD='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ld'
-+LDFLAGS='-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/Volumes/adk/openadk/target_i686_eglibc/usr/lib -L/Volumes/adk/openadk/target_i686_eglibc/lib -L/Volumes/adk/openadk/target_i686_eglibc/usr/lib'
- LIBOBJS=''
- LIBS='-lm '
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- LIPO=''
- LN_S='ln -s'
- LTLIBOBJS=''
--MAKEINFO='${SHELL} /home/wbx/adk/openadk/libfm-2.0/missing --run makeinfo'
--MENU_CACHE_CFLAGS=''
--MENU_CACHE_LIBS=''
--MKDIR_P='/bin/mkdir -p'
--MKINSTALLDIRS=''
--MSGFMT='/usr/bin/msgfmt'
--MSGFMT_OPTS=''
--MSGMERGE='/usr/bin/msgmerge'
--NM='/usr/bin/nm -B'
-+MAKEINFO='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/missing --run makeinfo'
-+MENU_CACHE_CFLAGS='-I/Volumes/adk/openadk/target_i686_eglibc/usr/include/menu-cache -I/Volumes/adk/openadk/target_i686_eglibc/usr/include/glib-2.0 -I/Volumes/adk/openadk/target_i686_eglibc/usr/lib/glib-2.0/include  '
-+MENU_CACHE_LIBS='-L/Volumes/adk/openadk/target_i686_eglibc/usr/lib -lmenu-cache -lglib-2.0 -lintl  '
-+MKDIR_P='/opt/local/bin/gmkdir -p'
-+MKINSTALLDIRS='./mkinstalldirs'
-+MSGFMT='/opt/local/bin/msgfmt'
-+MSGFMT_OPTS='-c'
-+MSGMERGE='/opt/local/bin/msgmerge'
-+NM='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-nm'
- NMEDIT=''
--OBJDUMP='objdump'
-+OBJDUMP='i686-openadk-linux-objdump'
- OBJEXT='o'
- OTOOL64=''
- OTOOL=''
-@@ -663,68 +830,68 @@ PACKAGE_TARNAME='libfm'
- PACKAGE_URL=''
- PACKAGE_VERSION='0.1.15'
- PATH_SEPARATOR=':'
--PKG_CONFIG='/usr/bin/pkg-config'
-+PKG_CONFIG='/opt/local/bin/pkg-config'
- POFILES=''
--POSUB=''
-+POSUB='po'
- PO_IN_DATADIR_FALSE=''
- PO_IN_DATADIR_TRUE=''
--RANLIB='ranlib'
--SED='/bin/sed'
-+RANLIB='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-ranlib'
-+SED='/Volumes/adk/openadk/scripts/sed'
- SET_MAKE=''
- SHELL='/bin/bash'
--STRIP='strip'
-+STRIP='/Volumes/adk/openadk/host_i686_eglibc/bin/i686-openadk-linux-gnu-strip'
- USE_NLS='yes'
- VERSION='0.1.15'
--XGETTEXT='/usr/bin/xgettext'
--ac_ct_CC='gcc'
-+XGETTEXT='/opt/local/bin/xgettext'
-+ac_ct_CC=''
- ac_ct_DUMPBIN=''
- am__EXEEXT_FALSE=''
--am__EXEEXT_TRUE=''
--am__fastdepCC_FALSE='#'
--am__fastdepCC_TRUE=''
-+am__EXEEXT_TRUE='#'
-+am__fastdepCC_FALSE=''
-+am__fastdepCC_TRUE='#'
- am__include='include'
- am__isrc=''
- am__leading_dot='.'
- am__quote=''
- am__tar='${AMTAR} chof - "$$tardir"'
- am__untar='${AMTAR} xf -'
--bindir='${exec_prefix}/bin'
--build='x86_64-unknown-linux-gnu'
--build_alias=''
--build_cpu='x86_64'
--build_os='linux-gnu'
--build_vendor='unknown'
--datadir='${datarootdir}'
-+bindir='/usr/bin'
-+build='i686-apple-darwin10'
-+build_alias='i686-apple-darwin10'
-+build_cpu='i686'
-+build_os='darwin10'
-+build_vendor='apple'
-+datadir='/usr/share'
- datarootdir='${prefix}/share'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
- dvidir='${docdir}'
--exec_prefix='NONE'
--giomodulesdir=''
--host='x86_64-unknown-linux-gnu'
--host_alias=''
--host_cpu='x86_64'
-+exec_prefix='${prefix}'
-+giomodulesdir='${exec_prefix}/lib/gio/modules'
-+host='i686-openadk-linux-gnu'
-+host_alias='i686-openadk-linux'
-+host_cpu='i686'
- host_os='linux-gnu'
--host_vendor='unknown'
-+host_vendor='openadk'
- htmldir='${docdir}'
- includedir='${prefix}/include'
- infodir='${datarootdir}/info'
--install_sh='${SHELL} /home/wbx/adk/openadk/libfm-2.0/install-sh'
-+install_sh='${SHELL} /Volumes/adk/openadk/build_ibm-x40_i686_eglibc/w-libfm-2.0-1/libfm-2.0/install-sh'
- libdir='${exec_prefix}/lib'
--libexecdir='${exec_prefix}/libexec'
-+libexecdir='/usr/libexec'
- localedir='${datarootdir}/locale'
--localstatedir='${prefix}/var'
-+localstatedir='/var'
- lt_ECHO='echo'
--mandir='${datarootdir}/man'
--mkdir_p='/bin/mkdir -p'
-+mandir='/usr/share/man'
-+mkdir_p='/opt/local/bin/gmkdir -p'
- oldincludedir='/usr/include'
- pdfdir='${docdir}'
--prefix='NONE'
--program_transform_name='s,x,x,'
-+prefix='/usr'
-+program_transform_name='s&$$&&;s&^&&'
- psdir='${docdir}'
- sbindir='${exec_prefix}/sbin'
- sharedstatedir='${prefix}/com'
--sysconfdir='${prefix}/etc'
--target_alias=''
-+sysconfdir='/etc'
-+target_alias='i686-openadk-linux'
- 
- ## ----------- ##
- ## confdefs.h. ##
-@@ -756,9 +923,16 @@ target_alias=''
- #define HAVE_UNISTD_H 1
- #define HAVE_SYS_PARAM_H 1
- #define HAVE_GETPAGESIZE 1
--#define HAVE_MMAP 1
- #define HAVE_LIBM 1
- #define _LARGEFILE64_SOURCE 1
- #define _FILE_OFFSET_BITS 64
-+#define HAVE_SCHEME_HANDLER 1
-+#define HAVE_LOCALE_H 1
-+#define HAVE_LC_MESSAGES 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-+#define HAVE_GETTEXT 1
-+#define HAVE_DCGETTEXT 1
-+#define ENABLE_NLS 1
-+#define GETTEXT_PACKAGE "libfm"
- 
--configure: exit 1
-+configure: exit 0
diff --git a/package/libfm/patches/patch-configure b/package/libfm/patches/patch-configure
new file mode 100644
index 000000000..5886afec6
--- /dev/null
+++ b/package/libfm/patches/patch-configure
@@ -0,0 +1,21 @@
+--- libfm-0.1.16.orig/configure	2011-08-09 23:25:14.000000000 +0200
++++ libfm-0.1.16/configure	2011-09-13 10:20:35.697990682 +0200
+@@ -14181,7 +14181,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile libfm.pc libfm-gtk.pc"
++ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in libfm.pc libfm-gtk.pc"
+ 
+ 
+ cat >confcache <<\_ACEOF
+@@ -15237,9 +15237,6 @@ do
+     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+     "data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES data/ui/Makefile" ;;
+     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+-    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+-    "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
+-    "docs/reference/libfm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libfm/Makefile" ;;
+     "libfm.pc") CONFIG_FILES="$CONFIG_FILES libfm.pc" ;;
+     "libfm-gtk.pc") CONFIG_FILES="$CONFIG_FILES libfm-gtk.pc" ;;
+     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
diff --git a/package/libfm/patches/patch-ltmain_sh b/package/libfm/patches/patch-ltmain_sh
deleted file mode 100644
index 2bbfb9164..000000000
--- a/package/libfm/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,81 +0,0 @@
---- libfm-2.0.orig/ltmain.sh	2011-04-14 20:39:58.000000000 +0200
-+++ libfm-2.0/ltmain.sh	2011-04-16 11:26:42.000000000 +0200
-@@ -4216,19 +4216,6 @@ func_mode_link ()
- 	  prev=
- 	  continue
- 	  ;;
--	framework)
--	  case $host in
--	    *-*-darwin*)
--	      case "$deplibs " in
--		*" $qarg.ltframework "*) ;;
--		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
--		   ;;
--	      esac
--	      ;;
--	  esac
--	  prev=
--	  continue
--	  ;;
- 	inst_prefix)
- 	  inst_prefix_dir="$arg"
- 	  prev=
-@@ -4452,11 +4439,6 @@ func_mode_link ()
- 	continue
- 	;;
- 
--      -framework)
--	prev=framework
--	continue
--	;;
--
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -5155,21 +5137,6 @@ func_mode_link ()
- 	    fi
- 	  fi
- 	  ;; # -l
--	*.ltframework)
--	  if test "$linkmode,$pass" = "prog,link"; then
--	    compile_deplibs="$deplib $compile_deplibs"
--	    finalize_deplibs="$deplib $finalize_deplibs"
--	  else
--	    deplibs="$deplib $deplibs"
--	    if test "$linkmode" = lib ; then
--		case "$new_inherited_linker_flags " in
--		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
--		esac
--	    fi
--	  fi
--	  continue
--	  ;;
- 	-L*)
- 	  case $linkmode in
- 	  lib)
-@@ -5319,24 +5286,6 @@ func_mode_link ()
- 	# Read the .la file
- 	func_source "$lib"
- 
--	# Convert "-framework foo" to "foo.ltframework"
--	if test -n "$inherited_linker_flags"; then
--	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
--	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
--	    case " $new_inherited_linker_flags " in
--	      *" $tmp_inherited_linker_flag "*) ;;
--	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
--	    esac
--	  done
--	fi
--	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	if test "$linkmode,$pass" = "lib,link" ||
--	   test "$linkmode,$pass" = "prog,scan" ||
--	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
--	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
--	fi
--
- 	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
- 	  deplibs="$lib $deplibs"
diff --git a/package/libfm/patches/patch-src_Makefile_in b/package/libfm/patches/patch-src_Makefile_in
deleted file mode 100644
index 2cd40ec83..000000000
--- a/package/libfm/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,40 +0,0 @@
---- libfm-2.0.orig/src/Makefile.in	2011-04-14 20:39:59.000000000 +0200
-+++ libfm-2.0/src/Makefile.in	2011-04-16 10:54:54.000000000 +0200
-@@ -205,8 +205,8 @@ am_xml_purge_OBJECTS = xml_purge-xml-pur
- xml_purge_OBJECTS = $(am_xml_purge_OBJECTS)
- xml_purge_DEPENDENCIES = $(am__DEPENDENCIES_1)
- xml_purge_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(xml_purge_CFLAGS) \
--	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LIBTOOLFLAGS) --mode=link $(CC_FOR_BUILD) \
-+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -911,7 +911,7 @@ libfm-pref-apps$(EXEEXT): $(libfm_pref_a
- 	$(libfm_pref_apps_LINK) $(libfm_pref_apps_OBJECTS) $(libfm_pref_apps_LDADD) $(LIBS)
- xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) 
- 	@rm -f xml-purge$(EXEEXT)
--	$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS)
-+	$(xml_purge_LINK) $(xml_purge_OBJECTS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -1508,14 +1508,14 @@ libfm_pref_apps-libfm-pref-apps.obj: too
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_pref_apps_CFLAGS) $(CFLAGS) -c -o libfm_pref_apps-libfm-pref-apps.obj `if test -f 'tools/libfm-pref-apps.c'; then $(CYGPATH_W) 'tools/libfm-pref-apps.c'; else $(CYGPATH_W) '$(srcdir)/tools/libfm-pref-apps.c'; fi`
- 
- xml_purge-xml-purge.o: xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- 
- xml_purge-xml-purge.obj: xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/package/libfm/patches/patch-src_Makefile_in.orig b/package/libfm/patches/patch-src_Makefile_in.orig
deleted file mode 100644
index 3d4cec98f..000000000
--- a/package/libfm/patches/patch-src_Makefile_in.orig
+++ /dev/null
@@ -1,31 +0,0 @@
---- libfm-2.0.orig/src/Makefile.in	2011-04-14 20:39:59.000000000 +0200
-+++ libfm-2.0/src/Makefile.in	2011-04-16 10:50:57.000000000 +0200
-@@ -205,8 +205,8 @@ am_xml_purge_OBJECTS = xml_purge-xml-pur
- xml_purge_OBJECTS = $(am_xml_purge_OBJECTS)
- xml_purge_DEPENDENCIES = $(am__DEPENDENCIES_1)
- xml_purge_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(xml_purge_CFLAGS) \
--	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LIBTOOLFLAGS) --mode=link $(CC_FOR_BUILD) \
-+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -1508,14 +1508,14 @@ libfm_pref_apps-libfm-pref-apps.obj: too
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfm_pref_apps_CFLAGS) $(CFLAGS) -c -o libfm_pref_apps-libfm-pref-apps.obj `if test -f 'tools/libfm-pref-apps.c'; then $(CYGPATH_W) 'tools/libfm-pref-apps.c'; else $(CYGPATH_W) '$(srcdir)/tools/libfm-pref-apps.c'; fi`
- 
- xml_purge-xml-purge.o: xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- 
- xml_purge-xml-purge.obj: xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 55f9e5b90..353c5cc32 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -11,6 +11,8 @@ PKG_DFLT_LIBGCC:=	y if !ADK_TOOLCHAIN_ONLY
 
 NO_DISTFILES:=		1
 
+PKG_ARCH_DEPENDS:=	!sh
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGCC,libgcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libhugetlbfs/Makefile b/package/libhugetlbfs/Makefile
index 11d8cc9a4..7541c3128 100644
--- a/package/libhugetlbfs/Makefile
+++ b/package/libhugetlbfs/Makefile
@@ -13,7 +13,7 @@ PKG_URL:=		http://libhugetlbfs.ozlabs.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libhugetlbfs/}
 
 PKG_CFLINE_LIBHUGETLBFS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_ARCH_DEPENDS:=	x86 x86_64 arm
+PKG_ARCH_DEPENDS:=	x86 x86_64
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/libmpdclient/Makefile b/package/libmpdclient/Makefile
index 960dc668b..a7f6b9303 100644
--- a/package/libmpdclient/Makefile
+++ b/package/libmpdclient/Makefile
@@ -15,11 +15,12 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 PKG_SUBPKGS:=		LIBMPDCLIENT LIBMPDCLIENT_DEV
 PKGSD_LIBMPDCLIENT_DEV:=headers for interfacing MPD
 PKGSC_LIBMPDCLIENT_DEV:=devel
+PKGSS_LIBMPDCLIENT_DEV:=libmpdclient
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBMPDCLIENT,libmpdclient,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBMPDCLIENT_DEV,libmpdclient-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMPDCLIENT_DEV},${PKGSC_LIBMPDCLIENT_DEV}))
+$(eval $(call PKG_template,LIBMPDCLIENT_DEV,libmpdclient-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_LIBMPDCLIENT_DEV},${PKGSD_LIBMPDCLIENT_DEV},${PKGSC_LIBMPDCLIENT_DEV}))
 
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 
diff --git a/package/libtheora/Makefile b/package/libtheora/Makefile
new file mode 100644
index 000000000..328307941
--- /dev/null
+++ b/package/libtheora/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libtheora
+PKG_VERSION:=		1.1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		292ab65cedd5021d6b7ddd117e07cd8e
+PKG_DESCR:=		Theora video codec
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		libsdl libogg libvorbis
+PKG_BUILDDEP:=		sdl libogg libvorbis
+PKG_URL:=		http://www.theora.org/
+PKG_SITES:=		http://downloads.xiph.org/releases/theora/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBTHEORA,libtheora,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libtheora-install:
+	$(INSTALL_DIR) $(IDIR_LIBTHEORA)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libtheora*.so* \
+		$(IDIR_LIBTHEORA)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtheora/patches/patch-Makefile_in b/package/libtheora/patches/patch-Makefile_in
new file mode 100644
index 000000000..41162985c
--- /dev/null
+++ b/package/libtheora/patches/patch-Makefile_in
@@ -0,0 +1,20 @@
+--- libtheora-1.1.1.orig/Makefile.in	2009-10-01 20:04:07.000000000 +0200
++++ libtheora-1.1.1/Makefile.in	2011-09-18 18:38:53.551740404 +0200
+@@ -164,7 +164,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip 
+ @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples
+ @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = 
+ 
+-SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR)
++SUBDIRS = lib include m4 $(EXAMPLES_DIR)
+ 
+ # we include the whole debian/ dir in EXTRA_DIST because there's a problem
+ # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
+@@ -200,7 +200,7 @@ DIST_COMMON = README AUTHORS COPYING Mak
+ 	missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \
+ 	theoradec-uninstalled.pc.in theoradec.pc.in \
+ 	theoraenc-uninstalled.pc.in theoraenc.pc.in
+-DIST_SUBDIRS = lib include doc tests m4 examples
++DIST_SUBDIRS = lib include m4 examples
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
new file mode 100644
index 000000000..243cca04f
--- /dev/null
+++ b/package/libvpx/Makefile
@@ -0,0 +1,80 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libvpx
+PKG_VERSION:=		0.9.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		bd888cffde8d9c3061c7fd719b0cd4ce
+PKG_DESCR:=		VP8 codec library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.webmproject.org/about/
+PKG_SITES:=		http://webm.googlecode.com/files/
+
+PKG_SYSTEM_DEPENDS:=	sharp-zaurus ibm-x40 lemote-yeelong
+
+DISTFILES:=             ${PKG_NAME}-v${PKG_VERSION}-p1.tar.bz2
+WRKDIST=		$(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}-p1
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBVPX,libvpx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		minimal
+ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
+CONFIGURE_ARGS+=	--target=armv5te-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
+CONFIGURE_ARGS+=	--target=armv5te-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_INTEL_ATOM),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_WRAP),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_ALIX1C),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2),y)
+CONFIGURE_ARGS+=	--target=x86-linux-gcc --as=yasm
+endif
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB4XX),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+ifeq ($(ADK_TARGET_SYSTEM_BROADCOM_BCM47XX),y)
+CONFIGURE_ARGS+=	--target=mips32-linux-gcc
+endif
+CONFIGURE_ARGS+=	--prefix=/usr \
+			--disable-install-docs \
+			--disable-install-bins \
+			--enable-install-libs \
+			--disable-examples \
+			--enable-shared
+ALL_TARGET:=
+
+libvpx-install:
+	$(INSTALL_DIR) $(IDIR_LIBVPX)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libvpx.so* \
+		$(IDIR_LIBVPX)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libvpx/patches/patch-build_make_Makefile b/package/libvpx/patches/patch-build_make_Makefile
new file mode 100644
index 000000000..e1a6d5fa8
--- /dev/null
+++ b/package/libvpx/patches/patch-build_make_Makefile
@@ -0,0 +1,24 @@
+--- libvpx-v0.9.7-p1.orig/build/make/Makefile	2011-08-15 23:02:45.000000000 +0200
++++ libvpx-v0.9.7-p1/build/make/Makefile	2011-09-17 18:03:25.467990966 +0200
+@@ -193,8 +193,8 @@ endif
+ define linker_template
+ $(1): $(filter-out -%,$(2))
+ $(1):
+-	$(if $(quiet),@echo    "    [LD] $$@")
+-	$(qexec)$$(LD) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
++	$(if $(quiet),@echo    "    [CC] $$@")
++	$(qexec)$$(CC) $$(strip $$(INTERNAL_LDFLAGS) $$(LDFLAGS) -o $$@ $(2) $(3) $$(extralibs))
+ endef
+ # make-3.80 has a bug with expanding large input strings to the eval function,
+ # which was triggered in some cases by the following component of
+@@ -227,8 +227,8 @@ define so_template
+ #
+ # This needs further abstraction for dealing with non-GNU linkers.
+ $(1):
+-	$(if $(quiet),@echo "    [LD] $$@")
+-	$(qexec)$$(LD) -shared $$(LDFLAGS) \
++	$(if $(quiet),@echo "    [CC] $$@")
++	$(qexec)$$(CC) -shared $$(LDFLAGS) \
+             -Wl,--no-undefined -Wl,-soname,$$(SONAME) \
+             -Wl,--version-script,$$(SO_VERSION_SCRIPT) -o $$@ \
+             $$(filter %.o,$$?) $$(extralibs)
diff --git a/package/libvpx/patches/patch-build_make_configure_sh b/package/libvpx/patches/patch-build_make_configure_sh
new file mode 100644
index 000000000..42ab9785a
--- /dev/null
+++ b/package/libvpx/patches/patch-build_make_configure_sh
@@ -0,0 +1,11 @@
+--- libvpx-v0.9.7-p1.orig/build/make/configure.sh	2011-08-15 23:02:45.000000000 +0200
++++ libvpx-v0.9.7-p1/build/make/configure.sh	2011-09-17 17:48:07.667986440 +0200
+@@ -287,7 +287,7 @@ check_cpp() {
+ check_ld() {
+     log check_ld "$@"
+     check_cc $@ \
+-        && check_cmd ${LD} ${LDFLAGS} "$@" -o ${TMP_X} ${TMP_O} ${extralibs}
++        && check_cmd ${CC} ${LDFLAGS} "$@" -o ${TMP_X} ${TMP_O} ${extralibs}
+ }
+ 
+ check_header(){
diff --git a/package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c b/package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c
new file mode 100644
index 000000000..1a5757a9a
--- /dev/null
+++ b/package/libvpx/patches/patch-vp8_common_arm_bilinearfilter_arm_c
@@ -0,0 +1,15 @@
+--- libvpx-v0.9.7-p1.orig/vp8/common/arm/bilinearfilter_arm.c	2011-08-15 23:02:45.000000000 +0200
++++ libvpx-v0.9.7-p1/vp8/common/arm/bilinearfilter_arm.c	2011-09-17 18:14:27.977994106 +0200
+@@ -29,10 +29,10 @@ void vp8_filter_block2d_bil_armv6
+     unsigned short FData[36*16]; /* Temp data buffer used in filtering */
+ 
+     /* First filter 1-D horizontally... */
+-    vp8_filter_block2d_bil_first_pass_armv6(src_ptr, FData, src_pitch, Height + 1, Width, HFilter);
++    //vp8_filter_block2d_bil_first_pass_armv6(src_ptr, FData, src_pitch, Height + 1, Width, HFilter);
+ 
+     /* then 1-D vertically... */
+-    vp8_filter_block2d_bil_second_pass_armv6(FData, dst_ptr, dst_pitch, Height, Width, VFilter);
++    //vp8_filter_block2d_bil_second_pass_armv6(FData, dst_ptr, dst_pitch, Height, Width, VFilter);
+ }
+ 
+ 
diff --git a/package/libvpx/patches/patch-vp8_vp8cx_arm_mk b/package/libvpx/patches/patch-vp8_vp8cx_arm_mk
new file mode 100644
index 000000000..9c170c84f
--- /dev/null
+++ b/package/libvpx/patches/patch-vp8_vp8cx_arm_mk
@@ -0,0 +1,11 @@
+--- libvpx-v0.9.7-p1.orig/vp8/vp8cx_arm.mk	2011-08-15 23:02:45.000000000 +0200
++++ libvpx-v0.9.7-p1/vp8/vp8cx_arm.mk	2011-09-17 18:09:12.317990227 +0200
+@@ -18,7 +18,7 @@ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/
+ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/dct_arm.c
+ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/dct_arm.h
+ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/encodemb_arm.h
+-VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/picklpf_arm.c
++VP8_CX_SRCS-$(HAVE_ARMV7)  += encoder/arm/picklpf_arm.c
+ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/quantize_arm.c
+ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/quantize_arm.h
+ VP8_CX_SRCS-$(ARCH_ARM)  += encoder/arm/variance_arm.c
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index b82a80281..b4306c66d 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxslt
 PKG_VERSION:=		1.1.24
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		e83ec5d27fc4c10c6f612879bea9a153
 PKG_DESCR:=		XSLT Library
 PKG_SECTION:=		libs
@@ -42,7 +42,8 @@ xsltproc-install:
 
 libxslt-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib?xslt.so* ${IDIR_LIBXSLT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libexslt.so* ${IDIR_LIBXSLT}/usr/lib
 
 libxslt-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT_DEV}/usr/include
diff --git a/package/llvm/Makefile b/package/llvm/Makefile
index 0dfd2d3ec..1ac7c3a10 100644
--- a/package/llvm/Makefile
+++ b/package/llvm/Makefile
@@ -14,6 +14,7 @@ PKG_SITES:=		http://llvm.org/releases/2.9/
 
 PKG_CFLINE_LLVM:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	mips x86 x86_64
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tgz
 
diff --git a/package/lm_sensors/Makefile b/package/lm_sensors/Makefile
new file mode 100644
index 000000000..0f6ba7130
--- /dev/null
+++ b/package/lm_sensors/Makefile
@@ -0,0 +1,59 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		lm_sensors
+PKG_VERSION:=		3.3.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8c0eebda8524fc87da1393b4564d279b
+PKG_DESCR:=		linux hw sensor toolset
+PKG_SECTION:=		misc
+PKG_DEPENDS:=		sysfsutils
+PKG_URL:=		http://www.lm-sensors.org
+PKG_SITES:=		http://dl.lm-sensors.org/lm-sensors/releases/
+
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+PKG_ARCH_DEPENDS:=	x86 x86_64
+
+PKG_SUBPKGS:=		LM_SENSORS LM_SENSORS_DEV LM_SENSORS_DETECT
+PKGSD_LM_SENSORS_DEV:=		lm_sensors header files
+PKGSC_LM_SENSORS_DEV:=		devel
+PKGSD_LM_SENSORS_DETECT:=	lm_sensors perl scripts (e.g. sensors-detect)
+PKGSC_LM_SENSORS_DETECT:=	misc
+PKGSS_LM_SENSORS_DETECT:=	perl
+PKGSB_LM_SENSORS_DETECT:=	perl
+
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LM_SENSORS,lm-sensors,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LM_SENSORS_DEV,lm-sensors-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DEV},${PKGSC_LM_SENSORS_DEV}))
+$(eval $(call PKG_template,LM_SENSORS_DETECT,lm-sensors-detect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LM_SENSORS_DETECT},${PKGSC_LM_SENSORS_DETECT}))
+
+CONFIG_STYLE:=		manual
+ALL_TARGET:=		user
+TARGET_LDFLAGS+=	-liconv
+
+lm-sensors-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libsensors.so* ${IDIR_LM_SENSORS}/usr/lib
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/etc
+	${CP} ${WRKINST}/etc/sensors3.conf ${IDIR_LM_SENSORS}/etc
+
+lm-sensors-dev-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+	${CP} ${WRKINST}/usr/include/sensors/*.h ${IDIR_LM_SENSORS_DEV}/usr/include/sensors
+
+lm-sensors-detect-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS_DETECT}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lm_sensors/patches/patch-Makefile b/package/lm_sensors/patches/patch-Makefile
new file mode 100644
index 000000000..223321ada
--- /dev/null
+++ b/package/lm_sensors/patches/patch-Makefile
@@ -0,0 +1,15 @@
+--- lm_sensors-3.3.1.orig/Makefile	2010-10-26 15:24:12.000000000 +0200
++++ lm_sensors-3.3.1/Makefile	2011-09-18 19:09:30.217984317 +0200
+@@ -42,10 +42,10 @@ DEBUG := 0
+ DESTDIR :=
+ 
+ # This is the prefix that will be used for almost all directories below.
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ # Your C compiler
+-CC := gcc
++CC ?= gcc
+ 
+ # This is the directory where sensors3.conf will be installed, if no other
+ # configuration file is found
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
new file mode 100644
index 000000000..ffc5b6fe5
--- /dev/null
+++ b/package/log4cxx/Makefile
@@ -0,0 +1,40 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		log4cxx
+PKG_VERSION:=		0.10.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b30ffb8da3665178e68940ff7a61084c
+PKG_DESCR:=		Apache logging framework for C++
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		apr apr-util
+PKG_BUILDDEP:=		apr apr-util
+PKG_URL:=		http://logging.apache.org/log4cxx/
+PKG_SITES:=		http://www.apache.org/dist/logging/log4cxx/0.10.0/
+
+DISTFILES:=		apache-${PKG_NAME}-${PKG_VERSION}.tar.gz
+WRKDIST=		${WRKDIR}/apache-${PKG_NAME}-${PKG_VERSION}
+
+PKG_ARCH_DEPENDS:=	!cris
+
+PKG_SUBPKGS:=		LOG4CXX LOG4CXX_DEV
+PKGSD_LOG4CXX_DEV:=	log4cxx development headers
+PKGSC_LOG4CXX_DEV:=	devel
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LOG4CXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LOG4CXX_DEV,${PKG_NAME}_dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LOG4CXX_DEV},${PKGSC_LOG4CXX_DEV}))
+
+log4cxx-install:
+	${INSTALL_DIR} ${IDIR_LOG4CXX}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.a ${IDIR_LOG4CXX}/usr/lib
+	${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_LOG4CXX}/usr/lib
+
+log4cxx_dev-install:
+	${INSTALL_DIR} ${IDIR_LOG4CXX_DEV}/usr/include
+	${CP} ${WRKINST}/usr/include/* ${IDIR_LOG4CXX_DEV}/usr/include
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/patches/patch-src_Makefile_am b/package/log4cxx/patches/patch-src_Makefile_am
new file mode 100644
index 000000000..339a18eeb
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_Makefile_am
@@ -0,0 +1,8 @@
+--- apache-log4cxx-0.10.0.orig/src/Makefile.am	2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/Makefile.am	2011-09-08 09:41:19.679507959 +0200
+@@ -13,4 +13,4 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main
diff --git a/package/log4cxx/patches/patch-src_Makefile_in b/package/log4cxx/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..da14caed3
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- apache-log4cxx-0.10.0.orig/src/Makefile.in	2008-04-01 00:44:12.000000000 +0200
++++ apache-log4cxx-0.10.0/src/Makefile.in	2011-09-08 10:16:06.139506556 +0200
+@@ -209,7 +209,7 @@ target_vendor = @target_vendor@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ #
+-SUBDIRS = main examples site test
++SUBDIRS = main
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/package/log4cxx/patches/patch-src_examples_cpp_console_cpp b/package/log4cxx/patches/patch-src_examples_cpp_console_cpp
new file mode 100644
index 000000000..da948e211
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_examples_cpp_console_cpp
@@ -0,0 +1,11 @@
+--- apache-log4cxx-0.10.0.orig/src/examples/cpp/console.cpp	2008-04-01 00:34:52.000000000 +0200
++++ apache-log4cxx-0.10.0/src/examples/cpp/console.cpp	2011-09-08 09:33:04.799508250 +0200
+@@ -16,6 +16,8 @@
+  */
+ 
+ #include <stdlib.h>
++#include <stdio.h>
++#include <string.h>
+ #include <log4cxx/logger.h>
+ #include <log4cxx/consoleappender.h>
+ #include <log4cxx/simplelayout.h>
diff --git a/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp b/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp
new file mode 100644
index 000000000..3768a2f6b
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_main_cpp_inputstreamreader_cpp
@@ -0,0 +1,10 @@
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/inputstreamreader.cpp	2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/inputstreamreader.cpp	2011-09-08 09:33:04.799508250 +0200
+@@ -20,6 +20,7 @@
+ #include <log4cxx/helpers/exception.h>
+ #include <log4cxx/helpers/pool.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp b/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp
new file mode 100644
index 000000000..bc19643b2
--- /dev/null
+++ b/package/log4cxx/patches/patch-src_main_cpp_socketoutputstream_cpp
@@ -0,0 +1,10 @@
+--- apache-log4cxx-0.10.0.orig/src/main/cpp/socketoutputstream.cpp	2008-04-01 00:34:09.000000000 +0200
++++ apache-log4cxx-0.10.0/src/main/cpp/socketoutputstream.cpp	2011-09-08 09:33:04.799508250 +0200
+@@ -19,6 +19,7 @@
+ #include <log4cxx/helpers/socketoutputstream.h>
+ #include <log4cxx/helpers/socket.h>
+ #include <log4cxx/helpers/bytebuffer.h>
++#include <string.h>
+ 
+ using namespace log4cxx;
+ using namespace log4cxx::helpers;
diff --git a/package/lsscsi/Makefile b/package/lsscsi/Makefile
new file mode 100644
index 000000000..3a8cd740d
--- /dev/null
+++ b/package/lsscsi/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		lsscsi
+PKG_VERSION:=		0.25
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c4e36b106624aff78527c54cf08ecbfe
+PKG_DESCR:=		list SCSI devices
+PKG_SECTION:=		utils
+PKG_URL:=		http://sg.danny.cz/scsi/lsscsi.html
+PKG_SITES:=		http://sg.danny.cz/scsi/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tgz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LSSCSI,lsscsi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+lsscsi-install:
+	$(INSTALL_DIR) $(IDIR_LSSCSI)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/lsscsi \
+		$(IDIR_LSSCSI)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 7e45410ce..2ce5d2072 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2dd0cb6481d77fda09c58ec3154a21c0
 PKG_DESCR:=		console music player
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg libiconv
+PKG_DEPENDS:=		libmad libvorbis libcurl libflac libiconv
 PKG_DEPENDS+=		libncurses libid3tag
-PKG_BUILDDEP:=		ncurses libvorbis curl libmad flac ffmpeg libiconv
+PKG_BUILDDEP:=		ncurses libvorbis curl libmad flac libiconv
 PKG_BUILDDEP+=		libid3tag
 PKG_URL:=		http://moc.daper.net/
 PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/unstable/
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=	--without-jack \
 			--without-oss \
 			--without-musepack \
 			--without-speex \
+			--without-ffmpeg \
 			--without-sndfile
 
 post-install:
diff --git a/package/motion/Makefile b/package/motion/Makefile
index 605e61b55..a31fe129e 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -4,9 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		motion
-PKG_VERSION:=		3.2.12
+# actually a svn version from 18.09.2011 checkout
+PKG_VERSION:=		4.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1ba0065ed50509aaffb171594c689f46
+PKG_MD5SUM:=		6b8730c875e0f550c1abdb647027d8e1
 PKG_DESCR:=		Webcam motion sensing and logging
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libjpeg libpthread
@@ -22,11 +23,13 @@ CONFIGURE_ARGS+=	--without-ffmpeg \
 			--without-jpeg-mmx \
 			--without-optimizecpu \
 			--without-mysql \
+			--without-sqlite \
 			--without-pgsql \
-			--without-v4l
+			--with-v4l
 
 post-install:
-	${INSTALL_DIR} ${IDIR_MOTION}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/motion ${IDIR_MOTION}/usr/bin/
+	${INSTALL_DIR} ${IDIR_MOTION}/etc ${IDIR_MOTION}/usr/bin
+	$(INSTALL_DATA) ./files/motion.conf ${IDIR_MOTION}/etc
+	${INSTALL_BIN} ${WRKINST}/usr/bin/motion ${IDIR_MOTION}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/motion/files/motion.conf b/package/motion/files/motion.conf
new file mode 100755
index 000000000..54e8eb86a
--- /dev/null
+++ b/package/motion/files/motion.conf
@@ -0,0 +1,717 @@
+# Rename this distribution example file to motion.conf
+#
+# This config file was generated by motion trunkREV528
+
+
+############################################################
+# Daemon
+############################################################
+
+# Start in daemon (background) mode and release terminal (default: off)
+daemon on
+
+# File to store the process ID, also called pid file. (default: not defined)
+process_id_file /var/run/motion.pid
+
+############################################################
+# Basic Setup Mode
+############################################################
+
+# Start in Setup-Mode, daemon disabled. (default: off)
+setup_mode off
+
+
+# Use a file to save logs messages, if not defined stderr and syslog is used. (default: not defined)
+;logfile /tmp/motion.log
+
+# Level of log messages [1..9] (EMR, ALR, CRT, ERR, WRN, NTC, ERR, DBG, ALL). (default: 6 / NTC)
+log_level 6
+
+# Filter to log messages by type (STR, ENC, NET, DBL, EVT, TRK, VID, ALL). (default: ALL)
+log_type all
+
+###########################################################
+# Capture device options
+############################################################
+
+# Videodevice to be used for capturing  (default /dev/video0)
+# for FreeBSD default is /dev/bktr0
+videodevice /dev/video0
+
+# v4l2_palette allows to choose preferable palette to be use by motion
+# to capture from those supported by your videodevice. (default: 17)
+# E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and
+# V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG.
+# Setting v4l2_palette to 2 forces motion to use V4L2_PIX_FMT_SBGGR8
+# instead.
+#
+# Values :
+# V4L2_PIX_FMT_SN9C10X : 0  'S910'
+# V4L2_PIX_FMT_SBGGR16 : 1  'BYR2'
+# V4L2_PIX_FMT_SBGGR8  : 2  'BA81'
+# V4L2_PIX_FMT_SPCA561 : 3  'S561'
+# V4L2_PIX_FMT_SGBRG8  : 4  'GBRG'
+# V4L2_PIX_FMT_SGRBG8  : 5  'GRBG'
+# V4L2_PIX_FMT_PAC207  : 6  'P207'
+# V4L2_PIX_FMT_PJPG    : 7  'PJPG'
+# V4L2_PIX_FMT_MJPEG   : 8  'MJPEG'
+# V4L2_PIX_FMT_JPEG    : 9  'JPEG'
+# V4L2_PIX_FMT_RGB24   : 10 'RGB3'
+# V4L2_PIX_FMT_SPCA501 : 11 'S501'
+# V4L2_PIX_FMT_SPCA505 : 12 'S505'
+# V4L2_PIX_FMT_SPCA508 : 13 'S508'
+# V4L2_PIX_FMT_UYVY    : 14 'UYVY'
+# V4L2_PIX_FMT_YUYV    : 15 'YUYV'
+# V4L2_PIX_FMT_YUV422P : 16 '422P'
+# V4L2_PIX_FMT_YUV420  : 17 'YU12'
+#
+v4l2_palette 17
+
+# Tuner device to be used for capturing using tuner as source (default /dev/tuner0)
+# This is ONLY used for FreeBSD. Leave it commented out for Linux
+; tunerdevice /dev/tuner0
+
+# The video input to be used (default: -1)
+# Should normally be set to 0 or 1 for video/TV cards, and -1 for USB cameras
+input -1
+
+# The video norm to use (only for video capture and TV tuner cards)
+# Values: 0 (PAL), 1 (NTSC), 2 (SECAM), 3 (PAL NC no colour). Default: 0 (PAL)
+norm 0
+
+# The frequency to set the tuner to (kHz) (only for TV tuner cards) (default: 0)
+frequency 0
+
+# Rotate image this number of degrees. The rotation affects all saved images as
+# well as movies. Valid values: 0 (default = no rotation), 90, 180 and 270.
+rotate 0
+
+# Image width (pixels). Valid range: Camera dependent, default: 352
+width 320
+
+# Image height (pixels). Valid range: Camera dependent, default: 288
+height 240
+
+# Maximum number of frames to be captured per second.
+# Valid range: 2-100. Default: 100 (almost no limit).
+framerate 2
+
+# Minimum time in seconds between capturing picture frames from the camera.
+# Default: 0 = disabled - the capture rate is given by the camera framerate.
+# This option is used when you want to capture images at a rate lower than 2 per second.
+minimum_frame_time 0
+
+# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// or file:///)
+# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. Default: Not defined
+; netcam_url value
+
+# Username and password for network camera (only if required). Default: not defined
+# Syntax is user:password
+; netcam_userpass value
+
+# The setting for keep-alive of network socket, should improve performance on compatible net cameras.
+# off:   The historical implementation using HTTP/1.0, closing the socket after each http request.
+# force: Use HTTP/1.0 requests with keep alive header to reuse the same connection.
+# on:    Use HTTP/1.1 requests that support keep alive as default.
+# Default: off
+netcam_keepalive off
+
+# URL to use for a netcam proxy server, if required, e.g. "http://myproxy".
+# If a port number other than 80 is needed, use "http://myproxy:1234".
+# Default: not defined
+; netcam_proxy value
+
+# Set less strict jpeg checks for network cameras with a poor/buggy firmware.
+# Default: off
+netcam_tolerant_check off
+
+# Let motion regulate the brightness of a video device (default: off).
+# The auto_brightness feature uses the brightness option as its target value.
+# If brightness is zero auto_brightness will adjust to average brightness value 128.
+# Only recommended for cameras without auto brightness
+auto_brightness off
+
+# Set the initial brightness of a video device.
+# If auto_brightness is enabled, this value defines the average brightness level
+# which Motion will try and adjust to.
+# Valid range 0-255, default 0 = disabled
+brightness 0
+
+# Set the contrast of a video device.
+# Valid range 0-255, default 0 = disabled
+contrast 0
+
+# Set the saturation of a video device.
+# Valid range 0-255, default 0 = disabled
+saturation 0
+
+# Set the hue of a video device (NTSC feature).
+# Valid range 0-255, default 0 = disabled
+hue 0
+
+
+############################################################
+# Round Robin (multiple inputs on same video device name)
+############################################################
+
+# Number of frames to capture in each roundrobin step (default: 1)
+roundrobin_frames 1
+
+# Number of frames to skip before each roundrobin step (default: 1)
+roundrobin_skip 1
+
+# Try to filter out noise generated by roundrobin (default: off)
+switchfilter off
+
+
+############################################################
+# Motion Detection Settings:
+############################################################
+
+# Threshold for number of changed pixels in an image that
+# triggers motion detection (default: 1500)
+threshold 1500
+
+# Automatically tune the threshold down if possible (default: off)
+threshold_tune off
+
+# Noise threshold for the motion detection (default: 32)
+noise_level 32
+
+# Automatically tune the noise threshold (default: on)
+noise_tune on
+
+# Despeckle motion image using (e)rode or (d)ilate or (l)abel (Default: not defined)
+# Recommended value is EedDl. Any combination (and number of) of E, e, d, and D is valid.
+# (l)abeling must only be used once and the 'l' must be the last letter.
+# Comment out to disable
+despeckle_filter EedDl
+
+# Detect motion in predefined areas (1 - 9). Areas are numbered like that:  1 2 3
+# A script (on_area_detected) is started immediately when motion is         4 5 6
+# detected in one of the given areas, but only once during an event.        7 8 9
+# One or more areas can be specified with this option. (Default: not defined)
+; area_detect value
+
+# PGM file to use as a sensitivity mask.
+# Full path name to. (Default: not defined)
+; mask_file value
+
+# Dynamically create a mask file during operation (default: 0)
+# Adjust speed of mask changes from 0 (off) to 10 (fast)
+smart_mask_speed 0
+
+# Ignore sudden massive light intensity changes given as a percentage of the picture
+# area that changed intensity. Valid range: 0 - 100 , default: 0 = disabled
+lightswitch 0
+
+# Picture frames must contain motion at least the specified number of frames
+# in a row before they are detected as true motion. At the default of 1, all
+# motion is detected. Valid range: 1 to thousands, recommended 1-5
+minimum_motion_frames 1
+
+# Specifies the number of pre-captured (buffered) pictures from before motion
+# was detected that will be output at motion detection.
+# Recommended range: 0 to 5 (default: 0)
+# Do not use large values! Large values will cause Motion to skip video frames and
+# cause unsmooth movies. To smooth movies use larger values of post_capture instead.
+pre_capture 0
+
+# Number of frames to capture after motion is no longer detected (default: 0)
+post_capture 0
+
+# Event Gap is the seconds of no motion detection that triggers the end of an event
+# An event is defined as a series of motion images taken within a short timeframe.
+# Recommended value is 60 seconds (Default). A value of 0 allows to generate 'gapless'
+# movies - an event ends right after post_capture if any. The value -1 is allowed and
+# disables events causing all Motion to be written to one single movie file and no
+# pre_capture.
+event_gap 60
+
+# Maximum length in seconds of a movie
+# When value is exceeded a new movie file is created. (Default: 0 = infinite)
+max_movie_time 0
+
+# Always save images even if there was no motion (default: off)
+emulate_motion off
+
+
+############################################################
+# Image File Output
+############################################################
+
+# Output 'normal' pictures when motion is detected (default: on)
+# Valid values: on, off, first, best, center
+# When set to 'first', only the first picture of an event is saved.
+# Picture with most motion of an event is saved when set to 'best'.
+# Picture with motion nearest center of picture is saved when set to 'center'.
+# Can be used as preview shot for the corresponding movie.
+output_pictures on
+
+# Output pictures with only the pixels moving object (ghost images) (default: off)
+output_debug_pictures off
+
+# The quality (in percent) to be used by the jpeg compression (default: 75)
+quality 75
+
+# Type of output images
+# Valid values: jpeg, ppm (default: jpeg)
+picture_type jpeg
+
+############################################################
+# FFMPEG related options
+# Film (movies) file output, and deinterlacing of the video input
+# The options movie_filename and timelapse_filename are also used
+# by the ffmpeg feature
+############################################################
+
+# Use ffmpeg to encode movies in realtime (default: off)
+#ffmpeg_output_movies on
+
+# Use ffmpeg to make movies with only the pixels moving
+# object (ghost images) (default: off)
+#ffmpeg_output_debug_movies off
+
+# Use ffmpeg to encode a timelapse movie
+# Default value 0 = off - else save frame every Nth second
+#ffmpeg_timelapse 0
+
+# The file rollover mode of the timelapse video
+# Valid values: hourly, daily (default), weekly-sunday, weekly-monday, monthly, manual
+#ffmpeg_timelapse_mode daily
+
+# Bitrate to be used by the ffmpeg encoder (default: 400000)
+# This option is ignored if ffmpeg_variable_bitrate is not 0 (disabled)
+#ffmpeg_bps 500000
+
+# Enables and defines variable bitrate for the ffmpeg encoder.
+# ffmpeg_bps is ignored if variable bitrate is enabled.
+# Valid values: 0 (default) = fixed bitrate defined by ffmpeg_bps,
+# or the range 2 - 31 where 2 means best quality and 31 is worst.
+#ffmpeg_variable_bitrate 0
+
+# Codec to used by ffmpeg for the video compression.
+# Timelapse mpegs are always made in mpeg1 format independent from this option.
+# Supported formats are: mpeg1 (ffmpeg-0.4.8 only), mpeg4 (default), and msmpeg4.
+# mpeg1 - gives you files with extension .mpg
+# mpeg4 or msmpeg4 - gives you files with extension .avi
+# msmpeg4 is recommended for use with Windows Media Player because
+# it requires no installation of codec on the Windows client.
+# swf - gives you a flash film with extension .swf
+# flv - gives you a flash video with extension .flv
+# ffv1 - FF video codec 1 for Lossless Encoding ( experimental )
+# mov - QuickTime ( testing )
+#ffmpeg_video_codec mpeg4
+
+# Use ffmpeg to deinterlace video. Necessary if you use an analog camera
+# and see horizontal combing on moving objects in video or pictures.
+# (default: off)
+#ffmpeg_deinterlace off
+
+############################################################
+# SDL Window
+############################################################
+
+# Number of motion thread to show in SDL Window (default: 0 = disabled)
+sdl_threadnr 0
+
+############################################################
+# External pipe to video encoder
+# Replacement for FFMPEG builtin encoder for ffmpeg_output_movies only.
+# The options movie_filename and timelapse_filename are also used
+# by the ffmpeg feature
+#############################################################
+
+# Bool to enable or disable extpipe (default: off)
+use_extpipe off
+
+# External program (full path and opts) to pipe raw video to
+# Generally, use '-' for STDIN...
+;extpipe mencoder -demuxer rawvideo -rawvideo w=320:h=240:i420 -ovc x264 -x264encopts bframes=4:frameref=1:subq=1:scenecut=-1:nob_adapt:threads=1:keyint=1000:8x8dct:vbv_bufsize=4000:crf=24:partitions=i8x8,i4x4:vbv_maxrate=800:no-chroma-me -vf denoise3d=16:12:48:4,pp=lb -of   avi -o %f.avi - -fps %fps
+
+
+
+############################################################
+# Snapshots (Traditional Periodic Webcam File Output)
+############################################################
+
+# Make automated snapshot every N seconds (default: 0 = disabled)
+snapshot_interval 0
+
+
+############################################################
+# Text Display
+# %Y = year, %m = month, %d = date,
+# %H = hour, %M = minute, %S = second, %T = HH:MM:SS,
+# %v = event, %q = frame number, %t = thread (camera) number,
+# %D = changed pixels, %N = noise level, \n = new line,
+# %i and %J = width and height of motion area,
+# %K and %L = X and Y coordinates of motion center
+# %C = value defined by text_event - do not use with text_event!
+# You can put quotation marks around the text to allow
+# leading spaces
+############################################################
+
+# Locate and draw a box around the moving object.
+# Valid values: on, off, preview (default: off)
+# Set to 'preview' will only draw a box in preview_shot pictures.
+locate_motion_mode off
+
+# Set the look and style of the locate box if enabled.
+# Valid values: box, redbox, cross, redcross (default: box)
+# Set to 'box' will draw the traditional box.
+# Set to 'redbox' will draw a red box.
+# Set to 'cross' will draw a little cross to mark center.
+# Set to 'redcross' will draw a little red cross to mark center.
+locate_motion_style box
+
+# Draws the timestamp using same options as C function strftime(3)
+# Default: %Y-%m-%d\n%T = date in ISO format and time in 24 hour clock
+# Text is placed in lower right corner
+text_right %Y-%m-%d\n%T-%q
+
+# Draw a user defined text on the images using same options as C function strftime(3)
+# Default: Not defined = no text
+# Text is placed in lower left corner
+; text_left CAMERA %t
+
+# Draw the number of changed pixed on the images (default: off)
+# Will normally be set to off except when you setup and adjust the motion settings
+# Text is placed in upper right corner
+text_changes off
+
+# This option defines the value of the special event conversion specifier %C
+# You can use any conversion specifier in this option except %C. Date and time
+# values are from the timestamp of the first image in the current event.
+# Default: %Y%m%d%H%M%S
+# The idea is that %C can be used filenames and text_left/right for creating
+# a unique identifier for each event.
+text_event %Y%m%d%H%M%S
+
+# Draw characters at twice normal size on images. (default: off)
+text_double off
+
+
+############################################################
+# Target Directories and filenames For Images And Films
+# For the options snapshot_, picture_, movie_ and timelapse_filename
+# you can use conversion specifiers
+# %Y = year, %m = month, %d = date,
+# %H = hour, %M = minute, %S = second,
+# %v = event, %q = frame number, %t = thread (camera) number,
+# %D = changed pixels, %N = noise level,
+# %i and %J = width and height of motion area,
+# %K and %L = X and Y coordinates of motion center
+# %C = value defined by text_event
+# Quotation marks round string are allowed.
+############################################################
+
+# Target base directory for pictures and films
+# Recommended to use absolute path. (Default: current working directory)
+target_dir /tmp/cam1
+
+# File path for snapshots (jpeg or ppm) relative to target_dir
+# Default: %v-%Y%m%d%H%M%S-snapshot
+# Default value is equivalent to legacy oldlayout option
+# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-snapshot
+# File extension .jpg or .ppm is automatically added so do not include this.
+# Note: A symbolic link called lastsnap.jpg created in the target_dir will always
+# point to the latest snapshot, unless snapshot_filename is exactly 'lastsnap'
+snapshot_filename %v-%Y%m%d%H%M%S-snapshot
+
+# File path for motion triggered images (jpeg or ppm) relative to target_dir
+# Default: %v-%Y%m%d%H%M%S-%q
+# Default value is equivalent to legacy oldlayout option
+# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q
+# File extension .jpg or .ppm is automatically added so do not include this
+# Set to 'preview' together with best-preview feature enables special naming
+# convention for preview shots. See motion guide for details
+picture_filename %v-%Y%m%d%H%M%S-%q
+
+# File path for motion triggered ffmpeg films (movies) relative to target_dir
+# Default: %v-%Y%m%d%H%M%S
+# Default value is equivalent to legacy oldlayout option
+# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H%M%S
+# File extension .mpg or .avi is automatically added so do not include this
+# This option was previously called ffmpeg_filename
+#movie_filename %v-%Y%m%d%H%M%S
+
+# File path for timelapse movies relative to target_dir
+# Default: %Y%m%d-timelapse
+# Default value is near equivalent to legacy oldlayout option
+# For Motion 3.0 compatible mode choose: %Y/%m/%d-timelapse
+# File extension .mpg is automatically added so do not include this
+#timelapse_filename %Y%m%d-timelapse
+
+############################################################
+# Global Network Options
+############################################################
+# Enable or disable IPV6 for http control and stream (default: off )
+ipv6_enabled off
+
+############################################################
+# Live Stream Server
+############################################################
+
+# The mini-http server listens to this port for requests (default: 0 = disabled)
+stream_port 8081
+
+# Quality of the jpeg (in percent) images produced (default: 50)
+stream_quality 50
+
+# Output frames at 1 fps when no motion is detected and increase to the
+# rate given by stream_maxrate when motion is detected (default: off)
+stream_motion off
+
+# Maximum framerate for stream streams (default: 1)
+stream_maxrate 1
+
+# Restrict stream connections to localhost only (default: on)
+stream_localhost on
+
+# Limits the number of images per connection (default: 0 = unlimited)
+# Number can be defined by multiplying actual stream rate by desired number of seconds
+# Actual stream rate is the smallest of the numbers framerate and stream_maxrate
+stream_limit 0
+
+# Set the authentication method (default: 0)
+# 0 = disabled
+# 1 = Basic authentication
+# 2 = MD5 digest (the safer authentication)
+stream_auth_method 0
+
+# Authentication for the stream. Syntax username:password
+# Default: not defined (Disabled)
+; stream_authentication username:password
+
+
+############################################################
+# HTTP Based Control
+############################################################
+
+# TCP/IP port for the http server to listen on (default: 0 = disabled)
+webcontrol_port 8080
+
+# Restrict control connections to localhost only (default: on)
+webcontrol_localhost on
+
+# Output for http server, select off to choose raw text plain (default: on)
+webcontrol_html_output on
+
+# Authentication for the http based control. Syntax username:password
+# Default: not defined (Disabled)
+; webcontrol_authentication username:password
+
+
+############################################################
+# Tracking (Pan/Tilt)
+#############################################################
+
+# Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic, 5=uvcvideo, 6=servo)
+# The generic type enables the definition of motion center and motion size to
+# be used with the conversion specifiers for options like on_motion_detected
+track_type 0
+
+# Enable auto tracking (default: off)
+track_auto off
+
+# Serial port of motor (default: none)
+;track_port /dev/ttyS0
+
+# Motor number for x-axis (default: 0)
+;track_motorx 0
+
+# Set motorx reverse (default: 0)
+;track_motorx_reverse 0
+
+# Motor number for y-axis (default: 0)
+;track_motory 1
+
+# Set motory reverse (default: 0)
+;track_motory_reverse 0
+
+# Maximum value on x-axis (default: 0)
+;track_maxx 200
+
+# Minimum value on x-axis (default: 0)
+;track_minx 50
+
+# Maximum value on y-axis (default: 0)
+;track_maxy 200
+
+# Minimum value on y-axis (default: 0)
+;track_miny 50
+
+# Center value on x-axis (default: 0)
+;track_homex 128
+
+# Center value on y-axis (default: 0)
+;track_homey 128
+
+# ID of an iomojo camera if used (default: 0)
+track_iomojo_id 0
+
+# Angle in degrees the camera moves per step on the X-axis
+# with auto-track (default: 10)
+# Currently only used with pwc type cameras
+track_step_angle_x 10
+
+# Angle in degrees the camera moves per step on the Y-axis
+# with auto-track (default: 10)
+# Currently only used with pwc type cameras
+track_step_angle_y 10
+
+# Delay to wait for after tracking movement as number
+# of picture frames (default: 10)
+track_move_wait 10
+
+# Speed to set the motor to (stepper motor option) (default: 255)
+track_speed 255
+
+# Number of steps to make (stepper motor option) (default: 40)
+track_stepsize 40
+
+
+############################################################
+# External Commands, Warnings and Logging:
+# You can use conversion specifiers for the on_xxxx commands
+# %Y = year, %m = month, %d = date,
+# %H = hour, %M = minute, %S = second,
+# %v = event, %q = frame number, %t = thread (camera) number,
+# %D = changed pixels, %N = noise level,
+# %i and %J = width and height of motion area,
+# %K and %L = X and Y coordinates of motion center
+# %C = value defined by text_event
+# %f = filename with full path
+# %n = number indicating filetype
+# Both %f and %n are only defined for on_picture_save,
+# on_movie_start and on_movie_end
+# Quotation marks round string are allowed.
+############################################################
+
+# Do not sound beeps when detecting motion (default: on)
+# Note: Motion never beeps when running in daemon mode.
+quiet on
+
+# Command to be executed when an event starts. (default: none)
+# An event starts at first motion detected after a period of no motion defined by event_gap
+; on_event_start value
+
+# Command to be executed when an event ends after a period of no motion
+# (default: none). The period of no motion is defined by option event_gap.
+; on_event_end value
+
+# Command to be executed when a picture (.ppm|.jpg) is saved (default: none)
+# To give the filename as an argument to a command append it with %f
+; on_picture_save value
+
+# Command to be executed when a motion frame is detected (default: none)
+; on_motion_detected value
+
+# Command to be executed when motion in a predefined area is detected
+# Check option 'area_detect'.   (default: none)
+; on_area_detected value
+
+# Command to be executed when a movie file (.mpg|.avi) is created. (default: none)
+# To give the filename as an argument to a command append it with %f
+; on_movie_start value
+
+# Command to be executed when a movie file (.mpg|.avi) is closed. (default: none)
+# To give the filename as an argument to a command append it with %f
+; on_movie_end value
+
+# Command to be executed when a camera can't be opened or if it is lost
+# NOTE: There is situations when motion don't detect a lost camera!
+# It depends on the driver, some drivers dosn't detect a lost camera at all
+# Some hangs the motion thread. Some even hangs the PC! (default: none)
+; on_camera_lost value
+
+#####################################################################
+# Common Options for database features.
+# Options require database options to be active also.
+#####################################################################
+
+# Log to the database when creating motion triggered picture file  (default: on)
+; sql_log_picture on
+
+# Log to the database when creating a snapshot image file (default: on)
+; sql_log_snapshot on
+
+# Log to the database when creating motion triggered movie file (default: off)
+; sql_log_movie off
+
+# Log to the database when creating timelapse movies file (default: off)
+; sql_log_timelapse off
+
+# SQL query string that is sent to the database
+# Use same conversion specifiers has for text features
+# Additional special conversion specifiers are
+# %n = the number representing the file_type
+# %f = filename with full path
+# Default value:
+# insert into security(camera, filename, frame, file_type, time_stamp, text_event) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C')
+; sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C')
+
+
+############################################################
+# Database Options
+############################################################
+
+# database type : mysql, postgresql, sqlite3 (default : not defined)
+; database_type value
+
+# database to log to (default: not defined)
+; database_dbname value
+
+# The host on which the database is located (default: localhost)
+; database_host value
+
+# User account name for database (default: not defined)
+; database_user value
+
+# User password for database (default: not defined)
+; database_password value
+
+# Port on which the database is located
+#  mysql 3306 , postgresql 5432 (default: not defined)
+; database_port value
+
+############################################################
+# Database Options For SQLite3
+############################################################
+
+# SQLite3 database (file path) (default: not defined)
+; sqlite3_db value
+
+
+
+############################################################
+# Video Loopback Device (vloopback project)
+############################################################
+
+# Output images to a video4linux loopback device
+# The value '-' means next available (default: not defined)
+; video_pipe value
+
+# Output motion images to a video4linux loopback device
+# The value '-' means next available (default: not defined)
+; motion_video_pipe value
+
+
+##############################################################
+# Thread config files - One for each camera.
+# Except if only one camera - You only need this config file.
+# If you have more than one camera you MUST define one thread
+# config file for each camera in addition to this config file.
+##############################################################
+
+# Remember: If you have more than one camera you must have one
+# thread file for each camera. E.g. 2 cameras requires 3 files:
+# This motion.conf file AND thread1.conf and thread2.conf.
+# Only put the options that are unique to each camera in the
+# thread config files.
+; thread /usr/local/etc/thread1.conf
+; thread /usr/local/etc/thread2.conf
+; thread /usr/local/etc/thread3.conf
+; thread /usr/local/etc/thread4.conf
+
diff --git a/package/motion/files/motion.init b/package/motion/files/motion.init
new file mode 100644
index 000000000..1c8b7e705
--- /dev/null
+++ b/package/motion/files/motion.init
@@ -0,0 +1,27 @@
+#!/bin/sh
+#PKG motion
+#INIT 80
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${motion:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	[ -f /etc/motion.conf ] || exit
+	/usr/bin/motion
+	;;
+stop)
+	kill $(pgrep -f /usr/bin/motion)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	;;
+esac
+exit $?
diff --git a/package/mplayer/files/mplayer.postinst b/package/motion/files/motion.postinst
index 386bf95c2..596d6620e 100644
--- a/package/mplayer/files/mplayer.postinst
+++ b/package/motion/files/motion.postinst
@@ -1,4 +1,3 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group video $gid
+add_rcconf motion motion NO
diff --git a/package/motion/patches/patch-configure b/package/motion/patches/patch-configure
deleted file mode 100644
index 28e7af0b6..000000000
--- a/package/motion/patches/patch-configure
+++ /dev/null
@@ -1,95 +0,0 @@
---- motion-3.2.12.orig/configure	2010-06-01 08:48:23.000000000 +0200
-+++ motion-3.2.12/configure	2010-12-14 18:06:34.000000000 +0100
-@@ -2364,9 +2364,6 @@ ac_config_headers="$ac_config_headers co
- THREAD_CFLAGS=""
- THREAD_CHECK="/usr/include/pthread.h"
- 
--Darwin=""
--FreeBSD=""
--
- LINUXTHREADS="no"
- 
- # Check whether --with-linuxthreads was given.
-@@ -2375,74 +2372,6 @@ if test "${with_linuxthreads+set}" = set
- 
- fi
- 
--
--PWCBSD="no"
--
--# Check whether --with-pwcbsd was given.
--if test "${with_pwcbsd+set}" = set; then :
--  withval=$with_pwcbsd; PWCBSD="$withval"
--
--fi
--
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin" >&5
--$as_echo_n "checking for Darwin... " >&6; }
--Darwin=`uname -a | grep "Darwin"`
--
--if test "${Darwin}" = ""; then
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for *BSD" >&5
--$as_echo_n "checking for *BSD... " >&6; }
--
--	FreeBSD=`uname -a | grep "BSD"`
--	if test "${FreeBSD}" = ""; then
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--		VIDEO="video.o video2.o video_common.o"
--	else
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--		if test "${LINUXTHREADS}" = "no"; then
--			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Linuxthreads" >&5
--$as_echo_n "checking Linuxthreads... " >&6; }
--			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: skipping" >&5
--$as_echo "skipping" >&6; }
--		else
--			THREAD_CHECK="/usr/local/include/pthread/linuxthreads/pthread.h"
--			THREAD_LIB_CHECK="/usr/local/lib/liblthread.so"
--		fi
--
--		if test "${PWCBSD}" != "no"; then
--			VIDEO="video.o video2.o video_common.o"
--			TEMP_CFLAGS="${CFLAGS} -I/usr/local/include -DPWCBSD"
--		else
--			VIDEO="video_freebsd.o"
--			TEMP_CFLAGS="${CFLAGS} -I/usr/local/include"
--		fi
--
--		TEMP_LDFLAGS="${LDFLAGS} -L/usr/local/lib"
--		TEMP_LIBS="-L/usr/local/lib"
--		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Build with PWCBSD support $PWCBSD" >&5
--$as_echo "Build with PWCBSD support $PWCBSD" >&6; }
--
--	fi
--else
--	TEMP_CFLAGS="${CFLAGS} -I/sw/include"
--	TEMP_LDFLAGS="${LDFLAGS} -L/sw/lib"
--	TEMP_LIBS="-L/sw/lib"
--	VIDEO="video_freebsd.o"
--	FINK_LIB="-L/sw/lib"
--	Darwin="yes"
--	V4L="no"
--	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Darwin" >&5
--$as_echo "$Darwin" >&6; }
--fi
--
--
--
--
- # Checks for programs.
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3276,6 +3205,7 @@ else
- #
- # Check to Exclude V4L
- #
-+VIDEO="video.o video2.o video_common.o"
- V4L="yes"
- 
- # Check whether --with-v4l was given.
diff --git a/package/motion/patches/patch-track_c b/package/motion/patches/patch-track_c
deleted file mode 100644
index 06e580e18..000000000
--- a/package/motion/patches/patch-track_c
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- motion-3.2.11.orig/track.c	2008-09-22 01:20:58.000000000 +0200
-+++ motion-3.2.11/track.c	2009-05-30 12:45:30.141690363 +0200
-@@ -165,7 +165,7 @@ static unsigned short int stepper_center
-             return 0;
-         }
- 
--        bzero (&adtio, sizeof(adtio));
-+        memset (&adtio, 0, sizeof(adtio));
-         adtio.c_cflag = STEPPER_BAUDRATE | CS8 | CLOCAL | CREAD;
-         adtio.c_iflag = IGNPAR;
-         adtio.c_oflag = 0;
-@@ -323,7 +323,7 @@ static unsigned short int iomojo_center(
-             return 0;
-         }
- 
--        bzero (&adtio, sizeof(adtio));
-+        memset (&adtio, 0, sizeof(adtio));
-         adtio.c_cflag = IOMOJO_BAUDRATE | CS8 | CLOCAL | CREAD;
-         adtio.c_iflag = IGNPAR;
-         adtio.c_oflag = 0;
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 738172650..9aa986100 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -74,10 +74,10 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_MMS),y)
 PKG_FDEPENDS+=		libmms
 endif
 PKGFD_WITH_FFMPEG:=	enable FFMPEG support
-PKGFS_WITH_FFMPEG:=	ffmpeg
+PKGFS_WITH_FFMPEG:=	libffmpeg
 PKGFB_WITH_FFMPEG:=	ffmpeg
 ifeq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),y)
-PKG_FDEPENDS+=		ffmpeg
+PKG_FDEPENDS+=		libffmpeg
 endif
 PKGFD_WITH_SHOUT:=	enable Shoutcast output support
 PKGFS_WITH_SHOUT:=	libshout liblame libvorbisenc
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 8bedd1023..e46d63f0f 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -5,20 +5,21 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
 PKG_VERSION:=		1.0-32749
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		aadc5d8cca503c8b18b3ed00b3a52cf5
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
 PKG_DEPENDS+=		libogg libpng libpthread libvorbis giflib
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
-PKG_DEPENDS+=		libxscrnsaver
+PKG_DEPENDS+=		libxscrnsaver libtheora libxvid libvpx
 PKG_BUILDDEP:=		alsa-lib libmad libvorbis faad2 ncurses zlib
-PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
+PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg libtheora
+PKG_BUILDDEP+=		xvidcore libvpx
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	x86 mips
+PKG_ARCH_DEPENDS:=	x86 mips arm
 
 PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -30,6 +31,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 # gcc 4.5 produces internal compiler error with -Os
 TARGET_CFLAGS:=$(subst Os,O2,$(TARGET_CFLAGS))
 
@@ -68,6 +70,11 @@ CONFIGURE_CPU_OPTS+=	--enable-sse2
 else
 CONFIGURE_CPU_OPTS+=	--disable-sse2
 endif
+#ifeq (${ADK_TARGET_CPU_WITH_IWMMXT},y)
+#CONFIGURE_CPU_OPTS+=	--enable-iwmmxt
+#else
+#CONFIGURE_CPU_OPTS+=	--disable-iwmmxt
+#endif
 
 ifeq ($(ADK_DEBUG),y)
 CONFIGURE_DEBUG=	--enable-debug
@@ -96,13 +103,15 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--enable-jpeg \
 			--enable-mad \
 			--enable-libvorbis \
+			--enable-faac \
+			--enable-theora \
+			--enable-xvid \
 			--disable-ossaudio \
 			--disable-vm \
 			--disable-iconv \
 			--disable-lirc \
 			--disable-radio-v4l2 \
 			--disable-speex \
-			--disable-faac \
 			--disable-libdv \
 			--disable-live \
 			--disable-pvr \
@@ -135,6 +144,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			${CONFIGURE_DIRECTFB}
 
 XAKE_FLAGS+=		AR="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
+TARGET_LDFLAGS+=	-lxvidcore
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin
diff --git a/package/mplayer/patches/patch-libao2_ao_alsa_c b/package/mplayer/patches/patch-libao2_ao_alsa_c
new file mode 100644
index 000000000..26d0832dc
--- /dev/null
+++ b/package/mplayer/patches/patch-libao2_ao_alsa_c
@@ -0,0 +1,14 @@
+--- mplayer-1.0-32749.orig/libao2/ao_alsa.c	2011-01-03 11:26:52.000000000 +0100
++++ mplayer-1.0-32749/libao2/ao_alsa.c	2011-09-14 20:52:35.457990653 +0200
+@@ -760,8 +760,9 @@ static int play(void* data, int len, int
+ {
+   int num_frames;
+   snd_pcm_sframes_t res = 0;
+-  if (!(flags & AOPLAY_FINAL_CHUNK))
+-      len = len / ao_data.outburst * ao_data.outburst;
++  // SIGFPE on Sharp Zaurus ARM CPU
++  //if (!(flags & AOPLAY_FINAL_CHUNK))
++  //    len = len / ao_data.outburst * ao_data.outburst;
+   num_frames = len / bytes_per_sample;
+ 
+   //mp_msg(MSGT_AO,MSGL_ERR,"alsa-play: frames=%i, len=%i\n",num_frames,len);
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index e277874c6..4aa720004 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -4,12 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
-PKG_VERSION:=		1.2.3
-PKG_RELEASE:=		6
-PKG_MD5SUM:=		1131dc5f27c4f3905a6e7ee0d594fd4d
+PKG_VERSION:=		1.2.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		938dc0574f3eb9891a8ed4746f806277
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-nfsd
+PKG_DEPENDS:=		kmod-nfsd keyutils
+PKG_BUILDDEP:=		keyutils
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
diff --git a/package/openais/files/openais.init b/package/openais/files/openais.init
index f36121c7a..25b2d8974 100644
--- a/package/openais/files/openais.init
+++ b/package/openais/files/openais.init
@@ -10,13 +10,16 @@ autostart)
 	exec sh $0 start
 	;;
 start)
-	mount -t tmpfs -o size=4M tmpfs /dev/shm
 	[ -d /var/lib/corosync ] || mkdir -p /var/lib/corosync
+	mkdir -p /var/lib/heartbeat/crm 
+	chown hacluster:haclient /var/lib/heartbeat/crm
+	chmod 775 /var/lib/heartbeat/crm
+	mkdir -p /var/lib/pengine
+	chown hacluster /var/lib/pengine
 	/usr/sbin/aisexec
   	;;
 stop)
 	kill $(pgrep -f corosync)
-	umount /dev/shm
 	;;
 restart)
 	sh $0 stop
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 4bb68bb88..2c953c0fe 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -17,7 +17,7 @@ PKG_DESCR:=		OpenJDK Java VM
 PKG_SECTION:=		lang
 PKG_BUILDDEP:=		alsa-lib xproto jpeg zlib giflib libpng freetype cups
 PKG_BUILDDEP+=		libX11 libXt libXp libXinerama libXrender libXtst libiconv
-PKG_DEPENDS:=		zlib libstdcxx libffi libpthread
+PKG_DEPENDS:=		zlib libstdcxx libffi libpthread libxtst libxi
 PKG_URL:=		http://openjdk.org/
 PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 			http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \
@@ -26,7 +26,7 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 
 PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:=	!lemote-yeelong !linksys-ag241 !fon-fon2100
+PKG_SYSTEM_DEPENDS:=	!lemote-yeelong !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
 
 # autotools infrastructure for OpenJDK
 ICEDTEA_NAME:=		icedtea6
@@ -59,7 +59,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-
+# segfaults with march=pentium-m/atom
+TARGET_CFLAGS:=		$(subst march=pentium-m,march=i686,$(TARGET_CFLAGS))
+TARGET_CFLAGS:=		$(subst march=atom,march=i686,$(TARGET_CFLAGS))
 TARGET_CFLAGS:=         $(filter-out -fhonour-copts,$(TARGET_CFLAGS))
 BOOTSTRAPJDK:=		${STAGING_JAVA_HOST_DIR}/bootstrap-jdk
 
@@ -144,5 +146,6 @@ pre-configure:
 openjdk-install:
 	$(INSTALL_DIR) $(IDIR_OPENJDK)/usr
 	$(CP) $(WRKBUILD)/openjdk.build/j2re-image/* $(IDIR_OPENJDK)/usr 
+	rm -rf $(IDIR_OPENJDK)/usr/man
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openjdk/patches/rename-libnet.patch b/package/openjdk/patches/rename-libnet.patch
new file mode 100644
index 000000000..671c80dcc
--- /dev/null
+++ b/package/openjdk/patches/rename-libnet.patch
@@ -0,0 +1,127 @@
+https://evolvis.org/scm/viewvc.php/jalimo/trunk/oe-overlay/packages/openjdk/openjdk-6-6b18-1.8/icedtea-libnet-renaming.patch?revision=864&view=markup&pathrev=867
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/net/Makefile	2011-02-28 17:06:10.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/net/Makefile	2011-09-02 16:20:55.597991415 +0200
+@@ -25,7 +25,7 @@
+ 
+ BUILDDIR = ../..
+ PACKAGE = java.net
+-LIBRARY = net
++LIBRARY = javanet
+ PRODUCT = sun
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/make/java/nio/Makefile	2011-02-28 17:06:11.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/make/java/nio/Makefile	2011-09-02 16:21:37.817990454 +0200
+@@ -135,11 +135,11 @@
+ endif
+ ifeq ($(PLATFORM), linux)
+ COMPILER_WARNINGS_FATAL=true
+-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet -lpthread -ldl
+ endif
+ ifeq ($(PLATFORM), solaris)
+ OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
+-		-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
++		-L$(LIBDIR)/$(LIBARCH) -ljava -ljavanet
+ endif # PLATFORM
+ 
+ #
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java	2011-09-02 16:22:26.507995127 +0200
+@@ -59,7 +59,7 @@
+      */
+     static {
+         java.security.AccessController.doPrivileged(
+-                  new sun.security.action.LoadLibraryAction("net"));
++                  new sun.security.action.LoadLibraryAction("javanet"));
+     }
+ 
+     /**
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	2011-09-02 16:22:58.041740544 +0200
+@@ -79,7 +79,7 @@
+      */
+     static {
+         java.security.AccessController.doPrivileged(
+-                  new sun.security.action.LoadLibraryAction("net"));
++                  new sun.security.action.LoadLibraryAction("javanet"));
+     }
+ 
+     /**
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/DatagramPacket.java	2011-09-02 16:23:20.197991292 +0200
+@@ -47,7 +47,7 @@
+      */
+     static {
+         java.security.AccessController.doPrivileged(
+-                  new sun.security.action.LoadLibraryAction("net"));
++                  new sun.security.action.LoadLibraryAction("javanet"));
+         init();
+     }
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/InetAddress.java	2011-09-02 16:23:57.670490341 +0200
+@@ -231,7 +231,7 @@
+     static {
+         preferIPv6Address = java.security.AccessController.doPrivileged(
+             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
+-        AccessController.doPrivileged(new LoadLibraryAction("net"));
++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+         init();
+     }
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-02-28 17:06:22.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/java/net/NetworkInterface.java	2011-09-02 16:24:13.879239438 +0200
+@@ -52,7 +52,7 @@
+     private boolean virtual = false;
+ 
+     static {
+-        AccessController.doPrivileged(new LoadLibraryAction("net"));
++        AccessController.doPrivileged(new LoadLibraryAction("javanet"));
+         init();
+     }
+ 
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-02-28 17:06:34.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java	2011-09-02 16:24:50.877990409 +0200
+@@ -89,7 +89,7 @@
+                 }});
+         if (b != null && b.booleanValue()) {
+             java.security.AccessController.doPrivileged(
+-                      new sun.security.action.LoadLibraryAction("net"));
++                      new sun.security.action.LoadLibraryAction("javanet"));
+             hasSystemProxies = init();
+         }
+     }
+--- w-openjdk-6.orig/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-02-28 17:06:35.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/share/classes/sun/nio/ch/Util.java	2011-09-02 16:25:45.749240462 +0200
+@@ -354,7 +354,7 @@
+                 return;
+             loaded = true;
+             java.security.AccessController
+-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
++                .doPrivileged(new sun.security.action.LoadLibraryAction("javanet"));
+             java.security.AccessController
+                 .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
+             // IOUtil must be initialized; Its native methods are called from
+--- w-openjdk-6.orig/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:48.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:26:36.017990742 +0200
+@@ -244,7 +244,7 @@
+ 
+     static {
+         java.security.AccessController.doPrivileged(
+-            new sun.security.action.LoadLibraryAction("net"));
++            new sun.security.action.LoadLibraryAction("javanet"));
+     }
+ 
+ }
+--- w-openjdk-6.orig/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-02-28 17:06:51.000000000 +0100
++++ w-openjdk-6/openjdk-6/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2011-09-02 16:27:07.069240501 +0200
+@@ -160,7 +160,7 @@
+ 
+     static {
+         java.security.AccessController.doPrivileged(
+-            new sun.security.action.LoadLibraryAction("net"));
++            new sun.security.action.LoadLibraryAction("javanet"));
+         init0();
+ 
+         // start the address listener thread
diff --git a/package/openssl/patches/patch-Makefile_org b/package/openssl/patches/patch-Makefile_org
new file mode 100644
index 000000000..f72030d14
--- /dev/null
+++ b/package/openssl/patches/patch-Makefile_org
@@ -0,0 +1,11 @@
+--- openssl-1.0.0d.orig/Makefile.org	2010-01-27 17:06:58.000000000 +0100
++++ openssl-1.0.0d/Makefile.org	2011-10-12 06:07:40.993200000 +0200
+@@ -109,7 +109,7 @@ LIBKRB5=
+ ZLIB_INCLUDE=
+ LIBZLIB=
+ 
+-DIRS=   crypto ssl engines apps test tools
++DIRS=   crypto ssl engines apps tools
+ ENGDIRS= ccgost
+ SHLIBDIRS= crypto ssl
+ 
diff --git a/package/pacemaker/Makefile b/package/pacemaker/Makefile
index 8f0b6bbe2..25dc896ff 100644
--- a/package/pacemaker/Makefile
+++ b/package/pacemaker/Makefile
@@ -9,12 +9,14 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		bfe2127d31e5244d0106a5c290fd0dc2
 PKG_DESCR:=		scalable High-Availability cluster resource manager
 PKG_SECTION:=		ha
-PKG_DEPENDS:=		python2
+PKG_BUILDDEP:=		resource-agents cluster-glue pam gnutls
+PKG_DEPENDS:=		python2 python2-readline python2-bzip2 cluster-glue
+PKG_DEPENDS+=		bash resource-agents pam libgnutls glib libxslt libxml2
 PKG_URL:=		http://www.clusterlabs.org/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_PACEMAKER:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	x86
 
 include $(TOPDIR)/mk/package.mk
 
@@ -23,15 +25,25 @@ $(eval $(call PKG_template,PACEMAKER,pacemaker,$(PKG_VERSION)-${PKG_RELEASE},${P
 # disable honour cflags stuff
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-CONFIGURE_ARGS+=	--includedir=$(STAGING_TARGET_DIR)/usr/include \
-			--disable-fatal-warnings
+CONFIGURE_ARGS+=	--disable-fatal-warnings
 CONFIGURE_ENV+=		ac_cv_path_HELP2MAN=''
-CFLAGS_FOR_BUILD+=	-I$(STAGING_TARGET_DIR)/usr/include/heartbeat
+CFLAGS_FOR_BUILD+=	-I$(STAGING_DIR)/usr/include/heartbeat
+
+pre-configure:
+	$(SED) "s#@@STAGING_DIR@@#$(STAGING_DIR)#" $(WRKBUILD)/configure
 
 pacemaker-install:
-	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/heartbeat
+	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/lib/ocf
 	$(CP) $(WRKINST)/usr/lib/lib*.so* \
 		$(IDIR_PACEMAKER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/heartbeat/* \
+		$(IDIR_PACEMAKER)/usr/lib/heartbeat
+	$(CP) $(WRKINST)/usr/lib/ocf/* \
+		$(IDIR_PACEMAKER)/usr/lib/ocf
+	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/share/pacemaker
+	$(CP) $(WRKINST)/usr/share/pacemaker/* \
+		$(IDIR_PACEMAKER)/usr/share/pacemaker
 	$(INSTALL_DIR) $(IDIR_PACEMAKER)/usr/sbin
 	$(CP) $(WRKINST)/usr/sbin/* \
 		$(IDIR_PACEMAKER)/usr/sbin
diff --git a/package/pacemaker/files/pacemaker.postinst b/package/pacemaker/files/pacemaker.postinst
new file mode 100644
index 000000000..acda216de
--- /dev/null
+++ b/package/pacemaker/files/pacemaker.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+
+gid=$(get_next_gid)
+gid2=$(get_next_gid)
+add_user hacluster $(get_next_uid) $gid /tmp
+add_group hacluster $gid
+add_group haclient $gid2
diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure
index 5206c0b3b..320b06924 100644
--- a/package/pacemaker/patches/patch-configure
+++ b/package/pacemaker/patches/patch-configure
@@ -1,5 +1,5 @@
 --- pacemaker-1.0.11.orig/configure	2011-05-24 17:00:37.000000000 +0200
-+++ pacemaker-1.0.11/configure	2011-06-25 22:21:57.912681957 +0200
++++ pacemaker-1.0.11/configure	2011-10-07 12:41:11.000000000 +0200
 @@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
  	  printf "#include <stdio.h>\n" > ${Cfile}.c
  	  printf "#include <%s>\n" $1 >> ${Cfile}.c
@@ -49,7 +49,7 @@
 -esac
 -
 -CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
-+CFLAGS="$CFLAGS -I${includedir}/heartbeat"
++CFLAGS="$CFLAGS -I@@STAGING_DIR@@/usr/include/heartbeat"
  
  
  
diff --git a/package/pacemaker/patches/patch-configure.orig b/package/pacemaker/patches/patch-configure.orig
deleted file mode 100644
index a3eca9a9d..000000000
--- a/package/pacemaker/patches/patch-configure.orig
+++ /dev/null
@@ -1,54 +0,0 @@
---- pacemaker-1.0.11.orig/configure	2011-05-24 17:00:37.000000000 +0200
-+++ pacemaker-1.0.11/configure	2011-05-24 17:39:43.000000000 +0200
-@@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
- 	  printf "#include <stdio.h>\n" > ${Cfile}.c
- 	  printf "#include <%s>\n" $1 >> ${Cfile}.c
- 	  printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
--	  $CC $CFLAGS ${Cfile}.c -o ${Cfile}
-+	  $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile}
- 	  value=`${Cfile}`
- 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
- $as_echo "$value" >&6; }
-@@ -12713,33 +12713,11 @@ $as_echo "$as_me: WARNING: $j directory 
- done
- 
- 
--case "$host_os" in
--*bsd*)		LIBS="-L/usr/local/lib"
--		CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--		INIT_EXT=".sh"
--		;;
--*solaris*)
--		;;
--*linux*)
--
- cat >>confdefs.h <<_ACEOF
- #define ON_LINUX 1
- _ACEOF
- 
--  		CFLAGS="$CFLAGS -I${prefix}/include"
-- 		;;
--darwin*)
--
--cat >>confdefs.h <<_ACEOF
--#define ON_DARWIN 1
--_ACEOF
--
--  		LIBS="$LIBS -L${prefix}/lib"
--  		CFLAGS="$CFLAGS -I${prefix}/include"
--		;;
--esac
--
--CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
-+CFLAGS="$CFLAGS -I${includedir}/heartbeat"
- 
- 
- 
-@@ -17159,7 +17137,6 @@ else
- 
- 	# We had to eliminate -Wnested-externs because of libtool changes
-         EXTRA_FLAGS="-fgnu89-inline
--		-fstack-protector-all
- 		-Wall
- 		-Waggregate-return
- 		-Wbad-function-cast
diff --git a/package/pam/Makefile b/package/pam/Makefile
new file mode 100644
index 000000000..a9381495e
--- /dev/null
+++ b/package/pam/Makefile
@@ -0,0 +1,32 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		pam
+PKG_VERSION:=		1.1.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ff8f3c4382b78ac211e11bcd56ab17bf
+PKG_DESCR:=		Pluggable Authentication Modules
+PKG_BUILDDEP:=		flex
+PKG_SECTION:=		misc
+PKG_SITES:=		http://openadk.org/distfiles/
+
+DISTFILES:=		Linux-PAM-$(PKG_VERSION).tar.gz
+WRKDIST=                ${WRKDIR}/Linux-PAM-${PKG_VERSION}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PAM,pam,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+pam-install:
+	$(INSTALL_DIR) $(IDIR_PAM)/etc/security
+	$(CP) $(WRKINST)/etc/security/* $(IDIR_PAM)/etc/security
+	$(INSTALL_DIR) $(IDIR_PAM)/lib/security
+	$(CP) $(WRKINST)/lib/libpam*.so* $(IDIR_PAM)/lib
+	$(CP) $(WRKINST)/lib/security/*.so* $(IDIR_PAM)/lib/security
+	$(CP) $(WRKBUILD)/conf/pam.conf $(IDIR_PAM)/etc
+	# /lib is not automatically installed to staging area
+	$(CP) $(WRKINST)/lib/libpam*.so* $(STAGING_DIR)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pam/patches/patch-Makefile_in b/package/pam/patches/patch-Makefile_in
new file mode 100644
index 000000000..12574da06
--- /dev/null
+++ b/package/pam/patches/patch-Makefile_in
@@ -0,0 +1,24 @@
+--- Linux-PAM-1.1.4.orig/Makefile.in	2011-06-24 12:48:16.000000000 +0200
++++ Linux-PAM-1.1.4/Makefile.in	2011-10-07 11:42:21.000000000 +0200
+@@ -75,8 +75,8 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \
+-	examples xtests
++DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf \
++	examples
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+@@ -258,8 +258,8 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+-@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
+-@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
++@STATIC_MODULES_FALSE@SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples
++@STATIC_MODULES_TRUE@SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples
+ CLEANFILES = *~
+ M4_FILES = m4/gettext.m4 m4/iconv.m4 m4/intlmacosx.m4 \
+ 	m4/japhar_grep_cflags.m4 m4/jh_path_xml_catalog.m4 \
diff --git a/package/pam/patches/patch-conf_Makefile_in b/package/pam/patches/patch-conf_Makefile_in
new file mode 100644
index 000000000..b4a0d7afb
--- /dev/null
+++ b/package/pam/patches/patch-conf_Makefile_in
@@ -0,0 +1,11 @@
+--- Linux-PAM-1.1.4.orig/conf/Makefile.in	2011-06-24 12:48:02.000000000 +0200
++++ Linux-PAM-1.1.4/conf/Makefile.in	2011-10-07 11:32:37.000000000 +0200
+@@ -236,7 +236,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pam_conv1
++SUBDIRS = 
+ CLEANFILES = *~
+ EXTRA_DIST = install_conf md5itall pam.conf
+ all: all-recursive
diff --git a/package/parted/Makefile b/package/parted/Makefile
index d7847947c..06451fc3e 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		parted
-PKG_VERSION:=		2.3
+PKG_VERSION:=		3.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		30ceb6df7e8681891e865e2fe5a7903d
+PKG_MD5SUM:=		a94e84a9b9944715c4453f82ccc639bf
 PKG_DESCR:=		partition table editor
 PKG_SECTION:=		fs
 PKG_DEPENDS:=		libuuid libreadline libpthread
@@ -18,8 +18,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PARTED,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--disable-device-mapper \
-			--enable-Werror=no
+CONFIGURE_ARGS+=	--disable-device-mapper
 
 post-install:
 	${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib
diff --git a/package/parted/patches/patch-build-aux_ltmain_sh b/package/parted/patches/patch-build-aux_ltmain_sh
deleted file mode 100644
index bb54e7146..000000000
--- a/package/parted/patches/patch-build-aux_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- parted-2.3.orig/build-aux/ltmain.sh	2010-05-28 20:29:02.000000000 +0200
-+++ parted-2.3/build-aux/ltmain.sh	2011-01-16 15:30:44.000000000 +0100
-@@ -4971,7 +4971,7 @@ func_mode_link ()
-       # @file GCC response files
-       # -tp=* Portland pgcc target processor selection
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/pcmanfm/Makefile b/package/pcmanfm/Makefile
index 500f4c41b..dfca642f9 100644
--- a/package/pcmanfm/Makefile
+++ b/package/pcmanfm/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		pcmanfm
-PKG_VERSION:=		2.0
+PKG_VERSION:=		0.9.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		20c07a1a39596d2322be0e88a310b314
+PKG_MD5SUM:=		f31ed6defb600f7046a456220d8efa3a
 PKG_DESCR:=		graphical file manager
 PKG_SECTION:=		x11/lxde
 PKG_BUILDDEP:=		libfm atk glib gtk+
@@ -15,7 +15,7 @@ PKG_DEPENDS+=		libxrender libgtk glib libxfixes fontconfig
 PKG_DEPENDS+=		libintl pango menu-cache libfreetype libxext
 PKG_DEPENDS+=		libxdamage gdk-pixbuf libpthread
 PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
+PKG_SITES:=		http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/pcmanfm/patches/patch-ltmain_sh b/package/pcmanfm/patches/patch-ltmain_sh
deleted file mode 100644
index 207a1b457..000000000
--- a/package/pcmanfm/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,80 +0,0 @@
---- pcmanfm-2.0.orig/ltmain.sh	2011-04-14 20:46:32.000000000 +0200
-+++ pcmanfm-2.0/ltmain.sh	2011-04-16 12:32:18.000000000 +0200
-@@ -4216,19 +4216,6 @@ func_mode_link ()
- 	  prev=
- 	  continue
- 	  ;;
--	framework)
--	  case $host in
--	    *-*-darwin*)
--	      case "$deplibs " in
--		*" $qarg.ltframework "*) ;;
--		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
--		   ;;
--	      esac
--	      ;;
--	  esac
--	  prev=
--	  continue
--	  ;;
- 	inst_prefix)
- 	  inst_prefix_dir="$arg"
- 	  prev=
-@@ -4452,11 +4439,6 @@ func_mode_link ()
- 	continue
- 	;;
- 
--      -framework)
--	prev=framework
--	continue
--	;;
--
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
-@@ -5155,21 +5137,6 @@ func_mode_link ()
- 	    fi
- 	  fi
- 	  ;; # -l
--	*.ltframework)
--	  if test "$linkmode,$pass" = "prog,link"; then
--	    compile_deplibs="$deplib $compile_deplibs"
--	    finalize_deplibs="$deplib $finalize_deplibs"
--	  else
--	    deplibs="$deplib $deplibs"
--	    if test "$linkmode" = lib ; then
--		case "$new_inherited_linker_flags " in
--		    *" $deplib "*) ;;
--		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
--		esac
--	    fi
--	  fi
--	  continue
--	  ;;
- 	-L*)
- 	  case $linkmode in
- 	  lib)
-@@ -5319,23 +5286,6 @@ func_mode_link ()
- 	# Read the .la file
- 	func_source "$lib"
- 
--	# Convert "-framework foo" to "foo.ltframework"
--	if test -n "$inherited_linker_flags"; then
--	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
--	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
--	    case " $new_inherited_linker_flags " in
--	      *" $tmp_inherited_linker_flag "*) ;;
--	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
--	    esac
--	  done
--	fi
--	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
--	if test "$linkmode,$pass" = "lib,link" ||
--	   test "$linkmode,$pass" = "prog,scan" ||
--	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
--	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
--	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
--	fi
- 
- 	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
diff --git a/package/pcmanfm/patches/patch-ltmain_sh.orig b/package/pcmanfm/patches/patch-ltmain_sh.orig
deleted file mode 100644
index c80b629e8..000000000
--- a/package/pcmanfm/patches/patch-ltmain_sh.orig
+++ /dev/null
@@ -1,34 +0,0 @@
---- pcmanfm-2.0.orig/ltmain.sh	2011-04-14 20:46:32.000000000 +0200
-+++ pcmanfm-2.0/ltmain.sh	2011-04-16 11:59:52.000000000 +0200
-@@ -4216,19 +4216,6 @@ func_mode_link ()
- 	  prev=
- 	  continue
- 	  ;;
--	framework)
--	  case $host in
--	    *-*-darwin*)
--	      case "$deplibs " in
--		*" $qarg.ltframework "*) ;;
--		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
--		   ;;
--	      esac
--	      ;;
--	  esac
--	  prev=
--	  continue
--	  ;;
- 	inst_prefix)
- 	  inst_prefix_dir="$arg"
- 	  prev=
-@@ -4452,11 +4439,6 @@ func_mode_link ()
- 	continue
- 	;;
- 
--      -framework)
--	prev=framework
--	continue
--	;;
--
-       -inst-prefix-dir)
- 	prev=inst_prefix
- 	continue
diff --git a/package/perl/Makefile b/package/perl/Makefile
index bb8565825..7fb8172e1 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		perl
 PKG_VERSION:=		5.12.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		29975a69dce54e47fcd6331c085c6c99
 PKG_DESCR:=		full-blown Perl
 PKG_SECTION:=		lang
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIG_STYLE:=          manual
 
 pre-configure:
-	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
+	(cd ${WRKBUILD}; ./Configure -des -Dusethreads -Dcc=gcc -Dprefix=/usr -A ccflags="${TARGET_CFLAGS}");
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PERL}/usr/bin
diff --git a/package/python/Makefile b/package/python/Makefile
index 4c6cc4428..993dcb034 100644
--- a/package/python/Makefile
+++ b/package/python/Makefile
@@ -4,11 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python
-PKG_VERSION:=		3.2
+PKG_VERSION:=		3.2.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		f1317dbb2398374d6691edd5bff1b91d
+PKG_MD5SUM:=		3c63a6d97333f4da35976b6a0755eb67
 PKG_DESCR:=		Python scripting language (Version 3)
 PKG_SECTION:=		lang
+PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 
@@ -21,13 +22,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PYTHON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+# disable honour cflags stuff
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
+
 MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			HOSTPYTHON=./hostpython \
 			HOSTPGEN=./Parser/hostpgen
-CONFIGURE_ENV+=		OPT="$(TARGET_CFLAGS)"
 CONFIGURE_ARGS:=	--with-threads \
 			--with-system-ffi \
 			--without-cxx-main
+CONFIGURE_ENV+=		ac_cv_have_long_long_format=yes
 
 post-extract:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -49,9 +53,11 @@ pre-configure:
 post-install:
 	${INSTALL_DIR} ${IDIR_PYTHON}/usr/bin ${IDIR_PYTHON}/usr/lib
 	${INSTALL_DIR} ${IDIR_PYTHON}/usr/lib/python3.2
+	${INSTALL_DIR} ${IDIR_PYTHON}/usr/include/python3.2m
 	${INSTALL_BIN} ${WRKINST}/usr/bin/python3 ${IDIR_PYTHON}/usr/bin
 	${CP} ${WRKINST}/usr/lib/libpython*.so* ${IDIR_PYTHON}/usr/lib
 	cd ${IDIR_PYTHON}/usr/bin && ln -s python3 python
 	${CP} ${WRKINST}/usr/lib/python3.2/* ${IDIR_PYTHON}/usr/lib/python3.2
+	${CP} ${WRKINST}/usr/include/python3.2m/* ${IDIR_PYTHON}/usr/include/python3.2m
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/python/patches/patch-Makefile_pre_in b/package/python/patches/patch-Makefile_pre_in
index 00504cb16..a2f7d96dc 100644
--- a/package/python/patches/patch-Makefile_pre_in
+++ b/package/python/patches/patch-Makefile_pre_in
@@ -1,6 +1,7 @@
---- Python-3.1.1.orig/Makefile.pre.in	2009-06-12 00:54:11.000000000 +0200
-+++ Python-3.1.1/Makefile.pre.in	2009-09-28 19:01:13.167748736 +0200
-@@ -52,7 +52,7 @@ INSTALL_DATA=	@INSTALL_DATA@
+diff -Nur Python-3.2.2.orig/Makefile.pre.in Python-3.2.2/Makefile.pre.in
+--- Python-3.2.2.orig/Makefile.pre.in	2011-09-03 18:16:45.000000000 +0200
++++ Python-3.2.2/Makefile.pre.in	2011-09-05 11:58:25.000000000 +0200
+@@ -57,7 +57,7 @@
  # Shared libraries must be installed with executable mode on some systems;
  # rather than figuring out exactly which, we always give them executable mode.
  # Also, making them read-only seems to be a good idea...
@@ -9,7 +10,7 @@
  
  MAKESETUP=      $(srcdir)/Modules/makesetup
  
-@@ -177,6 +177,7 @@ LIBOBJS=	@LIBOBJS@
+@@ -191,6 +191,7 @@
  
  PYTHON=		python$(EXE)
  BUILDPYTHON=	python$(BUILDEXE)
@@ -17,7 +18,7 @@
  
  # The task to run while instrument when building the profile-opt target
  PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck
-@@ -217,6 +218,7 @@ GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
+@@ -233,6 +234,7 @@
  ##########################################################################
  # Parser
  PGEN=		Parser/pgen$(EXE)
@@ -25,7 +26,7 @@
  
  POBJS=		\
  		Parser/acceler.o \
-@@ -393,7 +395,7 @@ build_all_generate_profile:
+@@ -413,7 +415,7 @@
  	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov"
  
  run_profile_task:
@@ -34,12 +35,12 @@
  
  build_all_use_profile:
  	$(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use"
-@@ -411,14 +413,14 @@ $(BUILDPYTHON):	Modules/python.o $(LIBRA
- 			$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+@@ -429,14 +431,14 @@
+ 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
  
  platform: $(BUILDPYTHON)
--	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
-+	$(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
+-	$(RUNSHARED) ./$(BUILDPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
++	$(RUNSHARED) $(HOSTPYTHON) -E -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
  
  
  # Build the shared modules
@@ -52,43 +53,43 @@
  	esac
  
  # Build static library
-@@ -542,7 +544,7 @@ $(IO_OBJS): $(IO_H)
- 
- $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
+@@ -587,7 +589,7 @@
+ $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp
+ Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)
  		-@$(INSTALL) -d Include
--		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
 +		-$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ 		-touch Parser/pgen.stamp
  
  $(PGEN):	$(PGENOBJS)
- 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
-@@ -705,7 +707,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/pytho
+@@ -758,7 +760,7 @@
  
  TESTOPTS=	-l $(EXTRATESTOPTS)
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
--TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -E -bb
-+TESTPYTHON=	$(RUNSHARED) $(HOSTPYTHON) -E -bb
+-TESTPYTHON=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
++TESTPYTHON=	$(RUNSHARED) $(HOSTPYTHON) -Wd -E -bb $(TESTPYTHONOPTS)
  test:		all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
  		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
-@@ -1018,7 +1020,7 @@ libainstall:	all
+@@ -1102,7 +1104,7 @@
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
- sharedinstall:
+ sharedinstall: sharedmods
 -	$(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
 +	$(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-@@ -1056,7 +1058,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
+@@ -1140,7 +1142,7 @@
  		fi; \
  	done
- 	$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
+ 	$(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers
 -	sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
 +	sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist
  	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
  	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1098,7 +1100,7 @@ frameworkinstallextras:
+@@ -1174,7 +1176,7 @@
  # This installs a few of the useful scripts in Tools/scripts
  scriptsinstall:
  	SRCDIR=$(srcdir) $(RUNSHARED) \
@@ -96,8 +97,8 @@
 +	$(HOSTPYTHON) $(srcdir)/Tools/scripts/setup.py install \
  	--prefix=$(prefix) \
  	--install-scripts=$(BINDIR) \
- 	--root=/$(DESTDIR)
-@@ -1120,7 +1122,7 @@ config.status:	$(srcdir)/configure
+ 	--root=$(DESTDIR)/
+@@ -1196,7 +1198,7 @@
  
  # Run reindent on the library
  reindent:
@@ -106,7 +107,7 @@
  
  # Rerun configure with the same options as it was run last time,
  # provided the config.status script exists
-@@ -1234,7 +1236,7 @@ funny:
+@@ -1317,7 +1319,7 @@
  
  # Perform some verification checks on any modified files.
  patchcheck:
diff --git a/package/python/patches/patch-configure b/package/python/patches/patch-configure
index b76afc821..b24d4c24f 100644
--- a/package/python/patches/patch-configure
+++ b/package/python/patches/patch-configure
@@ -1,12 +1,13 @@
---- Python-3.1.1.orig/configure	2009-06-08 23:22:57.000000000 +0200
-+++ Python-3.1.1/configure	2010-11-07 20:52:09.000000000 +0100
-@@ -2051,12 +2051,12 @@ fi
- echo $ECHO_N "checking MACHDEP... $ECHO_C" >&6; }
+diff -Nur Python-3.2.2.orig/configure Python-3.2.2/configure
+--- Python-3.2.2.orig/configure	2011-09-03 18:16:50.000000000 +0200
++++ Python-3.2.2/configure	2011-09-05 11:35:01.000000000 +0200
+@@ -2983,12 +2983,12 @@
+ $as_echo_n "checking MACHDEP... " >&6; }
  if test -z "$MACHDEP"
  then
 -	ac_sys_system=`uname -s`
 +	ac_sys_system=Linux
- 	if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+ 	if test "$ac_sys_system" = "AIX" \
  	-o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
  		ac_sys_release=`uname -v`
  	else
@@ -15,334 +16,12 @@
  	fi
  	ac_md_system=`echo $ac_sys_system |
  			   tr -d '/ ' | tr '[A-Z]' '[a-z]'`
-@@ -2224,7 +2224,7 @@ EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
+@@ -3140,7 +3140,7 @@
  
- { echo "$as_me:$LINENO: checking machine type as reported by uname -m" >&5
- echo $ECHO_N "checking machine type as reported by uname -m... $ECHO_C" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking machine type as reported by uname -m" >&5
+ $as_echo_n "checking machine type as reported by uname -m... " >&6; }
 -ac_sys_machine=`uname -m`
 +ac_sys_machine=@@CPU_ARCH@@
- { echo "$as_me:$LINENO: result: $ac_sys_machine" >&5
- echo "${ECHO_T}$ac_sys_machine" >&6; }
- 
-@@ -17204,141 +17204,6 @@ fi
- fi
- 
- 
--# On Tru64, chflags seems to be present, but calling it will
--# exit Python
--{ echo "$as_me:$LINENO: checking for chflags" >&5
--echo $ECHO_N "checking for chflags... $ECHO_C" >&6; }
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <sys/stat.h>
--#include <unistd.h>
--int main(int argc, char*argv[])
--{
--  if(chflags(argv[0], 0) != 0)
--    return 1;
--  return 0;
--}
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_CHFLAGS 1
--_ACEOF
--
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--
--{ echo "$as_me:$LINENO: checking for lchflags" >&5
--echo $ECHO_N "checking for lchflags... $ECHO_C" >&6; }
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <sys/stat.h>
--#include <unistd.h>
--int main(int argc, char*argv[])
--{
--  if(lchflags(argv[0], 0) != 0)
--    return 1;
--  return 0;
--}
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LCHFLAGS 1
--_ACEOF
--
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
- 
- 
- 
-@@ -22435,84 +22300,6 @@ fi
- 
- LIBS=$LIBS_SAVE
- 
--# Multiprocessing check for broken sem_getvalue
--{ echo "$as_me:$LINENO: checking for broken sem_getvalue" >&5
--echo $ECHO_N "checking for broken sem_getvalue... $ECHO_C" >&6; }
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--#include <unistd.h>
--#include <fcntl.h>
--#include <stdio.h>
--#include <semaphore.h>
--#include <sys/stat.h>
--
--int main(void){
--  sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
--  int count;
--  int res;
--  if(a==SEM_FAILED){
--    perror("sem_open");
--    return 1;
--
--  }
--  res = sem_getvalue(a, &count);
--  sem_close(a);
--  return res==-1 ? 1 : 0;
--}
--
--
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_BROKEN_SEM_GETVALUE 1
--_ACEOF
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
- 
- 
- 
-@@ -25145,94 +24932,6 @@ else
- echo "${ECHO_T}no" >&6; }
- fi
- 
--{ echo "$as_me:$LINENO: checking for %zd printf() format support" >&5
--echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; }
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdio.h>
--#include <stddef.h>
--#include <string.h>
--
--#ifdef HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
--
--#ifdef HAVE_SSIZE_T
--typedef ssize_t Py_ssize_t;
--#elif SIZEOF_VOID_P == SIZEOF_LONG
--typedef long Py_ssize_t;
--#else
--typedef int Py_ssize_t;
--#endif
--
--int main()
--{
--    char buffer[256];
--
--    if(sprintf(buffer, "%zd", (size_t)123) < 0)
--       	return 1;
--
--    if (strcmp(buffer, "123"))
--	return 1;
--
--    if (sprintf(buffer, "%zd", (Py_ssize_t)-123) < 0)
--       	return 1;
--
--    if (strcmp(buffer, "-123"))
--	return 1;
--
--    return 0;
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--
--cat >>confdefs.h <<\_ACEOF
--#define PY_FORMAT_SIZE_T "z"
--_ACEOF
--
--else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
- 
- 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_sys_machine" >&5
+ $as_echo "$ac_sys_machine" >&6; }
  
diff --git a/package/python/patches/patch-setup_py b/package/python/patches/patch-setup_py
index c9f3dfe08..2c910039c 100644
--- a/package/python/patches/patch-setup_py
+++ b/package/python/patches/patch-setup_py
@@ -1,6 +1,7 @@
---- Python-3.1.1.orig/setup.py	2009-08-12 20:39:44.000000000 +0200
-+++ Python-3.1.1/setup.py	2009-09-28 19:12:33.550271196 +0200
-@@ -255,36 +255,6 @@ class PyBuildExt(build_ext):
+diff -Nur Python-3.2.2.orig/setup.py Python-3.2.2/setup.py
+--- Python-3.2.2.orig/setup.py	2011-09-03 18:16:50.000000000 +0200
++++ Python-3.2.2/setup.py	2011-09-05 12:17:57.000000000 +0200
+@@ -332,36 +332,6 @@
          # cached.  Clear that cache before trying to import.
          sys.path_importer_cache.clear()
  
@@ -37,32 +38,32 @@
  
      def get_platform(self):
          # Get value of sys.platform
-@@ -295,8 +265,8 @@ class PyBuildExt(build_ext):
- 
-     def detect_modules(self):
-         # Ensure that /usr/local is always used
+@@ -396,8 +366,8 @@
+         # Ensure that /usr/local is always used, but the local build
+         # directories (i.e. '.' and 'Include') must be first.  See issue
+         # 10520.
 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 -        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 +        #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 +        #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
-@@ -332,20 +302,22 @@ class PyBuildExt(build_ext):
+@@ -434,25 +404,16 @@
                      for directory in reversed(options.dirs):
                          add_dir_to_list(dir_list, directory)
  
--        if os.path.normpath(sys.prefix) != '/usr':
+-        if os.path.normpath(sys.prefix) != '/usr' \
+-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+-            # building a framework with different architectures than
+-            # the one that is currently installed (issue #7473)
 -            add_dir_to_list(self.compiler.library_dirs,
 -                            sysconfig.get_config_var("LIBDIR"))
 -            add_dir_to_list(self.compiler.include_dirs,
 -                            sysconfig.get_config_var("INCLUDEDIR"))
-+        #if os.path.normpath(sys.prefix) != '/usr':
-+        #    add_dir_to_list(self.compiler.library_dirs,
-+        #                    sysconfig.get_config_var("LIBDIR"))
-+        #    add_dir_to_list(self.compiler.include_dirs,
-+        #                    sysconfig.get_config_var("INCLUDEDIR"))
- 
+-
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
@@ -71,13 +72,13 @@
 -            '/lib', '/usr/lib',
 -            ]
 -        inc_dirs = self.compiler.include_dirs + ['/usr/include']
-+        #lib_dirs = self.compiler.library_dirs + [
++        lib_dirs = self.compiler.library_dirs 
++	#+ [
 +        #    '/lib64', '/usr/lib64',
 +        #    '/lib', '/usr/lib',
 +        #    ]
-+        #inc_dirs = self.compiler.include_dirs + ['/usr/include']
-+        inc_dirs = self.compiler.include_dirs
-+        lib_dirs = self.compiler.library_dirs
++        inc_dirs = self.compiler.include_dirs 
++	#+ ['/usr/include']
          exts = []
          missing = []
  
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 200e9d225..53e770f2d 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		python2
 PKG_VERSION:=		2.7.1
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		15ed56733655e3fab785e49a7278d2fb
 PKG_DESCR:=		Python scripting language (Version 2)
 PKG_SECTION:=		lang
+PKG_BUILDDEP:=		zlib libffi openssl readline bzip2
 PKG_DEPENDS:=		libpthread zlib libffi libopenssl
-PKG_BUILDDEP:=		zlib libffi openssl
 PKG_URL:=		http://www.python.org/
 PKG_SITES:=		http://www.python.org/ftp/python/${PKG_VERSION}/
 PKG_OPTS:=		noscripts
@@ -20,9 +20,15 @@ PKG_HOST_DEPENDS:=	!netbsd !openbsd !cygwin
 DISTFILES=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
 
+PKG_SUBPKGS:=		PYTHON2 PYTHON2_READLINE PYTHON2_BZIP2
+PKGSS_PYTHON2_READLINE:=libreadline
+PKGSS_PYTHON2_BZIP2:=	bzip2
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PYTHON2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PYTHON2_BZIP2,${PKG_NAME}-bzip2,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_BZIP2},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,PYTHON2_READLINE,${PKG_NAME}-readline,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_PYTHON2_READLINE},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			RANLIB="${TARGET_CROSS}ranlib" \
@@ -36,6 +42,8 @@ CONFIGURE_ARGS:=	--with-threads \
 			--without-cxx-main
 
 post-extract:
+	$(CP) ${WRKBUILD}/setup.py ${WRKBUILD}/setup.py.sav
+	$(CP) ./files/setup.py ${WRKBUILD}/setup.py
 	$(CP) ./files/posixmodule.c ${WRKBUILD}/Modules/posixmodule.c
 	$(CP) ./files/python-config.in ${WRKBUILD}/Misc/python-config.in
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -49,7 +57,8 @@ post-extract:
 	${CP} ${WRKBUILD}/python ${STAGING_HOST_DIR}/usr/bin/hostpython
 	${CP} ${WRKBUILD}/Parser/pgen ${WRKBUILD}/Parser/hostpgen
 	${CP} ${WRKBUILD}/python ${WRKBUILD}/hostpython
-	$(MAKE) -C ${WRKBUILD} clean
+	$(MAKE) -C ${WRKBUILD} distclean
+	$(CP) ${WRKBUILD}/setup.py.sav ${WRKBUILD}/setup.py
 
 pre-configure:
 	$(SED) "s#@@CPU_ARCH@@#$(CPU_ARCH)#" ${WRKBUILD}/configure
@@ -63,7 +72,19 @@ post-install:
 	${CP} ${WRKINST}/usr/lib/python2.7/* ${IDIR_PYTHON2}/usr/lib/python2.7
 	${CP} ${WRKINST}/usr/include/python2.7/* ${IDIR_PYTHON2}/usr/include/python2.7
 	-find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
+	rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/readline.so
+	rm ${IDIR_PYTHON2}/usr/lib/python2.7/lib-dynload/bz2.so
 	# workaround, copy host python-config to target scripts directory
 	${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_DIR}/scripts
 
+python2-readline-install:
+	${INSTALL_DIR} ${IDIR_PYTHON2_READLINE}/usr/lib/python2.7/lib-dynload
+	${CP} ${WRKINST}/usr/lib/python2.7/lib-dynload/readline.so \
+		${IDIR_PYTHON2_READLINE}/usr/lib/python2.7/lib-dynload
+
+python2-bzip2-install:
+	${INSTALL_DIR} ${IDIR_PYTHON2_BZIP2}/usr/lib/python2.7/lib-dynload
+	${CP} ${WRKINST}/usr/lib/python2.7/lib-dynload/bz2.so \
+		${IDIR_PYTHON2_BZIP2}/usr/lib/python2.7/lib-dynload
+
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/python2/files/setup.py b/package/python2/files/setup.py
new file mode 100644
index 000000000..baf694e16
--- /dev/null
+++ b/package/python2/files/setup.py
@@ -0,0 +1,2076 @@
+# Autodetecting setup.py script for building the Python extensions
+#
+
+__version__ = "$Revision: 86041 $"
+
+import sys, os, imp, re, optparse
+from glob import glob
+from platform import machine as platform_machine
+import sysconfig
+
+from distutils import log
+from distutils import text_file
+from distutils.errors import *
+from distutils.core import Extension, setup
+from distutils.command.build_ext import build_ext
+from distutils.command.install import install
+from distutils.command.install_lib import install_lib
+from distutils.spawn import find_executable
+
+# Were we compiled --with-pydebug or with #define Py_DEBUG?
+COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+
+# This global variable is used to hold the list of modules to be disabled.
+disabled_module_list = []
+
+def add_dir_to_list(dirlist, dir):
+    """Add the directory 'dir' to the list 'dirlist' (at the front) if
+    1) 'dir' is not already in 'dirlist'
+    2) 'dir' actually exists, and is a directory."""
+    if dir is not None and os.path.isdir(dir) and dir not in dirlist:
+        dirlist.insert(0, dir)
+
+def macosx_sdk_root():
+    """
+    Return the directory of the current OSX SDK,
+    or '/' if no SDK was specified.
+    """
+    cflags = sysconfig.get_config_var('CFLAGS')
+    m = re.search(r'-isysroot\s+(\S+)', cflags)
+    if m is None:
+        sysroot = '/'
+    else:
+        sysroot = m.group(1)
+    return sysroot
+
+def is_macosx_sdk_path(path):
+    """
+    Returns True if 'path' can be located in an OSX SDK
+    """
+    return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
+
+def find_file(filename, std_dirs, paths):
+    """Searches for the directory where a given file is located,
+    and returns a possibly-empty list of additional directories, or None
+    if the file couldn't be found at all.
+
+    'filename' is the name of a file, such as readline.h or libcrypto.a.
+    'std_dirs' is the list of standard system directories; if the
+        file is found in one of them, no additional directives are needed.
+    'paths' is a list of additional locations to check; if the file is
+        found in one of them, the resulting list will contain the directory.
+    """
+    if sys.platform == 'darwin':
+        # Honor the MacOSX SDK setting when one was specified.
+        # An SDK is a directory with the same structure as a real
+        # system, but with only header files and libraries.
+        sysroot = macosx_sdk_root()
+
+    # Check the standard locations
+    for dir in std_dirs:
+        f = os.path.join(dir, filename)
+
+        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
+            f = os.path.join(sysroot, dir[1:], filename)
+
+        if os.path.exists(f): return []
+
+    # Check the additional directories
+    for dir in paths:
+        f = os.path.join(dir, filename)
+
+        if sys.platform == 'darwin' and is_macosx_sdk_path(dir):
+            f = os.path.join(sysroot, dir[1:], filename)
+
+        if os.path.exists(f):
+            return [dir]
+
+    # Not found anywhere
+    return None
+
+def find_library_file(compiler, libname, std_dirs, paths):
+    result = compiler.find_library_file(std_dirs + paths, libname)
+    if result is None:
+        return None
+
+    if sys.platform == 'darwin':
+        sysroot = macosx_sdk_root()
+
+    # Check whether the found file is in one of the standard directories
+    dirname = os.path.dirname(result)
+    for p in std_dirs:
+        # Ensure path doesn't end with path separator
+        p = p.rstrip(os.sep)
+
+        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
+            if os.path.join(sysroot, p[1:]) == dirname:
+                return [ ]
+
+        if p == dirname:
+            return [ ]
+
+    # Otherwise, it must have been in one of the additional directories,
+    # so we have to figure out which one.
+    for p in paths:
+        # Ensure path doesn't end with path separator
+        p = p.rstrip(os.sep)
+
+        if sys.platform == 'darwin' and is_macosx_sdk_path(p):
+            if os.path.join(sysroot, p[1:]) == dirname:
+                return [ p ]
+
+        if p == dirname:
+            return [p]
+    else:
+        assert False, "Internal error: Path not found in std_dirs or paths"
+
+def module_enabled(extlist, modname):
+    """Returns whether the module 'modname' is present in the list
+    of extensions 'extlist'."""
+    extlist = [ext for ext in extlist if ext.name == modname]
+    return len(extlist)
+
+def find_module_file(module, dirlist):
+    """Find a module in a set of possible folders. If it is not found
+    return the unadorned filename"""
+    list = find_file(module, [], dirlist)
+    if not list:
+        return module
+    if len(list) > 1:
+        log.info("WARNING: multiple copies of %s found"%module)
+    return os.path.join(list[0], module)
+
+class PyBuildExt(build_ext):
+
+    def __init__(self, dist):
+        build_ext.__init__(self, dist)
+        self.failed = []
+
+    def build_extensions(self):
+
+        # Detect which modules should be compiled
+        missing = self.detect_modules()
+
+        # Remove modules that are present on the disabled list
+        extensions = [ext for ext in self.extensions
+                      if ext.name not in disabled_module_list]
+        # move ctypes to the end, it depends on other modules
+        ext_map = dict((ext.name, i) for i, ext in enumerate(extensions))
+        if "_ctypes" in ext_map:
+            ctypes = extensions.pop(ext_map["_ctypes"])
+            extensions.append(ctypes)
+        self.extensions = extensions
+
+        # Fix up the autodetected modules, prefixing all the source files
+        # with Modules/ and adding Python's include directory to the path.
+        (srcdir,) = sysconfig.get_config_vars('srcdir')
+        if not srcdir:
+            # Maybe running on Windows but not using CYGWIN?
+            raise ValueError("No source directory; cannot proceed.")
+        srcdir = os.path.abspath(srcdir)
+        moddirlist = [os.path.join(srcdir, 'Modules')]
+
+        # Platform-dependent module source and include directories
+        incdirlist = []
+        platform = self.get_platform()
+        if platform == 'darwin' and ("--disable-toolbox-glue" not in
+            sysconfig.get_config_var("CONFIG_ARGS")):
+            # Mac OS X also includes some mac-specific modules
+            macmoddir = os.path.join(srcdir, 'Mac/Modules')
+            moddirlist.append(macmoddir)
+            incdirlist.append(os.path.join(srcdir, 'Mac/Include'))
+
+        # Fix up the paths for scripts, too
+        self.distribution.scripts = [os.path.join(srcdir, filename)
+                                     for filename in self.distribution.scripts]
+
+        # Python header files
+        headers = [sysconfig.get_config_h_filename()]
+        headers += glob(os.path.join(sysconfig.get_path('platinclude'), "*.h"))
+        for ext in self.extensions[:]:
+            ext.sources = [ find_module_file(filename, moddirlist)
+                            for filename in ext.sources ]
+            if ext.depends is not None:
+                ext.depends = [find_module_file(filename, moddirlist)
+                               for filename in ext.depends]
+            else:
+                ext.depends = []
+            # re-compile extensions if a header file has been changed
+            ext.depends.extend(headers)
+
+            # platform specific include directories
+            ext.include_dirs.extend(incdirlist)
+
+            # If a module has already been built statically,
+            # don't build it here
+            if ext.name in sys.builtin_module_names:
+                self.extensions.remove(ext)
+
+        # Parse Modules/Setup and Modules/Setup.local to figure out which
+        # modules are turned on in the file.
+        remove_modules = []
+        for filename in ('Modules/Setup', 'Modules/Setup.local'):
+            input = text_file.TextFile(filename, join_lines=1)
+            while 1:
+                line = input.readline()
+                if not line: break
+                line = line.split()
+                remove_modules.append(line[0])
+            input.close()
+
+        for ext in self.extensions[:]:
+            if ext.name in remove_modules:
+                self.extensions.remove(ext)
+
+        # When you run "make CC=altcc" or something similar, you really want
+        # those environment variables passed into the setup.py phase.  Here's
+        # a small set of useful ones.
+        compiler = os.environ.get('CC')
+        args = {}
+        # unfortunately, distutils doesn't let us provide separate C and C++
+        # compilers
+        if compiler is not None:
+            (ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
+            args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
+        self.compiler.set_executables(**args)
+
+        build_ext.build_extensions(self)
+
+        longest = max([len(e.name) for e in self.extensions])
+        if self.failed:
+            longest = max(longest, max([len(name) for name in self.failed]))
+
+        def print_three_column(lst):
+            lst.sort(key=str.lower)
+            # guarantee zip() doesn't drop anything
+            while len(lst) % 3:
+                lst.append("")
+            for e, f, g in zip(lst[::3], lst[1::3], lst[2::3]):
+                print "%-*s   %-*s   %-*s" % (longest, e, longest, f,
+                                              longest, g)
+
+        if missing:
+            print
+            print ("Python build finished, but the necessary bits to build "
+                   "these modules were not found:")
+            print_three_column(missing)
+            print ("To find the necessary bits, look in setup.py in"
+                   " detect_modules() for the module's name.")
+            print
+
+        if self.failed:
+            failed = self.failed[:]
+            print
+            print "Failed to build these modules:"
+            print_three_column(failed)
+            print
+
+    def build_extension(self, ext):
+
+        if ext.name == '_ctypes':
+            if not self.configure_ctypes(ext):
+                return
+
+        try:
+            build_ext.build_extension(self, ext)
+        except (CCompilerError, DistutilsError), why:
+            self.announce('WARNING: building of extension "%s" failed: %s' %
+                          (ext.name, sys.exc_info()[1]))
+            self.failed.append(ext.name)
+            return
+        # Workaround for Mac OS X: The Carbon-based modules cannot be
+        # reliably imported into a command-line Python
+        if 'Carbon' in ext.extra_link_args:
+            self.announce(
+                'WARNING: skipping import check for Carbon-based "%s"' %
+                ext.name)
+            return
+
+        if self.get_platform() == 'darwin' and (
+                sys.maxint > 2**32 and '-arch' in ext.extra_link_args):
+            # Don't bother doing an import check when an extension was
+            # build with an explicit '-arch' flag on OSX. That's currently
+            # only used to build 32-bit only extensions in a 4-way
+            # universal build and loading 32-bit code into a 64-bit
+            # process will fail.
+            self.announce(
+                'WARNING: skipping import check for "%s"' %
+                ext.name)
+            return
+
+        # Workaround for Cygwin: Cygwin currently has fork issues when many
+        # modules have been imported
+        if self.get_platform() == 'cygwin':
+            self.announce('WARNING: skipping import check for Cygwin-based "%s"'
+                % ext.name)
+            return
+        ext_filename = os.path.join(
+            self.build_lib,
+            self.get_ext_filename(self.get_ext_fullname(ext.name)))
+        try:
+            imp.load_dynamic(ext.name, ext_filename)
+        except ImportError, why:
+            self.failed.append(ext.name)
+            self.announce('*** WARNING: renaming "%s" since importing it'
+                          ' failed: %s' % (ext.name, why), level=3)
+            assert not self.inplace
+            basename, tail = os.path.splitext(ext_filename)
+            newname = basename + "_failed" + tail
+            if os.path.exists(newname):
+                os.remove(newname)
+            os.rename(ext_filename, newname)
+
+            # XXX -- This relies on a Vile HACK in
+            # distutils.command.build_ext.build_extension().  The
+            # _built_objects attribute is stored there strictly for
+            # use here.
+            # If there is a failure, _built_objects may not be there,
+            # so catch the AttributeError and move on.
+            try:
+                for filename in self._built_objects:
+                    os.remove(filename)
+            except AttributeError:
+                self.announce('unable to remove files (ignored)')
+        except:
+            exc_type, why, tb = sys.exc_info()
+            self.announce('*** WARNING: importing extension "%s" '
+                          'failed with %s: %s' % (ext.name, exc_type, why),
+                          level=3)
+            self.failed.append(ext.name)
+
+    def get_platform(self):
+        # Get value of sys.platform
+        for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
+            if sys.platform.startswith(platform):
+                return platform
+        return sys.platform
+
+    def add_multiarch_paths(self):
+        # Debian/Ubuntu multiarch support.
+        # https://wiki.ubuntu.com/MultiarchSpec
+        if not find_executable('dpkg-architecture'):
+            return
+        tmpfile = os.path.join(self.build_temp, 'multiarch')
+        if not os.path.exists(self.build_temp):
+            os.makedirs(self.build_temp)
+        ret = os.system(
+            'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
+            tmpfile)
+        try:
+            if ret >> 8 == 0:
+                with open(tmpfile) as fp:
+                    multiarch_path_component = fp.readline().strip()
+                add_dir_to_list(self.compiler.library_dirs,
+                                '/usr/lib/' + multiarch_path_component)
+                add_dir_to_list(self.compiler.include_dirs,
+                                '/usr/include/' + multiarch_path_component)
+        finally:
+            os.unlink(tmpfile)
+
+    def detect_modules(self):
+        # Ensure that /usr/local is always used
+        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+	self.add_multiarch_paths()
+
+        # Add paths specified in the environment variables LDFLAGS and
+        # CPPFLAGS for header and library files.
+        # We must get the values from the Makefile and not the environment
+        # directly since an inconsistently reproducible issue comes up where
+        # the environment variable is not set even though the value were passed
+        # into configure and stored in the Makefile (issue found on OS X 10.3).
+        for env_var, arg_name, dir_list in (
+                ('LDFLAGS', '-R', self.compiler.runtime_library_dirs),
+                ('LDFLAGS', '-L', self.compiler.library_dirs),
+                ('CPPFLAGS', '-I', self.compiler.include_dirs)):
+            env_val = sysconfig.get_config_var(env_var)
+            if env_val:
+                # To prevent optparse from raising an exception about any
+                # options in env_val that it doesn't know about we strip out
+                # all double dashes and any dashes followed by a character
+                # that is not for the option we are dealing with.
+                #
+                # Please note that order of the regex is important!  We must
+                # strip out double-dashes first so that we don't end up with
+                # substituting "--Long" to "-Long" and thus lead to "ong" being
+                # used for a library directory.
+                env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1],
+                                 ' ', env_val)
+                parser = optparse.OptionParser()
+                # Make sure that allowing args interspersed with options is
+                # allowed
+                parser.allow_interspersed_args = True
+                parser.error = lambda msg: None
+                parser.add_option(arg_name, dest="dirs", action="append")
+                options = parser.parse_args(env_val.split())[0]
+                if options.dirs:
+                    for directory in reversed(options.dirs):
+                        add_dir_to_list(dir_list, directory)
+
+        if os.path.normpath(sys.prefix) != '/usr' \
+                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+            # building a framework with different architectures than
+            # the one that is currently installed (issue #7473)
+            add_dir_to_list(self.compiler.library_dirs,
+                            sysconfig.get_config_var("LIBDIR"))
+            add_dir_to_list(self.compiler.include_dirs,
+                            sysconfig.get_config_var("INCLUDEDIR"))
+
+        try:
+            have_unicode = unicode
+        except NameError:
+            have_unicode = 0
+
+        # lib_dirs and inc_dirs are used to search for files;
+        # if a file is found in one of those directories, it can
+        # be assumed that no additional -I,-L directives are needed.
+        lib_dirs = self.compiler.library_dirs + [
+            '/lib64', '/usr/lib64',
+            '/lib', '/usr/lib',
+            ]
+        inc_dirs = self.compiler.include_dirs + ['/usr/include']
+        exts = []
+        missing = []
+
+        config_h = sysconfig.get_config_h_filename()
+        config_h_vars = sysconfig.parse_config_h(open(config_h))
+
+        platform = self.get_platform()
+        srcdir = sysconfig.get_config_var('srcdir')
+
+        # Check for AtheOS which has libraries in non-standard locations
+        if platform == 'atheos':
+            lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
+            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+            inc_dirs += ['/system/include', '/atheos/autolnk/include']
+            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+
+        # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
+        if platform in ['osf1', 'unixware7', 'openunix8']:
+            lib_dirs += ['/usr/ccs/lib']
+
+        if platform == 'darwin':
+            # This should work on any unixy platform ;-)
+            # If the user has bothered specifying additional -I and -L flags
+            # in OPT and LDFLAGS we might as well use them here.
+            #   NOTE: using shlex.split would technically be more correct, but
+            # also gives a bootstrap problem. Let's hope nobody uses directories
+            # with whitespace in the name to store libraries.
+            cflags, ldflags = sysconfig.get_config_vars(
+                    'CFLAGS', 'LDFLAGS')
+            for item in cflags.split():
+                if item.startswith('-I'):
+                    inc_dirs.append(item[2:])
+
+            for item in ldflags.split():
+                if item.startswith('-L'):
+                    lib_dirs.append(item[2:])
+
+        # Check for MacOS X, which doesn't need libm.a at all
+        math_libs = ['m']
+        if platform in ['darwin', 'beos']:
+            math_libs = []
+
+        # XXX Omitted modules: gl, pure, dl, SGI-specific modules
+
+        #
+        # The following modules are all pretty straightforward, and compile
+        # on pretty much any POSIXish platform.
+        #
+
+        # Some modules that are normally always on:
+        #exts.append( Extension('_weakref', ['_weakref.c']) )
+
+        # array objects
+        exts.append( Extension('array', ['arraymodule.c']) )
+        # complex math library functions
+        exts.append( Extension('cmath', ['cmathmodule.c', '_math.c'],
+                               depends=['_math.h'],
+                               libraries=math_libs) )
+        # math library functions, e.g. sin()
+        exts.append( Extension('math',  ['mathmodule.c', '_math.c'],
+                               depends=['_math.h'],
+                               libraries=math_libs) )
+        # fast string operations implemented in C
+        exts.append( Extension('strop', ['stropmodule.c']) )
+        # time operations and variables
+        exts.append( Extension('time', ['timemodule.c'],
+                               libraries=math_libs) )
+        exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
+                               libraries=math_libs) )
+        # fast iterator tools implemented in C
+        exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
+        # code that will be builtins in the future, but conflict with the
+        #  current builtins
+        exts.append( Extension('future_builtins', ['future_builtins.c']) )
+        # random number generator implemented in C
+        exts.append( Extension("_random", ["_randommodule.c"]) )
+        # high-performance collections
+        exts.append( Extension("_collections", ["_collectionsmodule.c"]) )
+        # bisect
+        exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
+        # heapq
+        exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
+        # operator.add() and similar goodies
+        exts.append( Extension('operator', ['operator.c']) )
+        # Python 3.1 _io library
+        exts.append( Extension("_io",
+            ["_io/bufferedio.c", "_io/bytesio.c", "_io/fileio.c",
+             "_io/iobase.c", "_io/_iomodule.c", "_io/stringio.c", "_io/textio.c"],
+             depends=["_io/_iomodule.h"], include_dirs=["Modules/_io"]))
+        # _functools
+        exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
+        # _json speedups
+        exts.append( Extension("_json", ["_json.c"]) )
+        # Python C API test module
+        exts.append( Extension('_testcapi', ['_testcapimodule.c'],
+                               depends=['testcapi_long.h']) )
+        # profilers (_lsprof is for cProfile.py)
+        exts.append( Extension('_hotshot', ['_hotshot.c']) )
+        exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
+        # static Unicode character database
+        if have_unicode:
+            exts.append( Extension('unicodedata', ['unicodedata.c']) )
+        else:
+            missing.append('unicodedata')
+        # access to ISO C locale support
+        data = open('pyconfig.h').read()
+        m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
+        if m is not None:
+            locale_libs = ['intl']
+        else:
+            locale_libs = []
+        if platform == 'darwin':
+            locale_extra_link_args = ['-framework', 'CoreFoundation']
+        else:
+            locale_extra_link_args = []
+
+
+        exts.append( Extension('_locale', ['_localemodule.c'],
+                               libraries=locale_libs,
+                               extra_link_args=locale_extra_link_args) )
+
+        # Modules with some UNIX dependencies -- on by default:
+        # (If you have a really backward UNIX, select and socket may not be
+        # supported...)
+
+        # fcntl(2) and ioctl(2)
+        libs = []
+        if (config_h_vars.get('FLOCK_NEEDS_LIBBSD', False)):
+            # May be necessary on AIX for flock function
+            libs = ['bsd']
+        exts.append( Extension('fcntl', ['fcntlmodule.c'], libraries=libs) )
+        # pwd(3)
+        exts.append( Extension('pwd', ['pwdmodule.c']) )
+        # grp(3)
+        exts.append( Extension('grp', ['grpmodule.c']) )
+        # spwd, shadow passwords
+        if (config_h_vars.get('HAVE_GETSPNAM', False) or
+                config_h_vars.get('HAVE_GETSPENT', False)):
+            exts.append( Extension('spwd', ['spwdmodule.c']) )
+        else:
+            missing.append('spwd')
+
+        # select(2); not on ancient System V
+        exts.append( Extension('select', ['selectmodule.c']) )
+
+        # Fred Drake's interface to the Python parser
+        exts.append( Extension('parser', ['parsermodule.c']) )
+
+        # cStringIO and cPickle
+        exts.append( Extension('cStringIO', ['cStringIO.c']) )
+        exts.append( Extension('cPickle', ['cPickle.c']) )
+
+        # Memory-mapped files (also works on Win32).
+        if platform not in ['atheos']:
+            exts.append( Extension('mmap', ['mmapmodule.c']) )
+        else:
+            missing.append('mmap')
+
+        # Lance Ellinghaus's syslog module
+        # syslog daemon interface
+        exts.append( Extension('syslog', ['syslogmodule.c']) )
+
+        # George Neville-Neil's timing module:
+        # Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
+        # http://mail.python.org/pipermail/python-dev/2006-January/060023.html
+        #exts.append( Extension('timing', ['timingmodule.c']) )
+
+        #
+        # Here ends the simple stuff.  From here on, modules need certain
+        # libraries, are platform-specific, or present other surprises.
+        #
+
+        # Multimedia modules
+        # These don't work for 64-bit platforms!!!
+        # These represent audio samples or images as strings:
+
+        # Operations on audio samples
+        # According to #993173, this one should actually work fine on
+        # 64-bit platforms.
+        exts.append( Extension('audioop', ['audioop.c']) )
+
+        # Disabled on 64-bit platforms
+        if sys.maxint != 9223372036854775807L:
+            # Operations on images
+            exts.append( Extension('imageop', ['imageop.c']) )
+        else:
+            missing.extend(['imageop'])
+
+        # readline
+        do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
+        readline_termcap_library = ""
+        curses_library = ""
+        # Determine if readline is already linked against curses or tinfo.
+        if do_readline and find_executable('ldd'):
+            fp = os.popen("ldd %s" % do_readline)
+            ldd_output = fp.readlines()
+            ret = fp.close()
+            if ret is None or ret >> 8 == 0:
+                for ln in ldd_output:
+                    if 'curses' in ln:
+                        readline_termcap_library = re.sub(
+                            r'.*lib(n?cursesw?)\.so.*', r'\1', ln
+                        ).rstrip()
+                        break
+                    if 'tinfo' in ln: # termcap interface split out from ncurses
+                        readline_termcap_library = 'tinfo'
+                        break
+        # Issue 7384: If readline is already linked against curses,
+        # use the same library for the readline and curses modules.
+        if 'curses' in readline_termcap_library:
+            curses_library = readline_termcap_library
+        elif self.compiler.find_library_file(lib_dirs, 'ncursesw'):
+            curses_library = 'ncursesw'
+        elif self.compiler.find_library_file(lib_dirs, 'ncurses'):
+            curses_library = 'ncurses'
+        elif self.compiler.find_library_file(lib_dirs, 'curses'):
+            curses_library = 'curses'
+
+        if platform == 'darwin':
+            os_release = int(os.uname()[2].split('.')[0])
+            dep_target = sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET')
+            if dep_target and dep_target.split('.') < ['10', '5']:
+                os_release = 8
+            if os_release < 9:
+                # MacOSX 10.4 has a broken readline. Don't try to build
+                # the readline module unless the user has installed a fixed
+                # readline package
+                if find_file('readline/rlconf.h', inc_dirs, []) is None:
+                    do_readline = False
+        if do_readline:
+            if platform == 'darwin' and os_release < 9:
+                # In every directory on the search path search for a dynamic
+                # library and then a static library, instead of first looking
+                # for dynamic libraries on the entiry path.
+                # This way a staticly linked custom readline gets picked up
+                # before the (possibly broken) dynamic library in /usr/lib.
+                readline_extra_link_args = ('-Wl,-search_paths_first',)
+            else:
+                readline_extra_link_args = ()
+
+            readline_libs = ['readline']
+            if readline_termcap_library:
+                pass # Issue 7384: Already linked against curses or tinfo.
+            elif curses_library:
+                readline_libs.append(curses_library)
+            elif self.compiler.find_library_file(lib_dirs +
+                                                     ['/usr/lib/termcap'],
+                                                     'termcap'):
+                readline_libs.append('termcap')
+            exts.append( Extension('readline', ['readline.c'],
+                                   library_dirs=['/usr/lib/termcap'],
+                                   extra_link_args=readline_extra_link_args,
+                                   libraries=readline_libs) )
+        else:
+            missing.append('readline')
+
+        # crypt module.
+
+        if self.compiler.find_library_file(lib_dirs, 'crypt'):
+            libs = ['crypt']
+        else:
+            libs = []
+        exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
+
+        # CSV files
+        exts.append( Extension('_csv', ['_csv.c']) )
+
+        # socket(2)
+        exts.append( Extension('_socket', ['socketmodule.c'],
+                               depends = ['socketmodule.h']) )
+        # Detect SSL support for the socket module (via _ssl)
+        search_for_ssl_incs_in = [
+                              '/usr/local/ssl/include',
+                              '/usr/contrib/ssl/include/'
+                             ]
+        ssl_incs = find_file('openssl/ssl.h', inc_dirs,
+                             search_for_ssl_incs_in
+                             )
+        if ssl_incs is not None:
+            krb5_h = find_file('krb5.h', inc_dirs,
+                               ['/usr/kerberos/include'])
+            if krb5_h:
+                ssl_incs += krb5_h
+        ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+                                     ['/usr/local/ssl/lib',
+                                      '/usr/contrib/ssl/lib/'
+                                     ] )
+
+        if (ssl_incs is not None and
+            ssl_libs is not None):
+            exts.append( Extension('_ssl', ['_ssl.c'],
+                                   include_dirs = ssl_incs,
+                                   library_dirs = ssl_libs,
+                                   libraries = ['ssl', 'crypto'],
+                                   depends = ['socketmodule.h']), )
+        else:
+            missing.append('_ssl')
+
+        # find out which version of OpenSSL we have
+        openssl_ver = 0
+        openssl_ver_re = re.compile(
+            '^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
+
+        # look for the openssl version header on the compiler search path.
+        opensslv_h = find_file('openssl/opensslv.h', [],
+                inc_dirs + search_for_ssl_incs_in)
+        if opensslv_h:
+            name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
+            if sys.platform == 'darwin' and is_macosx_sdk_path(name):
+                name = os.path.join(macosx_sdk_root(), name[1:])
+            try:
+                incfile = open(name, 'r')
+                for line in incfile:
+                    m = openssl_ver_re.match(line)
+                    if m:
+                        openssl_ver = eval(m.group(1))
+            except IOError, msg:
+                print "IOError while reading opensshv.h:", msg
+                pass
+
+        min_openssl_ver = 0x00907000
+        have_any_openssl = ssl_incs is not None and ssl_libs is not None
+        have_usable_openssl = (have_any_openssl and
+                               openssl_ver >= min_openssl_ver)
+
+        if have_any_openssl:
+            if have_usable_openssl:
+                # The _hashlib module wraps optimized implementations
+                # of hash functions from the OpenSSL library.
+                exts.append( Extension('_hashlib', ['_hashopenssl.c'],
+                                       include_dirs = ssl_incs,
+                                       library_dirs = ssl_libs,
+                                       libraries = ['ssl', 'crypto']) )
+            else:
+                print ("warning: openssl 0x%08x is too old for _hashlib" %
+                       openssl_ver)
+                missing.append('_hashlib')
+        if COMPILED_WITH_PYDEBUG or not have_usable_openssl:
+            # The _sha module implements the SHA1 hash algorithm.
+            exts.append( Extension('_sha', ['shamodule.c']) )
+            # The _md5 module implements the RSA Data Security, Inc. MD5
+            # Message-Digest Algorithm, described in RFC 1321.  The
+            # necessary files md5.c and md5.h are included here.
+            exts.append( Extension('_md5',
+                            sources = ['md5module.c', 'md5.c'],
+                            depends = ['md5.h']) )
+
+        min_sha2_openssl_ver = 0x00908000
+        if COMPILED_WITH_PYDEBUG or openssl_ver < min_sha2_openssl_ver:
+            # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
+            exts.append( Extension('_sha256', ['sha256module.c']) )
+            exts.append( Extension('_sha512', ['sha512module.c']) )
+
+        # Modules that provide persistent dictionary-like semantics.  You will
+        # probably want to arrange for at least one of them to be available on
+        # your machine, though none are defined by default because of library
+        # dependencies.  The Python module anydbm.py provides an
+        # implementation independent wrapper for these; dumbdbm.py provides
+        # similar functionality (but slower of course) implemented in Python.
+
+        # Sleepycat^WOracle Berkeley DB interface.
+        #  http://www.oracle.com/database/berkeley-db/db/index.html
+        #
+        # This requires the Sleepycat^WOracle DB code. The supported versions
+        # are set below.  Visit the URL above to download
+        # a release.  Most open source OSes come with one or more
+        # versions of BerkeleyDB already installed.
+
+        max_db_ver = (4, 8)
+        min_db_ver = (4, 1)
+        db_setup_debug = False   # verbose debug prints from this script?
+
+        def allow_db_ver(db_ver):
+            """Returns a boolean if the given BerkeleyDB version is acceptable.
+
+            Args:
+              db_ver: A tuple of the version to verify.
+            """
+            if not (min_db_ver <= db_ver <= max_db_ver):
+                return False
+            # Use this function to filter out known bad configurations.
+            if (4, 6) == db_ver[:2]:
+                # BerkeleyDB 4.6.x is not stable on many architectures.
+                arch = platform_machine()
+                if arch not in ('i386', 'i486', 'i586', 'i686',
+                                'x86_64', 'ia64'):
+                    return False
+            return True
+
+        def gen_db_minor_ver_nums(major):
+            if major == 4:
+                for x in range(max_db_ver[1]+1):
+                    if allow_db_ver((4, x)):
+                        yield x
+            elif major == 3:
+                for x in (3,):
+                    if allow_db_ver((3, x)):
+                        yield x
+            else:
+                raise ValueError("unknown major BerkeleyDB version", major)
+
+        # construct a list of paths to look for the header file in on
+        # top of the normal inc_dirs.
+        db_inc_paths = [
+            '/usr/include/db4',
+            '/usr/local/include/db4',
+            '/opt/sfw/include/db4',
+            '/usr/include/db3',
+            '/usr/local/include/db3',
+            '/opt/sfw/include/db3',
+            # Fink defaults (http://fink.sourceforge.net/)
+            '/sw/include/db4',
+            '/sw/include/db3',
+        ]
+        # 4.x minor number specific paths
+        for x in gen_db_minor_ver_nums(4):
+            db_inc_paths.append('/usr/include/db4%d' % x)
+            db_inc_paths.append('/usr/include/db4.%d' % x)
+            db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
+            db_inc_paths.append('/usr/local/include/db4%d' % x)
+            db_inc_paths.append('/pkg/db-4.%d/include' % x)
+            db_inc_paths.append('/opt/db-4.%d/include' % x)
+            # MacPorts default (http://www.macports.org/)
+            db_inc_paths.append('/opt/local/include/db4%d' % x)
+        # 3.x minor number specific paths
+        for x in gen_db_minor_ver_nums(3):
+            db_inc_paths.append('/usr/include/db3%d' % x)
+            db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
+            db_inc_paths.append('/usr/local/include/db3%d' % x)
+            db_inc_paths.append('/pkg/db-3.%d/include' % x)
+            db_inc_paths.append('/opt/db-3.%d/include' % x)
+
+        # Add some common subdirectories for Sleepycat DB to the list,
+        # based on the standard include directories. This way DB3/4 gets
+        # picked up when it is installed in a non-standard prefix and
+        # the user has added that prefix into inc_dirs.
+        std_variants = []
+        for dn in inc_dirs:
+            std_variants.append(os.path.join(dn, 'db3'))
+            std_variants.append(os.path.join(dn, 'db4'))
+            for x in gen_db_minor_ver_nums(4):
+                std_variants.append(os.path.join(dn, "db4%d"%x))
+                std_variants.append(os.path.join(dn, "db4.%d"%x))
+            for x in gen_db_minor_ver_nums(3):
+                std_variants.append(os.path.join(dn, "db3%d"%x))
+                std_variants.append(os.path.join(dn, "db3.%d"%x))
+
+        db_inc_paths = std_variants + db_inc_paths
+        db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
+
+        db_ver_inc_map = {}
+
+        if sys.platform == 'darwin':
+            sysroot = macosx_sdk_root()
+
+        class db_found(Exception): pass
+        try:
+            # See whether there is a Sleepycat header in the standard
+            # search path.
+            for d in inc_dirs + db_inc_paths:
+                f = os.path.join(d, "db.h")
+
+                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
+                    f = os.path.join(sysroot, d[1:], "db.h")
+
+                if db_setup_debug: print "db: looking for db.h in", f
+                if os.path.exists(f):
+                    f = open(f).read()
+                    m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
+                    if m:
+                        db_major = int(m.group(1))
+                        m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
+                        db_minor = int(m.group(1))
+                        db_ver = (db_major, db_minor)
+
+                        # Avoid 4.6 prior to 4.6.21 due to a BerkeleyDB bug
+                        if db_ver == (4, 6):
+                            m = re.search(r"#define\WDB_VERSION_PATCH\W(\d+)", f)
+                            db_patch = int(m.group(1))
+                            if db_patch < 21:
+                                print "db.h:", db_ver, "patch", db_patch,
+                                print "being ignored (4.6.x must be >= 4.6.21)"
+                                continue
+
+                        if ( (db_ver not in db_ver_inc_map) and
+                            allow_db_ver(db_ver) ):
+                            # save the include directory with the db.h version
+                            # (first occurrence only)
+                            db_ver_inc_map[db_ver] = d
+                            if db_setup_debug:
+                                print "db.h: found", db_ver, "in", d
+                        else:
+                            # we already found a header for this library version
+                            if db_setup_debug: print "db.h: ignoring", d
+                    else:
+                        # ignore this header, it didn't contain a version number
+                        if db_setup_debug:
+                            print "db.h: no version number version in", d
+
+            db_found_vers = db_ver_inc_map.keys()
+            db_found_vers.sort()
+
+            while db_found_vers:
+                db_ver = db_found_vers.pop()
+                db_incdir = db_ver_inc_map[db_ver]
+
+                # check lib directories parallel to the location of the header
+                db_dirs_to_check = [
+                    db_incdir.replace("include", 'lib64'),
+                    db_incdir.replace("include", 'lib'),
+                ]
+
+                if sys.platform != 'darwin':
+                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+
+                else:
+                    # Same as other branch, but takes OSX SDK into account
+                    tmp = []
+                    for dn in db_dirs_to_check:
+                        if is_macosx_sdk_path(dn):
+                            if os.path.isdir(os.path.join(sysroot, dn[1:])):
+                                tmp.append(dn)
+                        else:
+                            if os.path.isdir(dn):
+                                tmp.append(dn)
+                    db_dirs_to_check = tmp
+
+                # Look for a version specific db-X.Y before an ambiguoius dbX
+                # XXX should we -ever- look for a dbX name?  Do any
+                # systems really not name their library by version and
+                # symlink to more general names?
+                for dblib in (('db-%d.%d' % db_ver),
+                              ('db%d%d' % db_ver),
+                              ('db%d' % db_ver[0])):
+                    dblib_file = self.compiler.find_library_file(
+                                    db_dirs_to_check + lib_dirs, dblib )
+                    if dblib_file:
+                        dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
+                        raise db_found
+                    else:
+                        if db_setup_debug: print "db lib: ", dblib, "not found"
+
+        except db_found:
+            if db_setup_debug:
+                print "bsddb using BerkeleyDB lib:", db_ver, dblib
+                print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
+            db_incs = [db_incdir]
+            dblibs = [dblib]
+            # We add the runtime_library_dirs argument because the
+            # BerkeleyDB lib we're linking against often isn't in the
+            # system dynamic library search path.  This is usually
+            # correct and most trouble free, but may cause problems in
+            # some unusual system configurations (e.g. the directory
+            # is on an NFS server that goes away).
+            exts.append(Extension('_bsddb', ['_bsddb.c'],
+                                  depends = ['bsddb.h'],
+                                  library_dirs=dblib_dir,
+                                  runtime_library_dirs=dblib_dir,
+                                  include_dirs=db_incs,
+                                  libraries=dblibs))
+        else:
+            if db_setup_debug: print "db: no appropriate library found"
+            db_incs = None
+            dblibs = []
+            dblib_dir = None
+            missing.append('_bsddb')
+
+        # The sqlite interface
+        sqlite_setup_debug = False   # verbose debug prints from this script?
+
+        # We hunt for #define SQLITE_VERSION "n.n.n"
+        # We need to find >= sqlite version 3.0.8
+        sqlite_incdir = sqlite_libdir = None
+        sqlite_inc_paths = [ '/usr/include',
+                             '/usr/include/sqlite',
+                             '/usr/include/sqlite3',
+                             '/usr/local/include',
+                             '/usr/local/include/sqlite',
+                             '/usr/local/include/sqlite3',
+                           ]
+        MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
+        MIN_SQLITE_VERSION = ".".join([str(x)
+                                    for x in MIN_SQLITE_VERSION_NUMBER])
+
+        # Scan the default include directories before the SQLite specific
+        # ones. This allows one to override the copy of sqlite on OSX,
+        # where /usr/include contains an old version of sqlite.
+        if sys.platform == 'darwin':
+            sysroot = macosx_sdk_root()
+
+        for d in inc_dirs + sqlite_inc_paths:
+            f = os.path.join(d, "sqlite3.h")
+
+            if sys.platform == 'darwin' and is_macosx_sdk_path(d):
+                f = os.path.join(sysroot, d[1:], "sqlite3.h")
+
+            if os.path.exists(f):
+                if sqlite_setup_debug: print "sqlite: found %s"%f
+                incf = open(f).read()
+                m = re.search(
+                    r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
+                if m:
+                    sqlite_version = m.group(1)
+                    sqlite_version_tuple = tuple([int(x)
+                                        for x in sqlite_version.split(".")])
+                    if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
+                        # we win!
+                        if sqlite_setup_debug:
+                            print "%s/sqlite3.h: version %s"%(d, sqlite_version)
+                        sqlite_incdir = d
+                        break
+                    else:
+                        if sqlite_setup_debug:
+                            print "%s: version %d is too old, need >= %s"%(d,
+                                        sqlite_version, MIN_SQLITE_VERSION)
+                elif sqlite_setup_debug:
+                    print "sqlite: %s had no SQLITE_VERSION"%(f,)
+
+        if sqlite_incdir:
+            sqlite_dirs_to_check = [
+                os.path.join(sqlite_incdir, '..', 'lib64'),
+                os.path.join(sqlite_incdir, '..', 'lib'),
+                os.path.join(sqlite_incdir, '..', '..', 'lib64'),
+                os.path.join(sqlite_incdir, '..', '..', 'lib'),
+            ]
+            sqlite_libfile = self.compiler.find_library_file(
+                                sqlite_dirs_to_check + lib_dirs, 'sqlite3')
+            if sqlite_libfile:
+                sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
+
+        if sqlite_incdir and sqlite_libdir:
+            sqlite_srcs = ['_sqlite/cache.c',
+                '_sqlite/connection.c',
+                '_sqlite/cursor.c',
+                '_sqlite/microprotocols.c',
+                '_sqlite/module.c',
+                '_sqlite/prepare_protocol.c',
+                '_sqlite/row.c',
+                '_sqlite/statement.c',
+                '_sqlite/util.c', ]
+
+            sqlite_defines = []
+            if sys.platform != "win32":
+                sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
+            else:
+                sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
+
+            # Comment this out if you want the sqlite3 module to be able to load extensions.
+            sqlite_defines.append(("SQLITE_OMIT_LOAD_EXTENSION", "1"))
+
+            if sys.platform == 'darwin':
+                # In every directory on the search path search for a dynamic
+                # library and then a static library, instead of first looking
+                # for dynamic libraries on the entiry path.
+                # This way a staticly linked custom sqlite gets picked up
+                # before the dynamic library in /usr/lib.
+                sqlite_extra_link_args = ('-Wl,-search_paths_first',)
+            else:
+                sqlite_extra_link_args = ()
+
+            exts.append(Extension('_sqlite3', sqlite_srcs,
+                                  define_macros=sqlite_defines,
+                                  include_dirs=["Modules/_sqlite",
+                                                sqlite_incdir],
+                                  library_dirs=sqlite_libdir,
+                                  runtime_library_dirs=sqlite_libdir,
+                                  extra_link_args=sqlite_extra_link_args,
+                                  libraries=["sqlite3",]))
+        else:
+            missing.append('_sqlite3')
+
+        # Look for Berkeley db 1.85.   Note that it is built as a different
+        # module name so it can be included even when later versions are
+        # available.  A very restrictive search is performed to avoid
+        # accidentally building this module with a later version of the
+        # underlying db library.  May BSD-ish Unixes incorporate db 1.85
+        # symbols into libc and place the include file in /usr/include.
+        #
+        # If the better bsddb library can be built (db_incs is defined)
+        # we do not build this one.  Otherwise this build will pick up
+        # the more recent berkeleydb's db.h file first in the include path
+        # when attempting to compile and it will fail.
+        f = "/usr/include/db.h"
+
+        if sys.platform == 'darwin':
+            if is_macosx_sdk_path(f):
+                sysroot = macosx_sdk_root()
+                f = os.path.join(sysroot, f[1:])
+
+        if os.path.exists(f) and not db_incs:
+            data = open(f).read()
+            m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
+            if m is not None:
+                # bingo - old version used hash file format version 2
+                ### XXX this should be fixed to not be platform-dependent
+                ### but I don't have direct access to an osf1 platform and
+                ### seemed to be muffing the search somehow
+                libraries = platform == "osf1" and ['db'] or None
+                if libraries is not None:
+                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
+                                          libraries=libraries))
+                else:
+                    exts.append(Extension('bsddb185', ['bsddbmodule.c']))
+            else:
+                missing.append('bsddb185')
+        else:
+            missing.append('bsddb185')
+
+        dbm_order = ['gdbm']
+        # The standard Unix dbm module:
+        if platform not in ['cygwin']:
+            config_args = [arg.strip("'")
+                           for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
+            dbm_args = [arg for arg in config_args
+                        if arg.startswith('--with-dbmliborder=')]
+            if dbm_args:
+                dbm_order = [arg.split('=')[-1] for arg in dbm_args][-1].split(":")
+            else:
+                dbm_order = "ndbm:gdbm:bdb".split(":")
+            dbmext = None
+            for cand in dbm_order:
+                if cand == "ndbm":
+                    if find_file("ndbm.h", inc_dirs, []) is not None:
+                        # Some systems have -lndbm, others don't
+                        if self.compiler.find_library_file(lib_dirs,
+                                                               'ndbm'):
+                            ndbm_libs = ['ndbm']
+                        else:
+                            ndbm_libs = []
+                        print "building dbm using ndbm"
+                        dbmext = Extension('dbm', ['dbmmodule.c'],
+                                           define_macros=[
+                                               ('HAVE_NDBM_H',None),
+                                               ],
+                                           libraries=ndbm_libs)
+                        break
+
+                elif cand == "gdbm":
+                    if self.compiler.find_library_file(lib_dirs, 'gdbm'):
+                        gdbm_libs = ['gdbm']
+                        if self.compiler.find_library_file(lib_dirs,
+                                                               'gdbm_compat'):
+                            gdbm_libs.append('gdbm_compat')
+                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
+                            print "building dbm using gdbm"
+                            dbmext = Extension(
+                                'dbm', ['dbmmodule.c'],
+                                define_macros=[
+                                    ('HAVE_GDBM_NDBM_H', None),
+                                    ],
+                                libraries = gdbm_libs)
+                            break
+                        if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
+                            print "building dbm using gdbm"
+                            dbmext = Extension(
+                                'dbm', ['dbmmodule.c'],
+                                define_macros=[
+                                    ('HAVE_GDBM_DASH_NDBM_H', None),
+                                    ],
+                                libraries = gdbm_libs)
+                            break
+                elif cand == "bdb":
+                    if db_incs is not None:
+                        print "building dbm using bdb"
+                        dbmext = Extension('dbm', ['dbmmodule.c'],
+                                           library_dirs=dblib_dir,
+                                           runtime_library_dirs=dblib_dir,
+                                           include_dirs=db_incs,
+                                           define_macros=[
+                                               ('HAVE_BERKDB_H', None),
+                                               ('DB_DBM_HSEARCH', None),
+                                               ],
+                                           libraries=dblibs)
+                        break
+            if dbmext is not None:
+                exts.append(dbmext)
+            else:
+                missing.append('dbm')
+
+        # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
+        if ('gdbm' in dbm_order and
+            self.compiler.find_library_file(lib_dirs, 'gdbm')):
+            exts.append( Extension('gdbm', ['gdbmmodule.c'],
+                                   libraries = ['gdbm'] ) )
+        else:
+            missing.append('gdbm')
+
+        # Unix-only modules
+        if platform not in ['win32']:
+            # Steen Lumholt's termios module
+            exts.append( Extension('termios', ['termios.c']) )
+            # Jeremy Hylton's rlimit interface
+            if platform not in ['atheos']:
+                exts.append( Extension('resource', ['resource.c']) )
+            else:
+                missing.append('resource')
+
+            # Sun yellow pages. Some systems have the functions in libc.
+            if (platform not in ['cygwin', 'atheos', 'qnx6'] and
+                find_file('rpcsvc/yp_prot.h', inc_dirs, []) is not None):
+                if (self.compiler.find_library_file(lib_dirs, 'nsl')):
+                    libs = ['nsl']
+                else:
+                    libs = []
+                exts.append( Extension('nis', ['nismodule.c'],
+                                       libraries = libs) )
+            else:
+                missing.append('nis')
+        else:
+            missing.extend(['nis', 'resource', 'termios'])
+
+        # Curses support, requiring the System V version of curses, often
+        # provided by the ncurses library.
+        panel_library = 'panel'
+        if curses_library.startswith('ncurses'):
+            if curses_library == 'ncursesw':
+                # Bug 1464056: If _curses.so links with ncursesw,
+                # _curses_panel.so must link with panelw.
+                panel_library = 'panelw'
+            curses_libs = [curses_library]
+            exts.append( Extension('_curses', ['_cursesmodule.c'],
+                                   libraries = curses_libs) )
+        elif curses_library == 'curses' and platform != 'darwin':
+                # OSX has an old Berkeley curses, not good enough for
+                # the _curses module.
+            if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
+                curses_libs = ['curses', 'terminfo']
+            elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
+                curses_libs = ['curses', 'termcap']
+            else:
+                curses_libs = ['curses']
+
+            exts.append( Extension('_curses', ['_cursesmodule.c'],
+                                   libraries = curses_libs) )
+        else:
+            missing.append('_curses')
+
+        # If the curses module is enabled, check for the panel module
+        if (module_enabled(exts, '_curses') and
+            self.compiler.find_library_file(lib_dirs, panel_library)):
+            exts.append( Extension('_curses_panel', ['_curses_panel.c'],
+                                   libraries = [panel_library] + curses_libs) )
+        else:
+            missing.append('_curses_panel')
+
+        # Andrew Kuchling's zlib module.  Note that some versions of zlib
+        # 1.1.3 have security problems.  See CERT Advisory CA-2002-07:
+        # http://www.cert.org/advisories/CA-2002-07.html
+        #
+        # zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
+        # patch its zlib 1.1.3 package instead of upgrading to 1.1.4.  For
+        # now, we still accept 1.1.3, because we think it's difficult to
+        # exploit this in Python, and we'd rather make it RedHat's problem
+        # than our problem <wink>.
+        #
+        # You can upgrade zlib to version 1.1.4 yourself by going to
+        # http://www.gzip.org/zlib/
+        zlib_inc = find_file('zlib.h', [], inc_dirs)
+        have_zlib = False
+        if zlib_inc is not None:
+            zlib_h = zlib_inc[0] + '/zlib.h'
+            version = '"0.0.0"'
+            version_req = '"1.1.3"'
+            fp = open(zlib_h)
+            while 1:
+                line = fp.readline()
+                if not line:
+                    break
+                if line.startswith('#define ZLIB_VERSION'):
+                    version = line.split()[2]
+                    break
+            if version >= version_req:
+                if (self.compiler.find_library_file(lib_dirs, 'z')):
+                    if sys.platform == "darwin":
+                        zlib_extra_link_args = ('-Wl,-search_paths_first',)
+                    else:
+                        zlib_extra_link_args = ()
+                    exts.append( Extension('zlib', ['zlibmodule.c'],
+                                           libraries = ['z'],
+                                           extra_link_args = zlib_extra_link_args))
+                    have_zlib = True
+                else:
+                    missing.append('zlib')
+            else:
+                missing.append('zlib')
+        else:
+            missing.append('zlib')
+
+        # Helper module for various ascii-encoders.  Uses zlib for an optimized
+        # crc32 if we have it.  Otherwise binascii uses its own.
+        if have_zlib:
+            extra_compile_args = ['-DUSE_ZLIB_CRC32']
+            libraries = ['z']
+            extra_link_args = zlib_extra_link_args
+        else:
+            extra_compile_args = []
+            libraries = []
+            extra_link_args = []
+        exts.append( Extension('binascii', ['binascii.c'],
+                               extra_compile_args = extra_compile_args,
+                               libraries = libraries,
+                               extra_link_args = extra_link_args) )
+
+        # Gustavo Niemeyer's bz2 module.
+        if (self.compiler.find_library_file(lib_dirs, 'bz2')):
+            if sys.platform == "darwin":
+                bz2_extra_link_args = ('-Wl,-search_paths_first',)
+            else:
+                bz2_extra_link_args = ()
+            exts.append( Extension('bz2', ['bz2module.c'],
+                                   libraries = ['bz2'],
+                                   extra_link_args = bz2_extra_link_args) )
+        else:
+            missing.append('bz2')
+
+        # Interface to the Expat XML parser
+        #
+        # Expat was written by James Clark and is now maintained by a group of
+        # developers on SourceForge; see www.libexpat.org for more information.
+        # The pyexpat module was written by Paul Prescod after a prototype by
+        # Jack Jansen.  The Expat source is included in Modules/expat/.  Usage
+        # of a system shared libexpat.so is possible with --with-system-expat
+        # configure option.
+        #
+        # More information on Expat can be found at www.libexpat.org.
+        #
+        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
+            expat_inc = []
+            define_macros = []
+            expat_lib = ['expat']
+            expat_sources = []
+        else:
+            expat_inc = [os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')]
+            define_macros = [
+                ('HAVE_EXPAT_CONFIG_H', '1'),
+            ]
+            expat_lib = []
+            expat_sources = ['expat/xmlparse.c',
+                             'expat/xmlrole.c',
+                             'expat/xmltok.c']
+
+        exts.append(Extension('pyexpat',
+                              define_macros = define_macros,
+                              include_dirs = expat_inc,
+                              libraries = expat_lib,
+                              sources = ['pyexpat.c'] + expat_sources
+                              ))
+
+        # Fredrik Lundh's cElementTree module.  Note that this also
+        # uses expat (via the CAPI hook in pyexpat).
+
+        if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
+            define_macros.append(('USE_PYEXPAT_CAPI', None))
+            exts.append(Extension('_elementtree',
+                                  define_macros = define_macros,
+                                  include_dirs = expat_inc,
+                                  libraries = expat_lib,
+                                  sources = ['_elementtree.c'],
+                                  ))
+        else:
+            missing.append('_elementtree')
+
+        # Hye-Shik Chang's CJKCodecs modules.
+        if have_unicode:
+            exts.append(Extension('_multibytecodec',
+                                  ['cjkcodecs/multibytecodec.c']))
+            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
+                exts.append(Extension('_codecs_%s' % loc,
+                                      ['cjkcodecs/_codecs_%s.c' % loc]))
+        else:
+            missing.append('_multibytecodec')
+            for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
+                missing.append('_codecs_%s' % loc)
+
+        # Dynamic loading module
+        if sys.maxint == 0x7fffffff:
+            # This requires sizeof(int) == sizeof(long) == sizeof(char*)
+            dl_inc = find_file('dlfcn.h', [], inc_dirs)
+            if (dl_inc is not None) and (platform not in ['atheos']):
+                exts.append( Extension('dl', ['dlmodule.c']) )
+            else:
+                missing.append('dl')
+        else:
+            missing.append('dl')
+
+        # Thomas Heller's _ctypes module
+        self.detect_ctypes(inc_dirs, lib_dirs)
+
+        # Richard Oudkerk's multiprocessing module
+        if platform == 'win32':             # Windows
+            macros = dict()
+            libraries = ['ws2_32']
+
+        elif platform == 'darwin':          # Mac OSX
+            macros = dict()
+            libraries = []
+
+        elif platform == 'cygwin':          # Cygwin
+            macros = dict()
+            libraries = []
+
+        elif platform in ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'freebsd8'):
+            # FreeBSD's P1003.1b semaphore support is very experimental
+            # and has many known problems. (as of June 2008)
+            macros = dict()
+            libraries = []
+
+        elif platform.startswith('openbsd'):
+            macros = dict()
+            libraries = []
+
+        elif platform.startswith('netbsd'):
+            macros = dict()
+            libraries = []
+
+        else:                                   # Linux and other unices
+            macros = dict()
+            libraries = ['rt']
+
+        if platform == 'win32':
+            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
+                                     '_multiprocessing/semaphore.c',
+                                     '_multiprocessing/pipe_connection.c',
+                                     '_multiprocessing/socket_connection.c',
+                                     '_multiprocessing/win32_functions.c'
+                                   ]
+
+        else:
+            multiprocessing_srcs = [ '_multiprocessing/multiprocessing.c',
+                                     '_multiprocessing/socket_connection.c'
+                                   ]
+            if (sysconfig.get_config_var('HAVE_SEM_OPEN') and not
+                sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')):
+                multiprocessing_srcs.append('_multiprocessing/semaphore.c')
+
+        if sysconfig.get_config_var('WITH_THREAD'):
+            exts.append ( Extension('_multiprocessing', multiprocessing_srcs,
+                                    define_macros=macros.items(),
+                                    include_dirs=["Modules/_multiprocessing"]))
+        else:
+            missing.append('_multiprocessing')
+
+        # End multiprocessing
+
+
+        # Platform-specific libraries
+        if platform == 'linux2':
+            # Linux-specific modules
+            exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
+        else:
+            missing.append('linuxaudiodev')
+
+        if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+                        'freebsd7', 'freebsd8')
+            or platform.startswith("gnukfreebsd")):
+            exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
+        else:
+            missing.append('ossaudiodev')
+
+        if platform == 'sunos5':
+            # SunOS specific modules
+            exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
+        else:
+            missing.append('sunaudiodev')
+
+        if platform == 'darwin':
+            # _scproxy
+            exts.append(Extension("_scproxy", [os.path.join(srcdir, "Mac/Modules/_scproxy.c")],
+                extra_link_args= [
+                    '-framework', 'SystemConfiguration',
+                    '-framework', 'CoreFoundation'
+                ]))
+
+
+        if platform == 'darwin' and ("--disable-toolbox-glue" not in
+                sysconfig.get_config_var("CONFIG_ARGS")):
+
+            if int(os.uname()[2].split('.')[0]) >= 8:
+                # We're on Mac OS X 10.4 or later, the compiler should
+                # support '-Wno-deprecated-declarations'. This will
+                # surpress deprecation warnings for the Carbon extensions,
+                # these extensions wrap the Carbon APIs and even those
+                # parts that are deprecated.
+                carbon_extra_compile_args = ['-Wno-deprecated-declarations']
+            else:
+                carbon_extra_compile_args = []
+
+            # Mac OS X specific modules.
+            def macSrcExists(name1, name2=''):
+                if not name1:
+                    return None
+                names = (name1,)
+                if name2:
+                    names = (name1, name2)
+                path = os.path.join(srcdir, 'Mac', 'Modules', *names)
+                return os.path.exists(path)
+
+            def addMacExtension(name, kwds, extra_srcs=[]):
+                dirname = ''
+                if name[0] == '_':
+                    dirname = name[1:].lower()
+                cname = name + '.c'
+                cmodulename = name + 'module.c'
+                # Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
+                if macSrcExists(cname):
+                    srcs = [cname]
+                elif macSrcExists(cmodulename):
+                    srcs = [cmodulename]
+                elif macSrcExists(dirname, cname):
+                    # XXX(nnorwitz): If all the names ended with module, we
+                    # wouldn't need this condition.  ibcarbon is the only one.
+                    srcs = [os.path.join(dirname, cname)]
+                elif macSrcExists(dirname, cmodulename):
+                    srcs = [os.path.join(dirname, cmodulename)]
+                else:
+                    raise RuntimeError("%s not found" % name)
+
+                # Here's the whole point:  add the extension with sources
+                exts.append(Extension(name, srcs + extra_srcs, **kwds))
+
+            # Core Foundation
+            core_kwds = {'extra_compile_args': carbon_extra_compile_args,
+                         'extra_link_args': ['-framework', 'CoreFoundation'],
+                        }
+            addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
+            addMacExtension('autoGIL', core_kwds)
+
+
+
+            # Carbon
+            carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
+                           'extra_link_args': ['-framework', 'Carbon'],
+                          }
+            CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
+                           'OSATerminology', 'icglue',
+                           # All these are in subdirs
+                           '_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
+                           '_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
+                           '_Help', '_Icn', '_IBCarbon', '_List',
+                           '_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
+                           '_Scrap', '_Snd', '_TE',
+                          ]
+            for name in CARBON_EXTS:
+                addMacExtension(name, carbon_kwds)
+
+            # Workaround for a bug in the version of gcc shipped with Xcode 3.
+            # The _Win extension should build just like the other Carbon extensions, but
+            # this actually results in a hard crash of the linker.
+            #
+            if '-arch ppc64' in cflags and '-arch ppc' in cflags:
+                win_kwds = {'extra_compile_args': carbon_extra_compile_args + ['-arch', 'i386', '-arch', 'ppc'],
+                               'extra_link_args': ['-framework', 'Carbon', '-arch', 'i386', '-arch', 'ppc'],
+                           }
+                addMacExtension('_Win', win_kwds)
+            else:
+                addMacExtension('_Win', carbon_kwds)
+
+
+            # Application Services & QuickTime
+            app_kwds = {'extra_compile_args': carbon_extra_compile_args,
+                        'extra_link_args': ['-framework','ApplicationServices'],
+                       }
+            addMacExtension('_Launch', app_kwds)
+            addMacExtension('_CG', app_kwds)
+
+            exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
+                        extra_compile_args=carbon_extra_compile_args,
+                        extra_link_args=['-framework', 'QuickTime',
+                                     '-framework', 'Carbon']) )
+
+
+        self.extensions.extend(exts)
+
+        # Call the method for detecting whether _tkinter can be compiled
+        self.detect_tkinter(inc_dirs, lib_dirs)
+
+        if '_tkinter' not in [e.name for e in self.extensions]:
+            missing.append('_tkinter')
+
+        return missing
+
+    def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
+        # The _tkinter module, using frameworks. Since frameworks are quite
+        # different the UNIX search logic is not sharable.
+        from os.path import join, exists
+        framework_dirs = [
+            '/Library/Frameworks',
+            '/System/Library/Frameworks/',
+            join(os.getenv('HOME'), '/Library/Frameworks')
+        ]
+
+        sysroot = macosx_sdk_root()
+
+        # Find the directory that contains the Tcl.framework and Tk.framework
+        # bundles.
+        # XXX distutils should support -F!
+        for F in framework_dirs:
+            # both Tcl.framework and Tk.framework should be present
+
+
+            for fw in 'Tcl', 'Tk':
+                if is_macosx_sdk_path(F):
+                    if not exists(join(sysroot, F[1:], fw + '.framework')):
+                        break
+                else:
+                    if not exists(join(F, fw + '.framework')):
+                        break
+            else:
+                # ok, F is now directory with both frameworks. Continure
+                # building
+                break
+        else:
+            # Tk and Tcl frameworks not found. Normal "unix" tkinter search
+            # will now resume.
+            return 0
+
+        # For 8.4a2, we must add -I options that point inside the Tcl and Tk
+        # frameworks. In later release we should hopefully be able to pass
+        # the -F option to gcc, which specifies a framework lookup path.
+        #
+        include_dirs = [
+            join(F, fw + '.framework', H)
+            for fw in 'Tcl', 'Tk'
+            for H in 'Headers', 'Versions/Current/PrivateHeaders'
+        ]
+
+        # For 8.4a2, the X11 headers are not included. Rather than include a
+        # complicated search, this is a hard-coded path. It could bail out
+        # if X11 libs are not found...
+        include_dirs.append('/usr/X11R6/include')
+        frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
+
+        # All existing framework builds of Tcl/Tk don't support 64-bit
+        # architectures.
+        cflags = sysconfig.get_config_vars('CFLAGS')[0]
+        archs = re.findall('-arch\s+(\w+)', cflags)
+
+        if is_macosx_sdk_path(F):
+            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(os.path.join(sysroot, F[1:]),))
+        else:
+            fp = os.popen("file %s/Tk.framework/Tk | grep 'for architecture'"%(F,))
+
+        detected_archs = []
+        for ln in fp:
+            a = ln.split()[-1]
+            if a in archs:
+                detected_archs.append(ln.split()[-1])
+        fp.close()
+
+        for a in detected_archs:
+            frameworks.append('-arch')
+            frameworks.append(a)
+
+        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                        define_macros=[('WITH_APPINIT', 1)],
+                        include_dirs = include_dirs,
+                        libraries = [],
+                        extra_compile_args = frameworks[2:],
+                        extra_link_args = frameworks,
+                        )
+        self.extensions.append(ext)
+        return 1
+
+
+    def detect_tkinter(self, inc_dirs, lib_dirs):
+        # The _tkinter module.
+
+        # Rather than complicate the code below, detecting and building
+        # AquaTk is a separate method. Only one Tkinter will be built on
+        # Darwin - either AquaTk, if it is found, or X11 based Tk.
+        platform = self.get_platform()
+        if (platform == 'darwin' and
+            self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
+            return
+
+        # Assume we haven't found any of the libraries or include files
+        # The versions with dots are used on Unix, and the versions without
+        # dots on Windows, for detection by cygwin.
+        tcllib = tklib = tcl_includes = tk_includes = None
+        for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
+                        '8.2', '82', '8.1', '81', '8.0', '80']:
+            tklib = self.compiler.find_library_file(lib_dirs,
+                                                        'tk' + version)
+            tcllib = self.compiler.find_library_file(lib_dirs,
+                                                         'tcl' + version)
+            if tklib and tcllib:
+                # Exit the loop when we've found the Tcl/Tk libraries
+                break
+
+        # Now check for the header files
+        if tklib and tcllib:
+            # Check for the include files on Debian and {Free,Open}BSD, where
+            # they're put in /usr/include/{tcl,tk}X.Y
+            dotversion = version
+            if '.' not in dotversion and "bsd" in sys.platform.lower():
+                # OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
+                # but the include subdirs are named like .../include/tcl8.3.
+                dotversion = dotversion[:-1] + '.' + dotversion[-1]
+            tcl_include_sub = []
+            tk_include_sub = []
+            for dir in inc_dirs:
+                tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
+                tk_include_sub += [dir + os.sep + "tk" + dotversion]
+            tk_include_sub += tcl_include_sub
+            tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
+            tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
+
+        if (tcllib is None or tklib is None or
+            tcl_includes is None or tk_includes is None):
+            self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
+            return
+
+        # OK... everything seems to be present for Tcl/Tk.
+
+        include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
+        for dir in tcl_includes + tk_includes:
+            if dir not in include_dirs:
+                include_dirs.append(dir)
+
+        # Check for various platform-specific directories
+        if platform == 'sunos5':
+            include_dirs.append('/usr/openwin/include')
+            added_lib_dirs.append('/usr/openwin/lib')
+        elif os.path.exists('/usr/X11R6/include'):
+            include_dirs.append('/usr/X11R6/include')
+            added_lib_dirs.append('/usr/X11R6/lib64')
+            added_lib_dirs.append('/usr/X11R6/lib')
+        elif os.path.exists('/usr/X11R5/include'):
+            include_dirs.append('/usr/X11R5/include')
+            added_lib_dirs.append('/usr/X11R5/lib')
+        else:
+            # Assume default location for X11
+            include_dirs.append('/usr/X11/include')
+            added_lib_dirs.append('/usr/X11/lib')
+
+        # If Cygwin, then verify that X is installed before proceeding
+        if platform == 'cygwin':
+            x11_inc = find_file('X11/Xlib.h', [], include_dirs)
+            if x11_inc is None:
+                return
+
+        # Check for BLT extension
+        if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
+                                               'BLT8.0'):
+            defs.append( ('WITH_BLT', 1) )
+            libs.append('BLT8.0')
+        elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
+                                                'BLT'):
+            defs.append( ('WITH_BLT', 1) )
+            libs.append('BLT')
+
+        # Add the Tcl/Tk libraries
+        libs.append('tk'+ version)
+        libs.append('tcl'+ version)
+
+        if platform in ['aix3', 'aix4']:
+            libs.append('ld')
+
+        # Finally, link with the X11 libraries (not appropriate on cygwin)
+        if platform != "cygwin":
+            libs.append('X11')
+
+        ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
+                        define_macros=[('WITH_APPINIT', 1)] + defs,
+                        include_dirs = include_dirs,
+                        libraries = libs,
+                        library_dirs = added_lib_dirs,
+                        )
+        self.extensions.append(ext)
+
+##         # Uncomment these lines if you want to play with xxmodule.c
+##         ext = Extension('xx', ['xxmodule.c'])
+##         self.extensions.append(ext)
+
+        # XXX handle these, but how to detect?
+        # *** Uncomment and edit for PIL (TkImaging) extension only:
+        #       -DWITH_PIL -I../Extensions/Imaging/libImaging  tkImaging.c \
+        # *** Uncomment and edit for TOGL extension only:
+        #       -DWITH_TOGL togl.c \
+        # *** Uncomment these for TOGL extension only:
+        #       -lGL -lGLU -lXext -lXmu \
+
+    def configure_ctypes_darwin(self, ext):
+        # Darwin (OS X) uses preconfigured files, in
+        # the Modules/_ctypes/libffi_osx directory.
+        srcdir = sysconfig.get_config_var('srcdir')
+        ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
+                                                  '_ctypes', 'libffi_osx'))
+        sources = [os.path.join(ffi_srcdir, p)
+                   for p in ['ffi.c',
+                             'x86/darwin64.S',
+                             'x86/x86-darwin.S',
+                             'x86/x86-ffi_darwin.c',
+                             'x86/x86-ffi64.c',
+                             'powerpc/ppc-darwin.S',
+                             'powerpc/ppc-darwin_closure.S',
+                             'powerpc/ppc-ffi_darwin.c',
+                             'powerpc/ppc64-darwin_closure.S',
+                             ]]
+
+        # Add .S (preprocessed assembly) to C compiler source extensions.
+        self.compiler.src_extensions.append('.S')
+
+        include_dirs = [os.path.join(ffi_srcdir, 'include'),
+                        os.path.join(ffi_srcdir, 'powerpc')]
+        ext.include_dirs.extend(include_dirs)
+        ext.sources.extend(sources)
+        return True
+
+    def configure_ctypes(self, ext):
+        if not self.use_system_libffi:
+            if sys.platform == 'darwin':
+                return self.configure_ctypes_darwin(ext)
+
+            srcdir = sysconfig.get_config_var('srcdir')
+            ffi_builddir = os.path.join(self.build_temp, 'libffi')
+            ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
+                                         '_ctypes', 'libffi'))
+            ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
+
+            from distutils.dep_util import newer_group
+
+            config_sources = [os.path.join(ffi_srcdir, fname)
+                              for fname in os.listdir(ffi_srcdir)
+                              if os.path.isfile(os.path.join(ffi_srcdir, fname))]
+            if self.force or newer_group(config_sources,
+                                         ffi_configfile):
+                from distutils.dir_util import mkpath
+                mkpath(ffi_builddir)
+                config_args = []
+
+                # Pass empty CFLAGS because we'll just append the resulting
+                # CFLAGS to Python's; -g or -O2 is to be avoided.
+                cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
+                      % (ffi_builddir, ffi_srcdir, " ".join(config_args))
+
+                res = os.system(cmd)
+                if res or not os.path.exists(ffi_configfile):
+                    print "Failed to configure _ctypes module"
+                    return False
+
+            fficonfig = {}
+            with open(ffi_configfile) as f:
+                exec f in fficonfig
+
+            # Add .S (preprocessed assembly) to C compiler source extensions.
+            self.compiler.src_extensions.append('.S')
+
+            include_dirs = [os.path.join(ffi_builddir, 'include'),
+                            ffi_builddir,
+                            os.path.join(ffi_srcdir, 'src')]
+            extra_compile_args = fficonfig['ffi_cflags'].split()
+
+            ext.sources.extend(os.path.join(ffi_srcdir, f) for f in
+                               fficonfig['ffi_sources'])
+            ext.include_dirs.extend(include_dirs)
+            ext.extra_compile_args.extend(extra_compile_args)
+        return True
+
+    def detect_ctypes(self, inc_dirs, lib_dirs):
+        self.use_system_libffi = False
+        include_dirs = []
+        extra_compile_args = []
+        extra_link_args = []
+        sources = ['_ctypes/_ctypes.c',
+                   '_ctypes/callbacks.c',
+                   '_ctypes/callproc.c',
+                   '_ctypes/stgdict.c',
+                   '_ctypes/cfield.c']
+        depends = ['_ctypes/ctypes.h']
+
+        if sys.platform == 'darwin':
+            sources.append('_ctypes/malloc_closure.c')
+            sources.append('_ctypes/darwin/dlfcn_simple.c')
+            extra_compile_args.append('-DMACOSX')
+            include_dirs.append('_ctypes/darwin')
+# XXX Is this still needed?
+##            extra_link_args.extend(['-read_only_relocs', 'warning'])
+
+        elif sys.platform == 'sunos5':
+            # XXX This shouldn't be necessary; it appears that some
+            # of the assembler code is non-PIC (i.e. it has relocations
+            # when it shouldn't. The proper fix would be to rewrite
+            # the assembler code to be PIC.
+            # This only works with GCC; the Sun compiler likely refuses
+            # this option. If you want to compile ctypes with the Sun
+            # compiler, please research a proper solution, instead of
+            # finding some -z option for the Sun compiler.
+            extra_link_args.append('-mimpure-text')
+
+        elif sys.platform.startswith('hp-ux'):
+            extra_link_args.append('-fPIC')
+
+        ext = Extension('_ctypes',
+                        include_dirs=include_dirs,
+                        extra_compile_args=extra_compile_args,
+                        extra_link_args=extra_link_args,
+                        libraries=[],
+                        sources=sources,
+                        depends=depends)
+        ext_test = Extension('_ctypes_test',
+                             sources=['_ctypes/_ctypes_test.c'])
+        self.extensions.extend([ext, ext_test])
+
+        if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
+            return
+
+        if sys.platform == 'darwin':
+            # OS X 10.5 comes with libffi.dylib; the include files are
+            # in /usr/include/ffi
+            inc_dirs.append('/usr/include/ffi')
+
+        ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
+        if not ffi_inc or ffi_inc[0] == '':
+            ffi_inc = find_file('ffi.h', [], inc_dirs)
+        if ffi_inc is not None:
+            ffi_h = ffi_inc[0] + '/ffi.h'
+            fp = open(ffi_h)
+            while 1:
+                line = fp.readline()
+                if not line:
+                    ffi_inc = None
+                    break
+                if line.startswith('#define LIBFFI_H'):
+                    break
+        ffi_lib = None
+        if ffi_inc is not None:
+            for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
+                if (self.compiler.find_library_file(lib_dirs, lib_name)):
+                    ffi_lib = lib_name
+                    break
+
+        if ffi_inc and ffi_lib:
+            ext.include_dirs.extend(ffi_inc)
+            ext.libraries.append(ffi_lib)
+            self.use_system_libffi = True
+
+
+class PyBuildInstall(install):
+    # Suppress the warning about installation into the lib_dynload
+    # directory, which is not in sys.path when running Python during
+    # installation:
+    def initialize_options (self):
+        install.initialize_options(self)
+        self.warn_dir=0
+
+class PyBuildInstallLib(install_lib):
+    # Do exactly what install_lib does but make sure correct access modes get
+    # set on installed directories and files. All installed files with get
+    # mode 644 unless they are a shared library in which case they will get
+    # mode 755. All installed directories will get mode 755.
+
+    so_ext = sysconfig.get_config_var("SO")
+
+    def install(self):
+        outfiles = install_lib.install(self)
+        self.set_file_modes(outfiles, 0644, 0755)
+        self.set_dir_modes(self.install_dir, 0755)
+        return outfiles
+
+    def set_file_modes(self, files, defaultMode, sharedLibMode):
+        if not self.is_chmod_supported(): return
+        if not files: return
+
+        for filename in files:
+            if os.path.islink(filename): continue
+            mode = defaultMode
+            if filename.endswith(self.so_ext): mode = sharedLibMode
+            log.info("changing mode of %s to %o", filename, mode)
+            if not self.dry_run: os.chmod(filename, mode)
+
+    def set_dir_modes(self, dirname, mode):
+        if not self.is_chmod_supported(): return
+        os.path.walk(dirname, self.set_dir_modes_visitor, mode)
+
+    def set_dir_modes_visitor(self, mode, dirname, names):
+        if os.path.islink(dirname): return
+        log.info("changing mode of %s to %o", dirname, mode)
+        if not self.dry_run: os.chmod(dirname, mode)
+
+    def is_chmod_supported(self):
+        return hasattr(os, 'chmod')
+
+SUMMARY = """
+Python is an interpreted, interactive, object-oriented programming
+language. It is often compared to Tcl, Perl, Scheme or Java.
+
+Python combines remarkable power with very clear syntax. It has
+modules, classes, exceptions, very high level dynamic data types, and
+dynamic typing. There are interfaces to many system calls and
+libraries, as well as to various windowing systems (X11, Motif, Tk,
+Mac, MFC). New built-in modules are easily written in C or C++. Python
+is also usable as an extension language for applications that need a
+programmable interface.
+
+The Python implementation is portable: it runs on many brands of UNIX,
+on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
+listed here, it may still be supported, if there's a C compiler for
+it. Ask around on comp.lang.python -- or just try compiling Python
+yourself.
+"""
+
+CLASSIFIERS = """
+Development Status :: 6 - Mature
+License :: OSI Approved :: Python Software Foundation License
+Natural Language :: English
+Programming Language :: C
+Programming Language :: Python
+Topic :: Software Development
+"""
+
+def main():
+    # turn off warnings when deprecated modules are imported
+    import warnings
+    warnings.filterwarnings("ignore",category=DeprecationWarning)
+    setup(# PyPI Metadata (PEP 301)
+          name = "Python",
+          version = sys.version.split()[0],
+          url = "http://www.python.org/%s" % sys.version[:3],
+          maintainer = "Guido van Rossum and the Python community",
+          maintainer_email = "python-dev@python.org",
+          description = "A high-level object-oriented programming language",
+          long_description = SUMMARY.strip(),
+          license = "PSF license",
+          classifiers = filter(None, CLASSIFIERS.split("\n")),
+          platforms = ["Many"],
+
+          # Build info
+          cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
+                      'install_lib':PyBuildInstallLib},
+          # The struct module is defined here, because build_ext won't be
+          # called unless there's at least one extension module defined.
+          ext_modules=[Extension('_struct', ['_struct.c'])],
+
+          # Scripts to install
+          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+                     'Tools/scripts/2to3',
+                     'Lib/smtpd.py']
+        )
+
+# --install-platlib
+if __name__ == '__main__':
+    main()
diff --git a/package/python2/patches/patch-Modules_Setup_config b/package/python2/patches/patch-Modules_Setup_config
deleted file mode 100644
index c0d4e9fb8..000000000
--- a/package/python2/patches/patch-Modules_Setup_config
+++ /dev/null
@@ -1,11 +0,0 @@
---- Python-2.7.1.orig/Modules/Setup.config	2010-12-27 21:24:34.000000000 +0100
-+++ Python-2.7.1/Modules/Setup.config	2010-12-27 21:07:05.000000000 +0100
-@@ -4,7 +4,7 @@
- # based on configure-time options.
- 
- # Threading
--#thread threadmodule.c
-+thread threadmodule.c
- 
- # The signal module
- signal signalmodule.c
diff --git a/package/python2/patches/patch-Modules_config_c b/package/python2/patches/patch-Modules_config_c
deleted file mode 100644
index 1ceca607f..000000000
--- a/package/python2/patches/patch-Modules_config_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- Python-2.7.1.orig/Modules/config.c	2010-12-27 21:24:35.000000000 +0100
-+++ Python-2.7.1/Modules/config.c	2010-12-27 21:07:05.000000000 +0100
-@@ -23,6 +23,7 @@ extern "C" {
- #endif
- 
- 
-+extern void initthread(void);
- extern void initsignal(void);
- extern void initposix(void);
- extern void initerrno(void);
-@@ -44,6 +45,7 @@ extern void _PyWarnings_Init(void);
- 
- struct _inittab _PyImport_Inittab[] = {
- 
-+	{"thread", initthread},
- 	{"signal", initsignal},
- 	{"posix", initposix},
- 	{"errno", initerrno},
diff --git a/package/python2/patches/patch-configure b/package/python2/patches/patch-configure
index b2c0f2ccd..5f31d2fdb 100644
--- a/package/python2/patches/patch-configure
+++ b/package/python2/patches/patch-configure
@@ -1,5 +1,5 @@
---- Python-2.7.orig/configure	2010-05-28 17:28:47.000000000 +0200
-+++ Python-2.7/configure	2010-11-04 22:17:32.000000000 +0100
+--- Python-2.7.1.orig/configure	2010-11-01 02:47:19.000000000 +0100
++++ Python-2.7.1/configure	2011-10-06 18:21:02.848792210 +0200
 @@ -2972,12 +2972,12 @@ fi
  $as_echo_n "checking MACHDEP... " >&6; }
  if test -z "$MACHDEP"
@@ -20,7 +20,7 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking machine type as reported by uname -m" >&5
  $as_echo_n "checking machine type as reported by uname -m... " >&6; }
 -ac_sys_machine=`uname -m`
-+ac_sys_machine=i586
++ac_sys_machine=@@CPU_ARCH@@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_sys_machine" >&5
  $as_echo "$ac_sys_machine" >&6; }
  
diff --git a/package/python2/patches/patch-setup_py b/package/python2/patches/patch-setup_py
index a92a85b37..7da78c43c 100644
--- a/package/python2/patches/patch-setup_py
+++ b/package/python2/patches/patch-setup_py
@@ -1,12 +1,12 @@
 diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py
 --- Python-2.7.1.orig/setup.py	2010-10-31 17:40:21.000000000 +0100
-+++ Python-2.7.1/setup.py	2010-12-27 21:06:29.000000000 +0100
++++ Python-2.7.1/setup.py	2011-10-06 20:34:53.328787057 +0200
 @@ -21,7 +21,7 @@ from distutils.spawn import find_executa
  COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
  
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
-+disabled_module_list = ['nis', 'bz2']
++disabled_module_list = ['nis']
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
@@ -62,7 +62,25 @@ diff -Nur Python-2.7.orig/setup.py Python-2.7/setup.py
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -403,11 +369,8 @@ class PyBuildExt(build_ext):
+@@ -384,17 +350,6 @@ class PyBuildExt(build_ext):
+                     for directory in reversed(options.dirs):
+                         add_dir_to_list(dir_list, directory)
+ 
+-        if os.path.normpath(sys.prefix) != '/usr' \
+-                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+-            # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+-            # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+-            # building a framework with different architectures than
+-            # the one that is currently installed (issue #7473)
+-            add_dir_to_list(self.compiler.library_dirs,
+-                            sysconfig.get_config_var("LIBDIR"))
+-            add_dir_to_list(self.compiler.include_dirs,
+-                            sysconfig.get_config_var("INCLUDEDIR"))
+-
+         try:
+             have_unicode = unicode
+         except NameError:
+@@ -403,11 +358,8 @@ class PyBuildExt(build_ext):
          # lib_dirs and inc_dirs are used to search for files;
          # if a file is found in one of those directories, it can
          # be assumed that no additional -I,-L directives are needed.
diff --git a/package/resource-agents/Makefile b/package/resource-agents/Makefile
index 30f63b07b..657529326 100644
--- a/package/resource-agents/Makefile
+++ b/package/resource-agents/Makefile
@@ -5,23 +5,28 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		resource-agents
 PKG_VERSION:=		3.9.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b5d0c178082ff186c36ab145b5bbf5df
 PKG_DESCR:=		Resource agents for clusters
 PKG_SECTION:=		ha
+PKG_BUILDDEP:=		glib cluster-glue
 PKG_URL:=		https://github.com/ClusterLabs/resource-agents
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_CFLINE_RESOURCE_AGENTS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
-PKG_HOST_DEPENDS:=	!darwin
+PKG_ARCH_DEPENDS:=	x86
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RESOURCE_AGENTS,resource-agents,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--with-ocf-root=/usr/lib/ocf
+
 resource-agents-install:
 	$(INSTALL_DIR) $(IDIR_RESOURCE_AGENTS)/usr/share/cluster
 	$(CP) $(WRKINST)/usr/share/cluster/*.sh \
 		$(IDIR_RESOURCE_AGENTS)/usr/share/cluster
+	$(INSTALL_DIR) $(IDIR_RESOURCE_AGENTS)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/* $(IDIR_RESOURCE_AGENTS)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/resource-agents/patches/patch-configure b/package/resource-agents/patches/patch-configure
new file mode 100644
index 000000000..62d1beba5
--- /dev/null
+++ b/package/resource-agents/patches/patch-configure
@@ -0,0 +1,11 @@
+--- resource-agents-3.9.0.orig/configure	2011-05-24 15:37:07.000000000 +0200
++++ resource-agents-3.9.0/configure	2011-10-07 20:11:45.000000000 +0200
+@@ -6171,7 +6171,7 @@ $as_echo_n "checking for $2 in $1... " >
+ 	  printf "#include <stdio.h>\n" > ${Cfile}.c
+ 	  printf "#include <%s>\n" $1 >> ${Cfile}.c
+ 	  printf "int main(int argc, char **argv) { printf(\"%%s\", %s); return 0; }\n" $2 >> ${Cfile}.c
+-	  $CC $CFLAGS ${Cfile}.c -o ${Cfile}
++	  $CC_FOR_BUILD $CFLAGS_FOR_BUILD ${Cfile}.c -o ${Cfile}
+ 	  value=`${Cfile}`
+ 	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
+ $as_echo "$value" >&6; }
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index e575f7ac0..ce8b7fe53 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		sane-backends
-PKG_VERSION:=		1.0.20
+PKG_VERSION:=		1.0.22
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a0cfdfdebca2feb4f2ba5d3418b15a42
+PKG_MD5SUM:=		fadf56a60f4776bfb24491f66b617cf5
 PKG_DESCR:=		Scanner access now easy
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
@@ -82,7 +82,6 @@ $(eval $(call PKG_template,SANE_BACKEND_MATSUSHITA,sane-backend-matsushita,${PKG
 $(eval $(call PKG_template,SANE_BACKEND_MICROTEK2,sane-backend-microtek2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_MICROTEK,sane-backend-microtek,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_MUSTEK,sane-backend-mustek,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB2,sane-backend-mustek-usb2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_MUSTEK_USB,sane-backend-mustek-usb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_NEC,sane-backend-nec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SANE_BACKEND_NIASH,sane-backend-niash,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -141,7 +140,6 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_MATSUSHITA,matsushita))
 $(eval $(call PKG_mod_template,SANE_BACKEND_MICROTEK2,microtek2))
 $(eval $(call PKG_mod_template,SANE_BACKEND_MICROTEK,microtek))
 $(eval $(call PKG_mod_template,SANE_BACKEND_MUSTEK,mustek))
-$(eval $(call PKG_mod_template,SANE_BACKEND_MUSTEK_USB2,mustek_usb2,n))
 $(eval $(call PKG_mod_template,SANE_BACKEND_MUSTEK_USB,mustek_usb))
 $(eval $(call PKG_mod_template,SANE_BACKEND_NEC,nec))
 $(eval $(call PKG_mod_template,SANE_BACKEND_NIASH,niash,n))
@@ -169,7 +167,7 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX1220U,umax1220u))
 $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp))
 $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax))
 
-CONFIGURE_ENV+=		ac_cv_func_ioperm=no
+CONFIGURE_ENV+=		ac_cv_func_ioperm=no have_libv4l1=no
 CONFIGURE_ARGS+=	--disable-translations \
 			--without-gphoto2 \
 			--enable-libusb
diff --git a/package/sane-backends/patches/patch-Makefile_in b/package/sane-backends/patches/patch-Makefile_in
index 6a143eb05..b1796c56f 100644
--- a/package/sane-backends/patches/patch-Makefile_in
+++ b/package/sane-backends/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/Makefile.in	2009-04-30 15:41:20.000000000 +0200
-+++ sane-backends-1.0.20/Makefile.in	2009-05-11 00:17:44.000000000 +0200
-@@ -244,7 +244,7 @@ target_alias = @target_alias@
+--- sane-backends-1.0.22.orig/Makefile.in	2011-01-30 19:50:56.000000000 +0100
++++ sane-backends-1.0.22/Makefile.in	2011-10-01 19:26:02.309066938 +0200
+@@ -293,7 +293,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/package/sane-backends/patches/patch-backend_microtek_c b/package/sane-backends/patches/patch-backend_microtek_c
index 6d99f5808..dde369f2d 100644
--- a/package/sane-backends/patches/patch-backend_microtek_c
+++ b/package/sane-backends/patches/patch-backend_microtek_c
@@ -1,9 +1,9 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/microtek.c	2009-02-26 17:11:17.000000000 +0100
-+++ sane-backends-1.0.20/backend/microtek.c	2009-05-11 00:10:23.000000000 +0200
+--- sane-backends-1.0.22.orig/backend/microtek.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/microtek.c	2011-10-01 19:26:01.659066938 +0200
 @@ -59,6 +59,7 @@
  
- #include "sane/config.h"
+ #include "../include/sane/config.h"
  
 +#include <stdarg.h>
  #include <stdlib.h>
diff --git a/package/sane-backends/patches/patch-backend_pixma_bjnp_c b/package/sane-backends/patches/patch-backend_pixma_bjnp_c
index 4b3224eb9..5d347c00e 100644
--- a/package/sane-backends/patches/patch-backend_pixma_bjnp_c
+++ b/package/sane-backends/patches/patch-backend_pixma_bjnp_c
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/pixma_bjnp.c	2009-04-01 18:26:58.000000000 +0200
-+++ sane-backends-1.0.20/backend/pixma_bjnp.c	2009-05-11 00:23:33.000000000 +0200
+--- sane-backends-1.0.22.orig/backend/pixma_bjnp.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/pixma_bjnp.c	2011-10-01 19:26:01.699066938 +0200
 @@ -59,9 +59,6 @@
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
@@ -11,7 +11,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  /* 
   * networking stuff
-@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char 
+@@ -196,7 +193,7 @@ truncate_hostname (char *hostname, char
      {
        /* this is a hostname, not an ip-address, so remove domain part of the name */
  
diff --git a/package/sane-backends/patches/patch-backend_pixma_imageclass_c b/package/sane-backends/patches/patch-backend_pixma_imageclass_c
index 7c2492c5f..cb265aedb 100644
--- a/package/sane-backends/patches/patch-backend_pixma_imageclass_c
+++ b/package/sane-backends/patches/patch-backend_pixma_imageclass_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/pixma_imageclass.c	2009-03-12 18:36:09.000000000 +0100
-+++ sane-backends-1.0.20/backend/pixma_imageclass.c	2009-05-11 00:30:36.000000000 +0200
-@@ -159,8 +159,6 @@ query_status (pixma_t * s)
+--- sane-backends-1.0.22.orig/backend/pixma_imageclass.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/pixma_imageclass.c	2011-10-01 19:26:01.779066938 +0200
+@@ -161,8 +161,6 @@ query_status (pixma_t * s)
    if (error >= 0)
      {
        memcpy (mf->current_status, data, 12);
diff --git a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
index 542afb9c1..436102a18 100644
--- a/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
+++ b/package/sane-backends/patches/patch-backend_sm3600-scanutil_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- sane-backends-1.0.20.orig/backend/sm3600-scanutil.c	2005-08-16 21:50:34.000000000 +0200
-+++ sane-backends-1.0.20/backend/sm3600-scanutil.c	2009-05-11 21:08:46.000000000 +0200
-@@ -47,6 +47,7 @@ $Id: sm3600-scanutil.c,v 1.12 2005-08-16
+--- sane-backends-1.0.22.orig/backend/sm3600-scanutil.c	2010-12-02 00:49:58.000000000 +0100
++++ sane-backends-1.0.22/backend/sm3600-scanutil.c	2011-10-01 19:26:01.819066938 +0200
+@@ -47,6 +47,7 @@ $Id$
  
  ====================================================================== */
  
diff --git a/package/sane-backends/patches/patch-configure b/package/sane-backends/patches/patch-configure
index 927e3a8ab..d8d5aca8d 100644
--- a/package/sane-backends/patches/patch-configure
+++ b/package/sane-backends/patches/patch-configure
@@ -1,11 +1,90 @@
---- sane-backends-1.0.20.orig/configure	2009-05-03 18:59:22.000000000 +0200
-+++ sane-backends-1.0.20/configure	2010-01-14 19:51:31.000000000 +0100
-@@ -34117,7 +34117,7 @@ ALL_BACKENDS="abaton agfafocus apple art
-         hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+--- sane-backends-1.0.22.orig/configure	2011-02-14 02:27:52.000000000 +0100
++++ sane-backends-1.0.22/configure	2011-10-01 19:32:51.919066675 +0200
+@@ -7529,77 +7529,7 @@ done
+ 
+ 
+ 
+-
+-
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBV4L" >&5
+-$as_echo_n "checking for LIBV4L... " >&6; }
+-
+-if test -n "$LIBV4L_CFLAGS"; then
+-    pkg_cv_LIBV4L_CFLAGS="$LIBV4L_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_LIBV4L_CFLAGS=`$PKG_CONFIG --cflags "libv4l1" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-if test -n "$LIBV4L_LIBS"; then
+-    pkg_cv_LIBV4L_LIBS="$LIBV4L_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libv4l1\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libv4l1") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; }; then
+-  pkg_cv_LIBV4L_LIBS=`$PKG_CONFIG --libs "libv4l1" 2>/dev/null`
+-else
+-  pkg_failed=yes
+-fi
+- else
+-    pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+-        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        LIBV4L_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libv4l1" 2>&1`
+-        else
+-	        LIBV4L_PKG_ERRORS=`$PKG_CONFIG --print-errors "libv4l1" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$LIBV4L_PKG_ERRORS" >&5
+-
+-	have_libv4l1=no
+-elif test $pkg_failed = untried; then
+-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-	have_libv4l1=no
+-else
+-	LIBV4L_CFLAGS=$pkg_cv_LIBV4L_CFLAGS
+-	LIBV4L_LIBS=$pkg_cv_LIBV4L_LIBS
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	have_libv4l1=yes
+-fi
++have_libv4l1=no
+ 
+ 
+ 
+@@ -16874,7 +16804,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+         leo lexmark ma1509 magicolor \
          matsushita microtek microtek2 mustek mustek_pp \
          mustek_usb mustek_usb2 nec net niash pie pint \
 -        pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
 +        pixma plustek plustek_pp ricoh rts8891 s9036 \
          sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
          stv680 tamarack teco1 teco2 teco3 test u12 umax
-         umax_pp umax1220u v4l xerox_mfp"
+         umax_pp umax1220u v4l xerox_mfp p5"
diff --git a/package/sane-backends/patches/patch-configure_in b/package/sane-backends/patches/patch-configure_in
index 48e14d989..fbc410c70 100644
--- a/package/sane-backends/patches/patch-configure_in
+++ b/package/sane-backends/patches/patch-configure_in
@@ -1,11 +1,11 @@
---- sane-backends-1.0.20.orig/configure.in	2009-05-03 03:25:23.000000000 +0200
-+++ sane-backends-1.0.20/configure.in	2009-06-19 23:27:39.000000000 +0200
-@@ -513,7 +513,7 @@ ALL_BACKENDS="abaton agfafocus apple art
-         hp5590 hpsj5s hpljm1005 hs2p ibm leo lexmark ma1509 \
+--- sane-backends-1.0.22.orig/configure.in	2011-02-14 00:27:15.000000000 +0100
++++ sane-backends-1.0.22/configure.in	2011-10-01 19:26:02.249066938 +0200
+@@ -559,7 +559,7 @@ ALL_BACKENDS="abaton agfafocus apple art
+         leo lexmark ma1509 magicolor \
          matsushita microtek microtek2 mustek mustek_pp \
          mustek_usb mustek_usb2 nec net niash pie pint \
 -        pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
 +        pixma plustek plustek_pp ricoh rts8891 s9036 \
          sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
          stv680 tamarack teco1 teco2 teco3 test u12 umax 
-         umax_pp umax1220u v4l xerox_mfp"
+         umax_pp umax1220u v4l xerox_mfp p5"
diff --git a/package/sane-backends/patches/patch-ltmain_sh b/package/sane-backends/patches/patch-ltmain_sh
deleted file mode 100644
index 46c089aa5..000000000
--- a/package/sane-backends/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- sane-backends-1.0.20.orig/ltmain.sh	2009-02-10 22:41:47.000000000 +0100
-+++ sane-backends-1.0.20/ltmain.sh	2011-01-17 11:25:40.000000000 +0100
-@@ -1680,7 +1680,7 @@ EOF
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index c5749444a..a87760694 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--enable-png \
 			--enable-bmp \
 			--enable-tif
 
-post-install:
+libsdl-image-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
 	$(CP) ${WRKINST}/usr/lib/libSDL*.so* $(IDIR_LIBSDL_IMAGE)/usr/lib
 
@@ -40,5 +40,8 @@ libsdl-image-dev-install:
 	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
 	$(CP) ${WRKINST}/usr/include/SDL/*.h \
 		$(IDIR_LIBSDL_IMAGE_DEV)/usr/include/SDL
+	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE_DEV)/usr/lib/pkgconfig
+	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
+		$(IDIR_LIBSDL_IMAGE_DEV)/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index d36b9d55b..f911ee0f7 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -54,5 +54,7 @@ libsdl-dev-install:
 		$(IDIR_LIBSDL_DEV)/usr/bin
 	$(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/include/SDL
 	$(CP) ${WRKINST}/usr/include/SDL/* $(IDIR_LIBSDL_DEV)/usr/include/SDL
+	$(INSTALL_DIR) $(IDIR_LIBSDL_DEV)/usr/lib/pkgconfig
+	$(CP) ${WRKINST}/usr/lib/pkgconfig/*.pc $(IDIR_LIBSDL_DEV)/usr/lib/pkgconfig
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/section.lst b/package/section.lst
index d1fa5ebf3..b29d9dcb5 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -45,6 +45,6 @@ x11/apps	X applications
 x11/drivers	X drivers
 x11/server	X server 
 x11/libs	X libraries
-x11/misc	X Misc
+x11/misc	X misc
 x11/fonts	X fonts
 x11/devel	X headers
diff --git a/package/sox/Makefile b/package/sox/Makefile
index 4f633b2a6..2f5436146 100644
--- a/package/sox/Makefile
+++ b/package/sox/Makefile
@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--without-ffmpeg
+
 sox-install:
 	$(INSTALL_DIR) $(IDIR_SOX)/usr/lib
 	${CP} ${WRKINST}/usr/lib/libsox.so* $(IDIR_SOX)/usr/lib
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 8a0bfb694..548891921 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,23 +4,27 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		strace
-PKG_VERSION:=		4.5.20
+PKG_VERSION:=		4.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		64dfe10d9db0c1e34030891695ffca4b
+PKG_MD5SUM:=		e537b2b1afeec70c0e6e27a0d0fd671e
 PKG_DESCR:=		System call trace program
 PKG_SECTION:=		debug
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=strace/}
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_STATIC),y)
+TARGET_CFLAGS+=		-static
+endif
+
 INSTALL_STYLE:=		manual
 
 do-install:
-	${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/strace/patches/patch-Makefile_in b/package/strace/patches/patch-Makefile_in
index c93da1102..38329e3ac 100644
--- a/package/strace/patches/patch-Makefile_in
+++ b/package/strace/patches/patch-Makefile_in
@@ -1,10 +1,11 @@
---- strace-4.5.20.orig/Makefile.in	2010-04-14 21:41:05.000000000 +0200
-+++ strace-4.5.20/Makefile.in	2010-12-28 22:43:17.000000000 +0100
-@@ -242,6 +242,7 @@ EXTRA_DIST = $(man_MANS) errnoent.sh sig
- 	     linux/ioctlent.h linux/errnoent.h linux/signalent.h \
- 	     linux/syscall.h linux/dummy.h \
- 	     linux/i386/syscallent.h \
-+	     linux/cris/syscallent.h \
- 	     linux/alpha/errnoent.h linux/alpha/ioctlent.h \
- 	     linux/alpha/signalent.h linux/alpha/syscallent.h \
- 	     linux/arm/syscallent.h linux/arm/syscallent1.h \
+--- strace-4.6.orig/Makefile.in	2011-03-15 19:23:18.000000000 +0100
++++ strace-4.6/Makefile.in	2011-09-02 09:14:19.198484990 +0200
+@@ -270,7 +270,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = tests
++SUBDIRS =
+ man_MANS = strace.1
+ bin_SCRIPTS = strace-graph
+ 
diff --git a/package/strace/patches/patch-net_c b/package/strace/patches/patch-net_c
deleted file mode 100644
index a0dc31029..000000000
--- a/package/strace/patches/patch-net_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- strace-4.5.19.orig/net.c	2009-09-01 21:53:29.000000000 +0200
-+++ strace-4.5.19/net.c	2009-12-03 23:35:36.000000000 +0100
-@@ -53,6 +53,7 @@
- #include <net/if.h>
- #if defined(LINUX)
- #include <asm/types.h>
-+#include <linux/netlink.h>
- #if defined(__GLIBC__) && (__GLIBC__ >= 2) && (__GLIBC__ + __GLIBC_MINOR__ >= 3)
- #  include <netipx/ipx.h>
- #else
diff --git a/package/strace/src/linux/crisv32/ioctlent.h.in b/package/strace/src/linux/crisv32/ioctlent.h.in
new file mode 100644
index 000000000..52ac99ba0
--- /dev/null
+++ b/package/strace/src/linux/crisv32/ioctlent.h.in
@@ -0,0 +1 @@
+#include "../i386/ioctlent.h.in"
diff --git a/package/strace/src/linux/crisv32/syscallent.h b/package/strace/src/linux/crisv32/syscallent.h
new file mode 100644
index 000000000..d8dd9f7ab
--- /dev/null
+++ b/package/strace/src/linux/crisv32/syscallent.h
@@ -0,0 +1 @@
+#include "i386/syscallent.h"
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 31c2b6980..e4c903bef 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		94a1738fe92062cdd6a9642eeaccefc1
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		libusb libusb-compat libpthread
-PKG_BUILDDEP:=		libusb libusb-compat
+PKG_DEPENDS:=		libusb libusb-compat libpthread zlib
+PKG_BUILDDEP:=		libusb libusb-compat zlib
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
 
 PKG_SUBPKGS:=		LSUSB
diff --git a/package/v4l-utils/Makefile b/package/v4l-utils/Makefile
new file mode 100644
index 000000000..72e23f0f4
--- /dev/null
+++ b/package/v4l-utils/Makefile
@@ -0,0 +1,37 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		v4l-utils
+PKG_VERSION:=		0.8.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		037bec9f68cfb0b84bcccb00d30e429b
+PKG_DESCR:=		Video4Linux2 utilities
+PKG_SECTION:=		multimedia
+PKG_SITES:=		http://linuxtv.org/downloads/v4l-utils/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+PKG_SUBPKGS:=		V4L_UTILS LIBV4L
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,V4L_UTILS,v4l-utils,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBV4L,libv4l,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+
+v4l-utils-install:
+	$(INSTALL_DIR) $(IDIR_V4L_UTILS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/v4l2-ctl \
+		$(IDIR_V4L_UTILS)/usr/bin
+
+libv4l-install:
+	$(INSTALL_DIR) $(IDIR_LIBV4L)/usr/lib/libv4l
+	$(CP) $(WRKINST)/usr/lib/libv4l*so* \
+		$(IDIR_LIBV4L)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libv4l/v4l{1compat,2convert}.so \
+		$(IDIR_LIBV4L)/usr/lib/libv4l
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/v4l-utils/patches/patch-Make_rules b/package/v4l-utils/patches/patch-Make_rules
new file mode 100644
index 000000000..f7bdb14f7
--- /dev/null
+++ b/package/v4l-utils/patches/patch-Make_rules
@@ -0,0 +1,17 @@
+--- v4l-utils-0.8.5.orig/Make.rules	2011-07-17 18:06:39.000000000 +0200
++++ v4l-utils-0.8.5/Make.rules	2011-09-18 20:20:32.000000000 +0200
+@@ -2,12 +2,12 @@ V4L_UTILS_VERSION=0.8.5
+ 
+ # These ones can be overriden from the cmdline
+ 
+-CFLAGS := -g -O1
++CFLAGS ?= -g -O1
+ CFLAGS += -Wall -Wpointer-arith
+ CXXFLAGS := $(CFLAGS)
+ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
+ 
+-PREFIX = /usr/local
++PREFIX = /usr
+ LIBDIR = $(PREFIX)/lib
+ # subdir below LIBDIR in which to install the libv4lx libc wrappers
+ LIBSUBDIR = libv4l
diff --git a/package/v4l-utils/patches/patch-utils_Makefile b/package/v4l-utils/patches/patch-utils_Makefile
new file mode 100644
index 000000000..daf4c67e9
--- /dev/null
+++ b/package/v4l-utils/patches/patch-utils_Makefile
@@ -0,0 +1,8 @@
+--- v4l-utils-0.8.5.orig/utils/Makefile	2011-07-17 18:06:39.000000000 +0200
++++ v4l-utils-0.8.5/utils/Makefile	2011-09-26 04:56:47.369377637 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg v4l2-sysfs-path xc3028-firmware
++SUBDIRS=libv4l2util libmedia_dev v4l2-compliance v4l2-ctl v4l2-dbg
+ 
+ all install: 
+ 	@for i in $(SUBDIRS); do \
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
new file mode 100644
index 000000000..163028ca2
--- /dev/null
+++ b/package/vlc/Makefile
@@ -0,0 +1,51 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		vlc
+PKG_VERSION:=		1.1.11
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		a64846d6f21ea179ae8e8bfb6f9447fe
+PKG_DESCR:=		Media Player
+PKG_SECTION:=		multimedia
+PKG_BUILDDEP:=		ffmpeg xcb-util libtheora libgcrypt
+PKG_DEPENDS:=		libffmpeg xcb-util libtheora libgcrypt
+PKG_URL:=		http://www.videolan.org/vlc/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/}
+
+PKG_ARCH_DEPENDS:=	!cris
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,VLC,vlc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-lua \
+			--disable-dbus \
+			--disable-a52 \
+			--disable-fribidi \
+			--disable-qt4 \
+			--disable-skins2 \
+			--disable-remoteosd \
+			--disable-dvdnav \
+			--disable-glx \
+			--disable-libxml2 \
+			--disable-smb \
+			--enable-libgcrypt \
+			--enable-theora
+
+vlc-install:
+	$(INSTALL_DIR) $(IDIR_VLC)/usr/bin
+	$(INSTALL_DIR) $(IDIR_VLC)/usr/lib/vlc/plugins
+	$(CP) $(WRKINST)/usr/lib/libvlc*.so* \
+		$(IDIR_VLC)/usr/lib
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{c,}vlc \
+		$(IDIR_VLC)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/vlc/plugins/* \
+		$(IDIR_VLC)/usr/lib/vlc/plugins
+	-rm $(IDIR_VLC)/usr/lib/vlc/plugins/*/*.la
+	-rm $(IDIR_VLC)/usr/lib/vlc/plugins/*/*.a
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vlc/patches/patch-modules_misc_Makefile_in b/package/vlc/patches/patch-modules_misc_Makefile_in
new file mode 100644
index 000000000..a2670d93f
--- /dev/null
+++ b/package/vlc/patches/patch-modules_misc_Makefile_in
@@ -0,0 +1,155 @@
+--- vlc-1.1.11.orig/modules/misc/Makefile.in	2011-07-14 13:28:46.000000000 +0200
++++ vlc-1.1.11/modules/misc/Makefile.in	2011-09-15 13:17:03.867989779 +0200
+@@ -205,26 +205,6 @@ libwin32text_plugin_la_LINK = $(LIBTOOL)
+ 	$(libwin32text_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+ @HAVE_WINCE_TRUE@am_libwin32text_plugin_la_rpath = -rpath $(libvlcdir)
+-am__objects_12 = libxdg_screensaver_plugin_la-xdg.lo
+-am_libxdg_screensaver_plugin_la_OBJECTS = $(am__objects_12)
+-nodist_libxdg_screensaver_plugin_la_OBJECTS =
+-libxdg_screensaver_plugin_la_OBJECTS =  \
+-	$(am_libxdg_screensaver_plugin_la_OBJECTS) \
+-	$(nodist_libxdg_screensaver_plugin_la_OBJECTS)
+-libxdg_screensaver_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+-	$(libxdg_screensaver_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
+-am__objects_13 = libxscreensaver_plugin_la-xscreensaver.lo
+-am_libxscreensaver_plugin_la_OBJECTS = $(am__objects_13)
+-nodist_libxscreensaver_plugin_la_OBJECTS =
+-libxscreensaver_plugin_la_OBJECTS =  \
+-	$(am_libxscreensaver_plugin_la_OBJECTS) \
+-	$(nodist_libxscreensaver_plugin_la_OBJECTS)
+-libxscreensaver_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+-	$(libxscreensaver_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
+ am__depfiles_maybe = depfiles
+@@ -272,10 +252,6 @@ SOURCES = $(libaudioscrobbler_plugin_la_
+ 	$(nodist_libvod_rtsp_plugin_la_SOURCES) \
+ 	$(libwin32text_plugin_la_SOURCES) \
+ 	$(nodist_libwin32text_plugin_la_SOURCES) \
+-	$(libxdg_screensaver_plugin_la_SOURCES) \
+-	$(nodist_libxdg_screensaver_plugin_la_SOURCES) \
+-	$(libxscreensaver_plugin_la_SOURCES) \
+-	$(nodist_libxscreensaver_plugin_la_SOURCES)
+ DIST_SOURCES = $(libaudioscrobbler_plugin_la_SOURCES) \
+ 	$(libfreetype_plugin_la_SOURCES) \
+ 	$(libgnutls_plugin_la_SOURCES) $(libinhibit_plugin_la_SOURCES) \
+@@ -284,9 +260,7 @@ DIST_SOURCES = $(libaudioscrobbler_plugi
+ 	$(libquartztext_plugin_la_SOURCES) \
+ 	$(libsqlite_plugin_la_SOURCES) $(libsvg_plugin_la_SOURCES) \
+ 	$(libvod_rtsp_plugin_la_SOURCES) \
+-	$(libwin32text_plugin_la_SOURCES) \
+-	$(libxdg_screensaver_plugin_la_SOURCES) \
+-	$(libxscreensaver_plugin_la_SOURCES)
++	$(libwin32text_plugin_la_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+ 	install-dvi-recursive install-exec-recursive \
+@@ -620,7 +594,6 @@ LTLIBxcb_xv = @LTLIBxcb_xv@
+ LTLIBxdg_screensaver = @LTLIBxdg_screensaver@
+ LTLIBxml = @LTLIBxml@
+ LTLIBxosd = @LTLIBxosd@
+-LTLIBxscreensaver = @LTLIBxscreensaver@
+ LTLIBzip = @LTLIBzip@
+ LTLIBzvbi = @LTLIBzvbi@
+ LUAC = @LUAC@
+@@ -834,13 +807,12 @@ vlcdatadir = @vlcdatadir@
+ vlclibdir = @vlclibdir@
+ basedir = misc
+ dir = misc
+-mods = audioscrobbler freetype gnutls inhibit logger osso_screensaver quartztext sqlite svg vod_rtsp win32text xdg_screensaver xscreensaver
++mods = audioscrobbler freetype gnutls inhibit logger osso_screensaver quartztext sqlite svg vod_rtsp win32text
+ libvlc_LTLIBRARIES = $(LTLIBfreetype) $(LTLIBgnutls) $(LTLIBinhibit) \
+ 	$(LTLIBosso_screensaver) $(LTLIBsqlite) $(LTLIBsvg) \
+-	$(LTLIBxdg_screensaver) $(LTLIBxscreensaver) \
+ 	libaudioscrobbler_plugin.la liblogger_plugin.la \
+ 	$(am__append_2) $(am__append_3) $(am__append_4)
+-EXTRA_LTLIBRARIES = libfreetype_plugin.la libgnutls_plugin.la libinhibit_plugin.la libosso_screensaver_plugin.la libsqlite_plugin.la libsvg_plugin.la libxdg_screensaver_plugin.la libxscreensaver_plugin.la
++EXTRA_LTLIBRARIES = libfreetype_plugin.la libgnutls_plugin.la libinhibit_plugin.la libosso_screensaver_plugin.la libsqlite_plugin.la libsvg_plugin.la
+ NULL = 
+ SUFFIXES = 
+ libvlcdir = $(vlclibdir)/plugins/$(basedir)
+@@ -876,8 +848,6 @@ SOURCES_svg = svg.c
+ SOURCES_audioscrobbler = audioscrobbler.c
+ SOURCES_inhibit = inhibit.c
+ SOURCES_sqlite = sqlite.c
+-SOURCES_xscreensaver = inhibit/xscreensaver.c
+-SOURCES_xdg_screensaver = inhibit/xdg.c
+ SOURCES_osso_screensaver = inhibit/osso.c
+ 
+ # The audioscrobbler plugin
+@@ -1001,27 +971,6 @@ libwin32text_plugin_la_OBJCFLAGS = $(AM_
+ libwin32text_plugin_la_LIBADD = $(AM_LIBADD)
+ libwin32text_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym
+ 
+-# The xdg_screensaver plugin
+-libxdg_screensaver_plugin_la_SOURCES = $(SOURCES_xdg_screensaver)
+-nodist_libxdg_screensaver_plugin_la_SOURCES = $(nodist_SOURCES_xdg_screensaver)
+-# Force per-target objects:
+-libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
+-libxdg_screensaver_plugin_la_CXXFLAGS = $(AM_CXXFLAGS)
+-libxdg_screensaver_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
+-# Set LIBADD and DEPENDENCIES manually:
+-libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
+-libxdg_screensaver_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym
+-
+-# The xscreensaver plugin
+-libxscreensaver_plugin_la_SOURCES = $(SOURCES_xscreensaver)
+-nodist_libxscreensaver_plugin_la_SOURCES = $(nodist_SOURCES_xscreensaver)
+-# Force per-target objects:
+-libxscreensaver_plugin_la_CFLAGS = $(AM_CFLAGS)
+-libxscreensaver_plugin_la_CXXFLAGS = $(AM_CXXFLAGS)
+-libxscreensaver_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
+-# Set LIBADD and DEPENDENCIES manually:
+-libxscreensaver_plugin_la_LIBADD = $(AM_LIBADD)
+-libxscreensaver_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -1110,10 +1059,6 @@ libvod_rtsp_plugin.la: $(libvod_rtsp_plu
+ 	$(AM_V_CCLD)$(libvod_rtsp_plugin_la_LINK) $(am_libvod_rtsp_plugin_la_rpath) $(libvod_rtsp_plugin_la_OBJECTS) $(libvod_rtsp_plugin_la_LIBADD) $(LIBS)
+ libwin32text_plugin.la: $(libwin32text_plugin_la_OBJECTS) $(libwin32text_plugin_la_DEPENDENCIES) 
+ 	$(AM_V_CCLD)$(libwin32text_plugin_la_LINK) $(am_libwin32text_plugin_la_rpath) $(libwin32text_plugin_la_OBJECTS) $(libwin32text_plugin_la_LIBADD) $(LIBS)
+-libxdg_screensaver_plugin.la: $(libxdg_screensaver_plugin_la_OBJECTS) $(libxdg_screensaver_plugin_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(libxdg_screensaver_plugin_la_LINK)  $(libxdg_screensaver_plugin_la_OBJECTS) $(libxdg_screensaver_plugin_la_LIBADD) $(LIBS)
+-libxscreensaver_plugin.la: $(libxscreensaver_plugin_la_OBJECTS) $(libxscreensaver_plugin_la_DEPENDENCIES) 
+-	$(AM_V_CCLD)$(libxscreensaver_plugin_la_LINK)  $(libxscreensaver_plugin_la_OBJECTS) $(libxscreensaver_plugin_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1132,8 +1077,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsvg_plugin_la-svg.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvod_rtsp_plugin_la-rtsp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libwin32text_plugin_la-win32text.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxdg_screensaver_plugin_la-xdg.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxscreensaver_plugin_la-xscreensaver.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -1247,22 +1190,6 @@ libwin32text_plugin_la-win32text.lo: win
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libwin32text_plugin_la_CFLAGS) $(CFLAGS) -c -o libwin32text_plugin_la-win32text.lo `test -f 'win32text.c' || echo '$(srcdir)/'`win32text.c
+ 
+-libxdg_screensaver_plugin_la-xdg.lo: inhibit/xdg.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxdg_screensaver_plugin_la_CFLAGS) $(CFLAGS) -MT libxdg_screensaver_plugin_la-xdg.lo -MD -MP -MF $(DEPDIR)/libxdg_screensaver_plugin_la-xdg.Tpo -c -o libxdg_screensaver_plugin_la-xdg.lo `test -f 'inhibit/xdg.c' || echo '$(srcdir)/'`inhibit/xdg.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libxdg_screensaver_plugin_la-xdg.Tpo $(DEPDIR)/libxdg_screensaver_plugin_la-xdg.Plo
+-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inhibit/xdg.c' object='libxdg_screensaver_plugin_la-xdg.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxdg_screensaver_plugin_la_CFLAGS) $(CFLAGS) -c -o libxdg_screensaver_plugin_la-xdg.lo `test -f 'inhibit/xdg.c' || echo '$(srcdir)/'`inhibit/xdg.c
+-
+-libxscreensaver_plugin_la-xscreensaver.lo: inhibit/xscreensaver.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxscreensaver_plugin_la_CFLAGS) $(CFLAGS) -MT libxscreensaver_plugin_la-xscreensaver.lo -MD -MP -MF $(DEPDIR)/libxscreensaver_plugin_la-xscreensaver.Tpo -c -o libxscreensaver_plugin_la-xscreensaver.lo `test -f 'inhibit/xscreensaver.c' || echo '$(srcdir)/'`inhibit/xscreensaver.c
+-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libxscreensaver_plugin_la-xscreensaver.Tpo $(DEPDIR)/libxscreensaver_plugin_la-xscreensaver.Plo
+-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inhibit/xscreensaver.c' object='libxscreensaver_plugin_la-xscreensaver.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libxscreensaver_plugin_la_CFLAGS) $(CFLAGS) -c -o libxscreensaver_plugin_la-xscreensaver.lo `test -f 'inhibit/xscreensaver.c' || echo '$(srcdir)/'`inhibit/xscreensaver.c
+-
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
diff --git a/package/vlc/patches/patch-src_misc_linux_specific_c b/package/vlc/patches/patch-src_misc_linux_specific_c
new file mode 100644
index 000000000..f25b1ea57
--- /dev/null
+++ b/package/vlc/patches/patch-src_misc_linux_specific_c
@@ -0,0 +1,19 @@
+--- vlc-1.1.11.orig/src/misc/linux_specific.c	2011-07-14 13:27:03.000000000 +0200
++++ vlc-1.1.11/src/misc/linux_specific.c	2011-09-15 06:35:43.887989501 +0200
+@@ -83,14 +83,14 @@ static struct
+     unsigned refs;
+ } once = { VLC_STATIC_MUTEX, 0 };
+ 
+-#ifdef __GLIBC__
++#ifndef __UCLIBC__
+ # include <gnu/libc-version.h>
+ # include <stdlib.h>
+ #endif
+ 
+ void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])
+ {
+-#ifdef __GLIBC__
++#ifndef __UCLIBC__
+     const char *glcv = gnu_get_libc_version ();
+ 
+     /* gettext in glibc 2.5-2.7 is not thread-safe. LibVLC keeps crashing,
diff --git a/package/xawtv/Makefile b/package/xawtv/Makefile
new file mode 100644
index 000000000..f4c4ac60a
--- /dev/null
+++ b/package/xawtv/Makefile
@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xawtv
+PKG_VERSION:=		3.102
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3ee0f1d682d7e5734121bc420a74efd5
+PKG_DESCR:=		Video & Webcam application
+PKG_BUILDDEP:=		libXinerama v4l-utils
+PKG_DEPENDS:=		libxinerama libv4l
+PKG_SECTION:=		x11/apps
+PKG_SITES:=		http://linuxtv.org/downloads/xawtv/
+
+PKG_ARCH_DEPENDS:=	x86
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XAWTV,xawtv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+
+pre-configure:
+	$(SED) "s#@@GNU_TARGET_NAME@@#${GNU_TARGET_NAME}#" $(WRKBUILD)/Makefile
+
+xawtv-install:
+	$(INSTALL_DIR) $(IDIR_XAWTV)/etc/X11/app-defaults
+	$(INSTALL_DATA) $(WRKINST)/etc/X11/app-defaults/Xawtv \
+		$(IDIR_XAWTV)/etc/X11/app-defaults
+	$(INSTALL_DIR) $(IDIR_XAWTV)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xawtv \
+		$(IDIR_XAWTV)/usr/bin
+	$(INSTALL_DIR) $(IDIR_XAWTV)/usr/lib/xawtv
+	$(CP) $(WRKINST)/usr/lib/xawtv/*.so \
+		$(IDIR_XAWTV)/usr/lib/xawtv
+	$(INSTALL_DIR) $(IDIR_XAWTV)/usr/share/xawtv
+	$(CP) $(WRKINST)/usr/share/xawtv/* \
+		$(IDIR_XAWTV)/usr/share/xawtv
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xawtv/patches/patch-Makefile b/package/xawtv/patches/patch-Makefile
new file mode 100644
index 000000000..bdda68ed2
--- /dev/null
+++ b/package/xawtv/patches/patch-Makefile
@@ -0,0 +1,18 @@
+--- xawtv-3.102.orig/Makefile	2011-09-05 19:26:02.000000000 +0200
++++ xawtv-3.102/Makefile	2011-09-26 21:03:31.839340414 +0200
+@@ -1,6 +1,6 @@
+ 
+ # passed to configure
+-prefix = /usr/local
++prefix = /usr
+ 
+ # arch name -- for build directory
+ arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z")
+@@ -21,5 +21,5 @@ tag archive rpm dsc debs pbuild release
+ 
+ $(arch)/Makefile: configure
+ 	mkdir -p $(arch)
+-	(cd $(arch); ../configure	\
+-		--prefix=$(prefix)	)
++	(cd $(arch); ../configure --disable-xft	\
++		--prefix=$(prefix) --host=@@GNU_TARGET_NAME@@	)
diff --git a/package/xawtv/patches/patch-Makefile_in b/package/xawtv/patches/patch-Makefile_in
new file mode 100644
index 000000000..cac9d71bc
--- /dev/null
+++ b/package/xawtv/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- xawtv-3.102.orig/Makefile.in	2011-09-05 19:26:02.000000000 +0200
++++ xawtv-3.102/Makefile.in	2011-09-18 20:42:35.107990034 +0200
+@@ -3,7 +3,7 @@ VPATH		:= $(srcdir)
+ 
+ # for package builds (buildroot install + no root privs needed)
+ DESTDIR=
+-SUID_ROOT=-m4755 -o root
++SUID_ROOT=-m755
+ STRIP_FLAG=
+ 
+ # install paths
diff --git a/package/xawtv/patches/patch-console_fbtools_c b/package/xawtv/patches/patch-console_fbtools_c
new file mode 100644
index 000000000..aa4d98bb6
--- /dev/null
+++ b/package/xawtv/patches/patch-console_fbtools_c
@@ -0,0 +1,10 @@
+--- xawtv-3.102.orig/console/fbtools.c	2011-09-05 19:26:02.000000000 +0200
++++ xawtv-3.102/console/fbtools.c	2011-09-26 21:10:50.109340133 +0200
+@@ -520,6 +520,6 @@ fb_catch_exit_signals(void)
+ 
+     /* cleanup */
+     fb_cleanup();
+-    fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]);
++    fprintf(stderr,"Oops: %s\n",strsignal(termsig));
+     exit(42);
+ }
diff --git a/package/xawtv/patches/patch-console_record_c b/package/xawtv/patches/patch-console_record_c
new file mode 100644
index 000000000..bb679f3fe
--- /dev/null
+++ b/package/xawtv/patches/patch-console_record_c
@@ -0,0 +1,11 @@
+--- xawtv-3.102.orig/console/record.c	2011-09-05 19:26:02.000000000 +0200
++++ xawtv-3.102/console/record.c	2011-09-26 21:09:52.219340170 +0200
+@@ -429,7 +429,7 @@ ctrlc(int signal)
+ {
+     if (verbose)
+ 	fprintf(stderr,"\n%s - exiting\n",
+-		sys_siglist[signal]);
++		strsignal(signal));
+     stop = 1;
+ }
+ 
diff --git a/package/xawtv/patches/patch-mk_Compile_mk b/package/xawtv/patches/patch-mk_Compile_mk
new file mode 100644
index 000000000..0c64d48fc
--- /dev/null
+++ b/package/xawtv/patches/patch-mk_Compile_mk
@@ -0,0 +1,11 @@
+--- xawtv-3.102.orig/mk/Compile.mk	2011-09-05 19:26:02.000000000 +0200
++++ xawtv-3.102/mk/Compile.mk	2011-09-18 20:39:27.867990854 +0200
+@@ -13,7 +13,7 @@
+ ########################################################################
+ 
+ # verbose yes/no
+-verbose		?= no
++verbose		?= yes
+ 
+ # dependency files
+ tmpdep		= mk/$(subst /,_,$*).tmp
diff --git a/package/xawtv/patches/patch-x11_rootv_c b/package/xawtv/patches/patch-x11_rootv_c
new file mode 100644
index 000000000..8e3393f54
--- /dev/null
+++ b/package/xawtv/patches/patch-x11_rootv_c
@@ -0,0 +1,20 @@
+--- xawtv-3.102.orig/x11/rootv.c	2011-09-05 19:26:02.000000000 +0200
++++ xawtv-3.102/x11/rootv.c	2011-09-26 21:12:26.549340070 +0200
+@@ -133,7 +133,7 @@ catch_sig(int signal)
+     termsig = signal;
+     if (verbose)
+ 	fprintf(stderr,"received signal %d [%s]\n",
+-		termsig,sys_siglist[termsig]);
++		termsig,strsignal(termsig));
+ }
+ 
+ static void usage(FILE *fp)
+@@ -422,7 +422,7 @@ main(int argc, char *argv[])
+     }
+     if (verbose && termsig)
+ 	fprintf(stderr,"exiting on signal %d [%s]\n",
+-		termsig,sys_siglist[termsig]);
++		termsig,strsignal(termsig));
+     if (do_mute && have_mute)
+ 	XvSetPortAttribute(dpy,port,XV_MUTE,1);
+     XvStopVideo(dpy,port,win);
diff --git a/package/xcb-util/Makefile b/package/xcb-util/Makefile
new file mode 100644
index 000000000..4c7708596
--- /dev/null
+++ b/package/xcb-util/Makefile
@@ -0,0 +1,23 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xcb-util
+PKG_VERSION:=		0.3.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a8f8f710a202079d1ead532abd061672
+PKG_DESCR:=		XCB utils
+PKG_SECTION:=		x11/apps
+PKG_SITES:=		http://xcb.freedesktop.org/dist/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XCB_UTIL,xcb-util,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+xcb-util-install:
+	$(INSTALL_DIR) $(IDIR_XCB_UTIL)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libxcb-*.so* \
+		$(IDIR_XCB_UTIL)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
new file mode 100644
index 000000000..c2dcf7c03
--- /dev/null
+++ b/package/xf86-input-evdev/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xf86-input-evdev
+PKG_VERSION:=		2.6.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		95d35eea1dad1c4828d0027f3be5325c
+PKG_DESCR:=		X11 driver for Event driver
+PKG_SECTION:=		x11/drivers
+PKG_DEPENDS:=		xorg-server kmod-input-evdev
+PKG_BUILDDEP:=		xorg-server
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XF86_INPUT_EVDEV,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	${INSTALL_DIR} ${IDIR_XF86_INPUT_EVDEV}/usr/lib/xorg/modules/input
+	${CP} ${WRKINST}/usr/lib/xorg/modules/input/evdev_drv.so \
+		${IDIR_XF86_INPUT_EVDEV}/usr/lib/xorg/modules/input/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-evdev/patches/patch-ltmain_sh b/package/xf86-input-evdev/patches/patch-ltmain_sh
new file mode 100644
index 000000000..f679ecee5
--- /dev/null
+++ b/package/xf86-input-evdev/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- xf86-input-keyboard-1.5.0.orig/ltmain.sh	2010-10-30 18:15:40.000000000 +0200
++++ xf86-input-keyboard-1.5.0/ltmain.sh	2011-01-24 19:31:12.000000000 +0100
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index f22b8aec2..2af6fc389 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,17 +4,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
-PKG_VERSION:=		3.1.4
+PKG_VERSION:=		3.1.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		74081975f148bcabcab26c4c3496ede9
+PKG_MD5SUM:=		b1db37749e2b4149a0dd178abff956be
 PKG_DESCR:=		Utilities for XFS filesystems
 PKG_SECTION:=		fs
-PKG_DEPENDS:=		libuuid libpthread
 PKG_BUILDDEP:=		e2fsprogs
+PKG_DEPENDS:=		libuuid libpthread
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 			ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
 
+PKG_CFLINE_XFSPROGS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -28,7 +30,7 @@ ALL_TARGET=
 
 do-install:
 	${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure
index ea30c4cdb..0eaf41253 100644
--- a/package/xfsprogs/patches/patch-configure
+++ b/package/xfsprogs/patches/patch-configure
@@ -1,366 +1,20 @@
---- xfsprogs-3.1.4.orig/configure	2010-11-11 18:38:31.000000000 +0100
-+++ xfsprogs-3.1.4/configure	2011-02-14 20:26:03.000000000 +0100
-@@ -11214,11 +11214,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-     test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
+--- xfsprogs-3.1.5.orig/configure	2011-03-31 05:11:43.000000000 +0200
++++ xfsprogs-3.1.5/configure	2011-10-09 18:15:57.858626068 +0200
+@@ -245,7 +245,7 @@ $0: the script under such a shell if you
+ fi
+ fi
+ fi
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=${CONFIG_SHELL-/bin/bash}
+ export SHELL
+ # Unset more variables known to interfere with behavior of common tools.
+ CLICOLOR_FORCE= GREP_OPTIONS=
+@@ -6414,7 +6414,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool'
  
  
--    pkg_distribution=`uname -s`
-+    pkg_distribution=Linux
-     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
  
- 
--    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | tr -d / | sed -e 's/irix64/irix/'`
-+    pkg_platform=linux
-     test -z "$PLATFORM" || pkg_platform="$PLATFORM"
- 
- 
-@@ -12604,349 +12604,6 @@ fi
- 
- 
- 
--for ac_header in aio.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_header_compiler=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  ac_header_preproc=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
--    ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--    if test $ac_cv_header_aio_h = no; then
--	echo
--	echo 'FATAL ERROR: could not find a valid <aio.h> header.'
--	exit 1
--    fi
--
--
--for ac_func in lio_listio
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char $ac_func (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
--int
--main ()
--{
--return $ac_func ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  eval "$as_ac_var=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_var=no"
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--done
--
--    if test $ac_cv_func_lio_listio = yes; then
--	librt=""
--    else
--
--{ $as_echo "$as_me:$LINENO: checking for lio_listio in -lrt" >&5
--$as_echo_n "checking for lio_listio in -lrt... " >&6; }
--if test "${ac_cv_lib_rt_lio_listio+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lrt -lpthread $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char lio_listio ();
--int
--main ()
--{
--return lio_listio ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_lib_rt_lio_listio=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_rt_lio_listio=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_lio_listio" >&5
--$as_echo "$ac_cv_lib_rt_lio_listio" >&6; }
--if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBRT 1
--_ACEOF
--
--  LIBS="-lrt $LIBS"
--
--else
--
--	    echo
--	    echo 'FATAL ERROR: could not find a library with lio_listio.'
--	    exit 1
--fi
--
--	librt="-lrt"
--    fi
--
--
--
--
--
--
- for ac_header in uuid.h sys/uuid.h uuid/uuid.h
- do
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/package/xfsprogs/patches/patch-include_buildmacros b/package/xfsprogs/patches/patch-include_buildmacros
new file mode 100644
index 000000000..e6b9ae21f
--- /dev/null
+++ b/package/xfsprogs/patches/patch-include_buildmacros
@@ -0,0 +1,11 @@
+--- xfsprogs-3.1.5.orig/include/buildmacros	2011-03-31 00:25:47.000000000 +0200
++++ xfsprogs-3.1.5/include/buildmacros	2011-10-09 18:12:27.668626203 +0200
+@@ -32,7 +32,7 @@ OBJECTS = $(ASFILES:.s=.o) \
+ 
+ INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+ 
+-SHELL = /bin/sh
++SHELL ?= /bin/bash
+ IMAGES_DIR = $(TOPDIR)/all-images
+ DIST_DIR = $(TOPDIR)/dist
+ 
diff --git a/package/xfsprogs/patches/patch-libxfs_linux_c b/package/xfsprogs/patches/patch-libxfs_linux_c
deleted file mode 100644
index 586dab521..000000000
--- a/package/xfsprogs/patches/patch-libxfs_linux_c
+++ /dev/null
@@ -1,35 +0,0 @@
---- xfsprogs-3.1.4.orig/libxfs/linux.c	2010-01-29 20:46:13.000000000 +0100
-+++ xfsprogs-3.1.4/libxfs/linux.c	2011-01-22 20:27:29.458658270 +0100
-@@ -16,12 +16,10 @@
-  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-  */
- 
--#define ustat __kernel_ustat
- #include <xfs/libxfs.h>
- #include <mntent.h>
- #include <sys/stat.h>
--#undef ustat
--#include <sys/ustat.h>
-+#include <sys/statvfs.h>
- #include <sys/mount.h>
- #include <sys/ioctl.h>
- #include <sys/sysinfo.h>
-@@ -49,8 +47,7 @@ static int max_block_alignment;
- int
- platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
- {
--	/* Pad ust; pre-2.6.28 linux copies out too much in 32bit compat mode */
--	struct ustat	ust[2];
-+	struct statvfs info;
- 	struct stat64	st;
- 
- 	if (!s) {
-@@ -61,7 +58,7 @@ platform_check_ismounted(char *name, cha
- 		s = &st;
- 	}
- 
--	if (ustat(s->st_rdev, ust) >= 0) {
-+	if (statvfs(name, &info) >= 0) {
- 		if (verbose)
- 			fprintf(stderr,
- 				_("%s: %s contains a mounted filesystem\n"),
diff --git a/package/xfsprogs/patches/patch-ltmain_sh b/package/xfsprogs/patches/patch-ltmain_sh
deleted file mode 100644
index 6c5c11607..000000000
--- a/package/xfsprogs/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfsprogs-3.1.4.orig/ltmain.sh	2010-11-11 18:38:26.000000000 +0100
-+++ xfsprogs-3.1.4/ltmain.sh	2011-04-01 20:20:00.951819025 +0200
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/xinput/Makefile b/package/xinput/Makefile
new file mode 100644
index 000000000..ee6adc046
--- /dev/null
+++ b/package/xinput/Makefile
@@ -0,0 +1,26 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xinput
+PKG_VERSION:=		1.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		87ad4db2fad4ff9a68e57759a63abc4b
+PKG_DESCR:=		X input utility
+PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		libxi
+PKG_BUILDDEP:=		libXi
+PKG_URL:=		http://xorg.freedesktop.org/
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XINPUT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_XINPUT)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xinput \
+		$(IDIR_XINPUT)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xinput_calibrator/Makefile b/package/xinput_calibrator/Makefile
new file mode 100644
index 000000000..14785c271
--- /dev/null
+++ b/package/xinput_calibrator/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xinput_calibrator
+PKG_VERSION:=		0.7.5
+PKG_RELEASE:=		2
+PKG_MD5SUM:=		20da0a2055a5a75962add8c6b44f60fa
+PKG_DESCR:=		X11 input calibration utility
+PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		libstdcxx
+PKG_URL:=		https://github.com/tias/xinput_calibrator
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XINPUT_CALIBRATOR,xinput-calibrator,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+xinput-calibrator-install:
+	$(INSTALL_DIR) $(IDIR_XINPUT_CALIBRATOR)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xinput_calibrator \
+		$(IDIR_XINPUT_CALIBRATOR)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index f953d434f..063fa92e7 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -22,14 +22,17 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_NEED_CXX:=		1
 
 PKG_SUBPKGS:=		XORG_SERVER XORG_SERVER_DEV
+PKGSD_XORG_SERVER_DEV:=	Xorg server development files
+PKGSC_XORG_SERVER_DEV:=	x11/devel
 
 PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
 PKG_ARCH_DEPENDS:=	!cris
 
-PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI
+PKG_FLAVOURS_XORG_SERVER:=	WITH_DRI WITH_KDRIVE
 PKGFS_WITH_DRI:=		mesalib
 PKGFD_WITH_DRI:=		enable DRI/DRI2 support
 PKGFB_WITH_DRI:=		xf86driproto glproto dri2proto MesaLib
+PKGFD_WITH_KDRIVE:=		Build Kdrive Xfbdev server
 
 PKG_CHOICES_XORG_SERVER:=	WITH_GCRYPT WITH_CRYPTO
 PKGCD_WITH_GCRYPT:=		use libgcrypt for SHA1
@@ -42,7 +45,7 @@ PKGCB_WITH_CRYPTO:=		openssl
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XORG_SERVER_DEV},${PKGSC_XORG_SERVER_DEV}))
 
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y)
 CONFIGURE_ARGS+=	 --with-sha1=libgcrypt
@@ -67,7 +70,6 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--disable-xf86bigfont \
 			--disable-xf86vidmode \
 			--disable-xfake \
-			--disable-xfbdev \
 			--disable-xinerama \
 			--disable-xnest \
 			--disable-xselinux \
@@ -78,6 +80,12 @@ CONFIGURE_ARGS+=	--enable-dga \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
 
+ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y)
+CONFIGURE_ARGS+=	--enable-kdrive --enable-xfbdev --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev
+else
+CONFIGURE_ARGS+=	--disable-kdrive --disable-xfbdev
+endif
+
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 CONFIGURE_ARGS+=	--enable-dri --enable-dri2 --enable-glx
 else
@@ -107,6 +115,10 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
 	${CP} ./files/xorg.conf.lemote-yeelong \
 		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
 endif
+ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y)
+	${CP} ./files/xorg.conf.sharp-zaurus \
+		$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
+endif
 ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
diff --git a/package/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst
index e26e54f3f..09f00dd35 100644
--- a/package/xorg-server/files/xorg-server.postinst
+++ b/package/xorg-server/files/xorg-server.postinst
@@ -1,5 +1,2 @@
 #!/bin/sh
 if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/Xorg;fi
-. $IPKG_INSTROOT/etc/functions.sh
-gid=$(get_next_gid)
-add_group video $gid
diff --git a/package/xorg-server/files/xorg.conf.sharp-zaurus b/package/xorg-server/files/xorg.conf.sharp-zaurus
new file mode 100644
index 000000000..9f3022a22
--- /dev/null
+++ b/package/xorg-server/files/xorg.conf.sharp-zaurus
@@ -0,0 +1,62 @@
+Section "Device"
+        Identifier      "Generic Video Card"
+        Driver          "fbdev"
+        Option          "UseFBDev"              "true"
+        Option          "Rotate"                "CW"
+EndSection
+
+Section "InputDevice"
+       Identifier      "Touchscreen"
+       Driver          "evdev"
+       Option          "CorePointer"
+       Option          "Device"        "/dev/input/event2"
+EndSection
+
+Section "InputClass"
+	Identifier	"calibration"
+	MatchProduct	"Touchscreen"
+	Option	"Calibration"	"210 3599 311 3796"
+EndSection
+
+Section "Monitor"
+        Identifier      "Generic Monitor"
+        Option          "DPMS"
+        HorizSync       28-32
+        VertRefresh     43-60
+EndSection
+
+Section "Screen"
+        Identifier      "Default Screen"
+        Device          "Generic Video Card"
+        Monitor         "Generic Monitor"
+        DefaultDepth    16
+        SubSection "Display"
+                Depth           1
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           4
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           8
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           15
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           16
+                Modes           "640x480"
+        EndSubSection
+        SubSection "Display"
+                Depth           24
+                Modes           "640x480"
+        EndSubSection
+EndSection
+
+Section "ServerLayout"
+        Identifier      "Default Layout"
+        Screen          "Default Screen"
+EndSection
diff --git a/package/xvidcore/Makefile b/package/xvidcore/Makefile
new file mode 100644
index 000000000..e17bbe8ea
--- /dev/null
+++ b/package/xvidcore/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xvidcore
+PKG_VERSION:=		1.3.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		87c8cf7b69ebed93c2d82ea5709d098a
+PKG_DESCR:=		Xvid Codec library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.xvid.org/
+PKG_SITES:=		http://downloads.xvid.org/downloads/
+
+PKG_SUBPKGS:=		LIBXVID
+
+WRKDIST=		$(WRKDIR)/$(PKG_NAME)/build/generic
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXVID,libxvid,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libxvid-install:
+	$(INSTALL_DIR) $(IDIR_LIBXVID)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libxvidcore.so* \
+		$(IDIR_LIBXVID)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
author	Waldemar Brodkorb <wbx@openadk.org>	2011-10-12 21:10:52 +0200
committer	Waldemar Brodkorb <wbx@openadk.org>	2011-10-12 21:10:52 +0200
commit	681a668edf704bbb000a49c835b3d71fa7035d86 (patch)
tree	27df7d51e37260f63812466b31369c1a144cdc45 /package
parent	2d1f73d4334593134d3a47704a2614ffcae384ae (diff)
parent	6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (diff)