diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2004-01-19 22:28:29 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2004-01-19 22:28:29 +0000 |
| commit | dd6ac8e6c8900e46b9c0192e0c2c02fcda4ab2fa (patch) | |
| tree | 576e62ec2e21d839e05de2c09b216a4d768b96b5 | |
| parent | Upgrade to latest variant from project CVS (diff) | |
Fix problems in RC directory handling, and keep with standards in script
naming. Also remove duplicates in SED_SCRIPT. Portlint.
Approved by: mat
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 17 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/pkg-plist | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 55ccdaa0cca7..1fe24879ba3b 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -39,20 +39,11 @@ MAN1= spamd.1 spamassassin.1 spamc.1 sa-learn.1 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} - +SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%RC_SUBR%%|${RC_SUBR}|g' post-patch: @${FIND} ${WRKSRC} -name \*.orig -delete - @${MV} ${WRKSRC}/rules/local.cf ${WRKSRC}/rules/local.cf.sample @${SED} -e 's#local.cf#local.cf.sample#g' \ ${WRKSRC}/Makefile.PL > ${WRKSRC}/Makefile.PL.sed @@ -63,8 +54,7 @@ post-build: 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} ${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql @@ -72,7 +62,6 @@ post-install: BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \ spamd/README* sql/spamassassin.sql ${DOCSDIR} .endif - @${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE} .include <bsd.port.pre.mk> diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist index 44feac06e10c..f52f5ba92fcb 100644 --- a/mail/p5-Mail-SpamAssassin/pkg-plist +++ b/mail/p5-Mail-SpamAssassin/pkg-plist @@ -3,7 +3,7 @@ bin/spamassassin 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 |