- Use OPTIONS, add more options

- Provide RCng script
- Tweaks

PR:		ports/78659
Submitted by:	Boris Kovalenko <boris@tagnet.ru>
Approved by:	Chris Elsworth <chris@shagged.org> (maintainer)

2 files changed, 41 insertions, 45 deletions

diff --git a/mail/tpop3d/files/tpop3d.sh.in b/mail/tpop3d/files/tpop3d.sh.in
new file mode 100644
index 000000000000..449eacd2d133
--- /dev/null
+++ b/mail/tpop3d/files/tpop3d.sh.in
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+
+# PROVIDE: tpop3d
+# BEFORE:  LOGIN
+# KEYWORD: FreeBSD
+
+#
+# Add the following line to /etc/rc.conf to enable tpop3d:
+#tpop3d_enable="YES"
+#
+# You may also wish to use the following variables to fine-tune startup:
+#tpop3d_flags="..."
+#
+
+. %%RC_SUBR%%
+
+name="tpop3d"
+rcvar=`set_rcvar`
+
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+tpop3d_enable=${tpop3d_enable:-"NO"}
+tpop3d_flags=${tpop3d_flags:-""}
+load_rc_config $name
+
+command=%%PREFIX%%/sbin/tpop3d
+required_files=%%PREFIX%%/tpop3d.conf
+pidfile=/var/run/tpop3d.pid
+
+tpop3d_flags="${tpop3d_flags} -f ${required_files} -p ${pidfile}"
+
+run_rc_command "$1"
diff --git a/mail/tpop3d/files/tpop3d.sh.sample b/mail/tpop3d/files/tpop3d.sh.sample
deleted file mode 100644
index 97dbd2514da1..000000000000
--- a/mail/tpop3d/files/tpop3d.sh.sample
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# tpop3d:
-# Init script for starting/stopping tpop3d.
-#
-# Copyright (c) 2001 Chris Lightfoot. All rights reserved.
-#  Portability enhanced by Chris Elsworth, July 2001
-#
-# $FreeBSD$
-#
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-DAEMON=$PREFIX/sbin/tpop3d
-
-[ -f $DAEMON ] || exit 0
-
-# See how we were called.
-case "$1" in
-  start)
-        # Start daemons.
-        $DAEMON -f $PREFIX/etc/tpop3d.conf -p /var/run/tpop3d.pid \
-		&& echo -n " tpop3d"
-        ;;
-  stop)
-        # Stop daemons.
-	[ -r /var/run/tpop3d.pid ] && kill `cat /var/run/tpop3d.pid` \
-		&& echo -n " tpop3d"
-        ;;
-  restart)
-	$0 stop
-	$0 start
-	;;
-  reload)
-  	[ -r /var/run/tpop3d.pid ] && kill -HUP `cat /var/run/tpop3d.pid`
-        ;;
-  *)
-        echo "Usage: `basename $0` {start|stop|restart|reload}"
-        exit 1
-esac
-
-exit 0