Update for 2010.02

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

CHANGES

@@ -1,3 +1,49 @@
+2010.02, Release February 26th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: avahi, busybox, cramfs, ipsec-tools, libcgicc,
+	libgtk2, libraw1394, madplay, netsnmp, pango, squashfs, sylpheed, qt,
+	xfont_font-util
+
+	Removed packages: hostap, openmotif, xpdf
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#165: openmotif does not build
+	#1147: Remove obsolete hostap package
+	#1183: make source fails to download gmp, mpfr and patches
+
+2010.02-rc2, Released February 23th, 2010:
+
+	Fixes all over the tree and new features.
+
+	New packages: intltool
+
+	Updated/fixed packages: ace_of_penguins, alsa-lib, alsa-utils, argus,
+	at, automake, ccache, dosfstools, e2fsprogs, flex, gob2, gmpc,
+	gst-plugins-good, imagemagick, iw, kexec, libeXosip, libgtk2,
+	libpcap, libpng, libsoup, libxcb, libxml-parser-perl, libxml2,
+	libxslt, lvm2, matchbox, mplayer, rsync, rubix, shared-mime-info,
+	tcl, webkit, xapp_mkfontscale, xfont_encodings, xfont_font-util,
+	xlib_libfontenc, xproto_trapproto, zlib
+
+	Removed package: xboard
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#335: atk looks for the path to the gnome library on the host
+	#355: Please update WebKit - it doesn't compile!
+	#453: libglib2 autoreconf
+	#457: e2fsprogs link problem
+	#459: libgtk2 autoreconf
+	#469: build of libgtk2 for host incorrectly assumes that X.org ...
+	#671: Bash fails to build when building buildront on Ubuntu 9.04
+	#711: WebKit host dependencies problems
+	#821: cp: illegal operation
+	#1039: Not compiled on ubuntu karmic
+	#1069: [PATCH] The AT91BOOTSTRAP makefile contains a typo
+
 2010.02-rc1, Released February 9th, 2010:
 
 	Fixes all over the tree and new features.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2010.02-rc1"
+	default "2010.02"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"

Makefile

@@ -1,7 +1,7 @@
 # Makefile for buildroot2
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
-# Copyright (C) 2006-2009 by the Buildroot developers <buildroot@uclibc.org>
+# Copyright (C) 2006-2010 by the Buildroot developers <buildroot@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -371,6 +371,7 @@ ifneq ($(BR2_TOOLCHAIN_EXTERNAL),y)
 endif
 endif
 	@mkdir -p $(STAGING_DIR)/usr/include
+	@mkdir -p $(STAGING_DIR)/usr/bin
 
 $(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)

configs/at91sam9260pf_defconfig

@@ -58,7 +58,7 @@ BR2_SVN="svn co"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="/usr/local/install/downloads"
+BR2_DL_DIR="$(TOPDIR)/dl"
 
 #
 # Mirrors and Download locations

docs/copyright.txt

