As threatened on freebsd-ports: all startup scripts know about the two

options `start' and `stop' now (unless I have forgotten any). This allows
us to call the scripts from /etc/rc.shutdown with the correct option.

The (42 or so) ports that already DTRT before are unchanged.

6 files changed, 85 insertions, 11 deletions

diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index e07cc9a78909..4ab1c30a28ba 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -37,11 +37,8 @@ post-extract:
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/conserver.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/conserver.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/conserver.sh; \
-		${ECHO} "if [ -x ${PREFIX}/sbin/conserver -a -f ${PREFIX}/etc/conserver.cf ]; then" >> ${PREFIX}/etc/rc.d/conserver.sh; \
-		${ECHO} "	${PREFIX}/sbin/conserver -d -n ; ${ECHO} -n ' conserver'" >> ${PREFIX}/etc/rc.d/conserver.sh; \
-		${ECHO} "fi" >> ${PREFIX}/etc/rc.d/conserver.sh; \
-		${CHMOD} 751 ${PREFIX}/etc/rc.d/conserver.sh; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/conserver.sh \
+			${PREFIX}/etc/rc.d/conserver.sh; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/comms/conserver/files/conserver.sh b/comms/conserver/files/conserver.sh
new file mode 100644
index 000000000000..842c39e60400
--- /dev/null
+++ b/comms/conserver/files/conserver.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	if [ -x ${PREFIX}/sbin/conserver -a -f ${PREFIX}/etc/conserver.cf ]; then
+		${PREFIX}/sbin/conserver -d -n ; echo -n ' conserver'
+	fi
+	;;
+stop)
+	killall conserver && echo -n ' conserver'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/comms/conserver/files/conserver.sh.in b/comms/conserver/files/conserver.sh.in
new file mode 100644
index 000000000000..842c39e60400
--- /dev/null
+++ b/comms/conserver/files/conserver.sh.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	if [ -x ${PREFIX}/sbin/conserver -a -f ${PREFIX}/etc/conserver.cf ]; then
+		${PREFIX}/sbin/conserver -d -n ; echo -n ' conserver'
+	fi
+	;;
+stop)
+	killall conserver && echo -n ' conserver'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/comms/hylafax/files/hylafax.sh.sample b/comms/hylafax/files/hylafax.sh.sample
index 069ac04e1686..f7a0f61200e3 100644
--- a/comms/hylafax/files/hylafax.sh.sample
+++ b/comms/hylafax/files/hylafax.sh.sample
@@ -4,6 +4,20 @@
 #   server: /usr/local/sbin/faxsetup 
 #   modems: /usr/local/sbin/faxaddmodem 
 #   incoming calls: /etc/ttys 
-if [ -x /usr/local/sbin/faxq ]; then 
-	/usr/local/sbin/faxq && echo -n ' hylafax' 
-fi
+
+case "$1" in
+start)
+	if [ -x /usr/local/sbin/faxq ]; then 
+		/usr/local/sbin/faxq && echo -n ' hylafax' 
+	fi
+	;;
+stop)
+	killall faxq && echo -n ' hylafax'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 2d144e0659d1..e80b620fd93f 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -20,9 +20,8 @@ MAN1=		qpage.1
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/qpage.sh ]; then \
 		${ECHO} "Install ${PREFIX}/etc/rc.d/qpage.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/qpage.sh; \
-		${ECHO} "[ -x ${PREFIX}/bin/qpage ] && ${PREFIX}/bin/qpage -q10 && ${ECHO} -n ' qpage'" >> ${PREFIX}/etc/rc.d/qpage.sh; \
-		${CHMOD} 751 ${PREFIX}/etc/rc.d/qpage.sh; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/qpage.sh \
+			${PREFIX}/etc/rc.d/qpage.sh \
 	fi
 
 .include <bsd.port.mk>
diff --git a/comms/qpage/files/qpage.sh b/comms/qpage/files/qpage.sh
new file mode 100644
index 000000000000..a183fa095842
--- /dev/null
+++ b/comms/qpage/files/qpage.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/bin/qpage ] && ${PREFIX}/bin/qpage -q10 && echo -n ' qpage'
+	;;
+stop)
+	killall qpage && echo -n ' qpage'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0