portmap: use DEBIAN_MIRROR instead of hardcoding one

diff --git a/packages/portmap/portmap-unslung_5-9.bb b/packages/portmap/portmap-unslung_5-9.bb
index ee6c648..c86ae1e 100644 (file)
--- a/packages/portmap/portmap-unslung_5-9.bb
+++ b/packages/portmap/portmap-unslung_5-9.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL"
 PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
-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 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+       ${DEBIAN_MIRROR}/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"
@@ -18,6 +18,5 @@ do_compile() {
 }
 
 do_install() {
-       oe_runmake 'docdir=${datadir}/doc/portmap' \
-                  'DESTDIR=${D}' install
+       oe_runmake 'docdir=${datadir}/doc/portmap' 'DESTDIR=${D}' install
 }

diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc
index ad47782..e7e7673 100644 (file)
--- a/packages/portmap/portmap.inc
+++ b/packages/portmap/portmap.inc
@@ -2,17 +2,13 @@ DESCRIPTION = "RPC program number mapper."
 SECTION = "console/network"
 LICENSE = "GPL"
 
-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 \
+SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
+       http://${DEBIAN_MIRROR}/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 ."
 
@@ -27,6 +23,9 @@ do_compile() {
 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
+       oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install
 }
+
+PACKAGES =+ "portmap-utils"
+FILES_portmap-utils = "/sbin/pmap_set /sbin/pmap_dump"
+FILES_${PN}-doc += "${docdir}"