Update sun-jre13 and sun-jdk13 to 1.0.7. These are bug fix releases from

Sun for JDK 1.3.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.

This closes PR 18942 by Urban Boquist <urban at boquist.net>.

13 files changed, 148 insertions, 74 deletions

diff --git a/lang/sun-jdk13/DESCR b/lang/sun-jdk13/DESCR
index 4dc2515f1e9..5173b4f7fe6 100644
--- a/lang/sun-jdk13/DESCR
+++ b/lang/sun-jdk13/DESCR
@@ -1 +1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.3.0.
+This is the Linux port of the Sun Java(tm) Development Kit, version 1.3.1.
diff --git a/lang/sun-jdk13/MESSAGE b/lang/sun-jdk13/MESSAGE
index ed1da2a1542..2ed18c20903 100644
--- a/lang/sun-jdk13/MESSAGE
+++ b/lang/sun-jdk13/MESSAGE
@@ -1,8 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2002/10/13 07:29:33 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2003/01/29 11:10:19 jlam Exp $
 
 You may want to read ${PREFIX}/README for details about running
-this jdk. In a nutshell you may want to set the following in your
+this JDK.  In a nutshell you may want to set the following in your
 shell environment:
 
 	CLASSPATH to ${PREFIX}/src.jar:.
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 8b652741e29..5166958e5cc 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,19 +1,38 @@
-# $NetBSD: Makefile,v 1.16 2002/10/13 07:45:30 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/29 11:10:19 jlam Exp $
 
-# MASTER_SITES is very special, and must end in "=":
-DISTNAME=	j2sdk-1_3_1_02-linux-i386
-PKGNAME=	sun-jdk13-1.0.2
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/jdk1.3.1_02
-MASTER_SITES=	http://java.sun.com/Download4?config-file=j2sdk-1_3_1_02.config&platform=linux-i386&protocol=HTTP+download&download-name=
+DISTNAME=	j2sdk-1_3_1_07-linux-i586
+PKGNAME=	sun-jdk13-1.0.7
+WRKSRC=		${WRKDIR}/jdk1.3.1_07
+MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
 
-DEPENDS=	sun-jre13>=1:../../lang/sun-jre13
+DEPENDS=	sun-jre13>=1.0.7:../../lang/sun-jre13
 
-# these are part of the JRE
+# Remove parts that are in common with the JRE.
+#
 post-extract:
-	${RM} -fr ${WRKSRC}/jre
-	${RM} -f ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/bin/.java_wrapper
+	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-jre13/Makefile.common"
+
+PREFIX=		${JVM_HOME}
diff --git a/lang/sun-jdk13/PLIST b/lang/sun-jdk13/PLIST
index 1fc32e6e809..12fb7e0ce1d 100644
--- a/lang/sun-jdk13/PLIST
+++ b/lang/sun-jdk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/27 22:01:33 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/29 11:10:19 jlam Exp $
 README.html
 bin/HtmlConverter
 bin/appletviewer
@@ -610,8 +610,6 @@ man/man1/native2ascii.1
 man/man1/rmic.1
 man/man1/serialver.1
 src.jar
-@unexec ${RMDIR} %D/lib/i386 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
 @dirrm include/linux
 @dirrm include-old/linux
 @dirrm include-old
@@ -711,7 +709,3 @@ src.jar
 @dirrm demo/applets/Animator
 @dirrm demo/applets
 @dirrm demo
-@unexec ${RMDIR} %D/bin/i386/native_threads 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/bin/i386/green_threads 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/bin/i386 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}
diff --git a/lang/sun-jdk13/distinfo b/lang/sun-jdk13/distinfo
index 652c3bcead0..7a9c241127d 100644
--- a/lang/sun-jdk13/distinfo
+++ b/lang/sun-jdk13/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/10/13 07:45:31 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/01/29 11:10:19 jlam Exp $
 
