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

40 files changed, 255 insertions, 666 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 20c08b15a..e7d1f0ae0 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -48,7 +48,8 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			BUSYBOX_FEATURE_OSF_LABEL=n \
 			BUSYBOX_FEATURE_SGI_LABEL=n \
 			ADK_KERNEL_RT2X00_DEBUG=n \
-			ADK_KERNEL_ATH5K_DEBUG=n
+			ADK_KERNEL_ATH5K_DEBUG=n \
+			ADK_KERNEL_DEBUG_WITH_KGDB=n
 
 noconfig_targets:=	menuconfig \
 			_config \
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index c130804de..c622a1af7 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -13,7 +13,9 @@ $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 
 TCFLAGS+=		-fPIC
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--disable-werror
+CONFIGURE_ARGS+=	--disable-werror \
+			--host=$(REAL_GNU_TARGET_NAME) \
+			--target=$(REAL_GNU_TARGET_NAME)
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index dd5784512..3d89f2072 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -13,7 +13,7 @@ PKG_TARGET_DEPENDS:=	alix1c alix2d alix2d13 wrap foxboard ag241 rb532
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
-CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG
+CFLINE_CFGFS:= 		select BUSYBOX_COMM\n\tselect BUSYBOX_MD5SUM\n\tselect BUSYBOX_XARGS\n\tselect BUSYBOX_FEATURE_SORT_BIG\n\tdepends on !ADK_TARGET_ROOTFS_NFSROOT
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile
index a945a534f..d45dcee52 100644
--- a/package/evilwm/patches/patch-Makefile
+++ b/package/evilwm/patches/patch-Makefile
@@ -1,5 +1,6 @@
+do not strip by install
 --- evilwm-1.0.1.orig/Makefile	2009-03-30 12:37:06.000000000 +0200
-+++ evilwm-1.0.1/Makefile	2010-01-22 17:14:53.000000000 +0100
++++ evilwm-1.0.1/Makefile	2010-01-27 08:14:46.000000000 +0100
 @@ -1,11 +1,11 @@
  # If you don't use CC 
 -CC       = gcc
@@ -34,3 +35,12 @@
  #CFLAGS  += $(INCLUDES) $(DEFINES) -g -Wall
  CFLAGS  += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls
  LDFLAGS += $(LDPATH) $(LIBS)
+@@ -93,7 +93,7 @@ evilwm: $(OBJS)
+ install: evilwm
+ 	if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi
+ 	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
+-	install -s evilwm $(prefix)/bin
++	install evilwm $(prefix)/bin
+ 	install evilwm.1 $(prefix)/share/man/man1
+ 	#gzip -9 $(prefix)/share/man/man1/evilwm.1
+ 
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 08d05d0d2..013910dd5 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		93bd04e2fb348a0c48e13ab3933f2381
 PKG_DESCR:=		X fonts
 PKG_SECTION:=		x11
+PKG_DEPENDS:=		font-util
+PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index f39871761..34ace47f1 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d22283daba10129643800d73f5496aab
 PKG_DESCR:=		X fonts
 PKG_SECTION:=		x11
+PKG_DEPENDS:=		font-util
+PKG_BUILDDEP+=		font-util
 PKG_URL:=		http://www.x.org/
 PKG_SITES:=		${MASTER_SITE_XORG}
 
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index dfa0cbb5c..308c174c9 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
 PKG_SITES:=		http://www-rn.informatik.uni-bremen.de/software/gsm/
 
+PKG_NOPARALLEL:=	1
 PKG_DESCR_1:=		A GSM 06.10 full-rate speech transcoding implementation (utilities)
 PKG_DEPENDS_1:=		libgsm
 
