Merge branch 'mickey/sane-defaults-and-updates' into org.openembedded.dev

45 files changed, 1102 insertions, 327 deletions

diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb
index a7857c562d..92c861f49c 100644
--- a/packages/automake/automake-native_1.10.bb
+++ b/packages/automake/automake-native_1.10.bb
@@ -1,5 +1,3 @@
 PV := "${PV}"
 
 require automake-native.inc
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/automake/automake_1.10.bb b/packages/automake/automake_1.10.bb
index e4e8f3385b..42e0d66d9e 100644
--- a/packages/automake/automake_1.10.bb
+++ b/packages/automake/automake_1.10.bb
@@ -2,12 +2,12 @@ DESCRIPTION = "A tool for automatically generating Makefiles."
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-DEFAULT_PREFERENCE = "-1"
 PR = "r1"
 
-SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
-	${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
-
+SRC_URI = "\
+  ${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 \
+  ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]} \
+"
 S = "${WORKDIR}/automake-${PV}"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/automake-${PV}"
diff --git a/packages/base-passwd/base-passwd-3.5.9/configure.patch b/packages/base-passwd/base-passwd-3.5.9/configure.patch
deleted file mode 100644
index a9adb1e9e2..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- base-passwd/configure.in~configure
-+++ base-passwd/configure.in
-@@ -1,5 +1,6 @@
- dnl Initialize the autoconf process
--AC_INIT(update-passwd.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([update-passwd.c])
- AC_CONFIG_HEADER(config.h)
- AC_PREFIX_DEFAULT(/usr)
- 
-@@ -12,5 +13,6 @@
- AC_CHECK_FUNCS(putgrent)
- 
- dnl Finally output everything
--AC_OUTPUT(Makefile)
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT
- 
diff --git a/packages/base-passwd/base-passwd-3.5.9/mysql.patch b/packages/base-passwd/base-passwd-3.5.9/mysql.patch
deleted file mode 100644
index b641f41238..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/mysql.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/group.master.orig	2005-07-08 06:36:07.717990112 +0200
-+++ base-passwd/group.master	2005-07-08 06:36:32.000000000 +0200
-@@ -36,4 +36,5 @@
- staff:*:50:
- games:*:60:
- users:*:100:
-+mysql:*:64001:
- nogroup:*:65534:
diff --git a/packages/base-passwd/base-passwd-3.5.9/nobash.patch b/packages/base-passwd/base-passwd-3.5.9/nobash.patch
deleted file mode 100644
index 2bde9bf33b..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/nobash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- base-passwd/passwd.master~nobash
-+++ base-passwd/passwd.master
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/bash
-+root::0:0:root:/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd-3.5.9/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/root-home.patch
deleted file mode 100644
index 85d96b6185..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/root-home.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/passwd.master.orig	2005-07-08 06:26:22.000000000 +0200
-+++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/sh
-+root::0:0:root:/home/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/README b/packages/base-passwd/base-passwd-3.5.9/slugos/README
deleted file mode 100644
index 1abe54b5a2..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/slugos/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch overrides the root-home.patch for all DISTROs
-derived from slugos (DISTROs which set slugos in OVERRIDES)
-
-The patch sets a root password on /etc/passwd, this password is
-
-opeNSLUg
-
-This allows ssh (dropbear) login to an OpenSlug NSLU2 using that
-password.
-
-The password is NO MORE SECURE than the previous empty string,
-however, because ssh logins can now succeed the NSLU2 is LESS
-secure!  This password must be changed as soon as possible after
-initial configuration of the NSLU2.
diff --git a/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch b/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
deleted file mode 100644
index 97dab68f33..0000000000
--- a/packages/base-passwd/base-passwd-3.5.9/slugos/root-home.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- base-passwd/passwd.master.orig	2005-07-08 06:26:22.000000000 +0200
-+++ base-passwd/passwd.master	2005-07-08 06:31:58.000000000 +0200
-@@ -1,4 +1,4 @@
--root::0:0:root:/root:/bin/sh
-+root:Xm./49bYkrkuo:0:0:root:/root:/bin/sh
- daemon:*:1:1:daemon:/usr/sbin:/bin/sh
- bin:*:2:2:bin:/bin:/bin/sh
- sys:*:3:3:sys:/dev:/bin/sh
diff --git a/packages/base-passwd/base-passwd_3.5.19.bb b/packages/base-passwd/base-passwd_3.5.20.bb
index 65ee129e0b..78079a0aa6 100644
--- a/packages/base-passwd/base-passwd_3.5.19.bb
+++ b/packages/base-passwd/base-passwd_3.5.20.bb
@@ -2,17 +2,16 @@ DESCRIPTION = "Base system password/group files."
 SECTION = "base"
 LICENSE = "GPL"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-	   file://nobash.patch;patch=1 \
-	   file://root-home.patch;patch=1 \
-	   file://mysql.patch;patch=1"
-
+SRC_URI = "\
+  ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
+  file://nobash.patch;patch=1 \
+  file://root-home.patch;patch=1 \
+  file://mysql.patch;patch=1 \
+"
 S = "${WORKDIR}/base-passwd"
 
 inherit autotools
 
-FILES_${PN}-doc += "${docdir}"
-
 do_install () {
 	install -d -m 755 ${D}${sbindir}
 	install -p -m 755 update-passwd ${D}${sbindir}/
@@ -42,6 +41,7 @@ do_install_append_openmn() {
 	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
 }
 
+FILES_${PN}-doc += "${docdir}"
 
 pkg_postinst () {
 	set -e
diff --git a/packages/base-passwd/base-passwd_3.5.9.bb b/packages/base-passwd/base-passwd_3.5.9.bb
deleted file mode 100644
index 4ea4e7f839..0000000000
--- a/packages/base-passwd/base-passwd_3.5.9.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "Base system password/group files."
-SECTION = "base"
-PR = "r3"
-LICENSE = "GPL"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz \
-	   file://configure.patch;patch=1 \
-	   file://nobash.patch;patch=1 \
-	   file://root-home.patch;patch=1 \
-	   file://mysql.patch;patch=1"
-
-S = "${WORKDIR}/base-passwd"
-
-inherit autotools
-
-FILES_${PN}-doc += "${docdir}"
-
-do_install () {
-	install -d -m 755 ${D}${sbindir}
-	install -p -m 755 update-passwd ${D}${sbindir}/
-	install -d -m 755 \
-		${D}${mandir}/man8 ${D}${mandir}/pl/man8
-	install -p -m 644 man/update-passwd.8 \
-		${D}${mandir}/man8/
-	install -p -m 644 man/update-passwd.pl.8 \
-		${D}${mandir}/pl/man8/update-passwd.8
-	gzip -9 ${D}${mandir}/man8/* \
-		${D}${mandir}/pl/man8/*
-	install -d -m 755 ${D}${datadir}/base-passwd
-	install -p -m 644 passwd.master \
-		${D}${datadir}/base-passwd/
-	install -p -m 644 group.master \
-		${D}${datadir}/base-passwd/
-
-	install -d -m 755 ${D}${docdir}/${PN}
-	install -p -m 644 debian/changelog ${D}${docdir}/${PN}/
-	gzip -9 ${D}${docdir}/${PN}/*
-	install -p -m 644 README ${D}${docdir}/${PN}/
-	install -p -m 644 debian/copyright ${D}${docdir}/${PN}/
-}
-
-
-do_install_append_openmn() {
-	echo "0:Jn6tcg/qjqvUE:0:0:root:/root:/bin/sh" >>${D}${datadir}/base-passwd/passwd.master
-}
-
-
-pkg_postinst () {
-	set -e
-
-	if [ ! -e $D${sysconfdir}/passwd ] ; then
-		cp $D${datadir}/base-passwd/passwd.master $D${sysconfdir}/passwd
-	fi
-
-	if [ ! -e $D${sysconfdir}/group ] ; then
-		cp $D${datadir}/base-passwd/group.master $D${sysconfdir}/group
-	fi
-	exit 0
-}
diff --git a/packages/base-passwd/base-passwd-3.5.19/mysql.patch b/packages/base-passwd/files/mysql.patch
index b641f41238..b641f41238 100644
--- a/packages/base-passwd/base-passwd-3.5.19/mysql.patch
+++ b/packages/base-passwd/files/mysql.patch
diff --git a/packages/base-passwd/base-passwd-3.5.19/nobash.patch b/packages/base-passwd/files/nobash.patch
index 2bde9bf33b..2bde9bf33b 100644
--- a/packages/base-passwd/base-passwd-3.5.19/nobash.patch
+++ b/packages/base-passwd/files/nobash.patch
diff --git a/packages/base-passwd/base-passwd-3.5.19/root-home.patch b/packages/base-passwd/files/root-home.patch
index 85d96b6185..85d96b6185 100644
--- a/packages/base-passwd/base-passwd-3.5.19/root-home.patch
+++ b/packages/base-passwd/files/root-home.patch
diff --git a/packages/base-passwd/base-passwd-3.5.19/slugos/README b/packages/base-passwd/files/slugos/README
index 1abe54b5a2..1abe54b5a2 100644
--- a/packages/base-passwd/base-passwd-3.5.19/slugos/README
+++ b/packages/base-passwd/files/slugos/README
diff --git a/packages/base-passwd/base-passwd-3.5.19/slugos/root-home.patch b/packages/base-passwd/files/slugos/root-home.patch
index 97dab68f33..97dab68f33 100644
--- a/packages/base-passwd/base-passwd-3.5.19/slugos/root-home.patch
+++ b/packages/base-passwd/files/slugos/root-home.patch
diff --git a/packages/cups/cups_1.2.10.bb b/packages/cups/cups_1.2.10.bb
deleted file mode 100644
index 2361565a91..0000000000
--- a/packages/cups/cups_1.2.10.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require cups.inc
-
-PR = "r3"
-
diff --git a/packages/cups/cups_1.2.12.bb b/packages/cups/cups_1.2.12.bb
index 662f0ec8ff..bbe3c5d84f 100644
--- a/packages/cups/cups_1.2.12.bb
+++ b/packages/cups/cups_1.2.12.bb
@@ -1,5 +1,2 @@
 require cups.inc
-
 PR = "r1"
-
-DEFAULT_PREFERENCE = "-1"
diff --git a/packages/efl1/elementary_svn.bb b/packages/efl1/elementary_svn.bb
index eb880aedca..82a099f00d 100644
--- a/packages/efl1/elementary_svn.bb
+++ b/packages/efl1/elementary_svn.bb
@@ -2,16 +2,17 @@ DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPL"
 DEPENDS = "evas ecore edje eet edbus"
 PV = "0.0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 inherit efl
 
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
 SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/TMP/st;module=elementary;proto=http"
 S = "${WORKDIR}/elementary"
-PACKAGES =+ "${PN}-tests"
 
-RDEPENDS = "elementary-themes"
-RRECOMMENDS = "elementary-tests"
+RDEPENDS_${PN} = "elementary-themes"
+RRECOMMENDS_${PN} = "elementary-tests"
 
 do_compile_append() {
         sed -i -e s:${STAGING_DIR_TARGET}::g \
diff --git a/packages/fakeroot/fakeroot-native_1.7.1.bb b/packages/fakeroot/fakeroot-native_1.12.1.bb
index 8a54d6497c..5215dc86ed 100644
--- a/packages/fakeroot/fakeroot-native_1.7.1.bb
+++ b/packages/fakeroot/fakeroot-native_1.12.1.bb
@@ -1,11 +1,11 @@
 require fakeroot_${PV}.bb
-inherit native
-RDEPENDS = "util-linux-native"
 
-SRC_URI += "file://fix-prefix.patch;patch=1 "
+SRC_URI += "file://fix-prefix.patch;patch=1"
 S = "${WORKDIR}/fakeroot-${PV}"
 
-EXTRA_OECONF = " --program-prefix="
+inherit native
+
+EXTRA_OECONF = "--program-prefix="
 
 # Compatability for the rare systems not using or having SYSV
 python () {
@@ -16,3 +16,5 @@ python () {
 do_stage_append () {
     oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
 }
+
+RDEPENDS = "util-linux-native"
diff --git a/packages/fakeroot/fakeroot-native_1.9.6.bb b/packages/fakeroot/fakeroot-native_1.9.6.bb
deleted file mode 100644
index 77d6f58651..0000000000
--- a/packages/fakeroot/fakeroot-native_1.9.6.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require fakeroot_${PV}.bb
-
-RDEPENDS="util-linux-native"
-
-SRC_URI += "file://fix-prefix.patch;patch=1 "
-S = "${WORKDIR}/fakeroot-${PV}"
-
-inherit native
-
-EXTRA_OECONF = " --program-prefix="
-
-# Compatability for the rare systems not using or having SYSV
-python () {
-    if bb.data.getVar('HOST_NONSYSV', d, True) and bb.data.getVar('HOST_NONSYSV', d, True) != '0':
-        bb.data.setVar('EXTRA_OECONF', ' --with-ipc=tcp --program-prefix= ', d)
-}
-
-do_stage_append () {
-    oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
-}
-
diff --git a/packages/fakeroot/fakeroot_1.7.1.bb b/packages/fakeroot/fakeroot_1.12.1.bb
index ea3806d2f5..4b61f252fb 100644
--- a/packages/fakeroot/fakeroot_1.7.1.bb
+++ b/packages/fakeroot/fakeroot_1.12.1.bb
@@ -1,15 +1,13 @@
 DESCRIPTION = "Gives a fake root environment"
+HOMEPAGE = "http://fakeroot.alioth.debian.org"
 SECTION = "base"
 LICENSE = "GPL"
-# fakeroot needs getopt which is provided by the util-linux package
-RDEPENDS = "util-linux"
-PR = "r2"
 
 SRC_URI = "\
-  ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz \
-  file://work-with-older-libtool.patch;patch=1 \
+  ${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
+  file://configure-libtool.patch;patch=1 \
 "
-
+	    
 inherit autotools
 
 do_stage() {
@@ -17,3 +15,7 @@ do_stage() {
         install -m 644 *.h ${STAGING_INCDIR}/fakeroot
         autotools_stage_all
 }
+
+# fakeroot needs getopt which is provided by the util-linux package
+RDEPENDS = "util-linux"
+
diff --git a/packages/fakeroot/fakeroot_1.9.6.bb b/packages/fakeroot/fakeroot_1.9.6.bb
deleted file mode 100644
index aaf696d79d..0000000000
--- a/packages/fakeroot/fakeroot_1.9.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Gives a fake root environment"
-HOMEPAGE = "http://fakeroot.alioth.debian.org/"
-SECTION = "base"
-LICENSE = "GPL"
-# fakeroot needs getopt which is provided by the util-linux package
-RDEPENDS = "util-linux"
-PR = "r1"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.tar.gz \
-           file://configure-libtool.patch;patch=1"
-	    
-inherit autotools
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/fakeroot
-        install -m 644 *.h ${STAGING_INCDIR}/fakeroot
-        autotools_stage_all
-}
diff --git a/packages/fakeroot/files/configure-libtool.patch b/packages/fakeroot/files/configure-libtool.patch
index 8830328eb5..46f7df7025 100644
--- a/packages/fakeroot/files/configure-libtool.patch
+++ b/packages/fakeroot/files/configure-libtool.patch
@@ -1,9 +1,11 @@
---- fakeroot-1.8.3/configure.ac.orig	2007-10-31 00:17:27.000000000 -0500
-+++ fakeroot-1.8.3/configure.ac	2007-10-31 00:18:12.000000000 -0500
-@@ -1,14 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
+Index: fakeroot-1.12.1/configure.ac
+===================================================================
+--- fakeroot-1.12.1.orig/configure.ac
++++ fakeroot-1.12.1/configure.ac
+@@ -2,14 +2,12 @@
  AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
  AC_PREREQ(2.61)
+ AC_CONFIG_MACRO_DIR([build-aux])
 -LT_PREREQ(2.1a)
  AC_CANONICAL_TARGET
  AM_INIT_AUTOMAKE
@@ -14,5 +16,5 @@
 -LT_LANG(C)
 +AC_PROG_LIBTOOL
  
- AC_ARG_WITH([ipc],
- 	    AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
+ AH_BOTTOM([#if ! HAVE_BUILTIN_EXPECT
+ #define __builtin_expect(x, expected_value) (x)
diff --git a/packages/fakeroot/files/fix-prefix.patch b/packages/fakeroot/files/fix-prefix.patch
index 3884aca01c..3c47bd7650 100644
--- a/packages/fakeroot/files/fix-prefix.patch
+++ b/packages/fakeroot/files/fix-prefix.patch
@@ -1,11 +1,8 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- fakeroot-1.2.13/scripts/fakeroot.in~fix-prefix
-+++ fakeroot-1.2.13/scripts/fakeroot.in
-@@ -15,8 +15,8 @@
+Index: fakeroot-1.12.1/scripts/fakeroot.in
+===================================================================
+--- fakeroot-1.12.1.orig/scripts/fakeroot.in
++++ fakeroot-1.12.1/scripts/fakeroot.in
+@@ -30,8 +30,8 @@
  }
  
  # strip /bin/fakeroot to find install prefix
@@ -13,6 +10,6 @@
 -BINDIR=@bindir@
 +BINDIR=`dirname $0`
 +PREFIX=`dirname ${BINDIR}`
-     
- LIB=lib@fakeroot_transformed@.so.0
- PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
+ 
+ USEABSLIBPATH=@LDPRELOADABS@
+ LIB=lib@fakeroot_transformed@@DLSUFFIX@
diff --git a/packages/fakeroot/files/work-with-older-libtool.patch b/packages/fakeroot/files/work-with-older-libtool.patch
deleted file mode 100644
index 05f9be87b6..0000000000
--- a/packages/fakeroot/files/work-with-older-libtool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fakeroot-1.7.1/configure.ac.orig	2007-08-09 16:03:34.000000000 -0500
-+++ fakeroot-1.7.1/configure.ac	2007-08-09 18:26:11.000000000 -0500
-@@ -7,8 +7,6 @@
- AC_CONFIG_HEADERS([config.h])
- AC_PROG_MAKE_SET
- AM_PROG_LIBTOOL
--LT_INIT
--LT_LANG(C)
- 
- AC_ARG_WITH([ipc],
- 	    AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
diff --git a/packages/glib-2.0/glib-2.0_2.18.0.bb b/packages/glib-2.0/glib-2.0_2.18.0.bb
index 3ac0487018..8fead80143 100644
--- a/packages/glib-2.0/glib-2.0_2.18.0.bb
+++ b/packages/glib-2.0/glib-2.0_2.18.0.bb
@@ -1,11 +1,8 @@
 require glib.inc
-
-# This version requires a newer libtool that isn't default yet 
-DEFAULT_PREFERENCE = "-1"
-
 PR = "r0"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-          "
+SRC_URI = "\
+  http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
+  file://glibconfig-sysdefs.h \
+  file://configure-libtool.patch;patch=1 \
+"
diff --git a/packages/glib-2.0/glib-2.0_2.18.1.bb b/packages/glib-2.0/glib-2.0_2.18.1.bb
index 1083ef4ba0..449fcd3769 100644
--- a/packages/glib-2.0/glib-2.0_2.18.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.18.1.bb
@@ -1,12 +1,9 @@
 require glib.inc
-
-# This version requires a newer libtool that isn't default yet 
-DEFAULT_PREFERENCE = "-1"
-
 PR = "r0"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-          "
-SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1"
+SRC_URI = "\
+  http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
+  file://glibconfig-sysdefs.h \
+  file://configure-libtool.patch;patch=1 \
+"
+SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
diff --git a/packages/glib-2.0/glib-2.0_2.18.3.bb b/packages/glib-2.0/glib-2.0_2.18.3.bb
index 6446b2491d..c8789e75d9 100644
--- a/packages/glib-2.0/glib-2.0_2.18.3.bb
+++ b/packages/glib-2.0/glib-2.0_2.18.3.bb
@@ -1,12 +1,9 @@
 require glib.inc
-
-# This version requires a newer libtool that isn't default yet 
-DEFAULT_PREFERENCE = "-1"
-
 PR = "r1"
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1 \
-          "
-SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1"
+SRC_URI = "\
+  http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \
+  file://glibconfig-sysdefs.h \
+  file://configure-libtool.patch;patch=1 \
+"
+SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1"
diff --git a/packages/libsidplay/libsidplay_1.36.59.bb b/packages/libsidplay/libsidplay_1.36.59.bb
index 9ca4ee13c4..59cabae085 100644
--- a/packages/libsidplay/libsidplay_1.36.59.bb
+++ b/packages/libsidplay/libsidplay_1.36.59.bb
@@ -2,15 +2,11 @@ DESCRIPTION = "A library for replaying C64 SID music"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
-
 PR = "r1"
 
-SRC_URI = "http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/libsidplay-${PV}.tgz \
-           http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1 \
+SRC_URI = "\
+  ftp://ftp.uni-frankfurt.de/pub/Mirrors2/gentoo.org/distfiles/libsidplay-1.36.59.tgz \
+  http://ftp.debian.org/debian/pool/main/libs/libsidplay/libsidplay_1.36.59-5.diff.gz;patch=1 \
 "
 
-inherit autotools
-
-do_stage() {
-	autotools_stage_all
-}
+inherit autotools_stage
diff --git a/packages/libtool/libtool-cross_2.2.4.bb b/packages/libtool/libtool-cross_2.2.4.bb
index 9b3c6d78ea..fab8aa4d42 100644
--- a/packages/libtool/libtool-cross_2.2.4.bb
+++ b/packages/libtool/libtool-cross_2.2.4.bb
@@ -1,11 +1,11 @@
 require libtool.inc
 require libtool_${PV}.bb
-
 PR = "r23"
-PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://cross_compile.patch;patch=1 \
-                   file://prefix.patch;patch=1"
+
+SRC_URI += "\
+  file://cross_compile.patch;patch=1 \
+  file://prefix.patch;patch=1 \
+"
 
 DEPENDS += "libtool-native"
 
@@ -43,3 +43,5 @@ do_stage () {
 do_install () {
 	:
 }
+
+PACKAGES = ""
diff --git a/packages/libtool/libtool-native_2.2.4.bb b/packages/libtool/libtool-native_2.2.4.bb
index a4f76c69dc..bfef6a6c96 100644
--- a/packages/libtool/libtool-native_2.2.4.bb
+++ b/packages/libtool/libtool-native_2.2.4.bb
@@ -1,11 +1,11 @@
 require libtool.inc
 require libtool_${PV}.bb
-
 PR = "r20"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://cross_compile.patch;patch=1 \
-                   file://prefix.patch;patch=1"
 
+SRC_URI += "\
+  file://cross_compile.patch;patch=1 \
+  file://prefix.patch;patch=1 \
+"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit native
diff --git a/packages/libtool/libtool.inc b/packages/libtool/libtool.inc
index db86d15ba4..197612910a 100644
--- a/packages/libtool/libtool.inc
+++ b/packages/libtool/libtool.inc
@@ -6,3 +6,4 @@ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPL"
 SECTION = "devel"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
diff --git a/packages/libtool/libtool_2.2.4.bb b/packages/libtool/libtool_2.2.4.bb
index c8380d161c..f4b1ab824f 100644
--- a/packages/libtool/libtool_2.2.4.bb
+++ b/packages/libtool/libtool_2.2.4.bb
@@ -1,8 +1,5 @@
 require libtool.inc
-
-PR = "r14"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r15"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz"
 S = "${WORKDIR}/libtool-${PV}"
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index fd0fb6dac2..dbe1755a97 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 SECTION = "base"
 LICENSE = "GPL"
-PR = "r31"
+PR = "r0"
 
 inherit update-rc.d
 
@@ -16,15 +16,17 @@ INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ."
 # Do not stop in single user - there's no way to sulogin!
 INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ."
 
-SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \
-           file://options \
-           file://init \
-           file://hosts \
-           file://interfaces \
-           file://if-pre-up.d \
-           file://if-up.d \
-           file://if-down.d \
-           file://if-post-down.d"
+SRC_URI = "\
+  http://developer.irexnet.com/pub/iOn/Sources/1.0/Third%20party/all/netbase-${PV}.tar.gz \
+  file://options \
+  file://init \
+  file://hosts \
+  file://interfaces \
+  file://if-pre-up.d \
+  file://if-up.d \
+  file://if-down.d \
+  file://if-post-down.d \
+"
 
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
diff --git a/packages/popt/popt-native_1.14.bb b/packages/popt/popt-native_1.14.bb
new file mode 100644
index 0000000000..dfad9fbf93
--- /dev/null
+++ b/packages/popt/popt-native_1.14.bb
@@ -0,0 +1,5 @@
+require popt_${PV}.bb
+DEPENDS = "gettext-native"
+inherit native
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/popt-${PV}"
diff --git a/packages/popt/popt.inc b/packages/popt/popt.inc
index bc4da2d2a7..07671d798f 100644
--- a/packages/popt/popt.inc
+++ b/packages/popt/popt.inc
@@ -3,3 +3,7 @@ HOMEPAGE = "http://rpm5.org"
 AUTHOR = "Jeff Johnson"
 LICENSE = "MIT"
 SECTION = "libs"
+
+S = "${WORKDIR}/popt-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/popt-${PV}"
+
diff --git a/packages/popt/popt_1.14.bb b/packages/popt/popt_1.14.bb
new file mode 100644
index 0000000000..b3f8a89e91
--- /dev/null
+++ b/packages/popt/popt_1.14.bb
@@ -0,0 +1,9 @@
+require popt.inc
+DEPENDS = "gettext virtual/libintl"
+PR = "r1"
+
+inherit autotools_stage
+
+SRC_URI = "\
+  http://rpm5.org/files/popt/popt-${PV}.tar.gz \
+"
diff --git a/packages/resolvconf/resolvconf_1.28.bb b/packages/resolvconf/resolvconf_1.28.bb
deleted file mode 100644
index 48017bce27..0000000000
--- a/packages/resolvconf/resolvconf_1.28.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "Resolvconf is a framework for keeping track of the system's \
-information about currently available nameservers. It sets \
-itself up as the intermediary between programs that supply \
-nameserver information and programs that need nameserver \
-information."
-SECTION = "console/network"
-LICENSE = "GPL"
-AUTHOR = "Thomas Hood"
-HOMEPAGE = "http://packages.debian.org/resolvconf"
-DEPENDS = "bash"
-RDEPENDS = "bash"
-PR = "r2"
-
-SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
-
-do_compile () {
-	:
-}
-
-do_install () {
-	install -d ${D}${sysconfdir} ${D}${sbindir} ${D}${base_sbindir} ${D}${localstatedir}/run/resolvconf/interface
-	install -d ${D}${mandir}/man8 ${D}${docdir}/${P}
-	cp -pPR etc/* ${D}${sysconfdir}/
-	mkdir -p ${D}${sysconfdir}/resolvconf/run/interface
-	install -m 0755 bin/resolvconf ${D}${base_sbindir}/
-	install -m 0644 README ${D}${docdir}/${P}/
-	install -m 0644 man/resolvconf.8 ${D}${mandir}/man8/
-}
diff --git a/packages/resolvconf/resolvconf_1.41.bb b/packages/resolvconf/resolvconf_1.43.bb
index 2c210ef1ec..2c210ef1ec 100644
--- a/packages/resolvconf/resolvconf_1.41.bb
+++ b/packages/resolvconf/resolvconf_1.43.bb
diff --git a/packages/screen/screen-4.0.2/screen_4.0.2-4.1sarge1.diff.gz b/packages/screen/screen-4.0.2/screen_4.0.2-4.1sarge1.diff.gz
new file mode 100644
index 0000000000..966d39b0fb
--- /dev/null
+++ b/packages/screen/screen-4.0.2/screen_4.0.2-4.1sarge1.diff.gz
diff --git a/packages/screen/screen-4.0.3/configure.patch b/packages/screen/screen-4.0.3/configure.patch
new file mode 100644
index 0000000000..2770a7a481
--- /dev/null
+++ b/packages/screen/screen-4.0.3/configure.patch
@@ -0,0 +1,970 @@
+
+#
+# Patch by Hannes Reich (hannes@skynet.ie) 22-Jul-2005
+# Resolves _some_ of the cross-compilation issues in screen's configure.in
+#
+
+--- screen-4.0.1/configure.in~configure
++++ screen-4.0.1/configure.in
+@@ -37,6 +37,323 @@
+ VERSION="$rev.$vers.$pat"
+ AC_NOTE(this is screen version $VERSION)
+ AC_SUBST(VERSION)
++
++AH_TOP([
++/* Copyright (c) 1993-2000
++ *      Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de)
++ *      Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de)
++ * Copyright (c) 1987 Oliver Laumann
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program (see the file COPYING); if not, write to the
++ * Free Software Foundation, Inc.,
++ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
++ *
++ */
++
++
++/**********************************************************************
++ *
++ *	User Configuration Section
++ */
++
++/*
++ * Maximum of simultaneously allowed windows per screen session.
++ */
++#ifndef MAXWIN
++# define MAXWIN 40
++#endif
++
++/*
++ * Define SOCKDIR to be the directory to contain the named sockets
++ * screen creates. This should be in a common subdirectory, such as
++ * /usr/local or /tmp. It makes things a little more secure if you
++ * choose a directory which is not writable by everyone or where the
++ * "sticky" bit is on, but this isn't required.
++ * If SOCKDIR is not defined screen will put the named sockets in
++ * the user's home directory. Notice that this can cause you problems
++ * if some user's HOME directories are AFS- or NFS-mounted. Especially
++ * AFS is unlikely to support named sockets.
++ *
++ * Screen will name the subdirectories "S-$USER" (e.g /tmp/S-davison).
++ */
++#undef SOCKDIR
++
++/*
++ * Define this if the SOCKDIR is not shared between hosts.
++ */
++#define SOCKDIR_IS_LOCAL_TO_HOST
++
++/*
++ * Screen sources two startup files. First a global file with a path
++ * specified here, second your local $HOME/.screenrc
++ * Don't define this, if you don't want it.
++ */
++#ifndef ETCSCREENRC
++# define ETCSCREENRC "/usr/local/etc/screenrc"
++#endif
++
++/*
++ * Screen can look for the environment variable $SYSSCREENRC and -if it
++ * exists- load the file specified in that variable as global screenrc.
++ * If you want to enable this feature, define ALLOW_SYSSCREENRC to one (1).
++ * Otherwise ETCSCREENRC is always loaded.
++ */
++#define ALLOW_SYSSCREENRC 1
++
++/*
++ * Screen needs encoding files for the translation of utf8
++ * into some encodings, e.g. JIS, BIG5.
++ * Only needed if FONT, ENCODINGS and UTF8 are defined.
++ */
++#ifndef SCREENENCODINGS
++# define SCREENENCODINGS "/usr/local/lib/screen/encodings"
++#endif
++/*
++ * Define CHECKLOGIN to force Screen users to enter their Unix password
++ * in addition to the screen password.
++ *
++ * Define NOSYSLOG if yo do not have logging facilities. Currently
++ * syslog() will be used to trace ``su'' commands only.
++ */
++#define CHECKLOGIN 1
++#undef NOSYSLOG
++
++
++/* 
++ * define PTYMODE if you do not like the default of 0622, which allows 
++ * public write to your pty.
++ * define PTYGROUP to some numerical group-id if you do not want the
++ * tty to be in "your" group.
++ * Note, screen is unable to change mode or group of the pty if it
++ * is not installed with sufficient privilege. (e.g. set-uid-root)
++ * define PTYROFS if the /dev/pty devices are mounted on a read-only 
++ * filesystem so screen should not even attempt to set mode or group  
++ * even if running as root (e.g. on TiVo).
++ */
++#undef PTYMODE
++#undef PTYGROUP
++#undef PTYROFS
++
++/*
++ * If screen is NOT installed set-uid root, screen can provide tty
++ * security by exclusively locking the ptys.  While this keeps other
++ * users from opening your ptys, it also keeps your own subprocesses
++ * from being able to open /dev/tty.  Define LOCKPTY to add this
++ * exclusive locking.
++ */
++#undef LOCKPTY
++
++/*
++ * If you'd rather see the status line on the first line of your
++ * terminal rather than the last, define TOPSTAT.
++ */
++#undef TOPSTAT
++
++/*
++ * define DETACH can detach a session. An absolute 'must'.
++ */
++#define DETACH
++
++/*
++ * here come the erlangen extensions to screen:
++ * define LOCK if you want to use a lock program for a screenlock.
++ * define PASSWORD for secure reattach of your screen.
++ * define COPY_PASTE to use the famous hacker's treasure zoo.
++ * define POW_DETACH to have a detach_and_logout key (requires DETACH).
++ * define REMOTE_DETACH (-d option) to move screen between terminals.
++ * define AUTO_NUKE to enable Tim MacKenzies clear screen nuking
++ * define PSEUDOS to allow window input/output filtering
++ * define MULTI to allow multiple attaches.
++ * define MULTIUSER to allow other users attach to your session
++ *                  (if they are in the acl, of course)
++ * define MAPKEYS to include input keyboard translation.
++ * define FONT to support ISO2022/alternet charset support
++ * define COLOR to include ansi color support. This may expose
++ *        a bug in x11r6-color-xterm.
++ * define DW_CHARS to include support for double-width character
++ *        sets.
++ * define ENCODINGS to include support for encodings like euc or big5.
++ *        Needs FONT to work.
++ * define UTF8 if you want support for UTF-8 encoding.
++ *        Needs FONT and ENCODINGS to work.
++ * define COLORS16 if you want 16 colors.
++ *        Needs COLOR to work.
++ * define BUILTIN_TELNET to add telnet support to screen.
++ *        Syntax: screen //telnet host [port]
++ * define RXVT_OSC if you want support for rxvts special
++ *        change fgcolor/bgcolor/bgpicture sequences
++ */
++#undef SIMPLESCREEN
++#ifndef SIMPLESCREEN
++# define LOCK
++# define PASSWORD
++# define COPY_PASTE
++# define REMOTE_DETACH
++# define POW_DETACH
++# define AUTO_NUKE
++# define PSEUDOS
++# define MULTI
++# define MULTIUSER
++# define MAPKEYS
++# define COLOR
++# define FONT
++# define DW_CHARS
++# define ENCODINGS
++# define UTF8
++# define COLORS16
++# define ZMODEM
++# define BLANKER_PRG
++#endif /* SIMPLESCREEN */
++
++#undef BUILTIN_TELNET
++#undef RXVT_OSC
++#undef COLORS256
++
++
++/*
++ * If you have a braille display you should define HAVE_BRAILLE.
++ * The code inside #ifdef HAVE_BRAILLE was contributed by Hadi Bargi
++ * Rangin (bargi@dots.physics.orst.edu).
++ * WARNING: this is more or less unsupported code, it may be full of
++ * bugs leading to security holes, enable at your own risk!
++ */
++#undef HAVE_BRAILLE
++
++
++/*
++ * As error messages are mostly meaningless to the user, we
++ * try to throw out phrases that are somewhat more familiar
++ * to ...well, at least familiar to us NetHack players.
++ */
++#ifndef NONETHACK
++# define NETHACK
++#endif /* NONETHACK */
++
++/*
++ * If screen is installed with permissions to update /etc/utmp (such
++ * as if it is installed set-uid root), define UTMPOK.
++ */
++#define UTMPOK
++
++/* Set LOGINDEFAULT to one (1)
++ * if you want entries added to /etc/utmp by default, else set it to
++ * zero (0).
++ * LOGINDEFAULT will be one (1) whenever LOGOUTOK is undefined!
++ */
++#define LOGINDEFAULT	1
++
++/* Set LOGOUTOK to one (1)
++ * if you want the user to be able to log her/his windows out.
++ * (Meaning: They are there, but not visible in /etc/utmp).
++ * Disabling this feature only makes sense if you have a secure /etc/utmp
++ * database. 
++ * Negative examples: suns usually have a world writable utmp file, 
++ * xterm will run perfectly without s-bit.
++ *
++ * If LOGOUTOK is undefined and UTMPOK is defined, all windows are
++ * initially and permanently logged in.
++ *
++ * Set CAREFULUTMP to one (1) if you want that users have at least one
++ * window per screen session logged in.
++ */
++#define LOGOUTOK 1
++#undef CAREFULUTMP
++
++
++/*
++ * If UTMPOK is defined and your system (incorrectly) counts logins by
++ * counting non-null entries in /etc/utmp (instead of counting non-null
++ * entries with no hostname that are not on a pseudo tty), define USRLIMIT
++ * to have screen put an upper-limit on the number of entries to write
++ * into /etc/utmp.  This helps to keep you from exceeding a limited-user
++ * license.
++ */
++#undef USRLIMIT
++
++/*
++ * both must be defined if you want to favor tcsendbreak over
++ * other calls to generate a break condition on serial lines.
++ * (Do not bother, if you are not using plain tty windows.)
++ */
++#define POSIX_HAS_A_GOOD_TCSENDBREAK
++#define SUNOS4_AND_WE_TRUST_TCSENDBREAK
++
++/*
++ * to lower the interrupt load on the host machine, you may want to
++ * adjust the VMIN and VTIME settings used for plain tty windows.
++ * See the termio(4) manual page (Non-Canonical Mode Input Processing)
++ * for details.
++ * if undefined, VMIN=1, VTIME=0 is used as a default - this gives you
++ * best user responsiveness, but highest interrupt frequency.
++ * (Do not bother, if you are not using plain tty windows.)
++ */
++#define TTYVMIN 100
++#define TTYVTIME 2
++
++/*
++ * looks like the above values are ignored by setting FNDELAY.
++ * This is default for all pty/ttys, you may disable it for
++ * ttys here. After playing with it for a while, one may find out
++ * that this feature may cause screen to lock up.
++ */
++#ifdef bsdi
++# define TTY_DISABLE_FNBLOCK /* select barfs without it ... */
++#endif
++
++
++/*
++ * Some terminals, e.g. Wyse 120, use a bitfield to select attributes.
++ * This doesn't work with the standard so/ul/m? terminal entries,
++ * because they will cancel each other out. 
++ * On TERMINFO machines, "sa" (sgr) may work. If you want screen
++ * to switch attributes only with sgr, define USE_SGR.
++ * This is *not* recomended, do this only if you must.
++ */
++#undef USE_SGR
++
++
++/*
++ * Define USE_LOCALE if you want screen to use the locale names
++ * for the name of the month and day of the week.
++ */
++#define USE_LOCALE
++
++/*
++ * Define USE_PAM if your system supports PAM (Pluggable Authentication
++ * Modules) and you want screen to use it instead of calling crypt().
++ * (You may also need to add -lpam to LIBS in the Makefile.)
++ */
++#undef USE_PAM
++
++/*
++ * Define CHECK_SCREEN_W if you want screen to set TERM to screen-w
++ * if the terminal width is greater than 131 columns. No longer needed
++ * on modern systems which use $COLUMNS or the tty settings instead.
++ */
++#undef CHECK_SCREEN_W
++
++/**********************************************************************
++ *
++ *	End of User Configuration Section
++ *
++ *      Rest of this file is modified by 'configure'
++ *      Change at your own risk!
++ *
++ */
++])
++# end of AH_TOP
++
+ AC_PREFIX_PROGRAM(screen)
+ AC_PREFIX_PROGRAM(gzip)
+ 
+@@ -46,6 +363,7 @@
+ AC_PROG_GCC_TRADITIONAL
+ AC_ISC_POSIX
+ 
++AC_MSG_CHECKING([for compiler sanity])
+ AC_TRY_RUN(main(){exit(0);},,[
+ if test $CC != cc ; then
+ AC_NOTE(Your $CC failed - restarting with CC=cc)
+@@ -54,22 +372,17 @@
+ export CC
+ exec $0 $configure_args
+ fi
+-])
+-
+-AC_TRY_RUN(main(){exit(0);},,
+-exec 5>&2
+-eval $ac_link
+-AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
+-AC_NOTE($ac_compile)
+-AC_MSG_ERROR(Can't run the compiler - sorry))
++],AC_MSG_WARN([skipping test due to crosscompilation]))
+ 
++AC_MSG_CHECKING([if compiler sets exit status])
+ AC_TRY_RUN([
+ main()
+ {
+   int __something_strange_();
+   __something_strange_(0);
+ }
+-],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
++],AC_MSG_ERROR(Your compiler does not set the exit status - sorry),,
++AC_MSG_WARN(skipping test due to crosscompilation))
+ 
+ AC_PROG_AWK
+ 
+@@ -103,6 +416,7 @@
+ dnl
+ dnl    ****  special unix variants  ****
+ dnl
++AH_TEMPLATE(ISC,[])
+ if test -n "$ISC"; then
+   AC_DEFINE(ISC) LIBS="$LIBS -linet"
+ fi
+@@ -114,11 +428,13 @@
+ dnl fi
+ dnl fi
+ 
++AH_TEMPLATE([sysV68],[])
+ if test -f /sysV68 ; then
+ AC_DEFINE(sysV68)
+ fi
+ 
+ AC_CHECKING(for MIPS)
++AH_TEMPLATE([MIPS],[])
+ if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
+ oldlibs="$LIBS"
+ test -f /bin/mx || LIBS="$LIBS -lmld" # for nlist. But not on alpha.
+@@ -132,6 +448,8 @@
+ AC_CHECKING(wait3)
+ AC_TRY_LINK(,[wait3();], ,
+ AC_CHECKING(wait2)
++AH_TEMPLATE([USE_WAIT2],[On RISCOS we prefer wait2() over wait3(). rouilj@sni-usa.com])
++dnl TODO(Hannes) shipped config.h.in wraps the define in #ifdef BSDWAIT
+ AC_TRY_LINK(,[wait2();],
+ dnl John Rouillard (rouilj@sni-usa.com):
+ dnl need -I/usr/include/bsd in RISCOS otherwise sockets are broken, no
+@@ -154,9 +472,11 @@
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lpyr"
+ AC_CHECKING(Pyramid OSX)
++AH_TEMPLATE([OSX], [Pyramid OSX])
+ AC_TRY_LINK(,[open_controlling_pty("")], AC_DEFINE(OSX), LIBS="$oldlibs")
+ fi
+ 
++AH_TEMPLATE([POSIX],[Define POSIX if your system supports IEEE Std 1003.1-1988 (POSIX).])
+ dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi):
+ dnl BBN butterfly is not POSIX, but a MACH BSD system.
+ dnl Do not define POSIX and TERMIO.
+@@ -183,6 +503,7 @@
+ fi
+ 
+ AC_CHECKING(for System V)
++AH_TEMPLATE([SYSV], [Define SYSV if your machine is SYSV complient (Sys V, HPUX, A/UX)])
+ AC_TRY_COMPILE(
+ [#include <sys/types.h>
+ #include <signal.h>
+@@ -198,6 +519,11 @@
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lelf"
+ AC_CHECKING(SVR4)
++AH_TEMPLATE([SVR4],[])
++AH_TEMPLATE([BUGGYGETLOGIN], 
++[If ttyslot() breaks getlogin() by returning indexes to utmp entries
++ of type DEAD_PROCESS, then our getlogin() replacement should be
++ selected by defining BUGGYGETLOGIN.])
+ AC_TRY_LINK([#include <utmpx.h>
+ ],,
+ [AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
+@@ -235,6 +561,9 @@
+ dnl
+ 
+ AC_CHECKING(BSD job jontrol)
++AH_TEMPLATE([BSDJOBS], 
++[Define BSDJOBS if you have BSD-style job control (both process
++ groups and a tty that deals correctly with them)])
+ AC_TRY_LINK(
+ [#include <sys/types.h>
+ #include <sys/ioctl.h>
+@@ -255,6 +584,10 @@
+ dnl    ****  setreuid(), seteuid()  ****
+ dnl
+ AC_CHECKING(setreuid)
++AH_TEMPLATE([HAVE_SETREUID], 
++[If your system has the calls setreuid() and setregid(),
++ define HAVE_SETREUID. Otherwise screen will use a forked process to
++ safely create output files without retaining any special privileges.])
+ AC_TRY_LINK(,[
+ #ifdef __hpux
+ setresuid(0, 0, 0);
+@@ -269,6 +602,9 @@
+ dnl   Solaris seteuid doesn't change the saved uid, bad for
+ dnl     multiuser screen sessions
+ AC_CHECKING(seteuid)
++AH_TEMPLATE([HAVE_SETEUID],
++[If your system supports BSD4.4's seteuid() and setegid(), define
++ HAVE_SETEUID.])
+ AC_TRY_LINK(,[
+ #if defined(linux) || defined(NeXT) || defined(_AUX_SOURCE) || defined(AUX) || defined(ultrix) || (defined(sun) && defined(SVR4)) || defined(ISC) || defined(sony_news)
+ seteuid_is_broken(0);
+@@ -292,7 +628,8 @@
+ dnl    ****  FIFO tests  ****
+ dnl
+ 
+-AC_CHECKING(fifos)
++AC_CACHE_CHECK([usable fifos],
++		[screen_cv_sys_fifo_usable],
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -357,12 +694,14 @@
+     exit(1);
+   exit(0);
+ }
+-], AC_NOTE(- your fifos are usable) fifo=1,
+-AC_NOTE(- your fifos are not usable))
+-rm -f /tmp/conftest*
++], screen_cv_sys_fifo_usable=yes, screen_cv_sys_fifo_usable=no))
+ 
+-if test -n "$fifo"; then
+-AC_CHECKING(for broken fifo implementation)
++if test X"$screen_cv_sys_fifo_usable" = Xyes; then
++AH_TEMPLATE([BROKEN_PIPE], 
++[Define this if your system exits select() immediatly if a pipe is
++ opened read-only and no writer has opened it.])
++AC_CACHE_CHECK([broken fifo implementation],
++	       [screen_cv_sys_fifo_broken_impl],
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <fcntl.h>
+@@ -407,9 +746,11 @@
+     exit(1);
+   exit(0);
+ }
+-], AC_NOTE(- your implementation is ok), 
+-AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
+-rm -f /tmp/conftest*
++], screen_cv_sys_fifo_broken_impl=no, 
++screen_cv_sys_fifo_broken_impl=yes))
++if test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then
++	AC_DEFINE(BROKEN_PIPE)
++fi
+ fi
+ 
+ dnl
+@@ -418,7 +759,8 @@
+ dnl 	may need  	LIBS="$LIBS -lsocket" 	here
+ dnl
+ 
+-AC_CHECKING(sockets)
++AC_CACHE_CHECK([sockets are usable],
++	       [screen_cv_sys_sockets_usable],
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -469,12 +811,16 @@
+     exit(1);
+   exit(0);
+ }
+-], AC_NOTE(- your sockets are usable) sock=1,
+-AC_NOTE(- your sockets are not usable))
+-rm -f /tmp/conftest*
++], screen_cv_sys_sockets_usable=yes,
++screen_cv_sys_sockets_usable=no))
+ 
+-if test -n "$sock"; then
++if test X"$screen_cv_sys_sockets_usable" = Xyes; then
+ AC_CHECKING(socket implementation)
++AH_TEMPLATE([SOCK_NOT_IN_FS], 
++[Define this if the unix-domain socket implementation doesn't
++ create a socket in the filesystem.])
++AC_CACHE_CHECK([if sockets are not stored in the filesystem],
++	       [screen_cv_sys_sockets_nofs],
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -500,22 +846,25 @@
+   close(s);
+   exit(0);
+ }
+-],AC_NOTE(- you are normal),
+-AC_NOTE(- unix domain sockets are not kept in the filesystem)
+-AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
+-rm -f /tmp/conftest*
++], screen_cv_sys_sockets_nofs=no,
++screen_cv_sys_sockets_nofs=yes))
++
++if test X"$screen_cv_sys_sockets_nofs" = Xyes; then
++  AC_DEFINE(SOCK_NOT_IN_FS)
++fi
+ fi
+ 
+ 
+ dnl
+ dnl    ****  choose sockets or fifos  ****
+ dnl
+-if test -n "$fifo"; then
+-  if test -n "$sock"; then
+-    if test -n "$nore"; then
++AH_TEMPLATE([NAMEDPIPE], [Define this if your system supports named pipes.])
++if test X"$screen_cv_sys_fifo_usable" = Xyes; then
++  if test X"$screen_cv_sys_sockets_usable" = Xyes; then
++    if test X"$screen_cv_sys_sockets_nofs" = Xyes; then
+       AC_NOTE(- hmmm... better take the fifos)
+       AC_DEFINE(NAMEDPIPE)
+-    elif test -n "$fifobr"; then
++    elif test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then
+       AC_NOTE(- as your fifos are broken lets use the sockets.)
+     else
+       AC_NOTE(- both sockets and fifos usable. let's take fifos.)
+@@ -525,7 +874,7 @@
+     AC_NOTE(- using named pipes, of course)
+     AC_DEFINE(NAMEDPIPE)
+   fi
+-elif test -n "$sock"; then
++elif test X"$screen_cv_sys_sockets_usable" = Xyes; then
+   AC_NOTE(- using unix-domain sockets, of course)
+ else
+   AC_MSG_ERROR(you have neither usable sockets nor usable pipes -> no screen)
+@@ -535,7 +884,11 @@
+ dnl    ****  check the select implementation ****
+ dnl
+ 
+-AC_CHECKING(select return value)
++AH_TEMPLATE([SELECT_BROKEN], 
++[If the select return value doesn't treat a descriptor that is
++ usable for reading and writing as two hits, define SELECT_BROKEN.])
++AC_CACHE_CHECK([for broken select return value],
++	       [screen_cv_sys_select_broken_retval],
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -634,19 +987,26 @@
+     exit(1);
+   exit(0);
+ }
+-],AC_NOTE(- select is ok),
+-AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
++], screen_cv_sys_select_broken_retval=no,
++screen_cv_sys_select_broken_retval=yes))
++if test X"$screen_cv_sys_select_broken_retval" = Xyes; then
++  AC_DEFINE(SELECT_BROKEN)
++fi
+ 
+ dnl
+ dnl    ****  termcap or terminfo  ****
+ dnl
++AH_TEMPLATE([TERMINFO], 
++[Define TERMINFO if your machine emulates the termcap routines
++ with the terminfo database.
++ Thus the .screenrc file is parsed for
++ the command 'terminfo' and not 'termcap'])
++
+ AC_CHECKING(for tgetent)
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ olibs="$LIBS"
+-if test -f /usr/lib/libncursesw.so ; then
+-    LIBS="-lncursesw $olibs"
+-fi
+ AC_CHECKING(libncursesw)
++AC_CHECK_LIB(ncursesw,tgetent)
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ LIBS="-lcurses $olibs"
+ AC_CHECKING(libcurses)
+@@ -668,24 +1028,39 @@
+ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
+ AC_MSG_ERROR(!!! no tgetent - no screen)))))))
+ 
+-AC_TRY_RUN([
++AC_CACHE_CHECK([using terminfo database],[screen_cv_sys_terminfo_used],
++	AC_TRY_RUN([
+ main()
+ {
+  exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
+-}], AC_NOTE(- you use the termcap database),
+-AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
++}
++	], screen_cv_sys_terminfo_used=no,
++	screen_cv_sys_terminfo_used=yes)
++)
++
++if test X"$screen_cv_sys_terminfo_used" = Xyes; then
++	AC_DEFINE(TERMINFO)
++fi
++
+ AC_CHECKING(ospeed)
++AH_TEMPLATE([NEED_OSPEED],[If your library does not define ospeed, define this.])
+ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
+ 
+ dnl
+ dnl    ****  PTY specific things  ****
+ dnl
++AH_TEMPLATE([HAVE_DEV_PTC], 
++[define HAVE_DEV_PTC if you have a /dev/ptc character special
++ device.])
+ AC_CHECKING(for /dev/ptc)
+ if test -r /dev/ptc; then
+ AC_DEFINE(HAVE_DEV_PTC)
+ fi
+ 
+ AC_CHECKING(for SVR4 ptys)
++AH_TEMPLATE([HAVE_SVR4_PTYS],
++[define HAVE_SVR4_PTYS if you have a /dev/ptmx character special
++ device and support the ptsname(), grantpt(), unlockpt() functions.])
+ sysvr4ptys=
+ if test -c /dev/ptmx ; then
+ AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
+@@ -701,6 +1076,13 @@
+ fi
+ 
+ AC_CHECKING(for ptyranges)
++AH_TEMPLATE([PTYRANGE0],
++[define PTYRANGE0 and or PTYRANGE1 if you want to adapt screen
++ to unusual environments. E.g. For SunOs the defaults are "qpr" and 
++ "0123456789abcdef". For SunOs 4.1.2 
++ #define PTYRANGE0 "pqrstuvwxyzPQRST" 
++ is recommended by Dan Jacobson.])
++AH_TEMPLATE([PTYRANGE1],[])
+ if test -d /dev/ptym ; then
+ pdir='/dev/ptym'
+ else
+@@ -817,6 +1199,9 @@
+ dnl    ****  utmp handling  ****
+ dnl
+ AC_CHECKING(getutent)
++AH_TEMPLATE([GETUTENT],
++[If your system has getutent(), pututline(), etc. to write to the
++ utmp file, define GETUTENT.])
+ AC_TRY_LINK([
+ #include <time.h> /* to get time_t on SCO */
+ #include <sys/types.h>
+@@ -850,6 +1235,7 @@
+ [int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), LIBS="$olibs")
+ )
+ AC_CHECKING(ut_host)
++AH_TEMPLATE([UTHOST],[Define UTHOST if the utmp file has a host field.])
+ AC_TRY_COMPILE([
+ #include <time.h>
+ #include <sys/types.h>
+@@ -860,8 +1246,9 @@
+ #include <utmp.h>
+ #endif
+ ],[struct utmp u; u.ut_host[0] = 0;], AC_DEFINE(UTHOST))
++AH_TEMPLATE([HAVE_UTEMPTER],[Define if you have the utempter utmp helper program])
+ AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
+-if test "$have_utempter" = yes; then
++if test X"$have_utempter" = Xyes; then
+   AC_DEFINE(HAVE_UTEMPTER)
+   LIBS="$LIBS -lutempter"
+ fi
+@@ -869,20 +1256,39 @@
+ dnl
+ dnl    ****  loadav  ****
+ dnl
++
++AH_TEMPLATE([LOADAV],
++[If you want the "time" command to display the current load average
++ define LOADAV. Maybe you must install screen with the needed
++ privileges to read /dev/kmem.
++ Note that NLIST_ stuff is only checked, when getloadavg() is not available.
++])
++AH_TEMPLATE([LOADAV_NUM])
++AH_TEMPLATE([LOADAV_TYPE])
++AH_TEMPLATE([LOADAV_SCALE])
++AH_TEMPLATE([LOADAV_GETLOADAVG])
++AH_TEMPLATE([LOADAV_UNIX])
++AH_TEMPLATE([LOADAV_AVENRUN])
++AH_TEMPLATE([LOADAV_USE_NLIST64])
++
++AH_TEMPLATE([NLIST_DECLARED])
++AH_TEMPLATE([NLIST_STRUCT])
++AH_TEMPLATE([NLIST_NAME_UNION])
++
+ AC_CHECKING(for libutil(s))
+-test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
+-test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
++dnl I have no idea whether "login" is an appropriate symbol to check for here - Hannes
++AC_CHECK_LIB(utils,login)
++AC_CHECK_LIB(util,login)
+ 
+ AC_CHECKING(getloadavg)
+ AC_TRY_LINK(,[getloadavg((double *)0, 0);],
+ AC_DEFINE(LOADAV_GETLOADAVG) load=1,
+-if test -f /usr/lib/libkvm.a ; then
+ olibs="$LIBS"
+-LIBS="$LIBS -lkvm"
++AC_CHECK_LIB(kvm,kvm_open,
+ AC_CHECKING(getloadavg with -lkvm)
+ AC_TRY_LINK(,[getloadavg((double *)0, 0);],
+ AC_DEFINE(LOADAV_GETLOADAVG) load=1, LIBS="$olibs")
+-fi
++)
+ )
+ 
+ if test -z "$load" ; then
+@@ -1024,6 +1430,11 @@
+ dnl
+ dnl    ****  signal handling  ****
+ dnl
++
++AH_TEMPLATE([SIGVOID],
++[Define SIGVOID if your signal handlers return void.  On older
++ systems, signal returns int, but on newer ones, it returns void.])
++
+ if test -n "$posix" ; then
+ 
+ dnl POSIX has reliable signals with void return type.
+@@ -1041,6 +1452,7 @@
+ #endif
+ extern void (*signal ()) ();], [int i;], AC_DEFINE(SIGVOID))
+ AC_CHECKING(sigset)
++AH_TEMPLATE([USESIGSET], [Define USESIGSET if you have sigset for BSD 4.1 reliable signals.])
+ AC_TRY_LINK([
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -1052,6 +1464,9 @@
+ #endif
+ ], AC_DEFINE(USESIGSET))
+ AC_CHECKING(signal implementation)
++AH_TEMPLATE([SYSVSIGS],
++[Define SYSVSIGS if signal handlers must be reinstalled after
++ they have been called.])
+ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -1094,13 +1509,14 @@
+ dnl
+ 
+ AC_CHECKING(for crypt and sec libraries)
+-test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
++dnl I have no idea whether "crypt" is an appropriate symbol to check for here - Hannes
++AC_CHECK_LIB(crypt_d,crypt)
+ oldlibs="$LIBS"
+-LIBS="$LIBS -lcrypt"
+ AC_CHECKING(crypt)
+ AC_TRY_LINK(,,,LIBS="$oldlibs")
+-test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
+-test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
++AC_CHECK_LIB(crypt,crypt)
++AC_CHECK_LIB(sec,crypt)
++AC_CHECK_LIB(shadow,getspnam)
+ oldlibs="$LIBS"
+ LIBS="$LIBS -lsun"
+ AC_CHECKING(IRIX sun library)
+@@ -1123,6 +1539,13 @@
+ dnl    ****  misc things  ****
+ dnl
+ AC_CHECKING(wait union)
++AH_TEMPLATE([BSDWAIT], 
++[Define BSDWAIT if your system defines a 'union wait' in <sys/wait.h>
++
++ Only allow BSDWAIT i.e. wait3 on nonposix systems, since
++ posix implies wait(3) and waitpid(3). vdlinden@fwi.uva.nl
++ TODO(Hannes) shipped config.h.in does that with a #ifdef
++])
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/wait.h>
+ ],[
+@@ -1133,6 +1556,12 @@
+ #endif
+ ],AC_DEFINE(BSDWAIT))
+ 
++AH_TEMPLATE([TERMIO],
++[Define TERMIO if you have struct termio instead of struct sgttyb.
++ This is usually the case for SVID systems, where BSD uses sgttyb.
++ POSIX systems should define this anyway, even though they use
++ struct termios.])
++
+ if test -z "$butterfly"; then
+ AC_CHECKING(for termio or termios)
+ AC_TRY_CPP([#include <termio.h>], AC_DEFINE(TERMIO),
+@@ -1142,17 +1571,35 @@
+ )
+ fi
+ 
++AH_TEMPLATE([CYTERMIO], [Define CYTERMIO if you have cyrillic termio modes.])
++
+ dnl AC_CHECK_HEADER(shadow.h, AC_DEFINE(SHADOWPW))
+ AC_CHECKING(getspnam)
++AH_TEMPLATE([SHADOWPW], 
++[If the passwords are stored in a shadow file and you want the
++ builtin lock to work properly, define SHADOWPW.])
+ AC_TRY_LINK([#include <shadow.h>], [getspnam("x");],AC_DEFINE(SHADOWPW))
+ 
+ AC_CHECKING(getttyent)
++AH_TEMPLATE([GETTTYENT],
++[If your system has the new format /etc/ttys (like 4.3 BSD) and the
++ getttyent(3) library functions, define GETTTYENT.])
+ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT))
+ 
+ AC_CHECKING(fdwalk)
++AH_TEMPLATE([HAVE_FDWALK], 
++[Newer versions of Solaris include fdwalk, which can greatly improve
++ the startup time of screen; otherwise screen spends a lot of time
++ closing file descriptors.])
+ AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK))
+ 
+-AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments)
++AH_TEMPLATE([USEBCOPY],
++[Define USEBCOPY if the bcopy/memcpy from your system's C library
++ supports the overlapping of source and destination blocks.  When
++ undefined, screen uses its own (probably slower) version of bcopy().])
++
++AC_CACHE_CHECK([if bcopy handles overlap],
++	       [screen_cv_sys_bcopy_overlap],
+ AC_TRY_RUN([
+ main() {
+   char buf[10];
+@@ -1165,8 +1612,21 @@
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEBCOPY))
++}], screen_cv_sys_bcopy_overlap=yes,
++screen_cv_sys_bcopy_overlap=no))
++if test X"$screen_cv_sys_bcopy_overlap" = Xyes; then
++  AC_DEFINE(USEBCOPY)
++fi
+ 
++AH_TEMPLATE([USEMEMMOVE], 
++[SYSV machines may have a working memcpy() -- Oh, this is 
++ quite unlikely. Tell me if you see one.
++ "But then, memmove() should work, if at all available" he thought...
++ Boing, never say "works everywhere" unless you checked SCO UNIX.
++ Their memove fails the test in the configure script. Sigh. (Juergen)
++])
++AC_CACHE_CHECK([if memmove handles overlap],
++	       [screen_cv_sys_memmove_overlap],
+ AC_TRY_RUN([
+ #define bcopy(s,d,l) memmove(d,s,l)
+ main() {
+@@ -1180,9 +1640,15 @@
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEMEMMOVE))
+-
++}], screen_cv_sys_memmove_overlap=yes,
++screen_cv_sys_memmove_overlap=no))
++if test X"$screen_cv_sys_memmove_overlap" = Xyes; then
++  AC_DEFINE(USEMEMMOVE)
++fi
+ 
++AH_TEMPLATE([USEMEMCPY],[])
++AC_CACHE_CHECK([if memcpy handles overlap],
++	       [screen_cv_sys_memcpy_overlap],
+ AC_TRY_RUN([
+ #define bcopy(s,d,l) memcpy(d,s,l)
+ main() {
+@@ -1196,9 +1662,19 @@
+   if (strncmp(buf, "cdedef", 6))
+     exit(1);
+   exit(0); /* libc version works properly.  */
+-}], AC_DEFINE(USEMEMCPY))
++}], screen_cv_sys_memcpy_overlap=yes,
++screen_cv_sys_memcpy_overlap=no))
++if test X"$screen_cv_sys_memcpy_overlap" = Xyes; then
++  AC_DEFINE(USEMEMCPY)
++fi
+ 
+ AC_MSG_CHECKING(long file names)
++AH_TEMPLATE([NAME_MAX], 
++[If you are on a SYS V machine that restricts filename length to 14 
++ characters, you may need to enforce that by setting NAME_MAX to 14])
++dnl TODO(Hannes) shipped config.h.in has 
++dnl #undef NAME_MAX		/* KEEP_UNDEF_HERE override system value */
++dnl ahead of this
+ (echo 1 > /tmp/conftest9012345) 2>/dev/null
+ (echo 2 > /tmp/conftest9012346) 2>/dev/null
+ val=`cat /tmp/conftest9012345 2>/dev/null`
+@@ -1211,17 +1687,28 @@
+ rm -f /tmp/conftest*
+ 
+ AC_MSG_CHECKING(for vsprintf)
++AH_TEMPLATE([USEVARARGS], 
++[If your system has vsprintf() and requires the use of the macros in
++ "varargs.h" to use functions with variable arguments,
++ define USEVARARGS.])
+ AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no))
+ 
+ AC_HEADER_DIRENT
+ 
+ AC_MSG_CHECKING(for setenv)
++AH_TEMPLATE([USESETENV], [If your system has setenv() and unsetenv() define USESETENV])
+ AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV),
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING(for putenv)
++AH_TEMPLATE([NEEDPUTENV], 
++[If your system does not come with a setenv()/putenv()/getenv()
++ functions, you may bring in our own code by defining NEEDPUTENV.])
+ AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) ,  AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV)
+ ))
+ AC_MSG_CHECKING([for nl_langinfo(CODESET)])
++AH_TEMPLATE([HAVE_NL_LANGINFO],
++[define HAVE_NL_LANGINFO if your system has the nl_langinfo() call
++ and <langinfo.h> defines CODESET.])
+ AC_TRY_LINK([
+ #include <langinfo.h>
+ ],[nl_langinfo(CODESET);], AC_MSG_RESULT(yes);AC_DEFINE(HAVE_NL_LANGINFO), AC_MSG_RESULT(no))
+@@ -1271,7 +1758,8 @@
+ dnl Ptx bug workaround -- insert -lc after -ltermcap
+ test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
+ 
+-AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
++AC_MSG_CHECKING(compiler sanity)
++AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.), AC_MSG_WARN(Skipping test due to crosscompilation))
+ 
+ ETCSCREENRC="\"/usr/local/etc/screenrc\""
+ if test -n "$prefix"; then
diff --git a/packages/screen/screen_4.0.2.bb b/packages/screen/screen_4.0.2.bb
index 29681304ec..0f79f40c1c 100644
--- a/packages/screen/screen_4.0.2.bb
+++ b/packages/screen/screen_4.0.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "ncurses"
 PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
