buildroot: fix version for 2009.02-rc2

2009-01-16 19:30:21 +00:00
605 changed files with 308016 additions and 38073 deletions
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG

 config BR2_VERSION
 	string
-	default "2009.02-rc4"
+	default "2009.02-rc1"

 source "target/Config.in.arch"
 source "target/device/Config.in"
@@ -69,13 +69,6 @@ config BR2_DL_DIR

 	  The default is $(BASE_DIR)/dl

-config BR2_COPYTO
-	string "Copy result to..."
-	default ""
-	help
-	  Setting this variable will (eventually) override 
-	  any other copyto configurations in buildroot.
-
 source	"target/device/Config.in.mirrors"

 config BR2_STAGING_DIR
@@ -116,6 +109,18 @@ config BR2_TOPDIR_SUFFIX
 	  build_ARCH -> build_ARCH_[SUFFIX]
 	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX]

+config BR2_ROOTFS_PREFIX
+	string "Custom root fs prefix"
+	default "rootfs"
+	help
+	  Add a custom string to the beginning of the root file system name.
+
+config BR2_ROOTFS_SUFFIX
+	string "Custom root fs suffix"
+	default ""
+	help
+	  Add a custom string to the end of the root file system name.
+
 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
 	default "pc-linux-gnu"
@@ -177,6 +182,7 @@ config BR2_RECENT

 config BR2_CONFIG_CACHE
 	bool "Use a central configure cache file"
+	default n
 	help
 	  This determines if a central config cache is used by
 	  packages, reducing the configure time for packages as each
@@ -231,14 +237,14 @@ choice

 config BR2_STRIP_strip
 	bool "strip"
-	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
+	depends on !BR2_ENABLE_DEBUG
 	help
 	  strip   is the normal strip command

 config BR2_STRIP_sstrip
 	bool "sstrip"
 	select BR2_PACKAGE_SSTRIP_HOST
-	depends on !BR2_ENABLE_DEBUG && !BR2_ELF2FLT
+	depends on !BR2_ENABLE_DEBUG
 	help
 	  sstrip  is a strip that discards more than the normal strip

--- a/18
+++ b/18
@@ -40,11 +40,6 @@ else
 BR2_LOCAL:=$(TOPDIR)/local
 endif

-# Variables for use in Make constructs
-comma:=,
-empty:=
-space:=$(empty) $(empty)
-
 # $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
@@ -132,6 +127,9 @@ HOSTCPP:=$(shell which $(HOSTCPP) || type -p $(HOSTCPP) || echo cpp)
 HOSTLD:=$(shell which $(HOSTLD) || type -p $(HOSTLD) || echo ld)
 HOSTLN:=$(shell which $(HOSTLN) || type -p $(HOSTLN) || echo ln)
 HOSTNM:=$(shell which $(HOSTNM) || type -p $(HOSTNM) || echo nm)
+HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
+HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
+

 ifndef CFLAGS_FOR_BUILD
 CFLAGS_FOR_BUILD:=-g -O2
@@ -213,7 +211,7 @@ BASE_TARGETS:=uclibc
 endif
 TARGETS:=

-# setup our paths
+# setup our pathes
 include project/Makefile.in

 BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
@@ -473,18 +471,14 @@ clean:
 distclean: clean
 	rm -rf sources/*

-
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)

-flush:
-	rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache
-
 %_defconfig: $(CONFIG)/conf
 	cp $(shell find ./target/ -name $@) .config
 	-@$(MAKE) oldconfig

 update:
-	cp .config $(BOARD_PATH)/$(PROJECT)_defconfig
+	cp .config $(BOARD_PATH)/$(BOARD_NAME)_defconfig

 configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config

@@ -512,7 +506,6 @@ help:
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
-	@echo '  configured             - make {uclibc/busybox/linux26}-config'
 	@echo '  saveconfig             - save current configuration under local/<project>'
 	@echo '  getconfig              - restore saved configuration from local/<project>'
 	@echo
@@ -520,7 +513,6 @@ help:
 	@echo '  source                 - download all sources needed for offline-build'
 	@echo '  source-check           - check all packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
-	@echo '  flush                  - flush configuration cache'
 	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'
 	@echo
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -247,10 +247,6 @@
    <li>HOSTCC</li>
    <li>UCLIBC_CONFIG_FILE=&lt;path/to/.config&gt;</li>
    <li>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</li>
-    <li>BUILDROOT_COPYTO</li>
-    <li>BUILDROOT_DL_DIR</li>
-    <li>BUILDROOT_LOCAL</li>
-    <li>BUILDROOT_USE_XWINDOWS</li>
    </ul>

    <p>An example that uses config files located in the toplevel directory and
@@ -265,16 +261,6 @@ $ make UCLIBC_CONFIG_FILE=uClibc.config BUSYBOX_CONFIG_FILE=$HOME/bb.config
 $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
 </pre>

-    <p>If you want the result of your build to be copied to another directory
-    like /tftpboot for downloading to a board using tftp, then you
-    can use BUILDROOT_COPYTO to specify your location</p>
-    <p>Typically, this is set in your ~/.bashrc file
-
-<pre>
-$ export BUILDROOT_COPYTO=/tftpboot
-</pre>
-
-
    <h3><a name="helper_completion" id="helper_completion"></a>
    Using auto-completion</h3>

@@ -649,22 +635,52 @@ $ make me&lt;TAB&gt;
    conflicts, but will use unique build directories, where the user
    can configure the build. </p>

-    <h2><a name="Linux" id="Linux"></a>Linux</h2>
+    <p><b>THINGS TO DO</b></p>
+
    <ol>

+    <li>Linux</li>

-     <p>The user can select from three different Linux strategies:
+    <p>The current Linux implementation is flawed. It only works
+    if the user chooses to use one of the few kernels selected
+    as base for the kernel-headers. While the Makefile seems to have
+    hooks, allowing the developer to specify whatever version he/she
+    wants in the target/device/*/* Makefiles, the build will fail
+    if another kernel version is choosen.</p>
+
+    <p>The reason for this is that the kernel patches are not
+    applied by the <code>&quot;target/linux/linux.mk&quot;</code>
+    build script fragment. They are only applied by the
+    <code>&quot;toolchain/kernel-headers/*.makefile&quot;</code>
+    build script fragments</p>
+
+    <p>If the kernel-header version and the linux version differs,
+    there will be two <code>&quot;linux-2.6.X.Y&quot;</code>
+    directories in
+    <code>&quot;build_&lt;ARCH&gt;/&lt;&gt;&quot;</code>,
+    each with its own set of patches. </p>
+
+    <p>The solution in the works, is to move the build of Linux to
+    <code>&quot;project_build_&lt;ARCH&gt;/&lt;project name&gt;/linux-2.6.X.Y&quot;</code> combined with method to configure
+     which patches can be applied. Possibly, the linux source tree
+     used to generate the kernel headers will be moved to the
+     <code>&quot;toolchain_build_&lt;ARCH&gt;&quot;</code>
+     directory
+      </p>
+
+     <p>The user will be able to select from three different
+     Linux strategies:

     <ul>
-     <li>Legacy: Only use version supported by the kernel headers</li>
-     <li>Advanced: Allow any 2.6.X.Y combination.
+     <li>Conservative Strategy: Only use version ssupported by the kernel headers</li>
+     <li>Stable Linux Strategy: Allow any 2.6.X.Y combination.
 	(Minimum 2.6.19)</li>
     <li>Power-User Strategy: Allow
     <code>&quot;-git&quot;</code>, or
     <code>&quot;-mm&quot;</code>, or user downloadable kernels</li>
     </ul>

-     <p>The current kernel patches can be applied to the
+     <p>The current kernel patches can be configured to be applied to the
     linux source tree even if the version differs from the
     kernel header version. </p>

@@ -674,7 +690,7 @@ $ make me&lt;TAB&gt;
     proprietary kernel-patch or decide to not apply the kernel
     patches</p>

-     <p>There is also support for <u>board specific</u> and
+     <p>Other optional patches will be <u>board specific</u> or
     <u>architecture specific</u> patches. </p>

     <p>There will also be a way for the user to supply absolute
@@ -686,17 +702,8 @@ $ make me&lt;TAB&gt;
     <p>Maybe, there will also be a possibility to supply an
     <code>&quot;URL&quot;</code> to a patch available on Internet. </p>

-     <p>
-	If there is no linux config file available,
-	buildroot starts the linux configuration system, which
-	defaults to "make menuconfig".
-     </p>
-    </ol>
-
-    <h2><a name="Todo" id="Todo"></a>Todo</h2>
-    <ol>
-
     <li>Configurable packages</li>
+
     <p>Many packages can, on top of the simple
     &quot;enable/disable build&quot;,
     be further configured using Kconfig.
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,10 @@

 <p>

-The latest release can always be dowloaded from
-<a href="/downloads/">http://buildroot.uclibc.org/downloads/</a>.
-
-<p>
-
-You can also obtain <a href="/downloads/snapshots/">Daily
-Snapshots</a> of the latest Buildroot source tree if you want to to
-follow development, but cannot or do not wish to use Subversion (svn).
+The best way to obtain and update your own copy of buildroot is to fetch the
+latest version using <a href="subversion.html">Subversion</a>.  You can also
+obtain <a href= "downloads/snapshots/">Daily Snapshots</a> of the latest
+buildroot source tree but cannot or do not wish to use Subversion (svn).

 <ul>
 	<li> Click here to <a href="downloads/snapshots/">Daily Snapshots</a>.
--- a/docs/news.html
+++ b/docs/news.html
@@ -3,39 +3,6 @@

 <ul>

-  <li><b>31 January 2009 -- 2009.02-rc3 released</b>
-      <p>RC3 is out with more cleanups and bug fixes. Unless big issues
-    are found, expect this to be the last release candidate before the
-    release - So give it a good test.</p>
-
-    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
-    <a href="/downloads/buildroot-2009.02-rc3.tar.bz2">2009.02-rc3
-    release candidate</a>, and report any problems found to the <a
-    href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>.</p>
-
-  <li><b>23 January 2009 -- 2009.02-rc2 released</b>
-    <p>Another week, another release candidate with a bunch of
-    cleanups and build fixes.</p>
-
-    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
-    <a href="/downloads/buildroot-2009.02-rc2.tar.bz2">2009.02-rc2
-    release candidate</a>, and report any problems found to the <a
-    href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>.</p>
-
-  <li><b>16 January 2009 -- Release candidate and new maintainer</b>
-    <p>It has been a long time coming, but we finally have a new
-    release candidate! - And a new maintainer to match (Peter Korsgaard).</p>
-
-    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
-    <a href="/downloads/buildroot-2009.02-rc1.tar.bz2">2009.02-rc1
-    release candidate</a>, and report any problems found to the <a
-    href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>. The plan is to
-    release 2009.02 in time for <a
-    href="http://www.fosdem.org/2009/">FOSDEM</a>.</p>
-
  <li><b>16 July 2006 -- Buildroot mailing list</b>
    <p>Buildroot now has its own <a href=lists.html>mailing list</a>.</p>

--- a/package/Config.in
+++ b/package/Config.in
@@ -86,6 +86,7 @@ source "package/logrotate/Config.in"
 source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/ltrace/Config.in"
+source "package/ltt/Config.in"
 source "package/memstat/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/module-init-tools/Config.in"
@@ -188,7 +189,6 @@ source "package/openvpn/Config.in"
 source "package/openswan/Config.in"
 source "package/portmap/Config.in"
 source "package/pppd/Config.in"
-source "package/radvd/Config.in"
 source "package/rp-pppoe/Config.in"
 source "package/pptp-linux/Config.in"
 source "package/proftpd/Config.in"
@@ -255,6 +255,7 @@ source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
+source "package/raidtools2/Config.in"
 source "package/setserial/Config.in"
 if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 # busybox has fdisk
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -38,8 +38,6 @@
 #	environment passed to the <configure> script
 # FOO_CONF_OPT [default empty]
 #	arguments passed to the <configure> script
-# FOO_MAKE [default $(MAKE)]
-#	command to use to execute <make>
 # FOO_MAKE_ENV [default empty]
 #	environment passed to all calls to <make> in the package source
 #	directory
@@ -250,22 +248,19 @@ $(BUILD_DIR)/%/.stamp_configured:
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
-		$(DISABLE_DOCUMENTATION) \
-		$(DISABLE_NLS) \
-		$(DISABLE_LARGEFILE) \
 		$(QUIET) $($(PKG)_CONF_OPT)
 	$(Q)touch $@

 # Build
 $(BUILD_DIR)/%/.stamp_built:
 	$(call MESSAGE,"Building")
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	$(Q)touch $@

 # Install to staging dir
 $(BUILD_DIR)/%/.stamp_staging_installed:
 	$(call MESSAGE,'Installing to host (staging directory)')
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 #	toolchain/replace.sh $(STAGING_DIR)/usr/lib ".*\.la" "\(['= ]\)/usr" "\\1$(STAGING_DIR)/usr"
 	for i in $$(find $(STAGING_DIR)/usr/lib/ -name "*.la"); do \
 		cp $$i $$i~; \
@@ -276,7 +271,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 # Install to target dir
 $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
 	$(call MESSAGE,"Installing to target")
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
 	$(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
 		rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
 	done)
@@ -290,14 +285,14 @@ $(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:

 $(BUILD_DIR)/%/.stamp_cleaned:
 	$(call MESSAGE,"Cleaning up")
-	-$($(PKG)_MAKE_ENV) $($(PKG)_MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	-$($(PKG)_MAKE_ENV) $(MAKE)  $($(PKG)_CLEAN_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $(@D)/.stamp_built

 $(BUILD_DIR)/%/.stamp_uninstalled:
 	$(call MESSAGE,"Uninstalling")
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_STAGING_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $(@D)/.stamp_staging_installed
-	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
+	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_UNINSTALL_TARGET_OPT) -C $(@D)/$($(PKG)_SUBDIR)
 	rm -f $($(PKG)_TARGET_INSTALL_TARGET) $($(PKG)_HOOK_POST_INSTALL)

 $(BUILD_DIR)/%/.stamp_dircleaned:
@@ -333,7 +328,6 @@ $(2)_LIBTOOL_PATCH		?= YES
 $(2)_USE_CONFIG_CACHE   ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_CONF_ENV			?=
 $(2)_CONF_OPT			?=
-$(2)_MAKE			?= $(MAKE)
 $(2)_MAKE_ENV			?=
 $(2)_MAKE_OPT			?=
 $(2)_INSTALL_STAGING		?= NO
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -10,19 +10,19 @@ MAKE1:=$(HOSTMAKE) -j1
 MAKE:=$(HOSTMAKE) -j$(BR2_JLEVEL)

 ifeq ($(BR2_OPTIMIZE_0),y)
-TARGET_OPTIMIZATION+=-O0
+TARGET_OPTIMIZATION=-O0
 endif
 ifeq ($(BR2_OPTIMIZE_1),y)
-TARGET_OPTIMIZATION+=-O1
+TARGET_OPTIMIZATION=-O1
 endif
 ifeq ($(BR2_OPTIMIZE_2),y)
-TARGET_OPTIMIZATION+=-O2
+TARGET_OPTIMIZATION=-O2
 endif
 ifeq ($(BR2_OPTIMIZE_3),y)
-TARGET_OPTIMIZATION+=-O3
+TARGET_OPTIMIZATION=-O3
 endif
 ifeq ($(BR2_OPTIMIZE_S),y)
-TARGET_OPTIMIZATION+=-Os
+TARGET_OPTIMIZATION=-Os
 endif
 ifeq ($(BR2_DEBUG_1),y)
 TARGET_DEBUGGING=-g1
@@ -71,10 +71,6 @@ ifeq ($(BR2_SOFT_FLOAT),y)
 TARGET_CFLAGS+=-msoft-float
 endif

-ifeq ($(BR2_VFP_FLOAT),y)
-TARGET_CFLAGS+=-mfpu=vfp
-endif
-
 # enable VIS for v9a and v9b
 ifeq ($(findstring y,$(BR2_sparc_v9a)$(BR2_sparc64_v9a)$(BR2_sparc_v9b)$(BR2_sparc64_v9b)),y)
 TARGET_CFLAGS+=-mvis
@@ -185,10 +181,6 @@ INSTALL=/usr/bin/install
 FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)

-# hostcc version as an integer - E.G. 4.3.2 => 432
-HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
-	sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
-
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/sparc.*/sparc/' \
 	-e 's/arm.*/arm/g' \
@@ -353,10 +345,6 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif

-ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
-endif
-
 ifneq ($(BR2_INET_IPV6),y)
 DISABLE_IPV6= --disable-ipv6
 endif
--- a/package/acpid/acpid-sign-warning.patch
+++ b/package/acpid/acpid-sign-warning.patch
@@ -0,0 +1,11 @@
+--- acpid-1.0.4/ud_socket.c
+++ acpid-1.0.4/ud_socket.c
+@@ -58,7 +58,7 @@ ud_accept(int listenfd, struct ucred *cr
+ 	while (1) {
+ 		int newsock = 0;
+ 		struct sockaddr_un cliaddr;
+-		int len = sizeof(struct sockaddr_un);
+		socklen_t len = sizeof(struct sockaddr_un);
+ 
+ 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
+ 		if (newsock < 0) {
--- a/package/acpid/acpid-socket-path.patch
+++ b/package/acpid/acpid-socket-path.patch
@@ -0,0 +1,11 @@
+--- acpid-1.0.4/acpid.h
+++ acpid-1.0.4/acpid.h
+@@ -32,7 +32,7 @@
+ #define ACPI_EVENTFILE		ACPI_PROCDIR "/event"
+ #define ACPI_CONFDIR		"/etc/acpi/events"
+ #define ACPI_LOGFILE		"/var/log/acpid"
+-#define ACPI_SOCKETFILE		"/var/run/acpid.socket"
+#define ACPI_SOCKETFILE		"/tmp/acpid.socket"
+ #define ACPI_SOCKETMODE		0666
+ #define ACPI_MAX_ERRS		5
+ 
--- a/package/argus/Config.in
+++ b/package/argus/Config.in
@@ -1,6 +1,3 @@
-comment "argus has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_ARGUS
-
 config BR2_PACKAGE_ARGUS
 	bool "argus"
 	select BR2_PACKAGE_LIBPCAP
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -3,7 +3,7 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION:=2.63
+AUTOCONF_VERSION:=2.61
 AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOCONF_SITE:=$(BR2_GNU_MIRROR)/autoconf
 AUTOCONF_CAT:=$(BZCAT)
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -158,7 +158,6 @@ $(TARGET_DIR)/usr/sbin/avahi-autoipd: $(AVAHI_DIR)/.installed
 	chmod 0755 $(TARGET_DIR)/usr/share/udhcpc/default.script
 	cp -af package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/
 	cp $(STAGING_DIR)/usr/sbin/avahi-autoipd $@
-	rm -f $(TARGET_DIR)/var/lib/avahi-autoipd
 	ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@

--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -1,6 +1,3 @@
-comment "bind has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_BIND
-
 config BR2_PACKAGE_BIND
 	bool "bind"
 	help
--- a/package/bridge-utils/bridge.mk
+++ b/package/bridge-utils/bridge.mk
@@ -11,7 +11,7 @@ BRIDGE_AUTORECONF:=YES
 BRIDGE_INSTALL_STAGING:=NO
 BRIDGE_INSTALL_TARGET:=YES
 BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install
-BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR)
+BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR) $(DISABLE_NLS)
 BRIDGE_DEPENDENCIES:=uclibc

 $(eval $(call AUTOTARGETS,package,bridge))
--- a/package/busybox/busybox-1.13.2-depmod.patch
+++ b/package/busybox/busybox-1.13.2-depmod.patch
@@ -1,121 +0,0 @@
--- busybox-1.13.2/modutils/depmod.c	Sun Nov  9 18:28:03 2008
-+++ busybox-1.13.2-depmod/modutils/depmod.c	Mon Jan 12 23:12:59 2009
-@@ -33,7 +33,7 @@
- enum {
- 	ARG_a = (1<<0), /* All modules, ignore mods in argv */
- 	ARG_A = (1<<1), /* Only emit .ko that are newer than modules.dep file */
-	ARG_b = (1<<2), /* not /lib/modules/$(uname -r)/ but this base-dir */
-+	ARG_b = (1<<2), /* base directory when modules are in staging area */
- 	ARG_e = (1<<3), /* with -F, print unresolved symbols */
- 	ARG_F = (1<<4), /* System.map that contains the symbols */
- 	ARG_n = (1<<5)  /* dry-run, print to stdout only */
-@@ -57,7 +57,7 @@
- 	*first = info;
- 
- 	info->dnext = info->dprev = info;
-	info->name = xstrdup(fname);
-+	info->name = xasprintf("/%s", fname);
- 	info->modname = filename2modname(fname, NULL);
- 	for (ptr = image; ptr < image + len - 10; ptr++) {
- 		if (strncmp(ptr, "depends=", 8) == 0) {
-@@ -123,44 +123,61 @@
- 	}
- }
- 
-+static void xfreopen_write(const char *file, FILE *f)
-+{
-+	if (freopen(file, "w", f) == NULL)
-+		bb_perror_msg_and_die("can't open '%s'", file);
-+}
-+
- int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int depmod_main(int argc UNUSED_PARAM, char **argv)
- {
- 	module_info *modules = NULL, *m, *dep;
-	char *moddir_base = (char *)CONFIG_DEFAULT_MODULES_DIR;
-+	const char *moddir_base = "/";
-+	char *moddir, *version;
-+	struct utsname uts;
- 	int tmp;
- 
- 	getopt32(argv, "aAb:eF:n", &moddir_base, NULL);
- 	argv += optind;
- 
- 	/* goto modules location */
-+	xchdir(moddir_base);
- 
- 	/* If a version is provided, then that kernel version's module directory
- 	 * is used, rather than the current kernel version (as returned by
- 	 * "uname -r").  */
-	xchdir(moddir_base);
-	if (*argv && (sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3)) {
-		xchdir(*argv++);
-+	if (*argv && sscanf(*argv, "%d.%d.%d", &tmp, &tmp, &tmp) == 3) {
-+		version = *argv++;
- 	} else {
-		struct utsname uts;
- 		uname(&uts);
-		xchdir(uts.release);
-+		version = uts.release;
- 	}
-	/* If no modules are given on the command-line, -a is on per default.  */
-	option_mask32 |= *argv == NULL;
-+	moddir = concat_path_file(&CONFIG_DEFAULT_MODULES_DIR[1], version);
- 
- 	/* Scan modules */
-	moddir_base = xrealloc_getcwd_or_warn(NULL);
-	do {
-		recursive_action((option_mask32 & ARG_a) ? moddir_base : *argv,
-				ACTION_RECURSE, parse_module, NULL,  &modules, 0);
-	} while (!(option_mask32 & ARG_a) && *(++argv));
-+	if (*argv) {
-+		char *modfile;
-+		struct stat sb;
-+		do {
-+			modfile = concat_path_file(moddir, *argv);
-+			xstat(modfile, &sb);
-+			parse_module(modfile, &sb, &modules, 0);
-+			free(modfile);
-+		} while (*(++argv));
-+	} else {
-+		recursive_action(moddir, ACTION_RECURSE,
-+				 parse_module, NULL, &modules, 0);
-+	}
-+
-+	/* Prepare for writing out the dep files */
-+	xchdir(moddir);
- 	if (ENABLE_FEATURE_CLEAN_UP)
-		free(moddir_base);
-+		free(moddir);
- 
- 	/* Generate dependency and alias files */
- 	if (!(option_mask32 & ARG_n))
-		freopen(CONFIG_DEFAULT_DEPMOD_FILE, "w", stdout);
-+		xfreopen_write(CONFIG_DEFAULT_DEPMOD_FILE, stdout);
- 	for (m = modules; m != NULL; m = m->next) {
- 		printf("%s:", m->name);
- 
-@@ -174,12 +191,12 @@
- 			dep->dprev->dnext = dep->dnext;
- 			dep->dnext = dep->dprev = dep;
- 		}
-		puts("");
-+		bb_putchar('\n');
- 	}
- 
- #if ENABLE_FEATURE_MODUTILS_ALIAS
- 	if (!(option_mask32 & ARG_n))
-		freopen("modules.alias", "w", stdout);
-+		xfreopen_write("modules.alias", stdout);
- 	for (m = modules; m != NULL; m = m->next) {
- 		while (m->aliases) {
- 			printf("alias %s %s\n",
-@@ -190,7 +207,7 @@
- #endif
- #if ENABLE_FEATURE_MODUTILS_SYMBOLS
- 	if (!(option_mask32 & ARG_n))
-		freopen("modules.symbols", "w", stdout);
-+		xfreopen_write("modules.symbols", stdout);
- 	for (m = modules; m != NULL; m = m->next) {
- 		while (m->symbols) {
- 			printf("alias symbol:%s %s\n",
--- a/package/busybox/busybox-1.13.2-init.patch
+++ b/package/busybox/busybox-1.13.2-init.patch
@@ -1,50 +0,0 @@
--- busybox-1.13.2/init/init.c	Wed Dec 31 04:06:45 2008
-+++ busybox-1.13.2-init/init/init.c	Thu Jan 29 03:02:13 2009
-@@ -671,15 +671,14 @@
-  */
- static void parse_inittab(void)
- {
-+#if ENABLE_FEATURE_USE_INITTAB
- 	char *token[4];
-	/* order must correspond to SYSINIT..RESTART constants */
-	static const char actions[] ALIGN1 =
-		"sysinit\0""respawn\0""askfirst\0""wait\0""once\0"
-		"ctrlaltdel\0""shutdown\0""restart\0";
-+	parser_t *parser = config_open2("/etc/inittab", fopen_for_read);
- 
-	parser_t *parser = config_open2(INITTAB, fopen_for_read);
-	/* No inittab file -- set up some default behavior */
-	if (parser == NULL) {
-+	if (parser == NULL)
-+#endif
-+	{
-+		/* No inittab file -- set up some default behavior */
- 		/* Reboot on Ctrl-Alt-Del */
- 		new_init_action(CTRLALTDEL, "reboot", "");
- 		/* Umount all filesystems on halt/reboot */
-@@ -699,11 +698,17 @@
- 		new_init_action(SYSINIT, INIT_SCRIPT, "");
- 		return;
- 	}
-+
-+#if ENABLE_FEATURE_USE_INITTAB
- 	/* optional_tty:ignored_runlevel:action:command
- 	 * Delims are not to be collapsed and need exactly 4 tokens
- 	 */
- 	while (config_read(parser, token, 4, 0, "#:",
- 				PARSE_NORMAL & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
-+		/* order must correspond to SYSINIT..RESTART constants */
-+		static const char actions[] ALIGN1 =
-+			"sysinit\0""respawn\0""askfirst\0""wait\0""once\0"
-+			"ctrlaltdel\0""shutdown\0""restart\0";
- 		int action;
- 		char *tty = token[0];
- 
-@@ -727,6 +732,7 @@
- 				parser->lineno);
- 	}
- 	config_close(parser);
-+#endif
- }
- 
- #if ENABLE_FEATURE_USE_INITTAB
--- a/package/busybox/busybox-1.13.2-modprobe.patch
+++ b/package/busybox/busybox-1.13.2-modprobe.patch
@@ -1,99 +0,0 @@
--- busybox-1.13.2/modutils/modutils-24.c	Sat Nov 29 07:48:56 2008
-+++ busybox-1.13.2-modprobe/modutils/modutils-24.c	Sun Feb  1 00:08:26 2009
-@@ -2150,7 +2150,7 @@
- 	sec->name = name;
- 	sec->idx = newidx;
- 	if (size)
-		sec->contents = xmalloc(size);
-+		sec->contents = xzalloc(size);
- 
- 	obj_insert_section_load_order(f, sec);
- 
-@@ -2165,7 +2165,7 @@
- 	int newidx = f->header.e_shnum++;
- 	struct obj_section *sec;
- 
-	f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
-+	f->sections = xrealloc_vector(f->sections, 2, newidx);
- 	f->sections[newidx] = sec = arch_new_section();
- 
- 	sec->header.sh_type = SHT_PROGBITS;
-@@ -2175,7 +2175,7 @@
- 	sec->name = name;
- 	sec->idx = newidx;
- 	if (size)
-		sec->contents = xmalloc(size);
-+		sec->contents = xzalloc(size);
- 
- 	sec->load_next = f->load_order;
- 	f->load_order = sec;
-@@ -2571,8 +2571,7 @@
- 	/* Collect the modules' symbols.  */
- 
- 	if (nmod) {
-		ext_modules = modules = xmalloc(nmod * sizeof(*modules));
-		memset(modules, 0, nmod * sizeof(*modules));
-+		ext_modules = modules = xzalloc(nmod * sizeof(*modules));
- 		for (i = 0, mn = module_names, m = modules;
- 				i < nmod; ++i, ++m, mn += strlen(mn) + 1) {
- 			struct new_module_info info;
-@@ -2652,13 +2651,14 @@
- }
- 
- 
-static void  new_create_this_module(struct obj_file *f, const char *m_name)
-+static void new_create_this_module(struct obj_file *f, const char *m_name)
- {
- 	struct obj_section *sec;
- 
- 	sec = obj_create_alloced_section_first(f, ".this", tgt_sizeof_long,
- 			sizeof(struct new_module));
-	memset(sec->contents, 0, sizeof(struct new_module));
-+	/* done by obj_create_alloced_section_first: */
-+	/*memset(sec->contents, 0, sizeof(struct new_module));*/
- 
- 	obj_add_symbol(f, SPFX "__this_module", -1,
- 			ELF_ST_INFO(STB_LOCAL, STT_OBJECT), sec->idx, 0,
-@@ -2965,9 +2965,9 @@
- 		if (i == f->header.e_shnum) {
- 			struct obj_section *sec;
- 
-+			f->header.e_shnum++;
- 			f->sections = xrealloc_vector(f->sections, 2, i);
- 			f->sections[i] = sec = arch_new_section();
-			f->header.e_shnum = i + 1;
- 
- 			sec->header.sh_type = SHT_PROGBITS;
- 			sec->header.sh_flags = SHF_WRITE | SHF_ALLOC;
-@@ -3006,12 +3006,9 @@
- 	for (i = 0; i < f->header.e_shnum; ++i) {
- 		struct obj_section *s = f->sections[i];
- 		if (s->header.sh_type == SHT_NOBITS) {
-+			s->contents = NULL;
- 			if (s->header.sh_size != 0)
-				s->contents = memset(xmalloc(s->header.sh_size),
-						0, s->header.sh_size);
-			else
-				s->contents = NULL;
-
-+				s->contents = xzalloc(s->header.sh_size);
- 			s->header.sh_type = SHT_PROGBITS;
- 		}
- 	}
-@@ -3275,14 +3272,13 @@
- 			case SHT_SYMTAB:
- 			case SHT_STRTAB:
- 			case SHT_RELM:
-+				sec->contents = NULL;
- 				if (sec->header.sh_size > 0) {
-					sec->contents = xmalloc(sec->header.sh_size);
-+					sec->contents = xzalloc(sec->header.sh_size);
- 					fseek(fp, sec->header.sh_offset, SEEK_SET);
- 					if (fread(sec->contents, sec->header.sh_size, 1, fp) != 1) {
- 						bb_perror_msg_and_die("error reading ELF section data");
- 					}
-				} else {
-					sec->contents = NULL;
- 				}
- 				break;
- 
--- a/package/busybox/busybox-1.13.2-tar.patch
+++ b/package/busybox/busybox-1.13.2-tar.patch
@@ -1,11 +0,0 @@
--- busybox-1.13.2/archival/tar.c	Sun Nov  9 18:28:02 2008
-+++ busybox-1.13.2-tar/archival/tar.c	Tue Jan 20 03:52:04 2009
-@@ -591,8 +591,6 @@
- 	struct TarBallInfo tbInfo;
- 
- 	tbInfo.hlInfoHead = NULL;
-
-	fchmod(tar_fd, 0644);
- 	tbInfo.tarFd = tar_fd;
- 	tbInfo.verboseFlag = verboseFlag;
- 
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -42,10 +42,18 @@ else
 endif
 	touch $@

-$(BUSYBOX_DIR)/.config: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
+$(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG_FILE)
 	cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_DIR)/.config
 	$(SED) s,^CONFIG_PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
 		$(BUSYBOX_DIR)/.config
+ifeq ($(BR2_BUSYBOX_VERSION_1_0_1),y)
+	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\PREFIX=$(TARGET_DIR),;" \
+		$(BUSYBOX_DIR)/Rules.mak
+endif
+ifeq ($(BR2_BUSYBOX_VERSION_1_1_3),y)
+	$(SED) s,^PREFIX=.*,CONFIG_PREFIX=\"$(TARGET_DIR)\", \
+		$(BUSYBOX_DIR)/.config
+endif
 ifeq ($(BR2_BUSYBOX_VERSION_1_2_2_1),y)
 	$(SED) s,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX=\"$(TARGET_CROSS)\", \
 		$(BUSYBOX_DIR)/.config
@@ -97,7 +105,7 @@ endif
 	touch $@


-$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
+$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
@@ -129,9 +137,9 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)

 busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked

-busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.config
+busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.configured

-busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
+busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.configured
 	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig

 busybox-update:
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -40,7 +40,7 @@ $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
 	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
 	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
 	(cd $(STAGING_DIR)/usr/lib/; \
-		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
+		ln -snf ../../lib/libbz2.so.$(BZIP2_VERSION) libbz2.so; \
 	)
 	(cd $(STAGING_DIR)/usr/lib; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
--- a/package/cairo/cairo.mk
+++ b/package/cairo/cairo.mk
@@ -46,6 +46,7 @@ ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT = --disable-xlib --without-x --enable-directfb
 	CAIRO_DEPENDENCIES_EXTRA = directfb
 endif
+CAIRO_CONF_OPT += --disable-gtk-doc --without-html-dir

 CAIRO_DEPENDENCIES = uclibc gettext libintl pkgconfig zlib libpng fontconfig $(CAIRO_DEPENDENCIES_EXTRA) pixman $(XSERVER) 

--- a/package/cups/cups.mk
+++ b/package/cups/cups.mk
@@ -3,59 +3,23 @@
 # cups
 #
 ################################################################################
-CUPS_VERSION = 1.3.9
+CUPS_VERSION = 1.3.5
 CUPS_NAME = cups-$(CUPS_VERSION)
 CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
-CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
+CUPS_SITE = http://ftp.easysw.com/pub/cups/1.3.5
 CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
 CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib
 CUPS_CAT:=$(BZCAT)

 ifeq ($(BR2_PACKAGE_DBUS),y)
-	CUPS_CONF_OPT += --enable-dbus
-	CUPS_DEPENDENCIES += dbus
+        CUPS_CONF_OPT_DBUS =--enable-dbus
+        CUPS_DEPENDENCIES_DBUS = dbus
 else
-	CUPS_CONF_OPT += --disable-dbus
+        CUPS_CONF_OPT_DBUS =--disable-dbus
 endif

 ifneq ($(BR2_PACKAGE_XSERVER_none),y)
-	CUPS_DEPENDENCIES += xlib_libX11
-endif
-
-CUPS_CONF_OPT +=	--disable-perl
-CUPS_CONF_OPT +=	--disable-java
-CUPS_CFLAGS = $(TARGET_CFLAGS)
-
-
-ifeq ($(BR2_PACKAGE_PERL),disabled)	# We do not provide perl (yet)
-	CUPS_CONF_ENV +=	ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
-	CUPS_CONF_OPT +=	--with-perl
-	CUPS_DEPENDENCIES +=	microperl
-else
-	CUPS_CONF_OPT +=	--disable-perl
-endif
-
-ifeq ($(BR2_PACKAGE_PHP),y)
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/main
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/regex
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/TSRM
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/Zend
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/php/ext
-	CUPS_CONF_ENV +=	ac_cv_path_php=$(STAGING_DIR)/usr/bin/php
-	CUPS_CONF_OPT +=	--with-php
-	CUPS_DEPENDENCIES +=	php
-else
-	CUPS_CONF_OPT +=	--disable-php
-endif
-
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-	CUPS_CFLAGS += 		-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-	CUPS_CONF_ENV +=	ac_cv_path_python=$(STAGING_DIR)/usr/bin/python
-	CUPS_CONF_OPT +=	--with-python
-	CUPS_DEPENDENCIES +=	python
-else
-	CUPS_CONF_OPT +=	--disable-python
+        CUPS_DEPENDENCIES_X = xlib_libX11
 endif

 $(DL_DIR)/$(CUPS_SOURCE):
@@ -71,25 +35,13 @@ $(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
 	(cd $(CUPS_DIR) && \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		$(CUPS_CONF_ENV) \
-		CFLAGS="$(CUPS_CFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-config-file-path=/etc \
-		--disable-gnutls \
-		--disable-gssapi \
-		$(CUPS_CONF_OPT) \
-		)
+		--prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include  \
+		--libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
 	touch $@

 $(CUPS_DIR)/.compiled: $(CUPS_DIR)/.configured
-	$(MAKE) CFLAGS="$(CUPS_CFLAGS)" -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
+	$(MAKE) -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
 	locale monitor notifier pdftops scheduler systemv scripting/php \
 	conf data doc fonts ppd templates
 	touch $@
@@ -103,14 +55,11 @@ $(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
 	touch $@

-cups: uclibc $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
+cups: uclibc $(CUPS_DEPENDENCIES_DBUS) $(CUPS_DEPENDENCIES_X) $(CUPS_DIR)/.installed

 cups-clean:
 	-$(MAKE) -C $(CUPS_DIR) clean

-cups-dirclean:
-	rm -fr $(CUPS_DIR)
-
 #############################################################
 #
 # Toplevel Makefile options
@@ -118,5 +67,4 @@ cups-dirclean:
 #############################################################
 ifeq ($(BR2_PACKAGE_CUPS),y)
 TARGETS+=cups
-endif
-
+endif
--- a/package/database/mysql_client/Config.in
+++ b/package/database/mysql_client/Config.in
@@ -1,10 +1,4 @@
 config BR2_PACKAGE_MYSQL_CLIENT
 	bool "MySQL 5.1 client"
-	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
 	help
 	  MySQL client
-
-comment "Mysql client requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
--- a/package/database/mysql_client/mysql_client.mk
+++ b/package/database/mysql_client/mysql_client.mk
@@ -8,24 +8,23 @@ MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1
 MYSQL_CLIENT_INSTALL_TARGET = YES
 MYSQL_CLIENT_INSTALL_STAGING = YES
-MYSQL_CLIENT_DEPENDENCIES = uclibc readline ncurses
+MYSQL_CLIENT_DEPENDENCIES = uclibc readline

 MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes
 MYSQL_CLIENT_CONF_OPT = \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
 	--program-prefix="" \
+	--prefix=/usr \
 	--without-ndb-binlog \
 	--without-server \
 	--without-docs \
 	--without-man \
 	--without-readline \
 	--without-libedit \
-	--with-readline=$(STAGING_DIR)/usr \
 	--with-low-memory \
 	--enable-thread-safe-client \
 	$(ENABLE_DEBUG)

 $(eval $(call AUTOTARGETS,package/database,mysql_client))
-
-$(MYSQL_CLIENT_HOOK_POST_INSTALL):
-	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
-	touch $@
--- a/package/database/sqlite/Config.in
+++ b/package/database/sqlite/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_SQLITE
 	bool "sqlite"
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
+	select BR2_READLINE
 	help
 	  SQLite is a small C library that implements a self-contained,
 	  embeddable, zero-configuration SQL database engine.
--- a/package/database/sqlite/sqlite.mk
+++ b/package/database/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 #############################################################

-SQLITE_VERSION:=3.6.10
+SQLITE_VERSION:=3.6.4
 SQLITE_SOURCE:=sqlite-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE:=http://www.sqlite.org
 SQLITE_DIR:=$(BUILD_DIR)/sqlite-$(SQLITE_VERSION)
@@ -55,7 +55,7 @@ $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3
 	cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so

-sqlite: uclibc ncurses $(TARGET_DIR)/usr/bin/sqlite3
+sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3

 sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)

--- a/package/dbus-glib/dbus-glib.mk
+++ b/package/dbus-glib/dbus-glib.mk
@@ -31,7 +31,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked
 		DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \
 		DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \
 		DBUS_GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \
-		DBUS_GLIB_LIBS="$(STAGING_DIR)/usr/lib/libglib-2.0.so $(STAGING_DIR)/usr/lib/libgobject-2.0.so $(STAGING_DIR)/usr/lib/libgmodule-2.0.so $(STAGING_DIR)/usr/lib/libgthread-2.0.so" \
+		DBUS_GLIB_LIBS="$(STAGING_DIR)/lib/libglib-2.0.so $(STAGING_DIR)/lib/libgobject-2.0.so $(STAGING_DIR)/lib/libgmodule-2.0.so $(STAGING_DIR)/lib/libgthread-2.0.so" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
@@ -47,7 +47,7 @@ $(DBUS_GLIB_DIR)/.configured: $(DBUS_GLIB_DIR)/.unpacked
 	touch $(DBUS_GLIB_DIR)/.configured

 $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY): $(DBUS_GLIB_DIR)/.configured
-	$(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/usr/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all
+	$(MAKE) DBUS_BUS_LIBS="$(STAGING_DIR)/lib/libexpat.so" -C $(DBUS_GLIB_DIR) all

 $(STAGING_DIR)/usr/lib/libdbus-glib-1.so.2.0.0: $(DBUS_GLIB_DIR)/$(DBUS_GLIB_BINARY)
 	cp -a $(DBUS_GLIB_DIR)/dbus/.libs/libdbus-glib-1.so* $(STAGING_DIR)/usr/lib
@@ -58,7 +58,7 @@ $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY): $(STAGING_DIR)/usr/lib/libdbus-glib-1.
 	cp -a $(DBUS_GLIB_DIR)/dbus/.libs/dbus-binding-tool $(TARGET_DIR)/usr/bin
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2.0.0

-dbus-glib: uclibc pkgconfig dbus expat libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY)
+dbus-glib: uclibc pkgconfig dbus libglib2 $(TARGET_DIR)/$(DBUS_GLIB_TARGET_BINARY)

 dbus-glib-clean:
 	rm -f $(TARGET_DIR)/usr/lib/libdbus-glib-1.so.2*
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -19,11 +19,7 @@ DBUS_XML_DEP:=$(STAGING_DIR)/usr/lib/libexpat.so.1
 else
 DBUS_XML:=libxml
 # Makefile.autotools.in unfortunately has broken dependency handling,
-# so we cannot do the same for libxml2 as the targets (like
-# libxml2-install-staging) are phony and hence, dbus will always be
-# considered out-of-date. Using the corresponding .stamp_* files (E.G.
-# LIBXML2_TARGET_INSTALL_STAGING doesn't work as there's no dependency
-# information between them.
+# so we cannot do the same for libxml2
 DBUS_XML_DEP:=libxml2-install-staging
 endif

@@ -68,12 +64,9 @@ $(DBUS_DIR)/.configured: $(DBUS_DIR)/.unpacked $(DBUS_XML_DEP)

 $(DBUS_DIR)/$(DBUS_BINARY): $(DBUS_DIR)/.configured
 	$(MAKE) -C $(DBUS_DIR) all
-	touch $@

 $(STAGING_DIR)/$(DBUS_TARGET_BINARY): $(DBUS_DIR)/$(DBUS_BINARY)
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DBUS_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libdbus-1.la
-	touch $@

 $(TARGET_DIR)/$(DBUS_TARGET_BINARY): $(STAGING_DIR)/$(DBUS_TARGET_BINARY)
 	mkdir -p $(TARGET_DIR)/var/run/dbus $(TARGET_DIR)/var/lib/dbus $(TARGET_DIR)/etc/init.d
--- a/package/directfb/directfb-1.2.7-ppc-compile-fix.patch
+++ b/package/directfb/directfb-1.2.7-ppc-compile-fix.patch
@@ -1,17 +0,0 @@
---
- lib/direct/ppcasm_memcpy_cachable.S |    2 --
- 1 file changed, 2 deletions(-)
-
-Index: DirectFB-1.2.7/lib/direct/ppcasm_memcpy_cachable.S
-===================================================================
--- DirectFB-1.2.7.orig/lib/direct/ppcasm_memcpy_cachable.S
-+++ DirectFB-1.2.7/lib/direct/ppcasm_memcpy_cachable.S
-@@ -34,8 +34,6 @@
- 
- #define __ASSEMBLY__
- 
-#include <linux/config.h>
-
- #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
- #define L1_CACHE_LINE_SIZE       16
- #define LG_L1_CACHE_LINE_SIZE     4 
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -3,16 +3,19 @@
 # directfb
 #
 #############################################################
+#DIRECTFB_VERSION:=0.9.25.1
+#DIRECTFB_SITE:=http://www.directfb.org/downloads/Old
 DIRECTFB_VERSION_MAJOR:=1.2
-DIRECTFB_VERSION:=1.2.7
+DIRECTFB_VERSION:=1.2.6
 #DIRECTFB_VERSION:=1.3.0	is a development version
 #DIRECTFB_VERSION_MAJOR:=1.3
 DIRECTFB_SITE:=http://www.directfb.org/downloads/Core
 DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
-DIRECTFB_AUTORECONF = NO
-DIRECTFB_LIBTOOL_PATCH = NO
-DIRECTFB_INSTALL_STAGING = YES
-DIRECTFB_INSTALL_TARGET = YES
+DIRECTFB_CAT:=$(ZCAT)
+DIRECTFB_DIR:=$(BUILD_DIR)/DirectFB-$(DIRECTFB_VERSION)
+DIRECTFB_STAGING:=directfb-$(DIRECTFB_VERSION_MAJOR)-0
+DIRECTFB_BIN:=usr/lib/libdirectfb-$(DIRECTFB_VERSION_MAJOR).so.0
+DIRECTFB_DEP:=zlib

 ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y)
 DIRECTFB_MULTI:=--enable-multi --enable-fusion
@@ -52,6 +55,9 @@ endif
 ifeq ($(DIRECTFB_GFX),)
 DIRECTFB_GFX:=none
 else
+comma:=,
+empty:=
+space:=$(empty) $(empty)
 DIRECTFB_GFX:=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
 endif

@@ -72,6 +78,9 @@ endif
 ifeq ($(DIRECTFB_INPUT),)
 DIRECTFB_INPUT:=none
 else
+comma:=,
+empty:=
+space:=$(empty) $(empty)
 DIRECTFB_INPUT:=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
 endif

@@ -96,29 +105,96 @@ else
 DIRECTFB_JPEG:=--disable-jpeg
 endif

-DIRECTFB_CONF_OPT = \
-	--localstatedir=/var \
-	--with-gfxdrivers=$(DIRECTFB_GFX) \
-	--with-inputdrivers=$(DIRECTFB_INPUT) \
-	--enable-static \
-	--enable-shared \
-	--disable-explicit-deps \
-	$(DIRECTFB_MULTI) \
-	$(DIRECTFB_X) \
-	$(DIRECTFB_JPEG) \
-	$(DIRECTFB_PNG) \
-	$(DIRECTFB_GIF) \
-	$(DIRECTFB_UNIQUE) \
-	--enable-linux-input \
-	--enable-zlib \
-	--enable-freetype \
-	--enable-fbdev \
-	--disable-sysfs \
-	--disable-sdl \
-	--disable-vnc \
-	--disable-video4linux \
-	--disable-video4linux2
+$(DL_DIR)/$(DIRECTFB_SOURCE):
+	$(call DOWNLOAD,$(DIRECTFB_SITE),$(DIRECTFB_SOURCE))

-DIRECTFB_DEPENDENCIES = uclibc $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION)
+directfb-source: $(DL_DIR)/$(DIRECTFB_SOURCE)

-$(eval $(call AUTOTARGETS,package,directfb))
+$(DIRECTFB_DIR)/.unpacked: $(DL_DIR)/$(DIRECTFB_SOURCE)
+	$(DIRECTFB_CAT) $(DL_DIR)/$(DIRECTFB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(DIRECTFB_DIR) package/directfb/ DirectFB-$(DIRECTFB_VERSION)\*.patch
+	touch $@
+
+$(DIRECTFB_DIR)/.configured: $(DIRECTFB_DIR)/.unpacked
+	(cd $(DIRECTFB_DIR); rm -f config.cache; \
+	ac_cv_header_linux_wm97xx_h=no \
+	ac_cv_header_linux_sisfb_h=no \
+	ac_cv_header_asm_page_h=no \
+	$(AUTO_CONFIGURE_TARGET) \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-gfxdrivers=$(DIRECTFB_GFX) \
+		--with-inputdrivers=$(DIRECTFB_INPUT) \
+		--enable-static \
+		--enable-shared \
+		$(DIRECTFB_MULTI) \
+		$(DIRECTFB_X) \
+		$(DIRECTFB_JPEG) \
+		$(DIRECTFB_PNG) \
+		$(DIRECTFB_GIF) \
+		$(DIRECTFB_UNIQUE) \
+		--enable-linux-input \
+		--enable-zlib \
+		--enable-freetype \
+		--enable-fbdev \
+		--disable-sysfs \
+		--disable-sdl \
+		--disable-vnc \
+		--disable-video4linux \
+		--disable-video4linux2 )
+	touch $@
+
+$(DIRECTFB_DIR)/.compiled: $(DIRECTFB_DIR)/.configured
+	$(MAKE) PATH=$(STAGING_DIR)/usr/lib:$(PATH) \
+		$(TARGET_CONFIGURE_OPTS) \
+		-C $(DIRECTFB_DIR)
+	touch $(DIRECTFB_DIR)/.compiled
+
+$(STAGING_DIR)/$(DIRECTFB_BIN): $(DIRECTFB_DIR)/.compiled
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DIRECTFB_DIR) install
+	$(SED) "s, /usr/lib, $(STAGING_DIR)/usr/lib,g" \
+		$(STAGING_DIR)/usr/lib/libdirect.la \
+		$(STAGING_DIR)/usr/lib/libdirectfb.la \
+		$(STAGING_DIR)/usr/lib/libfusion.la \
+		`find $(STAGING_DIR)/usr/lib/directfb-$(DIRECTFB_VERSION_MAJOR)-0/ -name '*.la'`
+	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \
+		$(STAGING_DIR)/usr/bin/*directfb-config
+
+$(TARGET_DIR)/$(DIRECTFB_BIN): $(STAGING_DIR)/$(DIRECTFB_BIN)
+	cd $(STAGING_DIR)/usr/lib/; find $(DIRECTFB_STAGING) -type f -name '*.so' \
+		| xargs -IREPL install -Dm644 REPL $(TARGET_DIR)/usr/lib/REPL
+	mkdir -p $(TARGET_DIR)/usr/lib/directfb-$(DIRECTFB_VERSION_MAJOR)-0/gfxdrivers
+	cp -dpf $(STAGING_DIR)/usr/lib/libfusion*.so.* $(TARGET_DIR)/usr/lib/
+ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
+	cp -dpf $(STAGING_DIR)/usr/lib/libuniquewm*.so.* $(TARGET_DIR)/usr/lib/
+endif
+	cp -dpf $(STAGING_DIR)/usr/lib/libdirect*.so.* $(TARGET_DIR)/usr/lib/
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
+		$(TARGET_DIR)/usr/lib/libdirect*.so.* \
+		$(TARGET_DIR)/usr/lib/libfusion*.so.*
+ifeq ($(BR2_PACKAGE_DIRECTFB_UNIQUE),y)
+	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \
+		$(TARGET_DIR)/usr/lib/libuniquewm*.so.*
+endif
+
+directfb: uclibc $(DIRECTFB_DEP) freetype $(DIRECTFB_FUSION) $(TARGET_DIR)/$(DIRECTFB_BIN)
+
+directfb-unpacked: $(DIRECTFB_DIR)/.unpacked
+
+directfb-clean:
+	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIRECTFB_DIR) uninstall
+	-$(MAKE) -C $(DIRECTFB_DIR) clean
+	rm -f $(DIRECTFB_DIR)/.configured $(DIRECTFB_DIR)/.compiled
+
+directfb-dirclean:
+	rm -rf $(DIRECTFB_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+TARGETS+=directfb
+endif
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -1,6 +1,3 @@
-comment "dmraid has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_DMRAID
-
 config BR2_PACKAGE_DMRAID
 	bool "dmraid"
 	select BR2_PACKAGE_DM
--- a/package/editors/vim/vim.mk
+++ b/package/editors/vim/vim.mk
@@ -9,7 +9,7 @@ VIM_SITE:=http://ftp.vim.org/pub/vim
 VIM_SOURCE_SITE:=$(VIM_SITE)/unix
 VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1
 VIM_DIR:=$(BUILD_DIR)/vim71
-VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/vim/$(VIM_VERSION).:' package/editors/vim/patches)
+VIM_PATCHES:=$(shell cat package/editors/vim/patches | sed -s 's:\(.\+\):$(DL_DIR)/vim/$(VIM_VERSION).\1:')
 VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
 VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk

--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -4,14 +4,13 @@
 #
 #############################################################
 FREETYPE_VERSION = $(strip $(subst ",, $(BR2_FREETYPE_VERSION)))
-#"))
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_LIBTOOL_PATCH = NO
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_INSTALL_TARGET = YES
 FREETYPE_MAKE_OPT = CCexe="$(HOSTCC)"
-FREETYPE_DEPENDENCIES = uclibc pkgconfig $(if $(BR2_PACKAGE_ZLIB),zlib)
+FREETYPE_DEPENDENCIES = uclibc pkgconfig zlib

 $(eval $(call AUTOTARGETS,package,freetype))

--- a/package/gamin/Config.in
+++ b/package/gamin/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_GAMIN
 	bool "gamin"
-	select BR2_PACKAGE_LIBGLIB2
 	help
 	  the File Alteration Monitor

--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -10,17 +10,13 @@ GAMIN_AUTORECONF = NO
 GAMIN_INSTALL_STAGING = YES
 GAMIN_INSTALL_TARGET = YES

-GAMIN_CONF_OPT = --program-prefix="" --disable-debug
+GAMIN_CONF_OPT = --program-prefix=""

 GAMIN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install

 GAMIN_CONF_ENV = have_abstract_sockets=no

-ifneq ($(BR2_LARGEFILE),y)
-GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
-endif
-
-GAMIN_DEPENDENCIES = uclibc libglib2
+GAMIN_DEPENDENCIES = uclibc libgtk2

 $(eval $(call AUTOTARGETS,package,gamin))

--- a/package/gmp/gmp.mk
+++ b/package/gmp/gmp.mk
@@ -83,7 +83,7 @@ $(GMP_DIR2)/.configured: $(GMP_DIR)/.unpacked
 		--prefix="$(GMP_HOST_DIR)" \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--disable-shared \
+		--enable-shared \
 		--enable-static \
 		$(DISABLE_NLS) \
 	)
--- a/package/gmpc/gmpc.mk
+++ b/package/gmpc/gmpc.mk
@@ -8,7 +8,7 @@ GMPC_SOURCE = gmpc-$(GMPC_VERSION).tar.gz
 GMPC_SITE = http://download.sarine.nl/download/Programs/gmpc/$(GMPC_VERSION)/
 GMPC_LIBTOOL_PATCH = NO
 GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes
-GMPC_CONF_OPT = --disable-mmkeys
+GMPC_CONF_OPT = --disable-mmkeys $(DISABLE_NLS)


 GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -1,11 +1,4 @@
 config BR2_PACKAGE_ICU
 	bool "icu"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR
 	help
 	  International Components for Unicode.
-
-	  http://icu-project.org/
-
-comment "icu requires a toolchain with C++ support and WCHAR enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
--- a/package/input-tools/joystick-20051019-rint.patch
+++ b/package/input-tools/joystick-20051019-rint.patch
@@ -1,18 +0,0 @@
-diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
--- joystick-20051019.orig/utils/jscal.c	2004-10-19 09:51:52.000000000 +0200
-+++ joystick-20051019/utils/jscal.c	2009-01-18 10:48:50.000000000 +0100
-@@ -141,10 +141,10 @@
- 	c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
- 	d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
- 
-	results[0] = rint(a);
-	results[1] = rint(b);
-	results[2] = rint(c*16384.0);
-	results[3] = rint(d*16384.0);
-+	results[0] = (int) (a + 0.5);
-+	results[1] = (int) (b + 0.5);
-+	results[2] = (int) (c*16384.0 + 0.5);
-+	results[3] = (int) (d*16384.0 + 0.5);
- 
- 	return 1;
- }
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -51,7 +51,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_IPV6

 config BR2_PACKAGE_IPSEC_TOOLS_READLINE
 	depends on BR2_PACKAGE_IPSEC_TOOLS
-	select BR2_PACKAGE_READLINE
+	select BR2_READLINE
 	bool "Enable readline input support if available."

 config BR2_PACKAGE_IPSEC_TOOLS_LIBS
--- a/package/irda-utils/Config.in
+++ b/package/irda-utils/Config.in
@@ -1,9 +1,7 @@
 menuconfig BR2_PACKAGE_IRDA_UTILS
 	bool "irda_utils"
-	depends on BROKEN
 	help
-	  Tools for accessing the irda-Subsystem of the Linux-Kernel
-	  The makefile is totally broken.
+		Tools for accessing the irda-Subsystem of the Linux-Kernel

 if BR2_PACKAGE_IRDA_UTILS
 config IRDA_IRATTACH
@@ -41,5 +39,5 @@ config IRDA_SMCINIT
 	help
 		Some Toshiba Laptops have buggy BIOSes which didn't initialize
 		Irda. This may help those.
-
+	
 endif
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,6 +1,3 @@
-comment "kismet has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_KISMET
-
 config BR2_PACKAGE_KISMET
 	bool "kismet"
 	select BR2_PACKAGE_NCURSES
--- a/package/kismet/kismet-2007-10-R1-memset.patch
+++ b/package/kismet/kismet-2007-10-R1-memset.patch
@@ -1,45 +0,0 @@
-diff -urN kismet-2007-10-R1-0rig//kismet_wrapper.cc kismet-2007-10-R1/kismet_wrapper.cc
--- kismet-2007-10-R1-0rig//kismet_wrapper.cc	2007-10-06 23:50:03.000000000 +0200
-+++ kismet-2007-10-R1/kismet_wrapper.cc	2009-01-21 01:12:42.000000000 +0100
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- 
- #include "config.h"
-+#include <string.h>
- 
- /* Blob of globals since sighandler needs them */
- vector<string> postcli_err;
-diff -urN kismet-2007-10-R1-0rig//ringbuf.cc kismet-2007-10-R1/ringbuf.cc
--- kismet-2007-10-R1-0rig//ringbuf.cc	2005-12-11 20:14:39.000000000 +0100
-+++ kismet-2007-10-R1/ringbuf.cc	2009-01-21 01:12:26.000000000 +0100
-@@ -17,6 +17,7 @@
- */
- 
- #include "ringbuf.h"
-+#include <string.h>
- 
- RingBuffer::RingBuffer(int in_size) {
-     ring_len = in_size;
-diff -urN kismet-2007-10-R1-0rig//util.cc kismet-2007-10-R1/util.cc
--- kismet-2007-10-R1-0rig//util.cc	2006-08-28 22:37:29.000000000 +0200
-+++ kismet-2007-10-R1/util.cc	2009-01-21 01:12:26.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <string.h>
- 
- // We need this to make uclibc happy since they don't even have rintf...
- #ifndef rintf
-diff -urN kismet-2007-10-R1-0rig//util.h kismet-2007-10-R1/util.h
--- kismet-2007-10-R1-0rig//util.h	2006-08-28 22:37:29.000000000 +0200
-+++ kismet-2007-10-R1/util.h	2009-01-21 01:12:26.000000000 +0100
-@@ -65,7 +65,7 @@
-         end = op.end;
-         return *this;
-     }
-};
-+} swt;
- vector<smart_word_token> SmartStrTokenize(string in_str, string in_split, int return_partial = 1);
- 
- vector<string> LineWrap(string in_txt, unsigned int in_hdr_len, unsigned int in_maxlen);
--- a/package/kismet/kismet.mk
+++ b/package/kismet/kismet.mk
@@ -62,7 +62,6 @@ $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY): $(KISMET_DIR)/$(KISME

 kismet: uclibc ncurses libpcap dbus $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/$(KISMET_BINARY)

-kismet-unpacked: $(KISMET_DIR)/.patched

 kismet-clean:
 	rm -f $(TARGET_DIR)/$(KISMET_TARGET_DIRECTORY)/kismet
--- a/package/libcgicc/Config.in
+++ b/package/libcgicc/Config.in
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_LIBCGICC
 	bool "libcgicc"
-	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_INSTALL_LIBSTDCPP
 	help
 	  GNU cgicc is a C++ class library that greatly simplifies
 	  the creation of CGI applications for the World Wide Web.

 	  http://www.cgicc.com
-
-comment "libcgicc requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
--- a/package/libcgicc/cgicc-3.2.7-memset.patch
+++ b/package/libcgicc/cgicc-3.2.7-memset.patch
@@ -1,12 +0,0 @@
-diff -urN cgicc-3.2.7-0rig//demo/dns.cpp cgicc-3.2.7/demo/dns.cpp
--- cgicc-3.2.7-0rig//demo/dns.cpp	2009-01-21 00:24:13.000000000 +0100
-+++ cgicc-3.2.7/demo/dns.cpp	2009-01-21 00:24:30.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <vector>
- #include <stdexcept>
- #include <iostream>
-+#include <string.h>
- 
- #include "cgicc/CgiDefs.h"
- #include "cgicc/Cgicc.h"
-
--- a/package/libcgicc/libcgicc.mk
+++ b/package/libcgicc/libcgicc.mk
@@ -17,8 +17,7 @@ libcgicc-source: $(DL_DIR)/$(LIBCGICC_SOURCE)

 $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE)
 	$(LIBCGICC_CAT) $(DL_DIR)/$(LIBCGICC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LIBCGICC_DIR) package/libcgicc cgicc\*.patch
-	touch $@
+	touch $(LIBCGICC_DIR)/.unpacked

 $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 	(cd $(LIBCGICC_DIR); rm -f config.cache; \
@@ -30,27 +29,32 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 		--build=$(GNU_HOST_NAME) \
 		--prefix=/usr \
 		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libdir=/lib \
+		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
+		--datadir=/usr/share \
 		--localstatedir=/var \
-		--disable-demos \
+		--includedir=/include \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
 	)
-	touch $@
+	touch $(LIBCGICC_DIR)/.configured

 $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
 	$(MAKE) -C $(LIBCGICC_DIR)
-	touch $@
+	touch $(LIBCGICC_DIR)/.compiled

-$(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
+$(STAGING_DIR)/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
-	touch -c $(STAGING_DIR)/usr/lib/libcgicc.so
+	touch -c $(STAGING_DIR)/lib/libcgicc.so

-$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so
-	cp -dpf $(STAGING_DIR)/usr/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/lib/libcgicc.so
+	cp -dpf $(STAGING_DIR)/lib/libcgicc.so* $(TARGET_DIR)/usr/lib/

 libcgicc: uclibc $(TARGET_DIR)/usr/lib/libcgicc.so

-libcgicc-unpacked: $(LIBCGICC_DIR)/.unpacked
-
 libcgicc-clean:
 		-$(MAKE) -C $(LIBCGICC_DIR) clean

--- a/package/libconfuse/libconfuse-2.6-dont-use-werror.patch
+++ b/package/libconfuse/libconfuse-2.6-dont-use-werror.patch
@@ -1,34 +0,0 @@
-confuse: don't compile with -Werror
-
-Werror isn't really a robust setting for !development.
---
- src/Makefile.am |    2 +-
- src/Makefile.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: confuse-2.6/src/Makefile.am
-===================================================================
--- confuse-2.6.orig/src/Makefile.am
-+++ confuse-2.6/src/Makefile.am
-@@ -10,7 +10,7 @@
- DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- 
- if cc_is_gcc
-AM_CFLAGS=-Wall -Werror
-+AM_CFLAGS=-Wall
- endif
- 
- LIBS = @LIBS@
-Index: confuse-2.6/src/Makefile.in
-===================================================================
--- confuse-2.6.orig/src/Makefile.in
-+++ confuse-2.6/src/Makefile.in
-@@ -196,7 +196,7 @@
- libconfuse_la_SOURCES = confuse.c lexer.l
- libconfuse_la_LIBADD = $(LTLIBINTL)
- include_HEADERS = confuse.h
-@cc_is_gcc_TRUE@AM_CFLAGS = -Wall -Werror
-+@cc_is_gcc_TRUE@AM_CFLAGS = -Wall
- CLEANFILES = *~ \#*\#
- AM_LFLAGS = -Pcfg_yy -olex.yy.c
- all: all-am
--- a/package/libconfuse/libconfuse.mk
+++ b/package/libconfuse/libconfuse.mk
@@ -10,7 +10,7 @@ LIBCONFUSE_AUTORECONF:=NO
 LIBCONFUSE_INSTALL_STAGING:=YES
 LIBCONFUSE_INSTALL_TARGET:=YES

-LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath
+LIBCONFUSE_CONF_OPT:=--enable-shared --disable-rpath $(DISABLE_NLS)

 LIBCONFUSE_DEPENDENCIES = uclibc

--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -8,7 +8,7 @@ LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
 LIBCURL_SITE = http://curl.haxx.se/download/
 LIBCURL_INSTALL_STAGING = YES
 LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
-		   $(DISABLE_IPV6)
+		   $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)

 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
--- a/package/libdaemon/libdaemon.mk
+++ b/package/libdaemon/libdaemon.mk
@@ -11,7 +11,7 @@ LIBDAEMON_AUTORECONF:=no
 LIBDAEMON_INSTALL_STAGING:=YES
 LIBDAEMON_INSTALL_TARGET:=YES
 LIBDAEMON_CONF_ENV:=ac_cv_func_setpgrp_void=no
-LIBDAEMON_CONF_OPT:=--disable-lynx 
+LIBDAEMON_CONF_OPT:=--disable-lynx $(DISABLE_NLS) $(DISABLE_LARGEFILE)

 LIBDAEMON_DEPENDENCIES:=uclibc pkgconfig

--- a/package/libdnet/libdnet.mk
+++ b/package/libdnet/libdnet.mk
@@ -10,12 +10,7 @@ LIBDNET_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/l
 LIBDNET_INSTALL_STAGING = YES
 LIBDNET_INSTALL_TARGET = YES
 LIBDNET_AUTORECONF = YES
-LIBDNET_CONF_OPT = \
-	--with-gnu-ld \
-	--enable-shared \
-	--enable-static \
-	--with-check=no
-
+LIBDNET_CONF_OPT = --with-gnu-ld --enable-shared --enable-static
 LIBDNET_DEPENDENCIES = uclibc

 ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),)
--- a/package/libeXosip2/Config.in
+++ b/package/libeXosip2/Config.in
@@ -1,9 +1,5 @@
-comment "libeXosip2 has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_LIBEXOSIP2
-
 config BR2_PACKAGE_LIBEXOSIP2
 	bool "libeXosip2"
-	select BR2_PACKAGE_LIBOSIP2
 	help
 	  GNU Higher level SIP (Session Initiation Protocol)
 	  This library aims to provide multimedia and telecom software
--- a/package/libeXosip2/libeXosip2.mk
+++ b/package/libeXosip2/libeXosip2.mk
@@ -22,19 +22,36 @@ $(LIBEXOSIP2_DIR)/.configured: $(LIBEXOSIP2_DIR)/.unpacked
 	(cd $(LIBEXOSIP2_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		OSIP_CFLAGS="$(TARGET_CFLAGS)" \
-		OSIP_LIBS="-L$(STAGING_DIR)/usr/lib -losip2 -losipparser2" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
+		--prefix=$(STAGING_DIR) \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+		--libexecdir=/usr/lib \
+		--libdir=/usr/lib \
+		--includedir=$(STAGING_DIR)/usr/include \
+		--oldincludedir=/usr/include \
 		--enable-shared \
 		--enable-static \
 		$(DISABLE_NLS) \
 	)
 	touch $@

+#		--with-gnu-ld \
+#		--libexecdir=$(STAGING_DIR)/usr/lib \
+#		--libdir=$(STAGING_DIR)/usr/lib \
+#		--libdir=/usr/lib \
+#		--libexecdir=/usr/lib \
+
+
 $(LIBEXOSIP2_DIR)/.compiled: $(LIBEXOSIP2_DIR)/.configured
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBEXOSIP2_DIR)
 	touch $@
--- a/package/libfloat/Config.in
+++ b/package/libfloat/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBFLOAT
 	bool "libfloat"
-	depends on BR2_DEPRECATED
 	help
 	 Soft floating point library.
 	
--- a/package/libglib12/libglib-libtool.patch
+++ b/package/libglib12/libglib-libtool.patch
@@ -1,88 +0,0 @@
--- glib/ltconfig
-+++ glib/ltconfig
-@@ -450,6 +450,7 @@
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case "$host_os" in
- linux-gnu*) ;;
-+linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1981,6 +1982,28 @@
-   fi
-   ;;
- 
-+linux-uclibc*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+  soname_spec='${libname}${release}.so$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # deplibs_check_method=pass_all
-+  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /lib/libuClibc-*.so`
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  # Note: copied from linux-gnu, and may not be appropriate.
-+  hardcode_into_libs=yes
-+  # Assume using the uClibc dynamic linker.
-+  dynamic_linker="uClibc ld.so"
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--- g/configure
-+++ g/configure
-@@ -966,6 +966,7 @@
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- echo "$ac_t""$host" 1>&6
-+host_alias=$host
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
- echo "configure:972: checking build system type" >&5
-diff -urN glib-1.2.10-0rig/ltconfig glib-1.2.10/ltconfig
--- glib-1.2.10-0rig/ltconfig	2009-01-17 02:56:10.000000000 +0100
-+++ glib-1.2.10/ltconfig	2009-01-17 02:55:40.000000000 +0100
-@@ -448,6 +448,9 @@
- fi
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
-+echo $ac_n "host_os... $host_os" 1>&5
-+echo $ac_n "host_os... $host_os" 1>&6
-+
- case "$host_os" in
- linux-gnu*) ;;
- linux-uclibc*) ;;
-@@ -761,6 +764,7 @@
-     ;;
-   *)
-     can_build_shared=no
-+    echo "$progname:764: No OS found: host_os = $host_os" >&5
-     ;;
-   esac
- fi
-@@ -1791,6 +1795,8 @@
- # If you have `file' or equivalent on your system and you're not sure
- # whether `pass_all' will *always* work, you probably want this one.
- echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
-+echo $ac_n "host_os... $host_os" 1>&5
-+echo $ac_n "host_os... $host_os" 1>&6
- case "$host_os" in
- aix3*)
-   version_type=linux
-@@ -1982,7 +1988,7 @@
-   fi
-   ;;
- 
-linux-uclibc*)
-+*-linux | linux-uclibc*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
--- a/package/libglib12/libglib-libtool.patch.bz2
+++ b/package/libglib12/libglib-libtool.patch.bz2
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -3,21 +3,14 @@
 # libglib2
 #
 #############################################################
-LIBGLIB2_VERSION_MAJOR = 2.16
-LIBGLIB2_VERSION_MINOR = 6
-LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
+LIBGLIB2_VERSION = 2.16.6
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
-LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/$(LIBGLIB2_VERSION_MAJOR)
-
+LIBGLIB2_SITE = http://ftp.gtk.org/pub/glib/2.16
 LIBGLIB2_AUTORECONF = NO
 LIBGLIB2_INSTALL_STAGING = YES
 LIBGLIB2_INSTALL_TARGET = YES
 LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install

-# detect install prefix of host glib development stuff
-HOST_GLIB_BIN:=`dirname $(shell which glib-genmarshal || echo /usr/bin/glib-genmarshal)`
-HOST_GLIB:=$(shell dirname $(HOST_GLIB_BIN) || echo /usr)
-
 LIBGLIB2_CONF_ENV =	\
 		ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -52,6 +45,8 @@ LIBGLIB2_CONF_ENV =	\
 		gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)

 LIBGLIB2_CONF_OPT = --enable-shared \
+	 	--disable-gtk-doc \
+		--with-html-dir=/dev/null \
 		--enable-static

 LIBGLIB2_DEPENDENCIES = uclibc gettext libintl pkgconfig
@@ -60,16 +55,4 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
 LIBGLIB2_DEPENDENCIES+=libiconv
 endif

-ifeq ($(BR2_PACKAGE_LIBICONV),y)
-LIBGLIB2_CONF_OPT += --with-libiconv=gnu
-LIBGLIB2_DEPENDENCIES+=libiconv
-endif
-
 $(eval $(call AUTOTARGETS,package,libglib2))
-
-# we NEED a host glib-genmarshal
-ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
-ifeq ($(wildcard $(HOST_GLIB)/bin/glib-genmarshal),)
-$(error Host glib-genmarshal not found. Please install glib development package on your host (something like libglib2.0-dev))
-endif
-endif
--- a/package/libgtk2/libgtk2.mk
+++ b/package/libgtk2/libgtk2.mk
@@ -3,13 +3,9 @@
 # libgtk2.0
 #
 #############################################################
-#LIBGTK2_VERSION = 2.15.0
-LIBGTK2_VERSION_MAJOR:=2.12
-LIBGTK2_VERSION_MINOR:=12
-LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).$(LIBGTK2_VERSION_MINOR)
-
+LIBGTK2_VERSION = 2.12.12
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
-LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/$(LIBGTK2_VERSION_MAJOR)
+LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12
 LIBGTK2_AUTORECONF = NO
 LIBGTK2_INSTALL_STAGING = YES
 LIBGTK2_INSTALL_TARGET = YES
@@ -79,6 +75,7 @@ LIBGTK2_CONF_OPT = --enable-shared \
 		--disable-glibtest \
 		--enable-explicit-deps=no \
 		--disable-debug \
+		$(DISABLE_LARGEFILE) \
 		$(LIBGTK2_CONF_OPT_X)  \
 		$(LIBGTK2_CONF_OPT_DFB)

@@ -100,10 +97,6 @@ else
 	LIBGTK2_CONF_OPT += --without-x
 endif

-# Buildroot does not support JPEG2000 library
-ifeq ($(LIBGTK2_VERSION_MAJOR),2.15)
-LIBGTK2_CONF_OPT += --without-libjasper
-endif

 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 LIBGTK2_DEPENDENCIES += libpng
--- a/package/liboil/liboil-0.3.15-arm-vfp.patch
+++ b/package/liboil/liboil-0.3.15-arm-vfp.patch
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 06a0ac9..b8d1640 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -158,7 +158,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
-     true)
- fi
- 
-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
-+AC_ARG_ENABLE(vfp,
-+  AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
-+  enable_vfp=$enableval,enable_vfp=yes)
-+if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
-   AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
-     [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mfpu=vfp"],
-     true)
--- a/package/liboil/liboil.mk
+++ b/package/liboil/liboil.mk
@@ -6,7 +6,7 @@
 LIBOIL_VERSION = 0.3.15
 LIBOIL_SOURCE = liboil-$(LIBOIL_VERSION).tar.gz
 LIBOIL_SITE = http://liboil.freedesktop.org/download
