Fix CONFLICTS (remove redundancy, mostly)

8 files changed, 8 insertions, 24 deletions

diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index 10ac827d453..30dab890a31 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/01/16 12:05:09 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:25 hubertf Exp $
 #
 
 DISTNAME=	ORBit-0.3.90
@@ -12,8 +12,6 @@ HOMEPAGE=	http://www.gnome.org/
 DEPENDS+=	glib-1.1.12:../../devel/glib
 DEPENDS+=	gindent-1.9.1:../../devel/gindent
 
-CONFLICTS=	ORBit-*
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 9afd03e1661..ec1f0a2df1f 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1998/11/04 17:25:12 mycroft Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/20 22:48:36 hubertf Exp $
 #
 
 DISTNAME=	arpwatch-2.1a4
@@ -8,8 +8,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	bouyer@netbsd.org
 
-CONFLICTS=	arpwatch-2.0.2
-
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 7340597103d..5372f02ad58 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/11/26 23:34:13 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:36 hubertf Exp $
 #
 
 DISTNAME=	rsync-2.2.1
@@ -11,8 +11,6 @@ MASTER_SITES=	ftp://samba.anu.edu.au/pub/rsync/  \
 MAINTAINER=     mycroft@netbsd.org
 HOMEPAGE=	http://samba.anu.edu.au/rsync/
 
-CONFLICTS=	rsync-1.6.9 rsync-2.0.18 rsync-2.1.0 rsync-2.1.1
-
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index a2a5b6e6f82..895c0bd93ff 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 1999/02/18 11:50:06 bouyer Exp $
+# $NetBSD: Makefile,v 1.21 1999/02/20 22:48:37 hubertf Exp $
 
 DISTNAME=	samba-2.0.2
 CATEGORIES=	net
@@ -7,8 +7,6 @@ MASTER_SITES=	ftp://ftp.samba.org/pub/samba/
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.samba.org/
 
-CONFLICTS=      samba-1.* samba-2.0.0beta* samba-2.0.0
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 GNU_CONFIGURE=	yes
 
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index d45fe619356..dc1f2fcf23e 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1998/10/07 20:17:20 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/02/20 22:48:37 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
 #
 
@@ -11,8 +11,6 @@ MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/ \
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.ece.ucdavis.edu/ucd-snmp/
 
-CONFLICTS=	ucd-snmp-3.4 ucd-snmp-3.5
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-defaults
 
diff --git a/net/wget/Makefile b/net/wget/Makefile
index efcd3d85c97..6d4830c8a11 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/01/06 05:19:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 1999/02/20 22:48:37 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/22 07:53:29 tg Exp
 #
 
@@ -9,8 +9,6 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/wget/wget.html
 
-CONFLICTS=	wget-1.4.5 wget-1.5.0 wget-1.5.1 wget-1.5.2
-
 GNU_CONFIGURE=	yes
 INFO_FILES=	wget.info
 
diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile
index 98bb8298082..f6f01887bcd 100644
--- a/net/wu-ftpd/Makefile
+++ b/net/wu-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/02/14 15:27:50 rh Exp $
+# $NetBSD: Makefile,v 1.9 1999/02/20 22:48:37 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/12/24 17:45:28 ache Exp
 #
 # REMINDER: to use ftpaccess(5) you need to specify -a in command line,
@@ -15,8 +15,6 @@ EXTRACT_SUFX=   .tar.Z
 MAINTAINER=     rh@netbsd.org
 HOMEPAGE=	http://www.academ.com/academ/wu-ftpd/
 
-CONFLICTS=	wu-ftpd*
-
 MAKE_ENV+=	INSTALL="${INSTALL}"
 MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
diff --git a/net/zircon/Makefile b/net/zircon/Makefile
index f6d97b59aca..f8f54e416da 100644
--- a/net/zircon/Makefile
+++ b/net/zircon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/02/03 13:00:18 frueauf Exp $
+# $NetBSD: Makefile,v 1.4 1999/02/20 22:48:37 hubertf Exp $
 #
 
 DISTNAME=	zircon-1.18.210
@@ -10,8 +10,6 @@ HOMEPAGE=	http://catless.ncl.ac.uk/Programs/Zircon/
 
 DEPENDS+=	tk-8.0p2:../../x11/tk80
 
-CONFLICTS=	zircon-*
-
 IS_INTERACTIVE=	yes
 NO_BUILD=	yes