Skip site navigation (1)Skip section navigation (2)
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:   ports/61560: [PATCH] mail/p5-Mail-SpamAssassin: small fixes
Message-ID:  <E1AiQ94-0006Rs-7v@Current.sem-home.ciam.ru>
Resent-Message-ID: <200401190340.i0J3eCd7062818@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         61560
>Category:       ports
>Synopsis:       [PATCH] mail/p5-Mail-SpamAssassin: small fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 18 19:40:12 PST 2004
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1AiQ94-0006Rs-7v>