fix some bulk build issues

26 files changed, 180 insertions, 9170 deletions

diff --git a/package/bluez/patches/patch-tools_bccmd_c b/package/bluez/patches/patch-tools_bccmd_c
new file mode 100644
index 000000000..8278a834c
--- /dev/null
+++ b/package/bluez/patches/patch-tools_bccmd_c
@@ -0,0 +1,18 @@
+--- bluez-4.92.orig/tools/bccmd.c	2010-11-30 15:50:48.000000000 +0100
++++ bluez-4.92/tools/bccmd.c	2011-05-17 18:19:30.856601139 +0200
+@@ -1183,6 +1183,7 @@ int main(int argc, char *argv[])
+ 			case 115200: bcsp_rate = B115200; break;
+ 			case 230400: bcsp_rate = B230400; break;
+ 			case 460800: bcsp_rate = B460800; break;
++#if 0
+ 			case 500000: bcsp_rate = B500000; break;
+ 			case 576000: bcsp_rate = B576000; break;
+ 			case 921600: bcsp_rate = B921600; break;
+@@ -1202,6 +1203,7 @@ int main(int argc, char *argv[])
+ #ifdef B4000000
+ 			case 4000000: bcsp_rate = B4000000; break;
+ #endif
++#endif
+ 			default:
+ 				printf("Unknown BCSP baud rate specified, defaulting to 38400bps\n");
+ 				bcsp_rate = B38400;
diff --git a/package/bluez/patches/patch-tools_hciattach_c b/package/bluez/patches/patch-tools_hciattach_c
new file mode 100644
index 000000000..45c8e2e7f
--- /dev/null
+++ b/package/bluez/patches/patch-tools_hciattach_c
@@ -0,0 +1,18 @@
+--- bluez-4.92.orig/tools/hciattach.c	2010-11-30 15:50:48.000000000 +0100
++++ bluez-4.92/tools/hciattach.c	2011-05-17 18:18:20.776610031 +0200
+@@ -107,6 +107,7 @@ static int uart_speed(int s)
+ 		return B230400;
+ 	case 460800:
+ 		return B460800;
++#if 0
+ 	case 500000:
+ 		return B500000;
+ 	case 576000:
+@@ -137,6 +138,7 @@ static int uart_speed(int s)
+ 	case 4000000:
+ 		return B4000000;
+ #endif
++#endif
+ 	default:
+ 		return B57600;
+ 	}
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index f25372af8..544586301 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -28,7 +28,7 @@ $(eval $(call PKG_template,CAIRO,cairo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 $(eval $(call PKG_template,CAIRO_DEV,cairo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_CAIRO_DEV},${PKGSC_CAIRO_DEV},${PKG_OPTS}))
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-ifeq ($(TARGET_ARCH),arm)
+ifeq (,$(filter arm,$(TARGET_ARCH)))
 TARGET_CFLAGS:=         $(filter-out -Os,$(TARGET_CFLAGS))
 endif
 CONFIGURE_ARGS+=	--enable-ft=yes \
diff --git a/package/classpath/Makefile b/package/classpath/Makefile
index fd5efa109..2a9199e55 100644
--- a/package/classpath/Makefile
+++ b/package/classpath/Makefile
@@ -14,7 +14,7 @@ PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 
-PKG_ARCH_DEPENDS:=	!cris
+PKG_ARCH_DEPENDS:=	!cris !arm
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 211955af9..33b5b4519 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://collectd.org/
 PKG_SITES:=		http://collectd.org/files/
 
-PKG_FLAVOURS_COLLECD:=	WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
+PKG_FLAVOURS_COLLECTD:=	WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
 PKGFD_WITH_CPU:=	collect CPU statistics
 PKGFD_WITH_LOAD:=	collect system load statistics
 PKGFD_WITH_MEMORY:=	collect memory usage statistics
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 0039601c3..c5b732866 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		libnids openssl gdbm libpcap libnet
 PKG_URL:=		http://www.monkey.org/~dugsong/dsniff/
 PKG_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
 
+PKG_ARCH_DEPENDS:=	!arm
+
 WRKDIST=		${WRKDIR}/${PKG_NAME}-2.4
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index c5271f249..a0d6e9eaa 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -19,7 +19,7 @@ PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_
 PKG_NOPARALLEL:=	1
 PKG_NEED_CXX:=		1
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el native
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips64 mips64el native
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
diff --git a/package/gconf/Makefile b/package/gconf/Makefile
index 6f449ec8e..84c33ee44 100644
--- a/package/gconf/Makefile
+++ b/package/gconf/Makefile
@@ -15,6 +15,8 @@ PKG_DEPENDS:=		dbus dbus-glib orbit2
 PKG_URL:=		http://projects.gnome.org/gconf/
 PKG_SITES:=		ftp://ftp.gnome.org//pub/GNOME/sources/GConf/${PKG_EXTRAVER}/
 
+PKG_ARCH_DEPENDS:=	!arm !cris
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GCONF,gconf,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/gkrellm/patches/patch-server_Makefile b/package/gkrellm/patches/patch-server_Makefile
index 9f070e275..a1a8747e7 100644
--- a/package/gkrellm/patches/patch-server_Makefile
+++ b/package/gkrellm/patches/patch-server_Makefile
@@ -1,5 +1,5 @@
 --- gkrellm-2.3.4.orig/server/Makefile	2008-10-03 23:52:48.000000000 +0200
-+++ gkrellm-2.3.4/server/Makefile	2011-01-15 18:37:40.000000000 +0100
++++ gkrellm-2.3.4/server/Makefile	2011-05-17 11:34:14.926610183 +0200
 @@ -26,7 +26,7 @@ SMANDIR ?= $(INSTALLROOT)/share/man/man1
  MANMODE ?= 644
  MANDIRMODE ?= 755
@@ -9,7 +9,7 @@
  EXTRAOBJS =
  
  SHARED_PATH = ../shared
-@@ -109,8 +109,8 @@ endif
+@@ -109,15 +109,15 @@ endif
  
  override CC += -Wall $(FLAGS)
  
@@ -20,3 +20,11 @@
  
  OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o
  
+ all:	gkrellmd
+ 
+ gkrellmd: $(OBJS) $(EXTRAOBJS)
+-	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LIBS) $(LINK_FLAGS)
++	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd $(LINK_FLAGS) $(LIBS)
+ 
+ static: $(OBJS) $(EXTRAOBJS)
+ 	$(CC) $(OBJS) $(EXTRAOBJS) -o gkrellmd.static -static \
diff --git a/package/gmediaserver/patches/patch-src_Makefile_in b/package/gmediaserver/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..52cbf9afa
--- /dev/null
+++ b/package/gmediaserver/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+--- gmediaserver-0.13.0.orig/src/Makefile.in	2007-11-10 16:01:34.000000000 +0100
++++ gmediaserver-0.13.0/src/Makefile.in	2011-05-16 17:08:17.466610320 +0200
+@@ -452,9 +452,6 @@ AM_CPPFLAGS = \
+   -I$(top_srcdir)/lib \
+   $(ID3_CPPFLAGS)
+ 
+-AM_LDFLAGS = \
+-  $(ID3_LDFLAGS)
+-
+ gmediaserver_LDADD = \
+   $(top_builddir)/lib/libgnu.a \
+   $(UUID_LIBS) \
diff --git a/package/icecast/patches/autotool.patch b/package/icecast/patches/autotool.patch
index 213ef0965..e8feb2e3a 100644
--- a/package/icecast/patches/autotool.patch
+++ b/package/icecast/patches/autotool.patch
@@ -1,6 +1,6 @@
 diff -Nur icecast-2.3.2.orig/aclocal.m4 icecast-2.3.2/aclocal.m4
 --- icecast-2.3.2.orig/aclocal.m4	2008-05-27 02:21:50.000000000 +0200
