Correcting various dependency issues noticed during the last oemake -a run.

BKrev: 3fc531a4VZcNua6H8futydrwoHwIyw

diff --git a/cscope/cscope_15.4.oe b/cscope/cscope_15.4.oe
index 3472c4f..88ed7c2 100644 (file)
--- a/cscope/cscope_15.4.oe
+++ b/cscope/cscope_15.4.oe
@@ -1,5 +1,5 @@
-DEPENDS = virtual/libc ncurses-5.3
-RDEPENDS = libc6 libncurses5
+DEPENDS = virtual/libc ncurses
+RDEPENDS = libc6 libncurses
 
 SRC_URI := ${SOURCEFORGE_MIRROR}/cscope/cscope-15.4.tar.gz \
           file://${FILESDIR}/configure.patch;patch=1

diff --git a/directfb/directfb_0.9.19.oe b/directfb/directfb_0.9.19.oe
index e69de29..aeb6062 100644 (file)
--- a/directfb/directfb_0.9.19.oe
+++ b/directfb/directfb_0.9.19.oe
@@ -0,0 +1,31 @@
+SECTION="libs"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 libjpeg libpng3 zlib1g
+DEPENDS=virtual/libc jpeg libpng zlib
+
+SRC_URI=http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz;
+S=${WORKDIR}/DirectFB-${PV}
+
+inherit autotools libtool
+
+EXTRA_OECONF="--with-gfxdrivers=none --enable-libmpeg3=no --enable-freetype=no --enable-sdl=no"
+
+do_stage() {
+       oe_runmake -C src 'libdir=/target/lib' 'includedir=/target/include/directfb' \
+                         'oldincludedir=/target/include' 'datadir=/share' \
+                         'DESTDIR=${STAGING_DIR}' \
+                         'INTERNALINCLUDEDIR=/target/include/directfb-internal' \
+                         install-internalincludeHEADERS install-libLTLIBRARIES
+       oe_runmake -C include 'libdir=/target/lib' 'includedir=/target/include/directfb' \
+                             'oldincludedir=/target/include' 'datadir=/share' \
+                             'DESTDIR=${STAGING_DIR}' \
+                             'INTERNALINCLUDEDIR=/target/include/directfb-internal' \
+                             install-internalincludeHEADERS install-includeHEADERS
+       install -d ${STAGING_DIR}/share/pkgconfig
+       install -m 0644 directfb.pc ${STAGING_DIR}/share/pkgconfig
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}

diff --git a/directfb/directfb_0.9.20.oe b/directfb/directfb_0.9.20.oe
index e69de29..a6cc704 100644 (file)
--- a/directfb/directfb_0.9.20.oe
+++ b/directfb/directfb_0.9.20.oe
@@ -0,0 +1,31 @@
+SECTION="libs"
+PRIORITY="optional"
+MAINTAINER="Michael Lauer <mickey@Vanille.de>"
+RDEPENDS=libc6 libjpeg62 libpng3 zlib1g
+DEPENDS=virtual/libc jpeg libpng zlib
+
+SRC_URI=http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz;
+S=${WORKDIR}/DirectFB-${PV}
+
+inherit autotools libtool
+
+EXTRA_OECONF="--with-gfxdrivers=none --enable-libmpeg3=no --enable-freetype=no --enable-sdl=no"
+
+do_stage() {
+       oe_runmake -C src 'libdir=/target/lib' 'includedir=/target/include/directfb' \
+                         'oldincludedir=/target/include' 'datadir=/share' \
+                         'DESTDIR=${STAGING_DIR}' \
+                         'INTERNALINCLUDEDIR=/target/include/directfb-internal' \
+                         install-internalincludeHEADERS install-libLTLIBRARIES
+       oe_runmake -C include 'libdir=/target/lib' 'includedir=/target/include/directfb' \
+                             'oldincludedir=/target/include' 'datadir=/share' \
+                             'DESTDIR=${STAGING_DIR}' \
+                             'INTERNALINCLUDEDIR=/target/include/directfb-internal' \
+                             install-internalincludeHEADERS install-includeHEADERS
+       install -d ${STAGING_DIR}/share/pkgconfig
+       install -m 0644 directfb.pc ${STAGING_DIR}/share/pkgconfig
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}

