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

29 files changed, 282 insertions, 70 deletions

diff --git a/Makefile b/Makefile
index ac760019f..9857476be 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-_UNLIMIT=	ulimit -dS $$(ulimit -dH 2>/dev/null ) 2>/dev/null;
+_UNLIMIT=	ulimit -dS $(shell ulimit -dH >/dev/null 2>/dev/null ) >/dev/null 2>/dev/null;
 
 all: .prereq_done
 	@${_UNLIMIT} ${GMAKE_INV} all
@@ -192,7 +192,7 @@ NO_ERROR=0
 	    -e 's/i[3-9]86/i386/' \
 	    )" >>prereq.mk
 	@echo 'HOSTCC:=${CC}' >>prereq.mk
-	@echo 'HOSTCFLAGS:=-O2 -fwrapv' >>prereq.mk
+	@echo 'HOSTCFLAGS:=-O2' >>prereq.mk
 	@echo 'LANGUAGE:=C' >>prereq.mk
 	@echo 'LC_ALL:=C' >>prereq.mk
 	@echo 'MAKE:=$${GMAKE}' >>prereq.mk
diff --git a/TODO b/TODO
index 364a66212..61921cbe3 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 - netbsd build
 - macos x build
-- openbsd build
 - make rpm package backend working
 - network scripts for wireless client / ap
 - network scripts for pppoe
diff --git a/mk/build.mk b/mk/build.mk
index e8309afba..1a9c637cf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -13,6 +13,7 @@ CONFIG = config
 DEFCONFIG= 		ADK_DEVELSYSTEM=n \
 			ADK_DEBUG=n \
 			ADK_STATIC=n \
+			ADK_MAKE_PARALLEL=n \
 			ADK_FORCE_PARALLEL=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 3a7320d6e..a3ca4590c 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -20,11 +20,13 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
 
 ifneq ($(filter autotool,${CONFIGURE_STYLE}),)
 	cd ${WRKBUILD}; \
-	    autoreconf -vif $(MAKE_TRACE)
+	    env AUTOCONF_VERSION=2.62 \
+		AUTOMAKE_VERSION=1.9 \
+		autoreconf -vif $(MAKE_TRACE)
 endif
 ifneq ($(filter autoconf,${CONFIGURE_STYLE}),)
 	cd ${WRKBUILD}; \
-	    autoconf $(MAKE_TRACE)
+	    env AUTOCONF_VERSION=2.62 autoconf $(MAKE_TRACE)
 endif
 ifneq ($(filter gnu,${CONFIGURE_STYLE}),)
 	@$(CMD_TRACE) "configuring... "
diff --git a/package/atk/Makefile b/package/atk/Makefile
index f7172b76b..0980de0cc 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		atk
 PKG_VERSION:=		1.29.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		glib
 PKG_MD5SUM:=		f587d9285b2d0ac35ea95acef673517c
 PKG_DESCR:=		atk library
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		glib
 PKG_URL:=		http://www.gnome.org
 PKG_SITES:=		${MASTER_SITE_GNOME:=/atk/1.29/}
 
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 3d100010d..36b1b7bba 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		aufs2 utilities
 PKG_SECTION:=		admin
 PKG_URL:=		http://aufs.sf.net/