-LIBOIL_AUTORECONF = YES
+LIBOIL_AUTORECONF = NO
 LIBOIL_INSTALL_STAGING = YES
 LIBOIL_INSTALL_TARGET = YES

@@ -26,16 +26,10 @@ ifeq ($(BR2_x86_64),y)
 LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
 endif

-LIBOIL_CONF_OPT+=--with-gnu-ld
-
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 LIBOIL_GLIB_DEP = libglib2
 endif

-ifeq ($(BR2_VFP_FLOAT),y)
-LIBOIL_CONF_OPT+=--enable-vfp
-endif
-
 LIBOIL_DEPENDENCIES = uclibc $(LIBOIL_GLIB_DEP)

 $(eval $(call AUTOTARGETS,package,liboil))
@@ -43,4 +37,4 @@ $(eval $(call AUTOTARGETS,package,liboil))
 $(LIBOIL_HOOK_POST_INSTALL):
 	# Remove useless bugreport program from the target
 	rm -f $(TARGET_DIR)/usr/bin/oil-bugreport
-	touch $@
+	touch $@
--- a/package/libsexy/Config.in
+++ b/package/libsexy/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBSEXY
 	bool "libsexy"
 	depends on BR2_PACKAGE_LIBGTK2
-	select BR2_PACKAGE_LIBXML2
 	help
 	  libsexy is a collection of GTK+ widgets that extend the
 	  functionality of such standard widgets as GtkEntry and