-SHA1 (j2sdk-1_3_1_02-linux-i386.bin) = ebeee5f0f32faf14bdc6beacac54c851b309c7ba
-Size (j2sdk-1_3_1_02-linux-i386.bin) = 26311391 bytes
+SHA1 (j2sdk-1_3_1_07-linux-i586.bin) = 51fc6536420d79218c11aebc72d71099d253a9a9
+Size (j2sdk-1_3_1_07-linux-i586.bin) = 26532079 bytes
diff --git a/lang/sun-jdk13/files/common b/lang/sun-jdk13/files/common
new file mode 100644
index 00000000000..a9fbcda8e07
--- /dev/null
+++ b/lang/sun-jdk13/files/common
@@ -0,0 +1,36 @@
+# $NetBSD: common,v 1.1 2003/01/29 11:10:24 jlam Exp $
+
+COPYRIGHT
+LICENSE
+README
+bin/.java_wrapper
+bin/ControlPanel
+bin/awt_robot
+bin/i386/green_threads
+bin/i386/native_threads/java
+bin/i386/native_threads/java_vm
+bin/i386/native_threads/keytool
+bin/i386/native_threads/policytool
+bin/i386/native_threads/rmid
+bin/i386/native_threads/rmiregistry
+bin/i386/native_threads/tnameserv
+bin/i386/realpath
+bin/java
+bin/keytool
+bin/policytool
+bin/realpath
+bin/rmid
+bin/rmiregistry
+bin/tnameserv
+jre
+man/ja
+man/ja_JP.eucJP/man1/java.1
+man/ja_JP.eucJP/man1/keytool.1
+man/ja_JP.eucJP/man1/rmid.1
+man/ja_JP.eucJP/man1/rmiregistry.1
+man/ja_JP.eucJP/man1/tnameserv.1
+man/man1/java.1
+man/man1/keytool.1
+man/man1/rmid.1
+man/man1/rmiregistry.1
+man/man1/tnameserv.1
diff --git a/lang/sun-jre13/MESSAGE b/lang/sun-jre13/MESSAGE
index 3676e535586..4f4273fdbcf 100644
--- a/lang/sun-jre13/MESSAGE
+++ b/lang/sun-jre13/MESSAGE
@@ -1,11 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2002/10/13 07:29:35 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2003/01/29 11:10:24 jlam Exp $
 
 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:
 
 	JAVA_HOME to ${PREFIX}
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index b2e37fc8fe1..b3514b5d38d 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,15 +1,49 @@
-# $NetBSD: Makefile,v 1.24 2002/10/13 07:45:33 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/29 11:10:24 jlam Exp $
 
-# MASTER_SITES is very special, and must end in "=":
-DISTNAME=	j2re-1_3_1_02-linux-i386
-PKGNAME=	sun-jre13-1.0.2
-PKGREVISION=	1
-WRKSRC=		${WRKDIR}/jre1.3.1_02
-MASTER_SITES=	http://java.sun.com/Download4?config-file=j2re-1_3_1_02.config&platform=linux-i386&protocol=HTTP+download&download-name=
+DISTNAME=	j2re-1_3_1_07-linux-i586
+PKGNAME=	sun-jre13-1.0.7
+WRKSRC=		${WRKDIR}/jre1.3.1_07
+MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) Runtime Environment 1.3.1
 
-post-patch:
-	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+USE_PKGINSTALL=	yes
+OWN_DIRS=	${PREFIX}
+OWN_DIRS+=	${PREFIX}/jre
+OWN_DIRS+=	${PREFIX}/jre/lib
+OWN_DIRS+=	${PREFIX}/jre/lib/applet
+OWN_DIRS+=	${PREFIX}/jre/lib/ext
+OWN_DIRS+=	${PREFIX}/lib
+OWN_DIRS+=	${PREFIX}/lib/images
+OWN_DIRS+=	${PREFIX}/lib/images/cursors
+OWN_DIRS+=	${PREFIX}/lib/security
+SFILES=		content-types.properties	flavormap.properties
+SFILES+=	font.properties		font.properties.ja
+SFILES+=	font.properties.zh	images/cursors/cursors.properties
+SFILES+=	jvm.cfg			psfont.properties.ja
+SFILES+=	psfontj2d.properties	security/java.security
+SUPPORT_FILES=	# empty
+.for FILE in ${SFILES}
+SUPPORT_FILES+=	${PREFIX}/lib/${FILE}.default ${PREFIX}/lib/${FILE}
+.endfor
+
+do-configure:
+	cd ${WRKSRC}/lib; for file in ${SFILES}; do			\
+		${MV} -f $$file $$file.default;				\
+	done
+
+_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:"; \
+	${ECHO} "	${DISTDIR}"; \
+	${ECHO} " from:"; \
+	${ECHO} "	${DOWNLOAD}"; \
+	${ECHO} ; \
+	${ECHO} "======================================================================"
 
 .include "../../lang/sun-jre13/Makefile.common"