-+++ icecast-2.3.2/aclocal.m4	2010-02-18 21:27:36.308858757 +0100
++++ icecast-2.3.2/aclocal.m4	2011-05-16 17:41:51.277851096 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -7233,7 +7233,7 @@ diff -Nur icecast-2.3.2.orig/aclocal.m4 icecast-2.3.2/aclocal.m4
  m4_include([m4/theora.m4])
 diff -Nur icecast-2.3.2.orig/admin/Makefile.in icecast-2.3.2/admin/Makefile.in
 --- icecast-2.3.2.orig/admin/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/admin/Makefile.in	2010-02-18 21:27:41.556853485 +0100
++++ icecast-2.3.2/admin/Makefile.in	2011-05-16 17:41:51.296610263 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -7531,7 +7531,7 @@ diff -Nur icecast-2.3.2.orig/admin/Makefile.in icecast-2.3.2/admin/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/conf/Makefile.in icecast-2.3.2/conf/Makefile.in
 --- icecast-2.3.2.orig/conf/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/conf/Makefile.in	2010-02-18 21:27:41.872855443 +0100
++++ icecast-2.3.2/conf/Makefile.in	2011-05-16 17:41:51.356602233 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -7832,7 +7832,7 @@ diff -Nur icecast-2.3.2.orig/conf/Makefile.in icecast-2.3.2/conf/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/config.h.in icecast-2.3.2/config.h.in
 --- icecast-2.3.2.orig/config.h.in	2008-04-29 06:54:28.000000000 +0200