diff --git a/dsniff/dsniff_2.3.oe b/dsniff/dsniff_2.3.oe
index e69de29..736f16d 100644 (file)
--- a/dsniff/dsniff_2.3.oe
+++ b/dsniff/dsniff_2.3.oe
@@ -0,0 +1,17 @@
+DESCRIPTION = 'dsniff is a collection of tools for network auditing and penetration testing.'
+
+DEPENDS = virtual/libc db3 libpcap libnet libnids openssl
+RDEPENDS = libc6 db3 libpcap openssl
+
+SRC_URI = http://www.monkey.org/~dugsong/dsniff/dsniff-${PV}.tar.gz \
+         file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+
+EXTRA_OECONF='--without-x --with-db=${STAGING_DIR}/target \
+             --with-libpcap=${STAGING_DIR}/target \
+             --with-libnet=${STAGING_DIR}/target \
+             --with-libnids=${STAGING_DIR}/target \
+             --with-openssl=${STAGING_DIR}/target'
+EXTRA_OEMAKE='"install_prefix=${D}"'
+CFLAGS_prepend=' -I${S}/missing '

diff --git a/epeg/epeg.oe b/epeg/epeg.oe
index e69de29..60a9410 100644 (file)
--- a/epeg/epeg.oe
+++ b/epeg/epeg.oe
@@ -0,0 +1,9 @@
+PV = ${DATE}
+
+DEPENDS = virtual/libc libjpeg
+RDEPENDS = libc6 jpeg
+
+SRC_URI = cvs://anonymous:@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/libs/epeg
+S = ${WORKDIR}/epeg
+
+inherit autotools libtool

diff --git a/fixesext/fixesext-cvs.oe b/fixesext/fixesext-cvs.oe
index 32e76d7..109a94e 100644 (file)
--- a/fixesext/fixesext-cvs.oe
+++ b/fixesext/fixesext-cvs.oe
@@ -2,7 +2,7 @@ SECTION="libs"
 PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
-DEPENDS=virtual/libc xextensions 
+DEPENDS=virtual/libc xextensions-cvs
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=FixesExt
 S=${WORKDIR}/FixesExt

diff --git a/libnids/libnids_1.18.oe b/libnids/libnids_1.18.oe
index 46f314d..8d4484b 100644 (file)
--- a/libnids/libnids_1.18.oe
+++ b/libnids/libnids_1.18.oe
@@ -1,4 +1,4 @@
-DEPENDS = libc libnet libpcap
+DEPENDS = virtual/libc libnet libpcap
 
 SRC_URI = ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
          file://${FILESDIR}/configure.patch;patch=1

diff --git a/psmisc/psmisc_20.2.oe b/psmisc/psmisc_20.2.oe
index e924b22..7443c62 100644 (file)
--- a/psmisc/psmisc_20.2.oe
+++ b/psmisc/psmisc_20.2.oe
@@ -3,7 +3,7 @@ SECTION="base"
 PRIORITY="required"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6 libncurses5"
-DEPENDS=virtual/libc libncurses
+DEPENDS=virtual/libc ncurses
 
 SRC_URI="${SOURCEFORGE_MIRROR}/psmisc/psmisc-20.2.tar.gz \
         file://${FILESDIR}/configure.patch;patch=1"

diff --git a/readline/readline_4.3.oe b/readline/readline_4.3.oe
index ca9666f..81e2c9f 100644 (file)
--- a/readline/readline_4.3.oe
+++ b/readline/readline_4.3.oe
@@ -3,11 +3,9 @@ PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
 DEPENDS=virtual/libc
-PROVIDES=virtual/libreadline
 
 SRC_URI = ftp://ftp.cwru.edu/pub/bash/readline-4.3.tar.gz \
          file://${FILESDIR}/signalnamespace.patch;patch=1
