Update sun-jre14 and sun-jdk14 to 1.0.1. These are bug fix releases from

Sun for JDK 1.4.1.  Pkgsrc changes include noting that some of the installed
files are config files and using bsd.pkg.install.mk to handle the file
copying and directory handling, and using a more scalable method to remove
files shared between the JRE and JDK during the JDK installation.  Also,
the JDK 1.4.x series are now installed into ${LOCALBASE}/java/sun-1.4 so
that future updates of this package won't require a new JDK directory.

This closes PR 19853 by FUKAUMI Naoki <naoki at fukaumi.org>.

6 files changed, 78 insertions, 42 deletions

diff --git a/lang/sun-jdk14/DESCR b/lang/sun-jdk14/DESCR
index 210df9b0755..e2fea1a57df 100644
--- a/lang/sun-jdk14/DESCR
+++ b/lang/sun-jdk14/DESCR
@@ -1,2 +1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.0.
-This version runs only on Linux and NetBSD-1.6*-i386.
+This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.1.
diff --git a/lang/sun-jdk14/MESSAGE b/lang/sun-jdk14/MESSAGE
index 09f350dc082..f4b72a93a34 100644
--- a/lang/sun-jdk14/MESSAGE
+++ b/lang/sun-jdk14/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2002/10/13 07:29:34 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2003/01/29 11:13:28 jlam Exp $
 
 In order to invoke the JVM, the data segment size set by your shell's
 'ulimit' builtin must be at least 131204 -- please refer to your shell's
@@ -9,7 +9,7 @@ You may want to read
 
 	${PREFIX}/README
 
-for details about running this jdk.  In a nutshell you may want to set the
+for details about running this JDK.  In a nutshell you may want to set the
 following in your shell environment:
 
 	CLASSPATH to ${PREFIX}/src.zip:.
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 446f5d32cfc..bc74ead67d4 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,20 +1,37 @@
-# $NetBSD: Makefile,v 1.3 2002/10/13 07:45:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/29 11:13:28 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
+WRKSRC=		${WRKDIR}/j2sdk1.4.1_01
+MASTER_SITES=	# empty
 
-COMMENT=	Sun's Java(tm) Development Kit 1.4.0
+COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.4.1
 
-DEPENDS=	sun-jre14>=0:../../lang/sun-jre14
+DEPENDS=	sun-jre14>=1.0.1:../../lang/sun-jre14
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.0
-
-# these are part of JRE
+# Remove parts that are in common with the JRE
+#
 post-extract:
-	${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README
+	common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \
+	cd ${WRKSRC}; for i in $$common; do				\
+		if [ -d $$i ]; then					\
+			${RM} -rf $$i;					\
+		else							\
+			${RM} -f $$i;					\
+		fi;							\
+	done
+
+_FETCH_MESSAGE= \
+	${ECHO} "======================================================================"; \
+	${ECHO} ; \
+	${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
+	${ECHO} " Java(tm) 2 SDK, Standard Edition must be fetched"; \
+	${ECHO} " into:"; \
+	${ECHO} "	${DISTDIR}"; \
+	${ECHO} " from:"; \
+	${ECHO} "	${DOWNLOAD}"; \
+	${ECHO} ; \
+	${ECHO} "======================================================================"
 
 .include "../../lang/sun-jre14/Makefile.common"
 
diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST
index 0e4cc2127e3..a01672c8207 100644
--- a/lang/sun-jdk14/PLIST
+++ b/lang/sun-jdk14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/27 22:21:05 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/29 11:13:28 jlam Exp $
 README.html
 bin/HtmlConverter
 bin/appletviewer
@@ -236,7 +236,6 @@ demo/jfc/FileChooserDemo/src/ExampleFileView.java
 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/README.txt
 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/SampleData.java
 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/SwingApplet/src/SwingApplet.java
 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/ExampleFileView.java
 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/README.txt
 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/SampleData.java
 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/SwingApplet/src/SwingApplet.java
 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
@@ -920,7 +910,6 @@ man/man1/serialver.1
 src.zip
 @dirrm include/linux
 @dirrm include
-@unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
 @dirrm demo/plugin/jfc/TableExample/src
 @dirrm demo/plugin/jfc/TableExample
 @dirrm demo/plugin/jfc/SwingSet2/src
@@ -930,8 +919,6 @@ src.zip
 @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 +995,6 @@ src.zip
 @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
@@ -1076,4 +1061,3 @@ src.zip
 @dirrm demo/applets/Animator
 @dirrm demo/applets
 @dirrm demo
-@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index 511ff93764e..89825ccee03 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2002/05/14 18:00:55 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/01/29 11:13:29 jlam 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
diff --git a/lang/sun-jdk14/files/common b/lang/sun-jdk14/files/common
new file mode 100644
index 00000000000..58d6c93a042
--- /dev/null
+++ b/lang/sun-jdk14/files/common
@@ -0,0 +1,36 @@
+# $NetBSD: common,v 1.1 2003/01/29 11:13:29 jlam Exp $
+
+.systemPrefs
+COPYRIGHT
+LICENSE
+README
+bin/ControlPanel
+bin/java
+bin/keytool
+bin/kinit
+bin/klist
+bin/ktab
+bin/orbd
+bin/policytool
+bin/rmid
+bin/rmiregistry
+bin/servertool
+bin/tnameserv
+jre
+man/ja
+man/ja_JP.eucJP/man1/java.1
+man/ja_JP.eucJP/man1/keytool.1
+man/ja_JP.eucJP/man1/orbd.1
+man/ja_JP.eucJP/man1/policytool.1
+man/ja_JP.eucJP/man1/rmid.1
+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/keytool.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