3 files changed, 46 insertions, 5 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