+
+PREFIX=		${JVM_HOME}
diff --git a/lang/sun-jre13/Makefile.common b/lang/sun-jre13/Makefile.common
index ec901b62bfc..eb252db4a61 100644
--- a/lang/sun-jre13/Makefile.common
+++ b/lang/sun-jre13/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2002/11/07 00:22:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2003/01/29 11:10:24 jlam Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 CATEGORIES=	lang
@@ -6,8 +6,8 @@ EXTRACT_SUFX=	.bin
 
 MAINTAINER=	jschauma@netbsd.org
 HOMEPAGE=	http://java.sun.com/
+DOWNLOAD=	http://java.sun.com/j2se/1.3/download.html
 
-FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
 
 LICENSE=	jdk13-license
@@ -32,20 +32,18 @@ DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
 
 .if ${OPSYS} == "Darwin"
 DISTFILES=	# empty
-NO_PATCH=	# defined
-NO_CONFIGURE=	# defined
-NO_BUILD=	# defined
+NO_PATCH=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 PLIST_SRC=	${PKGDIR}/PLIST.Darwin
 .endif
 
 .if ${OPSYS} == "Linux"
-NO_PATCH=	# defined -- no need for patches on Linux
+NO_PATCH=	yes	# no need for patches on Linux
 .endif
 
-USE_BUILDLINK2=	# defined
-NO_CONFIGURE=	# defined
-NO_BUILD=	# defined
-NO_MTREE=	# defined, since we change PREFIX
+USE_BUILDLINK2=	yes
+NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
@@ -57,6 +55,8 @@ post-fetch:
 	fi
 .endif
 
+do-build:	# nothing
+
 post-build:
 	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
 
diff --git a/lang/sun-jre13/PLIST b/lang/sun-jre13/PLIST
index 77dac5c4dca..649a886f162 100644
--- a/lang/sun-jre13/PLIST
+++ b/lang/sun-jre13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/13 07:45:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/29 11:10:24 jlam Exp $
 CHANGES
 COPYRIGHT
 ControlPanel.html
@@ -51,11 +51,11 @@ lib/cmm/GRAY.pf
 lib/cmm/LINEAR_RGB.pf
 lib/cmm/PYCC.pf
 lib/cmm/sRGB.pf
-lib/content-types.properties
-lib/flavormap.properties
-lib/font.properties
-lib/font.properties.ja
-lib/font.properties.zh
+lib/content-types.properties.default
+lib/flavormap.properties.default
+lib/font.properties.default
+lib/font.properties.ja.default
+lib/font.properties.zh.default
 lib/fonts/LucidaBrightDemiBold.ttf
 lib/fonts/LucidaBrightDemiItalic.ttf
 lib/fonts/LucidaBrightItalic.ttf
@@ -98,7 +98,7 @@ lib/i386/libzip.so
 lib/i386/native_threads/libhpi.so
 lib/i386/server/Xusage.txt
 lib/i386/server/libjvm.so
-lib/images/cursors/cursors.properties
+lib/images/cursors/cursors.properties.default
 lib/images/cursors/invalid32x32.gif
 lib/images/cursors/motif_CopyDrop32x32.gif
 lib/images/cursors/motif_CopyNoDrop32x32.gif
@@ -107,7 +107,7 @@ lib/images/cursors/motif_LinkNoDrop32x32.gif
 lib/images/cursors/motif_MoveDrop32x32.gif
 lib/images/cursors/motif_MoveNoDrop32x32.gif
 lib/javaplugin.jar
-lib/jvm.cfg
+lib/jvm.cfg.default
 lib/jvm.hprof.txt
 lib/jvm.jcov.txt
 lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -122,20 +122,21 @@ lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
 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/psfont.properties.ja
-lib/psfontj2d.properties
+lib/psfont.properties.ja.default
+lib/psfontj2d.properties.default
 lib/rt.jar
 lib/security/cacerts
 lib/security/java.policy
-lib/security/java.security
+lib/security/java.security.default
 lib/sunrsasign.jar
 lib/tzmappings
