diff options
| author | scheidell <scheidell@FreeBSD.org> | 2012-04-18 02:03:59 +0800 |
|---|---|---|
| committer | scheidell <scheidell@FreeBSD.org> | 2012-04-18 02:03:59 +0800 |
| commit | 91558e228d3a6f365680323103a4e61c4ef65c2b (patch) | |
| tree | 34c5e7ac8cb58d6cd923c5b4ba85b3840745dfc7 /mail | |
| parent | cb8f3a650423b018dab419129135090a18807080 (diff) | |
| download | freebsd-ports-gnome-91558e228d3a6f365680323103a4e61c4ef65c2b.tar.gz freebsd-ports-gnome-91558e228d3a6f365680323103a4e61c4ef65c2b.tar.zst freebsd-ports-gnome-91558e228d3a6f365680323103a4e61c4ef65c2b.zip | |
- Fix CONFLICTS glob [1]
- Change OPTIONS= to += to support p5-Mail-SpamAssassin-Alt
- change post-patch: to :: to support p5-Mail-SpamAssassin-Alt
Submitted by: crees@ [1]
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 0408d76f6942..d96af949a262 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -27,7 +27,7 @@ BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ ${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools RUN_DEPENDS:= ${BUILD_DEPENDS} -CONFLICTS?= (ja-)?p5-Mail-SpamAssassin-(devel-)?[0-9]* +CONFLICTS?= ja-p5-Mail-SpamAssassin-[0-9]* p5-Mail-SpamAssassin-devel-[0-9]* p5-Mail-SpamAssassin-Alt-[0-9]* PERL_CONFIGURE= yes USE_PERL5= 5.12+ @@ -41,7 +41,7 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \ LOCALSTATEDIR="${DBDIR}/spamassassin" -OPTIONS= AS_ROOT "Run spamd as root (recommended)" on \ +OPTIONS+= AS_ROOT "Run spamd as root (recommended)" on \ SPAMC "Build spamd/spamc (not for amavisd)" on \ SACOMPILE "sa-compile" off \ DKIM "DKIM/DomainKeys Identified Mail" on \ @@ -159,7 +159,7 @@ SUB_LIST+= RUN_AS_USER="-u ${USERS} -H /var/spool/spamd" SUB_LIST+= RUN_AS_USER="" .endif -post-patch: +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' \ |