-+++ icecast-2.3.2/config.h.in	2010-02-18 21:27:40.476856140 +0100
++++ icecast-2.3.2/config.h.in	2011-05-16 17:41:51.416610152 +0200
 @@ -93,7 +93,7 @@
  /* Define to 1 if you have the <string.h> header file. */
  #undef HAVE_STRING_H
@@ -7865,7 +7865,7 @@ diff -Nur icecast-2.3.2.orig/config.h.in icecast-2.3.2/config.h.in
  
 diff -Nur icecast-2.3.2.orig/configure icecast-2.3.2/configure
 --- icecast-2.3.2.orig/configure	2008-05-27 02:21:57.000000000 +0200
-+++ icecast-2.3.2/configure	2010-02-18 21:27:38.596852163 +0100
++++ icecast-2.3.2/configure	2011-05-16 17:41:51.446599626 +0200
 @@ -1,62 +1,85 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -42577,7 +42577,7 @@ diff -Nur icecast-2.3.2.orig/configure icecast-2.3.2/configure
  
 diff -Nur icecast-2.3.2.orig/debian/Makefile.in icecast-2.3.2/debian/Makefile.in
 --- icecast-2.3.2.orig/debian/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/debian/Makefile.in	2010-02-18 21:27:41.980853846 +0100
++++ icecast-2.3.2/debian/Makefile.in	2011-05-16 17:41:51.496601840 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -42816,7 +42816,7 @@ diff -Nur icecast-2.3.2.orig/debian/Makefile.in icecast-2.3.2/debian/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/doc/Makefile.in icecast-2.3.2/doc/Makefile.in
 --- icecast-2.3.2.orig/doc/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/doc/Makefile.in	2010-02-18 21:27:42.072851881 +0100
++++ icecast-2.3.2/doc/Makefile.in	2011-05-16 17:41:51.536609889 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -43114,7 +43114,7 @@ diff -Nur icecast-2.3.2.orig/doc/Makefile.in icecast-2.3.2/doc/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/examples/Makefile.in icecast-2.3.2/examples/Makefile.in
 --- icecast-2.3.2.orig/examples/Makefile.in	2008-05-30 01:58:57.000000000 +0200
-+++ icecast-2.3.2/examples/Makefile.in	2010-02-18 21:27:42.160852195 +0100
++++ icecast-2.3.2/examples/Makefile.in	2011-05-16 17:41:51.576610251 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -43353,7 +43353,7 @@ diff -Nur icecast-2.3.2.orig/examples/Makefile.in icecast-2.3.2/examples/Makefil
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/ltmain.sh icecast-2.3.2/ltmain.sh
 --- icecast-2.3.2.orig/ltmain.sh	2007-08-29 14:28:46.000000000 +0200
-+++ icecast-2.3.2/ltmain.sh	2010-02-18 21:27:29.560857065 +0100
++++ icecast-2.3.2/ltmain.sh	2011-05-16 17:41:51.596605253 +0200
 @@ -1,52 +1,83 @@
 -# ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -57541,7 +57541,7 @@ diff -Nur icecast-2.3.2.orig/ltmain.sh icecast-2.3.2/ltmain.sh
 +
 diff -Nur icecast-2.3.2.orig/m4/libtool.m4 icecast-2.3.2/m4/libtool.m4
 --- icecast-2.3.2.orig/m4/libtool.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/libtool.m4	2010-02-18 21:27:29.616856377 +0100
