2 files changed, 39 insertions, 40 deletions

diff --git a/mail/spamd/files/pfspamd.sh b/mail/spamd/files/pfspamd.sh
new file mode 100644
index 000000000000..5f82af096862
--- /dev/null
+++ b/mail/spamd/files/pfspamd.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: pfspamd
+# REQUIRE: NETWORKING
+# BEFORE:  mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable spamd:
+# pfspamd_enable (bool):	Set to "NO" by default.
+#				Set it to "YES" to enable spamd
+# pfspamd_flags (str):		Set to "" by default.
+#				Extra flags passed to start command.
+
+. %%RC_SUBR%%
+
+name="pfspamd"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/libexec/spamd"
+start_postcmd="pfspamd_postcmd"
+restart_postcmd="pfspamd_postcmd"
+
+[ -z "$pfspamd_enable" ]	&& pfspamd_enable="NO"
+[ -z "$pfspamd_flags" ]		&& pfspamd_flags=""
+
+load_rc_config $name
+
+pfspamd_postcmd() 
+{
+	if [ -x %%PREFIX%%/sbin/spamd-setup ]; then
+		%%PREFIX%%/sbin/spamd-setup
+	fi
+}
+
+run_rc_command "$1"
diff --git a/mail/spamd/files/spamd.sh.sample b/mail/spamd/files/spamd.sh.sample
deleted file mode 100644
index d393e1d00385..000000000000
--- a/mail/spamd/files/spamd.sh.sample
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/spamd/files/Attic/spamd.sh.sample,v 1.1 2003-09-29 23:01:21 edwin Exp $
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    echo "Please use the complete pathname." >&2
-    exit 1
-fi
-
-if [ -z "${source_rc_confs_defined}" ]; then
-	if [ -r /etc/defaults/rc.conf ]; then
-		. /etc/defaults/rc.conf
-		source_rc_confs
-	elif [ -r /etc/rc.conf ]; then
-		. /etc/rc.conf
-	fi
-fi
-
-case "$1" in
-start)
-	case "${spamd_enable}" in
-	    [Yy][Ee][Ss])
-	    echo -n ' spamd'
-	    ${PREFIX}/libexec/spamd ${spamd_flags}
-	    if [ -x ${PREFIX}/sbin/spamd-setup ]; then
-		${PREFIX}/sbin/spamd-setup
-	    fi
-	    ;;
-	esac
-	;;
-stop)
-	killall spamd
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0