We allow several JDKs/JREs to coexist, installing them in separate

subdirectories under ${PREFIX}/java/ -- Change IV of many.

Thus install this JDK into ${PREFIX}/java/sun-1.3.1 and remove
CONFLICTS with other JDKs/JREs.  Rename package from sun-jdk-1.3.1.0.2
to sun-jdk13-1.0.2 (avoids conflict with sun-jdk14).

Include lang/sun-jre13/Makefile.common for shared info.

Add informative MESSAGE and finally bump PKGREVISION.

3 files changed, 27 insertions, 134 deletions

diff --git a/lang/sun-jdk13/MESSAGE b/lang/sun-jdk13/MESSAGE
new file mode 100644
index 00000000000..acae996866c
--- /dev/null
+++ b/lang/sun-jdk13/MESSAGE
@@ -0,0 +1,12 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2002/07/27 22:01:33 jschauma Exp $
+
+You may want to read ${JDK_HOME}/README for details about
+running this jdk. In a nutshell you may want to set the following in
+your shell environment:
+
+	CLASSPATH to ${JDK_HOME}/src.jar:.
+        JAVA_HOME to ${JDK_HOME}
+	${PATH} to include ${JDK_HOME}/bin
+
+======================================================================
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index 321fa9cdcec..086e35e2324 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,82 +1,19 @@
-# $NetBSD: Makefile,v 1.14 2002/06/30 15:01:48 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2002/07/27 22:01:33 jschauma Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2sdk-1_3_1_02-linux-i386
-PKGNAME=	sun-jdk-1.3.1.0.2
-CATEGORIES=     lang
+PKGNAME=	sun-jdk13-1.0.2
+PKGREVISION=	1
 MASTER_SITES=	http://java.sun.com/Download4?config-file=j2sdk-1_3_1_02.config&platform=linux-i386&protocol=HTTP+download&download-name=
-EXTRACT_SUFX=	.bin
 
-MAINTAINER=	tv@netbsd.org
-HOMEPAGE=	http://java.sun.com/
 COMMENT=	Sun's Java(tm) Development Kit 1.3.1
 
-DEPENDS=	sun-jre-1.3.1.0.2:../../lang/sun-jre13
+DEPENDS=	sun-jre13>=1:../../lang/sun-jre13
 
-CONFLICTS=	jdk-[0-9]* blackdown-j*
-
-FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
 WRKSRC=		${WRKDIR}/jdk1.3.1_02
 