-PKG_HOST_DEPENDS:=	!cygwin !freebsd
+PKG_HOST_DEPENDS:=	!cygwin !freebsd !openbsd
 
 NO_DISTFILES:=		1
 
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index 2d8c14735..d5b1bc48c 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bluez
-PKG_VERSION:=		4.57
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		dc29e54f1204ac4215caeeee062b26f6
+PKG_VERSION:=		4.59
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1c7cee215bc84656b1edee019cee78f5
 PKG_DESCR:=		bluetooth libraries and applications
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		kmod-bluetooth libusb glib dbus
diff --git a/package/bluez/patches/patch-Makefile_in b/package/bluez/patches/patch-Makefile_in
new file mode 100644
index 000000000..4334402d7
--- /dev/null
+++ b/package/bluez/patches/patch-Makefile_in
@@ -0,0 +1,27 @@
+--- bluez-4.59.orig/Makefile.in	Thu Dec 24 17:42:48 2009
++++ bluez-4.59/Makefile.in	Tue Dec 29 01:31:12 2009
+@@ -48,7 +48,6 @@ noinst_PROGRAMS = $(am__EXEEXT_7) $(am__EXEEXT_8) $(am
+ 	$(am__EXEEXT_10) $(am__EXEEXT_11)
+ @SBC_TRUE@am__append_1 = sbc/libsbc.la
+ @SBC_TRUE@am__append_2 = sbc/sbcinfo sbc/sbcdec sbc/sbcenc
+-@SBC_TRUE@@SNDFILE_TRUE@am__append_3 = sbc/sbctester
+ @NETLINK_TRUE@am__append_4 = plugins/netlink.la
+ @ECHOPLUGIN_TRUE@am__append_5 = echo
+ @ECHOPLUGIN_TRUE@am__append_6 = plugins/echo.c
+@@ -318,7 +317,6 @@ sbc_libsbc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(
+ @DUND_TRUE@am__EXEEXT_6 = compat/dund$(EXEEXT)
+ @SBC_TRUE@am__EXEEXT_7 = sbc/sbcinfo$(EXEEXT) sbc/sbcdec$(EXEEXT) \
+ @SBC_TRUE@	sbc/sbcenc$(EXEEXT)
+-@SBC_TRUE@@SNDFILE_TRUE@am__EXEEXT_8 = sbc/sbctester$(EXEEXT)
+ @TOOLS_TRUE@am__EXEEXT_9 = tools/avinfo$(EXEEXT) tools/ppporc$(EXEEXT) \
+ @TOOLS_TRUE@	tools/hcieventmask$(EXEEXT) \
+ @TOOLS_TRUE@	tools/hcisecfilter$(EXEEXT)
+@@ -918,8 +916,6 @@ lib_libbluetooth_la_DEPENDENCIES = $(local_headers)
+ @SBC_TRUE@sbc_sbcdec_LDADD = sbc/libsbc.la
+ @SBC_TRUE@sbc_sbcenc_SOURCES = sbc/sbcenc.c sbc/formats.h
+ @SBC_TRUE@sbc_sbcenc_LDADD = sbc/libsbc.la
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctester_LDADD = @SNDFILE_LIBS@
+-@SBC_TRUE@@SNDFILE_TRUE@sbc_sbctest_CFLAGS = @SNDFILE_CFLAGS@
+ @NETLINK_TRUE@plugins_netlink_la_LIBADD = @NETLINK_LIBS@
+ @NETLINK_TRUE@plugins_netlink_la_LDFLAGS = -module -avoid-version -no-undefined
+ @NETLINK_TRUE@plugins_netlink_la_CFLAGS = -fvisibility=hidden @DBUS_CFLAGS@ \
diff --git a/package/bluez/patches/patch-scripts_bluetooth_rules b/package/bluez/patches/patch-scripts_bluetooth_rules
new file mode 100644
index 000000000..0ff2c0ef3
--- /dev/null
+++ b/package/bluez/patches/patch-scripts_bluetooth_rules
@@ -0,0 +1,7 @@
+--- bluez-4.59.orig/scripts/bluetooth.rules	Thu Dec 24 17:43:09 2009
++++ bluez-4.59/scripts/bluetooth.rules	Tue Dec 29 01:26:46 2009
+@@ -1,3 +1,3 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/local/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/bluetoothd --udev"
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
index ae8f70f57..e5a84de4f 100644
--- a/package/bluez/patches/patch-tools_hciattach_c
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bluez-4.12.orig/tools/hciattach.c	2008-08-05 23:14:56.000000000 +0200
-+++ bluez-4.12/tools/hciattach.c	2009-05-12 18:14:29.000000000 +0200
-@@ -107,6 +107,7 @@ static int uart_speed(int s)
+--- bluez-4.59.orig/tools/hciattach.c	Tue May 19 11:04:10 2009
++++ bluez-4.59/tools/hciattach.c	Tue Dec 29 01:26:35 2009
+@@ -100,6 +100,7 @@ static int uart_speed(int s)
  		return B57600;
  	case 115200:
  		return B115200;
@@ -9,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	case 230400:
  		return B230400;
  	case 460800:
-@@ -125,6 +126,7 @@ static int uart_speed(int s)
+@@ -118,6 +119,7 @@ static int uart_speed(int s)
  		return B1500000;
  	case 2000000:
  		return B2000000;
diff --git a/package/bogofilter/patches/patch-configure_ac b/package/bogofilter/patches/patch-configure_ac
index 8d79ed50f..c3c254400 100644
--- a/package/bogofilter/patches/patch-configure_ac
+++ b/package/bogofilter/patches/patch-configure_ac
@@ -1,7 +1,7 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- bogofilter-1.2.0.orig/configure.ac	2009-02-21 21:41:43.000000000 +0100
-+++ bogofilter-1.2.0/configure.ac	2009-05-28 19:47:00.466710794 +0200
-@@ -550,49 +550,6 @@ Cannot link against libdb? Try these ste
+--- bogofilter-1.2.0.orig/configure.ac	Sat Feb 21 21:41:43 2009
++++ bogofilter-1.2.0/configure.ac	Tue Dec 29 01:38:12 2009
+@@ -550,49 +550,6 @@ Cannot link against libdb? Try these steps to solve th
  	AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header])
  	AC_SUBST(LIBDB)
  
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 99404e8e9..824704dcd 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -28,5 +28,6 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 9de7e2127..089197773 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.7
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		ncurses e2fsprogs
 PKG_MD5SUM:=		9f7b3402b4731a7fa543db193bf1b564
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		krb5-libs libncurses libss libcom-err
+PKG_BUILDDEP+=		ncurses e2fsprogs
 PKG_URL:=		http://web.mit.edu/kerberos
 PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.7/
 
