From owner-freebsd-perl@FreeBSD.ORG  Sun Jan 18 19:32:09 2004
Return-Path: <owner-freebsd-perl@FreeBSD.ORG>
Delivered-To: freebsd-perl@freebsd.org
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
To: FreeBSD-gnats-submit@freebsd.org
From: Sergey Matveychuk <sem@ciam.ru>
X-send-pr-version: 3.113
X-GNATS-Notify: 
Message-Id: <E1AiQ94-0006Rs-7v@Current.sem-home.ciam.ru>
Date: Mon, 19 Jan 2004 06:32:10 +0300
cc: perl@FreeBSD.org
Subject: [PATCH] mail/p5-Mail-SpamAssassin: small fixes
X-BeenThere: freebsd-perl@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: maintainer of a number of perl-related ports
	<freebsd-perl.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-perl>,
	<mailto:freebsd-perl-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-perl>
List-Post: <mailto:freebsd-perl@freebsd.org>
List-Help: <mailto:freebsd-perl-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-perl>,
	<mailto:freebsd-perl-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2004 03:32:09 -0000


>Submitter-Id:	current-users
>Originator:	Sergey Matveychuk
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] mail/p5-Mail-SpamAssassin: small fixes
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 5.2-RELEASE i386
>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 ---