-S=${WORKDIR}/readline-${PV}
 
 inherit autotools libtool
 

diff --git a/units/units_1.80.oe b/units/units_1.80.oe
index e69de29..1991ff9 100644 (file)
--- a/units/units_1.80.oe
+++ b/units/units_1.80.oe
@@ -0,0 +1,10 @@
+DEPENDS = virtual/libc readline
+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/x11/x11-cvs.oe b/x11/x11-cvs.oe
index e69de29..9e14230 100644 (file)
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -0,0 +1,32 @@
+SECTION="libs"
+PRIORITY="optional"
+MAINTAINER="Greg Gilbert <greg@treke.net>"
+RDEPENDS="libc6"
+DEPENDS=virtual/libc xproto-cvs xextentions-cvs xau-cvs xtrans-cvs xdmcp-cvs
+
+SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=X11
+S=${WORKDIR}/X11
+
+inherit autotools pkgconfig libtool
+
+do_stage() {
+
+       install -c -m 644 X11/XKBlib.h ${STAGING_DIR}/target/include/X11/XKBlib.h
+       install -c -m 644 X11/Xcms.h ${STAGING_DIR}/target/include/X11/Xcms.h
+       install -c -m 644 X11/Xlib.h ${STAGING_DIR}/target/include/X11/Xlib.h
+       install -c -m 644 X11/Xlibint.h ${STAGING_DIR}/target/include/X11/Xlibint.h
+       install -c -m 644 X11/Xlocale.h ${STAGING_DIR}/target/include/X11/Xlocale.h
+       install -c -m 644 X11/Xresource.h ${STAGING_DIR}/target/include/X11/Xresource.h
+       install -c -m 644 X11/Xutil.h ${STAGING_DIR}/target/include/X11/Xutil.h
+       install -c -m 644 X11/cursorfont.h ${STAGING_DIR}/target/include/X11/cursorfont.h
+       install -c -m 644 X11/region.h ${STAGING_DIR}/target/include/X11/region.h
+       install -c -m 644 X11/ImUtil.h ${STAGING_DIR}/target/include/X11/ImUtil.h
+       
+       install -c .libs/libX11.so.6.2.1 ${STAGING_DIR}/target/lib/libX11.so.6.2.1
+       ln -sf libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so.6
+       ln -sf libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so
+
+       install -c -m 644 .libs/libX11.a ${STAGING_DIR}/target/lib/libX11.a
+
+
+}

diff --git a/xau/xau-cvs.oe b/xau/xau-cvs.oe
index bb79a18..8b58606 100644 (file)
--- a/xau/xau-cvs.oe
+++ b/xau/xau-cvs.oe
@@ -2,7 +2,7 @@ SECTION="libs"
 PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
-DEPENDS=virtual/libc xproto
+DEPENDS=virtual/libc xproto-cvs
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xau
 S=${WORKDIR}/Xau

diff --git a/xdmcp/xdmcp-cvs.oe b/xdmcp/xdmcp-cvs.oe
index 4e5e5b7..6ff9b79 100644 (file)
--- a/xdmcp/xdmcp-cvs.oe
+++ b/xdmcp/xdmcp-cvs.oe
@@ -2,7 +2,7 @@ SECTION="libs"
 PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
-DEPENDS=virtual/libc xproto
+DEPENDS=virtual/libc xproto-cvs
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xdmcp
 S=${WORKDIR}/Xdmcp

diff --git a/xfont/xfont-cvs.oe b/xfont/xfont-cvs.oe
index fc18e36..8684415 100644 (file)
--- a/xfont/xfont-cvs.oe
+++ b/xfont/xfont-cvs.oe
@@ -2,7 +2,7 @@ SECTION="libs"
 PRIORITY="optional"
 MAINTAINER="Greg Gilbert <greg@treke.net>"
 RDEPENDS="libc6"
-DEPENDS=virtual/libc zlib xproto
+DEPENDS=virtual/libc zlib xproto-cvs
 
 SRC_URI =   cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont
 S=${WORKDIR}/Xfont