Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/22 22:25:52+02:00 hrw.one.pl!hrw
fixed SRC_URI for scew 0.3.1 (version 0.4.0 available upstream)

2005/05/22 22:15:29+02:00 hrw.one.pl!hrw
lsof: removed 4.73, added 4.75, fixed SRC_URI for 4.74

2005/05/22 22:02:58+02:00 hrw.one.pl!hrw
fixed SRC_URI for lftp 3.0.11 (3.2.0 available upstream)

BKrev: 4290ee2cw2XxQ8-7SkQLkx20crAXIw

5 files changed, 17 insertions, 42 deletions

diff --git a/packages/lftp/lftp_3.0.11.bb b/packages/lftp/lftp_3.0.11.bb
index e69de29bb2..d15b119046 100644
--- a/packages/lftp/lftp_3.0.11.bb
+++ b/packages/lftp/lftp_3.0.11.bb
@@ -0,0 +1,15 @@
+LICENSE = GPL
+DESCRIPTION = "lftp is a sophisticated command line based file \
+transfer program. Supported protocols include FTP, HTTP, \
+and FISH."
+HOMEPAGE = "http://lftp.yar.ru"
+SECTION = "console/network"
+DEPENDS = "readline"
+PR = "r1"
+
+SRC_URI = "http://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/lftp-${PV}.tar.bz2 \
+	   file://pty.patch;patch=1"
+
+EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no"
+
+inherit autotools gettext
diff --git a/packages/lsof/lsof_4.73.bb b/packages/lsof/lsof_4.73.bb
deleted file mode 100644
index fd311bac78..0000000000
--- a/packages/lsof/lsof_4.73.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-SECTION = "console/utils"
-DESCRIPTION = "Lsof is a Unix-specific diagnostic \
-tool. Its name stands for LiSt Open Files, and it \
-does just that."
-LICENSE = "BSD"
-
-PR = "r1"
-
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.gz"
-LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
-S = "${WORKDIR}/lsof_${PV}_src"
-
-python do_unpack () {
-	bb.build.exec_func('base_do_unpack', d)
-	src_uri = bb.data.getVar('SRC_URI', d)
-	bb.data.setVar('SRC_URI', '${LOCALSRC}', d)
-	bb.build.exec_func('base_do_unpack', d)
-	bb.data.setVar('SRC_URI', src_uri, d)
-}
-
-LSOF_OS = "${TARGET_OS}"
-LSOF_OS_linux-uclibc = "linux"
-
-do_configure () {
-	./Configure ${LSOF_OS}
-}
-
-export I = "${STAGING_INCDIR}"
-export L = "${STAGING_INCDIR}"
-export EXTRA_OEMAKE = ""
-
-do_compile () {
-	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
-}
-
-do_install () {
-	install -d ${D}${sbindir} ${D}${mandir}/man8
-	install -m 4755 lsof ${D}${sbindir}/lsof
-	install -m 0644 lsof.8 ${D}${mandir}/man8/lsof.8
-}
diff --git a/packages/lsof/lsof_4.74.bb b/packages/lsof/lsof_4.74.bb
index e66272353b..0562a57fb1 100644
--- a/packages/lsof/lsof_4.74.bb
+++ b/packages/lsof/lsof_4.74.bb
@@ -4,7 +4,7 @@ tool. Its name stands for LiSt Open Files, and it \
 does just that."
 LICENSE = "BSD"
 
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.gz"
+SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2"
 LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
 S = "${WORKDIR}/lsof_${PV}_src"
 
diff --git a/packages/lsof/lsof_4.75.bb b/packages/lsof/lsof_4.75.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/lsof/lsof_4.75.bb
diff --git a/packages/scew/scew_0.3.1.bb b/packages/scew/scew_0.3.1.bb
index 6b7bd84b59..a25335860b 100644
--- a/packages/scew/scew_0.3.1.bb
+++ b/packages/scew/scew_0.3.1.bb
@@ -2,7 +2,7 @@ SECTION = "unknown"
 DESCRIPTION = "Simple C Expat Wrapper."
 DEPENDS = "expat"
 LICENSE = "LGPL"
-SRC_URI = "http://www.ccd.uab.es/~aleix/scew/scew-${PV}.tar.gz \
+SRC_URI = "http://savannah.nongnu.org/download/scew/scew-${PV}.tar.gz \
 	   file://m4.patch;patch=1"
 
 inherit autotools pkgconfig