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.

2 files changed, 21 insertions, 3 deletions

diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index 622c66866d7b..e01835a2e849 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -26,9 +26,7 @@ do-install:
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/dhid.sh ]; then \
 		${ECHO} "===>   Installing ${PREFIX}/etc/rc.d/dhid.sh startup file."; \
-		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/dhid.sh; \
-		${ECHO} "[ -x \"${PREFIX}/sbin/dhid\" -a -f \"${PREFIX}/etc/dhid.conf\" ] && ${PREFIX}/sbin/dhid > /dev/null && ${ECHO} -n ' dhid'" >> ${PREFIX}/etc/rc.d/dhid.sh; \
-		${CHMOD} 751 ${PREFIX}/etc/rc.d/dhid.sh; \
+		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhid.sh ${PREFIX}/etc/rc.d/dhid.sh; \
 	fi;
 	@${ECHO} "--------------------------------------------------------------------------"
 	@${ECHO} "Before dhid can run, you will need to register with a DHIS provider."
diff --git a/net/dhid/files/dhid.sh b/net/dhid/files/dhid.sh
new file mode 100644
index 000000000000..510f4ab70d16
--- /dev/null
+++ b/net/dhid/files/dhid.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}/sbin/dhid" -a -f "${PREFIX}/etc/dhid.conf" ] && ${PREFIX}/sbin/dhid > /dev/null && echo -n ' dhid'
+	;;
+stop)
+	killall dhid && echo -n ' dhid'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0