cvs commit: ports/mail/p5-Mail-SpamAssassin Makefile

[David O'Brien]

On Mon, Jan 19, 2004 at 02:15:09AM -0800, Mathieu Arnold wrote:
> mat         2004/01/19 02:15:09 PST
> 
>   FreeBSD ports repository
> 
>   Modified files:
>     mail/p5-Mail-SpamAssassin Makefile 
>   Log:
>   - 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

WHY??  rc scripts live in <PREFIX>/etc/rc.d peroid.
Please make this port always ahear to our standards.  There is no need to
make ever little thing overrideable as that will only encourage people to
try to do weird things we don't support.

Also it is well known that one can turn off a packages's rc script by
renaming the rc script such that it doesn't have a ".sh" extention.  It
is our defacto standard that packages rc scripts have ".sh" as their
extention, again please don't encourage a wide sweaping change.

Note that pkg-plist and spamd.sh were broken WRT RC_DIR -- neither did
anything with it.  I'd like to commit this patch to make this port to
follow the FreeBSD Ports estabished ways:


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile	19 Jan 2004 15:44:37 -0000	1.53
+++ Makefile	19 Jan 2004 16:30:22 -0000
@@ -42,14 +42,8 @@
 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}
-
+SED_SCRIPT+=	-e 's|%%PREFIX%%|${PREFIX}|g' \
+		-e 's|%%RC_SUBR%%|${RC_SUBR}|g'
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
@@ -63,7 +57,7 @@
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
-	${INSTALL_SCRIPT} ${WRKDIR}/spamd.sh ${RC_DIR}/spamd${RC_SUFX}
+	${INSTALL_SCRIPT} ${WRKDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/mail/p5-Mail-SpamAssassin/pkg-plist,v
retrieving revision 1.20
diff -u -r1.20 pkg-plist
--- pkg-plist	13 Jan 2004 08:29:28 -0000	1.20
+++ pkg-plist	19 Jan 2004 16:30:22 -0000
@@ -3,7 +3,7 @@
 bin/spamc
 bin/spamd
 etc/mail/spamassassin/local.cf.sample
-etc/rc.d/spamd%%RC_SUFX%%
+etc/rc.d/spamd.sh
 %%SITE_PERL%%/Mail/SpamAssassin.pm
 %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
 %%SITE_PERL%%/Mail/SpamAssassin/AuditMessage.pm