@@ -1,6 +1,6 @@
 
 The code and graphics on this website (and it's mirror sites, if any) are
-Copyright (c) 1999-2005 by Erik Andersen, 2006-2009 The Buildroot
+Copyright (c) 1999-2005 by Erik Andersen, 2006-2010 The Buildroot
 developers. All rights reserved.
 
 Documents on this Web site including their graphical elements, design, and

docs/download.html

@@ -6,22 +6,22 @@
 
 <p>
 
-The latest stable release is <b>2009.11</b>, which can be downloaded
+The latest stable release is <b>2010.02</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2009.11.tar.gz">buildroot-2009.11.tar.gz</a>
+<a href="/downloads/buildroot-2010.02.tar.gz">buildroot-2010.02.tar.gz</a>
 or
-<a href="/downloads/buildroot-2009.11.tar.bz2">buildroot-2009.11.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.02.tar.bz2">buildroot-2010.02.tar.bz2</a>.
 <p>
-
-The latest release candidate is <b>2010.02-rc1</b>, which can be
+<!--
+The latest release candidate is <b>2010.02-rc2</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2010.02-rc1.tar.gz">buildroot-2010.02-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2010.02-rc2.tar.gz">buildroot-2010.02-rc2.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.02-rc1.tar.bz2">buildroot-2010.02-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.02-rc2.tar.bz2">buildroot-2010.02-rc2.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 

docs/footer.html

@@ -9,7 +9,8 @@
 
     <p>
     <font face="arial, helvetica, sans-serif" size="-1">
-	<a HREF="/copyright.txt">Copyright &copy; 1999-2009 Erik Andersen</a>
+	<a HREF="/copyright.txt">Copyright &copy; 1999-2005 Erik Andersen,
+	2006-2010 The Buildroot developers</a>
 	<br>
 	Mail all comments, insults, suggestions and bribes to
 	<br>

docs/news.html

@@ -5,6 +5,27 @@
 <p>
 
 <ul>
+  <li><b>26 February 2010 -- 2010.02 released</b>
+
+    <p>The stable 2010.02 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.02">CHANGES</a>
+    file for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2010.02.tar.bz2">2010.02
+    release</a>.</p>
+
+  <li><b>23 February 2010 -- 2010.02-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.02_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2010.02-rc2.tar.bz2">2010.02-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>9 February 2010 -- 2010.02-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the

package/Config.in

@@ -46,6 +46,7 @@ source "package/pkg-config/Config.in"
 source "package/readline/Config.in"
 source "package/valgrind/Config.in"
 source "package/pcre/Config.in"
+source "package/intltool/Config.in"
 
 comment "Other stuff"
 source "package/at/Config.in"
@@ -137,7 +138,6 @@ source "package/dnsmasq/Config.in"
 source "package/dropbear/Config.in"
 source "package/ethtool/Config.in"
 source "package/haserl/Config.in"
-source "package/hostap/Config.in"
 source "package/hostapd/Config.in"
 source "package/ifplugd/Config.in"
 source "package/iperf/Config.in"
@@ -341,7 +341,6 @@ source "package/gtk2-engines/Config.in"
 source "package/gtk2-themes/Config.in"
 source "package/libsexy/Config.in"
 source "package/fltk/Config.in"
-source "package/openmotif/Config.in"
 source "package/fontconfig/Config.in"
 source "package/freetype/Config.in"
 source "package/tslib/Config.in"
@@ -369,7 +368,6 @@ source "package/sylpheed/Config.in"
 source "package/synergy/Config.in"
 source "package/torsmo/Config.in"
 source "package/x11vnc/Config.in"
-source "package/xpdf/Config.in"
 source "package/xstroke/Config.in"
 source "package/xvkbd/Config.in"
 endmenu
@@ -412,6 +410,7 @@ source "package/ezxml/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/xerces/Config.in"
+source "package/libxml-parser-perl/Config.in"
 endmenu
 
 # java support

package/Makefile.in

@@ -228,6 +228,8 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
+		PERLLIB="$(HOST_DIR)/usr/lib/perl" \
+		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib" \
 		STAGING_DIR="$(STAGING_DIR)"
 
 TARGET_CONFIGURE_ENV=\
@@ -236,7 +238,9 @@ TARGET_CONFIGURE_ENV=\
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FCFLAGS="$(TARGET_FCFLAGS)" \
 
-TARGET_MAKE_ENV=PATH=$(TARGET_PATH)
+TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
+		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
+		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
 HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		AR="$(HOSTAR)" \
@@ -274,11 +278,14 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
 		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
+		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
 HOST_MAKE_ENV=PATH=$(HOST_PATH) \
+		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
+		PERLLIB="$(HOST_DIR)/usr/lib/perl"
 
 
 #######################################################################

package/argus/argus-3.0.0.rc.34-01-use-pcap-header.patch

@@ -0,0 +1,27 @@
+Instead of hardcoding a wrong prototype for a libcap function, include
+the correct header.
+
+Index: argus-3.0.0.rc.34/argus/ArgusSource.c
+===================================================================
+--- argus-3.0.0.rc.34.orig/argus/ArgusSource.c	2010-02-09 22:57:21.000000000 +0100
++++ argus-3.0.0.rc.34/argus/ArgusSource.c	2010-02-09 22:57:29.000000000 +0100
+@@ -53,6 +53,7 @@
+ #define PPP_HDRLEN      4       /* length of PPP header */
+ #endif
+ 
++#include <pcap.h>
+ 
+ void ArgusGetInterfaceStatus (struct ArgusSourceStruct *src);
+ 
+Index: argus-3.0.0.rc.34/argus/ArgusSource.h
+===================================================================
+--- argus-3.0.0.rc.34.orig/argus/ArgusSource.h	2010-02-09 22:57:35.000000000 +0100
++++ argus-3.0.0.rc.34/argus/ArgusSource.h	2010-02-09 22:57:54.000000000 +0100
+@@ -381,7 +381,6 @@
+ 
+ int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
+ 
+-extern char *bpf_image(struct bpf_insn *, int);
+ 
+ 
+ #else /* defined(ArgusSource) */

package/at/at-3.1.12-0007-include-config-h.patch

@@ -0,0 +1,16 @@
+Make sure to include config.h so that NEEDS_* macros are properly
+taken into account. This was a problem for NEEDS_YYWRAP, which was set
+to 1 in config.h, but the corresponding code wasn't compiled in.
+
+Index: at-3.1.12/parsetime.l
+===================================================================
+--- at-3.1.12.orig/parsetime.l	2010-02-10 00:17:46.000000000 +0100
++++ at-3.1.12/parsetime.l	2010-02-10 00:18:07.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include <time.h>
+ #include "y.tab.h"
+ #include "parsetime.h"
++#include "config.h"
+ 
+ char *last_token = NULL;
+ char **my_argv;

package/automake/automake.mk

@@ -11,10 +11,16 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
 AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 endif
 
-AUTOMAKE_DEPENDENCIES = autoconf microperl
+AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl
 
 HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
 
+define GTK_DOC_M4_INSTALL
+ $(INSTALL) -m 0644 package/automake/gtk-doc.m4 $(STAGING_DIR)/usr/share/aclocal/
+endef
+
+HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL
+
 $(eval $(call AUTOTARGETS,package,automake))
 $(eval $(call AUTOTARGETS,package,automake,host))
 

package/automake/gtk-doc.m4

@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+  dnl check for tools we added during development
+  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
+  dnl for overriding the documentation installation directory
+  AC_ARG_WITH([html-dir],
+    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+    [with_html_dir='${datadir}/gtk-doc/html'])
+  HTML_DIR="$with_html_dir"
+  AC_SUBST([HTML_DIR])
+
+  dnl enable/disable documentation building
+  AC_ARG_ENABLE([gtk-doc],
+    AS_HELP_STRING([--enable-gtk-doc],
+                   [use gtk-doc to build documentation [[default=no]]]),,
+    [enable_gtk_doc=no])
+
+  if test x$enable_gtk_doc = xyes; then
+    ifelse([$1],[],
+      [PKG_CHECK_EXISTS([gtk-doc],,
+                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+      [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+  fi
+
+  AC_MSG_CHECKING([whether to build gtk-doc documentation])
+  AC_MSG_RESULT($enable_gtk_doc)
+
+  dnl enable/disable output formats
+  AC_ARG_ENABLE([gtk-doc-html],
+    AS_HELP_STRING([--enable-gtk-doc-html],
+                   [build documentation in html format [[default=yes]]]),,
+    [enable_gtk_doc_html=yes])
+    AC_ARG_ENABLE([gtk-doc-pdf],
+      AS_HELP_STRING([--enable-gtk-doc-pdf],
+                     [build documentation in pdf format [[default=no]]]),,
+      [enable_gtk_doc_pdf=no])
+
+  if test -z "$GTKDOC_MKPDF"; then
+    enable_gtk_doc_pdf=no
+  fi
+
+
+  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])

package/avahi/avahi.mk

@@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
 		--with-autoipd-user=default \
 		--with-autoipd-group=default
 
-AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext)
+AVAHI_DEPENDENCIES = $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool
 
 ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)
 AVAHI_DEPENDENCIES += libdaemon

package/busybox/busybox-1.16.0-ash.patch

@@ -0,0 +1,35 @@
+diff -urpN busybox-1.16.0/shell/ash.c busybox-1.16.0-ash/shell/ash.c
+--- busybox-1.16.0/shell/ash.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-ash/shell/ash.c	2010-02-21 01:52:22.000000000 +0100
+@@ -4539,7 +4539,7 @@ forkchild(struct job *jp, union node *n,
+ 	if (mode == FORK_NOJOB          /* is it `xxx` ? */
+ 	 && n && n->type == NCMD        /* is it single cmd? */
+ 	/* && n->ncmd.args->type == NARG - always true? */
+-	 && strcmp(n->ncmd.args->narg.text, "trap") == 0
++	 && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "trap") == 0
+ 	 && n->ncmd.args->narg.next == NULL /* "trap" with no arguments */
+ 	/* && n->ncmd.args->narg.backquote == NULL - do we need to check this? */
+ 	) {
+@@ -4627,7 +4627,7 @@ forkchild(struct job *jp, union node *n,
+ 	}
+ #if JOBS
+ 	if (n && n->type == NCMD
+-	 && strcmp(n->ncmd.args->narg.text, "jobs") == 0
++	 && n->ncmd.args && strcmp(n->ncmd.args->narg.text, "jobs") == 0
+ 	) {
+ 		TRACE(("Job hack\n"));
+ 		/* "jobs": we do not want to clear job list for it,
+diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right
+--- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.right	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.right	2010-02-21 01:52:22.000000000 +0100
+@@ -0,0 +1,3 @@
++Test 1
++Test 2
++Done
+diff -urpN busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests
+--- busybox-1.16.0/shell/ash_test/ash-misc/nulltick1.tests	1970-01-01 01:00:00.000000000 +0100
++++ busybox-1.16.0-ash/shell/ash_test/ash-misc/nulltick1.tests	2010-02-21 01:52:22.000000000 +0100
+@@ -0,0 +1,3 @@
++echo Test ` ` 1
++echo Test `</dev/null` 2
++echo Done

package/busybox/busybox-1.16.0-compat.patch

@@ -0,0 +1,317 @@
+diff -urpN busybox-1.16.0/coreutils/fsync.c busybox-1.16.0-compat/coreutils/fsync.c
+--- busybox-1.16.0/coreutils/fsync.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-compat/coreutils/fsync.c	2010-02-21 01:54:07.000000000 +0100
+@@ -7,6 +7,9 @@
+  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+  */
+ #include "libbb.h"
++#ifndef O_NOATIME
++# define O_NOATIME 0
++#endif
+ 
+ /* This is a NOFORK applet. Be very careful! */
+ 
+diff -urpN busybox-1.16.0/editors/diff.c busybox-1.16.0-compat/editors/diff.c
+--- busybox-1.16.0/editors/diff.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-compat/editors/diff.c	2010-02-21 01:54:07.000000000 +0100
+@@ -227,10 +227,12 @@ struct cand {
+ 
+ static int search(const int *c, int k, int y, const struct cand *list)
+ {
++	int i, j;
++
+ 	if (list[c[k]].y < y)	/* quick look for typical case */
+ 		return k + 1;
+ 
+-	for (int i = 0, j = k + 1;;) {
++	for (i = 0, j = k + 1;;) {
+ 		const int l = (i + j) >> 1;
+ 		if (l > i) {
+ 			const int t = list[c[l]].y;
+@@ -265,11 +267,13 @@ static void stone(const int *a, int n, c
+ 	int clistlen = 100;
+ 	int k = 0;
+ 	struct cand *clist = xzalloc(clistlen * sizeof(clist[0]));
++	struct cand cand;
++	struct cand *q;
+ 	int *klist = xzalloc((n + 2) * sizeof(klist[0]));
+ 	/*clist[0] = (struct cand){0}; - xzalloc did it */
+ 	/*klist[0] = 0; */
+ 
+-	for (struct cand cand = {1}; cand.x <= n; cand.x++) {
++	for (cand.x = 1; cand.x <= n; cand.x++) {
+ 		int j = a[cand.x], oldl = 0;
+ 		unsigned numtries = 0;
+ 		if (j == 0)
+@@ -303,7 +307,7 @@ static void stone(const int *a, int n, c
+ 		} while ((cand.y = b[++j]) > 0 && numtries < bound);
+ 	}
+ 	/* Unravel */
+-	for (struct cand *q = clist + klist[k]; q->y; q = clist + q->pred)
++	for (q = clist + klist[k]; q->y; q = clist + q->pred)
+ 		J[q->x + pref] = q->y + pref;
+ 	free(klist);
+ 	free(clist);
+@@ -348,10 +352,11 @@ static void equiv(struct line *a, int n,
+ 
+ static void unsort(const struct line *f, int l, int *b)
+ {
++	int i;
+ 	int *a = xmalloc((l + 1) * sizeof(a[0]));
+-	for (int i = 1; i <= l; i++)
++	for (i = 1; i <= l; i++)
+ 		a[f[i].serial] = f[i].value;
+-	for (int i = 1; i <= l; i++)
++	for (i = 1; i <= l; i++)
+ 		b[i] = a[i];
+ 	free(a);
+ }
+@@ -370,12 +375,13 @@ static int line_compar(const void *a, co
+ 
+ static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch)
+ {
+-	for (int i = a; i <= b; i++) {
++	int i, j, col;
++	for (i = a; i <= b; i++) {
+ 		seek_ft(ft, ix[i - 1]);
+ 		putchar(ch);
+ 		if (option_mask32 & FLAG(T))
+ 			putchar('\t');
+-		for (int j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
++		for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
+ 			int c = fgetc(ft->ft_fp);
+ 			if (c == EOF) {
+ 				printf("\n\\ No newline at end of file\n");
+@@ -410,19 +416,20 @@ static NOINLINE int *create_J(FILE_and_p
+ {
+ 	int *J, slen[2], *class, *member;
+ 	struct line *nfile[2], *sfile[2];
+-	int pref = 0, suff = 0;
++	int pref = 0, suff = 0, i, j, delta;
+ 
+ 	/* Lines of both files are hashed, and in the process
+ 	 * their offsets are stored in the array ix[fileno]
+ 	 * where fileno == 0 points to the old file, and
+ 	 * fileno == 1 points to the new one.
+ 	 */
+-	for (int i = 0; i < 2; i++) {
++	for (i = 0; i < 2; i++) {
+ 		unsigned hash;
+ 		token_t tok;
+ 		size_t sz = 100;
+ 		nfile[i] = xmalloc((sz + 3) * sizeof(nfile[i][0]));
+ 		/* ft gets here without the correct position, cant use seek_ft */
++		ft[i].ft_pos = 0;
+ 		fseeko(ft[i].ft_fp, 0, SEEK_SET);
+ 
+ 		nlen[i] = 0;
+@@ -460,11 +467,11 @@ start:
+ 			nlen[i]--;
+ 		/* Now we copy the line offsets into ix */
+ 		ix[i] = xmalloc((nlen[i] + 2) * sizeof(ix[i][0]));
+-		for (int j = 0; j < nlen[i] + 1; j++)
++		for (j = 0; j < nlen[i] + 1; j++)
+ 			ix[i][j] = nfile[i][j].offset;
+ 	}
+ 
+-	/* lenght of prefix and suffix is calculated */
++	/* length of prefix and suffix is calculated */
+ 	for (; pref < nlen[0] && pref < nlen[1] &&
+ 	       nfile[0][pref + 1].value == nfile[1][pref + 1].value;
+ 	       pref++);
+@@ -475,10 +482,10 @@ start:
+ 	 * the result being sorted and stored in sfile[fileno],
+ 	 * and their sizes are stored in slen[fileno]
+ 	 */
+-	for (int j = 0; j < 2; j++) {
++	for (j = 0; j < 2; j++) {
+ 		sfile[j] = nfile[j] + pref;
+ 		slen[j] = nlen[j] - pref - suff;
+-		for (int i = 0; i <= slen[j]; i++)
++		for (i = 0; i <= slen[j]; i++)
+ 			sfile[j][i].serial = i;
+ 		qsort(sfile[j] + 1, slen[j], sizeof(*sfile[j]), line_compar);
+ 	}
+@@ -494,7 +501,7 @@ start:
+ 	free(nfile[1]);
+ 
+ 	class = xmalloc((slen[0] + 1) * sizeof(class[0]));
+-	for (int i = 1; i <= slen[0]; i++) /* Unsorting */
++	for (i = 1; i <= slen[0]; i++) /* Unsorting */
+ 		class[sfile[0][i].serial] = sfile[0][i].value;
+ 	free(nfile[0]);
+ #else
+@@ -512,7 +519,7 @@ start:
+ 	 * are initialized with 0 (no matches), so that function stone can
+ 	 * then assign them their right values
+ 	 */
+-	for (int i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
++	for (i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
+ 		J[i] = i <= pref            ?  i :
+ 		       i > (nlen[0] - suff) ? (i + delta) : 0;
+ 	/* Here the magic is performed */
+@@ -526,14 +533,14 @@ start:
+ 	 * which, due to limitations intrinsic to any hashing algorithm,
+ 	 * are different but ended up confounded as the same
+ 	 */
+-	for (int i = 1; i <= nlen[0]; i++) {
++	for (i = 1; i <= nlen[0]; i++) {
+ 		if (!J[i])
+ 			continue;
+ 
+ 		seek_ft(&ft[0], ix[0][i - 1]);
+ 		seek_ft(&ft[1], ix[1][J[i] - 1]);
+ 
+-		for (int j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
++		for (j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
+ 			token_t tok0 = 0, tok1 = 0;
+ 			do {
+ 				tok0 = read_token(&ft[0], tok0);
+@@ -555,13 +562,18 @@ static bool diff(FILE* fp[2], char *file
+ {
+ 	int nlen[2];
+ 	off_t *ix[2];
+-	FILE_and_pos_t ft[2] = { { fp[0] }, { fp[1] } };
+-	int *J = create_J(ft, nlen, ix);
+-
+-	bool anychange = false;
++	FILE_and_pos_t ft[2];
+ 	typedef struct { int a, b; } vec_t[2];
+ 	vec_t *vec = NULL;
+-	int i = 1, idx = -1;
++	int i = 1, j, k, idx = -1;
++	bool anychange = false;
++	int *J;
++
++	ft[0].ft_fp = fp[0];
++	ft[1].ft_fp = fp[1];
++	/* note that ft[i].ft_pos is unintitalized, create_J()
++	 * must not assume otherwise */
++	J = create_J(ft, nlen, ix);
+ 
+ 	do {
+ 		bool nonempty = false;
+@@ -596,8 +608,8 @@ static bool diff(FILE* fp[2], char *file
+ 					break;
+ 				}
+ 
+-				for (int j = 0; j < 2; j++)
+-					for (int k = v[j].a; k < v[j].b; k++)
++				for (j = 0; j < 2; j++)
++					for (k = v[j].a; k < v[j].b; k++)
+ 						nonempty |= (ix[j][k+1] - ix[j][k] != 1);
+ 
+ 				vec = xrealloc_vector(vec, 6, ++idx);
+@@ -612,6 +624,7 @@ static bool diff(FILE* fp[2], char *file
+ 		if (idx < 0 || ((option_mask32 & FLAG(B)) && !nonempty))
+ 			goto cont;
+ 		if (!(option_mask32 & FLAG(q))) {
++			int lowa;
+ 			vec_t span, *cvp = vec;
+ 
+ 			if (!anychange) {
+@@ -621,7 +634,7 @@ static bool diff(FILE* fp[2], char *file
+ 			}
+ 
+ 			printf("@@");
+-			for (int j = 0; j < 2; j++) {
++			for (j = 0; j < 2; j++) {
+ 				int a = span[j].a = MAX(1, (*cvp)[j].a - opt_U_context);
+ 				int b = span[j].b = MIN(nlen[j], vec[idx][j].b + opt_U_context);
+ 
+@@ -635,12 +648,12 @@ static bool diff(FILE* fp[2], char *file
+ 			 * Output changes in "unified" diff format--the old and new lines
+ 			 * are printed together.
+ 			 */
+-			for (int lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
++			for (lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
+ 				bool end = cvp > &vec[idx];
+ 				fetch(&ft[0], ix[0], lowa, end ? span[0].b : (*cvp)[0].a - 1, ' ');
+ 				if (end)
+ 					break;
+-				for (int j = 0; j < 2; j++)
++				for (j = 0; j < 2; j++)
+ 					fetch(&ft[j], ix[j], (*cvp)[j].a, (*cvp)[j].b, j ? '+' : '-');
+ 			}
+ 		}
+@@ -660,9 +673,9 @@ static int diffreg(char *file[2])
+ {
+ 	FILE *fp[2] = { stdin, stdin };
+ 	bool binary = false, differ = false;
+-	int status = STATUS_SAME;
++	int status = STATUS_SAME, i;
+ 
+-	for (int i = 0; i < 2; i++) {
++	for (i = 0; i < 2; i++) {
+ 		int fd = open_or_warn_stdin(file[i]);
+ 		if (fd == -1)
+ 			goto out;
+@@ -688,7 +701,7 @@ static int diffreg(char *file[2])
+ 		const size_t sz = COMMON_BUFSIZE / 2;
+ 		char *const buf0 = bb_common_bufsiz1;
+ 		char *const buf1 = buf0 + sz;
+-		int i, j;
++		int j, k;
+ 		i = fread(buf0, 1, sz, fp[0]);
+ 		j = fread(buf1, 1, sz, fp[1]);
+ 		if (i != j) {
+@@ -697,7 +710,7 @@ static int diffreg(char *file[2])
+ 		}
+ 		if (i == 0)
+ 			break;
+-		for (int k = 0; k < i; k++) {
++		for (k = 0; k < i; k++) {
+ 			if (!buf0[k] || !buf1[k])
+ 				binary = true;
+ 			if (buf0[k] != buf1[k])
+@@ -771,9 +784,10 @@ static int FAST_FUNC skip_dir(const char
+ static void diffdir(char *p[2], const char *s_start)
+ {
+ 	struct dlist list[2];
++	int i;
+ 
+ 	memset(&list, 0, sizeof(list));
+-	for (int i = 0; i < 2; i++) {
++	for (i = 0; i < 2; i++) {
+ 		/*list[i].s = list[i].e = 0; - memset did it */
+ 		/*list[i].dl = NULL; */
+ 
+@@ -815,7 +829,7 @@ static void diffdir(char *p[2], const ch
+ 		else {
+ 			char *fullpath[2], *path[2]; /* if -N */
+ 
+-			for (int i = 0; i < 2; i++) {
++			for (i = 0; i < 2; i++) {
+ 				if (pos == 0 || i == k) {
+ 					path[i] = fullpath[i] = concat_path_file(p[i], dp[i]);
+ 					stat(fullpath[i], &stb[i]);
+@@ -883,7 +897,7 @@ static const char diff_longopts[] ALIGN1
+ int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int diff_main(int argc UNUSED_PARAM, char **argv)
+ {
+-	int gotstdin = 0;
++	int gotstdin = 0, i;
+ 	char *file[2], *s_start = NULL;
+ 	llist_t *L_arg = NULL;
+ 
+@@ -900,7 +914,7 @@ int diff_main(int argc UNUSED_PARAM, cha
+ 	while (L_arg)
+ 		label[!!label[0]] = llist_pop(&L_arg);
+ 	xfunc_error_retval = 2;
+-	for (int i = 0; i < 2; i++) {
++	for (i = 0; i < 2; i++) {
+ 		file[i] = argv[i];
+ 		/* Compat: "diff file name_which_doesnt_exist" exits with 2 */
+ 		if (LONE_DASH(file[i])) {
+diff -urpN busybox-1.16.0/miscutils/fbsplash.c busybox-1.16.0-compat/miscutils/fbsplash.c
+--- busybox-1.16.0/miscutils/fbsplash.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-compat/miscutils/fbsplash.c	2010-02-21 01:54:07.000000000 +0100
+@@ -301,7 +301,7 @@ static void fb_drawimage(void)
+  */
+ static void init(const char *cfg_filename)
+ {
+-	static const char const param_names[] ALIGN1 =
++	static const char param_names[] ALIGN1 =
+ 		"BAR_WIDTH\0" "BAR_HEIGHT\0"
+ 		"BAR_LEFT\0" "BAR_TOP\0"
+ 		"BAR_R\0" "BAR_G\0" "BAR_B\0"

package/busybox/busybox-1.16.0-defconfig.patch

@@ -0,0 +1,438 @@
+diff -urpN busybox-1.16.0/scripts/defconfig busybox-1.16.0-defconfig/scripts/defconfig
+--- busybox-1.16.0/scripts/defconfig	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-defconfig/scripts/defconfig	2010-02-21 01:53:15.000000000 +0100
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Busybox version: 1.15.0.svn
+-# Fri Aug 21 00:14:11 2009
++# Busybox version: 1.16.0
++# Wed Jan 27 20:00:00 2010
+ #
+ CONFIG_HAVE_DOT_CONFIG=y
+ 
+@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
+ #
+ # CONFIG_DESKTOP is not set
+ # CONFIG_EXTRA_COMPAT is not set
++CONFIG_INCLUDE_SUSv2=y
++# CONFIG_USE_PORTABLE_CODE is not set
+ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+ # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+ # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+@@ -22,7 +24,7 @@ CONFIG_FEATURE_VERBOSE_USAGE=y
+ CONFIG_FEATURE_COMPRESS_USAGE=y
+ CONFIG_FEATURE_INSTALLER=y
+ CONFIG_LOCALE_SUPPORT=y
+-# CONFIG_FEATURE_ASSUME_UNICODE is not set
++CONFIG_FEATURE_ASSUME_UNICODE=y
+ # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+ CONFIG_LONG_OPTS=y
+ CONFIG_FEATURE_DEVPTS=y
+@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
+ CONFIG_NO_DEBUG_LIB=y
+ # CONFIG_DMALLOC is not set
+ # CONFIG_EFENCE is not set
+-CONFIG_INCLUDE_SUSv2=y
+ 
+ #
+ # Installation Options
+@@ -120,10 +121,11 @@ CONFIG_FEATURE_CPIO_P=y
+ # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+ CONFIG_GUNZIP=y
+ CONFIG_GZIP=y
++CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+ CONFIG_LZOP=y
+ # CONFIG_LZOP_COMPR_HIGH is not set
+-# CONFIG_RPM2CPIO is not set
+-# CONFIG_RPM is not set
++CONFIG_RPM2CPIO=y
++CONFIG_RPM=y
+ CONFIG_TAR=y
+ CONFIG_FEATURE_TAR_CREATE=y
+ CONFIG_FEATURE_TAR_AUTODETECT=y
+@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
+ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+ CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+ CONFIG_FEATURE_TAR_UNAME_GNAME=y
++CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+ CONFIG_UNCOMPRESS=y
+ CONFIG_UNLZMA=y
+ CONFIG_FEATURE_LZMA_FAST=y
+@@ -148,15 +151,19 @@ CONFIG_CATV=y
+ CONFIG_CHGRP=y
+ CONFIG_CHMOD=y
+ CONFIG_CHOWN=y
++CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+ CONFIG_CHROOT=y
+ CONFIG_CKSUM=y
+ CONFIG_COMM=y
+ CONFIG_CP=y
++CONFIG_FEATURE_CP_LONG_OPTIONS=y
+ CONFIG_CUT=y
+ CONFIG_DATE=y
+ CONFIG_FEATURE_DATE_ISOFMT=y
++CONFIG_FEATURE_DATE_COMPAT=y
+ CONFIG_DD=y
+ CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+ CONFIG_FEATURE_DD_IBS_OBS=y
+ CONFIG_DF=y
+ CONFIG_FEATURE_DF_FANCY=y
+@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
+ CONFIG_FEATURE_HUMAN_READABLE=y
+ 
+ #
+-# Common options for md5sum, sha1sum
++# Common options for md5sum, sha1sum, sha256sum, sha512sum
+ #
+ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+ 
+@@ -318,9 +325,8 @@ CONFIG_AWK=y
+ CONFIG_FEATURE_AWK_LIBM=y
+ CONFIG_CMP=y
+ CONFIG_DIFF=y
+-CONFIG_FEATURE_DIFF_BINARY=y
++CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+ CONFIG_FEATURE_DIFF_DIR=y
+-CONFIG_FEATURE_DIFF_MINIMAL=y
+ CONFIG_ED=y
+ CONFIG_PATCH=y
+ CONFIG_SED=y
+@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
+ CONFIG_FEATURE_FIND_PATH=y
+ CONFIG_FEATURE_FIND_REGEX=y
+ # CONFIG_FEATURE_FIND_CONTEXT is not set
++CONFIG_FEATURE_FIND_LINKS=y
+ CONFIG_GREP=y
+ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
+ # Options common to multiple modutils
+ #
+ # CONFIG_FEATURE_2_4_MODULES is not set
++# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+ # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+ # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+ # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+@@ -467,8 +475,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+ #
+ # Linux System Utilities
+ #
+-# CONFIG_ACPID is not set
+-# CONFIG_FEATURE_ACPID_COMPAT is not set
++CONFIG_ACPID=y
++CONFIG_FEATURE_ACPID_COMPAT=y
+ CONFIG_BLKID=y
+ CONFIG_DMESG=y
+ CONFIG_FEATURE_DMESG_PRETTY=y
+@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
+ CONFIG_FINDFS=y
+ CONFIG_FREERAMDISK=y
+ CONFIG_FSCK_MINIX=y
++CONFIG_MKFS_EXT2=y
+ CONFIG_MKFS_MINIX=y
+ 
+ #
+ # Minix filesystem support
+ #
+ CONFIG_FEATURE_MINIX2=y
++# CONFIG_MKFS_REISER is not set
+ CONFIG_MKFS_VFAT=y
+ CONFIG_GETOPT=y
+ CONFIG_FEATURE_GETOPT_LONG=y
+@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+ CONFIG_IPCRM=y
+ CONFIG_IPCS=y
+ CONFIG_LOSETUP=y
++CONFIG_LSPCI=y
++CONFIG_LSUSB=y
+ CONFIG_MDEV=y
+ CONFIG_FEATURE_MDEV_CONF=y
+ CONFIG_FEATURE_MDEV_RENAME=y
+@@ -518,6 +530,7 @@ CONFIG_MORE=y
+ CONFIG_FEATURE_USE_TERMIOS=y
+ CONFIG_VOLUMEID=y
+ CONFIG_FEATURE_VOLUMEID_EXT=y
++CONFIG_FEATURE_VOLUMEID_BTRFS=y
+ CONFIG_FEATURE_VOLUMEID_REISERFS=y
+ CONFIG_FEATURE_VOLUMEID_FAT=y
+ CONFIG_FEATURE_VOLUMEID_HFS=y
+@@ -595,11 +608,12 @@ CONFIG_DEVMEM=y
+ CONFIG_EJECT=y
+ CONFIG_FEATURE_EJECT_SCSI=y
+ CONFIG_FBSPLASH=y
+-# CONFIG_FLASH_LOCK is not set
+-# CONFIG_FLASH_UNLOCK is not set
+-# CONFIG_FLASH_ERASEALL is not set
++CONFIG_FLASHCP=y
++CONFIG_FLASH_LOCK=y
++CONFIG_FLASH_UNLOCK=y
++CONFIG_FLASH_ERASEALL=y
+ CONFIG_IONICE=y
+-# CONFIG_INOTIFYD is not set
++CONFIG_INOTIFYD=y
+ CONFIG_LAST=y
+ # CONFIG_FEATURE_LAST_SMALL is not set
+ CONFIG_FEATURE_LAST_FANCY=y
+@@ -632,8 +646,8 @@ CONFIG_RUNLEVEL=y
+ CONFIG_RX=y
+ CONFIG_SETSID=y
+ CONFIG_STRINGS=y
+-# CONFIG_TASKSET is not set
+-# CONFIG_FEATURE_TASKSET_FANCY is not set
++CONFIG_TASKSET=y
++CONFIG_FEATURE_TASKSET_FANCY=y
+ CONFIG_TIME=y
+ CONFIG_TIMEOUT=y
+ CONFIG_TTYSIZE=y
+@@ -658,6 +672,7 @@ CONFIG_ETHER_WAKE=y
+ CONFIG_FAKEIDENTD=y
+ CONFIG_FTPD=y
+ CONFIG_FEATURE_FTP_WRITE=y
++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
+ CONFIG_FTPGET=y
+ CONFIG_FTPPUT=y
+ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+@@ -723,6 +738,8 @@ CONFIG_NETSTAT=y
+ CONFIG_FEATURE_NETSTAT_WIDE=y
+ CONFIG_FEATURE_NETSTAT_PRG=y
+ CONFIG_NSLOOKUP=y
++CONFIG_NTPD=y
++CONFIG_FEATURE_NTPD_SERVER=y
+ CONFIG_PING=y
+ CONFIG_PING6=y
+ CONFIG_FEATURE_FANCY_PING=y
+@@ -734,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
+ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+ CONFIG_TELNETD=y
+ CONFIG_FEATURE_TELNETD_STANDALONE=y
++CONFIG_FEATURE_TELNETD_INETD_WAIT=y
+ CONFIG_TFTP=y
+ CONFIG_TFTPD=y
+ CONFIG_FEATURE_TFTP_GET=y
+ CONFIG_FEATURE_TFTP_PUT=y
+ CONFIG_FEATURE_TFTP_BLOCKSIZE=y
++CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+ # CONFIG_TFTP_DEBUG is not set
+ CONFIG_TRACEROUTE=y
++CONFIG_TRACEROUTE6=y
+ CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+ # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
+ # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+@@ -814,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
+ CONFIG_FEATURE_TOP_DECIMALS=y
+ CONFIG_FEATURE_TOP_SMP_PROCESS=y
+ CONFIG_FEATURE_TOPMEM=y
++CONFIG_FEATURE_SHOW_THREADS=y
+ CONFIG_UPTIME=y
+ CONFIG_WATCH=y
+ 
+@@ -878,6 +899,7 @@ CONFIG_HUSH_CASE=y
+ CONFIG_HUSH_FUNCTIONS=y
+ CONFIG_HUSH_LOCAL=y
+ CONFIG_HUSH_EXPORT_N=y
++CONFIG_HUSH_RANDOM_SUPPORT=y
+ # CONFIG_LASH is not set
+ CONFIG_MSH=y
+ CONFIG_SH_MATH_SUPPORT=y
+diff -urpN busybox-1.16.0/TODO_config_nommu busybox-1.16.0-defconfig/TODO_config_nommu
+--- busybox-1.16.0/TODO_config_nommu	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-defconfig/TODO_config_nommu	2010-02-21 01:53:15.000000000 +0100
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+-# Busybox version: 1.15.0.svn
+-# Fri Aug 21 00:13:18 2009
++# Busybox version: 1.16.0
++# Wed Jan 27 21:01:26 2010
+ #
+ CONFIG_HAVE_DOT_CONFIG=y
+ 
+@@ -14,6 +14,8 @@ CONFIG_HAVE_DOT_CONFIG=y
+ #
+ CONFIG_DESKTOP=y
+ CONFIG_EXTRA_COMPAT=y
++CONFIG_INCLUDE_SUSv2=y
++# CONFIG_USE_PORTABLE_CODE is not set
+ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+ # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+ # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+@@ -59,7 +61,6 @@ CONFIG_EXTRA_CFLAGS=""
+ CONFIG_NO_DEBUG_LIB=y
+ # CONFIG_DMALLOC is not set
+ # CONFIG_EFENCE is not set
+-CONFIG_INCLUDE_SUSv2=y
+ 
+ #
+ # Installation Options
+@@ -120,6 +121,7 @@ CONFIG_DPKG_DEB=y
+ CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y
+ CONFIG_GUNZIP=y
+ CONFIG_GZIP=y
++CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+ CONFIG_LZOP=y
+ CONFIG_LZOP_COMPR_HIGH=y
+ CONFIG_RPM2CPIO=y
+@@ -133,6 +135,7 @@ CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=
+ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+ CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+ CONFIG_FEATURE_TAR_UNAME_GNAME=y
++CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+ CONFIG_UNCOMPRESS=y
+ CONFIG_UNLZMA=y
+ CONFIG_FEATURE_LZMA_FAST=y
+@@ -148,15 +151,19 @@ CONFIG_CATV=y
+ CONFIG_CHGRP=y
+ CONFIG_CHMOD=y
+ CONFIG_CHOWN=y
++CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+ CONFIG_CHROOT=y
+ CONFIG_CKSUM=y
+ CONFIG_COMM=y
+ CONFIG_CP=y
++CONFIG_FEATURE_CP_LONG_OPTIONS=y
+ CONFIG_CUT=y
+ CONFIG_DATE=y
+ CONFIG_FEATURE_DATE_ISOFMT=y
++CONFIG_FEATURE_DATE_COMPAT=y
+ CONFIG_DD=y
+ CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
++CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+ CONFIG_FEATURE_DD_IBS_OBS=y
+ CONFIG_DF=y
+ CONFIG_FEATURE_DF_FANCY=y
+@@ -271,7 +278,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
+ CONFIG_FEATURE_HUMAN_READABLE=y
+ 
+ #
+-# Common options for md5sum, sha1sum
++# Common options for md5sum, sha1sum, sha256sum, sha512sum
+ #
+ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+ 
+@@ -318,9 +325,8 @@ CONFIG_AWK=y
+ CONFIG_FEATURE_AWK_LIBM=y
+ CONFIG_CMP=y
+ CONFIG_DIFF=y
+-CONFIG_FEATURE_DIFF_BINARY=y
++CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+ CONFIG_FEATURE_DIFF_DIR=y
+-CONFIG_FEATURE_DIFF_MINIMAL=y
+ CONFIG_ED=y
+ CONFIG_PATCH=y
+ CONFIG_SED=y
+@@ -364,6 +370,7 @@ CONFIG_FEATURE_FIND_DELETE=y
+ CONFIG_FEATURE_FIND_PATH=y
+ CONFIG_FEATURE_FIND_REGEX=y
+ CONFIG_FEATURE_FIND_CONTEXT=y
++CONFIG_FEATURE_FIND_LINKS=y
+ CONFIG_GREP=y
+ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+ CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+@@ -453,6 +460,7 @@ CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALRE
+ # Options common to multiple modutils
+ #
+ # CONFIG_FEATURE_2_4_MODULES is not set
++CONFIG_FEATURE_INSMOD_TRY_MMAP=y
+ # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+ # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+ # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+@@ -488,12 +496,14 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
+ CONFIG_FINDFS=y
+ CONFIG_FREERAMDISK=y
+ CONFIG_FSCK_MINIX=y
++CONFIG_MKFS_EXT2=y
+ CONFIG_MKFS_MINIX=y
+ 
+ #
+ # Minix filesystem support
+ #
+ CONFIG_FEATURE_MINIX2=y
++CONFIG_MKFS_REISER=y
+ CONFIG_MKFS_VFAT=y
+ CONFIG_GETOPT=y
+ CONFIG_FEATURE_GETOPT_LONG=y
+@@ -506,6 +516,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+ CONFIG_IPCRM=y
+ CONFIG_IPCS=y
+ CONFIG_LOSETUP=y
++CONFIG_LSPCI=y
++CONFIG_LSUSB=y
+ CONFIG_MDEV=y
+ CONFIG_FEATURE_MDEV_CONF=y
+ CONFIG_FEATURE_MDEV_RENAME=y
+@@ -518,6 +530,7 @@ CONFIG_MORE=y
+ CONFIG_FEATURE_USE_TERMIOS=y
+ CONFIG_VOLUMEID=y
+ CONFIG_FEATURE_VOLUMEID_EXT=y
++CONFIG_FEATURE_VOLUMEID_BTRFS=y
+ CONFIG_FEATURE_VOLUMEID_REISERFS=y
+ CONFIG_FEATURE_VOLUMEID_FAT=y
+ CONFIG_FEATURE_VOLUMEID_HFS=y
+@@ -595,6 +608,7 @@ CONFIG_DEVMEM=y
+ CONFIG_EJECT=y
+ CONFIG_FEATURE_EJECT_SCSI=y
+ CONFIG_FBSPLASH=y
++CONFIG_FLASHCP=y
+ # CONFIG_FLASH_LOCK is not set
+ # CONFIG_FLASH_UNLOCK is not set
+ # CONFIG_FLASH_ERASEALL is not set
+@@ -638,6 +652,7 @@ CONFIG_TIME=y
+ CONFIG_TIMEOUT=y
+ CONFIG_TTYSIZE=y
+ CONFIG_VOLNAME=y
++CONFIG_WALL=y
+ CONFIG_WATCHDOG=y
+ 
+ #
+@@ -657,6 +672,7 @@ CONFIG_ETHER_WAKE=y
+ CONFIG_FAKEIDENTD=y
+ CONFIG_FTPD=y
+ CONFIG_FEATURE_FTP_WRITE=y
++CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
+ CONFIG_FTPGET=y
+ CONFIG_FTPPUT=y
+ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
+@@ -722,6 +738,8 @@ CONFIG_NETSTAT=y
+ CONFIG_FEATURE_NETSTAT_WIDE=y
+ CONFIG_FEATURE_NETSTAT_PRG=y
+ CONFIG_NSLOOKUP=y
++CONFIG_NTPD=y
++CONFIG_FEATURE_NTPD_SERVER=y
+ CONFIG_PING=y
+ CONFIG_PING6=y
+ CONFIG_FEATURE_FANCY_PING=y
+@@ -733,13 +751,16 @@ CONFIG_FEATURE_TELNET_TTYPE=y
+ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+ CONFIG_TELNETD=y
+ CONFIG_FEATURE_TELNETD_STANDALONE=y
++CONFIG_FEATURE_TELNETD_INETD_WAIT=y
+ CONFIG_TFTP=y
+ CONFIG_TFTPD=y
+ CONFIG_FEATURE_TFTP_GET=y
+ CONFIG_FEATURE_TFTP_PUT=y
+ CONFIG_FEATURE_TFTP_BLOCKSIZE=y
++CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+ CONFIG_TFTP_DEBUG=y
+ CONFIG_TRACEROUTE=y
++CONFIG_TRACEROUTE6=y
+ CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+ CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
+ CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
+@@ -813,6 +834,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y
+ CONFIG_FEATURE_TOP_DECIMALS=y
+ CONFIG_FEATURE_TOP_SMP_PROCESS=y
+ CONFIG_FEATURE_TOPMEM=y
++CONFIG_FEATURE_SHOW_THREADS=y
+ CONFIG_UPTIME=y
+ CONFIG_WATCH=y
+ 
+@@ -881,6 +903,7 @@ CONFIG_HUSH_CASE=y
+ CONFIG_HUSH_FUNCTIONS=y
+ CONFIG_HUSH_LOCAL=y
+ CONFIG_HUSH_EXPORT_N=y
++CONFIG_HUSH_RANDOM_SUPPORT=y
+ CONFIG_LASH=y
+ CONFIG_MSH=y
+ CONFIG_SH_MATH_SUPPORT=y

package/busybox/busybox-1.16.0-linux_swap.patch

@@ -0,0 +1,16 @@
+diff -urpN busybox-1.16.0/util-linux/volume_id/linux_swap.c busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c
+--- busybox-1.16.0/util-linux/volume_id/linux_swap.c	2010-01-25 01:59:39.000000000 +0100
++++ busybox-1.16.0-linux_swap/util-linux/volume_id/linux_swap.c	2010-02-21 01:53:21.000000000 +0100
+@@ -52,7 +52,11 @@ int FAST_FUNC volume_id_probe_linux_swap
+ 				goto found;
+ 			}
+ 
+-			if (memcmp(buf, "SWAPSPACE2", 10) == 0) {
++			if (memcmp(buf, "SWAPSPACE2", 10) == 0
++			 || memcmp(buf, "S1SUSPEND", 9) == 0
++			 || memcmp(buf, "S2SUSPEND", 9) == 0
++			 || memcmp(buf, "ULSUSPEND", 9) == 0
++			) {
+ 				sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));
+ 				if (sw == NULL)
+ 					return -1;

package/busybox/busybox-1.16.0-md5_sha_compat.patch

@@ -0,0 +1,16 @@
+diff -urpN busybox-1.16.0/coreutils/md5_sha1_sum.c busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c
+--- busybox-1.16.0/coreutils/md5_sha1_sum.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-md5_sha_compat/coreutils/md5_sha1_sum.c	2010-02-21 01:53:28.000000000 +0100
+@@ -101,8 +101,10 @@ int md5_sha1_sum_main(int argc UNUSED_PA
+ 	unsigned flags;
+ 	/*hash_algo_t hash_algo = applet_name[3];*/
+ 
+-	if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK)
+-		flags = getopt32(argv, "scw");
++	if (ENABLE_FEATURE_MD5_SHA1_SUM_CHECK) {
++		/* -b "binary", -t "text" are ignored (shaNNNsum compat) */
++		flags = getopt32(argv, "scwbt");
++	}
+ 	else optind = 1;
+ 	argv += optind;
+ 	//argc -= optind;

package/busybox/busybox-1.16.0-syslogd.patch

@@ -0,0 +1,12 @@
+diff -urpN busybox-1.16.0/sysklogd/syslogd.c busybox-1.16.0-syslogd/sysklogd/syslogd.c
+--- busybox-1.16.0/sysklogd/syslogd.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-syslogd/sysklogd/syslogd.c	2010-02-21 01:53:33.000000000 +0100
+@@ -698,7 +698,7 @@ int syslogd_main(int argc UNUSED_PARAM, 
+ 	if (!(opts & OPT_nofork)) {
+ 		bb_daemonize_or_rexec(DAEMON_CHDIR_ROOT, argv);
+ 	}
+-	umask(0);
++	//umask(0); - why??
+ 	write_pidfile("/var/run/syslogd.pid");
+ 	do_syslogd();
+ 	/* return EXIT_SUCCESS; */

package/busybox/busybox-1.16.0-tftp.patch

@@ -0,0 +1,12 @@
+diff -urpN busybox-1.16.0/networking/tftp.c busybox-1.16.0-tftp/networking/tftp.c
+--- busybox-1.16.0/networking/tftp.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-tftp/networking/tftp.c	2010-02-21 01:53:41.000000000 +0100
+@@ -308,7 +308,7 @@ static int tftp_protocol(
+ 
+ 	if (!ENABLE_TFTP || our_lsa) { /* tftpd */
+ 		/* Open file (must be after changing user) */
+-		local_fd = open(local_file, open_mode);
++		local_fd = open(local_file, open_mode, 0666);
+ 		if (local_fd < 0) {
+ 			error_pkt_reason = ERR_NOFILE;
+ 			strcpy((char*)error_pkt_str, "can't open file");

package/busybox/busybox-1.16.0-wget.patch

@@ -0,0 +1,20 @@
+diff -urpN busybox-1.16.0/networking/wget.c busybox-1.16.0-wget/networking/wget.c
+--- busybox-1.16.0/networking/wget.c	2010-01-25 01:59:38.000000000 +0100
++++ busybox-1.16.0-wget/networking/wget.c	2010-02-21 01:53:53.000000000 +0100
+@@ -546,6 +546,8 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 		"passive-ftp\0"      No_argument       "\xff"
+ 		"header\0"           Required_argument "\xfe"
+ 		"post-data\0"        Required_argument "\xfd"
++		/* Ignored (we don't do ssl) */
++		"no-check-certificate\0" No_argument   "\xfc"
+ 		;
+ #endif
+ 
+@@ -590,6 +592,7 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 	if (use_proxy) {
+ 		proxy = getenv(target.is_ftp ? "ftp_proxy" : "http_proxy");
+ 		if (proxy && proxy[0]) {
++			server.user = NULL;
+ 			parse_url(proxy, &server);
+ 		} else {
+ 			use_proxy = 0;

package/dosfstools/dosfstools.mk

@@ -32,7 +32,8 @@ $(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_DIR)/.unpacked
 	$(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY)
 	touch $@
 
-$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built
+$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): # $(DOSFSTOOLS_DIR)/.built
+	echo foo
 	cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@
 	touch -c $@
 
@@ -44,7 +45,20 @@ $(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built
 	cp -a $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY) $@
 	touch -c $@
 
-dosfstools: $(TARGET_DIR)/$(DOSFSTOOLS_TARGET_BINARY) $(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
+DOSFSTOOLS=
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y)
+DOSFSTOOLS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
+endif
+
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y)
+DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
+endif
+
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y)
+DOSFSTOOLS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)
+endif
+
+dosfstools: $(DOSFSTOOLS)
 
 dosfstools-clean:
 	rm -f $(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
@@ -60,14 +74,6 @@ dosfstools-dirclean:
 # Toplevel Makefile options
 #
 #############################################################
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKDOSFS),y)
-TARGETS+=$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY)
-endif
-
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSCK),y)
-TARGETS+=$(TARGET_DIR)/$(DOSFSCK_TARGET_BINARY)
-endif
-
-ifeq ($(BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL),y)
-TARGETS+=$(TARGET_DIR)/$(DOSFSLABEL_TARGET_BINARY)
-endif
+ifeq ($(BR2_PACKAGE_DOSFSTOOLS),y)
+TARGETS+=dosfstools
+endif

package/e2fsprogs/Config.in

@@ -54,7 +54,7 @@ config BR2_PACKAGE_E2FSPROGS_E2LABEL
 	select BR2_PACKAGE_E2FSPROGS_LIBBLKID
 
 config BR2_PACKAGE_E2FSPROGS_E2UNDO
-	bool "e2label"
+	bool "e2undo"
 	default y
 	depends on BR2_PACKAGE_E2FSPROGS
 
@@ -81,7 +81,7 @@ config BR2_PACKAGE_E2FSPROGS_LOGSAVE
 	depends on BR2_PACKAGE_E2FSPROGS
 
 config BR2_PACKAGE_E2FSPROGS_LSATTR
-	bool "chattr"
+	bool "lsattr"
 	default y
 	depends on BR2_PACKAGE_E2FSPROGS
 

package/flex/flex.mk

@@ -9,6 +9,7 @@ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
 FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
 FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
 FLEX_DIR:=$(BUILD_DIR)/flex-$(FLEX_VERSION)
+FLEX_INSTALL_STAGING=YES
 
 # lex -> flex
 define FLEX_INSTALL_LEX

package/games/Config.in

@@ -7,5 +7,4 @@ source "package/games/magiccube4d/Config.in"
 source "package/games/prboom/Config.in"
 source "package/games/rubix/Config.in"
 source "package/games/vice/Config.in"
-source "package/games/xboard/Config.in"
 endmenu

package/games/ace_of_penguins/Config.in

@@ -2,6 +2,10 @@ config BR2_PACKAGE_ACE_OF_PENGUINS
 	bool "ace_of_penguins"
 	select BR2_PACKAGE_LIBPNG
 	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XLIB_LIBXPM
+	# Build system is broken for tools that need to be compiled
+	# on the host
+	depends on BROKEN
 	help
 	  The Ace of Penguins is a set of Unix/X solitaire games based
 	  on the ones available for Windows but with a number of

package/games/ace_of_penguins/ace_of_penguins.mk

@@ -10,6 +10,6 @@ ACE_OF_PENGUINS_AUTORECONF = YES
 ACE_OF_PENGUINS_STAGING = NO
 ACE_OF_PENGUINS_TARGET = YES
 
-ACE_OF_PENGUINS_DEPENDENCIES = libpng xserver_xorg-server
+ACE_OF_PENGUINS_DEPENDENCIES = libpng host-libpng xserver_xorg-server xlib_libXpm
 
 $(eval $(call AUTOTARGETS,package/games,ace_of_penguins))

package/games/rubix/rubix-1.0.5-dont-use-legacy-functions.patch

@@ -0,0 +1,18 @@
+Use strstr() instead of index(), since index() is a legacy function
+and it may not be available in uClibc, depending on the configuration.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: rubix-1.0.5/cube.c
+===================================================================
+--- rubix-1.0.5.orig/cube.c	2010-02-14 14:19:05.000000000 +0100
++++ rubix-1.0.5/cube.c	2010-02-14 14:19:14.000000000 +0100
+@@ -257,7 +257,7 @@
+     if (i==-1) goto finish;
+     if (buffer[0]=='%') goto new_section;
+     buffer[0]=toupper(buffer[0]);
+-    ptr = index(buffer, '=');
++    ptr = strstr(buffer, '=');
+     if (ptr) {
+       ++ptr;
+       while (isspace(*ptr)) ++ptr;

package/games/xboard/Config.in

@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XBOARD
-	bool "xboard"
-	depends on BR2_PACKAGE_XORG7
-	select BR2_PACKAGE_GNUCHESS
-	help
-	  XBoard and WinBoard are graphical user interfaces for chess.
-
-	  http://ftp.gnu.org/gnu/xboard

package/games/xboard/xboard-4.2.7-installer.patch

@@ -1,55 +0,0 @@
---- a/Makefile.in	2003-11-28 16:12:57.000000000 -0500
-+++ b/Makefile.in	2008-02-13 13:18:34.000000000 -0500
-@@ -63,27 +63,27 @@ default: xboard zic2xpm
- all: default pseudosource info FAQ html dvi ps
- 
- install: installdirs default
--	$(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
--	$(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
--	$(INSTALL_PROGRAM) cmail $(bindir)/cmail
--	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
--	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
--	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
--	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
-+	$(INSTALL_PROGRAM) xboard $(DESTDIR)$(bindir)/xboard
-+	$(INSTALL_PROGRAM) zic2xpm $(DESTDIR)$(bindir)/zic2xpm
-+	$(INSTALL_PROGRAM) cmail $(DESTDIR)$(bindir)/cmail
-+	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard
-+	$(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext)
-+	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
-+	$(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info
- 	-PATH=$$PATH:/sbin:/usr/sbin install-info \
--		$(infodir)/xboard.info $(infodir)/dir
-+		$(infodir)/xboard.info $(DESTDIR)$(infodir)/dir
- 
- installdirs: mkinstalldirs
- 	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
- 
- uninstall:
--	rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard
--	rm -f $(bindir)/zic2xpm
--	rm -f $(man6dir)/xboard$(man6ext) $(man6dir)/cmail$(man6ext)
--	rm -f $(man6dir)/zic2xpm$(man6ext)
--	rm -f $(infodir)/xboard.info
-+	rm -f $(DESTDIR)$(bindir)/xboard $(DESTDIR)$(bindir)/cmail $(DESTDIR)$(bindir)/pxboard
-+	rm -f $(DESTDIR)$(bindir)/zic2xpm
-+	rm -f $(DESTDIR)$(man6dir)/xboard$(man6ext) $(DESTDIR)$(man6dir)/cmail$(man6ext)
-+	rm -f $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
-+	rm -f $(DESTDIR)$(infodir)/xboard.info
- 	-PATH=$$PATH:/sbin:/usr/sbin install-info --delete \
--		$(infodir)/xboard.info $(infodir)/dir
-+		$(DESTDIR)$(infodir)/xboard.info $(DESTDIR)$(infodir)/dir
- 
- clean:
- 	rm -f xboard zic2xpm *.o xboard.txt zic2xpm.txt $(LEX_OUTPUT_ROOT).c
---- a/Makefile.in	2008-02-13 13:20:14.000000000 -0500
-+++ b/Makefile.in	2008-02-13 13:21:25.000000000 -0500
-@@ -74,7 +74,7 @@ install: installdirs default
- 		$(infodir)/xboard.info $(DESTDIR)/$(infodir)/dir
- 
- installdirs: mkinstalldirs
--	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
-+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) $(DESTDIR)$(man6dir) $(DESTDIR)$(infodir)
- 
- uninstall:
- 	rm -f $(DESTDIR)/$(bindir)/xboard $(DESTDIR)/$(bindir)/cmail $(DESTDIR)/$(bindir)/pxboard

package/games/xboard/xboard.mk

@@ -1,16 +0,0 @@
-#############################################################
-#
-# xboard
-#
-#############################################################
-XBOARD_VERSION = 4.2.7
-XBOARD_SOURCE = xboard-$(XBOARD_VERSION).tar.gz
-XBOARD_SITE = $(BR2_GNU_MIRROR)/xboard
-XBOARD_INSTALL_STAGING = NO
-XBOARD_INSTALL_TARGET = YES
-XBOARD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-XBOARD_DEPENDENCIES = gnuchess xserver_xorg-server
-
-$(eval $(call AUTOTARGETS,package/games,xboard))
-

package/gmp/gmp.mk

@@ -93,6 +93,7 @@ $(GMP_HOST_DIR)/lib/libgmp$(HOST_LIBEXT): $(GMP_DIR2)/.configured
 	$(MAKE) -C $(GMP_DIR2) install
 
 host-libgmp: $(GMP_HOST_DIR)/lib/$(GMP_HOST_BINARY)
+host-libgmp-source: libgmp-source
 host-libgmp-clean:
 	rm -rf $(GMP_HOST_DIR)
 	-$(MAKE) -C $(GMP_DIR2) clean

package/gmpc/gmpc.mk

@@ -11,7 +11,7 @@ GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \
 		ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
 GMPC_CONF_OPT = --disable-mmkeys
 
-GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2
+GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y)
 GMPC_DEPENENCIES += xlib_libSM

package/gob2/Config.in

@@ -2,6 +2,7 @@ config BR2_PACKAGE_GOB2
 	bool "gob2"
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_FLEX
+	select BR2_PACKAGE_FLEX_LIBFL
 	select BR2_PACKAGE_BISON
 	help
 	  GOB (GTK+ Object Builder) is a preprocessor which simplifies

package/gob2/gob2.mk

@@ -7,7 +7,7 @@ GOB2_VERSION = 2.0.15
 GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.gz
 GOB2_SITE = http://ftp.5z.com/pub/gob/
 
-GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config
+GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex
 
 HOST_GOB2_DEPENDENCIES = host-libglib2
 

package/hostap/Config.in

@@ -1,9 +0,0 @@
-config BR2_PACKAGE_HOSTAP
-	bool "hostap"
-	depends on BR2_DEPRECATED
-	select BR2_PACKAGE_PCMCIA
-	help
-	  Linux driver for wireless LAN cards based on Intersil's
-	  Prism2/2.5/3 chipset.
-
-	  http://hostap.epitest.fi/

package/hostap/hostap.mk

@@ -1,72 +0,0 @@
-#############################################################
-#
-# hostap
-#
-# Note! Host AP driver was added into the main kernel tree in Linux v2.6.14.
-# The version in the kernel tree should be used instead of this external
-# hostap-driver package.
-# The external releases are only for older kernel versions and all
-# the future development will be in the main kernel tree.
-#
-#############################################################
-HOSTAP_VERSION=0.4.9
-HOSTAP_SOURCE=hostap-driver-$(HOSTAP_VERSION).tar.gz
-HOSTAP_SITE=http://hostap.epitest.fi/releases
-HOSTAP_DIR=$(BUILD_DIR)/hostapd-$(HOSTAP_VERSION)
-
-$(DL_DIR)/$(HOSTAP_SOURCE):
-	$(call DOWNLOAD,$(HOSTAP_SITE),$(HOSTAP_SOURCE))
-
-hostap-source: $(DL_DIR)/$(HOSTAP_SOURCE)
-
-$(HOSTAP_DIR)/.unpacked: $(DL_DIR)/$(HOSTAP_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(HOSTAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	mv -f $(BUILD_DIR)/hostap $(HOSTAP_DIR)
-	touch $@
-
-$(HOSTAP_DIR)/.configured: $(HOSTAP_DIR)/.unpacked
-	#$(SED) "s,/.*#define PRISM2_DOWNLOAD_SUPPORT.*/,#define PRISM2_DOWNLOAD_SUPPORT,g" \
-	# $(HOSTAP_DIR)/driver/modules/hostap_config.h
-	touch $@
-
-$(HOSTAP_DIR)/utils/hostap_crypt_conf: $(HOSTAP_DIR)/.configured
-	$(MAKE) -C $(HOSTAP_DIR)/utils \
-		CC=$(TARGET_CC) \
-		CFLAGS="-Os -Wall $(TARGET_CFLAGS) -I../driver/modules"
-	$(MAKE) -C $(HOSTAP_DIR)/hostapd \
-		CC=$(TARGET_CC) \
-		CFLAGS="-Os -Wall $(TARGET_CFLAGS) -I../driver/modules -I../utils"
-	touch -c $(HOSTAP_DIR)/driver/modules/hostap.o
-
-$(TARGET_DIR)//usr/bin/hostap_crypt_conf: $(HOSTAP_DIR)/utils/hostap_crypt_conf
-	# Make the dir
-	rm -rf $(HOSTAP_TARGET_MODULE_DIR)
-	mkdir -p $(HOSTAP_TARGET_MODULE_DIR)
-	# Copy the pcmcia-cs conf file
-	mkdir -p $(TARGET_DIR)/etc/pcmcia
-	cp -af $(HOSTAP_DIR)/driver/etc/hostap_cs.conf $(TARGET_DIR)/etc/pcmcia/
-	# Copy The Utils
-	cp -af $(HOSTAP_DIR)/utils/hostap_crypt_conf $(TARGET_DIR)/usr/bin/
-	cp -af $(HOSTAP_DIR)/utils/hostap_diag $(TARGET_DIR)/usr/bin/
-	cp -af $(HOSTAP_DIR)/utils/prism2_param $(TARGET_DIR)/usr/bin/
-	cp -af $(HOSTAP_DIR)/utils/prism2_srec $(TARGET_DIR)/usr/bin/
-	# Copy hostapd
-	cp -af $(HOSTAP_DIR)/hostapd/hostapd $(TARGET_DIR)/usr/sbin/
-
-hostap: pcmcia $(TARGET_DIR)//usr/bin/hostap_crypt_conf
-
-hostap-clean:
-	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(HOSTAP_DIR) uninstall
-	-$(MAKE) -C $(HOSTAP_DIR) clean
-
-hostap-dirclean:
-	rm -rf $(HOSTAP_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_HOSTAP),y)
-TARGETS+=hostap
-endif

package/imagemagick/imagemagick.mk

@@ -31,6 +31,12 @@ $(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
 	$(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config
 	touch $@
 
+ifeq ($(BR2_LARGEFILE),y)
+IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=64
+else
+IMAGEMAGICK_CONF_OPTS = ac_cv_sys_file_offset_bits=32
+endif
+
 $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked
 	(cd $(IMAGEMAGICK_DIR); rm -f config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -55,6 +61,7 @@ $(IMAGEMAGICK_DIR)/.configured: $(IMAGEMAGICK_DIR)/.unpacked
 		--without-fpx \
 		--without-freetype \
 		--without-x \
+		$(IMAGEMAGICK_CONF_OPTS) \
 	)
 	touch $@
 
@@ -76,8 +83,8 @@ $(IMAGEMAGICK_LIB): $(STAGING_DIR)/usr/lib/libMagickCore.a
 	touch -c $@
 
 $(IMAGEMAGICK_DIR)/.libinstall: $(IMAGEMAGICK_LIB)
-	libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders
-	libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters
+	$(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/coders
+	$(IMAGEMAGICK_DIR)/libtool --finish $(TARGET_DIR)/usr/lib/ImageMagick-$(IMAGEMAGICK_MAJOR)/modules-Q16/filters
 	touch $@
 
 $(TARGET_DIR)/usr/bin/animate: $(IMAGEMAGICK_LIB)

package/intltool/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_INTLTOOL
+       bool "intltool"
+       help
+         Utility scripts for internationalizing XML
+
+	 http://www.freedesktop.org/wiki/Software/intltool

package/intltool/intltook.mk

@@ -0,0 +1,16 @@
+#############################################################
+#
+# intltool
+#
+#############################################################
+INTLTOOL_VERSION:=0.40.6
+INTLTOOL_SOURCE:=intltool-$(INTLTOOL_VERSION).tar.bz2
+INTLTOOL_SITE:=http://ftp.acc.umu.se/pub/GNOME/sources/intltool/0.40/
+
+HOST_INTLTOOL_DEPENDENCIES = host-libxml-parser-perl
+HOST_INTLTOOL_CONF_OPT = \
+  PERLLIB=$(HOST_DIR)/usr/lib/perl
+
+$(eval $(call AUTOTARGETS,package,intltool))
+$(eval $(call AUTOTARGETS,package,intltool,host))
+

package/ipsec-tools/ipsec-tools.mk

@@ -145,7 +145,7 @@ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
 IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
 endif
 
-ipsec-tools: openssl flex $(IPSEC_TOOLS_PROGS)
+ipsec-tools: openssl flex host-flex $(IPSEC_TOOLS_PROGS)
 
 ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
 

package/iw/iw.mk

@@ -11,6 +11,7 @@ IW_DEPENDENCIES = libnl
 IW_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 IW_CONFIG = $(IW_DIR)/.config
 IW_MAKE_ENV = PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 $(eval $(call AUTOTARGETS,package,iw))

package/kexec/kexec.mk

@@ -3,7 +3,7 @@
 # kexec
 #
 #############################################################
-KEXEC_VERSION = 2.0.0
+KEXEC_VERSION = 2.0.1
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.bz2
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/horms/kexec-tools/
 # no install-strip/install-exec

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"
-

package/libcgicc/cgicc-3.2.9-disable-documentation-option.patch

@@ -0,0 +1,50 @@
+Index: cgicc-3.2.9/Makefile.am
+===================================================================
+--- cgicc-3.2.9.orig/Makefile.am	2010-02-25 16:34:06.000000000 +0100
++++ cgicc-3.2.9/Makefile.am	2010-02-25 16:34:14.000000000 +0100
+@@ -8,9 +8,15 @@
+ DEMO =
+ endif
+ 
++if DOC
++DOCDIR = doc
++else
++DOC =
++endif
++
+ ACLOCAL_AMFLAGS= 
+ 
+-SUBDIRS = cgicc doc support $(DEMO)
++SUBDIRS = cgicc $(DOCDIR) support $(DEMO)
+ 
+ CLEANFILES = *~
+ 
+Index: cgicc-3.2.9/configure.ac
+===================================================================
+--- cgicc-3.2.9.orig/configure.ac	2010-02-25 16:34:06.000000000 +0100
++++ cgicc-3.2.9/configure.ac	2010-02-25 16:45:46.000000000 +0100
+@@ -17,9 +17,23 @@
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+-AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo)
+ 
+ 
++AC_ARG_ENABLE(doc, 
++  [  --enable-doc          build doc [[default=yes]]],
++  [case "${enableval}" in
++    yes) cgicc_doc=yes ;;
++    no)  cgicc_doc=no ;;
++    *) AC_MSG_ERROR(bad value ${enableval} for --enable-doc) ;;
++  esac], cgicc_doc=yes)
++
++if test "$cgicc_doc" = yes; then
++ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen)
++ if test -z "$DOXYGEN" ; then
++   AC_MSG_ERROR([Doxygen is required to build the documentation])
++ fi
++fi
++AM_CONDITIONAL(DOC, test "$cgicc_doc" = yes)
+ 
+ dnl Determine host system type
+ 

package/libcgicc/libcgicc.mk

@@ -4,7 +4,7 @@
 #
 #############################################################
 
-LIBCGICC_VERSION=3.2.7
+LIBCGICC_VERSION=3.2.9
 LIBCGICC_DIR=$(BUILD_DIR)/cgicc-$(LIBCGICC_VERSION)
 LIBCGICC_SITE=$(BR2_GNU_MIRROR)/cgicc
 LIBCGICC_SOURCE=cgicc-$(LIBCGICC_VERSION).tar.gz
@@ -22,6 +22,7 @@ $(LIBCGICC_DIR)/.unpacked: $(DL_DIR)/$(LIBCGICC_SOURCE)
 
 $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 	(cd $(LIBCGICC_DIR); rm -f config.cache; \
+		$(AUTORECONF); \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		./configure $(QUIET) \
@@ -33,15 +34,16 @@ $(LIBCGICC_DIR)/.configured: $(LIBCGICC_DIR)/.unpacked
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--disable-demos \
+		--disable-doc \
 	)
 	touch $@
 
 $(LIBCGICC_DIR)/.compiled: $(LIBCGICC_DIR)/.configured
-	$(MAKE) -C $(LIBCGICC_DIR)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LIBCGICC_DIR)
 	touch $@
 
 $(STAGING_DIR)/usr/lib/libcgicc.so: $(LIBCGICC_DIR)/.compiled
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBCGICC_DIR) install
 	touch -c $(STAGING_DIR)/usr/lib/libcgicc.so
 
 $(TARGET_DIR)/usr/lib/libcgicc.so: $(STAGING_DIR)/usr/lib/libcgicc.so

package/libeXosip2/libeXosip2.mk

@@ -43,27 +43,33 @@ $(LIBEXOSIP2_DIR)/.compiled: $(LIBEXOSIP2_DIR)/.configured
 
 $(STAGING_DIR)/usr/lib/libeXosip2.so: $(LIBEXOSIP2_DIR)/.compiled
 	cp -dpf $(LIBEXOSIP2_DIR)/src/.libs/libeXosip2.so* $(STAGING_DIR)/usr/lib
+	touch $@
 
 $(STAGING_DIR)/usr/lib/libeXosip2.a: $(LIBEXOSIP2_DIR)/.compiled
 	cp -dpf $(LIBEXOSIP2_DIR)/src/.libs/libeXosip2.a $(STAGING_DIR)/usr/lib
 	cp -dpf $(LIBEXOSIP2_DIR)/include/*.h $(STAGING_DIR)/usr/include
+	touch $@
 
 $(STAGING_DIR)/usr/lib/libeXosip2.la: $(LIBEXOSIP2_DIR)/.compiled
 	cp -dpf $(LIBEXOSIP2_DIR)/src/libeXosip2.la $(STAGING_DIR)/usr/lib
 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libeXosip2.la
+	touch $@
 
 $(STAGING_DIR)/usr/bin/sip_reg: $(LIBEXOSIP2_DIR)/.compiled
 	cp -dpf $(LIBEXOSIP2_DIR)/tools/.libs/sip_reg $(STAGING_DIR)/usr/bin
+	touch $@
 
 
 $(TARGET_DIR)/usr/lib/libeXosip2.so: $(STAGING_DIR)/usr/lib/libeXosip2.so
 	mkdir -p $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/usr/lib/libeXosip2.so* $(TARGET_DIR)/usr/lib/
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libeXosip2.so*
+	touch $@
 
 $(TARGET_DIR)/usr/bin/sip_reg: $(STAGING_DIR)/usr/bin/sip_reg
 	mkdir -p $(TARGET_DIR)/usr/bin
 	cp -dpf $(STAGING_DIR)/usr/bin/sip_reg $(TARGET_DIR)/usr/bin
+	touch $@
 
 
 

package/libgtk2/host-libgtk2-2.12.12-reduce-dependencies.patch

@@ -0,0 +1,200 @@
+Index: gtk+-2.12.12/configure.in
+===================================================================
+--- gtk+-2.12.12.orig/configure.in	2008-09-13 02:01:07.000000000 +0200
++++ gtk+-2.12.12/configure.in	2010-02-21 10:42:40.000000000 +0100
+@@ -32,9 +32,6 @@
+ 
+ # required versions of other packages
+ m4_define([glib_required_version], [2.13.5])
+-m4_define([pango_required_version], [1.17.3])
+-m4_define([atk_required_version], [1.9.0])
+-m4_define([cairo_required_version], [1.2.0])
+ 
+ 
+ AC_INIT([gtk+], [gtk_version],
+@@ -239,12 +236,12 @@
+   gdktarget=x11
+ fi
+ 
+-AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
++AC_ARG_WITH(gdktarget, [  --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target],
+ 	gdktarget=$with_gdktarget)
+ 
+ AC_SUBST(gdktarget)
+ case $gdktarget in
+-  x11|win32|quartz|directfb) ;;
++  x11|win32|quartz|directfb|none) ;;
+   *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
+ esac
+ 
+@@ -349,10 +346,7 @@
+ ## the version requirements since those make the module lists 
+ ## annoying to construct
+ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
+-  [glib-2.0 >= glib_required_version dnl
+-   atk >= atk_required_version dnl
+-   pango >= pango_required_version dnl
+-   cairo >= cairo_required_version])
++  [glib-2.0 >= glib_required_version])
+ 
+ if test "$os_win32" != yes; then
+     # libtool option to control which symbols are exported
+@@ -1061,7 +1055,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
+ GDK_PIXBUF_XLIB_EXTRA_LIBS=
+ 	
+-X_PACKAGES=fontconfig
++X_PACKAGES=
+ GDK_EXTRA_LIBS="$GDK_WLIBS"
+ GDK_EXTRA_CFLAGS=
+ 	
+@@ -1070,14 +1064,6 @@
+ GTK_DEP_LIBS_FOR_X=
+ 
+ if test "x$gdktarget" = "xx11"; then
+-  #
+-  # We use fontconfig very peripherally when decoding the default
+-  # settings.
+-  #
+-  if $PKG_CONFIG --exists fontconfig; then : ; else
+-    AC_MSG_ERROR([
+-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
+-  fi
+ 
+   #
+   # Check for basic X packages; we use pkg-config if available
+@@ -1124,16 +1110,6 @@
+   gtk_save_LIBS=$LIBS
+   LIBS="$x_libs_for_checks $LIBS"
+   
+-  # Sanity check for the X11 and Xext libraries. While everything we need from
+-  # Xext is optional, the chances a system has *none* of these things is so
+-  # small that we just unconditionally require it.
+-  AC_CHECK_FUNC(XOpenDisplay, :,
+-                AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]))
+-  AC_CHECK_FUNC(XextFindDisplay, :,
+-                AC_MSG_ERROR([*** libXext not found. Check 'config.log' for more details.]))
+-  AC_CHECK_FUNC(XRenderQueryExtension, :,
+-                AC_MSG_ERROR([*** libXrender not found. Check 'config.log' for more details.]))
+-
+   # Check for xReply
+ 
+   AC_MSG_CHECKING([if <X11/extensions/XIproto.h> is needed for xReply])
+@@ -1418,48 +1394,6 @@
+   AM_CONDITIONAL(USE_DIRECTFB, false)
+ fi
+ 
+-
+-# Check for Pango flags
+-
+-if test "x$gdktarget" = "xwin32"; then
+-	PANGO_PACKAGES="pangowin32 pangocairo"
+-else
+-	PANGO_PACKAGES="pango pangocairo"
+-fi
+-
+-AC_MSG_CHECKING(Pango flags)
+-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
+-        PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
+-        PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
+-
+-        AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
+-else
+-        AC_MSG_ERROR([
+-*** Pango not found. Pango built with Cairo support is required
+-*** to build GTK+. See http://www.pango.org for Pango information.
+-])
+-fi
+-
+-CFLAGS="$CFLAGS $PANGO_CFLAGS"
+-
+-if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
+-        :
+-else
+-	gtk_save_LIBS="$LIBS"
+-        LIBS="$PANGO_LIBS $LIBS"
+-        AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
+-*** Can't link to Pango. Pango is required to build
+-*** GTK+. For more information see http://www.pango.org]))
+-        LIBS="$gtk_save_LIBS"
+-fi
+-
+-CFLAGS="$saved_cflags"
+-LDFLAGS="$saved_ldflags"
+-
+-GDK_PACKAGES="$PANGO_PACKAGES"
+-if test "x$gdktarget" = "xx11"; then
+-  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
+-fi
+ GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+ GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+ 
+@@ -1468,7 +1402,7 @@
+ # into the pkg-config files
+ #
+ if test $enable_explicit_deps != yes ; then
+-  GDK_PACKAGES="$PANGO_PACKAGES"
++  GDK_PACKAGES=
+   GDK_EXTRA_LIBS=
+ fi
+ 
+@@ -1479,39 +1413,10 @@
+ AC_SUBST(GDK_DEP_CFLAGS)
+ 
+ 
+-########################################
+-# Check for Accessibility Toolkit flags
+-########################################
+-
+-ATK_PACKAGES=atk
+-AC_MSG_CHECKING(ATK flags)
+-if $PKG_CONFIG --exists $ATK_PACKAGES ; then
+-        ATK_CFLAGS=`$PKG_CONFIG --cflags $ATK_PACKAGES`
+-        ATK_LIBS=`$PKG_CONFIG --libs $ATK_PACKAGES`
+-
+-        AC_MSG_RESULT($ATK_CFLAGS $ATK_LIBS)
+-else
+-        AC_MSG_ERROR([
+-*** Accessibility Toolkit not found. Accessibility Toolkit is required
+-*** to build GTK+.
+-])
+-fi
+-
+-if $PKG_CONFIG --uninstalled $ATK_PACKAGES; then
+-        :
+-else
+-	gtk_save_LIBS="$LIBS"
+-        LIBS="$ATK_LIBS $LIBS"
+-        AC_TRY_LINK_FUNC(atk_object_get_type, : , AC_MSG_ERROR([
+-                *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
+-                *** to build GTK+]))
+-        LIBS="$gtk_save_LIBS"
+-fi
+-
+-GTK_PACKAGES="atk cairo"
++GTK_PACKAGES=
+ GTK_EXTRA_LIBS=
+ GTK_EXTRA_CFLAGS= 
+-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
++GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
+ GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
+ 
+ if test x"$os_win32" = xyes; then
+@@ -1601,17 +1506,6 @@
+ 
+ gtk_save_cppflags="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
+-			  
+-AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
+-*** Can't find cairo-pdf.h. You must build Cairo with the pdf
+-*** backend enabled.]))
+-
+-if test "$os_win32" != "yes"; then
+-  AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
+-*** Can't find cairo-ps.h. You must build Cairo with the 
+-*** postscript backend enabled.]))
+-fi   
+-
+ CPPFLAGS="$gtk_save_cppflags"
+      
+ 			  	

package/libgtk2/libgtk2.mk

@@ -119,17 +119,40 @@ else
 LIBGTK2_CONF_OPT += --disable-cups
 endif
 
-HOST_LIBGTK2_DEPENDENCIES = host-cairo host-libglib2 host-pango host-atk
+# We do not build a full version of libgtk2 for the host, because that
+# requires compiling Cairo, Pango, ATK and X.org for the
+# host. Therefore, we patch it to remove dependencies, and we hack the
+# build to only build gdk-pixbuf-from-source and
+# gtk-update-icon-cache, which are the host tools needed to build Gtk
+# for the target.
+
+HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng
+HOST_LIBGTK2_AUTORECONF = YES
 HOST_LIBGTK2_CONF_OPT = \
 		--disable-static \
 		--disable-glibtest \
 		--without-libtiff \
 		--without-libjpeg \
-		--with-x \
-		--with-gdktarget=x11 \
+		--with-gdktarget=none \
 		--disable-cups \
 		--disable-debug
 
+define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
+ toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$($(NOHOSTPKG)_NAME) host-*.patch
+endef
+
+HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
+
+define HOST_LIBGTK2_BUILD_CMDS
+ $(HOST_MAKE_ENV) make -C $(@D)/gdk-pixbuf
+ $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache
+endef
+
+define HOST_LIBGTK2_INSTALL_CMDS
+ $(HOST_MAKE_ENV) make -C $(@D)/gdk-pixbuf install
+ cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
+endef
+
 $(eval $(call AUTOTARGETS,package,libgtk2))
 $(eval $(call AUTOTARGETS,package,libgtk2,host))
 

package/libpng/libpng.mk

@@ -11,7 +11,12 @@ LIBPNG_INSTALL_STAGING = YES
 LIBPNG_CONF_OPT = --without-libpng-compat
 LIBPNG_DEPENDENCIES = host-pkg-config zlib
 
+HOST_LIBPNG_LIBTOOL_PATCH = NO
+HOST_LIBPNG_CONF_OPT = --without-libpng-compat
+HOST_LIBPNG_DEPENDENCIES = host-pkg-config host-zlib
+
 $(eval $(call AUTOTARGETS,package,libpng))
+$(eval $(call AUTOTARGETS,package,libpng,host))
 
 $(LIBPNG_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" \

package/libraw1394/libraw1394.mk

@@ -6,7 +6,7 @@
 
 LIBRAW1394_VERSION:=1.2.1
 LIBRAW1394_SOURCE:=libraw1394-$(LIBRAW1394_VERSION).tar.gz
-LIBRAW1394_SITE:=http://www.linux1394.org/dl
+LIBRAW1394_SITE:=http://www.kernel.org/pub/linux/libs/ieee1394/
 LIBRAW1394_DIR:=$(BUILD_DIR)/libraw1394-$(LIBRAW1394_VERSION)
 
 $(DL_DIR)/$(LIBRAW1394_SOURCE):

package/libsoup/libsoup.mk

@@ -24,7 +24,7 @@ LIBSOUP_CONF_OPT = \
 	--disable-explicit-deps \
 	--disable-glibtest	\
 	--without-gnome		\
-	--disable-gtk-doc --without-html-dir
+	--disable-gtk-doc
 
 LIBSOUP_DEPENDENCIES = gettext libintl host-pkg-config host-libglib2 libglib2 libxml2
 

package/libxml-parser-perl/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBXML_PARSER_PERL
+       bool "libxml-parser-perl"
+       select BR2_PACKAGE_EXPAT
+       help
+         The Perl XML::Parser module.
+
+	 http://www.cpan.org/modules/by-module/XML/
+

package/libxml-parser-perl/libxml-parser-perl.mk

@@ -0,0 +1,34 @@
+#############################################################
+#
+# libxml-parser-perl
+#
+#############################################################
+LIBXML_PARSER_PERL_VERSION:=2.36
+LIBXML_PARSER_PERL_SOURCE:=XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
+LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/
+
+LIBXML_PARSER_PERL_DEPENDENCIES = expat
+HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat
+
+define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
+ (cd $(@D) ; \
+   perl Makefile.PL \
+        PREFIX=$(HOST_DIR)/usr \
+        EXPATLIBPATH=$(HOST_DIR)/usr/lib \
+        EXPATINCPATH=$(HOST_DIR)/usr/include \
+        INSTALLDIRS=site \
+        INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
+ )
+endef
+
+define HOST_LIBXML_PARSER_PERL_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(call GENTARGETS,package,libxml-parser-perl))
+$(eval $(call GENTARGETS,package,libxml-parser-perl,host))
+

package/libxml2/libxml2.mk

@@ -28,6 +28,8 @@ HOST_LIBXML2_CONF_OPT = \
 		--enable-shared --without-debugging --without-python \
 		--without-threads
 
+HOST_LIBXML2_LIBTOOL_PATCH = NO
+
 $(eval $(call AUTOTARGETS,package,libxml2))
 $(eval $(call AUTOTARGETS,package,libxml2,host))
 

package/libxslt/libxslt.mk

@@ -25,7 +25,15 @@ LIBXSLT_CONF_OPT = --with-gnu-ld --enable-shared \
 
 LIBXSLT_DEPENDENCIES = libxml2 $(LIBXSLT_DEPENDENCIES_EXTRA)
 
+HOST_LIBXSLT_CONF_OPT = --enable-shared \
+			--without-debugging \
+			--without-python \
+			--without-threads
+
+HOST_LIBXSLT_DEPENDENCIES = host-libxml2
+
 $(eval $(call AUTOTARGETS,package,libxslt))
+$(eval $(call AUTOTARGETS,package,libxslt,host))
 
 $(LIBXSLT_HOOK_POST_INSTALL):
 	$(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/xslt-config

package/lvm2/lvm2.mk

@@ -86,9 +86,11 @@ $(LVM2_DIR)/.built: $(LVM2_DIR)/.configured
 
 $(LVM2_TARGET_SBINS) $(LVM2_TARGET_DMSETUP_SBINS): $(LVM2_DIR)/.built
 	cp -a $(STAGING_DIR)/sbin/$(notdir $@) $@
+	touch $@
 
 $(LVM2_TARGET_LIBS): $(LVM2_DIR)/.built
 	cp -a $(STAGING_DIR)/lib/$(notdir $@) $@
+	touch $@
 
 
 ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y)

package/matchbox/matchbox.mk

@@ -141,6 +141,7 @@ $(MATCHBOX_PL_DIR)/.unpacked: $(DL_DIR)/$(MATCHBOX_PL_SOURCE)
 $(MATCHBOX_DP_DIR)/.unpacked: $(DL_DIR)/$(MATCHBOX_DP_SOURCE)
 	$(MATCHBOX_CAT) $(DL_DIR)/$(MATCHBOX_DP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	$(SED) 's:mbfolder\.png:mbtasks\.png:g' $(MATCHBOX_DP_DIR)/modules/tasks.c
+	toolchain/patch-kernel.sh $(MATCHBOX_DP_DIR) package/ buildroot-libtool.patch
 	touch $(MATCHBOX_DP_DIR)/.unpacked
 
 $(MATCHBOX_FK_DIR)/.unpacked: $(DL_DIR)/$(MATCHBOX_FK_SOURCE)
@@ -218,7 +219,7 @@ else
 endif
 
 
-$(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked xlib_libXext-install-staging
+$(MATCHBOX_LIB_DIR)/.configured: $(MATCHBOX_LIB_DIR)/.unpacked
 	(cd $(MATCHBOX_LIB_DIR); rm -f config.cache; \
 	$(TARGET_CONFIGURE_OPTS) \
 	./configure $(QUIET) \
@@ -609,7 +610,7 @@ $(TARGET_DIR)/usr/bin/$(MATCHBOX_KB_BIN): $(STAGING_DIR)/usr/bin/$(MATCHBOX_KB_B
 	cp -af $(STAGING_DIR)/usr/share/matchbox/matchbox-keyboard $(TARGET_DIR)/usr/share/matchbox/
 	cp -dpf ./package/matchbox/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/
 
-matchbox: host-pkg-config expat $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN)
+matchbox: host-pkg-config expat xlib_libXext $(MATCHBOX_WM_DEPS) $(MATCHBOX_SNOTIFY_DEPS) $(MATCHBOX_LIB_DEPS) $(TARGET_DIR)/usr/lib/libmb.so $(TARGET_DIR)/usr/bin/$(MATCHBOX_WM_BIN)
 
 matchbox-panel: matchbox $(TARGET_DIR)/usr/bin/$(MATCHBOX_PL_BIN) $(TARGET_DIR)/usr/bin/matchbox-session $(MATCHBOX_PANEL_DEPS)
 

package/mpfr/mpfr.mk

@@ -107,6 +107,7 @@ $(MPFR_HOST_DIR)/lib/libmpfr$(HOST_LIBEXT): $(MPFR_DIR2)/.configured
 	$(MAKE) -C $(MPFR_DIR2) install
 
 host-libmpfr: $(MPFR_HOST_DIR)/lib/$(MPFR_HOST_BINARY)
+host-libmpfr-source: libmpfr-source
 host-libmpfr-clean:
 	rm -rf $(MPFR_HOST_DIR)
 	-$(MAKE) -C $(MPFR_DIR2) clean

package/multimedia/alsa-lib/Config.in

@@ -1,5 +1,9 @@
 config BR2_PACKAGE_ALSA_LIB
 	bool "alsa-lib"
+	# Temporary until
+	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
+	# is fixed
+	select BR2_PACKAGE_ALSA_LIB_PCM
 	help
 	  The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
 	  functionality to the Linux operating system.

package/multimedia/alsa-utils/Config.in

@@ -24,6 +24,9 @@ config BR2_PACKAGE_ALSA_UTILS_ALSACTL
 config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
 	bool "alsamixer"
 	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_TARGET_PANEL
+	select BR2_PACKAGE_NCURSES_TARGET_FORM
+	select BR2_PACKAGE_NCURSES_TARGET_MENU
 	default y
 
 config BR2_PACKAGE_ALSA_UTILS_AMIDI

package/multimedia/alsa-utils/alsa-utils.mk

@@ -39,6 +39,7 @@ $(ALSA_UTILS_DIR)/.configured: $(ALSA_UTILS_DIR)/.unpacked
 		--prefix=/usr \
 		$(ALSA_UTILS_CONFIGURE_OPTS) \
 		--disable-xmlto \
+		--with-curses=ncurses \
 	)
 	touch $@
 

package/multimedia/gst-plugins-good/Config.in

@@ -172,4 +172,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
 	select BR2_PACKAGE_LIBSOUP
 
+config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
+	bool "speex"
+	select BR2_PACKAGE_SPEEX
+
 endif

package/multimedia/gst-plugins-good/gst-plugins-good.mk

@@ -318,4 +318,11 @@ else
 GST_PLUGINS_GOOD_CONF_OPT += --disable-soup
 endif
 
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX),y)
+GST_PLUGINS_GOOD_CONF_OPT += --enable-speex
+GST_PLUGINS_GOOD_DEPENDENCIES += speex
+else
+GST_PLUGINS_GOOD_CONF_OPT += --disable-speex
+endif
+
 $(eval $(call AUTOTARGETS,package/multimedia,gst-plugins-good))

package/multimedia/madplay/madplay-0.15.2b-switch-to-new-alsa-api.patch

@@ -0,0 +1,173 @@
+Switch madplay to the new API. This is done thanks to a patch written
+by Micha Nelissen <micha@neli.hopto.org> and available at
+http://article.gmane.org/gmane.comp.audio.mad.devel/729.
+
+--- madplay-0.15.2b/audio_alsa.c	2008-10-18 15:10:16.000000000 +0200
++++ madplay-0.15.2b/audio_alsa.c.new	2008-10-18 15:03:27.000000000 +0200
+@@ -28,31 +28,30 @@
+
+ #include <errno.h>
+
+-#define ALSA_PCM_OLD_HW_PARAMS_API
+-#define ALSA_PCM_OLD_SW_PARAMS_API
+ #include <alsa/asoundlib.h>
+
+ #include <mad.h>
+
+ #include "audio.h"
+
+-char *buf	= NULL;
+-int paused	= 0;
++#define BUFFER_TIME_MAX     500000
+
+-int rate	= -1;
+-int channels	= -1;
+-int bitdepth	= -1;
+-int sample_size	= -1;
+-
+-int buffer_time		= 500000;
+-int period_time		= 100000;
+-char *defaultdev	= "plughw:0,0";
++unsigned char *buf  = NULL;
++int paused	    = 0;
++
++unsigned int rate           = 0;
++unsigned int channels	    = -1;
++unsigned int bitdepth	    = -1;
++unsigned int sample_size    = -1;
++
++unsigned int buffer_time;
++unsigned int period_time;
++char *defaultdev	    = "plughw:0,0";
+
+ snd_pcm_hw_params_t *alsa_hwparams;
+ snd_pcm_sw_params_t *alsa_swparams;
+
+-snd_pcm_sframes_t buffer_size;
+-snd_pcm_sframes_t period_size;
++snd_pcm_uframes_t buffer_size;
+
+ snd_pcm_format_t  alsa_format = -1;
+ snd_pcm_access_t  alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+@@ -66,14 +65,20 @@
+ 		 snd_pcm_hw_params_t *params,
+ 		 snd_pcm_access_t access)
+ {
+-	int err, dir;
+-	
++	int err;
++
+ 	/* choose all parameters */
+ 	err = snd_pcm_hw_params_any(handle,params);
+ 	if (err < 0) {
+ 		printf("Access type not available for playback: %s\n", snd_strerror(err));
+ 		return err;
+ 	}
++	/* set the access type */
++	err = snd_pcm_hw_params_set_access(handle, params, alsa_access);
++	if (err < 0) {
++		printf("Sample format not available for playback: %s\n", snd_strerror(err));
++		return err;
++	}
+ 	/* set the sample format */
+ 	err = snd_pcm_hw_params_set_format(handle, params, alsa_format);
+ 	if (err < 0) {
+@@ -87,29 +92,38 @@
+ 		return err;
+ 	}
+ 	/* set the stream rate */
+-	err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0);
++	err = snd_pcm_hw_params_set_rate(handle, params, rate, 0);
+ 	if (err < 0) {
+ 		printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err));
+ 		return err;
+ 	}
+-	if (err != rate) {
+-		printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err);
+-		return -EINVAL;
+-	}
++	err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL);
++        if (err < 0) {
++                printf("Unable to retrieve buffer time: %s\n", snd_strerror(err));
++                return err;
++        }
++        if (buffer_time > BUFFER_TIME_MAX)
++                buffer_time = BUFFER_TIME_MAX;
+ 	/* set buffer time */
+-	err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir);
++	err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, 0);
+ 	if (err < 0) {
+ 		printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err));
+ 		return err;
+ 	}
+-	buffer_size = snd_pcm_hw_params_get_buffer_size(params);
++        if (period_time * 4 > buffer_time)
++                period_time = buffer_time / 4;
+ 	/* set period time */
+-	err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir);
++	err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL);
+ 	if (err < 0) {
+ 		printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err));
+ 		return err;
+ 	}
+-	period_size = snd_pcm_hw_params_get_period_size(params, &dir);
++        /* retrieve buffer size */
++	err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size);
++        if (err < 0) {
++                printf("Unable to retrieve buffer size: %s\n", snd_strerror(err));
++                return err;
++        }
+ 	/* write the parameters to device */
+ 	err = snd_pcm_hw_params(handle, params);
+ 	if (err < 0) {
+@@ -123,6 +137,7 @@
+ int set_swparams(snd_pcm_t *handle,
+ 		 snd_pcm_sw_params_t *params)
+ {
++        unsigned int start_threshold;
+ 	int err;
+
+         /* get current swparams */
+@@ -136,13 +151,7 @@
+         if (err < 0) {
+                 printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err));
+                 return err;
+-										        }
+-        /* allow transfer when at least period_size samples can be processed */
+-        err = snd_pcm_sw_params_set_avail_min(handle, params, period_size);
+-        if (err < 0) {
+-                printf("Unable to set avail min for playback: %s\n", snd_strerror(err));
+-                return err;
+-												        }
++	}
+         /* align all transfers to 1 samples */
+         err = snd_pcm_sw_params_set_xfer_align(handle, params, 1);
+         if (err < 0) {
+@@ -190,7 +199,7 @@
+ 	rate		= config->speed;
+
+ 	if ( bitdepth == 0 )
+-		config->precision = bitdepth = 32;
++		config->precision = bitdepth = 16;
+
+ 	switch (bitdepth)
+ 	{
+@@ -241,7 +250,7 @@
+ 		return -1;
+ 	}
+
+-	buf = malloc(buffer_size);
++	buf = malloc(buffer_size * sample_size);
+ 	if (buf == NULL) {
+ 		audio_error="unable to allocate output buffer table";
+ 		return -1;
+@@ -279,7 +288,7 @@
+ int play(struct audio_play *play)
+ {
+ 	int err, len;
+-	char *ptr;
++	unsigned char *ptr;
+
+ 	ptr = buf;
+ 	len = play->nsamples;
+

package/multimedia/mplayer/mplayer.mk

@@ -54,7 +54,7 @@ $(MPLAYER_DIR)/.configured: $(MPLAYER_DIR)/.unpacked
 		--as=$(TARGET_CROSS)as \
 		--with-extraincdir=$(STAGING_DIR)/usr/include \
 		--with-extralibdir=$(STAGING_DIR)/lib \
-		--charset=US-ASCII \
+		--charset=UTF-8 \
 		--enable-mad \
 		--enable-fbdev \
 		$(MPLAYER_ENDIAN) \

package/netsnmp/netsnmp.mk

@@ -58,7 +58,7 @@ endif
 
 $(NETSNMP_DIR)/.configured: $(NETSNMP_DIR)/.unpacked
 	(cd $(NETSNMP_DIR); rm -f config.cache; \
-		autoconf && \
+		$(AUTOCONF) && \
 		ac_cv_NETSNMP_CAN_USE_SYSCTL=yes \
 		$(NETSNMP_CONFIGURE_PERL_ENV) \
 		$(TARGET_CONFIGURE_OPTS) \
@@ -130,7 +130,7 @@ endif
 	$(INSTALL) -D -m 0644 $(NETSNMP_DIR)/agent/mibgroup/header_complex.h $(STAGING_DIR)/usr/include/net-snmp/agent/header_complex.h
 	$(INSTALL) -D -m 0755 package/netsnmp/S59snmpd $(TARGET_DIR)/etc/init.d/S59snmpd
 
-netsnmp: $(if $(BR2_PACKAGE_OPENSSL),openssl) $(TARGET_DIR)/usr/sbin/snmpd
+netsnmp: host-autoconf $(if $(BR2_PACKAGE_OPENSSL),openssl) $(TARGET_DIR)/usr/sbin/snmpd
 
 netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
 	$(INSTALL) -d $(TARGET_DIR)/usr/include/net-snmp

package/openmotif/Config.in

@@ -1,7 +0,0 @@
-config BR2_PACKAGE_OPENMOTIF
-	bool "openmotif"
-	help
-	  OpenMotif is the publicly licensed version of Motif, the
-	  industry standard user interface toolkit for UNIX systems.
-
-	  ftp://ftp.ics.com/openmotif/2.3/2.3.0

package/openmotif/README

@@ -1,2 +0,0 @@
-Compiling OpenMotif may require byacc (or just yacc) 
-to be installed on the host build system 

package/openmotif/openmotif-2.3.0-cross-compile.patch

@@ -1,106 +0,0 @@
---- a/lib/Xm/Makefile.in	2007-08-09 03:27:55.000000000 -0400
-+++ b/lib/Xm/Makefile.in	2008-02-27 10:45:45.000000000 -0500
-@@ -1130,7 +1130,7 @@ $(STRING_FILES): Makefile $(XMSTRING_LIS
- 	test -f XmStrDefs23.ht || $(LN_S) $(srcdir)/XmStrDefs23.ht XmStrDefs23.ht
- 	test -f XmStrDefsI.ht || $(LN_S) $(srcdir)/XmStrDefsI.ht XmStrDefsI.ht
- 	test -f XmStrDefs.ct || $(LN_S) $(srcdir)/XmStrDefs.ct XmStrDefs.ct
--	$(top_builddir)/config/util/makestrs -f $(XMSTRING_LIST) >XmStrDefs.c
-+	$(top_builddir)/config/util/makestrs-host -f $(XMSTRING_LIST) >XmStrDefs.c
- 
- @MessageCatalog_TRUE@$(CAT_FILES): Xm.msg
- @MessageCatalog_TRUE@	$(mkinstalldirs) $(top_builddir)/localized/C/msg
-
---- a/lib/Xm/Makefile.am	2005-12-17 10:04:02.000000000 -0500
-+++ b/lib/Xm/Makefile.am	2008-02-27 10:40:01.000000000 -0500
-@@ -284,7 +284,7 @@ $(STRING_FILES): Makefile $(XMSTRING_LIS
- 	test -f XmStrDefs23.ht || $(LN_S) $(srcdir)/XmStrDefs23.ht XmStrDefs23.ht
- 	test -f XmStrDefsI.ht || $(LN_S) $(srcdir)/XmStrDefsI.ht XmStrDefsI.ht
- 	test -f XmStrDefs.ct || $(LN_S) $(srcdir)/XmStrDefs.ct XmStrDefs.ct
--	$(top_builddir)/config/util/makestrs -f $(XMSTRING_LIST) >XmStrDefs.c
-+	$(top_builddir)/config/util/makestrs-host -f $(XMSTRING_LIST) >XmStrDefs.c
- 
- if MessageCatalog
-
---- a/tools/wml/Makefile.in	2008-02-27 11:24:14.000000000 -0500
-+++ b/tools/wml/Makefile.in	2008-02-27 11:32:33.000000000 -0500
-@@ -617,9 +617,9 @@ UilLexPars.c: Uil.c
- 
- $(WMLTARGETS): wmluiltok wml UilLexPars.c $(TABLE)
- 	$(RM) $(WMLTARGETS) wml.report wml-uil.mm
--	./wmluiltok <$(srcdir)/Uil.y >tokens.dat
-+	./wmluiltok-host <$(srcdir)/Uil.y >tokens.dat
- 	$(RM) wml-uil.mm
--	./wml $(srcdir)/$(TABLE)
-+	./wml-host $(srcdir)/$(TABLE)
- 	$(RM) tokens.dat
- 
- all: motif.wmd
-
---- a/tools/wml/Makefile.am	2002-10-06 09:08:48.000000000 -0400
-+++ b/tools/wml/Makefile.am	2008-02-27 11:33:04.000000000 -0500
-@@ -50,9 +50,9 @@ UilLexPars.c: Uil.c
- 
- $(WMLTARGETS): wmluiltok wml UilLexPars.c $(TABLE)
- 	$(RM) $(WMLTARGETS) wml.report wml-uil.mm
--	./wmluiltok <$(srcdir)/Uil.y >tokens.dat
-+	./wmluiltok-host <$(srcdir)/Uil.y >tokens.dat
- 	$(RM) wml-uil.mm
--	./wml $(srcdir)/$(TABLE)
-+	./wml-host $(srcdir)/$(TABLE)
- 	$(RM) tokens.dat
- 
- all: motif.wmd
-
---- a/demos/lib/Exm/wml/Makefile.am	2002-10-06 09:08:47.000000000 -0400
-+++ b/demos/lib/Exm/wml/Makefile.am	2008-02-27 13:29:08.000000000 -0500
-@@ -65,11 +65,11 @@ $(TARGETS):	$(TABLE) $(WMLDIR)/motif.wml
- # 	$(YACC) -d $(YACCFLAGS) $(UILY)
- # 	$(MV) y.tab.c UilLexPars.c
- # 	$(MV) y.tab.h UilLexPars.h
--	$(top_builddir)/tools/wml/wmluiltok < $(UILY) > tokens.dat
-+	$(top_builddir)/tools/wml/wmluiltok-host < $(UILY) > tokens.dat
- # 	$(RM) wml-uil.mm
- 	$(RM) Exm.h
- 	$(LN_S) $(srcdir)/$(TABLE) ./Exm.h
--	$(CPP) -I$(WMLDIR) Exm.h | $(top_builddir)/tools/wml/wml
-+	$(CPP) -I$(WMLDIR) Exm.h | $(top_builddir)/tools/wml/wml-host
- 	$(RM) Exm.h
- # 	$(RM) tokens.dat
- # 
-
---- a/tools/wml/wmluiltok.c	2007-08-09 03:47:17.000000000 -0400
-+++ b/tools/wml/wmluiltok.c	2008-02-27 12:13:02.000000000 -0500
-@@ -1689,13 +1689,13 @@ void *ptr;
- 	free( ptr );
- 	}
- 
--#if YY_MAIN
-+//#if YY_MAIN
- int main()
- 	{
- 	yylex();
- 	return 0;
- 	}
--#endif
-+//#endif
- #line 183 "wmluiltok.l"
-
-
---- a/ltmain.sh	2006-07-13 03:12:13.000000000 -0400
-+++ b/ltmain.sh	2008-02-27 14:50:40.000000000 -0500
-@@ -5427,13 +5427,13 @@ else
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+      exec \"\$progdir\\\\\$program-host\" \${1+\"\$@\"}
- "
- 	  ;;
- 
- 	*)
- 	  $echo >> $output "\
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+      exec \"\$progdir/\$program-host\" \${1+\"\$@\"}
- "
- 	  ;;
- 	esac

package/openmotif/openmotif-2.3.0-legacy-bzero-must-die.patch

@@ -1,758 +0,0 @@
-diff -rup a/lib/Xm/BaseClass.c b/lib/Xm/BaseClass.c
---- a/lib/Xm/BaseClass.c	2002-01-10 15:56:19.000000000 -0500
-+++ b/lib/Xm/BaseClass.c	2008-02-27 12:56:46.000000000 -0500
-@@ -56,7 +56,7 @@ static char rcsid[] = "$TOG: BaseClass.c
- #include <Xm/ExtObjectP.h>
- #include <Xm/Screen.h>
- #include <Xm/VendorSEP.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include "BaseClassI.h"
- #include "CallbackI.h"
- #include "DropSMgrI.h"
-diff -rup a/lib/Xm/Color.c b/lib/Xm/Color.c
---- a/lib/Xm/Color.c	2002-01-10 15:56:22.000000000 -0500
-+++ b/lib/Xm/Color.c	2008-02-27 12:57:01.000000000 -0500
-@@ -50,7 +50,7 @@
- #include <Xm/ManagerP.h>
- #include <Xm/PrimitiveP.h>
- #include <Xm/XmP.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include "ColorI.h"
- #include "ImageCachI.h"
- #include "MessagesI.h"
-diff -rup a/lib/Xm/ComboBox.c b/lib/Xm/ComboBox.c
---- a/lib/Xm/ComboBox.c	2005-05-18 07:43:44.000000000 -0400
-+++ b/lib/Xm/ComboBox.c	2008-02-27 12:57:20.000000000 -0500
-@@ -45,7 +45,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <Xm/XmP.h>
--#include <Xm/XmosP.h>		/* for bzero et al */
-+#include <Xm/XmosP.h>		
- #include <X11/Shell.h>
- #include <X11/cursorfont.h>
- #include <X11/keysym.h>
-@@ -1431,7 +1431,7 @@ ComboBoxParentProcess(Widget		  wid,
- 	    {
- 	      XmListCallbackStruct call_data;
- 	
--	      bzero((char*) &call_data, sizeof(XmListCallbackStruct));
-+	      memset((char*) &call_data, 0, sizeof(XmListCallbackStruct));
- 	      if (pos)
- 		{
- 		  call_data.item		    = XmStringCopy(item);
-diff -rup a/lib/Xm/Container.c b/lib/Xm/Container.c
---- a/lib/Xm/Container.c	2005-07-13 05:25:16.000000000 -0400
-+++ b/lib/Xm/Container.c	2008-02-27 12:57:46.000000000 -0500
-@@ -79,7 +79,7 @@
- #include "CareVisualTI.h"
- #include "MessagesI.h"
- #include "ClipWindTI.h"
--#include <Xm/XmosP.h>                /* for bzero et al */
-+#include <Xm/XmosP.h>                
- 
- #define	ZERO_DIM	0
- #define	DEFAULT_INDENTATION	40
-@@ -9417,7 +9417,7 @@ ScrollProc(
- 	/* get the current position */
- 	nav_data.valueMask =
- 	    NavValue | NavIncrement | NavMinimum | NavMaximum | NavSliderSize;
--	bzero(&nav_data,sizeof(XmNavigatorDataRec));
-+	memset(&nav_data, 0, sizeof(XmNavigatorDataRec));
- 	navigatorTrait->getValue(*nav, &nav_data);
- 
- 	/* compute the new position */
-diff -rup a/lib/Xm/DropSMgr.c b/lib/Xm/DropSMgr.c
---- a/lib/Xm/DropSMgr.c	2006-04-20 07:26:07.000000000 -0400
-+++ b/lib/Xm/DropSMgr.c	2008-02-27 12:58:12.000000000 -0500
-@@ -98,7 +98,7 @@ static char rcsid[] = "$TOG: DropSMgr.c 
- #include <Xm/ManagerP.h>
- #include <Xm/DragC.h>
- #include <Xm/DropTrans.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include "XmI.h"
- #include "DisplayI.h"
- #include "DragBSI.h"
-@@ -2401,7 +2401,7 @@ PutDSToStream(
- 	 * that the widget does not define resources all of the required
- 	 * animation resources.
- 	 */
--	bzero(((void *) &iccInfo), sizeof(iccInfo));
-+	memset(((void *) &iccInfo), 0, sizeof(iccInfo));
- 
- 	if (last)
- 		tType |= XmDSM_T_CLOSE;
-@@ -3283,7 +3283,7 @@ CreateInfo(
- 	size_t size;
- 
- 	/* zero out the working info struct */
--	bzero((void *)(&fullInfoRec), sizeof(fullInfoRec));
-+	memset((void *)(&fullInfoRec), 0, sizeof(fullInfoRec));
- 
- 	/* Load that puppy */
- 	SetDSLeaf(&fullInfoRec, True);
-@@ -3448,7 +3448,7 @@ int index;
- 	/*
- 	 * Clear the full info back to the default (kind of) state.
- 	 */
--	bzero((void *)(full_info), sizeof(XmDSFullInfoRec));
-+	memset((void *)(full_info), 0, sizeof(XmDSFullInfoRec));
- 	full_info->animation_pixmap = XmUNSPECIFIED_PIXMAP;
- 	full_info->animation_mask = XmUNSPECIFIED_PIXMAP;
- 
-diff -rup a/lib/Xm/FileSB.c b/lib/Xm/FileSB.c
---- a/lib/Xm/FileSB.c	2005-12-27 06:14:13.000000000 -0500
-+++ b/lib/Xm/FileSB.c	2008-02-27 12:49:09.000000000 -0500
-@@ -2643,7 +2643,7 @@ SetValues(
-     *   picked-up there by the XmNqualifySearchDataProc routine to fill
-     *   in the value field of the search data.
-     */
--    bzero( (char*)&searchData, sizeof( XmFileSelectionBoxCallbackStruct)) ;
-+    memset( (char*)&searchData, 0, sizeof( XmFileSelectionBoxCallbackStruct)) ;
- 
-     if(    FS_DirMask( new_w) != FS_DirMask( current)    )
-     {   
-diff -rup a/lib/Xm/List.c b/lib/Xm/List.c
---- a/lib/Xm/List.c	2007-01-24 12:07:35.000000000 -0500
-+++ b/lib/Xm/List.c	2008-02-27 12:49:27.000000000 -0500
-@@ -5696,7 +5696,7 @@ ClickElement(XmListWidget lw,
-   unsigned char selection_policy;
-   XmListCallbackStruct cb;
- 
--  bzero((char*) &cb, sizeof(XmListCallbackStruct));
-+  memset((char*) &cb, 0, sizeof(XmListCallbackStruct));
-   item = lw->list.LastHLItem;
-   lw->list.DidSelection = TRUE;
- 
-diff -rup a/lib/Xm/Obso2_0.c b/lib/Xm/Obso2_0.c
---- a/lib/Xm/Obso2_0.c	2002-05-14 17:29:03.000000000 -0400
-+++ b/lib/Xm/Obso2_0.c	2008-02-27 12:50:04.000000000 -0500
-@@ -512,7 +512,7 @@ _XmGetDefaultThresholdsForScreen( Screen
-   * that call this routine don't have a widget, we need this hack
-   * to create a dummy widget.
-   */
--  bzero((void*) &widget, sizeof(widget) );
-+  memset((void*) &widget, 0, sizeof(widget) );
-   widget.core.self = &widget;
-   widget.core.widget_class = coreWidgetClass;
-   widget.core.screen = screen;
-diff -rup a/lib/Xm/Protocols.c b/lib/Xm/Protocols.c
---- a/lib/Xm/Protocols.c	2002-05-14 17:29:23.000000000 -0400
-+++ b/lib/Xm/Protocols.c	2008-02-27 12:58:54.000000000 -0500
-@@ -48,7 +48,7 @@ static char rcsid[] = "$XConsortium: Pro
- 
- /* (c) Copyright 1987, 1988, 1989, 1990, 1991, 1992 HEWLETT-PACKARD COMPANY */
- 
--#include <Xm/XmosP.h>           /* for bzero et al */
-+#include <Xm/XmosP.h>          
- #include <Xm/ProtocolsP.h>
- #include "BaseClassI.h"
- #include "CallbackI.h"
-@@ -327,7 +327,7 @@ RemoveAllPMgr(
- 
-     XtInsertEventHandler( w, KeyPressMask, TRUE, RemoveAllPMgrHandler,
-                                                          closure, XtListHead) ;
--    bzero((void *) &ev, sizeof(XEvent));
-+    memset((void *) &ev, 0, sizeof(XEvent));
-     ev.xkey.type = KeyPress ;
-     ev.xkey.display = XtDisplay( w) ;
-     ev.xkey.time = XtLastTimestampProcessed( XtDisplay( w)) ;
-diff -rup a/lib/Xm/RCLayout.c b/lib/Xm/RCLayout.c
---- a/lib/Xm/RCLayout.c	2002-01-30 10:47:18.000000000 -0500
-+++ b/lib/Xm/RCLayout.c	2008-02-27 12:58:35.000000000 -0500
-@@ -62,7 +62,7 @@ static char *rcsid = "$XConsortium: RCLa
- #include <Xm/RowColumnP.h>
- #include <Xm/TearOffBP.h>
- #include <Xm/TearOffP.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include "LabelGI.h"
- #include "GeoUtilsI.h"
- #include "RCLayoutI.h"
-@@ -1947,7 +1947,7 @@ _XmRC_SetOrGetTextMargins(
- 
-   if (op == XmBASELINE_GET) {
-     /* in case the class does not have this procedure */
--    bzero((void *) textMargins, sizeof(XmBaselineMargins));
-+    memset((void *) textMargins, 0, sizeof(XmBaselineMargins));
-   }
- 
-   textMargins->get_or_set = op;
-diff -rup a/lib/Xm/ResConvert.c b/lib/Xm/ResConvert.c
---- a/lib/Xm/ResConvert.c	2003-10-22 12:26:08.000000000 -0400
-+++ b/lib/Xm/ResConvert.c	2008-02-27 12:51:24.000000000 -0500
-@@ -2600,7 +2600,7 @@ GetNextTab(char **s,
-   char 	sign[2];
-   char	*tmp;
- 
--  bzero(sign, sizeof(sign));
-+  memset(sign, 0, sizeof(sign));
-   unitType[0] = '\0';
-   
-   if (sscanf(*s, " %2[+]", sign) == 1)
-diff -rup a/lib/Xm/TearOff.c b/lib/Xm/TearOff.c
---- a/lib/Xm/TearOff.c	2003-10-06 06:10:24.000000000 -0400
-+++ b/lib/Xm/TearOff.c	2008-02-27 12:59:10.000000000 -0500
-@@ -63,7 +63,7 @@ static char rcsid[] = "$TOG: TearOff.c /
- #include <Xm/SeparatorP.h>
- #include <Xm/TraitP.h>
- #include <Xm/VirtKeysP.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include "MenuStateI.h"
- #include "MenuUtilI.h"
- #include "RCMenuI.h"
-@@ -1095,7 +1095,7 @@ _XmTearOffInitiate(
-    }
-    else
-    {
--      bzero((void *)&sprop, sizeof(sprop));
-+      memset((void *)&sprop, 0, sizeof(sprop));
-       /* Fix for 9346,  use sizeof(long) to calculate total
- 	 size of block from get property */
-       memcpy(&sprop, rprop, (size_t)sizeof(long) * num_items);
-diff -rup a/lib/Xm/TxtPropCv.c b/lib/Xm/TxtPropCv.c
---- a/lib/Xm/TxtPropCv.c	2005-06-10 07:50:56.000000000 -0400
-+++ b/lib/Xm/TxtPropCv.c	2008-02-27 12:52:24.000000000 -0500
-@@ -192,7 +192,7 @@ GetTextSegment(Display *display, /* unus
- 	      /* The text should be already be valid locale text */
- 	      char *tmp = XtMalloc(char_count + sizeof(wchar_t));
- 	      memcpy(tmp, text, char_count);
--	      bzero(tmp + char_count, sizeof(wchar_t));
-+	      memset(tmp + char_count, 0, sizeof(wchar_t));
- 
- 	      *buffer = tmp;
- 	    }
-@@ -216,7 +216,7 @@ GetTextSegment(Display *display, /* unus
- 		     already be valid locale text. */
- 		  char *tmp = XtMalloc(char_count + sizeof(wchar_t));
- 		  memcpy(tmp, text, char_count);
--		  bzero(tmp + char_count, sizeof(wchar_t));
-+		  memset(tmp + char_count, 0, sizeof(wchar_t));
- 
- 		  *buffer = tmp;
- 		}
-@@ -226,7 +226,7 @@ GetTextSegment(Display *display, /* unus
- 		  /* The text is valid STRING text */
- 		  char *tmp = XtMalloc(char_count + sizeof(wchar_t));
- 		  memcpy(tmp, text, char_count);
--		  bzero(tmp + char_count, sizeof(wchar_t));
-+		  memset(tmp + char_count, 0, sizeof(wchar_t));
- 
- 		  *buffer = tmp;
- 		}
-diff -rup a/lib/Xm/VendorS.c b/lib/Xm/VendorS.c
---- a/lib/Xm/VendorS.c	2006-11-08 09:18:05.000000000 -0500
-+++ b/lib/Xm/VendorS.c	2008-02-27 12:59:26.000000000 -0500
-@@ -65,7 +65,7 @@ static char rcsid[] = "$TOG: VendorS.c /
- #include <Xm/UnitTypeT.h>
- #include <Xm/VendorSEP.h>
- #include <Xm/VendorSP.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include <Xm/ToolTipCT.h>
- #include "BaseClassI.h"
- #include "CallbackI.h"
-@@ -1818,7 +1818,7 @@ MotifWarningHandler (String name,
-      char *par[10];
-      if (i > 10) i = 10;
-      memcpy((char*)par, (char*)params, i * sizeof(String));
--     bzero((char *)&par[i], (10-i) * sizeof(String));
-+     memset((char *)&par[i], 0, (10-i) * sizeof(String));
-      (void) sprintf(&buf[strlen(buf)], buf2, par[0], par[1], par[2], par[3],
- 		    par[4], par[5], par[6], par[7], par[8], par[9]);
-    } else
-diff -rup a/lib/Xm/Xmfuncs.h b/lib/Xm/Xmfuncs.h
---- a/lib/Xm/Xmfuncs.h	2002-01-04 16:23:20.000000000 -0500
-+++ b/lib/Xm/Xmfuncs.h	2008-02-27 12:36:01.000000000 -0500
-@@ -36,14 +36,14 @@ in this Software without prior written a
- 
- #ifdef X_USEBFUNCS
- void bcopy();
--void bzero();
-+//void bzero();
- int bcmp();
- #else
- #if (__STDC__ && !defined(X_NOT_STDC_ENV) && !defined(sun) && !defined(macII) && !defined(apollo)) || defined(SVR4) || defined(hpux) || defined(_IBMR2) || defined(_SEQUENT_)
- #include <string.h>
- #define _XFUNCS_H_INCLUDED_STRING_H
- #define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len))
--#define bzero(b,len) memset(b, 0, (size_t)(len))
-+//#define bzero(b,len) memset(b, 0, (size_t)(len))
- #define bcmp(b1,b2,len) memcmp(b1, b2, (size_t)(len))
- #else
- #ifdef sgi
-@@ -52,11 +52,11 @@ int bcmp();
- #ifdef SYSV
- #include <memory.h>
- void bcopy();
--#define bzero(b,len) memset(b, 0, len)
-+//#define bzero(b,len) memset(b, 0, len)
- #define bcmp(b1,b2,len) memcmp(b1, b2, len)
- #else /* bsd */
- void bcopy();
--void bzero();
-+//void bzero();
- int bcmp();
- #endif /* SYSV */
- #endif /* sgi */
-@@ -70,8 +70,8 @@ int bcmp();
- #ifndef _XFUNCS_H_INCLUDED_STRING_H
- #include <string.h>
- #endif
--#undef bzero
--#define bzero(b,len) memset(b,0,len)
-+//#undef bzero
-+//#define bzero(b,len) memset(b,0,len)
- #else /* else X_NOT_STDC_ENV or SunOS 4 */
- #if defined(SYSV) || defined(luna) || defined(sun) || defined(__sxg__)
- #include <memory.h>
-diff -rup a/lib/Xm/XmIm.c b/lib/Xm/XmIm.c
---- a/lib/Xm/XmIm.c	2005-07-18 09:01:07.000000000 -0400
-+++ b/lib/Xm/XmIm.c	2008-02-27 12:59:39.000000000 -0500
-@@ -60,7 +60,7 @@ static char rcsid[] = "$TOG: XmIm.c /mai
- #include <Xm/PrimitiveP.h>
- #include <Xm/VendorSEP.h>
- #include <Xm/VendorSP.h>
--#include <Xm/XmosP.h>		/* for bzero */
-+#include <Xm/XmosP.h>		
- #include "BaseClassI.h"
- #include "MessagesI.h"
- #include "XmI.h"
-@@ -1035,7 +1035,7 @@ recreate_xic_info(XIC		  xic,
-   
-   /* This XIC must have been created by the application directly. */
-   xic_info = XtNew(XmImXICRec);
--  bzero((char*) xic_info, sizeof(XmImXICRec));
-+  memset((char*) xic_info, 0, sizeof(XmImXICRec));
-   (void) XGetICValues(xic, XNInputStyle, &xic_info->input_style, NULL);
-   xic_info->next = im_info->iclist;
-   im_info->iclist = xic_info;
-@@ -1128,11 +1128,11 @@ create_xic_info(Widget		shell,
-   
-   /* Create the XIC info record. */
-   xic_info = XtNew(XmImXICRec);
--  bzero((char*) xic_info, sizeof(XmImXICRec));
-+  memset((char*) xic_info, 0, sizeof(XmImXICRec));
-   xic_info->input_style = style;
-   xic_info->anonymous = True;
-   xic_info->preedit_buffer = XtNew(PreeditBufferRec);
--  bzero((char *) xic_info->preedit_buffer, sizeof(PreeditBufferRec));
-+  memset((char *) xic_info->preedit_buffer, 0, sizeof(PreeditBufferRec));
-   
-   xic_info->next = im_info->iclist;
-   im_info->iclist = xic_info;
-@@ -1215,9 +1215,9 @@ set_values(Widget w,
-       icp->focus_window && icp->focus_window != XtWindow(w))
-     return;
-   
--  bzero((char*) &status_vlist, sizeof(VaArgListRec));
--  bzero((char*) &preedit_vlist, sizeof(VaArgListRec));
--  bzero((char*) &xic_vlist, sizeof(VaArgListRec));
-+  memset((char*) &status_vlist, 0, sizeof(VaArgListRec));
-+  memset((char*) &preedit_vlist, 0, sizeof(VaArgListRec));
-+  memset((char*) &xic_vlist, 0, sizeof(VaArgListRec));
-   for (i = num_args; i > 0; i--, argp++) {
-     name = XrmStringToName(argp->name);
-     if (name == area_name && !(icp->input_style & XIMPreeditPosition))
-@@ -1490,7 +1490,7 @@ ImPreeditDoneCallback(XIC xic,
-     XtFree((char *)icp->preedit_buffer->text);
-   if (icp->preedit_buffer->feedback)
-     XtFree((char *)icp->preedit_buffer->feedback);
--  bzero((char *)icp->preedit_buffer, sizeof(PreeditBufferRec)); 
-+  memset((char *)icp->preedit_buffer, 0, sizeof(PreeditBufferRec)); 
- }
- 
- static void
-@@ -1589,9 +1589,9 @@ ImPreeditDrawCallback(XIC xic,
- 		text->length * sizeof(XIMFeedback));
- 
-       pb->length = pb->length + text->length - data->chg_length;
--      bzero((char *)pb->text + pb->length * sizeof(wchar_t),
-+      memset((char *)pb->text + pb->length * sizeof(wchar_t), 0,
- 	    sizeof(wchar_t));
--      bzero((char *)pb->feedback + pb->length * sizeof(XIMFeedback),
-+      memset((char *)pb->feedback + pb->length * sizeof(XIMFeedback), 0,
- 	    sizeof(XIMFeedback));
- 
-       XtFree((char *) wchar);
-@@ -1609,9 +1609,9 @@ ImPreeditDrawCallback(XIC xic,
- 	    ml * sizeof(XIMFeedback));
- 
-     pb->length = pb->length - data->chg_length;
--    bzero((char *)pb->text + pb->length * sizeof(wchar_t),
-+    memset((char *)pb->text + pb->length * sizeof(wchar_t), 0,
- 	  data->chg_length * sizeof(wchar_t));
--    bzero((char *)pb->feedback + pb->length * sizeof(XIMFeedback),
-+    memset((char *)pb->feedback + pb->length * sizeof(XIMFeedback), 0,
- 	  data->chg_length * sizeof(XIMFeedback));
-   }
- 
-@@ -2217,7 +2217,7 @@ get_xim_info(Widget  widget)
-   
-   /* Create a record so that we only try XOpenIM() once. */
-   xim_info = XtNew(XmImDisplayRec);
--  bzero((char*) xim_info, sizeof(XmImDisplayRec));
-+  memset((char*) xim_info, 0, sizeof(XmImDisplayRec));
-   xmDisplay->display.xmim_info = (XtPointer)xim_info;
-   
-   /* Setup any specified locale modifiers. */
-@@ -2305,7 +2305,7 @@ get_im_info_ptr(Widget  w,
-   if ((ve->vendor.im_info == NULL) && create)
-     {
-       im_info = XtNew(XmImShellRec);
--      bzero((char*) im_info, sizeof(XmImShellRec));
-+      memset((char*) im_info, 0, sizeof(XmImShellRec));
-       ve->vendor.im_info = (XtPointer)im_info;
-       
-       xim_info = get_xim_info(p);
-diff -rup a/lib/Xm/XmosP.h b/lib/Xm/XmosP.h
---- a/lib/Xm/XmosP.h	2002-06-17 16:36:30.000000000 -0400
-+++ b/lib/Xm/XmosP.h	2008-02-27 13:00:08.000000000 -0500
-@@ -42,8 +42,8 @@
- #ifndef _XmosP_h
- #define _XmosP_h
- 
--/* Some SVR4 systems don't have bzero. */
--#include <Xm/Xmfuncs.h>		/* for bzero et al */
-+
-+#include <Xm/Xmfuncs.h>		
- 
- /*
-  * Fix for 8975 - using LOGNAME instead of USER on SYSV and SVR4 
-diff -rup a/lib/Xm/Xmos_r.h b/lib/Xm/Xmos_r.h
---- a/lib/Xm/Xmos_r.h	2002-06-17 16:36:30.000000000 -0400
-+++ b/lib/Xm/Xmos_r.h	2008-02-27 13:01:20.000000000 -0500
-@@ -502,13 +502,13 @@ typedef struct {
-   struct servent_data sdata;
- } _Xgetservbynameparams;
- #  define _XGethostbyname(h,hp) \
--  (bzero((char*)&(hp).hdata,sizeof((hp).hdata)),	\
-+  (memset((char*)&(hp).hdata,sizeof((hp).hdata)), 0,	\
-    ((gethostbyname_r((h),&(hp).hent,&(hp).hdata) == -1) ? NULL : &(hp).hent))
- #  define _XGethostbyaddr(a,al,t,hp) \
--  (bzero((char*)&(hp).hdata,sizeof((hp).hdata)),	\
-+  (memset((char*)&(hp).hdata,sizeof((hp).hdata)), 0,	\
-    ((gethostbyaddr_r((a),(al),(t),&(hp).hent,&(hp).hdata) == -1) ? NULL : &(hp).hent))
- #  define _XGetservbyname(s,p,sp) \
--  (bzero((char*)&(sp).sdata,sizeof((sp).sdata)),	\
-+  (memset((char*)&(sp).sdata,sizeof((sp).sdata)), 0,	\
-    ((getservbyname_r((s),(p),&(sp).sent,&(sp).sdata) == -1) ? NULL : &(sp).sent) )
- # endif
- # ifdef X_POSIX_THREAD_SAFE_FUNCTIONS
-diff -rup a/lib/Xm/Xmpoll.h b/lib/Xm/Xmpoll.h
---- a/lib/Xm/Xmpoll.h	2002-06-17 16:36:30.000000000 -0400
-+++ b/lib/Xm/Xmpoll.h	2008-02-27 13:01:38.000000000 -0500
-@@ -110,7 +110,7 @@ typedef struct fd_set {
- #define FD_ISSET(n, p)  ((p)->fds_bits[(n)/NFDBITS] & ((fd_mask)1 << ((n) % NFDBITS)))
- #endif
- #ifndef FD_ZERO
--#define FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
-+#define FD_ZERO(p)      memset((char *)(p), 0, sizeof(*(p)))
- #endif
- 
- /*
-diff -rup a/lib/Xm/XmRenderT.c b/lib/Xm/XmRenderT.c
---- a/lib/Xm/XmRenderT.c	2005-09-07 05:06:10.000000000 -0400
-+++ b/lib/Xm/XmRenderT.c	2008-02-27 13:02:27.000000000 -0500
-@@ -435,7 +435,7 @@ GetResources(XmRendition rend,
-   /* Initialize found */
-   if (found == NULL)
-     found = (Boolean *)XtMalloc(_XmNumRenditionResources * sizeof(Boolean));
--  bzero(found, _XmNumRenditionResources * sizeof(Boolean));
-+  memset(found, 0, _XmNumRenditionResources * sizeof(Boolean));
- 
-   /* Compile names and classes. */
-   if (wid != NULL)
-@@ -588,7 +588,7 @@ GetResources(XmRendition rend,
- 		memcpy(((char *)GetPtr(rend) + res->xrm_offset),
- 		       value.addr, res->xrm_size);
- 	      else 
--		bzero(((char *)GetPtr(rend) + res->xrm_offset), res->xrm_size);
-+		memset(((char *)GetPtr(rend) + res->xrm_offset), 0, res->xrm_size);
- 	    }
- 	      
- 	}
-@@ -1185,7 +1185,7 @@ CloneRendition(XmRendition rend)
-   if (rend == NULL) return(NULL);
-   
-   copy = (_XmRendition)XtMalloc(sizeof(_XmRenditionRec));
--  bzero((char*)copy, sizeof(_XmRenditionRec));
-+  memset((char*)copy, 0, sizeof(_XmRenditionRec));
-   copy_handle = GetHandle(_XmRendition);
-   SetPtr(copy_handle, copy);
-   
-@@ -1341,7 +1341,7 @@ XmRenderTableAddRenditions(XmRenderTable
-     {
-       matches =
- 	(Boolean *)ALLOCATE_LOCAL(rendition_count * sizeof(Boolean));
--      bzero(matches, rendition_count * sizeof(Boolean));
-+      memset(matches, 0, rendition_count * sizeof(Boolean));
-       
-       /* May have to copy table if shared. */
-       if (_XmRTRefcount(oldtable) > 1)
-@@ -2201,7 +2201,7 @@ _XmRenditionCreate(Display *display,
- 
-   /* Allocate rendition. */
-   rend_int = (_XmRendition)XtMalloc(sizeof(_XmRenditionRec));
--  bzero((char*)rend_int, sizeof(_XmRenditionRec));
-+  memset((char*)rend_int, 0, sizeof(_XmRenditionRec));
-   rend = GetHandle(_XmRendition);
-   SetPtr(rend, rend_int);
-
-diff -rup a/lib/Xm/XmString.c b/lib/Xm/XmString.c
---- a/lib/Xm/XmString.c	2005-12-19 05:32:36.000000000 -0500
-+++ b/lib/Xm/XmString.c	2008-02-27 13:03:31.000000000 -0500
-@@ -3133,7 +3133,7 @@ XmStringExtent(
-       XmRendition	rend;
-       _XmStringArraySegRec array_seg;
-       
--      bzero((char*) &scratch, sizeof(_XmRenditionRec));
-+      memset((char*) &scratch, 0, sizeof(_XmRenditionRec));
-       tmp = &scratch;
-       rend = &tmp;
-       
-@@ -4087,7 +4087,7 @@ _XmStringDrawSegment(Display *d,
- 		 * text data, since optimized string does not have padding. 
- 		 */
- 		{
--		  bzero((char*)&under_seg, sizeof(_XmStringOptSegRec));
-+		  memset((char*)&under_seg, 0, sizeof(_XmStringOptSegRec));
- 		  _XmEntryType(&under_seg) = XmSTRING_ENTRY_OPTIMIZED;
- 		  _XmEntryTagIndex(&under_seg) = _XmStrTagIndex(*underline);
- 		  _XmEntryByteCountSet(&under_seg, _XmStrByteCount(*underline));
-@@ -5069,10 +5069,10 @@ _render(Display *d,
-   if (!string) return;
-   
-   tmp1 = &scratch1;
--  bzero((char *)tmp1, sizeof(_XmRenditionRec));
-+  memset((char *)tmp1, 0, sizeof(_XmRenditionRec));
-   rend1 = &tmp1;
-   tmp2 = &scratch2;
--  bzero((char *)tmp2, sizeof(_XmRenditionRec));
-+  memset((char *)tmp2, 0, sizeof(_XmRenditionRec));
-   rend2 = &tmp2;
- 
-   _XmRendDisplay(rend1) = _XmRendDisplay(rend2) = d;
-@@ -7010,7 +7010,7 @@ XmStringBaseline(
- 	_XmProcessLock();
-   }
- #endif
--  bzero((char*) &scratch, sizeof(_XmRenditionRec));
-+  memset((char*) &scratch, 0, sizeof(_XmRenditionRec));
-   tmp = &scratch;
-   rend = &tmp;
-       
-@@ -7095,7 +7095,7 @@ _XmStringGetBaselines(XmRenderTable rend
-       *baselines = (Dimension*) XtMalloc(*line_count * sizeof(Dimension));
- 
-       /* Initialize the scratch rendition for tabs. */
--      bzero((char*) &scratch, sizeof(_XmRenditionRec));
-+      memset((char*) &scratch, 0, sizeof(_XmRenditionRec));
-       _XmRendDisplay(rend) = 
- 	((_XmRTDisplay(rendertable) == NULL) ?
- 	 _XmGetDefaultDisplay() : _XmRTDisplay(rendertable));
-@@ -9057,7 +9057,7 @@ XmeStringGetComponent(_XmStringContext c
- 	    {
- 	      char* tmp = XtMalloc(char_count + sizeof(wchar_t));
- 	      memcpy(tmp, seg_text, char_count);
--	      bzero(tmp + char_count, sizeof(wchar_t));
-+	      memset(tmp + char_count, 0, sizeof(wchar_t));
- 	      *value = (XtPointer) tmp;
- 	    }
- 	  else
-@@ -9207,7 +9207,7 @@ _XmStringContextReInit(_XmStringContext 
- 		       _XmString	string)
- {
-   assert(context != NULL);
--  bzero((char*) context, sizeof(_XmStringContextRec));
-+  memset((char*) context, 0, sizeof(_XmStringContextRec));
- 
-   _XmStrContString(context) = string;
-   _XmStrContOpt(context)    = _XmStrOptimized(string);
-@@ -9526,7 +9526,7 @@ XmParseMappingCreate(ArgList  arg_list,
- {
-   /* Allocate and initialize the return value. */
-   XmParseMapping result = XtNew(_XmParseMappingRec);
--  bzero((char*)result, sizeof(_XmParseMappingRec));
-+  memset((char*)result, 0, sizeof(_XmParseMappingRec));
- 
-   /* Default values are established by bzero().
-    *
-diff -rup a/lib/Xm/XmStringFunc.c b/lib/Xm/XmStringFunc.c
---- a/lib/Xm/XmStringFunc.c	2002-01-10 15:57:05.000000000 -0500
-+++ b/lib/Xm/XmStringFunc.c	2008-02-27 13:03:50.000000000 -0500
-@@ -715,7 +715,7 @@ XmStringTableProposeTablist(XmStringTabl
-     return ((XmTabList)NULL);
-   }
-   
--  bzero((char*) &scratch, sizeof(_XmRenditionRec));
-+  memset((char*) &scratch, 0, sizeof(_XmRenditionRec));
-   tmp = &scratch;
-   rend = &tmp;
-   
-diff -rup a/lib/Xm/XmStringI.h b/lib/Xm/XmStringI.h
---- a/lib/Xm/XmStringI.h	2002-01-04 16:23:19.000000000 -0500
-+++ b/lib/Xm/XmStringI.h	2008-02-27 13:05:00.000000000 -0500
-@@ -492,7 +492,7 @@ typedef struct __XmStringArraySegRec *_X
- {									   \
-   switch (type) { 							   \
-   case XmSTRING_OPTIMIZED : 						   \
--    bzero((char*)str, sizeof(_XmStringOptRec));				   \
-+    memset((char*)str, 0, sizeof(_XmStringOptRec));				   \
-     _XmStrType(str) = type; 						   \
-     _XmStrTextType(str) = XmNO_TEXT;                                       \
-     _XmStrDirection(str) = XmSTRING_DIRECTION_UNSET;			   \
-@@ -501,7 +501,7 @@ typedef struct __XmStringArraySegRec *_X
-     _XmStrRefCountSet(str, 1);			 	 	 	   \
-     break; 								   \
-   case XmSTRING_MULTIPLE_ENTRY : 					   \
--    bzero((char*)str, sizeof(_XmStringMultiRec));			   \
-+    memset((char*)str, 0, sizeof(_XmStringMultiRec));			   \
-     _XmStrType(str) = type; 						   \
-     _XmStrRefCountSet(str, 1);			 	 	 	   \
-     break; 								   \
-@@ -524,7 +524,7 @@ typedef struct __XmStringArraySegRec *_X
-     (str) = (_XmString)							   \
-       _XmStrMalloc(sizeof(_XmStringOptRec) +                               \
- 		   (text_len ? (text_len - TEXT_BYTES_IN_STRUCT) : 0));    \
--    bzero((char*)str, sizeof(_XmStringOptRec)); 			   \
-+    memset((char*)str, 0, sizeof(_XmStringOptRec)); 			   \
-     _XmStrType(str) = type; 						   \
-     _XmStrTextType(str) = XmNO_TEXT;                                       \
-     _XmStrDirection(str) = XmSTRING_DIRECTION_UNSET;			   \
-@@ -535,7 +535,7 @@ typedef struct __XmStringArraySegRec *_X
-     break; 								   \
-   case XmSTRING_MULTIPLE_ENTRY : 					   \
-     (str) = (_XmString)_XmStrMalloc(sizeof(_XmStringMultiRec));		   \
--    bzero((char*)str, sizeof(_XmStringMultiRec));			   \
-+    memset((char*)str, 0, sizeof(_XmStringMultiRec));			   \
-     _XmStrType(str) = type; 						   \
-     _XmStrRefCountSet(str, 1);			 	 	 	   \
-     break; 								   \
-@@ -661,15 +661,15 @@ typedef struct __XmStringArraySegRec *_X
- {									   \
-   switch (type) { 							   \
-   case XmSTRING_ENTRY_OPTIMIZED : 					   \
--    bzero((char*)entry, sizeof(_XmStringOptSegRec));			   \
-+    memset((char*)entry, 0, sizeof(_XmStringOptSegRec));			   \
-     _XmEntryTagIndex(entry) = TAG_INDEX_UNSET;			 	   \
-     _XmEntryRendIndex(entry) = REND_INDEX_UNSET;		 	   \
-     break; 								   \
-   case XmSTRING_ENTRY_ARRAY : 						   \
--    bzero((char*)entry, sizeof(_XmStringArraySegRec));			   \
-+    memset((char*)entry, 0, sizeof(_XmStringArraySegRec));			   \
-     break; 								   \
-   case XmSTRING_ENTRY_UNOPTIMIZED :					   \
--    bzero((char*)entry, sizeof(_XmStringUnoptSegRec));		   \
-+    memset((char*)entry, 0, sizeof(_XmStringUnoptSegRec));		   \
-     break; 								   \
-   } 									   \
-   _XmEntryType(entry) = type; 						   \
-@@ -683,17 +683,17 @@ typedef struct __XmStringArraySegRec *_X
-   switch (type) { 							   \
-   case XmSTRING_ENTRY_OPTIMIZED : 					   \
-     (entry) = (_XmStringEntry)XtMalloc(sizeof(_XmStringOptSegRec));	   \
--    bzero((char*)entry, sizeof(_XmStringOptSegRec));			   \
-+    memset((char*)entry, 0, sizeof(_XmStringOptSegRec));			   \
-     _XmEntryTagIndex(entry) = TAG_INDEX_UNSET;			 	   \
-     _XmEntryRendIndex(entry) = REND_INDEX_UNSET;		 	   \
-     break; 								   \
-   case XmSTRING_ENTRY_ARRAY : 						   \
-     (entry) = (_XmStringEntry)XtMalloc(sizeof(_XmStringArraySegRec));	   \
--    bzero((char*)entry, sizeof(_XmStringArraySegRec));			   \
-+    memset((char*)entry, 0, sizeof(_XmStringArraySegRec));			   \
-     break; 								   \
-   case XmSTRING_ENTRY_UNOPTIMIZED :					   \
-     (entry) = (_XmStringEntry)XtMalloc(sizeof(_XmStringUnoptSegRec));  \
--    bzero((char*)entry, sizeof(_XmStringUnoptSegRec));		   \
-+    memset((char*)entry, 0, sizeof(_XmStringUnoptSegRec));		   \
-     break; 								   \
-   } 									   \
-   if (entry) {                                                             \
-diff -rup a/lib/Xm/XmStringSeg.c b/lib/Xm/XmStringSeg.c
---- a/lib/Xm/XmStringSeg.c	2002-01-10 15:57:06.000000000 -0500
-+++ b/lib/Xm/XmStringSeg.c	2008-02-27 13:05:16.000000000 -0500
-@@ -291,7 +291,7 @@ _XmStringGetSegment(_XmStringContext   c
- 	{
- 	  char *tmp = XtMalloc(*char_count + sizeof(wchar_t));
- 	  memcpy(tmp, *text, *char_count);
--	  bzero(tmp + *char_count, sizeof(wchar_t));
-+	  memset(tmp + *char_count, 0, sizeof(wchar_t));
- 
- 	  *text = (XtPointer) tmp;
- 	}
-diff -rup a/lib/Xm/XmTabList.c b/lib/Xm/XmTabList.c
---- a/lib/Xm/XmTabList.c	2002-01-30 10:47:25.000000000 -0500
-+++ b/lib/Xm/XmTabList.c	2008-02-27 13:00:38.000000000 -0500
-@@ -225,7 +225,7 @@ _XmCreateTabList(Widget parent,
-   if (_XmRendTabs(rend) == NULL) 
-     {
-       tl = (XmTabList)XtMalloc(sizeof(_XmTabListRec));
--      bzero((char *)tl, sizeof(_XmTabListRec));
-+      memset((char *)tl, 0, sizeof(_XmTabListRec));
-       _XmRendTabs(rend) = tl;
-     }
-   
-diff -rup a/lib/Xm/Xpmcreate.c b/lib/Xm/Xpmcreate.c
---- a/lib/Xm/Xpmcreate.c	2005-12-06 12:31:15.000000000 -0500
-+++ b/lib/Xm/Xpmcreate.c	2008-02-27 12:55:24.000000000 -0500
-@@ -2254,7 +2254,7 @@ ParseAndPutPixels(dc, data, width, heigh
-  	    if (ncolors > 256)
-  		return (XpmFileInvalid);
- 
--	    bzero((char *)colidx, 256 * sizeof(short));
-+	    memset((char *)colidx, 0, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
- 
-@@ -2296,7 +2296,7 @@ if (cidx[f]) XpmFree(cidx[f]);}
- 	    unsigned short *cidx[256];
- 	    unsigned int char1;
- 
--	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
-+	    memset((char *)cidx, 0, 256 * sizeof(unsigned short *)); /* init */
- 	    for (a = 0; a < ncolors; a++) {
- 		char1 = (unsigned char) colorTable[a].string[0];
- 		if (cidx[char1] == NULL) { /* get new memory */
-diff -rup a/lib/Xm/XpmI.h b/lib/Xm/XpmI.h
---- a/lib/Xm/XpmI.h	2005-12-05 11:31:46.000000000 -0500
-+++ b/lib/Xm/XpmI.h	2008-02-27 12:55:57.000000000 -0500
-@@ -139,9 +139,9 @@ extern FILE *popen();
- #ifndef bcopy
- #define bcopy(source, dest, count) memcpy(dest, source, count)
- #endif
--#ifndef bzero
--#define bzero(b, len) memset(b, 0, len)
--#endif
-+//#ifndef bzero
-+//#define bzero(b, len) memset(b, 0, len)
-+//#endif
- #endif
- 
- /* the following is defined in X11R6 but not in previous versions */
-diff -rup a/lib/Xm/Xpmparse.c b/lib/Xm/Xpmparse.c
---- a/lib/Xm/Xpmparse.c	2005-12-05 11:31:46.000000000 -0500
-+++ b/lib/Xm/Xpmparse.c	2008-02-27 12:56:18.000000000 -0500
-@@ -555,7 +555,7 @@ ParsePixels(data, width, height, ncolors
- 	        return (XpmFileInvalid);
- 	    }
- 
--	    bzero((char *)colidx, 256 * sizeof(short));
-+	    memset((char *)colidx, 0, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
- 
-@@ -591,7 +591,7 @@ do \
- 	    unsigned short *cidx[256];
- 	    unsigned int char1;
- 
--	    bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
-+	    memset((char *)cidx, 0, 256 * sizeof(unsigned short *)); /* init */
- 	    for (a = 0; a < ncolors; a++) {
- 		char1 = (unsigned char) colorTable[a].string[0];
- 		if (cidx[char1] == NULL) { /* get new memory */
-

package/openmotif/openmotif.mk

@@ -1,94 +0,0 @@
-#############################################################
-#
-# openmotif
-#
-#############################################################
-
-OPENMOTIF_VERSION = 2.3.0
-OPENMOTIF_SOURCE = openmotif-$(OPENMOTIF_VERSION).tar.gz
-OPENMOTIF_SITE = ftp://ftp.ics.com/openmotif/2.3/2.3.0
-OPENMOTIF_CAT:=$(ZCAT)
-OPENMOTIF_DIR:=$(BUILD_DIR)/openmotif-$(OPENMOTIF_VERSION)
-OPENMOTIF_HOST_DIR:=$(BUILD_DIR)/openmotif-$(OPENMOTIF_VERSION)-host
-
-$(DL_DIR)/$(OPENMOTIF_SOURCE):
-	 $(call DOWNLOAD,$(OPENMOTIF_SITE),$(OPENMOTIF_SOURCE))
-
-openmotif-source: $(DL_DIR)/$(OPENMOTIF_SOURCE)
-
-$(OPENMOTIF_DIR)/.unpacked: $(DL_DIR)/$(OPENMOTIF_SOURCE)
-	$(OPENMOTIF_CAT) $(DL_DIR)/$(OPENMOTIF_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(CONFIG_UPDATE) $(OPENMOTIF_DIR)
-	cp -a $(OPENMOTIF_DIR) $(OPENMOTIF_DIR)-host
-	toolchain/patch-kernel.sh $(OPENMOTIF_DIR) package/openmotif/ \*.patch
-	touch $(OPENMOTIF_DIR)/.unpacked
-
-$(OPENMOTIF_HOST_DIR)/.configured: $(OPENMOTIF_DIR)/.unpacked
-	(if [ ! -e "/usr/include/X11/extensions/Print.h" ]; then \
-		echo "Please install libXp-devel and re-run make."; \
-		exit 1; fi )
-	(if [ ! -e "/usr/include/X11/bitmaps" ]; then \
-		echo "Please install xorg-x11-xbitmaps and re-run make."; \
-		exit 1; fi )
-	(cd $(OPENMOTIF_HOST_DIR); rm -rf config.cache; \
-		aclocal; automake --foreign --add-missing; autoconf; \
-		./configure $(QUIET) \
-		--prefix=/usr -C;);
-	touch $(OPENMOTIF_HOST_DIR)/.configured
-
-$(OPENMOTIF_DIR)/.configured: $(OPENMOTIF_HOST_DIR)/.configured
-	(cd $(OPENMOTIF_DIR); rm -rf config.cache; \
-		aclocal; automake --foreign --add-missing; autoconf; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		ac_cv_file__usr_X_include_X11_X_h=yes \
-		ac_cv_func_setpgrp_void=yes \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--mandir=/usr/man \
-		--infodir=/usr/info \
-		--includedir=/usr/include \
-		--with-x --program-prefix="" \
-	);
-	touch $(OPENMOTIF_DIR)/.configured
-
-$(OPENMOTIF_HOST_DIR)/.done: $(OPENMOTIF_DIR)/.configured
-	$(MAKE) -C $(OPENMOTIF_HOST_DIR)
-	ln -s -f $(OPENMOTIF_HOST_DIR)/config/util/makestrs $(OPENMOTIF_DIR)/config/util/makestrs-host
-	ln -s -f $(OPENMOTIF_HOST_DIR)/tools/wml/wmluiltok $(OPENMOTIF_DIR)/tools/wml/wmluiltok-host
-	ln -s -f $(OPENMOTIF_HOST_DIR)/tools/wml/wml $(OPENMOTIF_DIR)/tools/wml/wml-host
-	ln -s -f $(OPENMOTIF_HOST_DIR)/tools/wml/wmldbcreate $(OPENMOTIF_DIR)/tools/wml/wmldbcreate-host
-	mkdir -p $(OPENMOTIF_DIR)/tools/wml/.libs
-	ln -s -f $(OPENMOTIF_HOST_DIR)/tools/wml/.libs/lt-wmldbcreate $(OPENMOTIF_DIR)/tools/wml/.libs/lt-wmldbcreate-host
-	mkdir -p $(OPENMOTIF_DIR)/demos/lib/Exm/wml/.libs
-	ln -s -f $(OPENMOTIF_HOST_DIR)/demos/lib/Exm/wml/.libs/lt-wmldbcreate $(OPENMOTIF_DIR)/demos/lib/Exm/wml/.libs/lt-wmldbcreate-host
-	mkdir -p $(OPENMOTIF_DIR)/clients/uil/.libs
-	ln -s -f $(OPENMOTIF_HOST_DIR)/clients/uil/.libs/lt-uil $(OPENMOTIF_DIR)/clients/uil/.libs/lt-uil-host
-	touch $(OPENMOTIF_HOST_DIR)/.done
-
-$(OPENMOTIF_DIR)/.done: $(OPENMOTIF_HOST_DIR)/.done
-	$(MAKE) -C $(OPENMOTIF_DIR)
-	$(MAKE) -C $(OPENMOTIF_DIR) install DESTDIR=$(STAGING_DIR)
-	$(MAKE) -C $(OPENMOTIF_DIR) install DESTDIR=$(TARGET_DIR)
-	touch $(OPENMOTIF_DIR)/.done
-
-openmotif: $(OPENMOTIF_DIR)/.done
-
-openmotif-clean:
-	rm -f $(TARGET_DIR)/bin/openmotif
-	-$(MAKE) -C $(OPENMOTIF_DIR) clean
-
-openmotif-dirclean:
-	rm -rf $(OPENMOTIF_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_OPENMOTIF),y)
-TARGETS+=openmotif
-endif

package/pango/pango-gtk-doc.patch

@@ -1,59 +0,0 @@
---- pango/acinclude.m4.old	2004-05-08 11:31:48.000000000 +0100
-+++ pango/acinclude.m4	2004-05-08 11:31:58.000000000 +0100
-@@ -55,3 +55,56 @@
- ])
- 
- 
-+dnl -*- mode: autoconf -*-
-+
-+# serial 1
-+
-+dnl Usage:
-+dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-+AC_DEFUN([GTK_DOC_CHECK],
-+[
-+  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-+  dnl for overriding the documentation installation directory
-+  AC_ARG_WITH(html-dir,
-+    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-+    [with_html_dir='${datadir}/gtk-doc/html'])
-+  HTML_DIR="$with_html_dir"
-+  AC_SUBST(HTML_DIR)
-+
-+  dnl enable/disable documentation building
-+  AC_ARG_ENABLE(gtk-doc,
-+    AC_HELP_STRING([--enable-gtk-doc],
-+                   [use gtk-doc to build documentation [default=no]]),,
-+    enable_gtk_doc=no)
-+
-+  have_gtk_doc=no
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-+    have_gtk_doc=yes
-+  fi
-+
-+  dnl do we want to do a version check?
-+ifelse([$1],[],,
-+  [gtk_doc_min_version=$1
-+  if test "$have_gtk_doc" = yes; then
-+    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-+    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-+      AC_MSG_RESULT(yes)
-+    else
-+      AC_MSG_RESULT(no)
-+      have_gtk_doc=no
-+    fi
-+  fi
-+])
-+  if test x$enable_gtk_doc = xyes; then
-+    if test "$have_gtk_doc" != yes; then
-+      enable_gtk_doc=no
-+    fi
-+  fi
-+
-+  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-+  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-+])

package/pango/pango-no-libthai.patch

@@ -1,10 +0,0 @@
---- a/modules/Makefile.am	2007-07-05 17:30:28.000000000 -0400
-+++ b/modules/Makefile.am	2008-02-09 19:37:13.000000000 -0500
-@@ -8,7 +8,6 @@ SUBDIRS = 		\
- 	indic           \
- 	khmer		\
- 	syriac		\
--	thai		\
- 	tibetan
- 
- EXTRA_DIST =		\

package/qt/qt-4.5.3-fix-qt-zlib-build.patch

@@ -7,10 +7,10 @@ include path to fix this issue.
  src/gui/painting/painting.pri |    3 +++
  1 file changed, 3 insertions(+)
 
-Index: qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri
+Index: qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri
 ===================================================================
---- qt-embedded-linux-opensource-src-4.5.2.orig/src/gui/painting/painting.pri
-+++ qt-embedded-linux-opensource-src-4.5.2/src/gui/painting/painting.pri
+--- qt-embedded-linux-opensource-src-4.5.3.orig/src/gui/painting/painting.pri
++++ qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri
 @@ -367,3 +367,6 @@
          SOURCES += painting/qwindowsurface_d3d.cpp
  }

package/rsync/rsync.mk

@@ -4,9 +4,9 @@
 #
 #############################################################
 
-RSYNC_VERSION:=3.0.6
+RSYNC_VERSION:=3.0.7
 RSYNC_SOURCE:=rsync-$(RSYNC_VERSION).tar.gz
-RSYNC_SITE:=http://rsync.samba.org/ftp/rsync
+RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/src
 RSYNC_INSTALL_STAGING:=NO
 RSYNC_INSTALL_TARGET:=YES
 RSYNC_CONF_OPT=$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)

package/shared-mime-info/shared-mime-info.mk

@@ -12,7 +12,7 @@ SHARED_MIME_INFO_INSTALL_TARGET = NO
 
 SHARED_MIME_INFO_AUTORECONF = NO
 SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
-SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 libxml2 libglib2
+SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2
 
 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb
 
@@ -28,7 +28,7 @@ $(eval $(call AUTOTARGETS,package,shared-mime-info,host))
 SHARED_MIME_INFO_HOST_BINARY:=$(HOST_DIR)/usr/bin/update-mime-database
 
 # update the shared-mime-info database in the target
-$(SHARED_MIME_INFO_HOOK_POST_INSTALL): host-shared-mime-info
-	$(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
+$(SHARED_MIME_INFO_HOOK_POST_INSTALL):
+	$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
 	$(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache
 	touch $@

package/sylpheed/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SYLPHEED
 	bool "sylpheed"
+	select BR2_PACKAGE_LIBGTK2
 	help
 	  lightweight and user-friendly e-mail client.
 

package/sylpheed/sylpheed.mk

@@ -13,7 +13,7 @@ SYLPHEED_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 
 SYLPHEED_CONF_OPT = --disable-gtkspell --program-prefix=""
 
-SYLPHEED_DEPENDENCIES = host-pkg-config
+SYLPHEED_DEPENDENCIES = host-pkg-config libgtk2
 
 $(eval $(call AUTOTARGETS,package,sylpheed))
 

package/tcl/tcl-configure-syntax-error.patch

@@ -1,42 +0,0 @@
-diff -ur tcl8.4.9/unix/configure tcl8.4.9-patched/unix/configure
---- tcl8.4.9/unix/configure	2004-12-06 18:23:45.000000000 -0600
-+++ tcl8.4.9-patched/unix/configure	2006-07-06 21:02:18.884355250 -0500
-@@ -2131,7 +2131,7 @@
- 	    # results, and the version is kept in special file).
- 	
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print }' /etc/.relid'`
-+		system=MP-RAS-`awk '{print }' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
-@@ -7322,7 +7322,7 @@
- 	    # results, and the version is kept in special file).
- 	
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print }' /etc/.relid'`
-+		system=MP-RAS-`awk '{print }' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
-diff -ur tcl8.4.9/unix/tcl.m4 tcl8.4.9-patched/unix/tcl.m4
---- tcl8.4.9/unix/tcl.m4	2004-12-06 18:23:45.000000000 -0600
-+++ tcl8.4.9-patched/unix/tcl.m4	2006-07-06 21:02:35.653403250 -0500
-@@ -844,7 +844,7 @@
- 	    # results, and the version is kept in special file).
- 	
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`
-@@ -2190,7 +2190,7 @@
- 	    # results, and the version is kept in special file).
- 	
- 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
--		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
-+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
- 	    fi
- 	    if test "`uname -s`" = "AIX" ; then
- 		system=AIX-`uname -v`.`uname -r`

package/tcl/tcl-strstr.patch

@@ -1,11 +0,0 @@
---- tcl8.4.9/compat/strstr.c	2002-01-26 03:10:08.000000000 +0200
-+++ tcl8.4.9/compat/strstr.c	2005-05-30 06:53:40.000000000 +0300
-@@ -33,6 +33,8 @@
-  *----------------------------------------------------------------------
-  */
- 
-+#include <unistd.h>
-+
- char *
- strstr(string, substring)
-     register char *string;	/* String to search. */

package/tcl/tcl.mk

@@ -3,66 +3,26 @@
 # TCL8.4
 #
 #############################################################
-TCL_VERSION:=8.4.9
+TCL_VERSION:=8.4.19
 TCL_SOURCE:=tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
-TCL_DIR:=$(BUILD_DIR)/tcl$(TCL_VERSION)
-
-$(DL_DIR)/$(TCL_SOURCE):
-	$(call DOWNLOAD,$(TCL_SITE),$(TCL_SOURCE))
-
-$(TCL_DIR)/.source: $(DL_DIR)/$(TCL_SOURCE)
-	$(ZCAT) $(DL_DIR)/$(TCL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(TCL_DIR) package/tcl/ tcl\*.patch
-	touch $(TCL_DIR)/.source
-
-$(TCL_DIR)/.configured: $(TCL_DIR)/.source
-	(cd $(TCL_DIR)/unix; rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+TCL_SUBDIR = unix
+TCL_CONF_OPT = \
 		--enable-shared \
 		--disable-symbols \
 		--disable-langinfo \
-		--disable-framework \
-	)
-	touch $(TCL_DIR)/.configured
+		--disable-framework
 
-$(TCL_DIR)/unix/libtcl8.4.so: $(TCL_DIR)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(TCL_DIR)/unix
-
-$(TARGET_DIR)/usr/lib/libtcl8.4.so: $(TCL_DIR)/unix/libtcl8.4.so
-	$(MAKE) INSTALL_ROOT=$(TARGET_DIR) -C $(TCL_DIR)/unix install
+define TCL_POST_INSTALL_CLEANUP
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
-	rm -Rf $(TARGET_DIR)/usr/man
 	-if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" == "y" ]; then \
 	rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \
 	fi
 	-if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" == "y" ]; then \
 	rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \
 	fi
+endef
 
-tcl: $(TARGET_DIR)/usr/lib/libtcl8.4.so
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
 
-tcl-source: $(DL_DIR)/$(TCL_SOURCE)
-
-tcl-clean:
-	$(MAKE) prefix=$(TARGET_DIR)/usr -C $(TCL_DIR)/unix uninstall
-	-$(MAKE) -C $(TCL_DIR)/unix clean
-
-tcl-dirclean:
-	rm -rf $(TCL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_TCL),y)
-TARGETS+=tcl
-endif
+$(eval $(call AUTOTARGETS,package,tcl))

package/webkit/Config.in

@@ -14,6 +14,9 @@ config BR2_PACKAGE_WEBKIT
 	help
 	  WebKit is an open source, standards compliant web browser engine.
 
+	  Note that WebKit does not build with a toolchain using the
+	  old linuxthreads library.
+
 	  http://webkit.org/
 
 comment "webkit requires a toolchain with C++ support and WCHAR enabled"

package/webkit/gtk-doc.make

@@ -0,0 +1,173 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+REPORT_FILES = \
+	$(DOC_MODULE)-undocumented.txt \
+	$(DOC_MODULE)-undeclared.txt \
+	$(DOC_MODULE)-unused.txt
+
+CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+else
+all-local:
+endif
+
+docs: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+	@echo 'gtk-doc: Scanning header files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo 'gtk-doc: Rebuilding template files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+tmpl/*.sgml:
+	@true
+
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+	@echo 'gtk-doc: Building XML'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building HTML'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo 'gtk-doc: Fixing cross-references'
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+	rm -rf .libs
+
+distclean-local:
+	cd $(srcdir) && \
+	  rm -rf xml $(REPORT_FILES) \
+	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html
+
+install-data-local:
+	-installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	  which gtkdoc-rebase >/dev/null && \
+	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+	fi
+	
+
+uninstall-local:
+	rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	cp $(srcdir)/html/* $(distdir)/html
+	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+	cd $(distdir) && rm -f $(DISTCLEANFILES)
+	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+
+.PHONY : dist-hook-local docs

package/webkit/webkit.mk

@@ -25,10 +25,12 @@ endif
 WEBKIT_CONF_OPT += --disable-video
 
 define WEBKIT_AUTOGEN_PATCH
+$(SED) 's%ACLOCAL_FLAGS=.*%ACLOCAL_FLAGS="-I autotools -I $(STAGING_DIR)/usr/share/aclocal"%' $(WEBKIT_DIR)/autogen.sh
 $(SED) 's/AUTOMAKE_FLAGS=.*/AUTOMAKE_FLAGS="--foreign --add-missing --copy"/' $(WEBKIT_DIR)/autogen.sh
 $(SED) 's/LIBTOOLIZE_FLAGS=.*/LIBTOOLIZE_FLAGS="--force --automake --copy"/' $(WEBKIT_DIR)/autogen.sh
+cp package/webkit/gtk-doc.make $(WEBKIT_DIR)/
 # Don't run the configure step yet
-cd $(WEBKIT_DIR); AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
+cd $(WEBKIT_DIR); $(HOST_CONFIGURE_OPTS) AUTOGEN_CONFIGURE_ARGS=--version ./autogen.sh
 endef
 
 WEBKIT_POST_EXTRACT_HOOKS += WEBKIT_AUTOGEN_PATCH

package/x11r7/libxcb/libxcb.mk

@@ -10,9 +10,9 @@ LIBXCB_SITE = http://xcb.freedesktop.org/dist/
 LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_AUTORECONF = NO
-LIBXCB_DEPENDENCIES = pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
+LIBXCB_DEPENDENCIES = host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
 LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
-LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XSLTPROC=/usr/bin/xsltproc
+LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb
 
 $(eval $(call AUTOTARGETS,package/x11r7,libxcb))
 

package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk

@@ -8,6 +8,8 @@ XAPP_MKFONTSCALE_VERSION = 1.0.5
 XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
 XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_MKFONTSCALE_AUTORECONF = NO
-XAPP_MKFONTSCALE_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc
+XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
+HOST_XAPP_MKFONTSCALE_DEPENDENCIES = host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
 
 $(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale))
+$(eval $(call AUTOTARGETS,package/x11r7,xapp_mkfontscale,host))

package/x11r7/xfont_encodings/xfont_encodings.mk

@@ -9,5 +9,6 @@ XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2
 XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_ENCODINGS_AUTORECONF = NO
 XFONT_ENCODINGS_MAKE_OPT =
+XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale
 
 $(eval $(call AUTOTARGETS,package/x11r7,xfont_encodings))

package/x11r7/xfont_font-util/xfont_font-util.mk

@@ -5,76 +5,16 @@
 ################################################################################
 
 XFONT_FONT_UTIL_VERSION = 1.0.1
-XFONT_FONT_UTIL_NAME = font-util-$(XFONT_FONT_UTIL_VERSION)
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_UTIL_AUTORECONF = NO
-XFONT_FONT_UTIL_DIR=$(BUILD_DIR)/$(XFONT_FONT_UTIL_NAME)
-XFONT_FONT_UTIL_CAT:=$(BZCAT)
+XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config
+XFONT_FONT_UTIL_INSTALL_STAGING = YES
+XFONT_FONT_UTIL_INSTALL_TARGET = NO
 
-$(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE):
-	 $(call DOWNLOAD,$(XFONT_FONT_UTIL_SITE),$(XFONT_FONT_UTIL_SOURCE))
+define XFONT_FONT_UTIL_POST_INSTALL_FIXES
+ package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR)
+endef
 
-xfont_font-util-source: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE)
-
-$(XFONT_FONT_UTIL_DIR)/.unpacked: $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE)
-	$(XFONT_FONT_UTIL_CAT) $(DL_DIR)/$(XFONT_FONT_UTIL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(XFONT_FONT_UTIL_DIR) package/x11r7/xfont_font-util/ \*.patch
-	$(CONFIG_UPDATE) $(XFONT_FONT_UTIL_DIR)
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.configured: $(XFONT_FONT_UTIL_DIR)/.unpacked
-	(cd $(XFONT_FONT_UTIL_DIR) && rm -rf config.cache)
-	(cd $(XFONT_FONT_UTIL_DIR) && \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		./configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--includedir=/usr/include \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-	)
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.compiled: $(XFONT_FONT_UTIL_DIR)/.configured
-	$(MAKE) -C $(XFONT_FONT_UTIL_DIR)
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.installed: $(XFONT_FONT_UTIL_DIR)/.compiled
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(XFONT_FONT_UTIL_DIR) install
-	touch $@
-
-$(XFONT_FONT_UTIL_DIR)/.hacked: $(XFONT_FONT_UTIL_DIR)/.installed
-	( package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) )
-	touch $@
-
-xfont_font-util: host-pkg-config $(XFONT_FONT_UTIL_DIR)/.hacked
-
-xfont_font-util-unpacked: $(XFONT_FONT_UTIL_DIR)/.unpacked
-
-xfont_font-util-clean:
-	-$(MAKE) -C $(XFONT_FONT_UTIL_DIR) clean
-
-xfont_font-util-dirclean:
-	rm -rf $(XFONT_FONT_UTIL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_XFONT_FONT_UTIL),y)
-TARGETS+=xfont_font-util
-endif
+XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES
 
+$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))

package/x11r7/xlib_libfontenc/xlib_libfontenc.mk

@@ -12,4 +12,7 @@ XLIB_LIBFONTENC_INSTALL_STAGING = YES
 XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
 XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static
 
+HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
+
 $(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc))
+$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc,host))

package/x11r7/xproto_trapproto/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XPROTO_TRAPPROTO
 	bool "trapproto"
+	select BR2_PACKAGE_XLIB_LIBXT
 	help
 	  trapproto 3.4.3
 	  X.Org Trap protocol headers

package/x11r7/xproto_trapproto/xproto_trapproto.mk

@@ -10,5 +10,6 @@ XPROTO_TRAPPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
 XPROTO_TRAPPROTO_AUTORECONF = NO
 XPROTO_TRAPPROTO_INSTALL_STAGING = YES
 XPROTO_TRAPPROTO_INSTALL_TARGET = NO
+XPROTO_TRAPPROTO_DEPENDENCIES = xlib_libXt
 
 $(eval $(call AUTOTARGETS,package/x11r7,xproto_trapproto))

package/xpdf/Config.in

@@ -1,9 +0,0 @@
-config BR2_PACKAGE_XPDF
-	bool "xpdf"
-	select BR2_PACKAGE_OPENMOTIF
-	select BR2_PACKAGE_FREETYPE
-	help
-	  Xpdf is an open source viewer for Portable Document Format
-	  (PDF) files.
-
-	  ftp://ftp.foolabs.com/pub/xpdf

package/xpdf/xpdf-3.02pl1.patch

@@ -1,33 +0,0 @@
-*** xpdf-3.02.orig/xpdf/Stream.cc	Tue Feb 27 14:05:52 2007
---- xpdf-3.02/xpdf/Stream.cc	Thu Jul 26 14:44:43 2007
-***************
-*** 410,424 ****
-    ok = gFalse;
-  
-    nVals = width * nComps;
--   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
--       nComps >= INT_MAX / nBits ||
--       width >= INT_MAX / nComps / nBits ||
--       nVals * nBits + 7 < 0) {
--     return;
--   }
-    pixBytes = (nComps * nBits + 7) >> 3;
-    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-!   if (rowBytes <= 0) {
-      return;
-    }
-    predLine = (Guchar *)gmalloc(rowBytes);
---- 410,422 ----
-    ok = gFalse;
-  
-    nVals = width * nComps;
-    pixBytes = (nComps * nBits + 7) >> 3;
-    rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
-!   if (width <= 0 || nComps <= 0 || nBits <= 0 ||
-!       nComps > gfxColorMaxComps ||
-!       nBits > 16 ||
-!       width >= INT_MAX / nComps ||      // check for overflow in nVals 
-!       nVals >= (INT_MAX - 7) / nBits) { // check for overflow in rowBytes
-      return;
-    }
-    predLine = (Guchar *)gmalloc(rowBytes);

package/xpdf/xpdf-3.02pl2.patch

@@ -1,823 +0,0 @@
-diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.cc xpdf-3.02/xpdf/Stream.cc
-*** xpdf-3.02pl1.orig/xpdf/Stream.cc	Thu Oct 25 15:47:38 2007
---- xpdf-3.02/xpdf/Stream.cc	Thu Oct 25 15:48:19 2007
-***************
-*** 1243,1265 ****
-    columns = columnsA;
-    if (columns < 1) {
-      columns = 1;
-!   }
-!   if (columns + 4 <= 0) {
-!     columns = INT_MAX - 4;
-    }
-    rows = rowsA;
-    endOfBlock = endOfBlockA;
-    black = blackA;
-!   refLine = (short *)gmallocn(columns + 3, sizeof(short));
-!   codingLine = (short *)gmallocn(columns + 2, sizeof(short));
-  
-    eof = gFalse;
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = 0;
-!   codingLine[1] = refLine[2] = columns;
-!   a0 = 1;
-  
-    buf = EOF;
-  }
---- 1243,1268 ----
-    columns = columnsA;
-    if (columns < 1) {
-      columns = 1;
-!   } else if (columns > INT_MAX - 2) {
-!     columns = INT_MAX - 2;
-    }
-    rows = rowsA;
-    endOfBlock = endOfBlockA;
-    black = blackA;
-!   // 0 <= codingLine[0] < codingLine[1] < ... < codingLine[n] = columns
-!   // ---> max codingLine size = columns + 1
-!   // refLine has one extra guard entry at the end
-!   // ---> max refLine size = columns + 2
-!   codingLine = (int *)gmallocn(columns + 1, sizeof(int));
-!   refLine = (int *)gmallocn(columns + 2, sizeof(int));
-  
-    eof = gFalse;
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = columns;
-!   a0i = 0;
-!   outputBits = 0;
-  
-    buf = EOF;
-  }
-***************
-*** 1278,1286 ****
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = 0;
-!   codingLine[1] = columns;
-!   a0 = 1;
-    buf = EOF;
-  
-    // skip any initial zero bits and end-of-line marker, and get the 2D
---- 1281,1289 ----
-    row = 0;
-    nextLine2D = encoding < 0;
-    inputBits = 0;
-!   codingLine[0] = columns;
-!   a0i = 0;
-!   outputBits = 0;
-    buf = EOF;
-  
-    // skip any initial zero bits and end-of-line marker, and get the 2D
-***************
-*** 1297,1507 ****
-    }
-  }
-  
-  int CCITTFaxStream::lookChar() {
-    short code1, code2, code3;
-!   int a0New;
-!   GBool err, gotEOL;
-!   int ret;
-!   int bits, i;
-  
-!   // if at eof just return EOF
-!   if (eof && codingLine[a0] >= columns) {
-!     return EOF;
-    }
-  
-    // read the next row
-!   err = gFalse;
-!   if (codingLine[a0] >= columns) {
-  
-      // 2-D encoding
-      if (nextLine2D) {
--       // state:
--       //   a0New = current position in coding line (0 <= a0New <= columns)
--       //   codingLine[a0] = last change in coding line
--       //                    (black-to-white if a0 is even,
--       //                     white-to-black if a0 is odd)
--       //   refLine[b1] = next change in reference line of opposite color
--       //                 to a0
--       // invariants:
--       //   0 <= codingLine[a0] <= a0New
--       //           <= refLine[b1] <= refLine[b1+1] <= columns
--       //   0 <= a0 <= columns+1
--       //   refLine[0] = 0
--       //   refLine[n] = refLine[n+1] = columns
--       //     -- for some 1 <= n <= columns+1
--       // end condition:
--       //   0 = codingLine[0] <= codingLine[1] < codingLine[2] < ...
--       //     < codingLine[n-1] < codingLine[n] = columns
--       //     -- where 1 <= n <= columns+1
-        for (i = 0; codingLine[i] < columns; ++i) {
-  	refLine[i] = codingLine[i];
-        }
-!       refLine[i] = refLine[i + 1] = columns;
-!       b1 = 1;
-!       a0New = codingLine[a0 = 0] = 0;
-!       do {
-  	code1 = getTwoDimCode();
-  	switch (code1) {
-  	case twoDimPass:
-! 	  if (refLine[b1] < columns) {
-! 	    a0New = refLine[b1 + 1];
-! 	    b1 += 2;
-  	  }
-  	  break;
-  	case twoDimHoriz:
-! 	  if ((a0 & 1) == 0) {
-! 	    code1 = code2 = 0;
-  	    do {
-! 	      code1 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	  } else {
-- 	    code1 = code2 = 0;
-  	    do {
-! 	      code1 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	  }
-! 	  if (code1 > 0 || code2 > 0) {
-! 	    if (a0New + code1 <= columns) {
-! 	      codingLine[a0 + 1] = a0New + code1;
-! 	    } else {
-! 	      codingLine[a0 + 1] = columns;
-! 	    }
-! 	    ++a0;
-! 	    if (codingLine[a0] + code2 <= columns) {
-! 	      codingLine[a0 + 1] = codingLine[a0] + code2;
-! 	    } else {
-! 	      codingLine[a0 + 1] = columns;
-! 	    }
-! 	    ++a0;
-! 	    a0New = codingLine[a0];
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVert0:
-! 	  if (refLine[b1] < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1];
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-  	case twoDimVertR1:
-! 	  if (refLine[b1] + 1 < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1] + 1;
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-! 	case twoDimVertL1:
-! 	  if (refLine[b1] - 1 > a0New || (a0 == 0 && refLine[b1] == 1)) {
-! 	    a0New = codingLine[++a0] = refLine[b1] - 1;
-! 	    --b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertR2:
-! 	  if (refLine[b1] + 2 < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1] + 2;
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-  	case twoDimVertL2:
-! 	  if (refLine[b1] - 2 > a0New || (a0 == 0 && refLine[b1] == 2)) {
-! 	    a0New = codingLine[++a0] = refLine[b1] - 2;
-! 	    --b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-! 	  }
-! 	  break;
-! 	case twoDimVertR3:
-! 	  if (refLine[b1] + 3 < columns) {
-! 	    a0New = codingLine[++a0] = refLine[b1] + 3;
-! 	    ++b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-- 	  } else {
-- 	    a0New = codingLine[++a0] = columns;
-  	  }
-  	  break;
-! 	case twoDimVertL3:
-! 	  if (refLine[b1] - 3 > a0New || (a0 == 0 && refLine[b1] == 3)) {
-! 	    a0New = codingLine[++a0] = refLine[b1] - 3;
-! 	    --b1;
-! 	    while (refLine[b1] <= a0New && refLine[b1] < columns) {
-! 	      b1 += 2;
-  	    }
-  	  }
-  	  break;
-  	case EOF:
-  	  eof = gTrue;
-! 	  codingLine[a0 = 0] = columns;
-! 	  return EOF;
-  	default:
-  	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-  	  err = gTrue;
-  	  break;
-  	}
-!       } while (codingLine[a0] < columns);
-  
-      // 1-D encoding
-      } else {
-!       codingLine[a0 = 0] = 0;
-!       while (1) {
-  	code1 = 0;
-! 	do {
-! 	  code1 += code3 = getWhiteCode();
-! 	} while (code3 >= 64);
-! 	codingLine[a0+1] = codingLine[a0] + code1;
-! 	++a0;
-! 	if (codingLine[a0] >= columns) {
-! 	  break;
-! 	}
-! 	code2 = 0;
-! 	do {
-! 	  code2 += code3 = getBlackCode();
-! 	} while (code3 >= 64);
-! 	codingLine[a0+1] = codingLine[a0] + code2;
-! 	++a0;
-! 	if (codingLine[a0] >= columns) {
-! 	  break;
-  	}
-        }
-      }
-  
--     if (codingLine[a0] != columns) {
--       error(getPos(), "CCITTFax row is wrong length (%d)", codingLine[a0]);
--       // force the row to be the correct length
--       while (codingLine[a0] > columns) {
-- 	--a0;
--       }
--       codingLine[++a0] = columns;
--       err = gTrue;
--     }
-- 
-      // byte-align the row
-      if (byteAlign) {
-        inputBits &= ~7;
---- 1300,1529 ----
-    }
-  }
-  
-+ inline void CCITTFaxStream::addPixels(int a1, int blackPixels) {
-+   if (a1 > codingLine[a0i]) {
-+     if (a1 > columns) {
-+       error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+       err = gTrue;
-+       a1 = columns;
-+     }
-+     if ((a0i & 1) ^ blackPixels) {
-+       ++a0i;
-+     }
-+     codingLine[a0i] = a1;
-+   }
-+ }
-+ 
-+ inline void CCITTFaxStream::addPixelsNeg(int a1, int blackPixels) {
-+   if (a1 > codingLine[a0i]) {
-+     if (a1 > columns) {
-+       error(getPos(), "CCITTFax row is wrong length (%d)", a1);
-+       err = gTrue;
-+       a1 = columns;
-+     }
-+     if ((a0i & 1) ^ blackPixels) {
-+       ++a0i;
-+     }
-+     codingLine[a0i] = a1;
-+   } else if (a1 < codingLine[a0i]) {
-+     if (a1 < 0) {
-+       error(getPos(), "Invalid CCITTFax code");
-+       err = gTrue;
-+       a1 = 0;
-+     }
-+     while (a0i > 0 && a1 <= codingLine[a0i - 1]) {
-+       --a0i;
-+     }
-+     codingLine[a0i] = a1;
-+   }
-+ }
-+ 
-  int CCITTFaxStream::lookChar() {
-    short code1, code2, code3;
-!   int b1i, blackPixels, i, bits;
-!   GBool gotEOL;
-  
-!   if (buf != EOF) {
-!     return buf;
-    }
-  
-    // read the next row
-!   if (outputBits == 0) {
-! 
-!     // if at eof just return EOF
-!     if (eof) {
-!       return EOF;
-!     }
-! 
-!     err = gFalse;
-  
-      // 2-D encoding
-      if (nextLine2D) {
-        for (i = 0; codingLine[i] < columns; ++i) {
-  	refLine[i] = codingLine[i];
-        }
-!       refLine[i++] = columns;
-!       refLine[i] = columns;
-!       codingLine[0] = 0;
-!       a0i = 0;
-!       b1i = 0;
-!       blackPixels = 0;
-!       // invariant:
-!       // refLine[b1i-1] <= codingLine[a0i] < refLine[b1i] < refLine[b1i+1]
-!       //                                                             <= columns
-!       // exception at left edge:
-!       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
-!       // exception at right edge:
-!       //   refLine[b1i] = refLine[b1i+1] = columns is possible
-!       while (codingLine[a0i] < columns) {
-  	code1 = getTwoDimCode();
-  	switch (code1) {
-  	case twoDimPass:
-! 	  addPixels(refLine[b1i + 1], blackPixels);
-! 	  if (refLine[b1i + 1] < columns) {
-! 	    b1i += 2;
-  	  }
-  	  break;
-  	case twoDimHoriz:
-! 	  code1 = code2 = 0;
-! 	  if (blackPixels) {
-  	    do {
-! 	      code1 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	  } else {
-  	    do {
-! 	      code1 += code3 = getWhiteCode();
-  	    } while (code3 >= 64);
-  	    do {
-! 	      code2 += code3 = getBlackCode();
-  	    } while (code3 >= 64);
-  	  }
-! 	  addPixels(codingLine[a0i] + code1, blackPixels);
-! 	  if (codingLine[a0i] < columns) {
-! 	    addPixels(codingLine[a0i] + code2, blackPixels ^ 1);
-! 	  }
-! 	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	    b1i += 2;
-! 	  }
-! 	  break;
-! 	case twoDimVertR3:
-! 	  addPixels(refLine[b1i] + 3, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertR2:
-! 	  addPixels(refLine[b1i] + 2, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-  	case twoDimVertR1:
-! 	  addPixels(refLine[b1i] + 1, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVert0:
-! 	  addPixels(refLine[b1i], blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    ++b1i;
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertL3:
-! 	  addPixelsNeg(refLine[b1i] - 3, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    if (b1i > 0) {
-! 	      --b1i;
-! 	    } else {
-! 	      ++b1i;
-! 	    }
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-  	case twoDimVertL2:
-! 	  addPixelsNeg(refLine[b1i] - 2, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    if (b1i > 0) {
-! 	      --b1i;
-! 	    } else {
-! 	      ++b1i;
-  	    }
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-! 	case twoDimVertL1:
-! 	  addPixelsNeg(refLine[b1i] - 1, blackPixels);
-! 	  blackPixels ^= 1;
-! 	  if (codingLine[a0i] < columns) {
-! 	    if (b1i > 0) {
-! 	      --b1i;
-! 	    } else {
-! 	      ++b1i;
-! 	    }
-! 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
-! 	      b1i += 2;
-  	    }
-  	  }
-  	  break;
-  	case EOF:
-+ 	  addPixels(columns, 0);
-  	  eof = gTrue;
-! 	  break;
-  	default:
-  	  error(getPos(), "Bad 2D code %04x in CCITTFax stream", code1);
-+ 	  addPixels(columns, 0);
-  	  err = gTrue;
-  	  break;
-  	}
-!       }
-  
-      // 1-D encoding
-      } else {
-!       codingLine[0] = 0;
-!       a0i = 0;
-!       blackPixels = 0;
-!       while (codingLine[a0i] < columns) {
-  	code1 = 0;
-! 	if (blackPixels) {
-! 	  do {
-! 	    code1 += code3 = getBlackCode();
-! 	  } while (code3 >= 64);
-! 	} else {
-! 	  do {
-! 	    code1 += code3 = getWhiteCode();
-! 	  } while (code3 >= 64);
-  	}
-+ 	addPixels(codingLine[a0i] + code1, blackPixels);
-+ 	blackPixels ^= 1;
-        }
-      }
-  
-      // byte-align the row
-      if (byteAlign) {
-        inputBits &= ~7;
-***************
-*** 1560,1573 ****
-      // this if we know the stream contains end-of-line markers because
-      // the "just plow on" technique tends to work better otherwise
-      } else if (err && endOfLine) {
-!       do {
-  	if (code1 == EOF) {
-  	  eof = gTrue;
-  	  return EOF;
-  	}
-  	eatBits(1);
-! 	code1 = lookBits(13);
-!       } while ((code1 >> 1) != 0x001);
-        eatBits(12); 
-        if (encoding > 0) {
-  	eatBits(1);
---- 1582,1598 ----
-      // this if we know the stream contains end-of-line markers because
-      // the "just plow on" technique tends to work better otherwise
-      } else if (err && endOfLine) {
-!       while (1) {
-! 	code1 = lookBits(13);
-  	if (code1 == EOF) {
-  	  eof = gTrue;
-  	  return EOF;
-  	}
-+ 	if ((code1 >> 1) == 0x001) {
-+ 	  break;
-+ 	}
-  	eatBits(1);
-!       }
-        eatBits(12); 
-        if (encoding > 0) {
-  	eatBits(1);
-***************
-*** 1575,1585 ****
-        }
-      }
-  
-!     a0 = 0;
-!     outputBits = codingLine[1] - codingLine[0];
-!     if (outputBits == 0) {
-!       a0 = 1;
-!       outputBits = codingLine[2] - codingLine[1];
-      }
-  
-      ++row;
---- 1600,1610 ----
-        }
-      }
-  
-!     // set up for output
-!     if (codingLine[0] > 0) {
-!       outputBits = codingLine[a0i = 0];
-!     } else {
-!       outputBits = codingLine[a0i = 1];
-      }
-  
-      ++row;
-***************
-*** 1587,1625 ****
-  
-    // get a byte
-    if (outputBits >= 8) {
-!     ret = ((a0 & 1) == 0) ? 0xff : 0x00;
-!     if ((outputBits -= 8) == 0) {
-!       ++a0;
-!       if (codingLine[a0] < columns) {
-! 	outputBits = codingLine[a0 + 1] - codingLine[a0];
-!       }
-      }
-    } else {
-      bits = 8;
-!     ret = 0;
-      do {
-        if (outputBits > bits) {
-! 	i = bits;
-! 	bits = 0;
-! 	if ((a0 & 1) == 0) {
-! 	  ret |= 0xff >> (8 - i);
-  	}
-! 	outputBits -= i;
-        } else {
-! 	i = outputBits;
-! 	bits -= outputBits;
-! 	if ((a0 & 1) == 0) {
-! 	  ret |= (0xff >> (8 - i)) << bits;
-  	}
-  	outputBits = 0;
-! 	++a0;
-! 	if (codingLine[a0] < columns) {
-! 	  outputBits = codingLine[a0 + 1] - codingLine[a0];
-  	}
-        }
-!     } while (bits > 0 && codingLine[a0] < columns);
-    }
--   buf = black ? (ret ^ 0xff) : ret;
-    return buf;
-  }
-  
---- 1612,1654 ----
-  
-    // get a byte
-    if (outputBits >= 8) {
-!     buf = (a0i & 1) ? 0x00 : 0xff;
-!     outputBits -= 8;
-!     if (outputBits == 0 && codingLine[a0i] < columns) {
-!       ++a0i;
-!       outputBits = codingLine[a0i] - codingLine[a0i - 1];
-      }
-    } else {
-      bits = 8;
-!     buf = 0;
-      do {
-        if (outputBits > bits) {
-! 	buf <<= bits;
-! 	if (!(a0i & 1)) {
-! 	  buf |= 0xff >> (8 - bits);
-  	}
-! 	outputBits -= bits;
-! 	bits = 0;
-        } else {
-! 	buf <<= outputBits;
-! 	if (!(a0i & 1)) {
-! 	  buf |= 0xff >> (8 - outputBits);
-  	}
-+ 	bits -= outputBits;
-  	outputBits = 0;
-! 	if (codingLine[a0i] < columns) {
-! 	  ++a0i;
-! 	  outputBits = codingLine[a0i] - codingLine[a0i - 1];
-! 	} else if (bits > 0) {
-! 	  buf <<= bits;
-! 	  bits = 0;
-  	}
-        }
-!     } while (bits);
-!   }
-!   if (black) {
-!     buf ^= 0xff;
-    }
-    return buf;
-  }
-  
-***************
-*** 1661,1666 ****
---- 1690,1698 ----
-    code = 0; // make gcc happy
-    if (endOfBlock) {
-      code = lookBits(12);
-+     if (code == EOF) {
-+       return 1;
-+     }
-      if ((code >> 5) == 0) {
-        p = &whiteTab1[code];
-      } else {
-***************
-*** 1673,1678 ****
---- 1705,1713 ----
-    } else {
-      for (n = 1; n <= 9; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 9) {
-  	code <<= 9 - n;
-        }
-***************
-*** 1684,1689 ****
---- 1719,1727 ----
-      }
-      for (n = 11; n <= 12; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 12) {
-  	code <<= 12 - n;
-        }
-***************
-*** 1709,1717 ****
-    code = 0; // make gcc happy
-    if (endOfBlock) {
-      code = lookBits(13);
-      if ((code >> 7) == 0) {
-        p = &blackTab1[code];
-!     } else if ((code >> 9) == 0) {
-        p = &blackTab2[(code >> 1) - 64];
-      } else {
-        p = &blackTab3[code >> 7];
---- 1747,1758 ----
-    code = 0; // make gcc happy
-    if (endOfBlock) {
-      code = lookBits(13);
-+     if (code == EOF) {
-+       return 1;
-+     }
-      if ((code >> 7) == 0) {
-        p = &blackTab1[code];
-!     } else if ((code >> 9) == 0 && (code >> 7) != 0) {
-        p = &blackTab2[(code >> 1) - 64];
-      } else {
-        p = &blackTab3[code >> 7];
-***************
-*** 1723,1728 ****
---- 1764,1772 ----
-    } else {
-      for (n = 2; n <= 6; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 6) {
-  	code <<= 6 - n;
-        }
-***************
-*** 1734,1739 ****
---- 1778,1786 ----
-      }
-      for (n = 7; n <= 12; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 12) {
-  	code <<= 12 - n;
-        }
-***************
-*** 1747,1752 ****
---- 1794,1802 ----
-      }
-      for (n = 10; n <= 13; ++n) {
-        code = lookBits(n);
-+       if (code == EOF) {
-+ 	return 1;
-+       }
-        if (n < 13) {
-  	code <<= 13 - n;
-        }
-***************
-*** 1961,1966 ****
---- 2011,2022 ----
-      // allocate a buffer for the whole image
-      bufWidth = ((width + mcuWidth - 1) / mcuWidth) * mcuWidth;
-      bufHeight = ((height + mcuHeight - 1) / mcuHeight) * mcuHeight;
-+     if (bufWidth <= 0 || bufHeight <= 0 ||
-+ 	bufWidth > INT_MAX / bufWidth / (int)sizeof(int)) {
-+       error(getPos(), "Invalid image size in DCT stream");
-+       y = height;
-+       return;
-+     }
-      for (i = 0; i < numComps; ++i) {
-        frameBuf[i] = (int *)gmallocn(bufWidth * bufHeight, sizeof(int));
-        memset(frameBuf[i], 0, bufWidth * bufHeight * sizeof(int));
-***************
-*** 3036,3041 ****
---- 3092,3102 ----
-    }
-    scanInfo.firstCoeff = str->getChar();
-    scanInfo.lastCoeff = str->getChar();
-+   if (scanInfo.firstCoeff < 0 || scanInfo.lastCoeff > 63 ||
-+       scanInfo.firstCoeff > scanInfo.lastCoeff) {
-+     error(getPos(), "Bad DCT coefficient numbers in scan info block");
-+     return gFalse;
-+   }
-    c = str->getChar();
-    scanInfo.ah = (c >> 4) & 0x0f;
-    scanInfo.al = c & 0x0f;
-diff -c -r xpdf-3.02pl1.orig/xpdf/Stream.h xpdf-3.02/xpdf/Stream.h
-*** xpdf-3.02pl1.orig/xpdf/Stream.h	Tue Feb 27 14:05:52 2007
---- xpdf-3.02/xpdf/Stream.h	Thu Oct 25 15:48:15 2007
-***************
-*** 528,540 ****
-    int row;			// current row
-    int inputBuf;			// input buffer
-    int inputBits;		// number of bits in input buffer
-!   short *refLine;		// reference line changing elements
-!   int b1;			// index into refLine
-!   short *codingLine;		// coding line changing elements
-!   int a0;			// index into codingLine
-    int outputBits;		// remaining ouput bits
-    int buf;			// character buffer
-  
-    short getTwoDimCode();
-    short getWhiteCode();
-    short getBlackCode();
---- 528,542 ----
-    int row;			// current row
-    int inputBuf;			// input buffer
-    int inputBits;		// number of bits in input buffer
-!   int *codingLine;		// coding line changing elements
-!   int *refLine;			// reference line changing elements
-!   int a0i;			// index into codingLine
-!   GBool err;			// error on current line
-    int outputBits;		// remaining ouput bits
-    int buf;			// character buffer
-  
-+   void addPixels(int a1, int black);
-+   void addPixelsNeg(int a1, int black);
-    short getTwoDimCode();
-    short getWhiteCode();
-    short getBlackCode();

package/xpdf/xpdf.mk

@@ -1,31 +0,0 @@
-#############################################################
-#
-# xpdf
-#
-#############################################################
-XPDF_VERSION = 3.02
-XPDF_SOURCE = xpdf-$(XPDF_VERSION).tar.gz
-XPDF_SITE = ftp://ftp.foolabs.com/pub/xpdf
-XPDF_AUTORECONF = NO
-XPDF_INSTALL_STAGING = NO
-XPDF_INSTALL_TARGET = YES
-XPDF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-
-XPDF_CONF_OPT = --enable-multithreaded
-
-ifeq ($(BR2_SOFT_FLOAT),y)
-	XPDF_CONF_OPT += --enable-fixedpoint
-endif
-
-ifeq ($(BR2_PACKAGE_XORG7),y)
-	XPDF_DEPENDENCIES += xserver_xorg-server openmotif
-	XPDF_CONF_OPT += --with-Xm-library=$(STAGING_DIR)/usr/lib --with-Xm-includes=$(STAGING_DIR)/usr/include/Xm \
-					--with-x --with-freetype2-includes=$(STAGING_DIR)/usr/include \
-					--with-freetype2-library=$(STAGING_DIR)/usr/lib CFLAGS="-I$(STAGING_DIR)/usr/include/freetype2" \
-					CXXFLAGS="-I$(STAGING_DIR)/usr/include/freetype2"
-endif
-
-XPDF_DEPENDENCIES = freetype
-
-$(eval $(call AUTOTARGETS,package,xpdf))
-