++++ icecast-2.3.2/m4/libtool.m4	2011-05-16 17:41:51.666726639 +0200
 @@ -0,0 +1,7377 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
@@ -64922,7 +64922,7 @@ diff -Nur icecast-2.3.2.orig/m4/libtool.m4 icecast-2.3.2/m4/libtool.m4
 +])
 diff -Nur icecast-2.3.2.orig/m4/lt~obsolete.m4 icecast-2.3.2/m4/lt~obsolete.m4
 --- icecast-2.3.2.orig/m4/lt~obsolete.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/lt~obsolete.m4	2010-02-18 21:27:29.996853947 +0100
++++ icecast-2.3.2/m4/lt~obsolete.m4	2011-05-16 17:41:51.676600869 +0200
 @@ -0,0 +1,92 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
@@ -65018,7 +65018,7 @@ diff -Nur icecast-2.3.2.orig/m4/lt~obsolete.m4 icecast-2.3.2/m4/lt~obsolete.m4
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 diff -Nur icecast-2.3.2.orig/m4/ltoptions.m4 icecast-2.3.2/m4/ltoptions.m4
 --- icecast-2.3.2.orig/m4/ltoptions.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/ltoptions.m4	2010-02-18 21:27:29.720856211 +0100
++++ icecast-2.3.2/m4/ltoptions.m4	2011-05-16 17:41:51.736619821 +0200
 @@ -0,0 +1,368 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -65390,7 +65390,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltoptions.m4 icecast-2.3.2/m4/ltoptions.m4
 +		 [m4_define([_LTDL_TYPE], [convenience])])
 diff -Nur icecast-2.3.2.orig/m4/ltsugar.m4 icecast-2.3.2/m4/ltsugar.m4
 --- icecast-2.3.2.orig/m4/ltsugar.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/ltsugar.m4	2010-02-18 21:27:29.812854518 +0100
++++ icecast-2.3.2/m4/ltsugar.m4	2011-05-16 17:41:51.776607116 +0200
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
@@ -65517,7 +65517,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltsugar.m4 icecast-2.3.2/m4/ltsugar.m4
 +])
 diff -Nur icecast-2.3.2.orig/m4/ltversion.m4 icecast-2.3.2/m4/ltversion.m4
 --- icecast-2.3.2.orig/m4/ltversion.m4	1970-01-01 01:00:00.000000000 +0100
-+++ icecast-2.3.2/m4/ltversion.m4	2010-02-18 21:27:29.900855680 +0100
++++ icecast-2.3.2/m4/ltversion.m4	2011-05-16 17:41:51.819110062 +0200
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -65544,7 +65544,7 @@ diff -Nur icecast-2.3.2.orig/m4/ltversion.m4 icecast-2.3.2/m4/ltversion.m4
 +])
 diff -Nur icecast-2.3.2.orig/m4/xiph_curl.m4 icecast-2.3.2/m4/xiph_curl.m4
 --- icecast-2.3.2.orig/m4/xiph_curl.m4	2008-04-19 03:54:26.000000000 +0200
-+++ icecast-2.3.2/m4/xiph_curl.m4	2010-02-18 21:27:17.216857590 +0100
++++ icecast-2.3.2/m4/xiph_curl.m4	2011-05-16 17:41:51.856607453 +0200
 @@ -52,7 +52,7 @@
  AC_MSG_CHECKING(for libcurl)
  if test "$curl_ok" = "yes"