diff --git a/package/libmad/patches/patch-configure b/package/libmad/patches/patch-configure
new file mode 100644
index 000000000..79126f24a
--- /dev/null
+++ b/package/libmad/patches/patch-configure
@@ -0,0 +1,10 @@
+--- libmad-0.15.1b.orig/configure	2004-02-05 10:34:07.000000000 +0100
++++ libmad-0.15.1b/configure	2010-01-22 22:03:54.000000000 +0100
+@@ -19099,7 +19099,6 @@ then
+     case "$optimize" in
+ 	-O|"-O "*)
+ 	    optimize="-O"
+-	    optimize="$optimize -fforce-mem"
+ 	    optimize="$optimize -fforce-addr"
+ 	    : #x optimize="$optimize -finline-functions"
+ 	    : #- optimize="$optimize -fstrength-reduce"
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index cf698f6d3..89d85d7c6 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -21,6 +21,7 @@ $(eval $(call PKG_template,MUTT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--includedir=${WRKBUILD}/. \
 			--oldincludedir=${WRKBUILD}/. \
+			--with-homespool="~/Maildir" \
 			--enable-pop \
 			--enable-imap \
 			--with-ssl
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
new file mode 100644
index 000000000..16af3373b
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -0,0 +1,66 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in	2009-11-04 12:15:52.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in	2010-01-16 11:01:44.015625000 +0100
+@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
+ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
+ rpcgen_LDADD = $(LDADD)
+ rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
+-	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
++	--mode=link $(CCLD) $(rpcgen_CFLAGS) \
++	$(rpcgen_LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CFLAGS) $(HOSTCFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++	--mode=link $(CCLD) $(AM_CFLAGS) $(HOSTCFLAGS) \
++	-o $@
+ SOURCES = $(rpcgen_SOURCES)
+ DIST_SOURCES = $(rpcgen_SOURCES)
+ ETAGS = etags
+@@ -100,10 +100,10 @@ AWK = @AWK@
+ CC = $(CC_FOR_BUILD)
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS =
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = 
+ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ K5VERS = @K5VERS@
+ KRBCFLAGS = @KRBCFLAGS@
+ KRBDIR = @KRBDIR@
+-KRBLDFLAGS = @KRBLDFLAGS@
++KRBLDFLAGS = 
+ KRBLIBS = @KRBLIBS@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS =
+ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+ LIBBLKID = @LIBBLKID@
+ LIBBSD = @LIBBSD@
+@@ -299,7 +299,7 @@ clean-noinstPROGRAMS:
+ 	rm -f $$list
+ rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
+ 	@rm -f rpcgen$(EXEEXT)
+-	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
++	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
new file mode 100644
index 000000000..5bc54e758
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
@@ -0,0 +1,12 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c	2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c	2010-01-16 11:22:02.359375000 +0100
+@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in
+ 	  f_print(fout, "#include <sys/types.h>\n");
+ 
+ 	f_print(fout, "#include <memory.h>\n");
+-#ifndef linux
+-	f_print(fout, "#include <stropts.h>\n");
+-#endif
+ 	if (inetdflag || !tirpcflag ) {
+ 		f_print(fout, "#include <sys/socket.h>\n");
+ 		f_print(fout, "#include <netinet/in.h>\n");
diff --git a/package/openswan/patches/patch-programs_eroute_eroute_c b/package/openswan/patches/patch-programs_eroute_eroute_c
deleted file mode 100644
index f2d2c52b2..000000000
--- a/package/openswan/patches/patch-programs_eroute_eroute_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.24.orig/programs/eroute/eroute.c	2010-01-10 02:34:38.000000000 +0100
-+++ openswan-2.6.24/programs/eroute/eroute.c	2010-01-20 08:43:00.000000000 +0100
-@@ -268,7 +268,7 @@ main(int argc, char **argv)
- 				exit (1);
- 			}
- 			if(ntohl(said.spi) < 0x100) {
--				fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%x Must be larger than 0x100.\n",
-+				fprintf(stderr, "%s: Illegal reserved spi: %s => 0x%lx Must be larger than 0x100.\n",
- 					progname, optarg, ntohl(said.spi));
- 				exit(1);
- 			}
diff --git a/package/proftpd/patches/patch-Make_rules_in b/package/proftpd/patches/patch-Make_rules_in
index 028fd90b3..6f12634fa 100644
--- a/package/proftpd/patches/patch-Make_rules_in
+++ b/package/proftpd/patches/patch-Make_rules_in
@@ -1,6 +1,6 @@
 	do not try to set user or group id when installing
 --- proftpd-1.3.2b.orig/Make.rules.in	2008-11-19 04:51:38.000000000 +0100
-+++ proftpd-1.3.2b/Make.rules.in	2010-01-20 17:52:24.864178426 +0100
++++ proftpd-1.3.2b/Make.rules.in	2010-01-27 23:00:19.000000000 +0100
 @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
  INSTALL=@INSTALL@
  INSTALL_USER=@install_user@
@@ -8,8 +8,8 @@
 -INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 -INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
 -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
-+INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
-+INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -m 0755
++INSTALL_BIN=$(INSTALL) -m 0755
++INSTALL_SBIN=$(INSTALL) -m 0755
 +INSTALL_MAN=$(INSTALL) -m 0644
  
  RM=rm -f
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 424c3de5f..01451b900 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -5,12 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		screen
 PKG_VERSION:=		4.0.3
-PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8506fd205028a96c741e4037de6e3c42
 PKG_DESCR:=		A window manager for the terminal session
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://www.gnu.org/software/screen
 PKG_SITES:=		${MASTER_SITE_GNU:=screen/}
 
diff --git a/package/screen/patches/patch-Makefile b/package/screen/patches/patch-Makefile
deleted file mode 100644
index 852a91342..000000000
--- a/package/screen/patches/patch-Makefile
+++ /dev/null
@@ -1,336 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/Makefile	2006-10-23 15:06:32.000000000 +0200
-+++ screen-4.0.3/Makefile	2008-12-08 04:54:09.000000000 +0100
-@@ -1,3 +1,331 @@
--install all Makefiles and config:
-+#
-+# Makefile template for screen 
-+#
-+# See machine dependant config.h for more configuration options.
-+#
-+
-+srcdir = /home/wbx/openadk/build_x86/w-screen-4.0.3-1/screen-4.0.3
-+VPATH = /home/wbx/openadk/build_x86/w-screen-4.0.3-1/screen-4.0.3
-+
-+DESTDIR = 
-+
-+# Where to install screen.
-+
-+prefix = /usr
-+exec_prefix = ${prefix}
-+
-+# don't forget to change mandir and infodir in doc/Makefile.
-+bindir  = $(exec_prefix)/bin
-+
-+VERSION = 4.0.3
-+SCREEN = screen-$(VERSION)
-+
-+ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
-+SCREENENCODINGS = `sed < config.h -n -e '/define SCREENENCODINGS/s/^.*"\([^"]*\)"/\1/p'`
-+
-+CC = /home/wbx/openadk/cross_x86/host/bin/i586-linux-uclibc-gcc
-+CFLAGS = -fwrapv -fno-ident -Os -pipe -march=i586
-+CPPFLAGS = -isystem /home/wbx/openadk/cross_x86/target/include -isystem /home/wbx/openadk/cross_x86/target/usr/include -DNDEBUG
-+LDFLAGS = -Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_x86/target/usr/lib -L/home/wbx/openadk/cross_x86/target/lib -L/home/wbx/openadk/cross_x86/target/usr/lib
-+LIBS = -lcurses  -lutil -lcrypt
-+
-+CPP=/home/wbx/openadk/cross_x86/host/bin/i586-linux-uclibc-gcc -E
-+CPP_DEPEND=$(CC) -MM
-+
-+INSTALL = /usr/bin/install -c
-+INSTALL_PROGRAM = ${INSTALL}
-+INSTALL_DATA = ${INSTALL} -m 644
-+
-+AWK = gawk
-+
-+### Chose some debug configuration options:
-+# -DDEBUG
-+#	Turn on really heavy debug output. This is written to 
-+#	/tmp/debug/{SCREEN,screen}.<pid>. Look at these files and quote 
-+#	questionable sections when sending bug-reports to the author.
-+# -DDUMPSHADOW
-+#	With shadow-pw screen would never dump core. Use this option if
-+#	you still want to have a core. Use only for debugging.
-+OPTIONS=
-+#OPTIONS= -DDEBUG
-+
-+SHELL=/bin/sh
-+
-+CFILES=	screen.c ansi.c fileio.c mark.c misc.c resize.c socket.c \
-+	search.c tty.c term.c window.c utmp.c loadav.c putenv.c help.c \
-+	termcap.c input.c attacher.c pty.c process.c display.c comm.c \
-+	kmapdef.c acls.c braille.c braille_tsi.c logfile.c layer.c \
-+	sched.c teln.c nethack.c encoding.c
-+OFILES=	screen.o ansi.o fileio.o mark.o misc.o resize.o socket.o \
-+	search.o tty.o term.o window.o utmp.o loadav.o putenv.o help.o \
-+	termcap.o input.o attacher.o pty.o process.o display.o comm.o \
-+	kmapdef.o acls.o braille.o braille_tsi.o logfile.o layer.o \
-+	sched.o teln.o nethack.o encoding.o
-+
-+all:	screen
-+
-+screen: $(OFILES)
-+	$(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-+
-+.c.o:
-+	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
-+
-+install_bin: .version screen
-+	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
-+		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
-+	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
-+	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
-+# This doesn't work if $(bindir)/screen is a symlink
-+	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
-+	rm -f $(DESTDIR)$(bindir)/screen
-+	(cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
-+	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
-+
-+###############################################################################
-+install: installdirs install_bin
-+	cd doc ; $(MAKE) install
-+	-if [ -d /usr/lib/terminfo ]; then \
-+		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
-+		chmod 644 /usr/lib/terminfo/s/screen*; \
-+	fi
-+# Better do this by hand. E.g. under RCS...
-+#	cat ${srcdir}/terminfo/screencap >> /etc/termcap
-+	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
-+	@echo "You may also want to install $(srcdir)/etc/etcscreenrc in" $(ETCSCREENRC)
-+
-+installdirs:
-+# Path leading to ETCSCREENRC and Socketdirectory not checked.
-+	$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(SCREENENCODINGS)
-+	cd doc ; $(MAKE) installdirs
-+
-+uninstall: .version
-+	rm -f $(DESTDIR)$(bindir)/$(SCREEN)
-+	rm -f $(DESTDIR)$(bindir)/screen
-+	-mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen
-+	rm -f $(DESTDIR)$(ETCSCREENRC)
-+	cd doc; $(MAKE) uninstall
-+
-+shadow:
-+	mkdir shadow;
-+	cd shadow; ln -s ../*.[ch] ../*.in ../*.sh ../configure ../doc ../terminfo ../etc .
-+	rm -f shadow/term.h shadow/tty.c shadow/comm.h shadow/osdef.h
-+	echo "install all Makefiles and config:" > shadow/Makefile
-+	echo "	rm -f config.cache" >> shadow/Makefile
-+	echo "	sh ./configure" >> shadow/Makefile
-+	
-+term.h: term.c term.sh
-+	AWK=$(AWK) srcdir=$(srcdir) sh $(srcdir)/term.sh
-+
-+kmapdef.c: term.h
-+
-+tty.c:	tty.sh 
-+	sh $(srcdir)/tty.sh tty.c
-+
-+comm.h: comm.c comm.sh config.h
-+	AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-+
-+osdef.h: osdef.sh config.h osdef.h.in
-+	CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
-+
-+docs:
-+	cd doc; $(MAKE) dvi screen.info
-+
-+dvi info screen.info:
-+	-cd doc; $(MAKE) $@
-+
-+mostlyclean:
-+	rm -f $(OFILES) screen config.cache osdef0.c osdef1.sed osdef2.sed
-+
-+clean celan: mostlyclean
-+	rm -f tty.c term.h comm.h osdef.h kmapdef.c core
-+
-+# Delete all files from the current directory that are created by 
-+# configuring or building the program.
-+# building of term.h/comm.h requires awk. Keep it in the distribution
-+# we keep config.h, as this file knows where 'make dist' finds the ETCSCREENRC.
-+#distclean:	mostlyclean
-+#	rm -f $(SCREEN).tar $(SCREEN).tar.gz
-+#	rm -f config.status Makefile
-+#	rm -f osdef.h doc/Makefile
-+
-+maintainer-clean:
-+	@echo "This command is not even intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+
-+
-+# Delete everything from the current directory that can be
-+# reconstructed with this Makefile.
-+realclean: .version mostlyclean
-+	rm -f $(SCREEN).tar $(SCREEN).tar.gz
-+	rm -f config.status Makefile doc/Makefile
-+	rm -f tty.c term.h comm.h osdef.h kmapdef.c
-+	rm -f config.h
-+	echo "install all Makefiles and config:" > Makefile
-+	echo "  sh ./configure" >> Makefile
-+
-+tags TAGS: $(CFILES)
-+	-ctags    *.sh $(CFILES) *.h
-+	-ctags -e *.sh $(CFILES) *.h
-+
-+dist: .version $(SCREEN).tar.gz
-+
-+$(SCREEN).tar: .version term.h comm.h tty.c kmapdef.c
-+	-rm -rf dist
-+	mkdir dist
-+	mkdir dist/$(SCREEN)
-+	ln acls.h ansi.h display.h extern.h logfile.h mark.h os.h \
-+	   layer.h patchlevel.h screen.h window.h image.h \
-+	   osdef.h.in term.sh tty.sh comm.sh osdef.sh braille.h \
-+	   sched.h \
-+	   $(CFILES) \
-+	   ChangeLog COPYING INSTALL NEWS* TODO install.sh \
-+	   dist/$(SCREEN)
-+	cd dist/$(SCREEN); mv tty.c tty.c.dist
-+	cd dist/$(SCREEN); mv kmapdef.c kmapdef.c.dist
-+	ln configure.in configure dist/$(SCREEN)
-+	sed -e 's@"/local/screens@"/tmp/screens@' -e 's@"/local@"/usr/local@g' < config.h.in > dist/$(SCREEN)/config.h.in
-+	sed -e 's@[	 ]/local@ /usr/local@g' -e 's/^CFLAGS = -g/CFLAGS = -O/' < Makefile.in > dist/$(SCREEN)/Makefile.in
-+	ln term.h dist/$(SCREEN)/term.h.dist
-+	ln comm.h dist/$(SCREEN)/comm.h.dist
-+	ln README dist/$(SCREEN)/README
-+	mkdir dist/$(SCREEN)/terminfo
-+	cd terminfo; ln 8bits README checktc.c screencap \
-+	  screeninfo.src test.txt tetris.c \
-+	  ../dist/$(SCREEN)/terminfo
-+	mkdir dist/$(SCREEN)/etc
-+	cd etc; ln * ../dist/$(SCREEN)/etc
-+	mkdir dist/$(SCREEN)/utf8encodings
-+	cd utf8encodings; ln * ../dist/$(SCREEN)/utf8encodings
-+	# sed -e 's/^startup/#startup/' -e 's/^autodetach/#autodetach/' < $(ETCSCREENRC) > dist/$(SCREEN)/etc/etcscreenrc 
-+	cp $(HOME)/.screenrc dist/$(SCREEN)/etc/screenrc
-+	mkdir dist/$(SCREEN)/doc
-+	sed -e 's@/local/emacs@/usr/local@g' < doc/Makefile.in > dist/$(SCREEN)/doc/Makefile.in
-+	cd doc; ln FAQ README.DOTSCREEN screen.1 screen.texinfo fdpat.ps make.help window_to_display.ps \
-+	  ../dist/$(SCREEN)/doc
-+	cd doc; if test -f screen.info; then ln screen.info* \
-+	   ../dist/$(SCREEN)/doc; fi
-+	cd dist/$(SCREEN)/doc; ln -s ../install.sh .
-+	cd dist/$(SCREEN); ln -s doc/FAQ .
-+	echo "install all Makefiles and config:" > dist/$(SCREEN)/Makefile
-+	echo "	rm -f config.cache" >> dist/$(SCREEN)/Makefile
-+	echo "	sh ./configure"     >> dist/$(SCREEN)/Makefile
-+	cd dist; tar cf ../$(SCREEN).tar $(SCREEN)
-+	rm -rf dist
-+
-+$(SCREEN).tar.gz: $(SCREEN).tar
-+	gzip -nf $(SCREEN).tar || gzip -f $(SCREEN).tar
-+
-+# Perform self-tests (if any).
-+check:
-+
-+lint:
-+	lint -I. $(CFILES)
-+
-+saber:
-+	#load $(CFLAGS) screen.c ansi.c $(LIBS)
-+
-+config:
- 	rm -f config.cache
- 	sh ./configure
-+
-+
-+###############################################################################
-+
-+.version:
-+	@rev=`sed < $(srcdir)/patchlevel.h -n -e '/#define REV/s/#define REV  *//p'`; \
-+	vers=`sed < $(srcdir)/patchlevel.h -n -e '/#define VERS/s/#define VERS  *//p'`; \
-+	pat=`sed < $(srcdir)/patchlevel.h -n -e '/#define PATCHLEVEL/s/#define PATCHLEVEL  *//p'`; \
-+	if [ "$${rev}.$${vers}.$${pat}" != "$(VERSION)" ]; then \
-+	echo "This distribution is screen-$${rev}.$${vers}.$${pat}, but"; \
-+	echo "the Makefile is from $(VERSION). Please update!"; exit 1; fi
-+
-+###############################################################################
-+
-+mdepend: $(CFILES) term.h
-+	@rm -f DEPEND ; \
-+	for i in ${CFILES} ; do \
-+	  echo "$$i" ; \
-+	  echo `echo "$$i" | sed -e 's/.c$$/.o/'`": $$i" `\
-+            cc -E $$i |\
-+            grep '^# .*"\./.*\.h"' |\
-+            (sort -t'"' -u -k 2,2 2>/dev/null || sort -t'"' -u +1 -2) |\
-+            sed -e 's/.*"\.\/\(.*\)".*/\1/'\
-+          ` >> DEPEND ; \
-+	done
-+
-+
-+depend: depend.in
-+	./config.status || ./configure
-+	
-+depend.in: $(CFILES) term.h
-+	cp Makefile.in Makefile.in~
-+	sed -e '/\#\#\# Dependencies/q' < Makefile.in > tmp_make
-+	for i in $(CFILES); do echo $$i; $(CPP_DEPEND) $$i >> tmp_make; done 
-+	mv tmp_make Makefile.in
-+
-+###############################################################################
-+
-+### Dependencies:
-+screen.o: screen.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h braille.h \
-+ patchlevel.h logfile.h extern.h
-+ansi.o: ansi.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h braille.h extern.h \
-+ logfile.h
-+fileio.o: fileio.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+mark.o: mark.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h
-+misc.o: misc.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+resize.o: resize.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+socket.o: socket.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+search.o: search.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h mark.h extern.h
-+tty.o: tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
-+ layer.h term.h image.h display.h window.h extern.h
-+term.o: term.c term.h
-+window.o: window.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
-+utmp.o: utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+loadav.o: loadav.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+putenv.o: putenv.c config.h
-+help.o: help.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+termcap.o: termcap.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+input.o: input.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+attacher.o: attacher.c config.h screen.h os.h osdef.h ansi.h \
-+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h
-+pty.o: pty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
-+ layer.h term.h image.h display.h window.h extern.h
-+process.o: process.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
-+display.o: display.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h
-+comm.o: comm.c config.h acls.h comm.h
-+kmapdef.o: kmapdef.c config.h
-+acls.o: acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \
-+ layer.h term.h image.h display.h window.h extern.h
-+braille.o: braille.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h braille.h
-+braille_tsi.o: braille_tsi.c config.h screen.h os.h osdef.h ansi.h \
-+ acls.h comm.h layer.h term.h image.h display.h window.h extern.h \
-+ braille.h
-+logfile.o: logfile.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
-+layer.o: layer.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+sched.o: sched.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h logfile.h
-+teln.o: teln.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+nethack.o: nethack.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
-+encoding.o: encoding.c config.h screen.h os.h osdef.h ansi.h acls.h \
-+ comm.h layer.h term.h image.h display.h window.h extern.h
diff --git a/package/screen/patches/patch-ansi_c b/package/screen/patches/patch-ansi_c
deleted file mode 100644
index f6da58abe..000000000
--- a/package/screen/patches/patch-ansi_c
+++ /dev/null
@@ -1,32 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/ansi.c	2003-12-05 14:57:05.000000000 +0100
-+++ screen-4.0.3/ansi.c	2008-12-08 04:59:17.000000000 +0100
-@@ -1462,7 +1462,7 @@ StringEnd()
-   switch (curr->w_StringType)
-     {
-     case OSC:	/* special xterm compatibility hack */
--      if (curr->w_string[0] == ';' || (p = index(curr->w_string, ';')) == 0)
-+      if (curr->w_string[0] == ';' || (p = strchr(curr->w_string, ';')) == 0)
- 	break;
-       typ = atoi(curr->w_string);
-       p++;
-@@ -2803,15 +2803,15 @@ int ys, ye;
-   debug2("MFindUsedLine: %d %d\n", ye, ys);
-   for (y = ye; y >= ys; y--, ml--)
-     {
--      if (bcmp((char*)ml->image, blank, p->w_width))
-+      if (memcmp((char*)ml->image, blank, p->w_width))
- 	break;
--      if (ml->attr != null && bcmp((char*)ml->attr, null, p->w_width))
-+      if (ml->attr != null && memcmp((char*)ml->attr, null, p->w_width))
- 	break;
- #ifdef COLOR
--      if (ml->color != null && bcmp((char*)ml->color, null, p->w_width))
-+      if (ml->color != null && memcmp((char*)ml->color, null, p->w_width))
- 	break;
- # ifdef COLORS256
--      if (ml->colorx != null && bcmp((char*)ml->colorx, null, p->w_width))
-+      if (ml->colorx != null && memcmp((char*)ml->colorx, null, p->w_width))
- 	break;
- # endif
- #endif
diff --git a/package/screen/patches/patch-attacher_c b/package/screen/patches/patch-attacher_c
deleted file mode 100644
index 34e9a0deb..000000000
--- a/package/screen/patches/patch-attacher_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/attacher.c	2003-09-08 16:24:48.000000000 +0200
-+++ screen-4.0.3/attacher.c	2008-10-08 14:09:31.000000000 +0200
-@@ -849,9 +849,9 @@ screen_builtin_lck()
-   strncpy(fullname, ppp->pw_gecos, sizeof(fullname) - 9);
-   fullname[sizeof(fullname) - 9] = 0;
- 
--  if ((cp1 = index(fullname, ',')) != NULL)
-+  if ((cp1 = strchr(fullname, ',')) != NULL)
-     *cp1 = '\0';
--  if ((cp1 = index(fullname, '&')) != NULL)
-+  if ((cp1 = strchr(fullname, '&')) != NULL)
-     {
-       strncpy(cp1, ppp->pw_name, 8);
-       cp1[8] = 0;
diff --git a/package/screen/patches/patch-configure b/package/screen/patches/patch-configure
index 21ae13053..91f90dc4c 100644
--- a/package/screen/patches/patch-configure
+++ b/package/screen/patches/patch-configure
@@ -1,6 +1,5 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- screen-4.0.3.orig/configure	2003-12-05 14:46:53.000000000 +0100
-+++ screen-4.0.3/configure	2008-10-08 13:33:43.000000000 +0200
++++ screen-4.0.3/configure	2010-01-23 10:18:22.000000000 +0100
 @@ -124,7 +124,7 @@ done
    fi
    if test ! -f "$as_myself"; then
@@ -227,7 +226,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  fi
  ac_config_guess="$SHELL $ac_aux_dir/config.guess"
  ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-@@ -4149,7 +4149,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3335,6 +3335,11 @@ _ACEOF
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ 
++# always SYSV
++cat >>confdefs.h <<\_ACEOF
++#define SYSV 1
++_ACEOF
++
+ { echo "$as_me:$LINENO: checking for sequent/ptx..." >&5
+ echo "$as_me: checking for sequent/ptx..." >&6;}
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4149,7 +4154,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5
  echo "$as_me: error: !!! no select - no screen" >&2;}
@@ -236,7 +247,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  
-@@ -4163,7 +4163,7 @@ if test "$cross_compiling" = yes; then
+@@ -4163,7 +4168,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -245,7 +256,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -4272,7 +4272,7 @@ if test "$cross_compiling" = yes; then
+@@ -4272,7 +4277,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -254,7 +265,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -4365,7 +4365,7 @@ if test "$cross_compiling" = yes; then
+@@ -4365,7 +4370,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -263,7 +274,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -4460,7 +4460,7 @@ if test "$cross_compiling" = yes; then
+@@ -4460,7 +4465,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -272,7 +283,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -4562,7 +4562,7 @@ elif test -n "$sock"; then
+@@ -4562,7 +4567,7 @@ elif test -n "$sock"; then
  else
    { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5
  echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;}
@@ -281,7 +292,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  fi
  
  
-@@ -4573,7 +4573,7 @@ if test "$cross_compiling" = yes; then
+@@ -4573,7 +4578,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -290,7 +301,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -4898,7 +4898,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -4898,7 +4903,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5
  echo "$as_me: error: !!! no tgetent - no screen" >&2;}
@@ -299,7 +310,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  fi
-@@ -4915,7 +4915,7 @@ if test "$cross_compiling" = yes; then
+@@ -4915,7 +4920,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -308,7 +319,58 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -5359,7 +5359,7 @@ if test "$cross_compiling" = yes; then
+@@ -5008,50 +5013,6 @@ _ACEOF
+ 
+ fi
+ 
+-{ echo "$as_me:$LINENO: checking for SVR4 ptys..." >&5
+-echo "$as_me: checking for SVR4 ptys..." >&6;}
+-sysvr4ptys=
+-if test -c /dev/ptmx ; then
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-ptsname(0);grantpt(0);unlockpt(0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SVR4_PTYS 1
+-_ACEOF
+-
+-sysvr4ptys=1
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-fi
+ 
+ 
+ for ac_func in getpt
+@@ -5359,7 +5320,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -317,7 +379,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -6206,7 +6206,7 @@ echo "$as_me: checking for avenrun symbo
+@@ -6206,7 +6167,7 @@ echo "$as_me: checking for avenrun symbo
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -326,7 +388,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -6482,7 +6482,7 @@ if test "$cross_compiling" = yes; then
+@@ -6482,7 +6443,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -335,7 +397,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -6598,8 +6598,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -6598,8 +6559,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
  LIBS="$oldlibs"
  fi
  rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -344,7 +406,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  oldlibs="$LIBS"
  LIBS="$LIBS -lsun"
  { echo "$as_me:$LINENO: checking IRIX sun library..." >&5
-@@ -7004,7 +7002,7 @@ if test "$cross_compiling" = yes; then
+@@ -7004,7 +6963,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -353,7 +415,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -7056,7 +7054,7 @@ if test "$cross_compiling" = yes; then
+@@ -7056,7 +7015,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -362,7 +424,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -7110,7 +7108,7 @@ if test "$cross_compiling" = yes; then
+@@ -7110,7 +7069,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -371,7 +433,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -7951,7 +7949,7 @@ if test "$cross_compiling" = yes; then
+@@ -7158,6 +7117,11 @@ fi
+ rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
++# always use memcpy
++cat >>confdefs.h <<\_ACEOF
++#define USEMEMCPY 1
++_ACEOF
++
+ echo "$as_me:$LINENO: checking long file names" >&5
+ echo $ECHO_N "checking long file names... $ECHO_C" >&6
+ (echo 1 > /tmp/conftest9012345) 2>/dev/null
+@@ -7951,7 +7915,7 @@ if test "$cross_compiling" = yes; then
  See \`config.log' for more details." >&5
  echo "$as_me: error: cannot run test program while cross compiling
  See \`config.log' for more details." >&2;}
@@ -380,7 +454,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  else
    cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
-@@ -7982,7 +7980,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -7982,7 +7946,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  ( exit $ac_status )
  { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5
  echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;}
@@ -389,7 +463,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  fi
  rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
-@@ -8251,7 +8249,7 @@ done
+@@ -8251,7 +8215,7 @@ done
    if test ! -f "$as_myself"; then
      { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
  echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
@@ -398,7 +472,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    fi
    case $CONFIG_SHELL in
    '')
-@@ -8302,7 +8300,7 @@ done
+@@ -8302,7 +8266,7 @@ done
    chmod +x $as_me.lineno ||
      { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
  echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
@@ -407,7 +481,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-@@ -8494,7 +8492,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -8494,7 +8458,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
  Try \`$0 --help' for more information." >&5
  echo "$as_me: error: ambiguous option: $1
  Try \`$0 --help' for more information." >&2;}
@@ -416,7 +490,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    --help | --hel | -h )
      echo "$ac_cs_usage"; exit 0 ;;
    --debug | --d* | -d )
-@@ -8516,7 +8514,7 @@ Try \`$0 --help' for more information." 
+@@ -8516,7 +8480,7 @@ Try \`$0 --help' for more information." 
  Try \`$0 --help' for more information." >&5
  echo "$as_me: error: unrecognized option: $1
  Try \`$0 --help' for more information." >&2;}
@@ -425,7 +499,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
    *) ac_config_targets="$ac_config_targets $1" ;;
  
-@@ -8555,7 +8553,7 @@ do
+@@ -8555,7 +8519,7 @@ do
    "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -434,7 +508,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    esac
  done
  
-@@ -8750,7 +8748,7 @@ echo X"$as_dir" |
+@@ -8750,7 +8714,7 @@ echo X"$as_dir" |
      test ! -n "$as_dirs" || mkdir $as_dirs
    fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
  echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
@@ -443,7 +517,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
    ac_builddir=.
  
-@@ -8816,7 +8814,7 @@ echo "$as_me: creating $ac_file" >&6;}
+@@ -8816,7 +8780,7 @@ echo "$as_me: creating $ac_file" >&6;}
           # Absolute (can't be DOS-style, as IFS=:)
           test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
@@ -452,7 +526,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
           echo $f;;
        *) # Relative
           if test -f "$f"; then
-@@ -8829,7 +8827,7 @@ echo "$as_me: error: cannot find input f
+@@ -8829,7 +8793,7 @@ echo "$as_me: error: cannot find input f
             # /dev/null tree
             { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
@@ -461,7 +535,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
           fi;;
        esac
      done` || { (exit 1); exit 1; }
-@@ -8907,7 +8905,7 @@ echo "$as_me: creating $ac_file" >&6;}
+@@ -8907,7 +8871,7 @@ echo "$as_me: creating $ac_file" >&6;}
           # Absolute (can't be DOS-style, as IFS=:)
           test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
@@ -470,7 +544,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
           echo $f;;
        *) # Relative
           if test -f "$f"; then
-@@ -8920,7 +8918,7 @@ echo "$as_me: error: cannot find input f
+@@ -8920,7 +8884,7 @@ echo "$as_me: error: cannot find input f
             # /dev/null tree
             { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
  echo "$as_me: error: cannot find input file: $f" >&2;}
@@ -479,7 +553,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
           fi;;
        esac
      done` || { (exit 1); exit 1; }
-@@ -9073,7 +9071,7 @@ echo X"$as_dir" |
+@@ -9073,7 +9037,7 @@ echo X"$as_dir" |
      test ! -n "$as_dirs" || mkdir $as_dirs
    fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
  echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
diff --git a/package/screen/patches/patch-fileio_c b/package/screen/patches/patch-fileio_c
deleted file mode 100644
index c86914c10..000000000
--- a/package/screen/patches/patch-fileio_c
+++ /dev/null
@@ -1,39 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/fileio.c	2003-09-08 16:25:28.000000000 +0200
-+++ screen-4.0.3/fileio.c	2008-10-08 14:07:52.000000000 +0200
-@@ -96,7 +96,7 @@ char *rcfile;
- 
-   if (rcfile)
-     {
--      char *rcend = rindex(rc_name, '/');
-+      char *rcend = strrchr(rc_name, '/');
-       if (*rcfile != '/' && rcend && (rcend - rc_name) + strlen(rcfile) + 2 < sizeof(buf))
- 	{
- 	  strncpy(buf, rc_name, rcend - rc_name + 1);
-@@ -169,7 +169,7 @@ char *rcfilename;
-     }
-   while (fgets(buf, sizeof buf, fp) != NULL)
-     {
--      if ((p = rindex(buf, '\n')) != NULL)
-+      if ((p = strrchr(buf, '\n')) != NULL)
- 	*p = '\0';
-       if ((argc = Parse(buf, sizeof buf, args, argl)) == 0)
- 	continue;
-@@ -216,7 +216,7 @@ char *rcfilename;
- 	    }
- 	  for (p = args[1]; p && *p; p = cp)
- 	    {
--	      if ((cp = index(p, '|')) != 0)
-+	      if ((cp = strchr(p, '|')) != 0)
- 		*cp++ = '\0';
- 	      len = strlen(p);
- 	      if (p[len - 1] == '*')
-@@ -501,7 +501,7 @@ int dump;
- 		}
- 	      break;
- 	    case DUMP_TERMCAP:
--	      if ((p = index(MakeTermcap(fore->w_aflag), '=')) != NULL)
-+	      if ((p = strchr(MakeTermcap(fore->w_aflag), '=')) != NULL)
- 		{
- 		  fputs(++p, f);
- 		  putc('\n', f);
diff --git a/package/screen/patches/patch-help_c b/package/screen/patches/patch-help_c
deleted file mode 100644
index 8b997c7de..000000000
--- a/package/screen/patches/patch-help_c
+++ /dev/null
@@ -1,15 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/help.c	2003-09-08 16:25:33.000000000 +0200
-+++ screen-4.0.3/help.c	2008-10-08 14:08:53.000000000 +0200
-@@ -386,9 +386,9 @@ int x, y;
-       del = 0;
-       bp = buf;
-       ll = *lp++;
--      if (!ll || (index(cp, ' ') != NULL))
-+      if (!ll || (strchr(cp, ' ') != NULL))
- 	{
--	  if (index(cp, '\'') != NULL)
-+	  if (strchr(cp, '\'') != NULL)
- 	    *bp++ = del = '"';
- 	  else
- 	    *bp++ = del = '\'';
diff --git a/package/screen/patches/patch-process_c b/package/screen/patches/patch-process_c
deleted file mode 100644
index 0260ead1f..000000000
--- a/package/screen/patches/patch-process_c
+++ /dev/null
@@ -1,39 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/process.c	2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.3/process.c	2008-12-08 04:59:51.000000000 +0100
-@@ -728,7 +728,7 @@ int ilen;
- 	      if (D_seqp[l] != l)
- 		{
- 		  q = D_seqp + 1 + l;
--		  if (D_kmaps + D_nseqs > q && q[2] > l && !bcmp(D_seqp - l, q + 3, l))
-+		  if (D_kmaps + D_nseqs > q && q[2] > l && !memcmp(D_seqp - l, q + 3, l))
- 		    {
- 		      debug1("have another mapping (%s), delay execution\n", q + 3);
- 		      D_seqh = D_seqp - 3 - l;
-@@ -2867,7 +2867,7 @@ int key;
- 	  s = 0;
- 	  if (ParseSaveStr(act, &s))
- 	    break;
--	  if (!*s || strlen(s) + (SockName - SockPath) > MAXPATHLEN - 13 || index(s, '/'))
-+	  if (!*s || strlen(s) + (SockName - SockPath) > MAXPATHLEN - 13 || strchr(s, '/'))
- 	    {
- 	      Msg(0, "%s: bad session name '%s'\n", rc_name, s);
- 	      free(s);
-@@ -3109,7 +3109,7 @@ int key;
- 		      break;
- 		  }
- 		else
--		  if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && bcmp(kme->str, *args, *argl) == 0)
-+		  if (*argl == (kme->fl & ~KMAP_NOTIMEOUT) && memcmp(kme->str, *args, *argl) == 0)
- 		      break;
- 	      if (i == kmap_extn)
- 		{
-@@ -4387,7 +4387,7 @@ int base, psize;
- char *s, *p;
- {
-   char *q;
--  if ((q = rindex(s, ':')) != 0)
-+  if ((q = strrchr(s, ':')) != 0)
-     {
-       strncpy(p, q + 1, psize - 1);
-       p[psize - 1] = '\0';
diff --git a/package/screen/patches/patch-pty_c b/package/screen/patches/patch-pty_c
deleted file mode 100644
index 038b4b283..000000000
--- a/package/screen/patches/patch-pty_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/pty.c	2003-09-08 16:26:18.000000000 +0200
-+++ screen-4.0.3/pty.c	2008-10-08 13:33:43.000000000 +0200
-@@ -34,9 +34,9 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
--# include <sys/stropts.h>
--#endif
-+//#ifdef HAVE_SVR4_PTYS
-+//# include <sys/stropts.h>
-+//#endif
- 
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
diff --git a/package/screen/patches/patch-sched_h b/package/screen/patches/patch-sched_h
index 2c632d6ca..17e9cf010 100644
--- a/package/screen/patches/patch-sched_h
+++ b/package/screen/patches/patch-sched_h
@@ -1,4 +1,3 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- screen-4.0.3.orig/sched.h	2002-01-08 16:42:43.000000000 +0100
 +++ screen-4.0.3/sched.h	2008-10-08 13:33:43.000000000 +0200
 @@ -22,6 +22,11 @@
diff --git a/package/screen/patches/patch-screen_c b/package/screen/patches/patch-screen_c
deleted file mode 100644
index c9a3da349..000000000
--- a/package/screen/patches/patch-screen_c
+++ /dev/null
@@ -1,30 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/screen.c	2003-09-08 16:26:41.000000000 +0200
-+++ screen-4.0.3/screen.c	2008-10-08 14:06:53.000000000 +0200
-@@ -819,7 +819,7 @@ char **av;
- 
- #ifdef MULTIUSER
-   own_uid = multi_uid = real_uid;
--  if (SockMatch && (sockp = index(SockMatch, '/')))
-+  if (SockMatch && (sockp = strchr(SockMatch, '/')))
-     {
-       if (eff_uid)
-         Panic(0, "Must run suid root for multiuser support.");
-@@ -1025,7 +1025,7 @@ char **av;
-     }
-   if ((st.st_mode & 0777) != 0700)
-     Panic(0, "Directory %s must have mode 700.", SockPath);
--  if (SockMatch && index(SockMatch, '/'))
-+  if (SockMatch && strchr(SockMatch, '/'))
-     Panic(0, "Bad session name '%s'", SockMatch);
-   SockName = SockPath + strlen(SockPath) + 1;
-   *SockName = 0;
-@@ -1041,7 +1041,7 @@ char **av;
-   (void) gethostname(HostName, MAXSTR);
-   HostName[MAXSTR - 1] = '\0';
- #endif
--  if ((ap = index(HostName, '.')) != NULL)
-+  if ((ap = strchr(HostName, '.')) != NULL)
-     *ap = '\0';
- 
-   if (lsflag)
diff --git a/package/screen/patches/patch-termcap_c b/package/screen/patches/patch-termcap_c
deleted file mode 100644
index 3dc7d60bf..000000000
--- a/package/screen/patches/patch-termcap_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/termcap.c	2003-09-08 16:45:36.000000000 +0200
-+++ screen-4.0.3/termcap.c	2008-10-08 14:09:15.000000000 +0200
-@@ -940,7 +940,7 @@ int aflag;
-   debug1("MakeTermcap decided '%s'\n", p);
-   if (extra_outcap && *extra_outcap)
-     {
--      for (cp = extra_outcap; (p = index(cp, ':')); cp = p)
-+      for (cp = extra_outcap; (p = strchr(cp, ':')); cp = p)
- 	{
- 	  ch = *++p;
- 	  *p = '\0';
diff --git a/package/screen/patches/patch-tty_sh b/package/screen/patches/patch-tty_sh
deleted file mode 100644
index b14b2f9ac..000000000
--- a/package/screen/patches/patch-tty_sh
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/tty.sh	2003-09-08 16:24:25.000000000 +0200
-+++ screen-4.0.3/tty.sh	2008-10-08 14:13:39.000000000 +0200
-@@ -659,7 +659,7 @@ char *opt;
- 
-   while (*opt)
-     {
--      while (index(sep, *opt)) opt++;
-+      while (strchr(sep, *opt)) opt++;
-       if (*opt >= '0' && *opt <= '9')
-         {
- 	  if (SetBaud(m, atoi(opt), atoi(opt)))
-@@ -745,7 +745,7 @@ char *opt;
- 	}
-       else
-         return -1;
--      while (*opt && !index(sep, *opt)) opt++;
-+      while (*opt && !strchr(sep, *opt)) opt++;
-     }
-   return 0;
- }
diff --git a/package/screen/patches/patch-utmp_c b/package/screen/patches/patch-utmp_c
deleted file mode 100644
index 4beebc274..000000000
--- a/package/screen/patches/patch-utmp_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/utmp.c	2003-09-08 16:27:17.000000000 +0200
-+++ screen-4.0.3/utmp.c	2008-12-08 04:59:38.000000000 +0100
-@@ -422,7 +422,7 @@ struct win *wi;
-   debug2("SetUtmp %d will get slot %d...\n", wi->w_number, (int)slot);
- 
-   bzero((char *)&u, sizeof(u));
--  if ((saved_ut = bcmp((char *) &wi->w_savut, (char *)&u, sizeof(u))))
-+  if ((saved_ut = memcmp((char *) &wi->w_savut, (char *)&u, sizeof(u))))
-     /* restore original, of which we will adopt all fields but ut_host */
-     bcopy((char *)&wi->w_savut, (char *) &u, sizeof(u));
- 
diff --git a/package/screen/patches/patch-window_c b/package/screen/patches/patch-window_c
deleted file mode 100644
index daad39ee3..000000000
--- a/package/screen/patches/patch-window_c
+++ /dev/null
@@ -1,33 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- screen-4.0.3.orig/window.c	2003-12-05 14:45:41.000000000 +0100
-+++ screen-4.0.3/window.c	2008-10-08 14:08:40.000000000 +0200
-@@ -643,7 +643,7 @@ struct NewWindow *newwin;
-   if (!nwin.aka)
-     nwin.aka = Filename(nwin.args[0]);
-   strncpy(p->w_akabuf, nwin.aka, sizeof(p->w_akabuf) - 1);
--  if ((nwin.aka = rindex(p->w_akabuf, '|')) != NULL)
-+  if ((nwin.aka = strrchr(p->w_akabuf, '|')) != NULL)
-     {
-       p->w_autoaka = 0;
-       *nwin.aka++ = 0;
-@@ -1356,9 +1356,9 @@ char **args, *ttyn;
- 	  debug2("Makewindow %d with %s\n", win->w_number, tebuf);
- 	  tl = strlen(win->w_term);
- 	  NewEnv[1] = tebuf;
--	  if ((s1 = index(NewEnv[2], '|')))
-+	  if ((s1 = strchr(NewEnv[2], '|')))
- 	    {
--	      if ((s2 = index(++s1, '|')))
-+	      if ((s2 = strchr(++s1, '|')))
- 		{
- 		  if (strlen(NewEnv[2]) - (s2 - s1) + tl < 1024)
- 		    {
-@@ -1396,7 +1396,7 @@ char *prog, **args, **env;
-   char *shargs[MAXARGS + 1];
-   register int i, eaccess = 0;
- 
--  if (rindex(prog, '/'))
-+  if (strrchr(prog, '/'))
-     path = "";
-   if (!path && !(path = getenv("PATH")))
-     path = DefaultPath;
diff --git a/package/tptest/patches/patch-apps_unix_client_Makefile b/package/tptest/patches/patch-apps_unix_client_Makefile
index 239d4770e..4043f3ec2 100644
--- a/package/tptest/patches/patch-apps_unix_client_Makefile
+++ b/package/tptest/patches/patch-apps_unix_client_Makefile
@@ -4,7 +4,7 @@
 	- drop the local subdir (openadk doesnt use this path)
 	- create the directories to install into
 --- tptest-3.1.7.orig/apps/unix/client/Makefile	2004-04-07 15:22:56.000000000 +0200
-+++ tptest-3.1.7/apps/unix/client/Makefile	2010-01-20 12:01:14.267178336 +0100
++++ tptest-3.1.7/apps/unix/client/Makefile	2010-01-28 00:00:45.000000000 +0100
 @@ -1,4 +1,4 @@
 -CC		= gcc
 +CC		?= gcc
@@ -28,7 +28,7 @@
  install:
 -	install -c -s -o bin -g bin -m 555 tptestclient /usr/local/bin
 +	install -d -m 755 ${DESTDIR}/usr/bin
-+	install -c -s -m 555 tptestclient ${DESTDIR}/usr/bin
++	install -c -m 755 tptestclient ${DESTDIR}/usr/bin
  
  depend: 
  	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
diff --git a/package/tptest/patches/patch-apps_unix_server_Makefile b/package/tptest/patches/patch-apps_unix_server_Makefile
index e4ea1eab8..127bd0a72 100644
--- a/package/tptest/patches/patch-apps_unix_server_Makefile
+++ b/package/tptest/patches/patch-apps_unix_server_Makefile
@@ -4,7 +4,7 @@
         - drop the local subdir (openadk doesnt use this path)
         - create the directories to install into
 --- tptest-3.1.7.orig/apps/unix/server/Makefile	2003-01-22 11:42:45.000000000 +0100
-+++ tptest-3.1.7/apps/unix/server/Makefile	2010-01-20 12:01:24.758178270 +0100
++++ tptest-3.1.7/apps/unix/server/Makefile	2010-01-28 00:00:23.000000000 +0100
 @@ -1,4 +1,4 @@
 -CC		= gcc
 +CC		?= gcc
@@ -28,7 +28,7 @@
  install:
 -	install -c -s -o bin -g bin -m 555 tptestserver /usr/local/bin
 +	install -d -m 755 ${DESTDIR}/usr/bin
-+	install -c -s -m 555 tptestserver ${DESTDIR}/usr/bin
++	install -c -m 755 tptestserver ${DESTDIR}/usr/bin
  
  depend: 
  	${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS}
diff --git a/scripts/create-image.sh b/scripts/create-image.sh
index 4a23b49cf..96a96ced8 100755
--- a/scripts/create-image.sh
+++ b/scripts/create-image.sh
@@ -24,6 +24,16 @@ if [ $(id -u) -ne 0 ];then
 	exit 1
 fi
 
+printf "Checking if mkfs is installed"
+mkfs=$(which mkfs.$filesystem)
+
+if [ ! -z $mkfs -a -x $mkfs ];then
+	printf "...okay\n"
+else
+	printf "...failed\n"
+	exit 1
+fi
+
 printf "Checking if parted is installed"
 parted=$(which parted)
 
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b546e5f8c..3e8478244 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -86,10 +86,14 @@ if [[ -n $ADK_PACKAGE_EGLIBC ]]; then
 	NEED_GPERF="$NEED_GPERF eglibc"
 fi
 
-if [[ -n $ADK_PACKAGE_FONT-BITSTREAM-100DPI ]]; then
+if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_100DPI ]]; then
 	NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-100dpi"
 fi
 
+if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_75DPI ]]; then
+	NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-75dpi"
+fi
+
 if [[ -n $NEED_GETTEXT ]]; then
 	if ! which xgettext >/dev/null 2>&1; then
 		echo >&2 You need gettext to build $NEED_GETTEXT
diff --git a/target/Config.in b/target/Config.in
index 92fcc4882..01dfd5ac3 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -375,6 +375,7 @@ config ADK_LINUX_QEMU
 	bool "Qemu Emulator"
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_MII
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_INPUT
 	help
@@ -389,10 +390,12 @@ config ADK_LINUX_X86_64_SHUTTLE
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_PP
 	select ADK_KERNEL_INPUT_KEYBOARD
+	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_NETDEVICES
 	select ADK_KERNEL_NET_PCI
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_KERNEL_SATA_AHCI if ADK_TARGET_ROOTFS_ARCHIVE
+	select ADK_KERNEL_BLK_DEV_SD if ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE
diff --git a/target/bulk.lst b/target/bulk.lst
index fbd1f9463..0dacdd64c 100644
--- a/target/bulk.lst
+++ b/target/bulk.lst
@@ -1 +1,2 @@
 ag241		uclibc		nfsroot		y
+foxboard	uclibc		nfsroot		y
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index cf5e7a270..614938f1d 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -175,6 +175,7 @@ config ADK_KPACKAGE_KMOD_SCSI
 	select ADK_KERNEL_LSF
 	select ADK_KERNEL_IOSCHED_AS
 	depends on !ADK_KERNEL_SCSI
+	depends on !ADK_KERNEL_SATA_AHCI
 	tristate
 	help
 	  If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
@@ -190,8 +191,8 @@ config ADK_KPACKAGE_KMOD_SCSI
 
 config ADK_KPACKAGE_KMOD_BLK_DEV_SD
 	prompt "kmod-scsi-disk.................... SCSI disk support"
+	select ADK_KPACKAGE_KMOD_SCSI
 	depends on !ADK_KERNEL_BLK_DEV_SD
-	depends on ADK_KPACKAGE_KMOD_SCSI
 	tristate
 	help
 	  If you want to use SCSI hard disks, Fibre Channel disks,
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 8541065f0..d533a3213 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -14,6 +14,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET
 
 config ADK_KPACKAGE_KMOD_EXPORTFS
 	tristate
+	depends on !ADK_KERNEL_EXPORTFS
 	default n
 	help
 
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 71236c47f..f87aeb9db 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -92,7 +92,7 @@ config ADK_KPACKAGE_KMOD_NFSD
 	prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
 	tristate
 	default n
-	select ADK_KPACKAGE_KMOD_EXPORTFS
+	select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_NFSD_V3
 	depends on ADK_KPACKAGE_KMOD_NFS_FS
 	help
diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile
index dcbb46b31..03513b8f2 100644
--- a/target/qemu-mipsel/Makefile
+++ b/target/qemu-mipsel/Makefile
@@ -12,7 +12,7 @@ kernel-install:
 
 ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Be sure to change permissions after image creation."
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile
index d9828d77f..44e4b2319 100644
--- a/target/qemu-x86/Makefile
+++ b/target/qemu-x86/Makefile
@@ -28,7 +28,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
-	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
+	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 
@@ -39,7 +39,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'You need a dummy qemu.img, create it with:'
 	@echo 'qemu-img create -f raw qemu.img 1M'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
+	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 
@@ -49,6 +49,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
 	@echo 'You need a dummy qemu.img, create it with:'
 	@echo 'qemu-img create -f raw qemu.img 1M'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
+	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index fe980bdac..b7847eeaa 100644
--- a/target/qemu-x86_64/Makefile
+++ b/target/qemu-x86_64/Makefile
@@ -29,7 +29,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
+	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 
@@ -40,7 +40,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'You need a dummy qemu.img, create it with:'
 	@echo 'qemu-img create -f raw qemu.img 1M'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
+	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
 
@@ -50,6 +50,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
 	@echo 'You need a dummy qemu.img, create it with:'
 	@echo 'qemu-img create -f raw qemu.img 1M'
 	@echo "Start qemu with following command line:"
-	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
+	@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif