From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 15:54:32 +0000 (+0000)
Subject: [packages_10.03.2] portmap: merge r29063
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=a8d8e32f0801879d053a151370430dbf960024d2

[packages_10.03.2] portmap: merge r29063

SVN-Revision: 30239
---

diff --git a/net/portmap/Makefile b/net/portmap/Makefile
index 19c373d6d7..70499aa0b8 100644
--- a/net/portmap/Makefile
+++ b/net/portmap/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=portmap
 PKG_VERSION:=6.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=http://neil.brown.name/portmap/
diff --git a/net/portmap/files/portmap.init b/net/portmap/files/portmap.init
index fd7322cf73..e73701c8e2 100644
--- a/net/portmap/files/portmap.init
+++ b/net/portmap/files/portmap.init
@@ -1,18 +1,13 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 
 START=19
 STOP=19
 
-NAME=portmap
-PROG=/usr/sbin/$NAME
-DEFAULT=/etc/default/$NAME
-
 start() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	start-stop-daemon -q -S -x $PROG -- $OPTIONS
+	service_start /usr/sbin/portmap
 }
 
 stop() {
-	start-stop-daemon -q -K -x $PROG -- $OPTIONS
+	service_stop /usr/sbin/portmap
 }