--- a/package/libsexy/libsexy.mk
+++ b/package/libsexy/libsexy.mk
@@ -8,7 +8,7 @@ LIBSEXY_VERSION = 0.1.11
 LIBSEXY_SOURCE = libsexy-$(LIBSEXY_VERSION).tar.gz
 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy/
 LIBSEXY_AUTORECONF = NO
-LIBSEXY_DEPENDENCIES = libgtk2 libxml2
+LIBSEXY_DEPENDENCIES = xlib_libX11 libgtk2
 LIBSEXY_INSTALL_TARGET = YES
 LIBSEXY_INSTALL_STAGING = YES

--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -16,7 +16,7 @@ endif
 LIBXML2_CONF_OPT = --with-gnu-ld --enable-shared \
 		--enable-static $(DISABLE_IPV6) \
 		--without-debugging --without-python \
-		--without-threads 
+		--without-threads $(DISABLE_NLS)

 LIBXML2_DEPENDENCIES = uclibc

@@ -25,7 +25,6 @@ $(eval $(call AUTOTARGETS,package,libxml2))
 $(LIBXML2_HOOK_POST_EXTRACT):
 	rm -f $(LIBXML2_DIR)/win32/Makefile.msvc.rej
 	rm -f $(LIBXML2_DIR)/macos/src/XMLTestPrefix.h.rej