@@ -65556,7 +65556,7 @@ diff -Nur icecast-2.3.2.orig/m4/xiph_curl.m4 icecast-2.3.2/m4/xiph_curl.m4
  {
 diff -Nur icecast-2.3.2.orig/Makefile.in icecast-2.3.2/Makefile.in
 --- icecast-2.3.2.orig/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/Makefile.in	2010-02-18 21:27:43.484852142 +0100
++++ icecast-2.3.2/Makefile.in	2011-05-16 17:41:51.886674860 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66203,7 +66203,7 @@ diff -Nur icecast-2.3.2.orig/Makefile.in icecast-2.3.2/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/avl/Makefile.in icecast-2.3.2/src/avl/Makefile.in
 --- icecast-2.3.2.orig/src/avl/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/avl/Makefile.in	2010-02-18 21:27:42.448854807 +0100
++++ icecast-2.3.2/src/avl/Makefile.in	2011-05-16 17:41:51.947265588 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66558,7 +66558,7 @@ diff -Nur icecast-2.3.2.orig/src/avl/Makefile.in icecast-2.3.2/src/avl/Makefile.
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/httpp/Makefile.in icecast-2.3.2/src/httpp/Makefile.in
 --- icecast-2.3.2.orig/src/httpp/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/httpp/Makefile.in	2010-02-18 21:27:42.572851611 +0100
++++ icecast-2.3.2/src/httpp/Makefile.in	2011-05-16 17:41:51.986604412 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -66913,7 +66913,7 @@ diff -Nur icecast-2.3.2.orig/src/httpp/Makefile.in icecast-2.3.2/src/httpp/Makef
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/log/Makefile.in icecast-2.3.2/src/log/Makefile.in
 --- icecast-2.3.2.orig/src/log/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/log/Makefile.in	2010-02-18 21:27:42.692851808 +0100
++++ icecast-2.3.2/src/log/Makefile.in	2011-05-16 17:41:52.029105504 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -67252,7 +67252,7 @@ diff -Nur icecast-2.3.2.orig/src/log/Makefile.in icecast-2.3.2/src/log/Makefile.
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in
 --- icecast-2.3.2.orig/src/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/Makefile.in	2010-02-18 21:27:42.308853999 +0100
++++ icecast-2.3.2/src/Makefile.in	2011-05-16 17:42:11.207851020 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -67438,6 +67438,15 @@ diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign
+@@ -268,7 +305,7 @@
+ icecast_LDADD = $(icecast_DEPENDENCIES) @XIPH_LIBS@ @KATE_LIBS@
+ AM_CFLAGS = @XIPH_CFLAGS@
+ AM_CPPFLAGS = @XIPH_CPPFLAGS@
+-AM_LDFLAGS = @XIPH_LDFLAGS@ @KATE_LIBS@
++AM_LDFLAGS = @KATE_LIBS@
+ all: all-recursive
+ 
+ .SUFFIXES:
 @@ -277,14 +314,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -67799,7 +67808,7 @@ diff -Nur icecast-2.3.2.orig/src/Makefile.in icecast-2.3.2/src/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/net/Makefile.in icecast-2.3.2/src/net/Makefile.in
 --- icecast-2.3.2.orig/src/net/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/net/Makefile.in	2010-02-18 21:27:42.832852040 +0100
++++ icecast-2.3.2/src/net/Makefile.in	2011-05-16 17:41:52.106679736 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68164,7 +68173,7 @@ diff -Nur icecast-2.3.2.orig/src/net/Makefile.in icecast-2.3.2/src/net/Makefile.
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/thread/Makefile.in icecast-2.3.2/src/thread/Makefile.in
 --- icecast-2.3.2.orig/src/thread/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/thread/Makefile.in	2010-02-18 21:27:42.960855785 +0100
++++ icecast-2.3.2/src/thread/Makefile.in	2011-05-16 17:41:52.136773431 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68519,7 +68528,7 @@ diff -Nur icecast-2.3.2.orig/src/thread/Makefile.in icecast-2.3.2/src/thread/Mak
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/src/timing/Makefile.in icecast-2.3.2/src/timing/Makefile.in
 --- icecast-2.3.2.orig/src/timing/Makefile.in	2008-05-30 01:58:58.000000000 +0200
-+++ icecast-2.3.2/src/timing/Makefile.in	2010-02-18 21:27:43.088853096 +0100
++++ icecast-2.3.2/src/timing/Makefile.in	2011-05-16 17:41:52.199109940 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -68874,7 +68883,7 @@ diff -Nur icecast-2.3.2.orig/src/timing/Makefile.in icecast-2.3.2/src/timing/Mak
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/web/Makefile.in icecast-2.3.2/web/Makefile.in
 --- icecast-2.3.2.orig/web/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/web/Makefile.in	2010-02-18 21:27:43.184852192 +0100
++++ icecast-2.3.2/web/Makefile.in	2011-05-16 17:41:52.236766604 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -69172,7 +69181,7 @@ diff -Nur icecast-2.3.2.orig/web/Makefile.in icecast-2.3.2/web/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/win32/Makefile.in icecast-2.3.2/win32/Makefile.in
 --- icecast-2.3.2.orig/win32/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/win32/Makefile.in	2010-02-18 21:27:43.280852401 +0100
++++ icecast-2.3.2/win32/Makefile.in	2011-05-16 17:41:52.286732567 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -69617,7 +69626,7 @@ diff -Nur icecast-2.3.2.orig/win32/Makefile.in icecast-2.3.2/win32/Makefile.in
  .NOEXPORT:
 diff -Nur icecast-2.3.2.orig/win32/res/Makefile.in icecast-2.3.2/win32/res/Makefile.in
 --- icecast-2.3.2.orig/win32/res/Makefile.in	2008-05-30 01:58:59.000000000 +0200
-+++ icecast-2.3.2/win32/res/Makefile.in	2010-02-18 21:27:43.368851884 +0100
++++ icecast-2.3.2/win32/res/Makefile.in	2011-05-16 17:41:52.326869656 +0200
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
diff --git a/package/libavl/Makefile b/package/libavl/Makefile
index 9ab1910c8..331daad78 100755
--- a/package/libavl/Makefile
+++ b/package/libavl/Makefile
@@ -20,6 +20,7 @@ $(eval $(call PKG_template,LIBAVL,libavl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 
 MAKE_FILE:=		GNUmakefile
 CONFIG_STYLE:=		manual
+TARGET_CFLAGS+=		-fPIC
 
 libavl-install:
 	${INSTALL_DIR} ${IDIR_LIBAVL}/usr/lib
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index 0b5ab1dee..fc80bbcba 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libnids
-PKG_VERSION:=		1.23
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		af35e8ef403a0ca95df2da94db856428
+PKG_VERSION:=		1.24
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		72d37c79c85615ffe158aa524d649610
 PKG_DESCR:=		Network Intrusion Detection System library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libnet libpcap glib
@@ -23,6 +23,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBNIDS,libnids,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNIDS_DEV,libnids-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBNIDS_DEV},${PKGSC_LIBNIDS_DEV}))
 
