Update sun-j*14 to Sun 1.4.2. This version of the JDK requires a

-current kernel from at least 2003-08-09.  Previous 1.4.1 versions
never really worked all that well and needed special kernel options
as well as a -current kernel from that date, so updating to 1.4.2
is better than keeping both.

A complete list of changes from previous 1.4 JDKs is available at
http://java.sun.com/j2se/1.4.2/changes.html

10 files changed, 88 insertions, 43 deletions

diff --git a/lang/sun-jdk14/DESCR b/lang/sun-jdk14/DESCR
index e2fea1a57df..af0712b2840 100644
--- a/lang/sun-jdk14/DESCR
+++ b/lang/sun-jdk14/DESCR
@@ -1 +1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.1.
+This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 4e5c9f6b153..8851a983406 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2003/08/10 22:28:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/08/13 03:29:54 jschauma Exp $
 
-DISTNAME=	j2sdk-1_4_1_04-linux-i586
-PKGNAME=	sun-jdk14-1.0.4
-WRKSRC=		${WRKDIR}/j2sdk1.4.1_04
+DISTNAME=	j2sdk-1_4_2-linux-i586
+PKGNAME=	sun-jdk14-2.0
+WRKSRC=		${WRKDIR}/j2sdk1.4.2
 MASTER_SITES=	# empty
 
-COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.1
+COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.2
 
-DEPENDS=	sun-jre14>=1.0.1:../../lang/sun-jre14
+DEPENDS=	sun-jre14>=2.0:../../lang/sun-jre14
 
 # Remove parts that are in common with the JRE
 #
diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST
index c3febeec8a2..f39d06ff49c 100644
--- a/lang/sun-jdk14/PLIST
+++ b/lang/sun-jdk14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/02/11 04:23:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/08/13 03:29:54 jschauma Exp $
 README.html
 bin/HtmlConverter
 bin/appletviewer
@@ -154,6 +154,7 @@ demo/applets/JumpingBox/JumpingBox.java
 demo/applets/JumpingBox/example1.html
 demo/applets/JumpingBox/sounds/adapt-or-die.au
 demo/applets/JumpingBox/sounds/cannot.be.completed.au
+demo/applets/JumpingBox/sounds/danger.au
 demo/applets/JumpingBox/sounds/ip.au
 demo/applets/JumpingBox/sounds/that.hurts.au
 demo/applets/JumpingBox/sounds/thin.bell.au
@@ -198,11 +199,6 @@ demo/applets/SpreadSheet/SpreadSheet.class
 demo/applets/SpreadSheet/SpreadSheet.java
 demo/applets/SpreadSheet/SpreadSheetInput.class
 demo/applets/SpreadSheet/example1.html
-demo/applets/SymbolTest/SymbolCanvas.class
-demo/applets/SymbolTest/SymbolTest$MyAdapter.class
-demo/applets/SymbolTest/SymbolTest.class
-demo/applets/SymbolTest/SymbolTest.java
-demo/applets/SymbolTest/example1.html
 demo/applets/TicTacToe/TicTacToe.class
 demo/applets/TicTacToe/TicTacToe.java
 demo/applets/TicTacToe/audio/beep.au
@@ -582,6 +578,7 @@ demo/plugin/applets/JumpingBox/JumpingBox.java
 demo/plugin/applets/JumpingBox/example1.html
 demo/plugin/applets/JumpingBox/sounds/adapt-or-die.au
 demo/plugin/applets/JumpingBox/sounds/cannot.be.completed.au
+demo/plugin/applets/JumpingBox/sounds/danger.au
 demo/plugin/applets/JumpingBox/sounds/ip.au
 demo/plugin/applets/JumpingBox/sounds/that.hurts.au
 demo/plugin/applets/JumpingBox/sounds/thin.bell.au
@@ -626,11 +623,6 @@ demo/plugin/applets/SpreadSheet/SpreadSheet.class
 demo/plugin/applets/SpreadSheet/SpreadSheet.java
 demo/plugin/applets/SpreadSheet/SpreadSheetInput.class
 demo/plugin/applets/SpreadSheet/example1.html