-	touch $@

 $(LIBXML2_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xml2-config
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -38,11 +38,11 @@ $(LSOF_DIR)/.configured: $(LSOF_DIR)/.unpacked
 	touch $(LSOF_DIR)/.configured

 $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/$(LSOF_BINARY): $(LSOF_DIR)/.configured
-ifeq ($(BR2_USE_WCHAR),)
+ifeq ($(UCLIBC_HAS_WCHAR),)
 	$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
 	$(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
 endif
-ifeq ($(BR2_ENABLE_LOCALE),)
+ifeq ($(UCLIBC_HAS_LOCALE),)
 	$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src/machine.h
 endif
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(LSOF_DIR)/lsof_$(LSOF_VERSION)_src
--- a/package/ltrace/Config.in
+++ b/package/ltrace/Config.in
@@ -1,6 +1,3 @@
-comment "ltrace has no inherent support for AVR32" 
-	depends on BR2_avr32 && BR2_PACKAGE_LTRACE
-
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
 	#depends on BR2_LARGEFILE
--- a/package/ltt/Config.in
+++ b/package/ltt/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LTT
+	bool "LTT (Linux Trace Toolkit)"
+	help
+	  A suite of tools designed to extract program execution
+	  details from the Linux operating system and interpret them.
+
+	  http://www.opersys.com/LTT/
--- a/package/ltt/S27tracer
+++ b/package/ltt/S27tracer
@@ -0,0 +1,93 @@
+#!/bin/sh
+#
+# Load tracer module and create tracer device node.
+#
+
+MODULE="tracer"
+MAIN_DEVICE="tracer"
+USER_DEVICE="tracerU"
+GROUP="root"
+MODE="664"
+
+start() {
+	if [ -e /dev/${MAIN_DEVICE} -o -e /dev/${USER_DEVICE} ]
+	then
+	    # tell the user about what we are doing
+	    echo "Deleting old tracer nodes: /dev/tracer and /dev/tracerU"
+
+	    # remove stale nodes
+	    rm -f /dev/${MAIN_DEVICE}
+	    rm -f /dev/${USER_DEVICE}
+	fi
+
+	# look for the major number
+	MAJOR=`/bin/grep " ${MODULE}$" /proc/devices | cut -d" " -f1`
+
+	# does the device exist?
+	if [ ${MAJOR} ]
+	then
+	    echo "Found tracer device with major number:" ${MAJOR}
+	else
+ 	    echo "Loading tracer kernel module: "
+	    # invoke modprobe
+	    /sbin/modprobe ${MODULE}
+	    MAJOR=`/bin/grep " ${MODULE}$" /proc/devices | cut -d" " -f1`
+	    if [ ${MAJOR} ]
+	    then
+		echo "Found tracer device with major number:" ${MAJOR}
+	    else
+		echo "Did not find tracer device ... /dev entries not created ..."
+		exit 1
+	    fi
+	fi
+
+	# tell the user about what we are doing
+	echo "Creating new tracer nodes: /dev/tracer and /dev/tracerU"
+
+	# create the character special file
+	/bin/mknod /dev/${MAIN_DEVICE} c ${MAJOR} 0
+	/bin/mknod /dev/${USER_DEVICE} c ${MAJOR} 1
+
+	# set permissions and ownership
+	/bin/chgrp ${GROUP} /dev/${MAIN_DEVICE}
+	/bin/chmod ${MODE}  /dev/${MAIN_DEVICE}
+	/bin/chgrp ${GROUP} /dev/${USER_DEVICE}
+	/bin/chmod ${MODE}  /dev/${USER_DEVICE}
+}
+stop() {
+	# tell the user about what we are doing
+	echo "Deleting tracer nodes: /dev/tracer and /dev/tracerU"
+
+	# remove nodes
+	rm -f /dev/${MAIN_DEVICE}
+	rm -f /dev/${USER_DEVICE}
+
+	if lsmod | /bin/grep "^${MODULE} "
+	then
+	    echo -n "Removing tracer kernel module: "
+	    # invoke modprobe -r
+	    /sbin/modprobe -r ${MODULE}
+	    echo "OK"
+	fi
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart|reload)
+  	restart
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
--- a/package/ltt/ltt-gcc4.patch
+++ b/package/ltt/ltt-gcc4.patch
@@ -0,0 +1,23 @@
+--- orig/TraceToolkit-0.9.5/Visualizer/MainWindow.c	2002-04-15 19:23:49.000000000 -0700
+++ TraceToolkit-0.9.5/Visualizer/MainWindow.c	2006-04-05 16:04:47.000000000 -0700
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <gdk/gdkkeysyms.h>
+ 
+@@ -3146,8 +3147,10 @@
+ 
+   /* FORCEFULLY disconnect event handlers from the notebook widget */
+   /*  I didn't find any cleaner way to do this. K.Y. 9/5/2000 */
+-  GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->key_press_event) = NULL,
+-  GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->focus_in_event) = NULL,
+  gtk_type_free(GTK_TYPE_SIGNAL, 
+		GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->key_press_event));
+  gtk_type_free(GTK_TYPE_SIGNAL,
+		GTK_SIGNAL_FUNC(GTK_WIDGET_CLASS(GTK_OBJECT(pmSysView->Window->MNotebook)->klass)->focus_in_event));
+ 
+   /* Connect the key press event */
+   gtk_signal_connect(GTK_OBJECT(pmSysView->Window->MWindow),
--- a/package/ltt/ltt.mk
+++ b/package/ltt/ltt.mk
@@ -0,0 +1,121 @@
+#############################################################
+#
+# ltt
+#
+#############################################################
+LTT_VERSION:=0.9.5a
+LTT_SOURCE:=TraceToolkit-$(LTT_VERSION).tgz
+LTT_SITE:=http://www.opersys.com/ftp/pub/LTT
+LTT_CAT:=$(ZCAT)
+LTT_DIR1:=$(TOOL_BUILD_DIR)/TraceToolkit-$(LTT_VERSION:a=)
+LTT_DIR2:=$(BUILD_DIR)/TraceToolkit-$(LTT_VERSION:a=)
+LTT_BINARY:=Visualizer/tracevisualizer
+LTT_TARGET_BINARY:=Daemon/tracedaemon
+
+$(DL_DIR)/$(LTT_SOURCE):
+	 $(call DOWNLOAD,$(LTT_SITE),$(LTT_SOURCE))
+
+ltt-source: $(DL_DIR)/$(LTT_SOURCE)
+
+
+#############################################################
+#
+# build tracevisualizer for use on the host system
+#
+#############################################################
+$(LTT_DIR1)/.unpacked: $(DL_DIR)/$(LTT_SOURCE)
+	$(LTT_CAT) $(DL_DIR)/$(LTT_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(LTT_DIR1) package/ltt ltt\*.patch
+	touch $(LTT_DIR1)/.unpacked
+
+# Build without GTK if not available
+LTT_WITHOUT_GTK:=$(shell which gtk-config > /dev/null 2>&1 || echo "--without-gtk")
+
+$(LTT_DIR1)/.configured: $(LTT_DIR1)/.unpacked
+	(cd $(LTT_DIR1); rm -rf config.cache; \
+		./configure \
+		--prefix=$(TOOL_BUILD_DIR) \
+		$(LTT_WITHOUT_GTK) \
+	)
+	touch $(LTT_DIR1)/.configured
+
+$(LTT_DIR1)/$(LTT_BINARY): $(LTT_DIR1)/.configured
+	$(MAKE) -C $(LTT_DIR1)/LibLTT
+	$(MAKE) -C $(LTT_DIR1)/Visualizer
+
+$(TOOL_BUILD_DIR)/bin/tracevisualizer: $(LTT_DIR1)/$(LTT_BINARY)
+	$(MAKE) -C $(LTT_DIR1)/LibLTT install
+	$(MAKE) -C $(LTT_DIR1)/Visualizer install
+
+host-ltt-tracevisualizer: $(TOOL_BUILD_DIR)/bin/tracevisualizer
+
+host-ltt-clean:
+	-$(MAKE) -C $(LTT_DIR1) clean
+
+host-ltt-dirclean:
+	rm -rf $(LTT_DIR1)
+
+
+#############################################################
+#
+# build tracedaemon for use on the target system
+#
+#############################################################
+$(LTT_DIR2)/.unpacked: $(DL_DIR)/$(LTT_SOURCE)
+	$(LTT_CAT) $(DL_DIR)/$(LTT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(LTT_DIR2) package/ltt ltt\*.patch
+	touch $(LTT_DIR2)/.unpacked
+
+$(LTT_DIR2)/.configured: $(LTT_DIR2)/.unpacked
+	(cd $(LTT_DIR2); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		./configure \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--bindir=/usr/bin \
+		--sbindir=/usr/sbin \
+		--libdir=/lib \
+		--libexecdir=/usr/lib \
+		--sysconfdir=/etc \
+		--datadir=/usr/share \
+		--localstatedir=/var \
+		--mandir=/usr/man \
+		--infodir=/usr/info \
+	)
+	touch $(LTT_DIR2)/.configured
+
+$(LTT_DIR2)/$(LTT_TARGET_BINARY): $(LTT_DIR2)/.configured
+	$(MAKE) CC=$(TARGET_CC) -C $(LTT_DIR2)/LibUserTrace
+	$(MAKE) CC=$(TARGET_CC) -C $(LTT_DIR2)/Daemon
+
+$(TARGET_DIR)/usr/bin/tracedaemon: $(LTT_DIR2)/$(LTT_TARGET_BINARY)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
+		-C $(LTT_DIR2)/LibUserTrace install
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
+		-C $(LTT_DIR2)/Daemon install
+	$(STRIPCMD) $(TARGET_DIR)/usr/bin/tracedaemon > /dev/null 2>&1
+	$(INSTALL) -D -m 0755 package/ltt/S27tracer $(TARGET_DIR)/etc/init.d
+
+ltt-tracedaemon: uclibc $(TARGET_DIR)/usr/bin/tracedaemon
+
+ltt-clean:
+	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LTT_DIR2) uninstall
+	-$(MAKE) -C $(LTT_DIR2) clean
+
+ltt-dirclean:
+	rm -rf $(LTT_DIR2)
+
+
+ltt: host-ltt-tracevisualizer ltt-tracedaemon
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(BR2_PACKAGE_LTT),y)
+TARGETS+=ltt
+endif
--- a/package/ltt/ltt.patch
+++ b/package/ltt/ltt.patch
@@ -0,0 +1,42 @@
+diff -urN TraceToolkit-0.9.5.orig/LibLTT/EventDB.c TraceToolkit-0.9.5/LibLTT/EventDB.c
+--- TraceToolkit-0.9.5.orig/LibLTT/EventDB.c	2002-04-15 09:10:13.000000000 -0700
+++ TraceToolkit-0.9.5/LibLTT/EventDB.c	2005-09-29 15:09:11.000000000 -0700
+@@ -2757,7 +2757,7 @@
+ 
+ 	/* Increment number of custom events */
+ 	pmTraceDB->NbCustom++;
+-	goto NoControlEvent;
+	continue;
+ 	break;
+ 
+       /* A custom event has occured */
+@@ -2800,8 +2800,6 @@
+       lLastCtrlEvent     = lEvent;
+       lLastCtrlEventTime = lEventTime;
+       }
+-
+-NoControlEvent:
+     } while(DBEventNext(pmTraceDB, &lEvent) == TRUE);
+ 
+   /* Remember the last event and its time */
+diff -urN TraceToolkit-0.9.5.orig/LibLTT/RTAIDB.c TraceToolkit-0.9.5/LibLTT/RTAIDB.c
+--- TraceToolkit-0.9.5.orig/LibLTT/RTAIDB.c	2002-04-15 20:00:05.000000000 -0700
+++ TraceToolkit-0.9.5/LibLTT/RTAIDB.c	2005-09-29 15:09:17.000000000 -0700
+@@ -2621,7 +2621,7 @@
+ 
+ 	/* Increment number of custom events */
+ 	pmTraceDB->NbCustom++;
+-	goto NoControlEvent;
+	continue;
+ 	break;
+ 
+       /* A custom event has occured */
+@@ -2936,8 +2936,6 @@
+       lLastCtrlEvent     = lEvent;
+       lLastCtrlEventTime = lEventTime;
+       }
+-
+-NoControlEvent:
+     } while(DBEventNext(pmTraceDB, &lEvent) == TRUE);
+ 
+   /* Remember the last event and it's time */
--- a/package/lua/Config.in
+++ b/package/lua/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LUA
 	bool "lua"