+TARGET_LDFLAGS+=	-lpthread
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--with-libpcap=${STAGING_TARGET_DIR}/usr
 XAKE_FLAGS+=		install_prefix="${WRKINST}"
diff --git a/package/libnids/patches/autotool.patch b/package/libnids/patches/autotool.patch
deleted file mode 100644
index b61da48bc..000000000
--- a/package/libnids/patches/autotool.patch
+++ /dev/null
@@ -1,9120 +0,0 @@
-diff -Nur libnids-1.23.orig/configure libnids-1.23/configure
---- libnids-1.23.orig/configure	2006-05-01 19:14:51.000000000 +0200
-+++ libnids-1.23/configure	2011-03-11 21:07:25.000000000 +0100
-@@ -1,81 +1,423 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.68.
-+#
-+#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-+# Foundation, Inc.
-+#
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
- 
--# Be Bourne compatible
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-   emulate sh
-   NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
- 
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in #(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
- fi
- 
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+as_myself=
-+case $0 in #((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
- 
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+if test "x$CONFIG_SHELL" = x; then
-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
-+else
-+  case \`(set -o) 2>/dev/null\` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
-+fi
-+"
-+  as_required="as_fn_return () { (exit \$1); }
-+as_fn_success () { as_fn_return 0; }
-+as_fn_failure () { as_fn_return 1; }
-+as_fn_ret_success () { return 0; }
-+as_fn_ret_failure () { return 1; }
-+
-+exitcode=0
-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-+
-+else
-+  exitcode=1; echo positional parameters were not saved.
-+fi
-+test x\$exitcode = x0 || exit 1"
-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1"
-+  if (eval "$as_required") 2>/dev/null; then :
-+  as_have_required=yes
-+else
-+  as_have_required=no
-+fi
-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-+
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_found=false
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  as_found=:
-+  case $as_dir in #(
-+	 /*)
-+	   for as_base in sh bash ksh sh5; do
-+	     # Try only shells that exist, to save several forks.
-+	     as_shell=$as_dir/$as_base
-+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$as_shell as_have_required=yes
-+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  break 2
-+fi
-+fi
-+	   done;;
-+       esac
-+  as_found=false
-+done
-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$SHELL as_have_required=yes