summaryrefslogtreecommitdiff
path: root/lang/jdk
diff options
context:
space:
mode:
authorjwise <jwise>1998-12-17 21:45:13 +0000
committerjwise <jwise>1998-12-17 21:45:13 +0000
commit75084ee10e87e70d58aaddd678378bc5b87012bc (patch)
tree95038f3d41b22a9a624b5530edf8209004800826 /lang/jdk
parent10a0670d7e61e0148aee276101b8b6c95ac59d2d (diff)
downloadpkgsrc-75084ee10e87e70d58aaddd678378bc5b87012bc.tar.gz
make this conflict with jdk-1.1.5b1
Diffstat (limited to 'lang/jdk')
-rw-r--r--lang/jdk/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 6f3128a8149..65a7ae850d8 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -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