ftpd-topfield: Updated to 0.6.3

diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
deleted file mode 100644 (file)
index c93e8c2..0000000
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-# This package builds the ftpd-topfield program
-PR = "r0"
-DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
-HOMEPAGE = "http://sourceforge.net/projects/puppy"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
-SECTION = "net"
-LICENSE = "MIT"
-
-DEPENDS = "libusb"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_1 \
-          cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_1 \
-          file://init"
-
-# The source will end up in the subdirectory 'ftpd-topfield' - no release name
-S = "${WORKDIR}/ftpd-topfield"
-SL = "${WORKDIR}/libtopfield"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "ftpd-topfield"
-INITSCRIPT_PARAMS = "defaults"
-
-# Just the one package at present
-PACKAGES = "${PN}"
-
-inherit autotools
-
-do_compile() {
-       oe_runmake -C ${SL} libtopfield.a
-       oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb"
-}
-
-do_install() {
-       install -d ${D}${sbindir}
-       install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield
-        install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield
-}

diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb
old mode 100644 (file)
new mode 100755 (executable)
similarity index 78%
rename from packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
rename to packages/ftpd-topfield/ftpd-topfield_0.6.3.bb
index 6a6665c..72cf5ab
--- a/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.6.3.bb
@@ -6,15 +6,12 @@ MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
 SECTION = "net"
 LICENSE = "MIT"
 
-DEPENDS = "libusb"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \
-          cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_3 \
+          cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_3 \
           file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name
 S = "${WORKDIR}/ftpd-topfield"
-SL = "${WORKDIR}/libtopfield"
 
 inherit update-rc.d
 
@@ -27,8 +24,7 @@ PACKAGES = "${PN}"
 inherit autotools
 
 do_compile() {
-       oe_runmake -C ${SL} libtopfield.a
-       oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb"
+       oe_runmake
 }
 
 do_install() {