fix conflict

author: Waldemar Brodkorb <wbx@openadk.org> 2011-09-16 11:07:13 +0200
committer: Waldemar Brodkorb <wbx@openadk.org> 2011-09-16 11:07:13 +0200
commit: 5861b2783c0615345b80a93470312b36d1cb9907 (patch)
tree: 42ded4821e0834063449a5620a1b46bc6f1e509b /package
parent: e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff)
parent: d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff)
68 files changed, 1243 insertions, 3138 deletions
diff --git a/package/SDL_gfx/Makefile b/package/SDL_gfx/Makefile
new file mode 100644
index 000000000..4dea6018d
--- /dev/null
+++ b/package/SDL_gfx/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:=		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
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_GFX,libsdl-gfx,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+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
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile
new file mode 100644
index 000000000..a76e49897
--- /dev/null
+++ b/package/SDL_ttf/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:=		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
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBSDL_TTF,libsdl-ttf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libsdl-ttf-install:
+	$(INSTALL_DIR) $(IDIR_LIBSDL_TTF)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libSDL_ttf*so* $(IDIR_LIBSDL_TTF)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
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/base-files/Makefile b/package/base-files/Makefile
index 4cc7e970a..27ecdaa7c 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:=		46
+PKG_RELEASE:=		47
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 
diff --git a/package/base-files/src/init b/package/base-files/src/init
index a3232cb9c..a9564011d 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 ] && {
@@ -18,6 +18,7 @@ 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/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/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/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/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile
index 9844014fb..db3e3cd7e 100644
--- a/package/gdk-pixbuf/Makefile
+++ b/package/gdk-pixbuf/Makefile
@@ -4,17 +4,19 @@
 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
 
+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}))
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/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/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/jack/Makefile b/package/jack/Makefile
index d67b473f6..ece6930b2 100644
--- a/package/jack/Makefile
+++ b/package/jack/Makefile
@@ -3,7 +3,6 @@
 
 include $(TOPDIR)/rules.mk
 
-# always use tab spaces as separator, no spaces
 PKG_NAME:=		jack
 PKG_VERSION:=		1.9.7
 PKG_RELEASE:=		1
@@ -16,6 +15,7 @@ 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
 
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..d66da0ff3
--- /dev/null
+++ b/package/kexec-tools/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:=		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_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/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/lm_sensors/Makefile b/package/lm_sensors/Makefile
new file mode 100644
index 000000000..1c9733e3e
--- /dev/null
+++ b/package/lm_sensors/Makefile
@@ -0,0 +1,64 @@
+# 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_DEPENDS:=		sysfsutils
+PKG_SECTION:=		misc
+PKG_URL:=		http://www.lm-sensors.org
+PKG_SITES:=		http://dl.lm-sensors.org/lm-sensors/releases/
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+TARGET_CFLAGS:=		${TARGET_CFLAGS_ARCH} -fwrapv -fno-ident
+
+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
+
+do-build:
+	${MAKE} -C ${WRKBUILD} \
+		${TARGET_CONFIGURE_OPTS} \
+		MACHINE="${CPU_ARCH}" \
+		LINUX="${LINUX_DIR}" \
+		STAGING_DIR="${STAGING_DIR}" \
+		PREFIX="/usr" \
+		user
+		
+lm-sensors-install:
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/local/bin/sensors ${IDIR_LM_SENSORS}/usr/bin/sensors
+	${INSTALL_DIR} ${IDIR_LM_SENSORS}/usr/lib
+	${CP} ${WRKINST}/usr/local/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/local/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/local/sbin/fancontrol ${IDIR_LM_SENSORS_DETECT}/usr/sbin/fancontrol
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isadump ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isadump
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/isaset ${IDIR_LM_SENSORS_DETECT}/usr/sbin/isaset
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/pwmconfig ${IDIR_LM_SENSORS_DETECT}/usr/sbin/pwmconfig
+	${INSTALL_BIN} ${WRKINST}/usr/local/sbin/sensors-detect ${IDIR_LM_SENSORS_DETECT}/usr/sbin/sensors-detect
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/log4cxx/Makefile b/package/log4cxx/Makefile
new file mode 100644
index 000000000..c65fe0b84
--- /dev/null
+++ b/package/log4cxx/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:=		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_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/mplayer/Makefile b/package/mplayer/Makefile
index 8bedd1023..8d00df04a 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -18,7 +18,7 @@ PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
 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 +30,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 +69,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
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/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/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/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/vlc/Makefile b/package/vlc/Makefile
new file mode 100644
index 000000000..0a57bf7ea
--- /dev/null
+++ b/package/vlc/Makefile
@@ -0,0 +1,46 @@
+# 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:=		1
+PKG_MD5SUM:=		a64846d6f21ea179ae8e8bfb6f9447fe
+PKG_DESCR:=		Media Player
+PKG_SECTION:=		multimedia
+PKG_BUILDDEP:=		ffmpeg xcb-util
+PKG_DEPENDS:=		ffmpeg xcb-util
+PKG_URL:=		http://www.videolan.org/vlc/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/}
+
+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-libgcrypt \
+			--disable-remoteosd \
+			--disable-dvdnav \
+			--disable-libxml2
+
+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/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..215f11a87
--- /dev/null
+++ b/package/xf86-input-evdev/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:=		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
+PKG_BUILDDEP:=		xorg-server
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+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/xinput/Makefile b/package/xinput/Makefile
new file mode 100644
index 000000000..d527229d4
--- /dev/null
+++ b/package/xinput/Makefile
@@ -0,0 +1,24 @@
+# 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_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..cc16db10f
--- /dev/null
+++ b/package/xinput_calibrator/Makefile
@@ -0,0 +1,24 @@
+# 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:=		1
+PKG_MD5SUM:=		20da0a2055a5a75962add8c6b44f60fa
+PKG_DESCR:=		X11 input calibration utility
+PKG_SECTION:=		x11/apps
+PKG_URL:=		https://github.com/tias/xinput_calibrator
+PKG_SITES:=		https://github.com/downloads/tias/xinput_calibrator/
+
+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..04e6471d5 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -22,6 +22,8 @@ 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
@@ -42,7 +44,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
author	Waldemar Brodkorb <wbx@openadk.org>	2011-09-16 11:07:13 +0200
committer	Waldemar Brodkorb <wbx@openadk.org>	2011-09-16 11:07:13 +0200
commit	5861b2783c0615345b80a93470312b36d1cb9907 (patch)
tree	42ded4821e0834063449a5620a1b46bc6f1e509b /package
parent	e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff)
parent	d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff)