Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/lang/jdk/Attic/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pkgsrc/lang/jdk/Attic/Makefile	1998/12/03 23:17:56	1.4
+++ pkgsrc/lang/jdk/Attic/Makefile	1998/12/17 21:45:13	1.5
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/12/03 23:17:56 frueauf Exp $
+# $NetBSD: Makefile,v 1.5 1998/12/17 21:45:13 jwise Exp $
 
 DISTNAME=		jdk116-beta2
 PKGNAME=		jdk-1.1.6b2
@@ -19,6 +19,8 @@ ONLY_FOR_ARCHS=		i386
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
+CONFLICTS=		jdk-1.1.5b1
+
 do-install:
 	${RM} ${WRKSRC}/README.NetBSD.orig
 	-${MKDIR} ${PREFIX}/java