Update to 1.3.1

Changes can be viewed at http://java.sun.com/j2se/1.3/relnotes.html

4 files changed, 83 insertions, 69 deletions

diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index 448279a8cc4..60e3864410c 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2001/06/12 11:18:49 abs Exp $
+# $NetBSD: Makefile,v 1.11 2001/06/12 16:31:47 skrll Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
-DISTNAME=	j2sdk-1_3_0_02-linux
-PKGNAME=	sun-jre-1.3.0.2
+DISTNAME=	j2re-1_3_1-linux-i386
+PKGNAME=	sun-jre-1.3.1
 CATEGORIES=     lang
-MASTER_SITES=	http://java.sun.com/Download4?config-file=j2sdk-1_3_0_02-linux.config&platform=targzsh&protocol=HTTP+download&download-name=
+MASTER_SITES=	http://java.sun.com/Download4?config-file=j2sdk-1_3_1.config&platform=linux-i386&protocol=HTTP+download&download-name=
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	tv@netbsd.org
@@ -16,7 +16,7 @@ CONFLICTS=	jdk-* blackdown-j*
 
 FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
-WRKSRC=		${WRKDIR}/jdk1.3.0_02/jre
+WRKSRC=		${WRKDIR}/jre1.3.1
 
 LICENSE=	jdk13-license
 RESTRICTED=	"Redistribution of repackaged binaries not permitted"
diff --git a/lang/sun-jre13/distinfo b/lang/sun-jre13/distinfo
index 7127d07abe5..0bc100945fd 100644
--- a/lang/sun-jre13/distinfo
+++ b/lang/sun-jre13/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:59 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/12 16:31:47 skrll Exp $
 
-SHA1 (j2sdk-1_3_0_02-linux.bin) = 71ed382de5596a345649f10936c0bd837e7743e8
-Size (j2sdk-1_3_0_02-linux.bin) = 27092454 bytes
-SHA1 (patch-aa) = a79ba245b0bcb1a35489437db1e08ec7ae5b3305
+SHA1 (j2re-1_3_1-linux-i386.bin) = 3196182e2f70b96ac73ccf2f0fd764edf959b8b4
+Size (j2re-1_3_1-linux-i386.bin) = 15479547 bytes
+SHA1 (patch-aa) = 9fb088f7975a39b012aa9c62236af858e5c7d23d
 SHA1 (patch-ab) = 1a1664d2be48d7a4f8fc05876b7aa5f225c65b16
diff --git a/lang/sun-jre13/patches/patch-aa b/lang/sun-jre13/patches/patch-aa
index ed74863f0bf..6c19b982aba 100644
--- a/lang/sun-jre13/patches/patch-aa
+++ b/lang/sun-jre13/patches/patch-aa
@@ -1,19 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/18 00:36:55 tv Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/12 16:31:47 skrll Exp $
 
---- bin/.java_wrapper.orig	Mon Sep 18 21:05:19 2000
-+++ bin/.java_wrapper	Fri Nov 17 18:15:26 2000
-@@ -28,17 +28,6 @@
+--- bin/.java_wrapper.orig	Sun May  6 11:15:57 2001
++++ bin/.java_wrapper
+@@ -31,17 +31,6 @@
          ;;
  esac
  
 -# Resolve symlinks. See 4152645.
 -while [ -L "$PRG" ]; do
--    ls=`/bin/ls -ld "$PRG"`
--    link=`/usr/bin/expr "$ls" : '.*-> \(.*\)$'`
--    if /usr/bin/expr "$link" : '/' > /dev/null; then
+-    ls=`ls -ld "$PRG"`
+-    link=`expr "$ls" : '.*-> \(.*\)$'`
+-    if expr "$link" : '/' > /dev/null; then
 -	PRG="$link"
 -    else
--	PRG="`/usr/bin/dirname $PRG`/$link"
+-	PRG="`dirname $PRG`/$link"
 -    fi
 -done
 -
diff --git a/lang/sun-jre13/pkg/PLIST b/lang/sun-jre13/pkg/PLIST
index 984f69871c6..c61334bc83b 100644
--- a/lang/sun-jre13/pkg/PLIST
+++ b/lang/sun-jre13/pkg/PLIST
@@ -1,5 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2001/04/03 13:37:43 skrll Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/06/12 16:31:47 skrll Exp $
+jre/CHANGES
+jre/COPYRIGHT
 jre/ControlPanel.html
+jre/LICENSE
+jre/LICENSE.fr
+jre/README
 jre/Welcome.html
 jre/bin/.java_wrapper
 jre/bin/ControlPanel
@@ -88,6 +93,7 @@ jre/lib/i386/libjpeg.so
 jre/lib/i386/libjsound.so
 jre/lib/i386/libmlib_image.so
 jre/lib/i386/libnet.so
+jre/lib/i386/libpreemptive_close.so
 jre/lib/i386/libverify.so
 jre/lib/i386/libzip.so
 jre/lib/i386/native_threads/libhpi.so
@@ -102,7 +108,6 @@ jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
 jre/lib/images/cursors/motif_MoveDrop32x32.gif
 jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
 jre/lib/javaplugin.jar
-jre/lib/javaplugin_l10n.jar
 jre/lib/jvm.cfg
 jre/lib/jvm.hprof.txt
 jre/lib/jvm.jcov.txt
@@ -111,77 +116,86 @@ jre/lib/locale/es/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/fr/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/it/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/ja/LC_MESSAGES/sunw_java_plugin.mo
-jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/ko.UTF-8/LC_MESSAGES/sunw_java_plugin.mo
+jre/lib/locale/ko/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/sv/LC_MESSAGES/sunw_java_plugin.mo
-jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
-jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
+jre/lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
+jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 jre/lib/psfont.properties.ja
+jre/lib/psfontj2d.properties
 jre/lib/rt.jar
 jre/lib/security/cacerts
 jre/lib/security/java.policy
 jre/lib/security/java.security
 jre/lib/sunrsasign.jar
 jre/lib/tzmappings
-jre/plugin/i386/ns4/javaplugin.so
-jre/plugin/i386/ns600/libjavaplugin_oji.so
+jre/man/ja
+jre/man/ja_JP.eucJP/man1/java.1
+jre/man/ja_JP.eucJP/man1/keytool.1
+jre/man/ja_JP.eucJP/man1/rmid.1
+jre/man/ja_JP.eucJP/man1/rmiregistry.1
+jre/man/ja_JP.eucJP/man1/tnameserv.1
 jre/man/man1/java.1
 jre/man/man1/keytool.1
 jre/man/man1/rmid.1
 jre/man/man1/rmiregistry.1
 jre/man/man1/tnameserv.1
+jre/plugin/i386/ns4/javaplugin.so
+jre/plugin/i386/ns600/libjavaplugin_oji.so
 @exec mkdir -p %D/jre/lib/applet
 @exec mkdir -p %D/jre/lib/ext
-@dirrm jre/bin/i386/green_threads
-@dirrm jre/bin/i386/native_threads
-@dirrm jre/bin/i386
-@dirrm jre/bin
-@dirrm jre/lib/applet
-@dirrm jre/lib/audio
-@dirrm jre/lib/cmm
-@dirrm jre/lib/ext
-@dirrm jre/lib/fonts
-@dirrm jre/lib/i386/classic
-@dirrm jre/lib/i386/client
-@dirrm jre/lib/i386/green_threads
-@dirrm jre/lib/i386/native_threads
-@dirrm jre/lib/i386/server
-@dirrm jre/lib/i386
-@dirrm jre/lib/images/cursors
-@dirrm jre/lib/images
-@dirrm jre/lib/locale/de/LC_MESSAGES
-@dirrm jre/lib/locale/de
-@dirrm jre/lib/locale/es/LC_MESSAGES
-@dirrm jre/lib/locale/es
-@dirrm jre/lib/locale/fr/LC_MESSAGES
-@dirrm jre/lib/locale/fr
-@dirrm jre/lib/locale/it/LC_MESSAGES
-@dirrm jre/lib/locale/it
-@dirrm jre/lib/locale/ja/LC_MESSAGES
-@dirrm jre/lib/locale/ja
-@dirrm jre/lib/locale/ko/LC_MESSAGES
-@dirrm jre/lib/locale/ko
-@dirrm jre/lib/locale/ko.UTF-8/LC_MESSAGES
-@dirrm jre/lib/locale/ko.UTF-8
-@dirrm jre/lib/locale/sv/LC_MESSAGES
-@dirrm jre/lib/locale/sv
-@dirrm jre/lib/locale/zh/LC_MESSAGES
-@dirrm jre/lib/locale/zh
-@dirrm jre/lib/locale/zh.GBK/LC_MESSAGES
-@dirrm jre/lib/locale/zh.GBK
+@dirrm jre/plugin/i386/ns600
+@dirrm jre/plugin/i386/ns4
+@dirrm jre/plugin/i386
+@dirrm jre/plugin
+@dirrm jre/man/man1
+@dirrm jre/man/ja_JP.eucJP/man1
+@dirrm jre/man/ja_JP.eucJP
+@dirrm jre/man
+@dirrm jre/lib/security
 @dirrm jre/lib/locale/zh_TW/LC_MESSAGES
-@dirrm jre/lib/locale/zh_TW
 @dirrm jre/lib/locale/zh_TW.BIG5/LC_MESSAGES
 @dirrm jre/lib/locale/zh_TW.BIG5
+@dirrm jre/lib/locale/zh_TW
+@dirrm jre/lib/locale/zh/LC_MESSAGES
+@dirrm jre/lib/locale/zh.GBK/LC_MESSAGES
+@dirrm jre/lib/locale/zh.GBK
+@dirrm jre/lib/locale/zh
+@dirrm jre/lib/locale/sv/LC_MESSAGES
+@dirrm jre/lib/locale/sv
+@dirrm jre/lib/locale/ko/LC_MESSAGES
+@dirrm jre/lib/locale/ko.UTF-8/LC_MESSAGES
+@dirrm jre/lib/locale/ko.UTF-8
+@dirrm jre/lib/locale/ko
+@dirrm jre/lib/locale/ja/LC_MESSAGES
+@dirrm jre/lib/locale/ja
+@dirrm jre/lib/locale/it/LC_MESSAGES
+@dirrm jre/lib/locale/it
+@dirrm jre/lib/locale/fr/LC_MESSAGES
+@dirrm jre/lib/locale/fr
+@dirrm jre/lib/locale/es/LC_MESSAGES
+@dirrm jre/lib/locale/es
+@dirrm jre/lib/locale/de/LC_MESSAGES
+@dirrm jre/lib/locale/de
 @dirrm jre/lib/locale
-@dirrm jre/lib/security
+@dirrm jre/lib/images/cursors
+@dirrm jre/lib/images
+@dirrm jre/lib/i386/server
+@dirrm jre/lib/i386/native_threads
+@dirrm jre/lib/i386/green_threads
+@dirrm jre/lib/i386/client
+@dirrm jre/lib/i386/classic
+@dirrm jre/lib/i386
+@dirrm jre/lib/fonts
+@dirrm jre/lib/ext
+@dirrm jre/lib/cmm
+@dirrm jre/lib/audio
+@dirrm jre/lib/applet
 @dirrm jre/lib
-@dirrm jre/man/man1
-@dirrm jre/man
-@dirrm jre/plugin/i386/ns4
-@dirrm jre/plugin/i386/ns600
-@dirrm jre/plugin/i386
-@dirrm jre/plugin
+@dirrm jre/bin/i386/native_threads
+@dirrm jre/bin/i386/green_threads
+@dirrm jre/bin/i386
+@dirrm jre/bin
 @dirrm jre