2 files changed, 17 insertions, 33 deletions

diff --git a/meta/packages/portmap/portmap_5-9.bb b/meta/packages/portmap/portmap_5-9.bb
deleted file mode 100644
index 76d66e9ad9..0000000000
--- a/meta/packages/portmap/portmap_5-9.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "RPC program number mapper."
-SECTION = "console/network"
-LICENSE = "GPL"
-PR = "r5"
-
-SRC_URI = "http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_5.orig.tar.gz \
-        http://www.uk.debian.org/debian/pool/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \
-        file://no-libwrap.patch;patch=1;pnum=0 \
-        file://portmap.init \
-        file://make.patch;patch=1"
-S = "${WORKDIR}/portmap_5beta"
-
-PACKAGES =+ "portmap-utils"
-FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
-FILES_${PN}-doc += "${docdir}"
-
-INITSCRIPT_NAME = "portmap"
-INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
-
-inherit update-rc.d
-
-sbindir = "/sbin"
-
-do_compile() {
-        oe_runmake
-}
-
-do_install() {
-        install -d ${D}${sysconfdir}/init.d
-        install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
-        oe_runmake 'docdir=${docdir}/portmap' \
-                   'DESTDIR=${D}' install
-}
diff --git a/meta/packages/portmap/portmap_6.0.bb b/meta/packages/portmap/portmap_6.0.bb
new file mode 100644
index 0000000000..315cb4a473
--- /dev/null
+++ b/meta/packages/portmap/portmap_6.0.bb
@@ -0,0 +1,17 @@
+require portmap.inc
+
+SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \
+           file://destdir-no-strip.patch;patch=1 \
+           file://no-tcpd-support.patch;patch=1 \
+           file://no-libwrap.patch;patch=1;pnum=0 \
+           file://portmap.init "
+
+S = "${WORKDIR}/${PN}_${PV}/"
+
+CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS"
+
+fakeroot do_install() {
+    install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
+    install -m 0757 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap
+    oe_runmake install DESTDIR=${D}
+}