Remove unnecessary sets of the S variable, we have a sane default for that now.

BKrev: 3fcd64f7p2VYsNYNbFnMtPYuY-5tZQ

63 files changed, 422 insertions, 35 deletions

diff --git a/acpid/acpid_1.0.2.oe b/acpid/acpid_1.0.2.oe
index 7b962dbed0..7a163c09e5 100644
--- a/acpid/acpid_1.0.2.oe
+++ b/acpid/acpid_1.0.2.oe
@@ -1,7 +1,6 @@
 DEPENDS = virtual/libc
 
 SRC_URI := ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz
-S := ${WORKDIR}/${P}
 
 EXTRA_OEMAKE=
 do_compile () {
diff --git a/autoconf/autoconf_2.57.oe b/autoconf/autoconf_2.57.oe
index ce998e2e15..ba1e6de8fb 100644
--- a/autoconf/autoconf_2.57.oe
+++ b/autoconf/autoconf_2.57.oe
@@ -1,5 +1,4 @@
 SRC_URI := ${GNU_MIRROR}/autoconf/autoconf-2.57.tar.bz2 \
 	   file://${FILESDIR}/program_prefix.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/automake/automake_1.7.7.oe b/automake/automake_1.7.7.oe
index 49bb29ef09..1d67d318a4 100644
--- a/automake/automake_1.7.7.oe
+++ b/automake/automake_1.7.7.oe
@@ -1,5 +1,4 @@
 SRC_URI := ${GNU_MIRROR}/automake/automake-1.7.7.tar.bz2
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/avr-libc/avr-libc_1.0.oe b/avr-libc/avr-libc_1.0.oe
index 13476bb956..97416c6e43 100644
--- a/avr-libc/avr-libc_1.0.oe
+++ b/avr-libc/avr-libc_1.0.oe
@@ -2,7 +2,6 @@ PROVIDES = virtual/libc
 
 SRC_URI := http://savannah.nongnu.org/download/avr-libc/released/SOURCES/avr-libc-1.0.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 B := ${WORKDIR}/build.${BUILD_SYS}.${TARGET_SYS}
 
 inherit autotools
diff --git a/base-files/base-files_3.0.12.oe b/base-files/base-files_3.0.12.oe
index 98b001a38b..55478e99c2 100644
--- a/base-files/base-files_3.0.12.oe
+++ b/base-files/base-files_3.0.12.oe
@@ -1,5 +1,4 @@
 SRC_URI := ${DEBIAN_MIRROR}/main/b/base-files/base-files_3.0.12.tar.gz
-S := ${WORKDIR}/${P}
 
 docdir_append=/${P}
 do_install () {
diff --git a/base-passwd/base-passwd_3.5.4.oe b/base-passwd/base-passwd_3.5.4.oe
index afe0972dd6..adbd96dcce 100644
--- a/base-passwd/base-passwd_3.5.4.oe
+++ b/base-passwd/base-passwd_3.5.4.oe
@@ -4,7 +4,6 @@ RDEPENDS = libc6
 SRC_URI := ${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_3.5.4.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1 \
 	   file://${FILESDIR}/nobash.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/bluez-hcidump/bluez-hcidump_1.5.oe b/bluez-hcidump/bluez-hcidump_1.5.oe
index aa8f25f932..3b96961fdd 100644
--- a/bluez-hcidump/bluez-hcidump_1.5.oe
+++ b/bluez-hcidump/bluez-hcidump_1.5.oe
@@ -6,7 +6,6 @@ DEPENDS=virtual/libc virtual/libbluetooth
 
 SRC_URI = http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1
-S=${WORKDIR}/${P}
 
 EXTRA_OECONF:="--with-bluez-libs=${STAGING_DIR}/target"
 
diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe
index 6b54785371..96b6de73b2 100644
--- a/bluez-libs/bluez-libs_2.4.oe
+++ b/bluez-libs/bluez-libs_2.4.oe
@@ -6,7 +6,6 @@ DEPENDS=virtual/libc
 PROVIDES=virtual/libbluetooth
 
 SRC_URI = "http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz"
-S=${WORKDIR}/${P}
 
 inherit autotools libtool
 
diff --git a/bluez-pan/bluez-pan_1.1.oe b/bluez-pan/bluez-pan_1.1.oe
index dece88f1c7..0d1a47d2e5 100644
--- a/bluez-pan/bluez-pan_1.1.oe
+++ b/bluez-pan/bluez-pan_1.1.oe
@@ -5,7 +5,6 @@ SECTION="libs"
 DEPENDS=virtual/libc virtual/libbluetooth virtual/libsdp
 
 SRC_URI = "http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz"
-S=${WORKDIR}/${P}
 
 EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_DIR}/target/include --with-sdp-libs=${STAGING_LIBDIR} --with-sdp-includes=${STAGING_DIR}/target/include"
 
diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe
index f9e6a3fb87..6c37422143 100644
--- a/bluez-sdp/bluez-sdp_1.5.oe
+++ b/bluez-sdp/bluez-sdp_1.5.oe
@@ -6,7 +6,6 @@ DEPENDS=virtual/libc virtual/libbluetooth
 PROVIDES=virtual/libsdp
 
 SRC_URI = "http://bluez.sourceforge.net/download/${PN}-${PV}.tar.gz"
-S=${WORKDIR}/${P}
 
 EXTRA_OECONF:="--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_DIR}/target/include"
 LDFLAGS_prepend = "-L${S}/libs "
diff --git a/bootmenu/bootmenu_0.6.oe b/bootmenu/bootmenu_0.6.oe
index e69de29bb2..3faac47016 100644
--- a/bootmenu/bootmenu_0.6.oe
+++ b/bootmenu/bootmenu_0.6.oe
@@ -0,0 +1,16 @@
+DEPENDS = virtual/libc
+
+SRC_URI := http://www.cosmicpenguin.net/pub/bootmenu/${P}.tar.gz \
+	   file://${FILESDIR}/compile.patch;patch=1
+
+EXTRA_OEMAKE =
+
+do_compile () {
+	cd src
+	oe_runmake 'CC=${CC}' 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}'
+}
+
+do_install () {
+	cd src
+	oe_runmake 'PLUGINDIR=${datadir}/bootmenu' 'PREFIX=${bindir}' 'DESTDIR=${D}' install
+}
diff --git a/btscanner/btscanner_1.0.oe b/btscanner/btscanner_1.0.oe
index e69de29bb2..3948b9705c 100644
--- a/btscanner/btscanner_1.0.oe
+++ b/btscanner/btscanner_1.0.oe
@@ -0,0 +1,11 @@
+SECTION="libs"
+PRIORITY="optional"
+RDEPENDS="libc6"
+SECTION="libs"
+DEPENDS=virtual/libc virtual/libbluetooth virtual/libsdp virtual/libgdbm
+
+SRC_URI = http://www.pentest.co.uk/src/${PN}-${PV}.tar.gz \
+	  file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+
diff --git a/bvi/bvi_1.3.1.oe b/bvi/bvi_1.3.1.oe
index e69de29bb2..ad3e0d8c9a 100644
--- a/bvi/bvi_1.3.1.oe
+++ b/bvi/bvi_1.3.1.oe
@@ -0,0 +1,8 @@
+DEPENDS = virtual/libc ncurses
+RDEPENDS = libc6 libncurses5
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/bvi/bvi-1.3.1.src.tar.gz \
+	  file://${FILESDIR}/configure.patch;patch=1 \
+	  file://${FILESDIR}/compile.patch;patch=1
+
+inherit autotools
diff --git a/ccache/ccache_2.3.oe b/ccache/ccache_2.3.oe
index e69de29bb2..7ff0c07e71 100644
--- a/ccache/ccache_2.3.oe
+++ b/ccache/ccache_2.3.oe
@@ -0,0 +1,6 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI := http://ccache.samba.org/ftp/ccache/ccache-2.3.tar.gz
+
+inherit autotools
diff --git a/cflow/cflow_2.0.oe b/cflow/cflow_2.0.oe
index e69de29bb2..4f8b3b674b 100644
--- a/cflow/cflow_2.0.oe
+++ b/cflow/cflow_2.0.oe
@@ -0,0 +1,9 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = http://www.ibiblio.org/pub/Linux/devel/lang/c/cflow-2.0.tar.gz
+
+do_install () {
+	install -d ${D}/${bindir}
+	oe_runmake 'PREFIX=${D}' 'BINDIR=${D}/${bindir}' install
+}
diff --git a/console-tools/console-tools_0.3.2.oe b/console-tools/console-tools_0.3.2.oe
index 358df146de..15c7a2cdb3 100644
--- a/console-tools/console-tools_0.3.2.oe
+++ b/console-tools/console-tools_0.3.2.oe
@@ -4,7 +4,6 @@ RDEPENDS = libc6
 SRC_URI := ${SOURCEFORGE_MIRROR}/lct/console-tools-0.3.2.tar.gz \
 	   file://${FILESDIR}/codepage.patch;patch=1 \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 export SUBDIRS='fontfiletools vttools kbdtools screenfonttools contrib \
 		examples po intl compat'
diff --git a/coreutils/coreutils_5.0.oe b/coreutils/coreutils_5.0.oe
index b188928e46..223d85bfc9 100644
--- a/coreutils/coreutils_5.0.oe
+++ b/coreutils/coreutils_5.0.oe
@@ -4,6 +4,5 @@ RDEPENDS = libc6
 SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz \
 	  file://${FILESDIR}/malloc.patch;patch=1 \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/corkscrew/corkscrew_2.0.oe b/corkscrew/corkscrew_2.0.oe
index 612c6fee68..194ed234fc 100644
--- a/corkscrew/corkscrew_2.0.oe
+++ b/corkscrew/corkscrew_2.0.oe
@@ -1,5 +1,4 @@
 SRC_URI := http://www.agroman.net/${PN}/${P}.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/cscope/cscope_15.4.oe b/cscope/cscope_15.4.oe
index 88ed7c2e55..4e6d77d490 100644
--- a/cscope/cscope_15.4.oe
+++ b/cscope/cscope_15.4.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6 libncurses
 
 SRC_URI := ${SOURCEFORGE_MIRROR}/cscope/cscope-15.4.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/cvs/cvs_1.11.6.oe b/cvs/cvs_1.11.6.oe
index e8cb286eea..ece1b60d91 100644
--- a/cvs/cvs_1.11.6.oe
+++ b/cvs/cvs_1.11.6.oe
@@ -2,6 +2,5 @@ DEPENDS = virtual/libc
 RDEPENDS = libc6
 
 SRC_URI := http://www.cvshome.org/files/19/10/${P}.tar.bz2
-S := ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/cvs/cvs_1.11.9.oe b/cvs/cvs_1.11.9.oe
index e69de29bb2..ece1b60d91 100644
--- a/cvs/cvs_1.11.9.oe
+++ b/cvs/cvs_1.11.9.oe
@@ -0,0 +1,6 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI := http://www.cvshome.org/files/19/10/${P}.tar.bz2
+
+inherit autotools
diff --git a/diffutils/diffutils_2.8.1.oe b/diffutils/diffutils_2.8.1.oe
index e69de29bb2..7b56764a39 100644
--- a/diffutils/diffutils_2.8.1.oe
+++ b/diffutils/diffutils_2.8.1.oe
@@ -0,0 +1,6 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz
+
+inherit autotools
diff --git a/distcc/distcc_2.11.oe b/distcc/distcc_2.11.oe
index e69de29bb2..4822ade430 100644
--- a/distcc/distcc_2.11.oe
+++ b/distcc/distcc_2.11.oe
@@ -0,0 +1,6 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI := http://distcc.samba.org/ftp/distcc/distcc-2.11.tar.bz2
+
+inherit autotools
diff --git a/fakeroot/fakeroot_0.7.8.oe b/fakeroot/fakeroot_0.7.8.oe
index fad2bcdd95..91ea11c7ba 100644
--- a/fakeroot/fakeroot_0.7.8.oe
+++ b/fakeroot/fakeroot_0.7.8.oe
@@ -1,4 +1,3 @@
 SRC_URI := ${DEBIAN_MIRROR}/main/f/fakeroot/${PN}_${PV}.tar.gz
-S = ${WORKDIR}/${P}
 
 inherit autotools libtool
diff --git a/fbgetty/fbgetty_0.1.698.oe b/fbgetty/fbgetty_0.1.698.oe
index e69de29bb2..a7de4a5b14 100644
--- a/fbgetty/fbgetty_0.1.698.oe
+++ b/fbgetty/fbgetty_0.1.698.oe
@@ -0,0 +1,5 @@
+SRC_URI := http://fbgetty.meuh.eu.org/downloads/${P}.tar.gz \
+	   file://${FILESDIR}/compile.patch;patch=1
+B := ${WORKDIR}/build.${HOST_SYS}.${TARGET_SYS}
+
+inherit autotools
diff --git a/fbi/fbi_1.22.oe b/fbi/fbi_1.22.oe
index 019e64d773..2ccfd0e415 100644
--- a/fbi/fbi_1.22.oe
+++ b/fbi/fbi_1.22.oe
@@ -2,7 +2,6 @@ DEPENDS = virtual/libc jpeg
 
 SRC_URI := http://bytesex.org/misc/fbi_1.22.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/findutils/findutils_4.1.20.oe b/findutils/findutils_4.1.20.oe
index 6e750c88a2..9c88ef920e 100644
--- a/findutils/findutils_4.1.20.oe
+++ b/findutils/findutils_4.1.20.oe
@@ -4,6 +4,5 @@ RDEPENDS = libc6
 SRC_URI := ftp://alpha.gnu.org/gnu/findutils/findutils-4.1.20.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1 \
 	   file://${FILESDIR}/m4.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
diff --git a/frotz/frotz_2.42.oe b/frotz/frotz_2.42.oe
index e69de29bb2..b133d33173 100644
--- a/frotz/frotz_2.42.oe
+++ b/frotz/frotz_2.42.oe
@@ -0,0 +1,20 @@
+DEPENDS = virtual/libc ncurses
+RDEPENDS = libc6 ncurses5
+
+SRC_URI = http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-${PV}.tar.gz
+
+do_configure() {
+    patch -N ${s}/ux_init.c < remove_root_restriction.patch || :
+    rm -f ${SourceTree}/frotz.conf
+}
+
+
+EXTRA_OEMAKE=CC="${CC}" INCL="${CFLAGS}" LIB="${LDFLAGS}" PREFIX=/usr CONFIG_DIR=/etc 
+do_compile() {
+    oe_runmake frotz
+    sed 's/^[a-z]/#&/' frotz.conf-big > frotz.conf;
+}
+
+do_install() {
+    oe_runmake PREFIX=${D}/usr MAN_PREFIX=${D}/usr install
+}
diff --git a/gawk/gawk_3.0.4.oe b/gawk/gawk_3.0.4.oe
index 3b4d90d03e..4690c154b6 100644
--- a/gawk/gawk_3.0.4.oe
+++ b/gawk/gawk_3.0.4.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6
 
 SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/gdbm/gdbm_1.8.3.oe b/gdbm/gdbm_1.8.3.oe
index e69de29bb2..aa20ad3a2f 100644
--- a/gdbm/gdbm_1.8.3.oe
+++ b/gdbm/gdbm_1.8.3.oe
@@ -0,0 +1,18 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+PROVIDES = virtual/libgdbm
+SECTION = libs
+
+SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz \
+	  file://${FILESDIR}/makefile.patch;patch=1
+
+inherit autotools libtool
+
+do_stage () {
+	install -m 0755 .libs/libgdbm.so.3.0.0 ${STAGING_LIBDIR}/
+	install -m 0644 .libs/libgdbm.a ${STAGING_LIBDIR}/
+	install -m 0644 gdbm.h ${STAGING_DIR}/target/include/
+	ln -sf ${STAGING_LIBDIR}/libgdbm.so.3.0.0 ${STAGING_LIBDIR}/libgdbm.so.3
+	ln -sf ${STAGING_LIBDIR}/libgdbm.so.3.0.0 ${STAGING_LIBDIR}/libgdbm.so
+}
+
diff --git a/gpm/gpm_1.20.1.oe b/gpm/gpm_1.20.1.oe
index 4e278ee4a7..fe1e49d2bd 100644
--- a/gpm/gpm_1.20.1.oe
+++ b/gpm/gpm_1.20.1.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6 ncurses
 
 SRC_URI = ftp://arcana.linux.it/pub/gpm/gpm-1.20.1.tar.bz2 \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/ifupdown-roam/ifupdown-roam_0.59.oe b/ifupdown-roam/ifupdown-roam_0.59.oe
index e69de29bb2..8c66bf1bc2 100644
--- a/ifupdown-roam/ifupdown-roam_0.59.oe
+++ b/ifupdown-roam/ifupdown-roam_0.59.oe
@@ -0,0 +1,11 @@
+SECTION = net
+PRIORITY = extra
+DESCRIPTION = Roaming enhancements for ifupdown
+RDEPENDS = ifupdown
+
+SRC_URI := http://openembedded.org/download/ifupdown-roam-0.59.tar.bz2
+
+do_install () {
+	install -d ${D}
+	cp -a ${S}/* ${D}/
+}
diff --git a/ifupdown/ifupdown_0.6.4.oe b/ifupdown/ifupdown_0.6.4.oe
index e69de29bb2..cfa6474bbf 100644
--- a/ifupdown/ifupdown_0.6.4.oe
+++ b/ifupdown/ifupdown_0.6.4.oe
@@ -0,0 +1,29 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+DESCRIPTION = High level tools to configure network interfaces\
+ This package provides the tools ifup and ifdown which may be used to\
+ configure (or, respectively, deconfigure) network interfaces, based on\
+ the file /etc/network/interfaces.
+
+SRC_URI = ${DEBIAN_MIRROR}/main/i/${PN}/${PN}_${PV}.orig.tar.gz \
+	  ${DEBIAN_MIRROR}/main/i/${PN}/${PN}_${PV}-4.6.diff.gz;patch=1 \
+	  file://${FILESDIR}/busybox.patch;patch=1 \
+	  file://${FILESDIR}/udhcpc.patch;patch=1 \
+	  file://${FILESDIR}/zeroconf.patch;patch=1
+
+EXTRA_OEMAKE = 
+
+do_compile () {
+	chmod a+rx *.pl *.sh
+	oe_runmake 'CC=${CC}' "CFLAGS=${CFLAGS} -Wall -W -D'IFUPDOWN_VERSION=\"0.6.4\"'"
+}
+
+do_install () {
+	install -d ${D}/etc/init.d \
+		   ${D}/etc/network \
+		   ${D}/sbin
+	install -m 0755 ifup ${D}/sbin/
+	ln ${D}/sbin/ifup ${D}/sbin/ifdown
+	install -m 0644 ${FILESDIR}/init ${D}/etc/init.d/networking
+	install -m 0644 ${FILESDIR}/interfaces ${D}/etc/network/interfaces
+}
diff --git a/irda-utils/irda-utils_0.9.15.oe b/irda-utils/irda-utils_0.9.15.oe
index e2e90c8192..0a314164e0 100644
--- a/irda-utils/irda-utils_0.9.15.oe
+++ b/irda-utils/irda-utils_0.9.15.oe
@@ -6,7 +6,6 @@ DESCRIPTION = Provides common files needed to use IrDA.\
 
 SRC_URI = ${SOURCEFORGE_MIRROR}/irda/${P}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools libtool
 
diff --git a/less/less_381.oe b/less/less_381.oe
index de2c7f68fe..8d01ac9a26 100644
--- a/less/less_381.oe
+++ b/less/less_381.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6 libncurses5
 
 SRC_URI := ${GNU_MIRROR}/less/less-381.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/libgcrypt/libgcrypt_1.1.12.oe b/libgcrypt/libgcrypt_1.1.12.oe
index e69de29bb2..fa6f246b70 100644
--- a/libgcrypt/libgcrypt_1.1.12.oe
+++ b/libgcrypt/libgcrypt_1.1.12.oe
@@ -0,0 +1,26 @@
+SECTION="libs"
+PRIORITY="optional"
+RDEPENDS="libc6"
+SECTION="libs"
+DEPENDS=virtual/libc
+PROVIDES=virtual/libgcrypt
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/${PN}-${PV}.tar.gz"
+
+inherit autotools libtool
+
+do_stage () {
+	install -m 0644 src/.libs/libgcrypt.a ${STAGING_LIBDIR}/
+	install -m 0755 src/.libs/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/
+
+	ln -sf ${STAGING_LIBDIR}/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/libgcrypt.so.1.5
+	ln -sf ${STAGING_LIBDIR}/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/libgcrypt.so.1
+	ln -sf ${STAGING_LIBDIR}/libgcrypt.so.1.5.1 ${STAGING_LIBDIR}/libgcrypt.so
+
+	install -d ${STAGING_DIR}/target/include/
+	for X in gcrypt.h
+	do
+		install -m 0644 src/${X} ${STAGING_DIR}/target/include/${X}
+	done
+
+}
diff --git a/libpng/libpng_1.2.5.oe b/libpng/libpng_1.2.5.oe
index e69de29bb2..c0a89a20d5 100644
--- a/libpng/libpng_1.2.5.oe
+++ b/libpng/libpng_1.2.5.oe
@@ -0,0 +1,39 @@
+DESCRIPTION="PNG Library"
+SECTION="libs"
+PRIORITY="required"
+MAINTAINER="Chris Larson <kergoth@handhelds.org>"
+DEPENDS=virtual/libc base/zlib
+RDEPENDS="libc6 zlib1g"
+RDEPENDS_append_libpng3=' libpng12'
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/png-mng/${P}.tar.bz2
+
+EXTRA_OEMAKE_append=' ZLIBINC=${STAGING_DIR}/target/include ZLIBLIB=${STAGING_LIBDIR}'
+
+do_compile() {
+	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
+	unset LDFLAGS
+	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+		   'ZLIBINC=${STAGING_DIR}/target/include' \
+		   'ZLIBLIB=${STAGING_LIBDIR}'
+}
+
+do_stage() {
+	install -m 644 -D png.h ${STAGING_DIR}/target/include/png.h
+	install -m 644 -D pngconf.h ${STAGING_DIR}/target/include/pngconf.h
+	install -m 755 -D libpng12.so.0.${PV} ${STAGING_LIBDIR}/libpng12.so.0.${PV}
+	ln -sf ./libpng12.so.0.${PV} ${STAGING_LIBDIR}/libpng12.so.0
+	ln -sf ./libpng12.so.0.${PV} ${STAGING_LIBDIR}/libpng12.so
+	ln -sf ./libpng12.so ${STAGING_LIBDIR}/libpng.so.3
+	ln -sf ./libpng12.so ${STAGING_LIBDIR}/libpng.so
+}
+
+do_install () {
+	install -d ${D}/${bindir} ${D}/${mandir} \
+		   ${D}/${libdir} ${D}/${includedir}
+	unset LDFLAGS
+	oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
+		   'DB=${D}/${bindir}' 'DI=${D}/${includedir}' \
+		   'DL=${D}/${libdir}' 'DM=${D}/${mandir}' \
+		   install
+}
diff --git a/links/links_2.1pre12.oe b/links/links_2.1pre12.oe
index e69de29bb2..0b306ec920 100644
--- a/links/links_2.1pre12.oe
+++ b/links/links_2.1pre12.oe
@@ -0,0 +1,13 @@
+DEPENDS = virtual/libc jpeg libpng gpm flex openssl zlib
+RDEPENDS = libc6 libjpeg libpng gpm openssl zlib1g
+
+SRC_URI = http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/download/links-2.1pre12.tar.bz2 \
+	  file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF = '--enable-javascript --with-libfl --enable-graphics \
+	        --with-ssl=${STAGING_DIR}/target --with-libjpeg \
+	        --without-libtiff --without-svgalib --without-x --with-fb \
+	        --without-directfb --without-pmshell --without-atheos \
+	        --without-x'
diff --git a/mailutils/mailutils_0.3.1.oe b/mailutils/mailutils_0.3.1.oe
index d207b3a6c4..cc4f55d5f0 100644
--- a/mailutils/mailutils_0.3.1.oe
+++ b/mailutils/mailutils_0.3.1.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6
 
 SRC_URI := ${GNU_MIRROR}/mailutils/mailutils-0.3.1.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/make/make_3.80.oe b/make/make_3.80.oe
index e69de29bb2..94e3322e39 100644
--- a/make/make_3.80.oe
+++ b/make/make_3.80.oe
@@ -0,0 +1,6 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI := ${GNU_MIRROR}/make/make-3.80.tar.bz2
+
+inherit autotools
diff --git a/man-pages/man-pages_1.60.oe b/man-pages/man-pages_1.60.oe
index e69de29bb2..ccc7785a41 100644
--- a/man-pages/man-pages_1.60.oe
+++ b/man-pages/man-pages_1.60.oe
@@ -0,0 +1,13 @@
+SRC_URI = http://www.kernel.org/pub/linux/docs/manpages/man-pages-1.60.tar.bz2
+
+EXTRA_OEMAKE=
+do_compile () {
+	true
+}
+
+do_install () {
+	oe_runmake 'prefix=${D}' install
+}
+
+PACKAGES=${PN}
+FILES_${PN}=*
diff --git a/man/man_1.5m2.oe b/man/man_1.5m2.oe
index e69de29bb2..8f69a21ec6 100644
--- a/man/man_1.5m2.oe
+++ b/man/man_1.5m2.oe
@@ -0,0 +1,23 @@
+SRC_URI := ftp://ftp.kernel.org/pub/linux/utils/man/man-1.5m2.tar.bz2
+
+EXTRA_OEMAKE=
+GS = -DGREPSILENT=\"q\"
+DEFS = -DUSG -DDO_COMPRESS ${GS}
+
+do_configure() {
+	./configure -d -confdir ${sysconfdir}
+}
+
+do_compile() {
+	(cd src; ${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+		makemsg.c -o makemsg)
+	oe_runmake 'DEFS=${DEFS}'
+}
+
+do_install() {
+	oe_runmake 'PREFIX=${D}' install
+}
+
+FILES_${PN}=${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
+	    ${libdir}/*/ ${sysconfdir} ${sharedstatedir} ${localstatedir} \
+	    /bin /sbin /lib/*/ /lib/*.so*
diff --git a/modutils/modutils_2.4.25.oe b/modutils/modutils_2.4.25.oe
index d0eb7827ce..44fe488c87 100644
--- a/modutils/modutils_2.4.25.oe
+++ b/modutils/modutils_2.4.25.oe
@@ -1,7 +1,6 @@
 SRC_URI = ftp://ftp.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2 \
 	  file://${FILESDIR}/modutils-notest.patch;patch=1 \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/mp3blaster/mp3blaster_3.1.3.oe b/mp3blaster/mp3blaster_3.1.3.oe
index e731850f09..2bdc3dc0d3 100644
--- a/mp3blaster/mp3blaster_3.1.3.oe
+++ b/mp3blaster/mp3blaster_3.1.3.oe
@@ -4,7 +4,6 @@ RDEPENDS = libc6 libncurses
 SRC_URI = http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-3.1.3.tar.gz \
 	  file://${FILESDIR}/includedir.patch;patch=1 \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/nano/nano_1.2.1.oe b/nano/nano_1.2.1.oe
index 4194e508bc..7590590062 100644
--- a/nano/nano_1.2.1.oe
+++ b/nano/nano_1.2.1.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6 libncurses5
 
 SRC_URI := ${GNU_MIRROR}/nano/nano-1.2.1.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/ncftp/ncftp_3.1.6.oe b/ncftp/ncftp_3.1.6.oe
index 0c42165ce3..633481d928 100644
--- a/ncftp/ncftp_3.1.6.oe
+++ b/ncftp/ncftp_3.1.6.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6
 
 SRC_URI := ftp://ftp.ncftp.com/ncftp/ncftp-3.1.6-src.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/ncurses/ncurses_4.2.oe b/ncurses/ncurses_4.2.oe
index e69de29bb2..706691bedf 100644
--- a/ncurses/ncurses_4.2.oe
+++ b/ncurses/ncurses_4.2.oe
@@ -0,0 +1,40 @@
+DESCRIPTION="Ncurses library"
+SECTION="libs"
+DEPENDS=virtual/libc
+SRC_URI = ${GNU_MIRROR}/ncurses/${P}.tar.gz \
+	  file://${FILESDIR}/mk_shared_lib.patch;patch=1 \
+	  file://${FILESDIR}/run_tic.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF=--with-shared \
+	     --without-profile \
+	     --without-debug \
+	     --disable-rpath \
+	     --enable-echo \
+	     --enable-const \
+	     --without-ada \
+	     --enable-termcap \
+	     --without-cxx-binding \
+	     --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo \
+	     --enable-overwrite
+export HOSTCCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
+export HOSTLDFLAGS=
+export LD := ${CC}
+
+do_compile () {
+	oe_runmake -C progs 'HOSTCC=${BUILD_CC}' 'HOSTLDFLAGS=' \
+		   'HOSTCCFLAGS=${HOSTCCFLAGS}' 'CC=${BUILD_CC}' \
+		   'LINK=${BUILD_CXX}' 'CFLAGS=${HOSTCCFLAGS}' \
+		   'LDFLAGS=-lncurses' tic
+	oe_runmake 'HOSTCC=${HOSTCC}' 'HOSTLDFLAGS=' 'HOSTCCFLAGS=${HOSTCCFLAGS}'
+}
+
+do_stage () {
+	install -m 0755 lib/lib*.so.* ${STAGING_LIBDIR}/
+	cp -R include/* ${STAGING_DIR}/target/include/
+	ln -sf libpanel.so.${PV} ${STAGING_LIBDIR}/libpanel.so
+	ln -sf libform.so.${PV} ${STAGING_LIBDIR}/libform.so
+	ln -sf libmenu.so.${PV} ${STAGING_LIBDIR}/libmenu.so
+	ln -sf libncurses.so.${PV} ${STAGING_LIBDIR}/libncurses.so
+}
diff --git a/netkit-base/netkit-base_0.17.oe b/netkit-base/netkit-base_0.17.oe
index ad777430c0..6b567961d9 100644
--- a/netkit-base/netkit-base_0.17.oe
+++ b/netkit-base/netkit-base_0.17.oe
@@ -1,7 +1,6 @@
 SRC_URI = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1 \
 	  file://${FILESDIR}/mconfig.patch;patch=1
-S = ${WORKDIR}/${P}
 
 EXTRA_OEMAKE = -C inetd
 do_compile () {
diff --git a/netkit-ftp/netkit-ftp_0.17.oe b/netkit-ftp/netkit-ftp_0.17.oe
index e69de29bb2..c1253248dd 100644
--- a/netkit-ftp/netkit-ftp_0.17.oe
+++ b/netkit-ftp/netkit-ftp_0.17.oe
@@ -0,0 +1,12 @@
+SRC_URI = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz \
+	  file://${FILESDIR}/mconfig.patch;patch=1
+
+EXTRA_OEMAKE =
+do_compile () {
+	oe_runmake 'CC=${CC}' 'LD=${LD}' all
+}
+
+do_install () {
+	install -d ${D}/${bindir}
+	install -m 0755 ftp/ftp ${D}/${bindir}
+}
diff --git a/ntp/ntp_4.1.2.oe b/ntp/ntp_4.1.2.oe
index aafe8d3e14..40854e1ba4 100644
--- a/ntp/ntp_4.1.2.oe
+++ b/ntp/ntp_4.1.2.oe
@@ -2,7 +2,6 @@ DEPENDS = virtual/libc openssl
 
 SRC_URI = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/openobex-apps/openobex-apps_1.0.0.oe b/openobex-apps/openobex-apps_1.0.0.oe
index e69de29bb2..04c5c64b8d 100644
--- a/openobex-apps/openobex-apps_1.0.0.oe
+++ b/openobex-apps/openobex-apps_1.0.0.oe
@@ -0,0 +1,16 @@
+DEPENDS = virtual/libc openobex
+RDEPENDS = libc6 libopenobex1
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz
+
+inherit autotools libtool
+
+EXTRA_OECONF = --disable-glibtest --with-glib-prefix=${STAGING_DIR}/target
+export OPENOBEX_CFLAGS=-I${STAGING_DIR}/target/include
+export OPENOBEX_CONFIG = ${STAGING_BINDIR}/openobex-config \
+			 --prefix=${STAGING_DIR}/target \
+			 --exec-prefix=${STAGING_DIR}/target
+
+do_compile () {
+	oe_runmake 'INCLUDES='
+}
diff --git a/openobex/openobex_1.0.0.oe b/openobex/openobex_1.0.0.oe
index b0d821a7af..83ca382bd4 100644
--- a/openobex/openobex_1.0.0.oe
+++ b/openobex/openobex_1.0.0.oe
@@ -2,7 +2,6 @@ DEPENDS = virtual/libc
 RDEPENDS = libc6
 
 SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz
-S = ${WORKDIR}/${P}
 
 inherit autotools libtool
 
diff --git a/openssh/openssh_3.7.1p1.oe b/openssh/openssh_3.7.1p1.oe
index 3c534d1334..e55c958cc8 100644
--- a/openssh/openssh_3.7.1p1.oe
+++ b/openssh/openssh_3.7.1p1.oe
@@ -12,7 +12,6 @@ DESCRIPTION = Secure rlogin/rsh/rcp/telnet replacement (OpenSSH)\
 SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1 \
 	  file://${FILESDIR}/scp-nossl.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/openssh/openssh_3.7.1p2.oe b/openssh/openssh_3.7.1p2.oe
index 3c534d1334..e55c958cc8 100644
--- a/openssh/openssh_3.7.1p2.oe
+++ b/openssh/openssh_3.7.1p2.oe
@@ -12,7 +12,6 @@ DESCRIPTION = Secure rlogin/rsh/rcp/telnet replacement (OpenSSH)\
 SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
 	  file://${FILESDIR}/configure.patch;patch=1 \
 	  file://${FILESDIR}/scp-nossl.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/pkgconfig/pkgconfig_0.15.0.oe b/pkgconfig/pkgconfig_0.15.0.oe
index 185a38838e..d4e3356eb6 100644
--- a/pkgconfig/pkgconfig_0.15.0.oe
+++ b/pkgconfig/pkgconfig_0.15.0.oe
@@ -3,7 +3,6 @@ RDEPENDS = libc6
 
 SRC_URI := http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz \
 	   file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/${P}
 
 inherit autotools libtool
 
diff --git a/regex-markup/regex-markup_0.9.0.oe b/regex-markup/regex-markup_0.9.0.oe
index e69de29bb2..3b521b920d 100644
--- a/regex-markup/regex-markup_0.9.0.oe
+++ b/regex-markup/regex-markup_0.9.0.oe
@@ -0,0 +1,13 @@
+DESCRIPTION = Regex-markup performs regular expression-based text \
+markup according to used-defined rules. This can be used to color \
+syslog files as well as the output of programs such as ping, traceroute, \
+gcc etc. The hierarchal rules-format is simple to understand, yet very \
+powerful. Regex-markup is written entirely in C, and uses POSIX regular \
+expressions to do much of its work.
+
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = http://www.student.lu.se/~nbi98oli/src/regex-markup-0.9.0.tar.gz
+
+inherit autotools
diff --git a/resolvconf/resolvconf_1.2.oe b/resolvconf/resolvconf_1.2.oe
index e69de29bb2..5403ccd45a 100644
--- a/resolvconf/resolvconf_1.2.oe
+++ b/resolvconf/resolvconf_1.2.oe
@@ -0,0 +1,16 @@
+SRC_URI := ${DEBIAN_MIRROR}/main/r/${PN}/${PN}_${PV}.tar.gz
+
+do_compile () {
+	oenote "Nothing to compile"
+}
+
+do_install () {
+	install -d ${D}/${sysconfdir} ${D}/${sbindir} ${D}/sbin ${D}/var/run/resolvconf/interface
+	install -d ${D}/${datadir}/doc/${P}
+	install -d ${D}/${mandir}/man8
+	cp -a etc/* ${D}/${sysconfdir}/
+	cp -a sbin/* ${D}/sbin/
+	cp -a usr/* ${D}/${prefix}/
+	install debian/README debian/ANNOUNCE ${D}/${datadir}/doc/${P}/
+	install man/resolvconf.8 man/update-resolv.8 ${D}/${mandir}/man8/
+}
diff --git a/screen/screen_3.9.15.oe b/screen/screen_3.9.15.oe
index e69de29bb2..b1912ee82f 100644
--- a/screen/screen_3.9.15.oe
+++ b/screen/screen_3.9.15.oe
@@ -0,0 +1,9 @@
+DEPENDS = virtual/libc ncurses
+RDEPENDS = libc6 libncurses5
+
+SRC_URI := ${GNU_MIRROR}/screen/screen-3.9.15.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5"
diff --git a/screen/screen_4.0.1.oe b/screen/screen_4.0.1.oe
index e69de29bb2..71e491e444 100644
--- a/screen/screen_4.0.1.oe
+++ b/screen/screen_4.0.1.oe
@@ -0,0 +1,9 @@
+DEPENDS = virtual/libc ncurses
+RDEPENDS = libc6 libncurses5
+
+SRC_URI := ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.1.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5"
diff --git a/tinylogin/tinylogin_1.4.oe b/tinylogin/tinylogin_1.4.oe
index e91e4dea04..4d6bc012f7 100644
--- a/tinylogin/tinylogin_1.4.oe
+++ b/tinylogin/tinylogin_1.4.oe
@@ -1,5 +1,4 @@
 SRC_URI = http://tinylogin.busybox.net/downloads/${P}.tar.bz2
-S = ${WORKDIR}/${P}
 
 EXTRA_OEMAKE =
 
diff --git a/units/units_1.80.oe b/units/units_1.80.oe
index 1991ff9954..e4c7d71bd3 100644
--- a/units/units_1.80.oe
+++ b/units/units_1.80.oe
@@ -4,7 +4,6 @@ RDEPENDS = libc6
 SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz \
 	  file://${FILESDIR}/units.c.patch;patch=1 \
 	  file://${FILESDIR}/makefile.patch;patch=1
-S = ${WORKDIR}/${P}
 
 inherit autotools
 
diff --git a/util-linux/util-linux_2.12.oe b/util-linux/util-linux_2.12.oe
index e69de29bb2..65fb74e964 100644
--- a/util-linux/util-linux_2.12.oe
+++ b/util-linux/util-linux_2.12.oe
@@ -0,0 +1,19 @@
+DEPENDS=virtual/libc zlib ncurses
+
+SRC_URI := http://ftp.cwi.nl/aeb/util-linux/util-linux-2.12.tar.gz
+
+EXTRA_OEMAKE=
+do_compile () {
+	set -e
+	install ${FILESDIR}/MCONFIG ${S}/MCONFIG
+	install ${FILESDIR}/make_include ${S}/make_include
+	install ${FILESDIR}/swapargs.h ${S}/mount/swapargs.h
+	install ${FILESDIR}/defines.h ${S}/defines.h
+	oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
+		'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
+		'LDFLAGS=${LDFLAGS}'
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/zcip/zcip_4.oe b/zcip/zcip_4.oe
index e69de29bb2..89218f34c9 100644
--- a/zcip/zcip_4.oe
+++ b/zcip/zcip_4.oe
@@ -0,0 +1,17 @@
+DEPENDS = virtual/libc libpcap libnet-1.0.2a
+RDEPENDS = libc6
+
+SRC_URI := ${SOURCEFORGE_MIRROR}/zeroconf/zcip-4.tar.gz \
+	   file://${FILESDIR}/compile.patch;patch=1 \
+	   file://${FILESDIR}/linux-types.patch;patch=1 \
+	   file://${FILESDIR}/char-signed-idiocy.patch;patch=1
+
+CPPFLAGS_append = " -DLIBNET_LIL_ENDIAN"
+do_compile () {
+	oe_runmake 'LIBS=${STAGING_LIBDIR}/libpcap.a ${STAGING_LIBDIR}/libnet.a'
+}
+
+do_install () {
+	install -d ${D}/${sbindir}
+	install -m 0744 make-arp zcip ${D}/${sbindir}/
+}