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, 87 insertions, 14 deletions

diff --git a/mail/exim-devel/files/exim.sh b/mail/exim-devel/files/exim.sh
index af298538e310..6e25c5a56d0b 100644
--- a/mail/exim-devel/files/exim.sh
+++ b/mail/exim-devel/files/exim.sh
@@ -1,3 +1,17 @@
 #!/bin/sh
 args='-bd -q30m'
-[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
+
+case "$1" in
+start)
+	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
+	;;
+stop)
+	killall exim && echo -n ' exim'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0
diff --git a/mail/exim-old/files/exim.sh b/mail/exim-old/files/exim.sh
index af298538e310..6e25c5a56d0b 100644
--- a/mail/exim-old/files/exim.sh
+++ b/mail/exim-old/files/exim.sh
@@ -1,3 +1,17 @@
 #!/bin/sh
 args='-bd -q30m'
-[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
+
+case "$1" in
+start)
+	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
+	;;
+stop)
+	killall exim && echo -n ' exim'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0
diff --git a/mail/exim/files/exim.sh b/mail/exim/files/exim.sh
index af298538e310..6e25c5a56d0b 100644
--- a/mail/exim/files/exim.sh
+++ b/mail/exim/files/exim.sh
@@ -1,3 +1,17 @@
 #!/bin/sh
 args='-bd -q30m'
-[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
+
+case "$1" in
+start)
+	[ -x /usr/local/sbin/exim ] && /usr/local/sbin/exim $args && echo -n ' exim'
+	;;
+stop)
+	killall exim && echo -n ' exim'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0
diff --git a/mail/youbin/files/youbind.sh.sample b/mail/youbin/files/youbind.sh.sample
index 19f19a39c06d..25f1c277e55e 100644
--- a/mail/youbin/files/youbind.sh.sample
+++ b/mail/youbin/files/youbind.sh.sample
@@ -5,6 +5,19 @@
 #   If this program is used on your system, great care must be taken
 #   to avoid any security problem.
 #
-if [ -x @PREFIX@/sbin/youbind ]; then
-    @PREFIX@/sbin/youbind ; echo -n ' youbind'
-fi
+
+case "$1" in
+start)
+	if [ -x @PREFIX@/sbin/youbind ]; then
+	    @PREFIX@/sbin/youbind ; echo -n ' youbind'
+	fi
+stop)
+	killall youbind && echo -n ' youbind'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	exit 64
+	;;
+esac
+
+exit 0
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 735e4ac1f67d..31aeca3651ab 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -63,13 +63,8 @@ post-configure:
 		${PKGDIR}/MESSAGE > ${PKGMESSAGE}
 
 post-install:
-	@${ECHO} #!${SH} > ${PREFIX}/etc/rc.d/zmailer.sh.sample
-	@${ECHO} "[ -x ${PREFIX}/sbin/zmailer ] && \
-		${PREFIX}/sbin/zmailer start >/dev/null 2>&1) && \
-		${ECHO} -n \' zmailer\'" \
-		>> ${PREFIX}/etc/rc.d/zmailer.sh.sample
-	@${CHOWN} root:wheel ${PREFIX}/etc/rc.d/zmailer.sh.sample
-	@${CHMOD} a+x ${PREFIX}/etc/rc.d/zmailer.sh.sample
+	@${INSTALL_SCRIPT} ${FILESDIR}/zmailer.sh.sample \
+		 ${PREFIX}/etc/rc.d/zmailer.sh.sample
 
 	${CAT} ${PKGMESSAGE} | ${SED} -e s:@PREFIX@:${PREFIX}:g \
 		-e s:@PORTSDIR@:${PORTSDIR}:g
@@ -82,7 +77,7 @@ post-install:
 	@${ECHO} "# Who do I claim to be?" >> ${PREFIX}/etc/zmailer/mail.conf.sample
 	@${ECHO} 'mydomain=$$orgdomain' >> ${PREFIX}/etc/zmailer/mail.conf.sample
 
-# obdained directly from ports/mail/postfix
+# obtained directly from ports/mail/postfix
 # with minor hacks by the originator of this port <veers@disturbed.net>
 replace:
 	@${ECHO_MSG} "===> Replacing sendmail"
diff --git a/mail/zmailer/files/zmailer.sh.sample b/mail/zmailer/files/zmailer.sh.sample
new file mode 100644
index 000000000000..63cc33d27277
--- /dev/null
+++ b/mail/zmailer/files/zmailer.sh.sample
@@ -0,0 +1,23 @@
+#!/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/zmailer ] && \
+		${PREFIX}/sbin/zmailer start >/dev/null 2>&1 && \
+		echo -n ' zmailer'
+	;;
+stop)
+	# just a wild guess
+	# ${PREFIX}/sbin/zmailer stop && echo -n ' zmailer'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0