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

36 files changed, 519 insertions, 207 deletions

diff --git a/package/Config.in b/package/Config.in
index b6450f22c..54247a83a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -647,6 +647,8 @@ source "package/libXrender/Config.in"
 source "package/libXrender/Config.in.lib"
 source "package/libXt/Config.in"
 source "package/libXt/Config.in.lib"
+source "package/libXft/Config.in"
+source "package/libXft/Config.in.lib"
 source "package/libXxf86dga/Config.in"
 source "package/libXxf86dga/Config.in.lib"
 source "package/pixman/Config.in"
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index d4acd7275..a8a6c3420 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -42,9 +42,10 @@ CONFIGURE_ARGS+=	--with-notify=none \
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DOVECOT}/etc
-	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot
-	${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc
+	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin
+	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/libexec/dovecot
 	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot/modules/{imap,lda,pop3}
+	${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc
 	$(CP) ${WRKINST}/usr/lib/dovecot/modules/*.so \
 		${IDIR_DOVECOT}/usr/lib/dovecot/modules/
 	$(CP) ${WRKINST}/usr/lib/dovecot/modules/imap/*.so \
@@ -53,9 +54,9 @@ post-install:
 		${IDIR_DOVECOT}/usr/lib/dovecot/modules/lda/
 	$(CP) ${WRKINST}/usr/lib/dovecot/modules/pop3/*.so \
 		${IDIR_DOVECOT}/usr/lib/dovecot/modules/pop3/
-	$(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot/* \
-		${IDIR_DOVECOT}/usr/lib/dovecot/
-	$(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot \
+	$(INSTALL_BIN) ${WRKINST}/usr/libexec/dovecot/* \
+		${IDIR_DOVECOT}/usr/libexec/dovecot/
+	$(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot* \
 		${IDIR_DOVECOT}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 5f551b785..56149598a 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -27,8 +27,6 @@ $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION}))
 $(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION}))
 
-INSTALL_STYLE:=		manual
-
 CONFIGURE_ARGS+=	--disable-doc
 CONFIGURE_ENV+=		LIBS="-lncurses"
 
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 25c4e9ac7..d53312381 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -20,10 +20,10 @@ $(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},$
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/{s,}bin
+	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/bin $(IDIR_FINDUTILS)/usr/libexec
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} \
 		 $(IDIR_FINDUTILS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{bigram,code,frcode} \
-		$(IDIR_FINDUTILS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/libexec/{bigram,code,frcode} \
+		$(IDIR_FINDUTILS)/usr/libexec
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/git/Makefile b/package/git/Makefile
index 0f8a71014..4d3b382e3 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_snprintf_returns_bogus=no
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/sbin/git-core
+	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/libexec/git-core
 	$(INSTALL_DIR) $(IDIR_GIT)/usr/share/git-core/templates
 	$(CP) $(WRKINST)/usr/share/git-core/templates/* \
 		$(IDIR_GIT)/usr/share/git-core/templates
@@ -36,6 +36,6 @@ post-install:
 	$(CP) $(WRKINST)/usr/bin/git-receive-pack $(IDIR_GIT)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/git-upload-pack $(IDIR_GIT)/usr/bin
 	$(CP) $(WRKINST)/usr/bin/git-upload-archive $(IDIR_GIT)/usr/bin
-	${CP} $(WRKINST)/usr/sbin/git-core/* $(IDIR_GIT)/usr/sbin/git-core
+	${CP} $(WRKINST)/usr/libexec/git-core/* $(IDIR_GIT)/usr/libexec/git-core
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index ab2e42d6a..bf8ff399f 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -20,6 +20,6 @@ CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HDPARM}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/hdparm ${IDIR_HDPARM}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/sbin/hdparm ${IDIR_HDPARM}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile
index 26a759821..03c74f509 100644
--- a/package/hdparm/patches/patch-Makefile
+++ b/package/hdparm/patches/patch-Makefile
@@ -1,19 +1,32 @@
 --- hdparm-9.15.orig/Makefile	2008-12-10 01:14:28.000000000 +0100
-+++ hdparm-9.15/Makefile	2010-02-05 22:40:21.943083430 +0100
++++ hdparm-9.15/Makefile	2010-02-13 12:24:25.000000000 +0100
 @@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man
  CC ?= gcc
  STRIP ?= strip
- 
+
 -CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
 +CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
- 
+
  #LDFLAGS = -s -static
  LDFLAGS = -s
 @@ -28,7 +28,6 @@ all: hdparm
- 
+
  hdparm: hdparm.h sgio.h $(OBJS)
  	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
 -	$(STRIP) hdparm
- 
+
  hdparm.o:	hdparm.h sgio.h
- 
+
+@@ -46,9 +45,9 @@ install: all hdparm.8
+	if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
+	if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+	elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+-	$(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm
+-	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+-	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
++	$(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm
++	if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
++	elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+
+ clean:
+	-rm -f hdparm $(OBJS) core 2>/dev/null
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index c51d2e58b..49cd7e94d 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -17,7 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		V=1
 CONFIGURE_ENV+=		ac_cv_path_XMLTO=true
 
 post-install:
diff --git a/package/libXft/Makefile b/package/libXft/Makefile
new file mode 100644
index 000000000..03a06ab75
--- /dev/null
+++ b/package/libXft/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libXft
+PKG_VERSION:=		2.1.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0a1e129b1d8b2d3905dc02a64255b781
+PKG_DESCR:=		X FreeType library
+PKG_SECTION:=		x11
+PKG_SITES:=		${MASTER_SITE_XORG}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBXFT,libxft,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-malloc0returnsnull \
+			--disable-install-makestrs
+
+post-install:
+	${INSTALL_DIR} ${IDIR_LIBXFT}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libXft.so* ${IDIR_LIBXFT}/usr/lib/
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libtool/patches/01-force_dlopen_deplibs.patch b/package/libtool/patches/01-force_dlopen_deplibs.patch
deleted file mode 100644
index dfcf56b32..000000000
--- a/package/libtool/patches/01-force_dlopen_deplibs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN libtool-1.5.14/libltdl/acinclude.m4 libtool-1.5.14.new/libltdl/acinclude.m4
---- libtool-1.5.14/libltdl/acinclude.m4	2005-02-12 13:20:02.000000000 +0100
-+++ libtool-1.5.14.new/libltdl/acinclude.m4	2006-04-17 23:00:24.000000000 +0200
-@@ -6228,10 +6228,8 @@
-     ;;
-   esac
-   ])
--if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then
-  AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1],
-     [Define if the OS needs help to load dependent libraries for dlopen().])
--fi
- ])# AC_LTDL_SYS_DLOPEN_DEPLIBS
- 
- 
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index f36e728c6..20d31b1d0 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -19,7 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autotool
+AUTOTOOL_STYLE:=	autoconf
 
 TCFLAGS+=		-fPIC
 CONFIGURE_ARGS+=	--disable-samples
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index f76bffa39..cb4400e45 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP+=		libxml2 gnutls python
 PKG_URL:=		http://www.libvirt.org/
 PKG_SITES:=		ftp://libvirt.org/libvirt/
 
-PKG_HOST_DEPENDS:=	!freebsd
+PKG_HOST_DEPENDS:=	!freebsd !netbsd
 PKG_TARGET_DEPENDS:=	!foxboard
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl
new file mode 100644
index 000000000..c56cae4e9
--- /dev/null
+++ b/package/mrd6/patches/patch-src_scripts_generate-modules-cpp_pl
@@ -0,0 +1,7 @@
+--- mrd6-0.9.6.orig/src/scripts/generate-modules-cpp.pl	2007-03-22 03:37:07.000000000 +0100
++++ mrd6-0.9.6/src/scripts/generate-modules-cpp.pl	2010-02-13 16:04:53.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+
+ use strict;
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 42341cbe0..1818b893c 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -67,6 +67,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/sbin
+	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/usr/libexec
 	${CP} ./files/sshd_config ${IDIR_OPENSSH_SERVER}/etc/ssh
 	${INSTALL_BIN} ${WRKINST}/usr/bin/ssh-keygen \
 		${IDIR_OPENSSH_SERVER}/usr/bin
@@ -85,8 +86,8 @@ post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/sftp \
 		${IDIR_OPENSSH_SFTP_CLIENT}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/sftp-server \
-		${IDIR_OPENSSH_SFTP_SERVER}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \
+		${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec
 	chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openssh/files/sshd_config b/package/openssh/files/sshd_config
index 1ef114940..b8a2c1a70 100644
--- a/package/openssh/files/sshd_config
+++ b/package/openssh/files/sshd_config
@@ -104,7 +104,7 @@ UsePrivilegeSeparation yes
 #Banner none
 
 # override default of no subsystems
-Subsystem	sftp	/usr/sbin/sftp-server
+Subsystem	sftp	/usr/libexec/sftp-server
 
 # Example of overriding settings on a per-user basis
 #Match User anoncvs
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index 36b4896b7..64757186b 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -13,6 +13,8 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.phys.uu.nl/~rombouts/pdnsd.html
 PKG_SITES:=		http://www.phys.uu.nl/~rombouts/pdnsd/releases/
 
+PKG_HOST_DEPENDS:=	!netbsd
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-par.tar.gz
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/python/Makefile b/package/python/Makefile
index 7c313dcad..63d830e95 100644
--- a/package/python/Makefile
+++ b/package/python/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.python.org
 PKG_SITES:=		http://www.python.org/ftp/python/3.1.1/
 
+PKG_HOST_DEPENDS:=	!netbsd
+
 DISTFILES=		Python-${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/Python-${PKG_VERSION}
 
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 35835b9b3..21ec52811 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -18,19 +18,24 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_FILE:=		GNUmakefile
-XAKE_FLAGS+=		optflags='' debugflags=''
-CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
+XAKE_FLAGS+=		optflags='' debugflags='' BASERUBY="${WRKBUILD}/hostruby"
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes
 INSTALL_TARGET:=	install-nodoc
 
-# Enable some ruby extension / options
-post-configure:
-	#echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
-	#echo "socket" >> ${WRKBUILD}/ext/Setup
+pre-configure:
+	cp ${WRKBUILD}/ext/Setup ${WRKBUILD}/ext/Setup.orig
+	echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
+	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
+		./configure --prefix=$(STAGING_TOOLS) \
+	);
+	$(MAKE) -C ${WRKBUILD} ruby
+	cp ${WRKBUILD}/ruby ${WRKBUILD}/hostruby
+	cp ${WRKBUILD}/ext/Setup.orig ${WRKBUILD}/ext/Setup
+	$(MAKE) -C ${WRKBUILD} install-nodoc
+	$(MAKE) -C ${WRKBUILD} clean
 
 post-install:
-	rm ${WRKINST}/usr/lib/*.a
 	rm -rf ${WRKINST}/usr/lib/site_ruby
 	rm -rf ${WRKINST}/usr/include
 	${CP} ${WRKINST}/usr ${IDIR_RUBY}/
diff --git a/package/ruby/patches/patch-Makefile_in b/package/ruby/patches/patch-Makefile_in
new file mode 100644
index 000000000..0e1e996bc
--- /dev/null
+++ b/package/ruby/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- ruby-1.9.1-p378.orig/Makefile.in	2009-11-12 17:01:28.000000000 +0100
++++ ruby-1.9.1-p378/Makefile.in	2010-02-13 21:10:02.000000000 +0100
+@@ -274,7 +274,7 @@ INSNS	= opt_sc.inc optinsn.inc optunifs.
+
+ $(INSNS):
+	@$(RM) $(PROGRAM)
+-	$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
++	$(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+
+ node_name.inc:
+	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
diff --git a/package/ruby/patches/patch-common_mk b/package/ruby/patches/patch-common_mk
new file mode 100644
index 000000000..06a4a7e10
--- /dev/null
+++ b/package/ruby/patches/patch-common_mk
@@ -0,0 +1,10 @@
+--- ruby-1.9.1-p378.orig/common.mk	2009-11-12 17:01:28.000000000 +0100
++++ ruby-1.9.1-p378/common.mk	2010-02-13 20:20:27.000000000 +0100
+@@ -400,7 +400,7 @@ extconf: $(PREP)
+	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
+
+ $(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
+-	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
++	$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
+		-install_name=$(RUBY_INSTALL_NAME) \
+		-so_name=$(RUBY_SO_NAME) rbconfig.rb
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index 0ddc09efe..f6918ad68 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		49bb52c99e002bf85eb41d8385d903b5
 PKG_DESCR:=		x-term with unicode support
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		libx11
-PKG_BUILDDEP+=		libX11
+PKG_DEPENDS:=		libx11 fontconfig libxft
+PKG_BUILDDEP+=		libX11 fontconfig libXft
 PKG_URL:=		http://software.schmorp.de/pkg/rxvt-unicode.html
 PKG_SITES:=		http://dist.schmorp.de/rxvt-unicode/
 
diff --git a/package/squid/Makefile b/package/squid/Makefile
index d10b71a16..0179da4bd 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -16,6 +16,8 @@ PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.0/
 PKG_MULTI:=		1
 #PKG_CXX:=		SQUID
 
+PKG_HOST_DEPENDS:=	!netbsd
+
 AUTH_MODULES:=		basic digest ntlm
 ifneq (${ADK_PACKAGE_SQUID_MOD_BASIC_AUTH_GETPWNAM},)
 BASIC_AUTH_HELPERS+=	getpwnam
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 005601528..93825ae73 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -21,12 +21,14 @@ CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}"
 XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_DIR}/usr/include"
 
 post-install:
-	${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/{bin,sbin}
+	${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/bin
+	${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/sbin
+	${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/libexec
 	${INSTALL_BIN} ${WRKINST}/usr/bin/pppclient \
 		${IDIR_SSLTUNNEL}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppwho \
 		${IDIR_SSLTUNNEL}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppserver \
-		${IDIR_SSLTUNNEL}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/libexec/pppserver \
+		${IDIR_SSLTUNNEL}/usr/libexec/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wput/Makefile b/package/wput/Makefile
index 40649b3e4..fd9bc0ce9 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WPUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ARGS+=	--disable-g-switch
+CONFIGURE_ARGS+=	--disable-g-switch \
+			--without-ssl
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WPUT}/usr/bin
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index 6b86959ad..30da515e0 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.1.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		e2fsprogs
-PKG_MD5SUM:=		ec734f935ec87ebb8be890d29380a3e6
+PKG_MD5SUM:=		c2308b46ee707597ac50aae418d321b8
 PKG_DESCR:=		Utilities to create and check XFS filesystems
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libuuid libpthread
+PKG_BUILDDEP+=		e2fsprogs
 PKG_URL:=		http://oss.sgi.com/projects/xfs
 PKG_SITES:=		ftp://oss.sgi.com/projects/xfs/cmd_tars/ \
 			ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
@@ -19,15 +19,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-AUTOTOOL_STYLE:=	autoconf
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--enable-gettext=no \
 			--with-gnu-ld
 CONFIGURE_ENV+=		DEBUG=" " OPTIMIZER=" "
 ALL_TARGET=		
 
-post-install:
-	${INSTALL_DIR} ${IDIR_XFSPROGS}/sbin
-	${CP} ${WRKINST}/usr/sbin/mkfs.xfs ${IDIR_XFSPROGS}/sbin/
-	${CP} ${WRKINST}/usr/sbin/xfs_repair ${IDIR_XFSPROGS}/sbin/
+do-install:
+	${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xfsprogs/patches/patch-aclocal_m4 b/package/xfsprogs/patches/patch-aclocal_m4
deleted file mode 100644
index 62851935f..000000000
--- a/package/xfsprogs/patches/patch-aclocal_m4
+++ /dev/null
@@ -1,16 +0,0 @@
---- xfsprogs-3.0.0.orig/aclocal.m4	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/aclocal.m4	2009-12-12 00:50:23.000000000 +0100
-@@ -148,11 +148,11 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
-     test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
-     AC_SUBST(pkg_group)
- 
--    pkg_distribution=`uname -s`
-+    pkg_distribution=Linux
-     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
-     AC_SUBST(pkg_distribution)
- 
--    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
-+    pkg_platform=linux
-     test -z "$PLATFORM" || pkg_platform="$PLATFORM"
-     AC_SUBST(pkg_platform)
-   ])
diff --git a/package/xfsprogs/patches/patch-configure b/package/xfsprogs/patches/patch-configure
new file mode 100644
index 000000000..e8068cfba
--- /dev/null
+++ b/package/xfsprogs/patches/patch-configure
@@ -0,0 +1,370 @@
+--- xfsprogs-3.1.1.orig/configure	2010-01-29 21:33:34.000000000 +0100
++++ xfsprogs-3.1.1/configure	2010-02-14 00:02:10.000000000 +0100
+@@ -6404,7 +6404,7 @@ fi
+ LIBTOOL_DEPS="$ltmain"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(CONFIG_SHELL) $(top_builddir)/libtool'
+
+
+
+@@ -11216,7 +11216,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+     test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION"
+
+
+-    pkg_platform=`uname -s | tr 'A-Z' 'a-z' | sed -e 's/irix64/irix/'`
++    pkg_platform=linux
+     test -z "$PLATFORM" || pkg_platform="$PLATFORM"
+
+
+@@ -12602,349 +12602,6 @@ fi
+
+
+
+-for ac_header in aio.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-    if test $ac_cv_header_aio_h = no; then
+-	echo
+-	echo 'FATAL ERROR: could not find a valid <aio.h> header.'
+-	exit 1
+-    fi
+-
+-
+-for ac_func in lio_listio
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-    if test $ac_cv_func_lio_listio = yes; then
+-	librt=""
+-    else
+-
+-{ $as_echo "$as_me:$LINENO: checking for lio_listio in -lrt" >&5
+-$as_echo_n "checking for lio_listio in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_lio_listio+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lrt  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char lio_listio ();
+-int
+-main ()
+-{
+-return lio_listio ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_rt_lio_listio=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_rt_lio_listio=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_lio_listio" >&5
+-$as_echo "$ac_cv_lib_rt_lio_listio" >&6; }
+-if test "x$ac_cv_lib_rt_lio_listio" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBRT 1
+-_ACEOF
+-
+-  LIBS="-lrt $LIBS"
+-
+-else
+-
+-	    echo
+-	    echo 'FATAL ERROR: could not find a library with lio_listio.'
+-	    exit 1
+-fi
+-
+-	librt="-lrt"
+-    fi
+-
+-
+-
+-
+-
+-
+ for ac_header in uuid.h sys/uuid.h uuid/uuid.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/package/xfsprogs/patches/patch-configure_in b/package/xfsprogs/patches/patch-configure_in
deleted file mode 100644
index 78bb9c4b8..000000000
--- a/package/xfsprogs/patches/patch-configure_in
+++ /dev/null
@@ -1,20 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-3.0.0.orig/configure.in	2009-02-04 23:29:48.000000000 +0100
-+++ xfsprogs-3.0.0/configure.in	2009-03-27 11:40:33.000000000 +0100
-@@ -46,16 +46,12 @@ AC_PACKAGE_GLOBALS(xfsprogs)
- AC_PACKAGE_UTILITIES(xfsprogs)
- AC_MULTILIB($enable_lib64)
- 
--AC_PACKAGE_NEED_AIO_H
--AC_PACKAGE_NEED_LIO_LISTIO
--
- AC_PACKAGE_NEED_UUID_H
- AC_PACKAGE_NEED_UUIDCOMPARE
- 
- AC_PACKAGE_NEED_PTHREAD_H
- AC_PACKAGE_NEED_PTHREADMUTEXINIT
- 
--AC_HAVE_FADVISE
- AC_HAVE_MADVISE
- AC_HAVE_MINCORE
- AC_HAVE_SENDFILE
diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
deleted file mode 100644
index 9a305b9e5..000000000
--- a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfsprogs-3.0.0.orig/fsr/xfs_fsr.c	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/fsr/xfs_fsr.c	2009-12-12 00:53:17.000000000 +0100
-@@ -275,7 +275,7 @@ main(int argc, char **argv)
- 						progname, mtab);
- 					exit(1);
- 				}
--				bzero(&mntpref, sizeof(mntpref));
-+				memset(&mntpref, 0, sizeof(mntpref));
- 				if (S_ISDIR(sb.st_mode))
- 					mntpref.mnt_dir = argname;
- 				else
diff --git a/package/xfsprogs/patches/patch-include_builddefs_in b/package/xfsprogs/patches/patch-include_builddefs_in
deleted file mode 100644
index 452817404..000000000
--- a/package/xfsprogs/patches/patch-include_builddefs_in
+++ /dev/null
@@ -1,35 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-2.10.1.orig/include/builddefs.in	2007-09-11 04:01:15.000000000 +0200
-+++ xfsprogs-2.10.1/include/builddefs.in	2008-11-12 11:28:41.000000000 +0100
-@@ -25,7 +25,7 @@ OPTIMIZER = @opt_build@
- MALLOCLIB = @malloc_lib@
- LOADERFLAGS = @LDFLAGS@
- 
--LIBRT = @librt@
-+LIBRT = -lrt
- LIBUUID = @libuuid@
- LIBPTHREAD = @libpthread@
- LIBTERMCAP = @libtermcap@
-@@ -50,14 +50,14 @@ PKG_RELEASE	= @pkg_release@
- PKG_VERSION	= @pkg_version@
- PKG_PLATFORM	= @pkg_platform@
- PKG_DISTRIBUTION= @pkg_distribution@
--PKG_BIN_DIR	= @bindir@
--PKG_SBIN_DIR	= @sbindir@
--PKG_LIB_DIR	= @libdir@@libdirsuffix@
--PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
--PKG_INC_DIR	= @includedir@/xfs
--PKG_MAN_DIR	= @mandir@
--PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
--PKG_LOCALE_DIR	= @datadir@/locale
-+PKG_BIN_DIR	= $(DESTDIR)@bindir@
-+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
-+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
-+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
-+PKG_INC_DIR	= $(DESTDIR)@includedir@/xfs
-+PKG_MAN_DIR	= $(DESTDIR)@mandir@
-+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
-+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
- 
- CC		= @cc@
- AWK		= @awk@
diff --git a/package/xfsprogs/patches/patch-include_buildmacros b/package/xfsprogs/patches/patch-include_buildmacros
index f163f3f2b..ad07f23d2 100644
--- a/package/xfsprogs/patches/patch-include_buildmacros
+++ b/package/xfsprogs/patches/patch-include_buildmacros
@@ -1,12 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-3.0.0.orig/include/buildmacros	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/include/buildmacros	2009-03-27 11:45:29.000000000 +0100
-@@ -48,7 +48,7 @@ LTINSTALL = $(LIBTOOL) --mode=install $(
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF)
+--- xfsprogs-3.1.1.orig/include/buildmacros	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.1/include/buildmacros	2010-02-13 23:57:06.000000000 +0100
+@@ -32,7 +32,7 @@ OBJECTS = $(ASFILES:.s=.o) \
  
- ifeq ($(ENABLE_SHARED),yes)
--LTLDFLAGS += -rpath $(PKG_LIB_DIR)
-+#LTLDFLAGS += -rpath $(PKG_LIB_DIR)
- LTLDFLAGS += -version-info $(LTVERSION)
- endif
+ INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+
+-SHELL = /bin/sh
++SHELL ?= bash
+ IMAGES_DIR = $(TOPDIR)/all-images
+ DIST_DIR = $(TOPDIR)/dist
  
diff --git a/package/xfsprogs/patches/patch-libhandle_Makefile b/package/xfsprogs/patches/patch-libhandle_Makefile
deleted file mode 100644
index 2c16921e1..000000000
--- a/package/xfsprogs/patches/patch-libhandle_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-2.10.1.orig/libhandle/Makefile	2007-09-11 04:01:17.000000000 +0200
-+++ xfsprogs-2.10.1/libhandle/Makefile	2008-12-09 19:02:03.000000000 +0100
-@@ -17,7 +17,7 @@ default:  $(LTLIBRARY)
- include $(BUILDRULES)
- 
- install: default
--	$(INSTALL_LTLIB)
-+	#$(INSTALL_LTLIB)
- 
- install-dev: default
- 	$(INSTALL_LTLIB_DEV)
diff --git a/package/xfsprogs/patches/patch-libxfs_cache_c b/package/xfsprogs/patches/patch-libxfs_cache_c
deleted file mode 100644
index b1a2b1eb1..000000000
--- a/package/xfsprogs/patches/patch-libxfs_cache_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfsprogs-3.0.0.orig/libxfs/cache.c	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/libxfs/cache.c	2009-12-12 00:52:32.000000000 +0100
-@@ -582,7 +582,7 @@ cache_report(
- 			cache->c_mrus[i].cm_count * 100 / cache->c_count);
- 
- 	/* report hash bucket lengths */
--	bzero(hash_bucket_lengths, sizeof(hash_bucket_lengths));
-+	memset(hash_bucket_lengths, 0, sizeof(hash_bucket_lengths));
- 
- 	for (i = 0; i < cache->c_hashsize; i++) {
- 		count = cache->c_hash[i].ch_count;
diff --git a/package/xfsprogs/patches/patch-libxfs_linux_c b/package/xfsprogs/patches/patch-libxfs_linux_c
index 9d0a95f75..a2cd55bd4 100644
--- a/package/xfsprogs/patches/patch-libxfs_linux_c
+++ b/package/xfsprogs/patches/patch-libxfs_linux_c
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- xfsprogs-3.0.0.orig/libxfs/linux.c	2009-02-04 23:29:25.000000000 +0100
-+++ xfsprogs-3.0.0/libxfs/linux.c	2009-03-27 11:43:17.000000000 +0100
+--- xfsprogs-3.1.1.orig/libxfs/linux.c	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.1/libxfs/linux.c	2010-02-13 23:45:27.000000000 +0100
 @@ -20,8 +20,6 @@
  #include <xfs/libxfs.h>
  #include <mntent.h>
diff --git a/package/xfsprogs/patches/patch-repair_Makefile b/package/xfsprogs/patches/patch-repair_Makefile
new file mode 100644
index 000000000..43b1964ad
--- /dev/null
+++ b/package/xfsprogs/patches/patch-repair_Makefile
@@ -0,0 +1,10 @@
+--- xfsprogs-3.1.1.orig/repair/Makefile	2010-01-29 20:46:13.000000000 +0100
++++ xfsprogs-3.1.1/repair/Makefile	2010-02-14 00:07:38.000000000 +0100
+@@ -20,7 +20,7 @@ CFILES = agheader.c attr_repair.c avl.c
+	progress.c prefetch.c rt.c sb.c scan.c threads.c \
+	versions.c xfs_repair.c
+
+-LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
++LLDLIBS = $(LIBXFS) $(LIBXLOG) $(LIBUUID) $(LIBRT) $(LIBPTHREAD) -lrt
+ LTDEPENDENCIES = $(LIBXFS) $(LIBXLOG)
+ LLDFLAGS = -static
diff --git a/package/xfsprogs/patches/patch-repair_progress_c b/package/xfsprogs/patches/patch-repair_progress_c
deleted file mode 100644
index 19433b375..000000000
--- a/package/xfsprogs/patches/patch-repair_progress_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- xfsprogs-3.0.0.orig/repair/progress.c	2009-02-04 23:29:26.000000000 +0100
-+++ xfsprogs-3.0.0/repair/progress.c	2009-12-12 00:53:54.000000000 +0100
-@@ -117,7 +117,7 @@ init_progress_rpt (void)
- 		malloc(sizeof(__uint64_t)*glob_agcount)) == NULL ) {
- 		do_error(_("cannot malloc pointer to done vector\n"));
- 	}
--	bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount);
-+	memset(prog_rpt_done, 0, sizeof(__uint64_t)*glob_agcount);
- 
- 	/*
- 	 *  Setup comm block, start the thread
-@@ -296,7 +296,7 @@ set_progress_msg (int report, __uint64_t
- 
- 	/* reset all the accumulative totals */
- 	if (prog_rpt_done)
--		bzero(prog_rpt_done, sizeof(__uint64_t)*glob_agcount);
-+		memset(prog_rpt_done, 0, sizeof(__uint64_t)*glob_agcount);
- 
- 	if (pthread_mutex_unlock(&global_msgs.mutex))
- 		do_error(_("set_progress_msg: cannot unlock progress mutex\n"));
-@@ -321,7 +321,7 @@ print_final_rpt(void)
- 	if (pthread_mutex_lock(&global_msgs.mutex))
- 		do_error(_("print_final_rpt: cannot lock progress mutex\n"));
- 
--	bzero(&msgbuf, sizeof(msgbuf));
-+	memset(&msgbuf, 0, sizeof(msgbuf));
- 
- 	now = time (NULL);
- 	tmp = localtime ((const time_t *) &now);