Subject: pkg/19853: Sun J2SE 1.4.1_01 (sun-jre14/sun-jdk14)
To: None <gnats-bugs@gnats.netbsd.org>
From: None <naoki@fukaumi.org>
List: netbsd-bugs
Date: 01/15/2003 09:45:42 
>Number:         19853
>Category:       pkg
>Synopsis:       Sun J2SE 1.4.1_01 (sun-jre14/sun-jdk14)
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 14 16:47:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     FUKAUMI Naoki
>Release:        NetBSD 1.6K
>Organization:
	FUKAUMI Naoki
>Environment:
System: NetBSD nforce.naobsd.org 1.6K NetBSD 1.6K (NFORCE) #0: Thu Jan 2 19:32:51 JST 2003 fun@nforce.naobsd.org:/usr/obj/i386/sys/arch/i386/compile/NFORCE i386
Architecture: i386
Machine: i386
>Description:
	Current J2SE (sun-jre14/sun-jdk14) is 1.4.1_01. See
	  http://java.sun.com/j2se/1.4.1/
>How-To-Repeat:
>Fix:
	% java -version
	java version "1.4.1_01"
	Java(TM) 2 Runtime Environment, Standard Edition (build 1.4.1_01-b01)
	Java HotSpot(TM) Client VM (build 1.4.1_01-b01, mixed mode)

	XXX This patch is only tested on NetBSD 1.6K/i386
	XXX I don't know `pkgsrc/licenses/jdk13-license == J2SE 1.4 license'
	XXX I'm not pkgsrc guru. Please check my change before commit...

Index: lang/sun-jdk14/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk14/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lang/sun-jdk14/Makefile	2002/10/13 07:45:32	1.3
+++ lang/sun-jdk14/Makefile	2003/01/14 07:43:35
@@ -1,20 +1,62 @@
 # $NetBSD: Makefile,v 1.3 2002/10/13 07:45:32 jlam Exp $
 
-# MASTER_SITES is very special, and must end in "=":
-DISTNAME=	j2sdk-1_4_0-linux-i386
-PKGNAME=	sun-jdk14-0
-PKGREVISION=	1
-MASTER_SITES=	http://java.sun.com/Download4?config-file=j2sdk-1_4_0.config&platform=linux-i386&protocol=HTTP+download&download-name=
+DISTNAME=	j2sdk-1_4_1_01-linux-i586
+PKGNAME=	sun-jdk14-1.0.1
+#PKGREVISION=	1
 
-COMMENT=	Sun's Java(tm) Development Kit 1.4.0
+COMMENT=	Sun's Java(TM) 2 SDK, Standard Edition 1.4.1_01
 
 DEPENDS=	sun-jre14>=0:../../lang/sun-jre14
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.0
+WRKSRC=		${WRKDIR}/j2sdk1.4.1_01
 
 # these are part of JRE
 post-extract:
-	${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README
+	@${RM} -fr \
+		  ${WRKSRC}/.systemPrefs \
+		  ${WRKSRC}/COPYRIGHT \
+		  ${WRKSRC}/LICENSE \
+		  ${WRKSRC}/README \
+		  ${WRKSRC}/bin/ControlPanel \
+		  ${WRKSRC}/bin/java \
+		  ${WRKSRC}/bin/keytool \
+		  ${WRKSRC}/bin/kinit \
+		  ${WRKSRC}/bin/klist \
+		  ${WRKSRC}/bin/ktab \
+		  ${WRKSRC}/bin/orbd \
+		  ${WRKSRC}/bin/policytool \
+		  ${WRKSRC}/bin/rmid \
+		  ${WRKSRC}/bin/rmiregistry \
+		  ${WRKSRC}/bin/servertool \
+		  ${WRKSRC}/bin/tnameserv \
+		  ${WRKSRC}/jre \
+		  ${WRKSRC}/man/ja \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/java.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/keytool.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/orbd.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/policytool.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/rmid.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/rmiregistry.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/servertool.1 \
+		  ${WRKSRC}/man/ja_JP.eucJP/man1/tnameserv.1 \
+		  ${WRKSRC}/man/man1/java.1 \
+		  ${WRKSRC}/man/man1/keytool.1 \
+		  ${WRKSRC}/man/man1/orbd.1 \
+		  ${WRKSRC}/man/man1/policytool.1 \
+		  ${WRKSRC}/man/man1/rmid.1 \
+		  ${WRKSRC}/man/man1/rmiregistry.1 \
+		  ${WRKSRC}/man/man1/servertool.1 \
+		  ${WRKSRC}/man/man1/tnameserv.1
+
+_FETCH_MESSAGE= \
+	${ECHO} "======================================================================"; \
+	${ECHO} ; \
+	${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
+	${ECHO} " Java(TM) 2 SDK, Standard Edition must be fetched"; \
+	${ECHO} " into ${DISTDIR}"; \
+	${ECHO} " from ${DOWNLOAD}"; \
+	${ECHO} ; \
+	${ECHO} "======================================================================"
 
 .include "../../lang/sun-jre14/Makefile.common"
 
Index: lang/sun-jdk14/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk14/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- lang/sun-jdk14/PLIST	2002/07/27 22:21:05	1.2
+++ lang/sun-jdk14/PLIST	2003/01/14 07:43:35
@@ -236,7 +236,6 @@
 demo/jfc/FileChooserDemo/src/FileChooserDemo.java
 demo/jfc/Font2DTest/Font2DTest.html
 demo/jfc/Font2DTest/Font2DTest.jar
-demo/jfc/Font2DTest/Font2DTestPlugin.html
 demo/jfc/Font2DTest/README.txt
 demo/jfc/Font2DTest/src/Font2DTest.java
 demo/jfc/Font2DTest/src/Font2DTestApplet.java
@@ -344,7 +343,7 @@
 demo/jfc/Notepad/resources/Notepad.properties
 demo/jfc/Notepad/resources/Notepad_fr.properties
 demo/jfc/Notepad/resources/Notepad_sv.properties
-demo/jfc/Notepad/resources/Notepad_zh.properties
+demo/jfc/Notepad/resources/Notepad_zh_CN.properties
 demo/jfc/Notepad/resources/copy.gif
 demo/jfc/Notepad/resources/cut.gif
 demo/jfc/Notepad/resources/new.gif
@@ -362,18 +361,15 @@
 demo/jfc/SampleTree/src/SampleTree.java
 demo/jfc/SampleTree/src/SampleTreeCellRenderer.java
 demo/jfc/SampleTree/src/SampleTreeModel.java
-demo/jfc/SimpleExample/README.txt
-demo/jfc/SimpleExample/SimpleExample.jar
-demo/jfc/SimpleExample/src/SimpleExample.java
 demo/jfc/Stylepad/README.txt
 demo/jfc/Stylepad/Stylepad.jar
 demo/jfc/Stylepad/resources/Notepad.properties
 demo/jfc/Stylepad/resources/Notepad_fr.properties
 demo/jfc/Stylepad/resources/Notepad_sv.properties
-demo/jfc/Stylepad/resources/Notepad_zh.properties
+demo/jfc/Stylepad/resources/Notepad_zh_CN.properties
 demo/jfc/Stylepad/resources/Stylepad.properties
 demo/jfc/Stylepad/resources/Stylepad_sv.properties
-demo/jfc/Stylepad/resources/Stylepad_zh.properties
+demo/jfc/Stylepad/resources/Stylepad_zh_CN.properties
 demo/jfc/Stylepad/resources/alice.gif
 demo/jfc/Stylepad/resources/bold.gif
 demo/jfc/Stylepad/resources/bullets.gif
@@ -405,7 +401,6 @@
 demo/jfc/SwingSet2/README.txt
 demo/jfc/SwingSet2/SwingSet2.html
 demo/jfc/SwingSet2/SwingSet2.jar
-demo/jfc/SwingSet2/SwingSet2Plugin.html
 demo/jfc/SwingSet2/src/AquaTheme.java
 demo/jfc/SwingSet2/src/BezierAnimationPanel.java
 demo/jfc/SwingSet2/src/ButtonDemo.java
@@ -669,7 +664,6 @@
 demo/plugin/jfc/FileChooserDemo/src/FileChooserDemo.java
 demo/plugin/jfc/Font2DTest/Font2DTest.html
 demo/plugin/jfc/Font2DTest/Font2DTest.jar
-demo/plugin/jfc/Font2DTest/Font2DTestPlugin.html
 demo/plugin/jfc/Font2DTest/README.txt
 demo/plugin/jfc/Font2DTest/src/Font2DTest.java
 demo/plugin/jfc/Font2DTest/src/Font2DTestApplet.java
@@ -777,7 +771,7 @@
 demo/plugin/jfc/Notepad/resources/Notepad.properties
 demo/plugin/jfc/Notepad/resources/Notepad_fr.properties
 demo/plugin/jfc/Notepad/resources/Notepad_sv.properties
-demo/plugin/jfc/Notepad/resources/Notepad_zh.properties
+demo/plugin/jfc/Notepad/resources/Notepad_zh_CN.properties
 demo/plugin/jfc/Notepad/resources/copy.gif
 demo/plugin/jfc/Notepad/resources/cut.gif
 demo/plugin/jfc/Notepad/resources/new.gif
@@ -795,18 +789,15 @@
 demo/plugin/jfc/SampleTree/src/SampleTree.java
 demo/plugin/jfc/SampleTree/src/SampleTreeCellRenderer.java
 demo/plugin/jfc/SampleTree/src/SampleTreeModel.java
-demo/plugin/jfc/SimpleExample/README.txt
-demo/plugin/jfc/SimpleExample/SimpleExample.jar
-demo/plugin/jfc/SimpleExample/src/SimpleExample.java
 demo/plugin/jfc/Stylepad/README.txt
 demo/plugin/jfc/Stylepad/Stylepad.jar
 demo/plugin/jfc/Stylepad/resources/Notepad.properties
 demo/plugin/jfc/Stylepad/resources/Notepad_fr.properties
 demo/plugin/jfc/Stylepad/resources/Notepad_sv.properties
-demo/plugin/jfc/Stylepad/resources/Notepad_zh.properties
+demo/plugin/jfc/Stylepad/resources/Notepad_zh_CN.properties
 demo/plugin/jfc/Stylepad/resources/Stylepad.properties
 demo/plugin/jfc/Stylepad/resources/Stylepad_sv.properties
-demo/plugin/jfc/Stylepad/resources/Stylepad_zh.properties
+demo/plugin/jfc/Stylepad/resources/Stylepad_zh_CN.properties
 demo/plugin/jfc/Stylepad/resources/alice.gif
 demo/plugin/jfc/Stylepad/resources/bold.gif
 demo/plugin/jfc/Stylepad/resources/bullets.gif
@@ -838,7 +829,6 @@
 demo/plugin/jfc/SwingSet2/README.txt
 demo/plugin/jfc/SwingSet2/SwingSet2.html
 demo/plugin/jfc/SwingSet2/SwingSet2.jar
-demo/plugin/jfc/SwingSet2/SwingSet2Plugin.html
 demo/plugin/jfc/SwingSet2/src/AquaTheme.java
 demo/plugin/jfc/SwingSet2/src/BezierAnimationPanel.java
 demo/plugin/jfc/SwingSet2/src/ButtonDemo.java
@@ -930,8 +920,6 @@
 @dirrm demo/plugin/jfc/Stylepad/src
 @dirrm demo/plugin/jfc/Stylepad/resources
 @dirrm demo/plugin/jfc/Stylepad
-@dirrm demo/plugin/jfc/SimpleExample/src
-@dirrm demo/plugin/jfc/SimpleExample
 @dirrm demo/plugin/jfc/SampleTree/src
 @dirrm demo/plugin/jfc/SampleTree/images
 @dirrm demo/plugin/jfc/SampleTree
@@ -1008,8 +996,6 @@
 @dirrm demo/jfc/Stylepad/src
 @dirrm demo/jfc/Stylepad/resources
 @dirrm demo/jfc/Stylepad
-@dirrm demo/jfc/SimpleExample/src
-@dirrm demo/jfc/SimpleExample
 @dirrm demo/jfc/SampleTree/src
 @dirrm demo/jfc/SampleTree/images
 @dirrm demo/jfc/SampleTree
Index: lang/sun-jdk14/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jdk14/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- lang/sun-jdk14/distinfo	2002/05/14 18:00:55	1.1
+++ lang/sun-jdk14/distinfo	2003/01/14 07:43:35
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.1 2002/05/14 18:00:55 jschauma Exp $
 
-SHA1 (j2sdk-1_4_0-linux-i386.bin) = 0805e8b6794c95323dbf33b862075b760fc40693
-Size (j2sdk-1_4_0-linux-i386.bin) = 40618207 bytes
+SHA1 (j2sdk-1_4_1_01-linux-i586.bin) = 24afb3c549071db467697384189784d262f1f574
+Size (j2sdk-1_4_1_01-linux-i586.bin) = 42129700 bytes
Index: lang/sun-jre14/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre14/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lang/sun-jre14/Makefile	2002/10/13 07:45:34	1.3
+++ lang/sun-jre14/Makefile	2003/01/14 07:43:35
@@ -1,14 +1,22 @@
 # $NetBSD: Makefile,v 1.3 2002/10/13 07:45:34 jlam Exp $
 
-# MASTER_SITES is very special, and must end in "=":
-DISTNAME=	j2re-1_4_0-linux-i386
-PKGNAME=	sun-jre14-0
-PKGREVISION=	1
-MASTER_SITES=	http://java.sun.com/Download4?config-file=j2re-1_4_0.config&platform=linux-i386&protocol=HTTP+download&download-name=
+DISTNAME=	j2re-1_4_1_01-linux-i586
+PKGNAME=	sun-jre14-1.0.1
+#PKGREVISION=	1
 
-COMMENT=	Sun's Java(tm) Runtime Environment 1.4.0
+COMMENT=	Sun's Java(TM) 2 Runtime Environment 1.4.1_01
 
-WRKSRC=		${WRKDIR}/j2re1.4.0
+WRKSRC=		${WRKDIR}/j2re1.4.1_01
+
+_FETCH_MESSAGE= \
+	${ECHO} "======================================================================"; \
+	${ECHO} ; \
+	${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
+	${ECHO} " Java(TM) 2 Runtime Environment, Standard Edition must be fetched"; \
+	${ECHO} " into ${DISTDIR}"; \
+	${ECHO} " from ${DOWNLOAD}"; \
+	${ECHO} ; \
+	${ECHO} "======================================================================"
 
 .include "../../lang/sun-jre14/Makefile.common"
 
Index: lang/sun-jre14/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre14/Makefile.common,v
retrieving revision 1.6
diff -u -r1.6 Makefile.common
--- lang/sun-jre14/Makefile.common	2002/11/07 00:22:54	1.6
+++ lang/sun-jre14/Makefile.common	2003/01/14 07:43:35
@@ -5,8 +5,8 @@
 
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://java.sun.com/
+DOWNLOAD=	http://java.sun.com/j2se/1.4.1/download.html
 
-FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
 
 LICENSE=	jdk13-license
@@ -18,7 +18,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-JVM_HOME=	${LOCALBASE}/java/sun-1.4.0
+JVM_HOME=	${LOCALBASE}/java/sun-1.4.1_01
 
 .if ${OPSYS} == "NetBSD"
 DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
Index: lang/sun-jre14/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre14/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- lang/sun-jre14/PLIST	2002/10/13 07:45:35	1.4
+++ lang/sun-jre14/PLIST	2003/01/14 07:43:36
@@ -1,4 +1,6 @@
 @comment $NetBSD: PLIST,v 1.4 2002/10/13 07:45:35 jlam Exp $
+.systemPrefs/.system.lock
+.systemPrefs/.systemRootModFile
 CHANGES
 COPYRIGHT
 ControlPanel.html
@@ -9,13 +11,16 @@
 bin/java
 bin/java_vm
 bin/keytool
+bin/kinit
+bin/klist
+bin/ktab
 bin/orbd
 bin/policytool
 bin/rmid
 bin/rmiregistry
 bin/servertool
 bin/tnameserv
-javaws-1_0_1_02-linux-int.zip
+javaws-1_2_0_01-linux-i586-i.zip
 lib/audio/soundbank.gm
 lib/charsets.jar
 lib/cmm/CIEXYZ.pf
@@ -35,6 +40,7 @@
 lib/font.properties.ja.Redhat6.1
 lib/font.properties.ja.Redhat6.2
 lib/font.properties.ja.Turbo
+lib/font.properties.ja.Turbo6.0
 lib/font.properties.zh.Turbo
 lib/fonts/LucidaBrightDemiBold.ttf
 lib/fonts/LucidaBrightDemiItalic.ttf
@@ -81,6 +87,7 @@
 lib/i386/server/Xusage.txt
 lib/i386/server/libjsig.so
 lib/i386/server/libjvm.so
+lib/im/indicim.jar
 lib/images/cursors/cursors.properties
 lib/images/cursors/invalid32x32.gif
 lib/images/cursors/motif_CopyDrop32x32.gif
@@ -263,7 +270,6 @@
 lib/zi/America/Recife
 lib/zi/America/Regina
 lib/zi/America/Rio_Branco
-lib/zi/America/Rosario
 lib/zi/America/Santiago
 lib/zi/America/Santo_Domingo
 lib/zi/America/Sao_Paulo
@@ -332,17 +338,20 @@
 lib/zi/Asia/Kuala_Lumpur
 lib/zi/Asia/Kuching
 lib/zi/Asia/Kuwait
-lib/zi/Asia/Macao
+lib/zi/Asia/Macau
 lib/zi/Asia/Magadan
+lib/zi/Asia/Makassar
 lib/zi/Asia/Manila
 lib/zi/Asia/Muscat
 lib/zi/Asia/Nicosia
 lib/zi/Asia/Novosibirsk
 lib/zi/Asia/Omsk
+lib/zi/Asia/Oral
 lib/zi/Asia/Phnom_Penh
 lib/zi/Asia/Pontianak
 lib/zi/Asia/Pyongyang
 lib/zi/Asia/Qatar
+lib/zi/Asia/Qyzylorda
 lib/zi/Asia/Rangoon
 lib/zi/Asia/Riyadh
 lib/zi/Asia/Riyadh87
@@ -360,7 +369,6 @@
 lib/zi/Asia/Tehran
 lib/zi/Asia/Thimphu
 lib/zi/Asia/Tokyo
-lib/zi/Asia/Ujung_Pandang
 lib/zi/Asia/Ulaanbaatar
 lib/zi/Asia/Urumqi
 lib/zi/Asia/Vientiane
@@ -533,9 +541,9 @@
 man/man1/rmiregistry.1
 man/man1/servertool.1
 man/man1/tnameserv.1
-plugin/i386/ns4/javaplugin140.so
-plugin/i386/ns600/libjavaplugin_oji140.so
-plugin/i386/ns610/libjavaplugin_oji140.so
+plugin/i386/ns4/javaplugin.so
+plugin/i386/ns600/libjavaplugin_oji.so
+plugin/i386/ns610/libjavaplugin_oji.so
 @dirrm plugin/i386/ns610
 @dirrm plugin/i386/ns600
 @dirrm plugin/i386/ns4
@@ -587,6 +595,7 @@
 @dirrm lib/locale
 @dirrm lib/images/cursors
 @dirrm lib/images
+@dirrm lib/im
 @dirrm lib/i386/server
 @dirrm lib/i386/native_threads
 @dirrm lib/i386/client
@@ -599,4 +608,5 @@
 @unexec ${RMDIR} %D/lib/applet 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
 @dirrm bin
+@dirrm .systemPrefs
 @unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}
Index: lang/sun-jre14/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/sun-jre14/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- lang/sun-jre14/distinfo	2002/05/14 18:00:56	1.1
+++ lang/sun-jre14/distinfo	2003/01/14 07:43:36
@@ -1,4 +1,4 @@
 $NetBSD: distinfo,v 1.1 2002/05/14 18:00:56 jschauma Exp $
 
-SHA1 (j2re-1_4_0-linux-i386.bin) = 9cfecb00065e5b6b21fa3e747cd5ef40d7a2f313
-Size (j2re-1_4_0-linux-i386.bin) = 21826430 bytes
+SHA1 (j2re-1_4_1_01-linux-i586.bin) = d65557e9be05ad551065225b967cea42d7ad04e4
+Size (j2re-1_4_1_01-linux-i586.bin) = 22839295 bytes
>Release-Note:
>Audit-Trail:
>Unformatted: