diff options
| author | pav <pav@FreeBSD.org> | 2006-01-20 22:55:43 +0000 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2006-01-20 22:55:43 +0000 |
| commit | 847b24a5b35631dfa8fddb1392253dfd5eda48e1 (patch) | |
| tree | 3aef21d3f1fa49b9c6a10f58a6c108f26e0d560f /mail | |
| parent | 648852ffd58a61598d3b928178947f52321b9c00 (diff) | |
| download | FreeBSD-ports-847b24a5b35631dfa8fddb1392253dfd5eda48e1.zip FreeBSD-ports-847b24a5b35631dfa8fddb1392253dfd5eda48e1.tar.gz | |
- Properly treat v310.pre configuration file
- Fix SPF dependency
PR: ports/91379, ports/91864
Submitted by: Petr Rehor <prehor@gmail.com>,
Jarrod Sayers <jarrod@netleader.com.au>
Approved by: perl (tobez, mat)
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 8 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/pkg-plist | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 27f4901..63f87ef 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.1.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan @@ -41,7 +41,7 @@ OPTIONS= AS_ROOT "Run spamd as root (recommended)" on \ .include <bsd.port.pre.mk> .if defined(WITH_SPF_QUERY) -RUN_DEPENDS+= spfd:${PORTSDIR}/mail/p5-Mail-SPF-Query +RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query .endif .if !defined(WITHOUT_SSL) @@ -165,6 +165,7 @@ post-patch: @${FIND} ${WRKSRC} -name \*.orig -delete @${REINPLACE_CMD} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \ -e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \ + -e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \ -e 's/require DBI/0/' \ ${WRKSRC}/Makefile.PL .if defined(WITH_RAZOR) @@ -189,6 +190,9 @@ post-install: @[ -f ${PREFIX}/etc/mail/spamassassin/init.pre ] || \ ${CP} ${PREFIX}/etc/mail/spamassassin/init.pre.sample \ ${PREFIX}/etc/mail/spamassassin/init.pre + @[ -f ${PREFIX}/etc/mail/spamassassin/v310.pre ] || \ + ${CP} ${PREFIX}/etc/mail/spamassassin/v310.pre.sample \ + ${PREFIX}/etc/mail/spamassassin/v310.pre .if defined(WITH_TOOLS) @${MKDIR} ${DATADIR}/tools @for f in ${WRKSRC}/tools/*; do \ diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist index 6abbd30..20df547 100644 --- a/mail/p5-Mail-SpamAssassin/pkg-plist +++ b/mail/p5-Mail-SpamAssassin/pkg-plist @@ -8,7 +8,9 @@ etc/mail/spamassassin/local.cf.sample @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi etc/mail/spamassassin/init.pre.sample @exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre -etc/mail/spamassassin/v310.pre +@unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi +etc/mail/spamassassin/v310.pre.sample +@exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre etc/rc.d/sa-spamd.sh %%SITE_PERL%%/Mail/SpamAssassin.pm %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm |
