Update jdk from beta2 to 1.1.6. This one should also have all necessary

includes.

4 files changed, 65 insertions, 38 deletions

diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 65a7ae850d8..1363fea765c 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1998/12/17 21:45:13 jwise Exp $
+# $NetBSD: Makefile,v 1.6 1999/02/05 16:33:34 frueauf Exp $
 
-DISTNAME=		jdk116-beta2
-PKGNAME=		jdk-1.1.6b2
+DISTNAME=		jdk1.1.6
+PKGNAME=		jdk-1.1.6
 WRKSRC=			${WRKDIR}/jdk1.1.6
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/misc/java/i386/1.1.6/
@@ -19,7 +19,7 @@ ONLY_FOR_ARCHS=		i386
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
-CONFLICTS=		jdk-1.1.5b1
+CONFLICTS=		jdk-*
 
 do-install:
 	${RM} ${WRKSRC}/README.NetBSD.orig
diff --git a/lang/jdk/files/md5 b/lang/jdk/files/md5
index 57c7f371269..dd499ffa741 100644
--- a/lang/jdk/files/md5
+++ b/lang/jdk/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/12/03 23:17:56 frueauf Exp $
+$NetBSD: md5,v 1.4 1999/02/05 16:33:34 frueauf Exp $
 
-MD5 (jdk116-beta2.tgz) = fa0ce86b8761e7ccf58f227c60db92e1
+MD5 (jdk1.1.6.tgz) = 307572580a22a5f8d302dd56e34b1c7f
diff --git a/lang/jdk/patches/patch-aa b/lang/jdk/patches/patch-aa
index 432b3e7f51c..5c6939cb5f4 100644
--- a/lang/jdk/patches/patch-aa
+++ b/lang/jdk/patches/patch-aa
@@ -1,11 +1,8 @@
-$NetBSD: patch-aa,v 1.1 1998/12/03 23:17:57 frueauf Exp $
+$NetBSD: patch-aa,v 1.2 1999/02/05 16:33:34 frueauf Exp $
 
---- README.NetBSD-orig	Fri Oct 23 06:16:09 1998
-+++ README.NetBSD	Thu Dec  3 23:45:14 1998
-@@ -1,9 +1,9 @@
-                               NetBSD
--                             JDK1.1.5
-+                             JDK1.1.6
+--- README.NetBSD-orig	Fri Dec 11 04:31:31 1998
++++ README.NetBSD	Fri Feb  5 16:47:07 1999
+@@ -16,7 +16,7 @@
  
  This port is based on the FreeBSD port which in turn is based on
  Jeffrey Hsu's original JDK 1.0 port, and is also based on Randy
diff --git a/lang/jdk/pkg/PLIST b/lang/jdk/pkg/PLIST
index f6032e1c0a0..588b06125c1 100644
--- a/lang/jdk/pkg/PLIST
+++ b/lang/jdk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1998/12/03 23:17:57 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/02/05 16:33:34 frueauf Exp $
 java/CHANGES
 java/COPYRIGHT
 java/LICENSE
@@ -6,24 +6,6 @@ java/README
 java/README.NetBSD
 java/bin/.java_wrapper
 java/bin/appletviewer
-java/bin/jar
-java/bin/java
-java/bin/java_g
-java/bin/javac
-java/bin/javac_g
-java/bin/javadoc
-java/bin/javah
-java/bin/javah_g
-java/bin/javakey
-java/bin/javap
-java/bin/javaverify
-java/bin/javaverify_g
-java/bin/jdb
-java/bin/jre_g
-java/bin/native2ascii
-java/bin/rmic
-java/bin/rmiregistry
-java/bin/serialver
 java/bin/i386/green_threads/.extract_args
 java/bin/i386/green_threads/appletviewer
 java/bin/i386/green_threads/jar
@@ -45,8 +27,26 @@ java/bin/i386/green_threads/native2ascii
 java/bin/i386/green_threads/rmic
 java/bin/i386/green_threads/rmiregistry
 java/bin/i386/green_threads/serialver
+java/bin/jar
+java/bin/java
 java/bin/java-rmi.cgi
+java/bin/java_g
+java/bin/javac
+java/bin/javac_g
+java/bin/javadoc
+java/bin/javah
+java/bin/javah_g
+java/bin/javakey
+java/bin/javap
+java/bin/javaverify
+java/bin/javaverify_g
+java/bin/jdb
 java/bin/jre
+java/bin/jre_g
+java/bin/native2ascii
+java/bin/rmic
+java/bin/rmiregistry
+java/bin/serialver
 java/demo/Animator/1.0.2/Animator.class
 java/demo/Animator/1.0.2/Animator.java
 java/demo/Animator/1.0.2/DescriptionFrame.class
@@ -521,6 +521,18 @@ java/demo/jre/solaris/GNUmakefile
 java/demo/jre/solaris/jre.sh
 java/demo/jre/solaris/jre_md.c
 java/demo/jre/solaris/jre_md.h
+java/include/StubPreamble.h
+java/include/alloc_cache.h
+java/include/bool.h
+java/include/breakpoints.h
+java/include/byteorder.h
+java/include/common_exceptions.h
+java/include/config.h
+java/include/debug.h
+java/include/decode.h
+java/include/exceptions.h
+java/include/finalize.h
+java/include/gc.h
 java/include/green_threads/include/context.h
 java/include/green_threads/include/context_md.h
 java/include/green_threads/include/internal_md.h
@@ -528,10 +540,19 @@ java/include/green_threads/include/monitor_md.h
 java/include/green_threads/include/queue.h
 java/include/green_threads/include/schedule.h
 java/include/green_threads/include/threads_md.h
+java/include/interpreter.h
+java/include/javaString.h
 java/include/java_lang_ClassLoader.h
 java/include/java_lang_String.h
 java/include/java_lang_Thread.h
 java/include/java_lang_ThreadGroup.h
+java/include/jcov.h
+java/include/jmath.h
+java/include/jni.h
+java/include/log.h
+java/include/monitor.h
+java/include/monitor_cache.h
+java/include/native.h
 java/include/netbsd/byteorder_md.h
 java/include/netbsd/gc_md.h
 java/include/netbsd/io_md.h
@@ -544,6 +565,21 @@ java/include/netbsd/sysmacros_md.h
 java/include/netbsd/timeval_md.h
 java/include/netbsd/typedefs_md.h
 java/include/oobj.h
+java/include/path.h
+java/include/profile.h
+java/include/reflect.h
+java/include/selftest.h
+java/include/signature.h
+java/include/sys_api.h
+java/include/threads.h
+java/include/timeval.h
+java/include/tree.h
+java/include/typecodes.h
+java/include/typedefs.h
+java/include/utf.h
+java/include/verify.h
+java/include/wrap.h
+java/include/zip.h
 java/index.html
 java/lib/appletviewer.properties
 java/lib/awt.properties
@@ -593,13 +629,9 @@ java/lib/psfont.properties.ja
 java/lib/rmic.properties
 java/lib/security/java.security
 java/lib/serialver.properties
-java/lib/sparc/green_threads/libXm.so
-java/lib/sparc/green_threads/libXm.so.1.2
 java/src.zip
 @dirrm java/bin/i386/green_threads
 @dirrm java/bin/i386
-@dirrm java/bin/sparc/green_threads
-@dirrm java/bin/sparc
 @dirrm java/bin
 @dirrm java/demo/Animator/1.0.2/audio
 @dirrm java/demo/Animator/1.0.2/images/Beans
@@ -704,7 +736,5 @@ java/src.zip
 @dirrm java/lib/i386/green_threads
 @dirrm java/lib/i386
 @dirrm java/lib/security
-@dirrm java/lib/sparc/green_threads
-@dirrm java/lib/sparc
 @dirrm java/lib
 @dirrm java