cleanups of the rc6 ebuild and initscript

3 files changed, 39 insertions, 39 deletions

diff --git a/net-nds/portmap/files/portmap-5b-r6 b/net-nds/portmap/files/portmap-5b-r6
deleted file mode 100644
index 4282b86b7bb3..000000000000
--- a/net-nds/portmap/files/portmap-5b-r6
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-
-SERVICE=portmap
-EXE=/sbin/portmap
-opts="start stop restart"
-
-depend() {
-    need net
-}
-
-start() {
-    ebegin "Starting ${SERVICE}"
-    start-stop-daemon --start --quiet --exec $EXE 1>&2
-    eend $? "Error starting ${SERVICE}."
-}
-
-stop() {
-    ebegin "Stopping ${SERVICE}"
-    start-stop-daemon --stop --quiet --exec $EXE 1>&2
-    eend $? "Error stopping ${SERVICE}."
-}
-
-restart() {
-    # Dump the portmapper's table before stopping
-    ebegin "Saving portmap table"
-    local tmpfile=`mktemp /tmp/pmap_table.XXXXXX`
-    [ -n "$tmpfile" ] && pmap_dump >$tmpfile
-    eend $? "Error saving portmap table."
-    # Stop and restart portmapper
-    stop
-    start
-    # Reload the portmapper's table
-    if [ -n "$tmpfile" ]; then
-	ebegin "Reloading portmap table"
-	pmap_set <$tmpfile
-	eend $? "Error reloading portmap table."
-	rm -f $tmpfile
-    fi
-}
diff --git a/net-nds/portmap/files/portmap b/net-nds/portmap/files/portmap.rc5
index 2be2a499eea5..2be2a499eea5 100755..100644
--- a/net-nds/portmap/files/portmap
+++ b/net-nds/portmap/files/portmap.rc5
diff --git a/net-nds/portmap/files/portmap.rc6 b/net-nds/portmap/files/portmap.rc6
new file mode 100644
index 000000000000..047051271ddb
--- /dev/null
+++ b/net-nds/portmap/files/portmap.rc6
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+
+opts="start stop restart"
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting portmap"
+	start-stop-daemon --start --quiet --exec /sbin/portmap
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping portmap"
+	start-stop-daemon --stop --quiet --exec /sbin/portmap
+	eend $?
+}
+
+restart() {
+	# Dump the portmapper's table before stopping
+	ebegin "Saving portmap table"
+	local tmpfile=`mktemp /tmp/pmap_table.XXXXXX`
+	[ -n "$tmpfile" ] && pmap_dump >$tmpfile
+	eend $? "Error saving portmap table."
+
+	# Stop and restart portmapper
+	stop
+	start
+
+	# Reload the portmapper's table
+	if [ -n "$tmpfile" ]; then
+		ebegin "Reloading portmap table"
+		pmap_set <$tmpfile
+		eend $? "Error reloading portmap table."
+		rm -f $tmpfile
+	fi
+}