@@ -28,6 +28,7 @@ $(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/et
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-static \
+			--disable-profiled \
 			--with-system-ss \
 			--with-system-et \
 			--without-tcl
diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in
index ba9aff1f1..ef48b68ed 100644
--- a/package/krb5/patches/patch-src_Makefile_in
+++ b/package/krb5/patches/patch-src_Makefile_in
@@ -1,6 +1,6 @@
---- krb5-1.7.orig/src/Makefile.in	2009-04-15 22:07:03.000000000 +0200
-+++ krb5-1.7/src/Makefile.in	2009-11-11 19:45:39.281234175 +0100
-@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @lda
+--- krb5-1.7.orig/src/Makefile.in	Wed Apr 15 22:07:03 2009
++++ krb5-1.7/src/Makefile.in	Mon Dec 28 16:13:47 2009
+@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @ldap_plugin_dir@ 
  	plugins/kdb/db2 \
  	plugins/preauth/pkinit \
  	plugins/preauth/encrypted_challenge \
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 3e76da9eb..e1a990ada 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -23,6 +23,7 @@ $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-xlocale \
+			--disable-specs \
 			--disable-xf86bigfont \
 			--disable-malloc0returnsnull \
 			--without-xcb
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 38a5104b1..c3731953e 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -34,7 +34,6 @@ CONFIGURE_ENV+=		OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
 			mysql_cv_gethostname_style=glibc2
 CONFIGURE_ARGS+=	--disable-assembler \
 			--with-pthread \
-			--without-raid \
 			--with-atomic-ops=rwlocks \
 			--with-unix-socket-path=/tmp/.mysql.sock \
 			--with-named-thread-libs=-lpthread \
@@ -44,12 +43,8 @@ CONFIGURE_ARGS+=	--disable-assembler \
 			--without-server \
 			--without-embedded-server \
 			--without-query-cache \
-			--without-mysqlfs \
-			--without-vio \
 			--without-ssl \
 			--without-docs \
-			--without-bench \
-			--without-innodb \
 			--without-readline \
 			--with-machine-type=${CPU_ARCH}
 HOSTTOOLFLAGS=		CC="${HOSTCC}" \
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index cf3239b22..0ce1eac1e 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,6 @@
---- mysql-5.1.41.orig/configure	2009-11-04 19:37:28.000000000 +0100
-+++ mysql-5.1.41/configure	2009-12-25 12:18:01.000000000 +0100
-@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann
+--- mysql-5.1.41.orig/configure	Wed Nov  4 19:37:28 2009
++++ mysql-5.1.41/configure	Tue Dec 29 13:28:43 2009
+@@ -46976,198 +46976,15 @@ $as_echo "$as_me: error: unknown endianness
    esac
  
  
@@ -177,7 +177,7 @@
  
 -      { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
--
+ 
 -else
 -  $as_echo "$as_me: program exited with status $ac_status" >&5
 -$as_echo "$as_me: failed program was:" >&5
@@ -195,13 +195,15 @@
 -fi
 -
 -
- 
+-
    { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
  $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -47284,101 +47101,6 @@ fi
+   # either define HAVE_IB_SOLARIS_ATOMICS or not
+@@ -47283,101 +47100,6 @@ _ACEOF
+ fi
  done
  
- 
+-
 -  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
 -$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
 -  # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
@@ -296,7 +298,6 @@
 -rm -rf conftest.dSYM
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
--
  
  
-   # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
+ 
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
new file mode 100644
index 000000000..2b262bbb4
--- /dev/null
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -0,0 +1,54 @@
+--- mysql-5.1.41.orig/include/my_global.h	Wed Nov  4 19:28:15 2009
++++ mysql-5.1.41/include/my_global.h	Tue Dec 29 13:39:20 2009
+@@ -18,6 +18,8 @@
+ #ifndef _global_h
+ #define _global_h
+ 
++#include <sys/param.h>
++
+ /*
+   InnoDB depends on some MySQL internals which other plugins should not
+   need.  This is because of InnoDB's foreign key support, "safe" binlog
+@@ -424,7 +426,7 @@ C_MODE_END
+ #ifdef HAVE_FLOAT_H
+ #include <float.h>
+ #endif
+-#ifdef HAVE_FENV_H
++#if defined(HAVE_FENV_H) && !defined(BSD)
+ #include <fenv.h> /* For fesetround() */
+ #endif
+ 
+@@ -454,15 +456,20 @@ C_MODE_END
+ #undef HAVE_ALLOCA
+ #undef HAVE_ALLOCA_H
+ #endif
+-#ifdef HAVE_ALLOCA_H
++#if defined(HAVE_ALLOCA_H) && !defined(BSD)
+ #include <alloca.h>
+ #endif
+ 
+ #include <errno.h>				/* Recommended by debian */
+ /* We need the following to go around a problem with openssl on solaris */
++#ifdef BSD
++#include <pwd.h>
++#include <unistd.h>
++#else
+ #if defined(HAVE_CRYPT_H)
+ #include <crypt.h>
+ #endif
++#endif
+ 
+ /*
+   A lot of our programs uses asserts, so better to always include it
+@@ -879,9 +886,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
+ #endif /* HAVE_FINITE */
+ #endif /* isfinite */
+ 
++/*
+ #ifndef HAVE_ISNAN
+ #define isnan(x) ((x) != (x))
+ #endif
++*/
+ 
+ #ifdef HAVE_ISINF
+ /* Check if C compiler is affected by GCC bug #39228 */
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 9dd44d4cc..cd41f0f92 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--with-build-cc=${HOSTCC} \
 			--without-progs \
 			--with-fallbacks \
+			--disable-termcap \
 			--without-ada \
 			--with-shared \
 			--with-normal \
@@ -69,8 +70,9 @@ post-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/
 	for f in ansi dumb linux rxvt screen vt100 vt102 \
 	    vt220 wsvt25 xterm xterm-color xterm-xfree86; do \
+		${INSTALL_DIR} ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}; \
 		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
-		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$$f; \
+		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \
 	done
 	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 17de862f3..587abbd6e 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -33,10 +33,10 @@ INSTALL_STYLE:=		auto
 INSTALL_TARGET:=	install_sw
 FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
 
-OPENSSL_OPTIONS = shared no-ec no-err no-hw no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
+OPENSSL_OPTIONS = shared no-ec no-err no-krb5 no-threads zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast
 
 post-extract:
-	@find ${WRKBUILD} -name *.rej -delete
+	@find ${WRKBUILD} -name *.rej -exec rm {} \;
 
 do-configure:
 	(cd $(WRKBUILD); \
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 4380f3663..790a01d7e 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile libfontenc
+PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp
 PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		${MASTER_SITE_XORG}
diff --git a/rules.mk b/rules.mk
index 53496e223..145ca7a62 100644
--- a/rules.mk
+++ b/rules.mk
@@ -40,7 +40,7 @@ export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH
 
 HOSTCPPFLAGS?=
 HOSTLDFLAGS?=
-TARGET_CFLAGS:=		$(strip -fwrapv -fno-ident ${TARGET_CFLAGS})
+TARGET_CFLAGS:=		$(strip -fno-ident ${TARGET_CFLAGS})
 TARGET_CC:=		$(strip ${TARGET_CC})
 TARGET_CXX:=		$(strip ${TARGET_CXX})
 
diff --git a/scripts/awk b/scripts/awk
new file mode 100755
index 000000000..ff6f9b002
--- /dev/null
+++ b/scripts/awk
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+if [ -z "$(which gawk 2>/dev/null)" ];then
+	/bin/awk "$@"
+else
+	gawk "$@"
+fi
diff --git a/target/ag241/Makefile b/target/ag241/Makefile
index e87a55d0d..9848205cc 100644
--- a/target/ag241/Makefile
+++ b/target/ag241/Makefile
@@ -15,7 +15,7 @@ $(TOOLS_BUILD_DIR):
 tools-compile: $(TOOLS_BUILD_DIR)
 	$(MAKE) -C tools/addpattern
 	$(MAKE) -C tools/srec2bin
-	$(MAKE) -C tools/squashfs prepare compile install
+	$(MAKE) -C ../tools/squashfs prepare compile install
 
 kernel-install: tools-compile
 	PATH='${TARGET_PATH}' \
diff --git a/target/ag241/tools/squashfs/Makefile b/target/ag241/tools/squashfs/Makefile
deleted file mode 100644
index 0887afc22..000000000
--- a/target/ag241/tools/squashfs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id$
-#-
-# 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:=		squashfs
-PKG_VERSION:=		4.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		a3c23391da4ebab0ac4a75021ddabf96
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=squashfs/}
-DISTFILES:=		${PKG_NAME}${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/$(PKG_NAME)${PKG_VERSION}
-
-include ../rules.mk
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
-	$(MAKE) -C $(WRKBUILD)/squashfs-tools
-	touch $@
-
-$(WRKBUILD)/.installed:
-	$(INSTALL_BIN) $(WRKBUILD)/squashfs-tools/mksquashfs \
-		${STAGING_TOOLS}/bin
-	touch $@
-
-include $(TOPDIR)/mk/tools.mk
diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile
index f33dc813a..c4a64c26b 100644
--- a/target/foxboard/Makefile
+++ b/target/foxboard/Makefile
@@ -12,8 +12,8 @@ $(TOOLS_BUILD_DIR):
 
 tools-compile: $(TOOLS_BUILD_DIR)
 	$(MAKE) -C tools/mkfimage
-	$(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE)
-	$(MAKE) -C tools/squashfs prepare compile install
+	#$(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE)
+	$(MAKE) -C ../tools/squashfs prepare compile install
 	$(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/
 
 kernel-install: tools-compile
diff --git a/target/tools/rules.mk b/target/tools/rules.mk
new file mode 100644
index 000000000..a6a3684ac
--- /dev/null
+++ b/target/tools/rules.mk
@@ -0,0 +1,7 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+WRKDIR_BASE=    ${TOOLS_BUILD_DIR}
+WRKDIR=		${WRKDIR_BASE}
+
+include ${TOPDIR}/mk/buildhlp.mk
diff --git a/target/foxboard/tools/squashfs/Makefile b/target/tools/squashfs/Makefile
index a55181f88..a55181f88 100644
--- a/target/foxboard/tools/squashfs/Makefile
+++ b/target/tools/squashfs/Makefile
diff --git a/target/tools/squashfs/patches/squashfs-bsd.patch b/target/tools/squashfs/patches/squashfs-bsd.patch
new file mode 100644
index 000000000..6e23ed8d6
--- /dev/null
+++ b/target/tools/squashfs/patches/squashfs-bsd.patch
@@ -0,0 +1,132 @@
+diff -Nur squashfs4.0.orig/squashfs-tools/mksquashfs.c squashfs4.0/squashfs-tools/mksquashfs.c
+--- squashfs4.0.orig/squashfs-tools/mksquashfs.c	Sun Apr  5 23:22:48 2009
++++ squashfs4.0/squashfs-tools/mksquashfs.c	Tue Dec 29 18:23:15 2009
+@@ -48,16 +48,9 @@
+ #include <regex.h>
+ #include <fnmatch.h>
+ 
+-#ifndef linux
+-#define __BYTE_ORDER BYTE_ORDER
+-#define __BIG_ENDIAN BIG_ENDIAN
+-#define __LITTLE_ENDIAN LITTLE_ENDIAN
+-#include <sys/sysctl.h>
+-#else
+-#include <endian.h>
+-#include <sys/sysinfo.h>
+-#endif
++#include <sys/param.h>
+ 
++
+ #include "squashfs_fs.h"
+ #include "squashfs_swap.h"
+ #include "mksquashfs.h"
+@@ -3688,23 +3681,9 @@
+ 	signal(SIGUSR1, sigusr1_handler);
+ 
+ 	if(processors == -1) {
+-#ifndef linux
+-		int mib[2];
+-		size_t len = sizeof(processors);
+-
+-		mib[0] = CTL_HW;
+-#ifdef HW_AVAILCPU
+-		mib[1] = HW_AVAILCPU;
++#if defined(BSD)
++		processors = 1;
+ #else
+-		mib[1] = HW_NCPU;
+-#endif
+-
+-		if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) {
+-			ERROR("Failed to get number of available processors.  "
+-				"Defaulting to 1\n");
+-			processors = 1;
+-		}
+-#else
+ 		processors = get_nprocs();
+ #endif
+ 	}
+@@ -3974,9 +3953,15 @@
+ 			int match = use_regex ?
+ 				regexec(path->name[i].preg, name, (size_t) 0,
+ 					NULL, 0) == 0 :
++#if defined(BSD)
+ 				fnmatch(path->name[i].name, name,
++					FNM_PATHNAME|FNM_PERIOD) ==
++					 0;
++#else
++				fnmatch(path->name[i].name, name,
+ 					FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) ==
+ 					 0;
++#endif
+ 
+ 			if(match && path->name[i].paths == NULL) {
+ 				/* match on a leaf component, any subdirectories
+diff -Nur squashfs4.0.orig/squashfs-tools/pseudo.c squashfs4.0/squashfs-tools/pseudo.c
+--- squashfs4.0.orig/squashfs-tools/pseudo.c	Sun Apr  5 04:01:58 2009
++++ squashfs4.0/squashfs-tools/pseudo.c	Tue Dec 29 18:07:33 2009
+@@ -30,6 +30,11 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#include <sys/param.h>
++
++#if defined(BSD)
++#include <sys/stat.h>
++#endif
+ 
+ #include "pseudo.h"
+ 
+diff -Nur squashfs4.0.orig/squashfs-tools/unsquashfs.c squashfs4.0/squashfs-tools/unsquashfs.c
+--- squashfs4.0.orig/squashfs-tools/unsquashfs.c	Sun Apr  5 23:23:06 2009
++++ squashfs4.0/squashfs-tools/unsquashfs.c	Tue Dec 29 18:25:56 2009
+@@ -21,6 +21,8 @@
+  * unsquashfs.c
+  */
+ 
++#include <sys/param.h>
++
+ #include "unsquashfs.h"
+ #include "squashfs_swap.h"
+ #include "squashfs_compat.h"
+@@ -1193,10 +1195,17 @@
+ 		struct pathname *path = paths->path[n];
+ 		for(i = 0; i < path->names; i++) {
+ 			int match = use_regex ?
++#if defined(BSD)
+ 				regexec(path->name[i].preg, name, (size_t) 0,
+ 				NULL, 0) == 0 : fnmatch(path->name[i].name,
++				name, FNM_PATHNAME|FNM_PERIOD) ==
++				0;
++#else
++				regexec(path->name[i].preg, name, (size_t) 0,
++				NULL, 0) == 0 : fnmatch(path->name[i].name,
+ 				name, FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) ==
+ 				0;
++#endif
+ 			if(match && path->name[i].paths == NULL)
+ 				/*
+ 				 * match on a leaf component, any subdirectories
+@@ -1795,21 +1804,7 @@
+ 
+ 	if(processors == -1) {
+ #ifndef linux
+-		int mib[2];
+-		size_t len = sizeof(processors);
+-
+-		mib[0] = CTL_HW;
+-#ifdef HW_AVAILCPU
+-		mib[1] = HW_AVAILCPU;
+-#else
+-		mib[1] = HW_NCPU;
+-#endif
+-
+-		if(sysctl(mib, 2, &processors, &len, NULL, 0) == -1) {
+-			ERROR("Failed to get number of available processors.  "
+-				"Defaulting to 1\n");
+-			processors = 1;
+-		}
++		processors = 1;
+ #else
+ 		processors = get_nprocs();
+ #endif