Demote CONFLICTS to CONFLICTS_INSTALL.

Bump PORTREVISION on slave ports to pull in master port bugfix for trainbogo.sh.
This commit is contained in:
Matthias Andree 2011-08-31 10:32:13 +00:00
parent fa640c6e9b
commit d2b93068f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=280836
3 changed files with 5 additions and 5 deletions

View file

@ -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

View file

@ -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

View file

@ -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