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>.

6 files changed, 73 insertions, 24 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