-LICENSE=	jdk13-license
-RESTRICTED=	"Redistribution of repackaged binaries not permitted"
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-DISTFILES=	# empty
-NO_PATCH=	# defined
-NO_CONFIGURE=	# defined
-PLIST_SRC=	${PKGDIR}/PLIST.Darwin
-.endif
-
-.if !defined(JDK_HOME)
-JDK_HOME:=	${LOCALBASE}/java
-.endif
-
-NO_BUILD=	yes
-# since we change PREFIX:
-NO_MTREE=	yes
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 Darwin-*-*
-LDD=		${TRUE}
-
-post-fetch:
-.	if ${OPSYS} != "Darwin"
-	@${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-.	endif
-
-post-extract:
-	@${RM} -rf ${WRKSRC}/jre ${WRKSRC}/bin/java
-
-post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
-
-# This is ugly.  The chown should happen after copying, ot tar should have
-# a way to override permissions.
-do-install:
-.	if ${OPSYS} == "Darwin"
-	@${ECHO_MSG} "Darwin ships with a JDK based on Sun's 1.3.1 release."
-.	else
-	${INSTALL_PROGRAM_DIR} ${PREFIX}
-	${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC}
-	${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${PREFIX} -xpf-
-.	endif
-
-.include "../../mk/bsd.pkg.mk"
-
-# These need to be after bsd.pkg.mk 
-
-.if ${OPSYS} == "Linux"
-# No patches on linux
-PATCHDIR=	${WRKDIR}/.patches
-pre-patch:
-	${MKDIR} ${PATCHDIR}
-.endif
+# these are part of JRE
+do-configure:
+	@${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/bin/.java_wrapper
 
-PREFIX:=	${JDK_HOME}
+.include "../../lang/sun-jre13/Makefile.common"
diff --git a/lang/sun-jdk13/PLIST b/lang/sun-jdk13/PLIST
index ba004b8bf43..1fc32e6e809 100644
--- a/lang/sun-jdk13/PLIST
+++ b/lang/sun-jdk13/PLIST
@@ -1,60 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:25:06 zuntum Exp $
-COPYRIGHT
-LICENSE
-README
+@comment $NetBSD: PLIST,v 1.2 2002/07/27 22:01:33 jschauma Exp $
 README.html
-bin/.java_wrapper
-bin/ControlPanel
 bin/HtmlConverter
 bin/appletviewer
-bin/awt_robot
 bin/extcheck
-bin/i386/green_threads/appletviewer
-bin/i386/green_threads/extcheck
-bin/i386/green_threads/idlj
-bin/i386/green_threads/jar
-bin/i386/green_threads/jarsigner
-bin/i386/green_threads/java
-bin/i386/green_threads/javac
-bin/i386/green_threads/javadoc
-bin/i386/green_threads/javah
-bin/i386/green_threads/javap
-bin/i386/green_threads/jdb
-bin/i386/green_threads/keytool
-bin/i386/green_threads/native2ascii
-bin/i386/green_threads/oldjava
-bin/i386/green_threads/oldjavac
-bin/i386/green_threads/oldjdb
-bin/i386/green_threads/policytool
-bin/i386/green_threads/rmic
-bin/i386/green_threads/rmid
-bin/i386/green_threads/rmiregistry
-bin/i386/green_threads/serialver
-bin/i386/green_threads/tnameserv
 bin/i386/native_threads/appletviewer
 bin/i386/native_threads/extcheck
 bin/i386/native_threads/idlj
 bin/i386/native_threads/jar
 bin/i386/native_threads/jarsigner
-bin/i386/native_threads/java
-bin/i386/native_threads/java_vm
 bin/i386/native_threads/javac
 bin/i386/native_threads/javadoc
 bin/i386/native_threads/javah
 bin/i386/native_threads/javap
 bin/i386/native_threads/jdb
-bin/i386/native_threads/keytool
 bin/i386/native_threads/native2ascii
 bin/i386/native_threads/oldjava
 bin/i386/native_threads/oldjavac
 bin/i386/native_threads/oldjdb
-bin/i386/native_threads/policytool
 bin/i386/native_threads/rmic
-bin/i386/native_threads/rmid
-bin/i386/native_threads/rmiregistry
 bin/i386/native_threads/serialver
-bin/i386/native_threads/tnameserv
-bin/i386/realpath
 bin/idlj
 bin/jar
 bin/jarsigner
@@ -64,18 +28,12 @@ bin/javadoc
 bin/javah
 bin/javap
 bin/jdb
-bin/keytool
 bin/native2ascii
 bin/oldjava
 bin/oldjavac
 bin/oldjdb
-bin/policytool
-bin/realpath
 bin/rmic
-bin/rmid
-bin/rmiregistry
 bin/serialver
-bin/tnameserv
 demo/applets/Animator/Animation.class
 demo/applets/Animator/AnimationFrame.class
 demo/applets/Animator/Animator.class
@@ -627,48 +585,33 @@ lib/i386/libjdwp.so
 lib/ir.idl
 lib/orb.idl
 lib/tools.jar
-man/ja
 man/ja_JP.eucJP/man1/appletviewer.1
 man/ja_JP.eucJP/man1/extcheck.1
 man/ja_JP.eucJP/man1/jar.1
 man/ja_JP.eucJP/man1/jarsigner.1
-man/ja_JP.eucJP/man1/java.1
 man/ja_JP.eucJP/man1/javac.1
 man/ja_JP.eucJP/man1/javadoc.1
 man/ja_JP.eucJP/man1/javah.1
 man/ja_JP.eucJP/man1/javap.1
 man/ja_JP.eucJP/man1/jdb.1
-man/ja_JP.eucJP/man1/keytool.1
 man/ja_JP.eucJP/man1/native2ascii.1
 man/ja_JP.eucJP/man1/rmic.1
-man/ja_JP.eucJP/man1/rmid.1
-man/ja_JP.eucJP/man1/rmiregistry.1
 man/ja_JP.eucJP/man1/serialver.1
-man/ja_JP.eucJP/man1/tnameserv.1
 man/man1/appletviewer.1
 man/man1/extcheck.1
 man/man1/jar.1
 man/man1/jarsigner.1
-man/man1/java.1
 man/man1/javac.1
 man/man1/javadoc.1
 man/man1/javah.1
 man/man1/javap.1
 man/man1/jdb.1
-man/man1/keytool.1
 man/man1/native2ascii.1
 man/man1/rmic.1
-man/man1/rmid.1
-man/man1/rmiregistry.1
 man/man1/serialver.1
-man/man1/tnameserv.1
 src.jar
-@dirrm man/man1
-@dirrm man/ja_JP.eucJP/man1
-@dirrm man/ja_JP.eucJP
-@dirrm man
-@dirrm lib/i386
-@dirrm lib
+@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
@@ -768,6 +711,7 @@ src.jar
 @dirrm demo/applets/Animator
 @dirrm demo/applets
 @dirrm demo
-@dirrm bin/i386/native_threads
-@dirrm bin/i386/green_threads
-@dirrm bin/i386
+@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}