From sem@ciam.ru  Sun Jan 18 19:32:09 2004
Return-Path: <sem@ciam.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 810BD16A4CE; Sun, 18 Jan 2004 19:32:09 -0800 (PST)
Received: from hueymiccailhuitl.mtu.ru (hueytecuilhuitl.mtu.ru [195.34.32.123])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A593143D1D; Sun, 18 Jan 2004 19:32:07 -0800 (PST)
	(envelope-from sem@ciam.ru)
Received: from Current.sem-home.ciam.ru (ppp132-49.dialup.mtu-net.ru [62.118.132.49])
	by hueymiccailhuitl.mtu.ru (Postfix) with ESMTP
	id D5115180D2A; Mon, 19 Jan 2004 06:32:05 +0300 (MSK)
	(envelope-from sem@ciam.ru)
Received: from root by Current.sem-home.ciam.ru with local (Exim 4.30; FreeBSD)
	id 1AiQ94-0006Rs-7v; Mon, 19 Jan 2004 06:32:10 +0300
Message-Id: <E1AiQ94-0006Rs-7v@Current.sem-home.ciam.ru>
Date: Mon, 19 Jan 2004 06:32:10 +0300
From: Sergey Matveychuk <sem@ciam.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: perl@FreeBSD.org
Subject: [PATCH] mail/p5-Mail-SpamAssassin: small fixes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61560
>Category:       ports
>Synopsis:       [PATCH] mail/p5-Mail-SpamAssassin: small fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    perl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 18 19:40:12 PST 2004
>Closed-Date:    Mon Jan 19 02:15:51 PST 2004
>Last-Modified:  Mon Jan 19 02:15:51 PST 2004
>Originator:     Sergey Matveychuk
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD Current.sem-home.ciam.ru 5.2-RELEASE FreeBSD 5.2-RELEASE #6: Sat Jan 17 16:12:04 MSK 2004
>Description:
[DESCRIBE CHANGES]
- change spaces to tab to make portlint a little happier
- allow users override RC_DIR and RC_SUFX
- fix install spamd.sh in RC_DIR, not PREFIX/etc/rc.d
- do not pollute WRKSRC with generated files, use WRKDIR instead
	(it's IMHO better style)

Port maintainer (perl@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:

--- p5-Mail-SpamAssassin-2.61_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/mail/p5-Mail-SpamAssassin.orig/Makefile /usr/ports/mail/p5-Mail-SpamAssassin/Makefile
--- /usr/ports/mail/p5-Mail-SpamAssassin.orig/Makefile	Mon Jan 19 06:02:42 2004
+++ /usr/ports/mail/p5-Mail-SpamAssassin/Makefile	Mon Jan 19 06:23:59 2004
@@ -52,11 +52,11 @@
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
-SED_SCRIPT=     -e 's|%%PREFIX%%|${PREFIX}|g'
+SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
 
 USE_RC_SUBR=	yes
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
+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'
@@ -72,11 +72,11 @@
 	@${MV} ${WRKSRC}/Makefile.PL.sed ${WRKSRC}/Makefile.PL
 
 post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/spamd.sh > ${WRKSRC}/spamd.sh
+	@${SED} ${SED_SCRIPT} ${FILESDIR}/spamd.sh > ${WRKDIR}/spamd.sh
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
-	${INSTALL_SCRIPT} ${WRKSRC}/spamd.sh ${PREFIX}/etc/rc.d/spamd${RC_SUFX}
+	${INSTALL_SCRIPT} ${WRKDIR}/spamd.sh ${RC_DIR}/spamd${RC_SUFX}
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
--- p5-Mail-SpamAssassin-2.61_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl  
Responsible-Changed-By: krion 
Responsible-Changed-When: Mon Jan 19 00:13:52 PST 2004 
Responsible-Changed-Why:  
Over to maintainers. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61560 
Responsible-Changed-From-To: perl->mat 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Jan 19 00:35:15 PST 2004 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61560 
State-Changed-From-To: open->closed 
State-Changed-By: mat 
State-Changed-When: Mon Jan 19 01:47:45 PST 2004 
State-Changed-Why:  
Committed, thanks 


Responsible-Changed-From-To: mat->perl 
Responsible-Changed-By: mat 
Responsible-Changed-When: Mon Jan 19 01:47:45 PST 2004 
Responsible-Changed-Why:  
reassign to perl@ 

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