-	select BR2_PACKAGE_READLINE
+	select BR2_READLINE
 	select BR2_PACKAGE_NCURSES
 	help
 	  Lua is a powerful, fast, light-weight, embeddable scripting language.
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -3,7 +3,7 @@
 # lzma
 #
 #############################################################
-LZMA_VERSION:=4.32.6
+LZMA_VERSION:=4.32.4
 LZMA_SOURCE:=lzma-$(LZMA_VERSION).tar.gz
 LZMA_CAT:=$(ZCAT)
 LZMA_SITE:=http://tukaani.org/lzma/
--- a/package/lzo/lzo.mk
+++ b/package/lzo/lzo.mk
@@ -11,6 +11,7 @@ LZO_INSTALL_STAGING = YES
 LZO_INSTALL_TARGET = YES
 LZO_INSTALL_STAGING_OPT = CC="$(TARGET_CC)" DESTDIR=$(STAGING_DIR) install
 LZO_CONF_ENV =
+LZO_CONF_OPT = $(DISABLE_LARGEFILE)
 LZO_DEPENDENCIES = uclibc

 $(eval $(call AUTOTARGETS,package,lzo))
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -15,7 +15,7 @@ M4_TARGET_BINARY:=usr/bin/m4
 ifeq ($(UCLIBC_HAS_REGEX),y)
 gl_cv_func_re_compile_pattern_working=gl_cv_func_re_compile_pattern_working=yes
 endif
-ifneq ($(BR2_USE_WCHAR),y)
+ifneq ($(UCLIBC_HAS_WCHAR),y)
 gt_cv_c_wchar_t=gt_cv_c_wchar_t=no
 gl_cv_absolute_wchar_h=gl_cv_absolute_wchar_h=__fpending.h
 endif
--- a/package/microperl/microperl.mk
+++ b/package/microperl/microperl.mk
@@ -23,38 +23,18 @@ $(DL_DIR)/$(MICROPERL_SOURCE):

 $(MICROPERL_DIR)/.source: $(DL_DIR)/$(MICROPERL_SOURCE)
 	$(MICROPERL_CAT) $(DL_DIR)/$(MICROPERL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	chmod -R u+w $(MICROPERL_DIR)
 	touch $@

-$(MICROPERL_DIR)/.host_configured: $(MICROPERL_DIR)/.source
+$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.source
+ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
 	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR); ./Configure -Dcc=$(HOSTCC) -de  )
-	touch $@
-
-
-$(MICROPERL_DIR)/.host_configured_and_fixed: $(MICROPERL_DIR)/.host_configured
-	$(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/makefile
-	$(SED) 's/^.*<command-line>.*//g' $(MICROPERL_DIR)/x2p/makefile
-	touch $@
-
-$(MICROPERL_DIR)/.host_make: $(MICROPERL_DIR)/.host_configured_and_fixed
-	$(MAKE) -C $(MICROPERL_DIR)		|| echo "An error is expected on make"
-	touch $@
-
-$(MICROPERL_DIR)/.host_make_fixed: $(MICROPERL_DIR)/.host_make
-	$(SED) 's#^.*<asm/page.h>.*##g' $(MICROPERL_DIR)/ext/IPC/SysV/SysV.c
-	$(MAKE) -C $(MICROPERL_DIR) test	|| echo "An error is expected on make test"
-	touch $@
-
-$(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.host_make_fixed
-	# we need to build a perl for the host just for Errno.pm
-	(cd $(MICROPERL_DIR); \
-	 chmod a+x ext/util/make_ext; \
-	 ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))" \
+	(cd $(MICROPERL_DIR); ./Configure -de; \
+	 $(MAKE) CC="$(HOSTCC)"; \
+	 $(SHELL) ext/util/make_ext nonxs Errno MAKE="$(firstword $(MAKE))"; \
 	)
-	(cd $(MICROPERL_DIR); \
-	 chmod u+w uconfig.h; ./uconfig.sh; \
-	 $(MAKE) -f $(MICROPERL_DIR)/Makefile.micro regen_uconfig; \
+endif
+	(cd $(MICROPERL_DIR); chmod u+w uconfig.h; . ./uconfig.sh; \
+	 $(MAKE) -f Makefile.micro regen_uconfig; \
 	 $(SED) 's,PRIVLIB ".*,PRIVLIB "/$(MICROPERL_MODS_DIR)",' \
 		 -e 's,PRIVLIB_EXP ".*,PRIVLIB_EXP "$(MICROPERL_MODS_DIR)",' \
 		 -e 's,BIN ".*,BIN "/usr/bin",' \
@@ -63,7 +43,7 @@ $(MICROPERL_DIR)/.configured: $(MICROPERL_DIR)/.host_make_fixed
 	touch $@

 $(MICROPERL_DIR)/microperl: $(MICROPERL_DIR)/.configured
-	$(MAKE) -f $(MICROPERL_DIR)/Makefile.micro CC=$(TARGET_CC) \
+	$(MAKE) -f Makefile.micro CC=$(TARGET_CC) \
 		OPTIMIZE="$(TARGET_CFLAGS)" -C $(MICROPERL_DIR)
 ifeq ($(BR2_PACKAGE_AUTOMAKE),y)
 	#(cd $(@D); \
@@ -78,28 +58,17 @@ ifneq ($(MICROPERL_MODS),)
 		[ -d $$i ] || mkdir -p $$i; \
 	 done; \
 	 for i in $(MICROPERL_MODS); do \
-	 cp -dpf $(MICROPERL_DIR)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
+	 cp -dpf lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \
 	 done; \
 	)
 endif
-	cp -dpf $(MICROPERL_DIR)/microperl $@
-ifneq ($(BR2_STRIP_none),y)
-	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
-endif
+	cp -dpf $(MICROPERL_DIR)/microperl $(TARGET_DIR)/usr/bin/microperl
 	(cd $(TARGET_DIR)/usr/bin; rm -f perl; ln -s microperl perl;)

 microperl: uclibc $(TARGET_DIR)/usr/bin/microperl

 microperl-source: $(DL_DIR)/$(MICROPERL_SOURCE)

-microperl-unpacked: $(MICROPERL_DIR)/.source
-
-microperl-config: $(MICROPERL_DIR)/.host_configured
-
-microperl-host: $(MICROPERL_DIR)/.host_make
-
-microperl-host-fixed: $(MICROPERL_DIR)/.host_make_fixed
-
 microperl-clean:
 	rm -rf $(TARGET_DIR)/usr/bin/microperl \
 		$(TARGET_DIR)/$(MICROPERL_MODS_DIR) $(TARGET_DIR)/usr/bin/perl
--- a/package/modutils/Config.in
+++ b/package/modutils/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MODUTILS
 	bool "modutils"
 	depends on !BR2_PACKAGE_MODULE_INIT_TOOLS
-	depends on BR2_DEPRECATED
 	help
 	  The modutils packages includes the kerneld program for automatic
 	  loading and unloading of modules, as well as other module
--- a/package/mpfr/mpfr.mk
+++ b/package/mpfr/mpfr.mk
@@ -3,8 +3,8 @@
 # mpfr
 #
 #############################################################
-MPFR_VERSION:=2.3.2
-#MPFR_PATCH:=patches
+MPFR_VERSION:=2.3.0
+MPFR_PATCH:=patches
 MPFR_PATCH_FILE:=mpfr-$(MPFR_VERSION).patch
 MPFR_SOURCE:=mpfr-$(MPFR_VERSION).tar.bz2
 MPFR_CAT:=$(BZCAT)
@@ -13,7 +13,8 @@ MPFR_DIR:=$(TOOL_BUILD_DIR)/mpfr-$(MPFR_VERSION)
 MPFR_TARGET_DIR:=$(BUILD_DIR)/mpfr-$(MPFR_VERSION)
 MPFR_BINARY:=libmpfr$(LIBTGTEXT)
 MPFR_HOST_BINARY:=libmpfr$(HOST_SHREXT)
-MPFR_LIBVERSION:=1.1.2
+MPFR_LIBVERSION:=1.0.1
+#MPFR_SVN_CMD:=svn co svn://scm.gforge.inria.fr/svn/mpfr/branches/2.3 mpfr-2.3

 # need patch
 ifneq ($(MPFR_PATCH),)
@@ -96,7 +97,7 @@ $(MPFR_DIR2)/.configured: $(MPFR_DIR)/.unpacked $(GMP_HOST_DIR)/lib/$(GMP_HOST_B
 		--prefix="$(MPFR_HOST_DIR)" \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
-		--disable-shared \
+		--enable-shared \
 		--enable-static \
 		--with-gmp=$(GMP_HOST_DIR) \
 		$(DISABLE_NLS) \
--- a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch
+++ b/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch
@@ -1,23 +0,0 @@
-mkfs.jffs2.c: fix device_table handling
-
-find_filesystem_entry would ignore device_table entries for existing elements
-if the device type / permissions weren't exactly the same, effectively
-rendering device_table useless.
---
- mkfs.jffs2.c |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: mtd-utils-1.1.0/mkfs.jffs2.c
-===================================================================
--- mtd-utils-1.1.0.orig/mkfs.jffs2.c
-+++ mtd-utils-1.1.0/mkfs.jffs2.c
-@@ -246,8 +246,7 @@
- 		e = dir->files;
- 	}
- 	while (e) {
-		/* Only bother to do the expensive strcmp on matching file types */
-		if (type == (e->sb.st_mode & S_IFMT)) {
-+		if (1) {
- 			if (S_ISDIR(e->sb.st_mode)) {
- 				int len = strlen(e->fullname);
- 
--- a/package/mtd/mtd-utils/mtd-utils-1.1.0-target-acl.patch
+++ b/package/mtd/mtd-utils/mtd-utils-1.1.0-target-acl.patch
--- a/package/multimedia/alsa-lib/Config.in
+++ b/package/multimedia/alsa-lib/Config.in
@@ -5,14 +5,3 @@ config BR2_PACKAGE_ALSA_LIB
 	  functionality to the Linux operating system.

 	  http://www.alsa-project.org/
-
-config BR2_PACKAGE_ALSA_LIB_PYTHON
-	bool "Python support for alsa-lib"
-	depends on BR2_PACKAGE_ALSA_LIB
-	depends on BR2_PACKAGE_PYTHON
-	help
-	  Add python support for alsa-lib.
-	  Python will be built and libpython will be installed
-	  in the target directory
-	  http://www.alsa-project.org/
-
--- a/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
+++ b/package/multimedia/alsa-lib/alsa-lib-1.0.18-avr32-bad-inline.patch
@@ -1,91 +0,0 @@
-diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h alsa-lib-1.0.18/src/pcm/pcm_local.h
--- alsa-lib-1.0.18-0rig//src/pcm/pcm_local.h	2009-01-31 11:02:12.000000000 +0100
-+++ alsa-lib-1.0.18/src/pcm/pcm_local.h	2009-01-31 11:03:24.000000000 +0100
-@@ -611,6 +611,13 @@
- 			   snd_pcm_hw_param_t var);
- int _snd_pcm_hw_param_set(snd_pcm_hw_params_t *params,
- 			  snd_pcm_hw_param_t var, unsigned int val, int dir);
-+
-+#if	defined(AVR32_INLINE_BUG)
-+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
-+						snd_pcm_format_t val);
-+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
-+				     snd_pcm_subformat_t val);
-+#else
- static inline int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
- 						snd_pcm_format_t val)
- {
-@@ -624,7 +631,7 @@
- 	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
- 				     (unsigned long) val, 0);
- }
-
-+#endif
- int _snd_pcm_hw_param_set_min(snd_pcm_hw_params_t *params,
- 			      snd_pcm_hw_param_t var, unsigned int val, int dir);
- int _snd_pcm_hw_param_set_max(snd_pcm_hw_params_t *params,
-diff -urN alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c alsa-lib-1.0.18/src/pcm/pcm_route.c
--- alsa-lib-1.0.18-0rig//src/pcm/pcm_route.c	2009-01-31 11:02:12.000000000 +0100
-+++ alsa-lib-1.0.18/src/pcm/pcm_route.c	2009-01-31 11:03:18.000000000 +0100
-@@ -26,6 +26,7 @@
-  *
-  */
-   
-+
- #include <byteswap.h>
- #include <math.h>
- #include "pcm_local.h"
-@@ -106,6 +107,23 @@
- 
- #endif /* DOC_HIDDEN */
- 
-+
-+#if	defined(AVR32_INLINE_BUG)
-+int _snd_pcm_hw_params_set_format(snd_pcm_hw_params_t *params,
-+						snd_pcm_format_t val)
-+{
-+	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_FORMAT,
-+				     (unsigned long) val, 0);
-+}
-+
-+int _snd_pcm_hw_params_set_subformat(snd_pcm_hw_params_t *params,
-+				     snd_pcm_subformat_t val)
-+{
-+	return _snd_pcm_hw_param_set(params, SND_PCM_HW_PARAM_SUBFORMAT,
-+				     (unsigned long) val, 0);
-+}
-+#endif
-+
- static void snd_pcm_route_convert1_zero(const snd_pcm_channel_area_t *dst_area,
- 					snd_pcm_uframes_t dst_offset,
- 					const snd_pcm_channel_area_t *src_areas ATTRIBUTE_UNUSED,
-@@ -483,6 +501,8 @@
- 				  snd_pcm_uframes_t frames,
- 				  snd_pcm_route_params_t *params)
- {
-+#if	defined(AVR32_INLINE_BUG)
-+#endif
- 	unsigned int dst_channel;
- 	snd_pcm_route_ttable_dst_t *dstp;
- 	const snd_pcm_channel_area_t *dst_area;
-@@ -551,8 +571,20 @@
- 	_snd_pcm_hw_param_set_mask(sparams, SND_PCM_HW_PARAM_ACCESS,
- 				   &saccess_mask);
- 	if (route->sformat != SND_PCM_FORMAT_UNKNOWN) {
-+#if	defined(AVR32_INLINE_BUG)
-+/* Start of  of problem */
-+#endif
- 		_snd_pcm_hw_params_set_format(sparams, route->sformat);
- 		_snd_pcm_hw_params_set_subformat(sparams, SND_PCM_SUBFORMAT_STD);
-+#if	0
-+		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_FORMAT,
-+				     (unsigned long) route->sformat, 0);
-+		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_SUBFORMAT,
-+				     (unsigned long) SND_PCM_SUBFORMAT_STD, 0);
-+#endif
-+#if	defined(AVR32_INLINE_BUG)
-+/* End of problem */
-+#endif
- 	}
- 	if (route->schannels >= 0) {
- 		_snd_pcm_hw_param_set(sparams, SND_PCM_HW_PARAM_CHANNELS,
--- a/package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch
+++ b/package/multimedia/alsa-lib/alsa-lib-1.0.18-fix-off_t-in-kernel-struct.patch
@@ -1,30 +0,0 @@
-From c821f2e7f2534ece24a10402df3f501536a09cbd Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Wed, 28 Jan 2009 15:00:35 +0100
-Subject: [PATCH] Fix off_t in kernel struct
-
-The off_t in kernel struct (for ioctls) is actually different from the
-definition of user-space off_t.  The kernel off_t is equial with long
-while user-space off_t depends on the large-file support.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
- include/sound/asound.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/sound/asound.h b/include/sound/asound.h
-index 977b2d6..62d1e57 100644
--- a/include/sound/asound.h
-+++ b/include/sound/asound.h
-@@ -402,7 +402,7 @@ struct sndrv_pcm_sw_params {
- 
- struct sndrv_pcm_channel_info {
- 	unsigned int channel;
-	off_t offset;			/* mmap offset */
-+	long offset;			/* mmap offset */
- 	unsigned int first;		/* offset to first sample in bits */
- 	unsigned int step;		/* samples distance in bits */
- };
-- 
-1.5.6.5
-
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -11,20 +11,14 @@ ALSA_LIB_CAT:=$(BZCAT)
 ALSA_LIB_BINARY:=libasound.so.2.0.0
 ALSA_LIB_TARGET_BINARY:=usr/lib/$(ALSA_LIB_BINARY)

-ALSA_LIB_CFLAGS=$(TARGET_CFLAGS)
-
 ifeq ($(BR2_arm),y)
-ALSA_LIB_CFLAGS+=-mabi=aapcs-linux
+ALSA_LIB_ABI:=-mabi=aapcs-linux
+else
+ALSA_LIB_ABI:=
 endif

-ifeq ($(BR2_avr32),y)
-ALSA_LIB_CFLAGS+=-DAVR32_INLINE_BUG
-endif
-
-ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON),y)
 ALSA_LIB_CONFIGURE_OPTS += --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_CFLAGS+=-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
-ALSA_LIB_DEPS = libpython
 else
 ALSA_LIB_CONFIGURE_OPTS += --disable-python
 endif
@@ -46,7 +40,7 @@ $(ALSA_LIB_DIR)/.configured: $(ALSA_LIB_DIR)/.unpacked
 	(cd $(ALSA_LIB_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(ALSA_LIB_CFLAGS)" \
+		CFLAGS="$(TARGET_CFLAGS) $(ALSA_LIB_ABI)" \
 		LDFLAGS="$(TARGET_LDFLAGS) -lm" \
 		./configure \
 		--target=$(GNU_TARGET_NAME) \
@@ -80,11 +74,9 @@ $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_LIB_TARGET_BINARY
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/alsa-lib/smixer/*.so
 	touch -c $@

-alsa-lib: uclibc $(ALSA_LIB_DEPS) $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
+alsa-lib: uclibc $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)

-alsa-lib-unpacked: $(ALSA_LIB_DIR)/.unpacked
-
-alsa-lib-source: $(DL_DIR)/$(ALSA_LIB_SOURCE)
+alsa-lib-source: $(DL_DIR)/$(ALSA-LIB_SOURCE)

 alsa-lib-clean:
 	rm -f $(TARGET_DIR)/$(ALSA_LIB_TARGET_BINARY)
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.arm
@@ -1,29 +0,0 @@
-When configuring alsa-utils, it will use the hosts <ncurses.h>
-See: alsa-utils <VERSION> / alsamixer/.deps/alsamicer.Po
-This will, on OpenSuSE 11.0, and possibly other distributions
-result in that the preprocessor directive:
-#define acs_map _nc_acs_map
-which is present in the Buildroot build of ncurses,
-is not executed, and the
-extern <chartype> acs_map[]; 
-declaration in the host ncurses will
-result in an undefined symbol: acs_map.
-
-This patches give up trying to force alsa-utils to use the correct
-ncurses, and just defines a byte with the needed symbol.
-
-
-diff -urN alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c alsa-utils-1.0.18/alsamixer/alsamixer.c
--- alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c	2008-10-29 13:42:11.000000000 +0100
-+++ alsa-utils-1.0.18/alsamixer/alsamixer.c	2009-01-22 23:35:29.000000000 +0100
-@@ -115,6 +115,10 @@
- #include <sys/time.h>
- 
- #include <locale.h>
-+/* Ugly hack to get rid of undefined "acs_map" */
-+/* This is caused by configure using host ncurses.h */
-+/* instead of buildroot's ncurses.h */
-+unsigned long acs_map[1];
- 
- #ifndef CURSESINC
- #include <ncurses.h>
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-acs_map.patch.avr32
@@ -1,29 +0,0 @@
-When configuring alsa-utils, it will use the hosts <ncurses.h>
-See: alsa-utils <VERSION> / alsamixer/.deps/alsamicer.Po
-This will, on OpenSuSE 11.0, and possibly other distributions
-result in that the preprocessor directive:
-#define acs_map _nc_acs_map
-which is present in the Buildroot build of ncurses,
-is not executed, and the
-extern <chartype> acs_map[]; 
-declaration in the host ncurses will
-result in an undefined symbol: acs_map.
-
-This patches give up trying to force alsa-utils to use the correct
-ncurses, and just defines a byte with the needed symbol.
-
-
-diff -urN alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c alsa-utils-1.0.18/alsamixer/alsamixer.c
--- alsa-utils-1.0.18-0rig//alsamixer/alsamixer.c	2008-10-29 13:42:11.000000000 +0100
-+++ alsa-utils-1.0.18/alsamixer/alsamixer.c	2009-01-22 23:35:29.000000000 +0100
-@@ -115,6 +115,10 @@
- #include <sys/time.h>
- 
- #include <locale.h>
-+/* Ugly hack to get rid of undefined "acs_map" */
-+/* This is caused by configure using host ncurses.h */
-+/* instead of buildroot's ncurses.h */
-+unsigned long acs_map[1];
- 
- #ifndef CURSESINC
- #include <ncurses.h>
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-fix_sysv_legacy.patch
@@ -1,20 +0,0 @@
--- a/alsactl/init_parse.c	2009-01-15 10:44:48.000000000 +0000
-+++ b/alsactl/init_parse.c	2009-01-15 10:46:41.000000000 +0000
-@@ -381,7 +381,7 @@ static int set_ctl_value(struct space *s
- 				snd_ctl_elem_value_set_integer(space->ctl_value, idx, val);
- 			} else if (items > 2 && value[items-2] == 'd' && value[items-1] == 'B') {
- 				val = strtol(value, NULL, 0) * 100;
-				if ((pos2 = index(value, '.')) != NULL) {
-+				if ((pos2 = strchr(value, '.')) != NULL) {
- 					if (isdigit(*(pos2-1)) && isdigit(*(pos2-2))) {
- 						if (val < 0)
- 							val -= strtol(pos2 + 1, NULL, 0);
-@@ -1253,7 +1253,7 @@ static char *new_root_dir(const char *fi
- 
- 	res = strdup(filename);
- 	if (res) {
-		tmp = rindex(res, '/');
-+		tmp = strrchr(res, '/');
- 		if (tmp)
- 			*tmp = '\0';
- 	}
--- a/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
+++ b/package/multimedia/alsa-utils/alsa-utils-1.0.18-remove_man.patch
@@ -1,11 +0,0 @@
--- a/alsactl/Makefile.in	2009-01-15 10:59:38.000000000 +0000
-+++ b/alsactl/Makefile.in	2009-01-15 10:59:34.000000000 +0000
-@@ -204,7 +204,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = init
-man_MANS = alsactl.1 alsactl_init.7
-+man_MANS = alsactl.1
- EXTRA_DIST = alsactl.1 alsactl_init.xml
- alsactl_SOURCES = alsactl.c state.c utils.c init_parse.c
- noinst_HEADERS = alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
--- a/package/multimedia/alsa-utils/alsa-utils.mk
+++ b/package/multimedia/alsa-utils/alsa-utils.mk
@@ -16,8 +16,7 @@ $(DL_DIR)/$(ALSA_UTILS_SOURCE):

 $(ALSA_UTILS_DIR)/.unpacked: $(DL_DIR)/$(ALSA_UTILS_SOURCE)
 	$(ALSA_UTILS_CAT) $(DL_DIR)/$(ALSA_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch
-	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch.$(ARCH)
+	toolchain/patch-kernel.sh $(ALSA_UTILS_DIR) package/multimedia/alsa-utils/ alsa-utils-$(ALSA_UTILS_VERSION)\*.patch\*
 	$(CONFIG_UPDATE) $(ALSA_UTILS_DIR)
 	touch $@

@@ -74,8 +73,6 @@ $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY): $(ALSA_UTILS_DIR)/$(ALSA_UTILS_BINARY

 alsa-utils: uclibc alsa-lib ncurses $(if $(BR2_PACKAGE_LIBINTL),libintl) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(TARGET_DIR)/$(ALSA_UTILS_TARGET_BINARY)

-alsa-utils-unpacked: $(ALSA_UTILS_DIR)/.unpacked
-
 alsa-utils-source: $(DL_DIR)/$(ALSA_UTILS_SOURCE)

 alsa-utils-clean:
--- a/package/multimedia/asterisk/Config.in
+++ b/package/multimedia/asterisk/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ASTERISK
 	bool "asterisk"
-	depends on BROKEN
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ZLIB
 	depends on BR2_PACKAGE_OPENSSL
@@ -11,4 +10,3 @@ config BR2_PACKAGE_ASTERISK
 comment "asterisk	- disabled (required openssl and mpg123)"
 	depends on !BR2_PACKAGE_OPENSSL || ! BR2_PACKAGE_MPG123

-
--- a/package/multimedia/asterisk/asterisk_no_res_ninit.patch
+++ b/package/multimedia/asterisk/asterisk_no_res_ninit.patch
@@ -0,0 +1,12 @@
+diff -ur /tmp/asterisk-1.2.0-beta1/dns.c asterisk-1.2.0-beta1/dns.c
+--- /tmp/asterisk-1.2.0-beta1/dns.c	2005-08-14 04:23:33.000000000 +0200
+++ asterisk-1.2.0-beta1/dns.c	2005-08-31 09:42:36.000000000 +0200
+@@ -157,7 +157,7 @@
+ 	return 0;
+ }
+ 
+-#if defined(res_ninit)
+#if (defined(res_ninit) && !defined(__UCLIBC__))
+ #define HAS_RES_NINIT
+ #else
+ AST_MUTEX_DEFINE_STATIC(res_lock);
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -17,7 +17,9 @@ GST_PLUGINS_BASE_CONF_OPT = \
 		--disable-xshm \
 		--disable-oggtest \
 		--disable-vorbistest \
-		--disable-freetypetest
+		--disable-freetypetest \
+		--disable-gtk-doc \
+		--without-html-dir

 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil

--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -10,30 +10,6 @@ menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD

 if BR2_PACKAGE_GST_PLUGINS_GOOD

-config BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG
-	bool "jpeg (JPEG support)"
-	select BR2_PACKAGE_JPEG
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PNG
-	bool "png (PNG support)"
-	select BR2_PACKAGE_LIBPNG
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2
-	bool "bz2 support"
-	depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA
-	select BR2_PACKAGE_BZIP2
-	help
-	  Enable bz2 support for the following plugins:
-	  matroska
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB
-	bool "zlib support"
-	depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_QTDEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA
-	select BR2_PACKAGE_ZLIB
-	help
-	  Enable zlib support for the following plugins:
-	  id3demux, qtdemux, matroska
-
 comment "dependency-less plugins"

 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER
@@ -143,13 +119,4 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE
 	bool "wavparse (*.wav audio)"
 	default y

-comment "plugins with external dependencies"
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX
-	bool "annodex (XML Library)"
-	select BR2_PACKAGE_LIBXML2
-
-config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
-	bool "ossaudio (OSS audio)"
-
 endif
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -23,38 +23,11 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 		--disable-esdtest \
 		--disable-shout2 \
 		--disable-shout2test \
-		--disable-esd 
+		--disable-gtk-doc \
+		--without-html-dir

 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base

-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
-GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-jpeg
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-libpng
-GST_PLUGINS_GOOD_DEPENDENCIES += libpng
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-libpng
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-bz2
-GST_PLUGINS_GOOD_DEPENDENCIES += bzip2
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-bz2
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-zlib
-GST_PLUGINS_GOOD_DEPENDENCIES += zlib
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-zlib
-endif
-
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-videofilter
 else
@@ -171,7 +144,6 @@ endif

 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-matroska
-GST_PLUGINS_GOOD_DEPENDENCIES += zlib bzip2
 else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-matroska
 endif
@@ -266,17 +238,4 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-wavparse
 endif

-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-annodex
-GST_PLUGINS_GOOD_DEPENDENCIES += libxml2
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-annodex
-endif
-
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y)
-GST_PLUGINS_GOOD_CONF_OPT += --enable-oss
-else
-GST_PLUGINS_GOOD_CONF_OPT += --disable-oss
-endif
-
 $(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-good))
--- a/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/package/multimedia/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -9,7 +9,9 @@ GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly

 GST_PLUGINS_UGLY_CONF_OPT = \
 		$(DISABLE_NLS) \
-		--disable-examples
+		--disable-examples \
+		--disable-gtk-doc \
+		--without-html-dir

 GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base

--- a/package/multimedia/gstreamer/gstreamer.mk
+++ b/package/multimedia/gstreamer/gstreamer.mk
@@ -19,9 +19,13 @@ GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
 endif

 GSTREAMER_CONF_OPT = \
+		$(DISABLE_NLS) \
+		$(DISABLE_LARGEFILE) \
 		--disable-examples \
 		--disable-tests \
-		--disable-failing-tests
+		--disable-failing-tests \
+		--disable-gtk-doc \
+		--without-html-dir

 GSTREAMER_DEPENDENCIES = libglib2 libxml2 pkgconfig

--- a/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
+++ b/package/multimedia/libmad/libmad-0.15.1b-remove-deprecated-cflags.patch
@@ -1,33 +0,0 @@
-libmad: remove deprecated cflags (-fforce-mem)
-
-fforce-mem has long been deprecated, and is completely removed from
-gcc 4.3.x on.
---
- configure    |    1 -
- configure.ac |    1 -
- 2 files changed, 2 deletions(-)
-
-Index: libmad-0.15.1b/configure.ac
-===================================================================
--- libmad-0.15.1b.orig/configure.ac
-+++ libmad-0.15.1b/configure.ac
-@@ -140,7 +140,6 @@
-     case "$optimize" in
- 	-O|"-O "*)
- 	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
- 	    optimize="$optimize -fforce-addr"
- 	    : #x optimize="$optimize -finline-functions"
- 	    : #- optimize="$optimize -fstrength-reduce"
-Index: libmad-0.15.1b/configure
-===================================================================
--- libmad-0.15.1b.orig/configure
-+++ libmad-0.15.1b/configure
-@@ -19099,7 +19099,6 @@
-     case "$optimize" in
- 	-O|"-O "*)
- 	    optimize="-O"
-	    optimize="$optimize -fforce-mem"
- 	    optimize="$optimize -fforce-addr"
- 	    : #x optimize="$optimize -finline-functions"
- 	    : #- optimize="$optimize -fstrength-reduce"
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -108,8 +108,7 @@ $(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured
 	touch $@

 $(TARGET_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs
-	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \
-		$(if $(BR2_STRIP_none),install,install-strip)
+	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) install
 	touch $@

 $(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so
--- a/package/multimedia/mpg123/Config.in
+++ b/package/multimedia/mpg123/Config.in
@@ -5,3 +5,8 @@ config BR2_PACKAGE_MPG123
 	  MPEG 1.0/2.0 layers 1, 2 and 3.

 	  http://www.mpg123.de/
+
+config BR2_PACKAGE_MPG123_ALSA
+	bool
+	default y
+	depends on BR2_PACKAGE_ALSA_LIB
--- a/Show More
+++ b/Show More