-           ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz;patch=1 \
+           file://screen_4.0.2-4.1sarge1.diff.gz;patch=1 \
            file://configure.patch;patch=1"
 
 inherit autotools
diff --git a/packages/screen/screen_4.0.3.bb b/packages/screen/screen_4.0.3.bb
new file mode 100644
index 0000000000..1165d46d33
--- /dev/null
+++ b/packages/screen/screen_4.0.3.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Screen is a full-screen window manager \
+that multiplexes a physical terminal between several \
+processes, typically interactive shells."
+LICENSE = "GPL"
+SECTION = "console/utils"
+DEPENDS = "ncurses"
+PR = "r0"
+
+# patch needs adapting
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5"
diff --git a/packages/tzcode/tzcode-native_2007k.bb b/packages/tzcode/tzcode-native_2007k.bb
index 8e721d6d9a..6593cc3a24 100644
--- a/packages/tzcode/tzcode-native_2007k.bb
+++ b/packages/tzcode/tzcode-native_2007k.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
-
 PR = "r0"
 
-SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzcode${PV}.tar.gz \
-           ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
-
+SRC_URI = "\
+  http://bent.latency.net/bent/darcs/zoneinfo-2007k/src/tzcode${PV}.tar.gz \
+  http://bent.latency.net/bent/darcs/zoneinfo-2007k/src/tzdata${PV}.tar.gz \
+"
 S = "${WORKDIR}"
 
 inherit native
diff --git a/packages/udev/udev_124.bb b/packages/udev/udev_124.bb
index a574014466..1cae0ce218 100644
--- a/packages/udev/udev_124.bb
+++ b/packages/udev/udev_124.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES_${PN} = "hotplug"
-
 PR = "r13"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
@@ -19,8 +18,6 @@ PACKAGE_ARCH_h2200 = "h2200"
 
 require udev.inc
 
-DEFAULT_PREFERENCE = "-999"
-
 INITSCRIPT_PARAMS = "start 03 S ."
 
 FILES_${PN} += "${base_libdir}/udev/*"