Packaging fixes, pass 2.

BKrev: 4010d8e2zRgIc2lz8zqu_17RxVRQ9g

16 files changed, 119 insertions, 5 deletions

diff --git a/alsa-oss/alsa-oss_0.9.8.oe b/alsa-oss/alsa-oss_0.9.8.oe
index e69de29bb2..dd7868beac 100644
--- a/alsa-oss/alsa-oss_0.9.8.oe
+++ b/alsa-oss/alsa-oss_0.9.8.oe
@@ -0,0 +1,21 @@
+DESCRIPTION="Alsa OSS Compatibility Package"
+MAINTAINER="Lorn Potter <lpotter@trolltech.com>"
+LICENSE="GPL"
+DEPENDS="virtual/libc alsa-lib"
+
+SRC_URI="ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
+	 file://${FILESDIR}/configure.patch"
+
+inherit autotools libtool
+
+do_configure_prepend () {
+	touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+	install -m 0755 .libs/libaoss.so.0.0.0 ${STAGING_LIBDIR}/
+	ln -sf libaoss.so.0.0.0 ${STAGING_LIBDIR}/libaoss.so.0
+	ln -sf libaoss.so.0.0.0 ${STAGING_LIBDIR}/libaoss.so
+	install -m 0644 .libs/libaoss.a ${STAGING_LIBDIR}/
+	install -m 0644 .libs/libaoss.lai ${STAGING_LIBDIR}/libaoss.la
+}
diff --git a/directfb/directfb_0.9.19.oe b/directfb/directfb_0.9.19.oe
index aeb6062572..ade9d371a7 100644
--- a/directfb/directfb_0.9.19.oe
+++ b/directfb/directfb_0.9.19.oe
@@ -3,6 +3,10 @@ PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libjpeg libpng3 zlib1g
 DEPENDS=virtual/libc jpeg libpng zlib
+FILES_directfb_append=' ${libdir}/directfb-${PV}/systems/*.so \
+			${libdir}/directfb-${PV}/inputdrivers/*.so \
+			${libdir}/directfb-${PV}/interfaces/*/*.so \
+			${datadir}/directfb-${PV}'
 
 SRC_URI=http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz;
 S=${WORKDIR}/DirectFB-${PV}
diff --git a/directfb/directfb_0.9.20.oe b/directfb/directfb_0.9.20.oe
index a6cc704a1d..d7a7689271 100644
--- a/directfb/directfb_0.9.20.oe
+++ b/directfb/directfb_0.9.20.oe
@@ -3,6 +3,10 @@ PRIORITY="optional"
 MAINTAINER="Michael Lauer <mickey@Vanille.de>"
 RDEPENDS=libc6 libjpeg62 libpng3 zlib1g
 DEPENDS=virtual/libc jpeg libpng zlib
+FILES_directfb_append=' ${libdir}/directfb-${PV}/systems/*.so \
+			${libdir}/directfb-${PV}/inputdrivers/*.so \
+			${libdir}/directfb-${PV}/interfaces/*/*.so \
+			${datadir}/directfb-${PV}'
 
 SRC_URI=http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz;
 S=${WORKDIR}/DirectFB-${PV}
diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe
index 936d9fa776..8711b90308 100644
--- a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe
+++ b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe
@@ -4,6 +4,7 @@ PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc 
+FILES_e2fsprogs-libs-dev_append=" ${datadir}/et ${datadir}/ss"
 
 SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
 	file://${FILESDIR}/configure.patch;patch=1 \
diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
index 60eb2ebb52..d3f40d188c 100644
--- a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
+++ b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
@@ -4,6 +4,7 @@ PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc 
+FILES_e2fsprogs-libs-dev_append=" ${datadir}/et ${datadir}/ss"
 
 SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
 	file://${FILESDIR}/configure.patch;patch=1 \
@@ -13,7 +14,6 @@ SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
 
 inherit autotools
 
-EXTRA_OECONF='--with-ldopts="${LDFLAGS}"'
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
diff --git a/e2fsprogs/e2fsprogs_1.34.oe b/e2fsprogs/e2fsprogs_1.34.oe
index 7a3735a0bb..6bfb21048e 100644
--- a/e2fsprogs/e2fsprogs_1.34.oe
+++ b/e2fsprogs/e2fsprogs_1.34.oe
@@ -14,7 +14,6 @@ SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
 
 inherit autotools
 
