From a08a210f0b87b88450df8585125e4df528e6ddb6 Mon Sep 17 00:00:00 2001
From: okan <okan@openbsd.org>
Date: Thu, 9 Dec 2010 01:47:31 +0000
Subject: [PATCH] - add rc script - no need for groff - remove MESSAGE since
 the remaining relevant snippet is in the manpage (maintainer timeout)

feedback and ok ajacoutot@
---
 mail/milter-spamd/Makefile            |  5 ++---
 mail/milter-spamd/pkg/MESSAGE         | 14 --------------
 mail/milter-spamd/pkg/PLIST           |  9 +++++----
 mail/milter-spamd/pkg/milter_spamd.rc | 13 +++++++++++++
 4 files changed, 20 insertions(+), 21 deletions(-)
 delete mode 100644 mail/milter-spamd/pkg/MESSAGE
 create mode 100644 mail/milter-spamd/pkg/milter_spamd.rc

diff --git a/mail/milter-spamd/Makefile b/mail/milter-spamd/Makefile
index 33a1372c88c..f7f24b52474 100644
--- a/mail/milter-spamd/Makefile
+++ b/mail/milter-spamd/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/19 07:23:07 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/12/09 01:47:31 okan Exp $
 
 COMMENT=	sendmail milter plugin for SpamAssassin spamd
 
 DISTNAME=	milter-spamd-0.5
-REVISION =	0
+REVISION =	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/
 
@@ -18,7 +18,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c pthread milter
 
-USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
 do-configure:
diff --git a/mail/milter-spamd/pkg/MESSAGE b/mail/milter-spamd/pkg/MESSAGE
deleted file mode 100644
index cb284bf9825..00000000000
--- a/mail/milter-spamd/pkg/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-milter-spamd has been installed as ${PREFIX}/libexec/milter-spamd.
-See milter-spamd(8) for instructions on how to register the plugin.
-
-To start the plugin automatically on startup, one can use:
-
-/etc/rc.conf.local
-milter_spamd=""
-
-/etc/rc.local
-if [ X"${milter_spamd}" != X"NO" -a \
-     -x ${PREFIX}/libexec/milter-spamd ]; then
-        echo -n ' milter-spamd'
-        ${PREFIX}/libexec/milter-spamd ${milter_spamd}
-fi
diff --git a/mail/milter-spamd/pkg/PLIST b/mail/milter-spamd/pkg/PLIST
index d149870b58b..8010053a53e 100644
--- a/mail/milter-spamd/pkg/PLIST
+++ b/mail/milter-spamd/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/11/25 00:37:47 alek Exp $
+@comment $OpenBSD: PLIST,v 1.5 2010/12/09 01:47:31 okan Exp $
 @newgroup _milter-spamd:532
 @newuser _milter-spamd:532:_milter-spamd:daemon:milter-spamd Account:/nonexistent:/sbin/nologin
-libexec/milter-spamd
+@bin libexec/milter-spamd
 @man man/man8/milter-spamd.8
+@rcscript ${RCDIR}/milter_spamd
+@mode 700
 @owner _milter-spamd
 @group _milter-spamd
-@mode 700
 @sample /var/spool/milter-spamd/
-@extraunexec rm -fr /var/spool/milter-spamd
+@extraunexec rm -rf /var/spool/milter-spamd
diff --git a/mail/milter-spamd/pkg/milter_spamd.rc b/mail/milter-spamd/pkg/milter_spamd.rc
new file mode 100644
index 00000000000..c82ad9ff9d2
--- /dev/null
+++ b/mail/milter-spamd/pkg/milter_spamd.rc
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $OpenBSD: milter_spamd.rc,v 1.1 2010/12/09 01:47:31 okan Exp $
+
+. /etc/rc.d/rc.subr
+
+daemon="${TRUEPREFIX}/libexec/milter-spamd"
+
+rc_reload() {
+	rc_err "$0: reload is not supported"
+}
+
+rc_cmd $1