2 files changed, 50 insertions, 25 deletions

diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index c86990300aca..4fa08c7aab9d 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vbsfilter
 PORTVERSION=	1.15
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://aeschi.ch.eu.org/milter/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -16,8 +17,8 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A vbs-attachment filter for Sendmail Milter
 
-SUB_FILES=	vbsfilter.sh
-PLIST_FILES=	libexec/vbsfilter etc/rc.d/vbsfilter.sh.sample
+USE_RC_SUBR=	vbsfilter.sh
+PLIST_FILES=	libexec/vbsfilter
 
 CTARGETS+=	vbsfilter-${PORTVERSION}
 LIBS+=		${PTHREAD_LIBS}
@@ -48,7 +49,5 @@ do-build:	${CTARGETS}
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-${PORTVERSION} \
 		${PREFIX}/libexec/vbsfilter
-	${INSTALL_SCRIPT} ${WRKDIR}/vbsfilter.sh \
-		${PREFIX}/etc/rc.d/vbsfilter.sh.sample
 
 .include <bsd.port.post.mk>
diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.sh.in
index 58423464eb09..72c1685f342e 100644
--- a/mail/vbsfilter/files/vbsfilter.sh.in
+++ b/mail/vbsfilter/files/vbsfilter.sh.in
@@ -1,23 +1,49 @@
 #!/bin/sh
-#
+
 # $FreeBSD$
-# 
-if ! test -x %%PREFIX%%/libexec/vbsfilter
-then
-	exit 0
-fi
-case "$1" in
-start)
-	rm -f /var/run/vbsfilter
-	%%PREFIX%%/libexec/vbsfilter -p local:/var/run/vbsfilter &&
-	echo -n ' vbsfilter'
-	;;
-stop)
-	killall vbsfilter
-	rm -f /var/run/vbsfilter
-	;;
-*)
-	echo "Usage: ${0##*/}: { start | stop }" >&2
-	exit 64
-	;;
-esac
+
+# Start or stop vbsfilter
+
+# PROVIDE: vbsfilter
+# REQUIRE: DAEMON
+# BEFORE: mail
+# KEYWORD: shutdown
+#
+
+prefix=%%PREFIX%%
+
+# Define these vbsfilter_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/vbsfilter
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+vbsfilter_enable=${vbsfilter_enable:-"NO"}      # Enable vbsfilter-milter
+vbsfilter_socket=${vbsfilter_socket:-"/var/run/vbsfilter"} # Path to socket
+vbsfilter_flags=${vbsfilter_flags:-""} # Flags to vbsfilter
+
+. /etc/rc.subr
+
+name="vbsfilter"
+rcvar=`set_rcvar`
+command="${prefix}/libexec/vbsfilter"
+procname="${command}"
+start_precmd="vbsfilter_prestart"
+stop_postcmd="vbsfilter_poststop"
+
+vbsfilter_prestart() {
+	/bin/rm -f "${vbsfilter_socket}"
+}
+
+vbsfilter_poststop() {
+	/bin/rm -f "${vbsfilter_socket}"
+}
+
+load_rc_config $name
+
+command_args="-p local:${vbsfilter_socket} ${vbsfilter_flags}"
+
+run_rc_command "$1"
+
+# eof