From martin@mail.tradex.sk  Mon Sep 29 18:18:18 2003
Return-Path: <martin@mail.tradex.sk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9FBA116A4B3
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Sep 2003 18:18:18 -0700 (PDT)
Received: from mail.tradex.sk (tradex.sk [81.0.229.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BE17044029
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 29 Sep 2003 18:18:17 -0700 (PDT)
	(envelope-from martin@mail.tradex.sk)
Received: from localhost (tradex.sk [81.0.229.33])
	by mail.tradex.sk (Postfix) with ESMTP id 8C18725FBA
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 30 Sep 2003 03:18:16 +0200 (CEST)
Received: by mail.tradex.sk (Postfix, from userid 1007)
	id 72C1125FBB; Tue, 30 Sep 2003 03:18:15 +0200 (CEST)
Message-Id: <20030930011815.72C1125FBB@mail.tradex.sk>
Date: Tue, 30 Sep 2003 03:18:15 +0200 (CEST)
From: Martin Matuska <martin@tradex.sk>
Reply-To: Martin Matuska <martin@tradex.sk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] mail/p5-Mail-SpamAssassin 2.60
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         57384
>Category:       ports
>Synopsis:       [PATCH] mail/p5-Mail-SpamAssassin - use rc_subr
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    perl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 29 18:20:08 PDT 2003
>Closed-Date:    Tue Jan 13 00:29:36 PST 2004
>Last-Modified:  Tue Jan 13 00:29:36 PST 2004
>Originator:     Martin Matuska
>Release:        FreeBSD 4.8-RELEASE-p10 i386
>Organization:
>Environment:
FreeBSD 4.8-RELEASE-p10 i386
>Description:
	This patch adds rc_subr support to spamd daemon
	of the spamassassin port.

>How-To-Repeat:
>Fix:
--- Makefile.orig	Tue Sep 30 03:00:54 2003
+++ Makefile	Tue Sep 30 03:08:07 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	2.60
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://spamassassin.org/released/ \
 		${MASTER_SITE_PERL_CPAN}
@@ -52,6 +53,17 @@
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
+SED_SCRIPT=     -e 's|%%PREFIX%%|${PREFIX}|g'
+
+USE_RC_SUBR=	yes
+RC_DIR=		${PREFIX}/etc/rc.d
+RC_SUFX=	.sh
+SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
+		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
+		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
+PLIST_SUB+=	RC_DIR=${RC_DIR} \
+		RC_SUFX=${RC_SUFX}
+
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
@@ -60,9 +72,12 @@
 		${WRKSRC}/Makefile.PL > ${WRKSRC}/Makefile.PL.sed
 	@${MV} ${WRKSRC}/Makefile.PL.sed ${WRKSRC}/Makefile.PL
 
+post-build:
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/spamd.sh > ${WRKSRC}/spamd.sh
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
-	${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh-dist
+	${INSTALL_SCRIPT} ${WRKSRC}/spamd.sh ${PREFIX}/etc/rc.d/spamd${RC_SUFX}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
--- files/spamd.sh.orig	Tue Sep 30 02:54:33 2003
+++ files/spamd.sh	Tue Sep 30 03:12:07 2003
@@ -1,19 +1,41 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-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/spamd ] && ${PREFIX}/bin/spamd -a -c -d && echo -n ' spamd'
-	;;
-stop)
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+# PROVIDE: spamd
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: FreeBSD shutdown
 
-exit 0
+#
+# Add the following lines to /etc/rc.conf to enable spamd:
+#
+#spamd_enable="YES"
+#
+# See spamd(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=spamd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/bin/spamd
+pidfile=/var/run/spamd.pid
+required_dirs=%%PREFIX%%/share/spamassassin
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+  rm -f $pidfile
+}
+
+# set defaults
+
+spamd_enable=${spamd_enable:-"NO"}
+spamd_flags=${spamd_flags:-"-a -c -d -r ${pidfile}"}
+
+load_rc_config $name
+run_rc_command "$1"
--- pkg-plist.orig	Tue Sep 30 03:05:15 2003
+++ pkg-plist	Tue Sep 30 03:05:36 2003
@@ -3,7 +3,7 @@
 bin/spamc
 bin/spamd
 etc/mail/spamassassin/local.cf.sample
-etc/rc.d/spamd.sh-dist
+etc/rc.d/spamd%%RC_SUFX%%
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AuditMessage.pm
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dougb  
Responsible-Changed-By: krion 
Responsible-Changed-When: Mon Sep 29 22:16:24 PDT 2003 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57384 
Responsible-Changed-From-To: dougb->perl 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Dec 24 14:24:02 PST 2003 
Responsible-Changed-Why:  
DougB has passed maintainership of this port to the perl@ mailing 
list, so reassign this PR as well. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57384 

From: Edwin Groothuis <edwin@freebsd.org>
To: perl@freebsd.org,
	FreeBSD Gnats Submit <freebsd-gnats-submit@freebsd.org>
Cc:  
Subject: ports/57384 - [PATCH] mail/p5-Mail-SpamAssassin - use rc_subr
Date: Mon, 12 Jan 2004 11:50:04 +1100

 Hello Perl group
 
 In PR ports/57384 (http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57384)
 there is a patch to convert the rc.d script of SpamAssassin to an
 rc_subr script.
 
 Could you please give an approve / not approved for this patch?
 
 Edwin
 
 -- 
 Edwin Groothuis
 edwin@freebsd.org
 http://www.mavetju.org

From: Mathieu Arnold <mat@mat.cc>
To: Edwin Groothuis <edwin@freebsd.org>,
	FreeBSD Gnats Submit <freebsd-gnats-submit@freebsd.org>
Cc:  
Subject: Re: ports/57384 - [PATCH] mail/p5-Mail-SpamAssassin - use rc_subr
Date: Mon, 12 Jan 2004 16:25:13 +0100

 +-Le 12/01/2004 11:50 +1100, Edwin Groothuis =E9crivait :
 | Hello Perl group
 |=20
 | In PR ports/57384 =
 (http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/57384)
 | there is a patch to convert the rc.d script of SpamAssassin to an
 | rc_subr script.
 |=20
 | Could you please give an approve / not approved for this patch?
 |=20
 | Edwin
 
 Well, I don't understand rc_subr still (lack of time), but I approve it if
 you do understand it, as it would be a great benefit.
 
 --=20
 Mathieu Arnold

From: Sergey Matveychuk <sem@ciam.ru>
To: Edwin Groothuis <edwin@freebsd.org>
Cc: perl@freebsd.org,
	FreeBSD Gnats Submit <freebsd-gnats-submit@freebsd.org>
Subject: Re: ports/57384 - [PATCH] mail/p5-Mail-SpamAssassin - use rc_subr
Date: Mon, 12 Jan 2004 18:42:49 +0300

 Edwin Groothuis wrote:
 
 > Hello Perl group
 > 
 > In PR ports/57384 (http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57384)
 > there is a patch to convert the rc.d script of SpamAssassin to an
 > rc_subr script.
 > 
 > Could you please give an approve / not approved for this patch?
 
 I'll test it.
 
 -- 
 Sem.

From: Sergey Matveychuk <sem@ciam.ru>
To: Edwin Groothuis <edwin@freebsd.org>
Cc: perl@freebsd.org,
	FreeBSD Gnats Submit <freebsd-gnats-submit@freebsd.org>
Subject: Re: ports/57384 - [PATCH] mail/p5-Mail-SpamAssassin - use rc_subr
Date: Mon, 12 Jan 2004 23:22:49 +0300

 Edwin Groothuis wrote:
 > Hello Perl group
 > 
 > In PR ports/57384 (http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57384)
 > there is a patch to convert the rc.d script of SpamAssassin to an
 > rc_subr script.
 > 
 > Could you please give an approve / not approved for this patch?
 > 
 > Edwin
 > 
 
 I've tested it. It works fine. I'll take it in production use.
 So, I approve it.
 
 ---
 Sem.
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Tue Jan 13 00:29:32 PST 2004 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=57384 
>Unformatted:
