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

4 files changed, 14 insertions, 23 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