Merge direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/paths

into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages

2004/01/13 11:10:14-06:00 ti.com!kergoth
Merge openembedded@openembedded.bkbits.net:packages
into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/paths

2004/01/13 10:56:32-06:00 ti.com!kergoth
Remove hardcoded references to target paths in a number of packages, replacing them with the use of our target path variables.

2004/01/13 17:40:06+01:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/oe-packages

2004/01/13 14:24:53+01:00 uni-frankfurt.de!mickeyl
add pyserial and sgmlop to buildsystem

BKrev: 40042712PUToOUzefh1XdY4q23VfEA

46 files changed, 541 insertions, 56 deletions

diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index e76e4dd028..07ac0799ae 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -43,13 +43,12 @@ do_install() {
     install -d ${D}/${sbindir}
     install -d ${D}/${bindir}
     install -d ${D}/${libdir}
-    install -d ${D}/usr/share
-    install -d ${D}/usr/share/apmd
+    install -d ${D}/${datadir}/apmd
     install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig
     install -m 0755 ${FILESDIR}/apmwrapper ${D}/${bindir}/apm
     install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd
     install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/
-    install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/usr/share/apmd/
+    install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
     install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
     install -m 0755 .libs/libapm.so.1.0.0 ${D}/${libdir}
     ln -sf ./libapm.so.1.0.0 ${D}/${libdir}/libapm.so.1.0
diff --git a/base-files/base-files_3.0.12.oe b/base-files/base-files_3.0.12.oe
index 55478e99c2..2117df257b 100644
--- a/base-files/base-files_3.0.12.oe
+++ b/base-files/base-files_3.0.12.oe
@@ -3,7 +3,7 @@ SRC_URI := ${DEBIAN_MIRROR}/main/b/base-files/base-files_3.0.12.tar.gz
 docdir_append=/${P}
 do_install () {
 	install -d ${D}/${docdir}
-	install -d ${D}/usr/share/${PN}
+	install -d ${D}${datadir}/${PN}
 	install -p -m 644 debian/changelog debian/FAQ \
 		debian/README.FHS debian/README.base ${D}/${docdir}/
 	cat debian/copyright.in | sed -e "s&#OSNAME#&${TARGET_OS}&g" \
@@ -12,14 +12,14 @@ do_install () {
 #	cd debian && install -m 755 preinst postinst ${D}/DEBIAN
 #	cd debian && install -m 644 conffiles ${D}/DEBIAN
 	( cd ${D} && install -d `cat ${S}/debian/directory-list` )
-	install -p -m 644 share/* ${D}/usr/share/base-files
-	install -p -m 644 licenses/* ${D}/usr/share/common-licenses
-	ln -s LGPL-2.1 ${D}/usr/share/common-licenses/LGPL
-	ln -s GPL-2    ${D}/usr/share/common-licenses/GPL
+	install -p -m 644 share/* ${D}${datadir}/base-files
+	install -p -m 644 licenses/* ${D}${datadir}/common-licenses
+	ln -s LGPL-2.1 ${D}${datadir}/common-licenses/LGPL
+	ln -s GPL-2    ${D}${datadir}/common-licenses/GPL
 	install -p -m 644 `ls etc/|grep -v debian` ${D}/etc
 	rm -f ${D}/etc/motd
-	cat etc/motd | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}/usr/share/base-files/motd
-	cat share/info.dir | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}/usr/share/base-files/info.dir
+	cat etc/motd | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/motd
+	cat share/info.dir | sed -e "s&#OSNAME#&${TARGET_OS}&g" > ${D}${datadir}/base-files/info.dir
 	gzip -9 ${docdir}/changelog
 #	chown -R root:root ${D}
 #	cd ${D} && chown root:src     usr/src
diff --git a/binutils/binutils-cross_2.14.90.0.6.oe b/binutils/binutils-cross_2.14.90.0.6.oe
index 7d5e9967e3..c898d7010f 100644
--- a/binutils/binutils-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-cross_2.14.90.0.6.oe
@@ -14,9 +14,9 @@ do_stage () {
 	rm -rf ${CROSS_DIR}/share/locale
 	rm -rf ${CROSS_DIR}/share/man
 	rmdir ${CROSS_DIR}/share || :
-	rmdir ${CROSS_DIR}/usr/lib/gcc-lib || :
-	rmdir ${CROSS_DIR}/usr/lib || :
-	rmdir ${CROSS_DIR}/usr || :
+	rmdir ${CROSS_DIR}/${libdir}/gcc-lib || :
+	rmdir ${CROSS_DIR}/${libdir} || :
+	rmdir ${CROSS_DIR}/${prefix} || :
 
 	# We want to move this into the target specific location
 	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
diff --git a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
index 6648d5d267..7f7b696d38 100644
--- a/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
+++ b/binutils/binutils-uclibc-cross_2.14.90.0.6.oe
@@ -14,9 +14,9 @@ do_stage () {
 	rm -rf ${CROSS_DIR}/share/locale
 	rm -rf ${CROSS_DIR}/share/man
 	rmdir ${CROSS_DIR}/share || :
-	rmdir ${CROSS_DIR}/usr/lib/gcc-lib || :
-	rmdir ${CROSS_DIR}/usr/lib || :
-	rmdir ${CROSS_DIR}/usr || :
+	rmdir ${CROSS_DIR}${libdir}/gcc-lib || :
+	rmdir ${CROSS_DIR}${libdir} || :
+	rmdir ${CROSS_DIR}${prefix} || :
 
 	# We want to move this into the target specific location
 	mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib
diff --git a/dropbear/dropbear_0.36.oe b/dropbear/dropbear_0.36.oe
index 6bda95d4dc..f837b3b2fd 100644
--- a/dropbear/dropbear_0.36.oe
+++ b/dropbear/dropbear_0.36.oe
@@ -10,5 +10,5 @@ inherit autotools
 CFLAGS_append = " -I${S}/libtomcrypt"
 LD=${CC}
 do_install_prepend () {
-	install -d ${D}/usr/sbin ${D}/usr/bin
+	install -d ${D}${sbindir} ${D}${bindir}
 }
diff --git a/dropbear/dropbear_0.38.oe b/dropbear/dropbear_0.38.oe
index e69de29bb2..f837b3b2fd 100644
--- a/dropbear/dropbear_0.38.oe
+++ b/dropbear/dropbear_0.38.oe
@@ -0,0 +1,14 @@
+DESCRIPTION="Dropbear SSH Implementation"
+LICENSE="MIT"
+DEPENDS=virtual/libc zlib ncurses
+
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2"
+S="${WORKDIR}/${P}"
+
+inherit autotools
+
+CFLAGS_append = " -I${S}/libtomcrypt"
+LD=${CC}
+do_install_prepend () {
+	install -d ${D}${sbindir} ${D}${bindir}
+}
diff --git a/flite/flite_1.2.oe b/flite/flite_1.2.oe
index e69de29bb2..b0d296ba89 100644
--- a/flite/flite_1.2.oe
+++ b/flite/flite_1.2.oe
@@ -0,0 +1,16 @@
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6
+DEPENDS=virtual/libc
+
+SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.2/flite-${PV}-release.tar.bz2
+S=${WORKDIR}/flite-${PV}-release
+
+inherit autotools libtool
+
+EXTRA_OECONF="--enable-shared"
+
+do_install() {
+        oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install
+}
+
diff --git a/freeswan/freeswan_2.0.4.oe b/freeswan/freeswan_2.0.4.oe
index e69de29bb2..031e31f017 100644
--- a/freeswan/freeswan_2.0.4.oe
+++ b/freeswan/freeswan_2.0.4.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = FreeS/WAN IPSEC
+DEPENDS = virtual/libc gmp
+RDEPENDS = libc6 gmp
+
+SRC_URI = ftp://ftp.xs4all.nl/pub/crypto/freeswan/freeswan-2.04.tar.gz \
+	  file://${FILESDIR}/pathnames.patch;patch=1 \
+	  file://${FILESDIR}/flags.patch;patch=1
+
+S = "${WORKDIR}/freeswan-2.04"
+
+do_compile () {
+	oe_runmake INC_USRLOCAL=${prefix} 'CFLAGS=${CFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}' programs
+}
+
+do_install () {
+	install -d ${D}/${sysconfdir}/init.d
+	oe_runmake INC_USRLOCAL=${prefix} DESTDIR=${D} install
+}
diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe
index 780540331d..f98469d6e5 100644
--- a/freetype/freetype_2.1.7.oe
+++ b/freetype/freetype_2.1.7.oe
@@ -30,7 +30,7 @@ do_stage () {
 	install -d ${STAGING_INCDIR}/freetype2
 	cp -a include/freetype ${STAGING_INCDIR}/freetype2/
 
-	sed -e 's,/usr,${STAGING_DIR}/target,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
+	sed -e 's,${prefix},${STAGING_DIR}/target,' < builds/unix/freetype-config > ${STAGING_BINDIR}/freetype-config
 	chmod u+x ${STAGING_BINDIR}/freetype-config
 }
 
diff --git a/frotz/frotz_2.42.oe b/frotz/frotz_2.42.oe
index b133d33173..327fa3d690 100644
--- a/frotz/frotz_2.42.oe
+++ b/frotz/frotz_2.42.oe
@@ -9,12 +9,12 @@ do_configure() {
 }
 
 
-EXTRA_OEMAKE=CC="${CC}" INCL="${CFLAGS}" LIB="${LDFLAGS}" PREFIX=/usr CONFIG_DIR=/etc 
+EXTRA_OEMAKE=CC="${CC}" INCL="${CFLAGS}" LIB="${LDFLAGS}" PREFIX=${prefix} CONFIG_DIR=${sysconfdir}
 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
+    oe_runmake PREFIX=${D}${prefix} MAN_PREFIX=${D}${mandir} install
 }
diff --git a/gcc/gcc-uclibc_3.3.2.oe b/gcc/gcc-uclibc_3.3.2.oe
index bfa276b1c4..0acd355ab0 100644
--- a/gcc/gcc-uclibc_3.3.2.oe
+++ b/gcc/gcc-uclibc_3.3.2.oe
@@ -33,7 +33,7 @@ SRC_URI_append = " file://${FILESDIR}/gcc-001-disable-mathf.patch;patch=1 \
                    file://${FILESDIR}/gcc-006-include-search.patch;patch=1 \
                    file://${FILESDIR}/gcc-810-libstd++-locale.patch;patch=1"
 
-EXTRA_OECONF := --with-local-prefix=/usr/local \
+EXTRA_OECONF := --with-local-prefix=${prefix}/local \
                 --with-gxx-include-dir=${includedir}/c++/${PV}-uclibc \
                 --enable-target-optspace \
                 --disable-nls \
diff --git a/gcc/gcc_3.3.2.oe b/gcc/gcc_3.3.2.oe
index 11c3aff1b4..946a673853 100644
--- a/gcc/gcc_3.3.2.oe
+++ b/gcc/gcc_3.3.2.oe
@@ -68,7 +68,7 @@ SRC_URI := http://gcc.get-software.com/releases/gcc-${PV}/gcc-${PV}.tar.bz2
 S := ${WORKDIR}/gcc-${PV}
 B := ${S}/build.${HOST_SYS}.${TARGET_SYS}
 
-EXTRA_OECONF := --with-local-prefix=/usr/local \
+EXTRA_OECONF := --with-local-prefix=${prefix}/local \
                 --with-gxx-include-dir=${includedir}/c++/${PV} \
                 --enable-target-optspace \
                 --disable-nls \
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index f501389188..e98f7e8cc5 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -70,7 +70,6 @@ SRC_URI = ftp://ftp.gnu.org/gnu/glibc/glibc-2.3.2.tar.gz \
 
 S="${WORKDIR}/${P}"
 B="${WORKDIR}/build-${TARGET_SYS}"
-prefix=/usr
 libdir=/lib
 bindir=/bin
 sbindir=/sbin
diff --git a/ipkg-utils/ipkg-utils_1.0cvs.oe b/ipkg-utils/ipkg-utils_1.0cvs.oe
index e69de29bb2..2c780ca367 100644
--- a/ipkg-utils/ipkg-utils_1.0cvs.oe
+++ b/ipkg-utils/ipkg-utils_1.0cvs.oe
@@ -0,0 +1,21 @@
+DESCRIPTION="Itsy Package Manager utilities"
+DEPENDS=""
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Chris Larson <kergoth@handhelds.org>"
+LICENSE="GPL"
+#DEPENDS=virtual/libc
+
+SRC_URI:="cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=ipkg-utils"
+S:="${WORKDIR}/${PN}"
+
+inherit autotools
+
+do_stage() {
+	cp ipkg* ${STAGING_BINDIR}/
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	cp ipkg* ${D}${bindir}/
+}
diff --git a/iptables/iptables_1.2.9.oe b/iptables/iptables_1.2.9.oe
index e69de29bb2..55af54b770 100644
--- a/iptables/iptables_1.2.9.oe
+++ b/iptables/iptables_1.2.9.oe
@@ -0,0 +1,17 @@
+DESCRIPTION = iptables network filtering tools
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = http://www.netfilter.org/files/iptables-1.2.9.tar.bz2
+
+S = "${WORKDIR}/iptables-1.2.9"
+
+do_compile () {
+	unset CFLAGS
+	oe_runmake PREFIX=${prefix}
+}
+
+do_install () {
+	unset CFLAGS
+	oe_runmake PREFIX=${prefix} DESTDIR=${D} install
+}
diff --git a/iputils/iputils_20020927.oe b/iputils/iputils_20020927.oe
index e69de29bb2..707ecc862c 100644
--- a/iputils/iputils_20020927.oe
+++ b/iputils/iputils_20020927.oe
@@ -0,0 +1,25 @@
+SRC_URI = http://www.tux.org/pub/people/alexey-kuznetsov/ip-routing/iputils-ss020927.tar.gz
+S = ${WORKDIR}/${PN}
+
+EXTRA_OEMAKE = 
+
+do_compile () {
+	oe_runmake 'CC=${CC}' \
+		   KERNEL_INCLUDE="${STAGING_DIR}/target/include" \
+		   LIBC_INCLUDE="${STAGING_DIR}/target/include"
+	oe_runmake -C doc 'CC=${CC}' \
+		   KERNEL_INCLUDE="${STAGING_DIR}/target/include" \
+		   LIBC_INCLUDE="${STAGING_DIR}/target/include"
+}
+
+do_install () {
+	install -d ${D}/bin ${D}${sbindir} \
+		   ${D}/${mandir}/man8 ${D}/${datadir}/doc/${P}
+	install -m 0755 ping ${D}/bin/
+	for f in ipg tracepath clockdiff rdisc arping \
+		tftpd rarpd tracepath6 traceroute6 ping6; do
+		install -m 0755 $f ${D}/${sbindir}/
+	done
+	install -m 0644 doc/*.8 ${D}/${mandir}/man8/
+	install -m 0644 doc/*.html ${D}/${datadir}/doc/${P}/
+}
diff --git a/irda-utils/irda-utils_0.9.15.oe b/irda-utils/irda-utils_0.9.15.oe
index 0a314164e0..632eafa33e 100644
--- a/irda-utils/irda-utils_0.9.15.oe
+++ b/irda-utils/irda-utils_0.9.15.oe
@@ -15,7 +15,7 @@ do_compile () {
 }
 
 do_install () {
-	install -d ${D}/usr/sbin
+	install -d ${D}${sbindir}
 	oe_runmake -C irattach ROOT="${D}" install
 	oe_runmake -C irdaping ROOT="${D}" install
 }
diff --git a/libdaemon/libdaemon_0.3.oe b/libdaemon/libdaemon_0.3.oe
index e69de29bb2..dc292df4b7 100644
--- a/libdaemon/libdaemon_0.3.oe
+++ b/libdaemon/libdaemon_0.3.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = libdaemon is a lightweight C library which eases the writing of UNIX daemons.
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz
+
+inherit autotools libtool
+
+EXTRA_OECONF = --disable-lynx
+
+do_stage () {
+	install -m 0755 src/.libs/libdaemon.so.0.1.0 ${STAGING_LIBDIR}/
+	install -m 0644 src/.libs/libdaemon.a ${STAGING_LIBDIR}/
+	install -m 0644 src/.libs/libdaemon.lai ${STAGING_LIBDIR}/libdaemon.la
+	ln -sf libdaemon.so.0.1.0 ${STAGING_LIBDIR}/libdaemon.so.0
+	ln -sf libdaemon.so.0.1.0 ${STAGING_LIBDIR}/libdaemon.so
+	install -d ${STAGING_INCDIR}/libdaemon
+	for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do
+		install -m 0644 src/$i ${STAGING_INCDIR}/libdaemon/
+	done
+}
diff --git a/libxine/libxine_1.6.0.oe b/libxine/libxine_1.6.0.oe
index e69de29bb2..310a7a44c6 100644
--- a/libxine/libxine_1.6.0.oe
+++ b/libxine/libxine_1.6.0.oe
@@ -0,0 +1,72 @@
+DESCRIPTION = "libxine"
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = virtual/libc zlib libogg tremor libmad
+RDEPENDS = libc6 zlib libogg tremor libmad 
+
+inherit autotools
+
+S = ${WORKDIR}/xine-lib
+
+SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine-1-beta12-release \
+        file://${FILESDIR}/full.patch;patch=1 \
+	file://${FILESDIR}/libvorbis.patch;patch=0 \
+        file://${FILESDIR}/demux_ogg.patch;patch=0 \
+        file://${FILESDIR}/configure.ac.patch;patch=0 \
+        file://${FILESDIR}/vo_scale.patch;patch=0"
+
+do_configure() {
+  ./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \
+        --enable-shared --disable-static --prefix=${prefix} \
+        --with-zlib-path=${STAGING_DIR} --with-vorbis-prefix=${STAGING_DIR} \
+        --disable-oggtest --with-ogg-prefix=${STAGING_DIR} --without-x \
+	--disable-iconv --disable-nls --without-arts --without-sdl \
+	--disable-aalib
+}
+
+do_compile() {
+  oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool
+}
+
+# ug - we don't do elegant/purdy today
+do_install() {
+  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+    -C src install-data \
+    'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+    'includedir=${D}/${includedir}'
+  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+    -C include install-data \
+    'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+    'includedir=${D}/${includedir}'
+  install -m 0755 -d ${D}/${libdir}/xine/plugins/1.0.0
+  for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+    dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
+    install -m 0755 $dso ${D}/${libdir}/xine/plugins/1.0.0
+  done
+  install -m 0755 src/xine-engine/.libs/libxine.so.${PV} ${D}${libdir}
+  ln -fs libxine.so.$PV ${D}${libdir}/libxine.so.1
+  ln -fs libxine.so.$PV ${D}${libdir}/libxine.so
+}
+
+do_stage() {
+  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+    -C src install-data \
+    'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+    'libdir=${STAGING_DIR}/target/lib' \
+    'includedir=${STAGING_DIR}/target/include'
+  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+    -C include install-data \
+    'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+    'libdir=${STAGING_DIR}/target/lib' \
+    'includedir=${STAGING_DIR}/target/include'
+  install -m 0755 -d ${STAGING_DIR}/target/lib/xine/plugins/1.0.0
+  for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+    dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
+    install -m 0755 $dso ${STAGING_DIR}/target/lib/xine/plugins/1.0.0
+  done
+  install -m 0755 src/xine-engine/.libs/libxine.so.${PV} \
+    ${STAGING_DIR}/target/lib
+  ln -fs libxine.so.$PV ${STAGING_DIR}/target/lib/libxine.so.1
+  ln -fs libxine.so.$PV ${STAGING_DIR}/target/lib/libxine.so
+}
diff --git a/mgetty/mgetty_1.1.30.oe b/mgetty/mgetty_1.1.30.oe
index e69de29bb2..51ea4e7790 100644
--- a/mgetty/mgetty_1.1.30.oe
+++ b/mgetty/mgetty_1.1.30.oe
@@ -0,0 +1,61 @@
+#SRC_URI = ftp://alpha.greenie.net/pub/mgetty/source/1.0/mgetty+sendfax-${PV}.tar.gz
+SRC_URI = ${DEBIAN_MIRROR}/main/m/mgetty/mgetty_${PV}.orig.tar.gz \
+	  file://${FILESDIR}/debian.patch;patch=1 \
+	  file://${FILESDIR}/00-g3_Makefile;patch=1 \
+	  file://${FILESDIR}/01-adjust-path;patch=1 \
+	  file://${FILESDIR}/02-pending-fix-includes;patch=1 \
+	  file://${FILESDIR}/03-callback_Makefile;patch=1 \
+	  file://${FILESDIR}/04-new_fax.pbm;patch=1 \
+	  file://${FILESDIR}/06-pending-contrib_g3tolj.c;patch=1 \
+	  file://${FILESDIR}/07-pending-contrib_g3toxwd.c;patch=1 \
+	  file://${FILESDIR}/09-doc_Makefile;patch=1 \
+	  file://${FILESDIR}/10-doc_faxrunqd.8in;patch=1 \
+	  file://${FILESDIR}/12-fax_faxrunqd.in;patch=1 \
+	  file://${FILESDIR}/13-fax_faxspool.in;patch=1 \
+	  file://${FILESDIR}/14-frontends_X11_viewfax-2.5_Makefile;patch=1 \
+	  file://${FILESDIR}/23-samples_new_fax.mime4;patch=1 \
+	  file://${FILESDIR}/24-voice_include_paths.h;patch=1 \
+	  file://${FILESDIR}/26-voice_libpvf_usr.c;patch=1 \
+	  file://${FILESDIR}/36-voice_voice.conf-dist;patch=1 \
+	  file://${FILESDIR}/37-Makefile;patch=1 \
+	  file://${FILESDIR}/39-mgetty.cfg.in;patch=1 \
+	  file://${FILESDIR}/40-locks.c_bug153394;patch=1 \
+	  file://${FILESDIR}/41-ugly-redo-ring.c_bug128668;patch=1 \
+	  file://${FILESDIR}/42-voice_libvoice_detect.c;patch=1 \
+	  file://${FILESDIR}/43-moreinfo-cnd.c_bug112163;patch=1 \
+	  file://${FILESDIR}/44-pending-faxexpand.h_bug169455;patch=1 \
+	  file://${FILESDIR}/45-logfile.c;patch=1 \
+	  file://${FILESDIR}/47-doc_mgetty.texi-in;patch=1 \
+	  file://${FILESDIR}/50-pending-voice-zoom-2949l-c;patch=1 \
+	  file://${FILESDIR}/51-pending-faxq-time;patch=1 \
+	  file://${FILESDIR}/52-pending-metamail;patch=1 \
+	  file://${FILESDIR}/install.patch;patch=1
+
+do_compile () {
+        cp ${FILESDIR}/policy.h ${FILESDIR}/voice-defs.h .
+	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \
+	-I.. -DBINDIR=\"${bindir}\" -DSBINDIR=\"${sbindir}\" \
+        -DLIBDIR=\"${libdir}/mgetty-fax\" \
+        -DCONFDIR=\"${sysconfdir}/mgetty\" \
+        -DFAX_SPOOL=\"/var/spool/fax\" \
+        -DFAX_SPOOL_IN=\"/var/spool/fax/incoming\" \
+        -DFAX_SPOOL_OUT=\"/var/spool/fax/outgoing\" \
+        -DFAX_OUT_USER=\"uucp\" \
+        -DVARRUNDIR=\"/var/run\" \
+        -DAWK=\"awk\" \
+        -DPERL=\""/usr/bin/perl -w"\" -DTKPERL=\"/usr/bin/tkperl\" \
+        -DECHO=\""echo -e"\" \
+        -DSHELL=\"/bin/bash\" \
+	-o mksed mksed.c
+	./mksed >sedscript
+	chmod u+x sedscript
+	oe_runmake
+	oe_runmake vgetty
+#        cd doc; $(MAKE) manpages mgetty.info $(GCC)
+#        cd contrib; $(MAKE) g3toxwd g3tolj
+#        cd $(VFDIR); $(MAKE)
+}
+
+do_install () {
+	oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/modplugplay/modplugplay_1.0.oe b/modplugplay/modplugplay_1.0.oe
index e69de29bb2..adfd380aa2 100644
--- a/modplugplay/modplugplay_1.0.oe
+++ b/modplugplay/modplugplay_1.0.oe
@@ -0,0 +1,17 @@
+DEPENDS = virtual/libc libmodplug
+RDEPENDS = libc6 libmodplug
+
+SRC_URI = http://www.linuks.mine.nu/modplugplay/${P}.tar.gz
+
+do_compile() {
+	${CC} -c ${CFLAGS} modplugplay.c -o modplugplay.o -I${STAGING_DIR}/target/include 
+	${CC} -o modplugplay modplugplay.o ${LDFLAGS} -L${STAGING_LIBDIR} -lmodplug
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${mandir}/man1
+        install -m 755 modplugplay ${D}${bindir}/
+        install -m 644 modplugplay.1 ${D}${mandir}/man1/
+}
+
diff --git a/mtd/mtd.oe b/mtd/mtd.oe
index 7f06163305..64b8116825 100644
--- a/mtd/mtd.oe
+++ b/mtd/mtd.oe
@@ -10,10 +10,10 @@ CPPFLAGS_prepend = "-I${S}/../include "
 CXXFLAGS_prepend = "-I${S}/../include "
 
 do_install () {
-	install -d ${D}/usr/bin
+	install -d ${D}${bindir}
 	for binary in ftl_format erase eraseall nanddump doc_loadbios \
 		mkfs.jffs ftl_check mkfs.jffs2 lock unlock einfo mtd_debug \
 		fcp nandwrite jffs2dump; do
-		install -m 0755 $binary ${D}/usr/bin/
+		install -m 0755 $binary ${D}${bindir}
 	done
 }
diff --git a/ncurses/ncurses_5.3.oe b/ncurses/ncurses_5.3.oe
index c7c895772f..49637fc6a4 100644
--- a/ncurses/ncurses_5.3.oe
+++ b/ncurses/ncurses_5.3.oe
@@ -23,7 +23,7 @@ EXTRA_OECONF=--with-shared \
 	     --without-ada \
 	     --enable-termcap \
 	     --without-cxx-binding \
-	     --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo \
+	     --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
 	     --enable-overwrite
 export BUILD_CC := ${BUILD_CC}
 export BUILD_CCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
diff --git a/openssh/openssh_3.7.1p1.oe b/openssh/openssh_3.7.1p1.oe
index e55c958cc8..7e7108e9b0 100644
--- a/openssh/openssh_3.7.1p1.oe
+++ b/openssh/openssh_3.7.1p1.oe
@@ -15,8 +15,8 @@ SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.g
 
 inherit autotools
 
-export sysconfdir = /etc/ssh
-export ASKPASS_PROGRAM = /usr/bin/ssh-askpass
+sysconfdir_append=/ssh
+export ASKPASS_PROGRAM = ${bindir}/ssh-askpass
 export LD = ${CC}
 CFLAGS_prepend = "-I${S} "
 CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
diff --git a/openssh/openssh_3.7.1p2.oe b/openssh/openssh_3.7.1p2.oe
index e55c958cc8..b97e80e597 100644
--- a/openssh/openssh_3.7.1p2.oe
+++ b/openssh/openssh_3.7.1p2.oe
@@ -15,8 +15,8 @@ SRC_URI = ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.g
 
 inherit autotools
 
-export sysconfdir = /etc/ssh
-export ASKPASS_PROGRAM = /usr/bin/ssh-askpass
+sysconfdir_append = /ssh
+export ASKPASS_PROGRAM = ${bindir}/ssh-askpass
 export LD = ${CC}
 CFLAGS_prepend = "-I${S} "
 CFLAGS_append = " -D__FILE_OFFSET_BITS=64"
diff --git a/openssl/openssl_0.9.7b.oe b/openssl/openssl_0.9.7b.oe
index 10cdbce083..882c089760 100644
--- a/