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.

14 files changed, 54 insertions, 16 deletions

diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index b57040a..03b9d8a 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -44,9 +44,8 @@ post-install:
 		@${MKDIR} ${PREFIX}/etc/rc.d
 		@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
 			${ECHO} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
-			${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql2.sh; \
-			${ECHO} "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && ${ECHO} -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \
-			${CHMOD} 751 ${PREFIX}/etc/rc.d/msql2.sh; \
+			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2d.sh \
+				${PREFIX}/etc/rc.d/msql2d.sh; \
 		fi
 .if !defined(BATCH)
 		@ /usr/bin/more -e ${FILESDIR}/post-install-notes
diff --git a/databases/msql/files/msql2.sh b/databases/msql/files/msql2.sh
new file mode 100644
index 0000000..4f9ff5c
--- /dev/null
+++ b/databases/msql/files/msql2.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/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'
+	;;
+stop)
+	killall msql2d && echo -n ' msql2d'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index b57040a..03b9d8a 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -44,9 +44,8 @@ post-install:
 		@${MKDIR} ${PREFIX}/etc/rc.d
 		@if [ ! -f ${PREFIX}/etc/rc.d/msql2.sh ]; then \
 			${ECHO} "Installing ${PREFIX}/etc/rc.d/msql2.sh startup file."; \
-			${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/msql2.sh; \
-			${ECHO} "[ -x ${PREFIX}/bin/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && ${ECHO} -n ' msql2'" >> ${PREFIX}/etc/rc.d/msql2.sh; \
-			${CHMOD} 751 ${PREFIX}/etc/rc.d/msql2.sh; \
+			${INSTALL_SCRIPT} -m 751 ${FILESDIR}/msql2d.sh \
+				${PREFIX}/etc/rc.d/msql2d.sh; \
 		fi
 .if !defined(BATCH)
 		@ /usr/bin/more -e ${FILESDIR}/post-install-notes
diff --git a/databases/msql3/files/msql2.sh b/databases/msql3/files/msql2.sh
new file mode 100644
index 0000000..4f9ff5c
--- /dev/null
+++ b/databases/msql3/files/msql2.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/msql2d ] && su -l msql -c 'exec ${PREFIX}/bin/msql2d' > /dev/null 2>&1 & && echo -n ' msql2'
+	;;
+stop)
+	killall msql2d && echo -n ' msql2d'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/databases/mysql322-server/files/mysql-server.sh b/databases/mysql322-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql322-server/files/mysql-server.sh
+++ b/databases/mysql322-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql323-server/files/mysql-server.sh b/databases/mysql323-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql323-server/files/mysql-server.sh
+++ b/databases/mysql323-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql40-server/files/mysql-server.sh b/databases/mysql40-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql40-server/files/mysql-server.sh
+++ b/databases/mysql40-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql41-server/files/mysql-server.sh b/databases/mysql41-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql41-server/files/mysql-server.sh
+++ b/databases/mysql41-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql50-server/files/mysql-server.sh b/databases/mysql50-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql50-server/files/mysql-server.sh
+++ b/databases/mysql50-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql51-server/files/mysql-server.sh b/databases/mysql51-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql51-server/files/mysql-server.sh
+++ b/databases/mysql51-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql54-server/files/mysql-server.sh b/databases/mysql54-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql54-server/files/mysql-server.sh
+++ b/databases/mysql54-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql55-server/files/mysql-server.sh b/databases/mysql55-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql55-server/files/mysql-server.sh
+++ b/databases/mysql55-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/mysql60-server/files/mysql-server.sh b/databases/mysql60-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/mysql60-server/files/mysql-server.sh
+++ b/databases/mysql60-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac
diff --git a/databases/percona55-server/files/mysql-server.sh b/databases/percona55-server/files/mysql-server.sh
index 507a080..0ff5374 100644
--- a/databases/percona55-server/files/mysql-server.sh
+++ b/databases/percona55-server/files/mysql-server.sh
@@ -13,6 +13,6 @@ case "$1" in
 		echo ""
 		echo "Usage: `basename $0` { start | stop }"
 		echo ""
-		exit 1
+		exit 64
 		;;
 esac