- add CONFLICTS

Submitted by:   eikemeier@fillmore-labs.com
Approved by:    kris

27 files changed, 43 insertions, 0 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 41c375722877..c4040169345b 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -31,6 +31,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index c4492982d8d9..7dfc7ba13a0e 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -33,6 +33,7 @@ PATCHFILES=	postfix-2.0-ns-mx-acl-patch.gz
 MAINTAINER=	khera@kciLink.com
 COMMENT=	A secure alternative to widely-used Sendmail
 
+CONFLICTS=	courier-0.* postfix-1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
 USE_SUBMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 8a5ef8af0834..ceebfed9eb6a 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/mail/zmailer/src/
 MAINTAINER=	veers@disturbed.net
 COMMENT=	A fully functional fast, robust SMTP server and transport agent
 
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.*
 GNU_CONFIGURE=	yes
 
 .if defined(WITH_SSL)
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index d827aec8d45f..5c4631babd0b 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 
 LOGDIR?=	/var/log
 
+CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index d827aec8d45f..5c4631babd0b 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm \
 
 LOGDIR?=	/var/log
 
+CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile
index 3bc93daa80e8..14bd5d636217 100644
--- a/net/gnu-radius/Makefile
+++ b/net/gnu-radius/Makefile
@@ -16,6 +16,7 @@ COMMENT=	GNU RADIUS server
 
 #MAKEFILE=	Makefile
 
+CONFLICTS=	freeradius-0.* openradius-0.* radiusd-cistron-1.*
 USE_SUBMAKE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 782c0ff98ea8..4ff300c5a4f5 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=  http://www.xs4all.nl/~evbergen/openradius/download/ \
 MAINTAINER=    jettea46@yahoo.com
 COMMENT=       A RADIUS server with some actual documentation
 
+CONFLICTS=	freeradius-0.* gnu-radius-1.* radiusd-cistron-1.*
 CONFIGURE_ARGS=     --prefix={$PREFIX}
 
 CC ?= gcc
diff --git a/net/suckblow/Makefile b/net/suckblow/Makefile
index 642df5f97b30..9353b6786587 100644
--- a/net/suckblow/Makefile
+++ b/net/suckblow/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	archie
 MAINTAINER=	archie@freebsd.org
 COMMENT=	Two companion utilities for transferring data over a TCP socket
 
+CONFLICTS=	suck-4.* suck-cnews-4.*
 MAN1=		suck.1
 MLINKS=		suck.1 blow.1
 MANCOMPRESSED=	maybe
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 90dd7ec4a9fb..3e2ff56d9be5 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -20,6 +20,7 @@ DISTNAME=	ssh-${PORTVERSION}
 MAINTAINER=	marius@alchemy.franken.de
 COMMENT=	Secure shell client and server (remote login program)
 
+CONFLICTS=	openssh-* openssh-portable-* openssh-gssapi-* ssh-1.*
 GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index b681bd4553d1..1cf8c0b64145 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -17,6 +17,9 @@ PATCHFILES=	apache-1.3.28-v6-20030912.diff.gz
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	The extremely popular Apache http server.  Very fast, very clean
 
+CONFLICTS=	apache+modssl-1.* apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 USE_PERL5=      yes
 
 DATADIR=${PREFIX}/www
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index a6c9b5120f73..193c2ee29f93 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -22,6 +22,9 @@ COMMENT=	The Apache webserver with MS Frontpage Module
 #PATCH_SITE_SUBDIR=	patches/apply_to_${PORTVERSION}/
 #PATCHFILES=
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache-2.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 APACHE=		${DISTNAME}${EXTRACT_SUFX}
 
 RUN_DEPENDS=	${LOCALBASE}/frontpage/version5.0/bin/owsadm.exe:${PORTSDIR}/www/frontpage
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 2a6c27f69ad7..e9ec60f51b50 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -20,6 +20,9 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache-1.* apache-2.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 APACHE_VERSION=		1.3.28
 APACHE_SSL_VERSION=	1.49
 USE_OPENSSL=		yes
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 1a2a1a784185..bf32ad1d3d37 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -19,6 +19,9 @@ DISTNAME=	apache_${PORTVERSION}
 MAINTAINER=	ache@freebsd.org
 COMMENT=	The extremely popular Apache http server.  Very fast, very clean
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-2.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 USE_PERL5=      yes
 
 DATADIR=${PREFIX}/www
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index bd01b4db945b..13273027dd1a 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -18,6 +18,9 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
 
 WITH_MPM?=	prefork # or worker, perchild
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index bd01b4db945b..13273027dd1a 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -18,6 +18,9 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
 
 WITH_MPM?=	prefork # or worker, perchild
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index bd01b4db945b..13273027dd1a 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -18,6 +18,9 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
 
 WITH_MPM?=	prefork # or worker, perchild
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index bd01b4db945b..13273027dd1a 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -18,6 +18,9 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
+CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+		caudium-devel-1.* caudium10-1.* caudium12-* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
 
 WITH_MPM?=	prefork # or worker, perchild
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index c033f2d774c9..5e8ffa30c3b9 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -21,6 +21,7 @@ DIST_SUBDIR=	openmotif
 MAINTAINER=	steve@FreeBSD.org
 COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
 
+CONFLICTS=	lesstif-*
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes