diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2006-03-20 13:03:33 +0000 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2006-03-20 13:03:33 +0000 |
| commit | 6fa3181f11f9ea07a01646bb2656d035e6fa999a (patch) | |
| tree | 592ad6abbeaabc11ebf07ee88f169d8eb1e6cf9d /mail | |
| parent | 4ff24336d9bb91cad96c462f99b62d36052a3d09 (diff) | |
| download | ports-6fa3181f11f9ea07a01646bb2656d035e6fa999a.tar.gz ports-6fa3181f11f9ea07a01646bb2656d035e6fa999a.zip | |
Use USE_RC_SUBR=sa-spamd.sh and remove some SED's using PLIST_SUB instead
Approved by: maintainer on ICQ
Notes
Notes:
svn path=/head/; revision=157734
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 16 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in (renamed from mail/p5-Mail-SpamAssassin/files/spamd.sh) | 0 |
2 files changed, 6 insertions, 10 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 9a37c421c107..a2e29fa41b2c 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -150,18 +150,17 @@ DOCSCONTRIB= mbox-to-check run-corpora run-masses DOCSLDAP= README README.testing sa_test.ldif PORTDOCS= ${DOCS} sql contrib ldap -USE_RC_SUBR= yes -SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%RC_SUBR%%|${RC_SUBR}|g' +USE_RC_SUBR= sa-spamd.sh + .if defined(WITH_MYSQL) || defined(WITH_PGSQL) -SED_SCRIPT+= -e 's|%%SQL_FLAG%%|-Q|g' +SUB_LIST+= SQL_FLAG="-Q" .else -SED_SCRIPT+= -e 's|%%SQL_FLAG%%||g' +SUB_LIST+= SQL_FLAG="" .endif .if !defined(WITH_AS_ROOT) -SED_SCRIPT+= -e 's|%%RUN_AS_USER%%|-u spamd -H /var/spool/spamd|g' +SUB_LIST+= RUN_AS_USER="-u spamd -H /var/spool/spamd" .else -SED_SCRIPT+= -e 's|%%RUN_AS_USER%%||g' +SUB_LIST+= RUN_AS_USER="" .endif post-patch: @@ -181,9 +180,6 @@ post-patch: ${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre .endif -post-build: - @${SED} ${SED_SCRIPT} ${FILESDIR}/spamd.sh > ${WRKDIR}/sa-spamd.sh - pre-install: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/p5-Mail-SpamAssassin/files/spamd.sh b/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in index 87530ffb70e9..87530ffb70e9 100644 --- a/mail/p5-Mail-SpamAssassin/files/spamd.sh +++ b/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in |