-EXTRA_OECONF='--with-ldopts="${LDFLAGS}"'
 do_compile_prepend () {
 	find ./ -print|xargs chmod u=rwX
 	( cd util; ${BUILD_CC} subst.c -o subst )
diff --git a/freeswan/freeswan_2.0.4.oe b/freeswan/freeswan_2.0.4.oe
index 031e31f017..d080dd1cce 100644
--- a/freeswan/freeswan_2.0.4.oe
+++ b/freeswan/freeswan_2.0.4.oe
@@ -1,6 +1,7 @@
 DESCRIPTION = FreeS/WAN IPSEC
 DEPENDS = virtual/libc gmp
 RDEPENDS = libc6 gmp
+FILES_freeswan_append = ' ${libdir}/ipsec'
 
 SRC_URI = ftp://ftp.xs4all.nl/pub/crypto/freeswan/freeswan-2.04.tar.gz \
 	  file://${FILESDIR}/pathnames.patch;patch=1 \
@@ -8,11 +9,20 @@ SRC_URI = ftp://ftp.xs4all.nl/pub/crypto/freeswan/freeswan-2.04.tar.gz \
 
 S = "${WORKDIR}/freeswan-2.04"
 
+# "local" part of tree, used in building other pathnames
+EXTRA_OEMAKE = "'INC_USRLOCAL=${prefix}' \
+		'FINALLIBEXECDIR=${libexecdir}/ipsec' \
+		'FINALSBINDIR=${sbindir}' \
+		'FINALLIBDIR=${libdir}/ipsec' \
+		'MANTREE=${DESTDIR}/${mandir}' \
+		'FINALCONFFILE?=${sysconfdir}/ipsec.conf' \
+		'FINALCONFDIR?=${sysconfdir}'"
+
 do_compile () {
-	oe_runmake INC_USRLOCAL=${prefix} 'CFLAGS=${CFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}' programs
+	oe_runmake 'CFLAGS=${CFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}' programs
 }
 
 do_install () {
 	install -d ${D}/${sysconfdir}/init.d
-	oe_runmake INC_USRLOCAL=${prefix} DESTDIR=${D} install
+	oe_runmake DESTDIR=${D} install
 }
diff --git a/gift/gift_0.11.4.oe b/gift/gift_0.11.4.oe
index e69de29bb2..e67df08310 100644
--- a/gift/gift_0.11.4.oe
+++ b/gift/gift_0.11.4.oe
@@ -0,0 +1,10 @@
+DEPENDS = virtual/libc libvorbis libogg
+RDEPENDS = libc6 libvorbis libogg
+FILES_gift_append = ' ${datadir}/giFT'
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2
+
+inherit autotools libtool
+
+EXTRA_OECONF = '--with-vorbis-libraries=${STAGING_LIBDIR} \
+		--with-vorbis-includes=${STAGING_INCDIR}'
diff --git a/gift/gift_0.11.5.oe b/gift/gift_0.11.5.oe
index e69de29bb2..e67df08310 100644
--- a/gift/gift_0.11.5.oe
+++ b/gift/gift_0.11.5.oe
@@ -0,0 +1,10 @@
+DEPENDS = virtual/libc libvorbis libogg
+RDEPENDS = libc6 libvorbis libogg
+FILES_gift_append = ' ${datadir}/giFT'
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/gift/gift-${PV}.tar.bz2
+
+inherit autotools libtool
+
+EXTRA_OECONF = '--with-vorbis-libraries=${STAGING_LIBDIR} \
+		--with-vorbis-includes=${STAGING_INCDIR}'
diff --git a/libesmtp/libesmtp_1.0.1.oe b/libesmtp/libesmtp_1.0.1.oe
index e69de29bb2..c2716fec11 100644
--- a/libesmtp/libesmtp_1.0.1.oe
+++ b/libesmtp/libesmtp_1.0.1.oe
@@ -0,0 +1,24 @@
+DEPENDS = virtual/libc openssl
+RDEPENDS = libc6 openssl
+FILES_libesmtp_append = ' ${libdir}/esmtp-plugins'
+
+SRC_URI := http://www.stafford.uklinux.net/libesmtp/${P}.tar.bz2  \
+           file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools libtool
+
+EXTRA_OECONF = '--disable-isoc --with-openssl=${STAGING_DIR}/target'
+
+do_stage () {
+	install -m 0644 .libs/libesmtp.a ${STAGING_LIBDIR}/
+	install -m 0644 .libs/libesmtp.lai ${STAGING_LIBDIR}/libesmtp.la
+	install -m 0644 .libs/libesmtp.so.5.1.2 ${STAGING_LIBDIR}/
+	ln -sf libesmtp.so.5.1.2 ${STAGING_LIBDIR}/libesmtp.so.5
+	ln -sf libesmtp.so.5.1.2 ${STAGING_LIBDIR}/libesmtp.so
+
+        install -d ${STAGING_DIR}/include
+	install -m 644 auth-client.h ${STAGING_DIR}/target/include
+	install -m 644 auth-plugin.h ${STAGING_DIR}/target/include
+	install -m 644 libesmtp.h ${STAGING_DIR}/target/include
+}
+
diff --git a/libnet/libnet_1.0.2a.oe b/libnet/libnet_1.0.2a.oe
index 6caee56345..82bb26d700 100644
--- a/libnet/libnet_1.0.2a.oe
+++ b/libnet/libnet_1.0.2a.oe
@@ -8,6 +8,8 @@ S := ${WORKDIR}/Libnet-1.0.2a
 inherit autotools
 
 CPPFLAGS_prepend = "-I${S}/libnet/include -DHAVE_PF_PACKET "
+EXTRA_OEMAKE="'LIB_PREFIX=${libdir}/' 'MAN_PREFIX=${mandir}/' \
+	      'BIN_PREFIX=${bindir}/' 'INC_PREFIX=${includedir}/'"
 
 do_stage () {
 	install -m 0755 libnet-config ${STAGING_BINDIR}/
diff --git a/mailutils/mailutils_0.3.1.oe b/mailutils/mailutils_0.3.1.oe
index 19a24fc99b..03e7f016fa 100644
--- a/mailutils/mailutils_0.3.1.oe
+++ b/mailutils/mailutils_0.3.1.oe
@@ -4,6 +4,6 @@ RDEPENDS = libc6
 SRC_URI := ${GNU_MIRROR}/mailutils/mailutils-0.3.1.tar.bz2 \
 	   file://${FILESDIR}/configure.patch;patch=1
 
-inherit autotools
+inherit autotools libtool
 
 EXTRA_OECONF = --disable-pam --without-guile
diff --git a/ncurses/ncurses_5.3.oe b/ncurses/ncurses_5.3.oe
index 4c781a7fb8..9f256c57a0 100644
--- a/ncurses/ncurses_5.3.oe
+++ b/ncurses/ncurses_5.3.oe
@@ -8,6 +8,7 @@ DEPENDS=virtual/libc
 PROVIDES=${PV}-${BaseV} ${PV}-${BaseV}-${PR} \
 	 ${CATEGORY}/${PN}-${BaseV} ${CATEGORY}/${PN}-${BaseV}-${PR} 
 PACKAGES_append=' ncurses-terminfo'
+FILES_ncurses_append=' ${datadir}/tabset'
 FILES_ncurses-terminfo=${datadir}/terminfo
 
 SRC_URI = ${GNU_MIRROR}/ncurses/${PN}-${BaseV}.tar.gz \
diff --git a/python/pyvorbis_1.3.oe b/python/pyvorbis_1.3.oe
index e69de29bb2..6111c0306c 100644
--- a/python/pyvorbis_1.3.oe
+++ b/python/pyvorbis_1.3.oe
@@ -0,0 +1,21 @@
+DESCRIPTION=Python Vorbis Bindings
+SECTION="base"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 python-core libvorbis pyogg
+DEPENDS=virtual/libc libvorbis pyogg
+
+SRC_URI = http://www.andrewchatham.com/pyogg/download/${P}.tar.gz \
+          file://${FILESDIR}/disable-oggcheck.patch;patch=1
+
+inherit distutils
+
+do_configure_prepend() {
+	touch Setup
+	echo "ogg_libs = ogg" >>Setup
+	echo "ogg_lib_dir = ${STAGING_LIBDIR}" >>Setup
+	echo "ogg_include_dir = ${STAGING_INCDIR}" >>Setup
+	echo "vorbis_libs = vorbis vorbisfile vorbisenc" >>Setup
+	echo "vorbis_lib_dir = ${STAGING_LIBDIR}" >>Setup
+	echo "vorbis_include_dir = ${STAGING_INCDIR}" >>Setup
+}
diff --git a/sgml-common/sgml-common_0.6.3.oe b/sgml-common/sgml-common_0.6.3.oe
index e69de29bb2..07753601ac 100644
--- a/sgml-common/sgml-common_0.6.3.oe
+++ b/sgml-common/sgml-common_0.6.3.oe
@@ -0,0 +1,6 @@
+FILES_sgml-common_append = ' ${datadir}/sgml'
+
+SRC_URI = ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-${PV}.tgz \
+	  file://${FILESDIR}/autohell.patch;patch=1
+
+inherit autotools
diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe
index 5133768255..e3d082cdd4 100644
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -3,6 +3,7 @@ PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc xproto-cvs xextensions-cvs xau-cvs xtrans-cvs xdmcp-cvs
+FILES_x11-cvs_append=" ${datadir}/X11"
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11
 S=${WORKDIR}/X11