aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authormandree <mandree@FreeBSD.org>2011-08-31 18:32:13 +0800
committermandree <mandree@FreeBSD.org>2011-08-31 18:32:13 +0800
commit051491d6fab173287330ebc04cef7b107c180070 (patch)
treec5f55bc28d7d59f14a650f170304a1afb4b6150b /mail
parenta75b83532bd95393538fa05fa5e61d2df69a6f71 (diff)
downloadfreebsd-ports-gnome-051491d6fab173287330ebc04cef7b107c180070.tar.gz
freebsd-ports-gnome-051491d6fab173287330ebc04cef7b107c180070.tar.zst
freebsd-ports-gnome-051491d6fab173287330ebc04cef7b107c180070.zip
Demote CONFLICTS to CONFLICTS_INSTALL.
Bump PORTREVISION on slave ports to pull in master port bugfix for trainbogo.sh.
Diffstat (limited to 'mail')
-rw-r--r--mail/bogofilter-sqlite/Makefile4
-rw-r--r--mail/bogofilter-tc/Makefile4
-rw-r--r--mail/bogofilter/Makefile2
3 files changed, 5 insertions, 5 deletions
diff --git a/mail/bogofilter-sqlite/Makefile b/mail/bogofilter-sqlite/Makefile
index 5d38b987144b..2be9f82df606 100644
--- a/mail/bogofilter-sqlite/Makefile
+++ b/mail/bogofilter-sqlite/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bogofilter
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
PKGNAMESUFFIX= -sqlite
@@ -14,7 +14,7 @@ MAINTAINER= mandree@FreeBSD.org
USE_SQLITE= 3
-CONFLICTS= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
+CONFLICTS_INSTALL= bogofilter-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
CONFIGURE_ARGS= --with-database=sqlite
BF_CPPFLAGS= -I${LOCALBASE}/include
diff --git a/mail/bogofilter-tc/Makefile b/mail/bogofilter-tc/Makefile
index d2d8b1b227fc..340986e6a65c 100644
--- a/mail/bogofilter-tc/Makefile
+++ b/mail/bogofilter-tc/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= bogofilter
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
PKGNAMESUFFIX= -tc
@@ -15,7 +15,7 @@ MAINTAINER= mandree@FreeBSD.org
LIB_DEPENDS= tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet
-CONFLICTS= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]*
+CONFLICTS_INSTALL= bogofilter-[0-9]* [a-z][a-z]-bogofilter-[1-9]* bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]*
CONFIGURE_ARGS= --with-database=tokyocabinet
BF_CPPFLAGS= -I${LOCALBASE}/include
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index f816d7b46581..243f009f3b00 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -22,7 +22,7 @@ USE_BDB= 41+
OPTIONS= GSL "Link with system-wide GSL dynamically (recommended)" on
OPTIONS+= UNICODE "Normalize tokens to Unicode (UTF-8)" on
-CONFLICTS?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
+CONFLICTS_INSTALL?= bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
USE_BZIP2= yes
USE_PERL5_RUN= yes