Fix CONFLICTS (remove redundancy, mostly)

6 files changed, 6 insertions, 18 deletions

diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 5ea94a1436e..7bd9d1781f8 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/01/31 23:37:28 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $
 
 DISTNAME=	clispsrc-19990108
 PKGNAME=	clisp-19990108
@@ -8,8 +8,6 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MAINTAINER=	mjl@emsi.priv.at
 HOMEPAGE=	http://clisp.cons.org/~haible/clisp.html
 
-CONFLICTS=	clisp-*
-
 NOT_FOR_ARCHS=	alpha	# severe LP64 problems
 
 MIRROR_DISTFILE=	no
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 3462d8cb241..7645f80cc78 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1998/11/15 21:28:08 frueauf Exp $
+# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:32 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
@@ -9,8 +9,6 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	perry@piermont.com
 HOMEPAGE=	http://www.gnu.org/software/guile/guile.html
 
-CONFLICTS=	guile-1.2
-
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV=	CPPFLAGS="-Dunix" \
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 1363fea765c..feeaee2da0c 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/02/05 16:33:34 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:32 hubertf Exp $
 
 DISTNAME=		jdk1.1.6
 PKGNAME=		jdk-1.1.6
@@ -19,8 +19,6 @@ ONLY_FOR_ARCHS=		i386
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
-CONFLICTS=		jdk-*
-
 do-install:
 	${RM} ${WRKSRC}/README.NetBSD.orig
 	-${MKDIR} ${PREFIX}/java
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 1e42d26d4b9..f4b52beedc9 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/12/08 23:19:49 frueauf Exp $
+# $NetBSD: Makefile,v 1.15 1999/02/20 22:48:33 hubertf Exp $
 #
 
 DISTNAME=	kaffe-1.0.b3
@@ -12,8 +12,6 @@ DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	png-1.0.2:../../graphics/png
 DEPENDS+=	giflib-3.0:../../graphics/giflib
 
-CONFLICTS=	kaffe-0.9.2 kaffe-1.0.b1 kaffe-1.0.b2
-
 ONLY_FOR_ARCHS=	arm32 i386 m68k mips* sparc
 NOT_FOR_ARCHS=	alpha	#assembler problems
 
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 190333dd208..216ac109f09 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/12/07 11:11:40 frueauf Exp $
+# $NetBSD: Makefile,v 1.7 1999/02/20 22:48:33 hubertf Exp $
 #
 
 DISTNAME=       mos14src
@@ -13,8 +13,6 @@ HOMEPAGE=	http://www.dina.kvl.dk/~sestoft/mosml.html
 
 BUILD_DEPENDS+=	perl:../../lang/perl5
 
-CONFLICTS=	moscow_ml-1.42
-
 ALL_TARGET=	clean world
 
 post-install:
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 280afbe9e9e..91bf4b68c18 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/01/19 14:16:45 jonb Exp $
+# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:33 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/08/27 19:31:37 jmacd Exp
 #
 
@@ -10,8 +10,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER= 	packages@netbsd.org
 HOMEPAGE=	http://www.neci.nj.nec.com/homepages/kelsey/
 
-CONFLICTS=	scheme48-0.46 scheme48-0.51
-
 NOT_FOR_ARCHS=	alpha	# *severe* problems.  Bus error, alignment
 
 GNU_CONFIGURE=  yes