10 files changed, 10 insertions, 4 deletions

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 564b68ac146c..eddc2187d33e 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-perl
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT=	Version control system with Perl bindings
+CONFLICTS=      subversion-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index e97af8ee46a8..ce510c67346a 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-python
 
 MAINTAINER=	thinker@branda.to
 COMMENT=	Version control system with Python bindings
+CONFLICTS=      subversion-[0-9]* subversion-perl-[0-9]* subversion-ruby-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index 034debd91338..a4f415e6c0b4 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-ruby
 
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	Version control system with Ruby bindings
+CONFLICTS=      subversion-[0-9]* subversion-perl-[0-9]* subversion-python-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 491f256403ae..9cbb65ac95ca 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
-CONFLICTS=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+CONFLICTS?=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 491f256403ae..9cbb65ac95ca 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
-CONFLICTS=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+CONFLICTS?=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
diff --git a/devel/subversion-perl/Makefile b/devel/subversion-perl/Makefile
index 564b68ac146c..eddc2187d33e 100644
--- a/devel/subversion-perl/Makefile
+++ b/devel/subversion-perl/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-perl
 
 MAINTAINER=	autrijus@autrijus.org
 COMMENT=	Version control system with Perl bindings
+CONFLICTS=      subversion-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
diff --git a/devel/subversion-python/Makefile b/devel/subversion-python/Makefile
index e97af8ee46a8..ce510c67346a 100644
--- a/devel/subversion-python/Makefile
+++ b/devel/subversion-python/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-python
 
 MAINTAINER=	thinker@branda.to
 COMMENT=	Version control system with Python bindings
+CONFLICTS=      subversion-[0-9]* subversion-perl-[0-9]* subversion-ruby-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
diff --git a/devel/subversion-ruby/Makefile b/devel/subversion-ruby/Makefile
index 034debd91338..a4f415e6c0b4 100644
--- a/devel/subversion-ruby/Makefile
+++ b/devel/subversion-ruby/Makefile
@@ -9,6 +9,7 @@ PKGNAMESUFFIX=	-ruby
 
 MAINTAINER=	don@na.rim.or.jp
 COMMENT=	Version control system with Ruby bindings
+CONFLICTS=      subversion-[0-9]* subversion-perl-[0-9]* subversion-python-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 491f256403ae..9cbb65ac95ca 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
-CONFLICTS=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+CONFLICTS?=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 491f256403ae..9cbb65ac95ca 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	lev@freebsd.org
 COMMENT=	Version control system
 
-CONFLICTS=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+CONFLICTS?=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2