diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2014-03-09 18:17:29 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-03-09 18:17:29 +0000 |
| commit | 0986d3661f1712a6dc5a343f028fbe1d87b470fc (patch) | |
| tree | 802a1d60086cc316c35399bf527bc29b12c2907d | |
| parent | c8d14867690fbb5c1f98fcc6a0843dfcc49191cc (diff) | |
| download | ports-0986d3661f1712a6dc5a343f028fbe1d87b470fc.tar.gz ports-0986d3661f1712a6dc5a343f028fbe1d87b470fc.zip | |
Notes
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | mail/Makefile | 1 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin-Alt/Makefile | 21 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 2 |
4 files changed, 2 insertions, 23 deletions
@@ -5619,3 +5619,4 @@ devel/py-gitpython||2014-03-08|Has expired: No more public distfiles net/mars_nwe||2014-03-08|Has expired: No more public distfiles audio/fmio||2014-03-08|Has expired: No more public distfiles audio/libmtp|multimedia/libmtp|2014-03-09|Moved from audio to multimedia +mail/p5-Mail-SpamAssassin-Alt|mail/p5-Mail-SpamAssassin|2014-03-09|Retired; please use mail/p5-Mail-SpamAssassin diff --git a/mail/Makefile b/mail/Makefile index dd9183f4ac22..8bf8f97a2b86 100644 --- a/mail/Makefile +++ b/mail/Makefile @@ -419,7 +419,6 @@ SUBDIR += p5-Mail-Sender SUBDIR += p5-Mail-Sendmail SUBDIR += p5-Mail-SpamAssassin - SUBDIR += p5-Mail-SpamAssassin-Alt SUBDIR += p5-Mail-Spool SUBDIR += p5-Mail-Tools SUBDIR += p5-Mail-Transport-Dbx diff --git a/mail/p5-Mail-SpamAssassin-Alt/Makefile b/mail/p5-Mail-SpamAssassin-Alt/Makefile deleted file mode 100644 index 145e5429853e..000000000000 --- a/mail/p5-Mail-SpamAssassin-Alt/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 1 -PKGNAMESUFFIX= -Alt - -MAINTAINER= adamw@FreeBSD.org -COMMENT= Provides optional SpamAssassin tuning - -CONFLICTS= p5-Mail-SpamAssassin-[0-9]* ja-p5-Mail-SpamAssassin-[0-9]* p5-Mail-SpamAssassin-devel-[0-9]* - -OPTIONS_DEFINE= AWL FREEMAIL -AWL_DESC= Auto WhiteList support -FREEMAIL_DESC= Disable FreeMail support - -post-patch-script: - if [ -n "${PORT_OPTIONS:MAWL}" ]; then ${REINPLACE_CMD} -e '/AWL/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre ; fi - if [ -n "${PORT_OPTIONS:MFREEMAIL}" ]; then ${REINPLACE_CMD} -e '/FreeMail/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v330.pre ; fi - -MASTERDIR= ${.CURDIR}/../p5-Mail-SpamAssassin - -.include "${MASTERDIR}/Makefile" diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index 459edd2e1345..81e097b2ef5c 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -24,7 +24,7 @@ BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \ RUN_DEPENDS= ${BUILD_DEPENDS} \ re2c>=.12.0:${PORTSDIR}/devel/re2c -CONFLICTS?= ja-p5-Mail-SpamAssassin-[0-9]* p5-Mail-SpamAssassin-devel-[0-9]* p5-Mail-SpamAssassin-Alt-[0-9]* +CONFLICTS?= ja-p5-Mail-SpamAssassin-[0-9]* USES= perl5 USE_PERL5= configure |