-man/ja
 man/ja_JP.eucJP/man1/java.1
 man/ja_JP.eucJP/man1/keytool.1
 man/ja_JP.eucJP/man1/rmid.1
 man/ja_JP.eucJP/man1/rmiregistry.1
 man/ja_JP.eucJP/man1/tnameserv.1
+@exec	${LN} -sf ja_JP.eucJP %D/man/ja
+@unexec ${RM} -f %D/man/ja
 man/man1/java.1
 man/man1/keytool.1
 man/man1/rmid.1
@@ -143,8 +144,6 @@ man/man1/rmiregistry.1
 man/man1/tnameserv.1
 plugin/i386/ns4/javaplugin.so
 plugin/i386/ns600/libjavaplugin_oji.so
-@exec ${MKDIR} %D/jre/lib/applet
-@exec ${MKDIR} %D/jre/lib/ext
 @dirrm plugin/i386/ns600
 @dirrm plugin/i386/ns4
 @dirrm plugin/i386
@@ -153,7 +152,6 @@ plugin/i386/ns600/libjavaplugin_oji.so
 @dirrm man/ja_JP.eucJP/man1
 @dirrm man/ja_JP.eucJP
 @dirrm man
-@dirrm lib/security
 @dirrm lib/locale/zh_TW/LC_MESSAGES
 @dirrm lib/locale/zh_TW.BIG5/LC_MESSAGES
 @dirrm lib/locale/zh_TW.BIG5
@@ -179,8 +177,6 @@ plugin/i386/ns600/libjavaplugin_oji.so
 @dirrm lib/locale/de/LC_MESSAGES
 @dirrm lib/locale/de
 @dirrm lib/locale
-@dirrm lib/images/cursors
-@dirrm lib/images
 @dirrm lib/i386/server
 @dirrm lib/i386/native_threads
 @dirrm lib/i386/green_threads
@@ -192,9 +188,7 @@ plugin/i386/ns600/libjavaplugin_oji.so
 @dirrm lib/cmm
 @dirrm lib/audio
 @dirrm lib/applet
-@dirrm lib
 @dirrm bin/i386/native_threads
 @dirrm bin/i386/green_threads
 @dirrm bin/i386
 @dirrm bin
-@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}
diff --git a/lang/sun-jre13/distinfo b/lang/sun-jre13/distinfo
index 4a512056467..c36266363d7 100644
--- a/lang/sun-jre13/distinfo
+++ b/lang/sun-jre13/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/03/19 16:33:59 tron Exp $
+$NetBSD: distinfo,v 1.6 2003/01/29 11:10:24 jlam Exp $
 
-SHA1 (j2re-1_3_1_02-linux-i386.bin) = fb8bc0a3370c8f779873679d5d108bc640d1e2d0
-Size (j2re-1_3_1_02-linux-i386.bin) = 14877685 bytes
-SHA1 (patch-aa) = 9fb088f7975a39b012aa9c62236af858e5c7d23d
+SHA1 (j2re-1_3_1_07-linux-i586.bin) = 824294203178db005e79a787d1e40cebb3e1519f
+Size (j2re-1_3_1_07-linux-i586.bin) = 15358216 bytes
+SHA1 (patch-aa) = d77d939b5c38ca8c8f9b387632e40441015c47cf
 SHA1 (patch-ab) = 1a1664d2be48d7a4f8fc05876b7aa5f225c65b16
diff --git a/lang/sun-jre13/files/wrap.sh b/lang/sun-jre13/files/wrap.sh
deleted file mode 100755
index d9560de3c71..00000000000
--- a/lang/sun-jre13/files/wrap.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-# $NetBSD: wrap.sh,v 1.2 2002/03/10 21:04:51 cjs Exp $
-exec @PREFIX@/jre/bin/java "$@"
diff --git a/lang/sun-jre13/patches/patch-aa b/lang/sun-jre13/patches/patch-aa
index 6c19b982aba..bcbf26deff7 100644
--- a/lang/sun-jre13/patches/patch-aa
+++ b/lang/sun-jre13/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2001/06/12 16:31:47 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/29 11:10:26 jlam Exp $
 
---- bin/.java_wrapper.orig	Sun May  6 11:15:57 2001
+--- bin/.java_wrapper.orig	Fri Dec  6 11:27:32 2002
 +++ bin/.java_wrapper
-@@ -31,17 +31,6 @@
+@@ -22,17 +22,6 @@ case "`uname -m`" in
          ;;
  esac