-demo/plugin/applets/SymbolTest/SymbolCanvas.class
-demo/plugin/applets/SymbolTest/SymbolTest$MyAdapter.class
-demo/plugin/applets/SymbolTest/SymbolTest.class
-demo/plugin/applets/SymbolTest/SymbolTest.java
-demo/plugin/applets/SymbolTest/example1.html
 demo/plugin/applets/TicTacToe/TicTacToe.class
 demo/plugin/applets/TicTacToe/TicTacToe.java
 demo/plugin/applets/TicTacToe/audio/beep.au
@@ -655,6 +647,7 @@ demo/plugin/applets/WireFrame/models/cube.obj
 demo/plugin/applets/WireFrame/models/dinasaur.obj
 demo/plugin/applets/WireFrame/models/hughes_500.obj
 demo/plugin/applets/WireFrame/models/knoxS.obj
+demo/plugin/applets.html
 demo/plugin/jfc/FileChooserDemo/FileChooserDemo.jar
 demo/plugin/jfc/FileChooserDemo/README.txt
 demo/plugin/jfc/FileChooserDemo/images/gifIcon.gif
@@ -957,7 +950,6 @@ src.zip
 @dirrm demo/plugin/applets/TicTacToe/images
 @dirrm demo/plugin/applets/TicTacToe/audio
 @dirrm demo/plugin/applets/TicTacToe
-@dirrm demo/plugin/applets/SymbolTest
 @dirrm demo/plugin/applets/SpreadSheet
 @dirrm demo/plugin/applets/SortDemo
 @dirrm demo/plugin/applets/SimpleGraph
@@ -1033,7 +1025,6 @@ src.zip
 @dirrm demo/applets/TicTacToe/images
 @dirrm demo/applets/TicTacToe/audio
 @dirrm demo/applets/TicTacToe
-@dirrm demo/applets/SymbolTest
 @dirrm demo/applets/SpreadSheet
 @dirrm demo/applets/SortDemo
 @dirrm demo/applets/SimpleGraph
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index d94a98813a0..2b355c31e9d 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/08/10 22:28:21 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2003/08/13 03:29:54 jschauma Exp $
 
-SHA1 (j2sdk-1_4_1_04-linux-i586.bin) = 11e7ce52efc146b651fecd4320604a928b6765b9
-Size (j2sdk-1_4_1_04-linux-i586.bin) = 41573398 bytes
+SHA1 (j2sdk-1_4_2-linux-i586.bin) = 723d6a1953fdb30625e4ed06977aaf57314f2aed
+Size (j2sdk-1_4_2-linux-i586.bin) = 35761623 bytes
diff --git a/lang/sun-jre14/DESCR b/lang/sun-jre14/DESCR
index e2fea1a57df..af0712b2840 100644
--- a/lang/sun-jre14/DESCR
+++ b/lang/sun-jre14/DESCR
@@ -1 +1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.1.
+This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.
diff --git a/lang/sun-jre14/MESSAGE.NetBSD b/lang/sun-jre14/MESSAGE.NetBSD
index 4f54d86b6b3..21df4a1f02a 100644
--- a/lang/sun-jre14/MESSAGE.NetBSD
+++ b/lang/sun-jre14/MESSAGE.NetBSD
@@ -1,11 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.2 2003/08/11 01:25:49 grant Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.3 2003/08/13 03:29:55 jschauma Exp $
 
 In order to be able to run the JVM, you will need to compile your kernel
 with the following options:
 
-makeoptions	TEXTADDR=d0100000
-options		KERNBASE_LOCORE=0xd0000000
 options		COMPAT_LINUX
 
 Furthermore, the data segment size set by your shell's 'ulimit' builtin
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index b658af6f37c..b695eee9776 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2003/08/10 22:28:21 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/13 03:29:55 jschauma Exp $
 
-DISTNAME=	j2re-1_4_1_04-linux-i586
-PKGNAME=	sun-jre14-1.0.4
-WRKSRC=		${WRKDIR}/j2re1.4.1_04
+DISTNAME=	j2re-1_4_2-linux-i586
+PKGNAME=	sun-jre14-2.0
+WRKSRC=		${WRKDIR}/j2re1.4.2
 MASTER_SITES=	# empty
 
-COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.1
+COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.4.2
 
 USE_PKGINSTALL=	yes
 OWN_DIRS=	${PREFIX}
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 20350991933..567ba22fe85 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2003/07/17 21:45:27 grant Exp $
+# $NetBSD: Makefile.common,v 1.12 2003/08/13 03:29:55 jschauma Exp $
 
 CATEGORIES=	lang
 EXTRACT_SUFX=	.bin
@@ -31,7 +31,7 @@ USE_BUILDLINK2=	yes
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
-ONLY_FOR_PLATFORM=	NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386
+ONLY_FOR_PLATFORM=	NetBSD-1.6[U-Z]*-i386
 ONLY_FOR_PLATFORM+=	Linux-*-i[3-6]86
 
 post-fetch:
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index 0f0d7e555fa..1c76fa836cd 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/08/10 22:28:22 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/08/13 03:29:55 jschauma Exp $
 .systemPrefs/.system.lock
 .systemPrefs/.systemRootModFile
 CHANGES
@@ -6,6 +6,7 @@ COPYRIGHT
 ControlPanel.html
 LICENSE
 README
+THIRDPARTYLICENSEREADME.txt
 Welcome.html
 bin/ControlPanel
 bin/java
@@ -20,7 +21,37 @@ bin/rmid
 bin/rmiregistry
 bin/servertool
 bin/tnameserv
-javaws-1_2_0_04-linux-i586-i.zip
+javaws/cacerts
+javaws/javalogo52x88.gif
+javaws/javaws
+javaws/javaws-l10n.jar
+javaws/javaws.jar
+javaws/javaws.policy
+javaws/javawsbin
+javaws/readme.html
+javaws/readme_de.html
+javaws/readme_es.html
+javaws/readme_fr.html
+javaws/readme_it.html
+javaws/readme_ja.html
+javaws/readme_ko.html
+javaws/readme_sv.html
+javaws/readme_zh_CN.html
+javaws/readme_zh_TW.html
+javaws/resources/copyright.jpg
+javaws/resources/messages.properties
+javaws/resources/messages_de.properties
+javaws/resources/messages_es.properties
+javaws/resources/messages_fr.properties
+javaws/resources/messages_it.properties
+javaws/resources/messages_ja.properties
+javaws/resources/messages_ko.properties
+javaws/resources/messages_sv.properties
+javaws/resources/messages_zh_CN.properties
+javaws/resources/messages_zh_TW.properties
+javaws/resources/miniSplash.jpg
+javaws/resources/splash.jpg
+javaws/sunlogo64x30.gif
 lib/audio/soundbank.gm
 lib/charsets.jar
 lib/cmm/CIEXYZ.pf
@@ -39,6 +70,14 @@ lib/font.properties.Redhat6.1.default
 lib/font.properties.ja.default
 lib/font.properties.ja.Redhat6.1.default
 lib/font.properties.ja.Redhat6.2.default
+lib/font.properties.Redhat8.0
+lib/font.properties.SuSE8.0
+lib/font.properties.ja.Redhat7.2
+lib/font.properties.ja.Redhat7.3
+lib/font.properties.ja.Redhat8.0
+lib/font.properties.ko.Redhat8.0
+lib/font.properties.zh_CN.Redhat8.0
+lib/font.properties.zh_TW.Redhat8.0
 lib/font.properties.ja.Turbo.default
 lib/font.properties.ja.Turbo6.0.default
 lib/font.properties.zh.Turbo.default
@@ -77,7 +116,9 @@ lib/i386/libjdwp.so
 lib/i386/libjpeg.so
 lib/i386/libjsig.so
 lib/i386/libjsound.so
+lib/i386/libjsoundalsa.so
 lib/i386/libmlib_image.so
+lib/i386/libnative_chmod.so
 lib/i386/libnet.so
 lib/i386/libnio.so
 lib/i386/librmi.so
@@ -88,6 +129,7 @@ lib/i386/server/Xusage.txt
 lib/i386/server/libjsig.so
 lib/i386/server/libjvm.so
 lib/im/indicim.jar
+lib/im/thaiim.jar
 lib/images/cursors/cursors.properties.default
 lib/images/cursors/invalid32x32.gif
 lib/images/cursors/motif_CopyDrop32x32.gif
@@ -96,7 +138,6 @@ lib/images/cursors/motif_LinkDrop32x32.gif
 lib/images/cursors/motif_LinkNoDrop32x32.gif
 lib/images/cursors/motif_MoveDrop32x32.gif
 lib/images/cursors/motif_MoveNoDrop32x32.gif
-lib/javaplugin.jar
 lib/jce.jar
 lib/jsse.jar
 lib/jvm.hprof.txt
@@ -114,6 +155,7 @@ lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
 lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
 lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 lib/logging.properties.default
+lib/plugin.jar
 lib/psfont.properties.ja.default
 lib/psfontj2d.properties.default
 lib/rt.jar
@@ -296,6 +338,7 @@ lib/zi/Antarctica/DumontDUrville
 lib/zi/Antarctica/Mawson
 lib/zi/Antarctica/McMurdo
 lib/zi/Antarctica/Palmer
+lib/zi/Antarctica/Rothera
 lib/zi/Antarctica/Syowa
 lib/zi/Antarctica/Vostok
 lib/zi/Asia/Aden
@@ -526,7 +569,11 @@ lib/zi/WET
 lib/zi/ZoneInfoMappings
 man/ja
 man/ja_JP.eucJP/man1/java.1
+man/ja_JP.eucJP/man1/javaws.1
 man/ja_JP.eucJP/man1/keytool.1
+man/ja_JP.eucJP/man1/kinit.1
+man/ja_JP.eucJP/man1/klist.1
+man/ja_JP.eucJP/man1/ktab.1
 man/ja_JP.eucJP/man1/orbd.1
 man/ja_JP.eucJP/man1/policytool.1
 man/ja_JP.eucJP/man1/rmid.1
@@ -534,20 +581,27 @@ man/ja_JP.eucJP/man1/rmiregistry.1
 man/ja_JP.eucJP/man1/servertool.1
 man/ja_JP.eucJP/man1/tnameserv.1
 man/man1/java.1
+man/man1/javaws.1
 man/man1/keytool.1
+man/man1/kinit.1
+man/man1/klist.1
+man/man1/ktab.1
 man/man1/orbd.1
 man/man1/policytool.1
 man/man1/rmid.1
 man/man1/rmiregistry.1
 man/man1/servertool.1
 man/man1/tnameserv.1
-plugin/i386/ns4/javaplugin.so
-plugin/i386/ns600/libjavaplugin_oji.so
+plugin/desktop/sun_java.desktop
+plugin/desktop/sun_java.png
+plugin/i386/ns4/libjavaplugin.so
 plugin/i386/ns610/libjavaplugin_oji.so
+plugin/i386/ns610-gcc32/libjavaplugin_oji.so
+@dirrm plugin/i386/ns610-gcc32
 @dirrm plugin/i386/ns610
-@dirrm plugin/i386/ns600
 @dirrm plugin/i386/ns4
 @dirrm plugin/i386
+@dirrm plugin/desktop
 @dirrm plugin
 @dirrm man/man1
 @dirrm man/ja_JP.eucJP/man1
@@ -601,5 +655,7 @@ plugin/i386/ns610/libjavaplugin_oji.so
 @dirrm lib/ext
 @dirrm lib/cmm
 @dirrm lib/audio
+@dirrm javaws/resources
+@dirrm javaws
 @dirrm bin
 @dirrm .systemPrefs
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index de7b7e61878..e79c4f74757 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2003/08/10 22:28:22 jschauma Exp $
+$NetBSD: distinfo,v 1.6 2003/08/13 03:29:55 jschauma Exp $
 
-SHA1 (j2re-1_4_1_04-linux-i586.bin) = ee8d0080054440691675aa3d9c46b71cc388b2a6
-Size (j2re-1_4_1_04-linux-i586.bin) = 22274902 bytes
+SHA1 (j2re-1_4_2-linux-i586.bin) = ac3f6908bb2feabb32d013c5138da0818a59fb21
+Size (j2re-1_4_2-linux-i586.bin) = 14153852 bytes