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, 60 insertions, 13 deletions

diff --git a/sysutils/healthd/Makefile b/sysutils/healthd/Makefile
index f31214f3e1be..1a3d8c8c6110 100644
--- a/sysutils/healthd/Makefile
+++ b/sysutils/healthd/Makefile
@@ -20,9 +20,7 @@ MAN8=		healthd.8 healthdc.8
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/healthd.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/healthd.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/healthd.sh; \
-		${ECHO} "[ -x ${PREFIX}/bin/healthd ] && ${PREFIX}/bin/healthd > /dev/null && ${ECHO} -n ' healthd'" >> ${PREFIX}/etc/rc.d/healthd.sh; \
-		${CHMOD} 751 ${PREFIX}/etc/rc.d/healthd.sh; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/healthd.sh ${PREFIX}/etc/rc.d/healthd.sh; \
 	fi
 	@if [ ! -f ${PREFIX}/etc/healthd.conf ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/healthd.conf configuration file."; \
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 9fc3d8bb0fac..f4d9b66e80d3 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -51,9 +51,7 @@ post-install:
 	fi
 	@if [ ! -f ${PREFIX}/etc/rc.d/syslog-ng.sh.sample ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/syslog-ng.sh.sample startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
-		${ECHO} "[ -x ${PREFIX}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && ${ECHO} -n ' syslog-ng'" >> ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
-		${CHMOD} 755 ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
+		${INSTALL_SCRIPT} ${FILESDIR}/syslog-ng.sh.sample ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
 	fi
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/sysutils/syslog-ng/files/syslog-ng.sh.sample b/sysutils/syslog-ng/files/syslog-ng.sh.sample
new file mode 100644
index 000000000000..9aff5b0d38eb
--- /dev/null
+++ b/sysutils/syslog-ng/files/syslog-ng.sh.sample
@@ -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}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && echo -n ' syslog-ng'
+	;;
+stop)
+	killall syslog-ng && echo -n ' syslog-ng'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/sysutils/syslog-ng1/Makefile b/sysutils/syslog-ng1/Makefile
index 9fc3d8bb0fac..f4d9b66e80d3 100644
--- a/sysutils/syslog-ng1/Makefile
+++ b/sysutils/syslog-ng1/Makefile
@@ -51,9 +51,7 @@ post-install:
 	fi
 	@if [ ! -f ${PREFIX}/etc/rc.d/syslog-ng.sh.sample ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/syslog-ng.sh.sample startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
-		${ECHO} "[ -x ${PREFIX}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && ${ECHO} -n ' syslog-ng'" >> ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
-		${CHMOD} 755 ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
+		${INSTALL_SCRIPT} ${FILESDIR}/syslog-ng.sh.sample ${PREFIX}/etc/rc.d/syslog-ng.sh.sample; \
 	fi
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/sysutils/syslog-ng1/files/syslog-ng.sh.sample b/sysutils/syslog-ng1/files/syslog-ng.sh.sample
new file mode 100644
index 000000000000..9aff5b0d38eb
--- /dev/null
+++ b/sysutils/syslog-ng1/files/syslog-ng.sh.sample
@@ -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}/sbin/syslog-ng ] && ${PREFIX}/sbin/syslog-ng && echo -n ' syslog-ng'
+	;;
+stop)
+	killall syslog-ng && echo -n ' syslog-ng'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/sysutils/upsmon/files/upsmon.sh b/sysutils/upsmon/files/upsmon.sh
index 3b1c302c4cb7..11a3971819f3 100644
--- a/sysutils/upsmon/files/upsmon.sh
+++ b/sysutils/upsmon/files/upsmon.sh
@@ -1,7 +1,20 @@
 #!/bin/sh
 
-# see !!PREFIX!!/share/doc/upsmon/INSTALL for command line option details
+case $1 in
+start)
+	# see !!PREFIX!!/share/doc/upsmon/INSTALL for command line option details
 
-if [ -x !!PREFIX!!/sbin/upsmond ]; then
-	!!PREFIX!!/sbin/upsmond -p /dev/cuaa0 2>&1 > /dev/null && echo -n ' upsmond'
-fi
+	if [ -x !!PREFIX!!/sbin/upsmond ]; then
+		!!PREFIX!!/sbin/upsmond -p /dev/cuaa0 2>&1 > /dev/null && echo -n ' upsmond'
+	fi
+	;;
+stop)
+	killall updmond && echo -n ' upsmond'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0