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

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

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

Pull in common stuff by including lang/sun-jre14/Makefile.common.

Extend MESSAGE and finally bump PKGREVISION.

3 files changed, 20 insertions, 90 deletions

diff --git a/lang/sun-jdk14/MESSAGE b/lang/sun-jdk14/MESSAGE
index 08947cfb160..2f28d33076b 100644
--- a/lang/sun-jdk14/MESSAGE
+++ b/lang/sun-jdk14/MESSAGE
@@ -1,8 +1,16 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.1 2002/05/15 19:11:13 jschauma Exp $
+$NetBSD: MESSAGE,v 1.2 2002/07/27 22:21:04 jschauma Exp $
 
 In order to invoke the JVM, the data segment size set by żour shells
 'ulimit' builtin must be at least 131204 -- please refer to your
 shells manual page for details.
 
+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.zip:.
+        JAVA_HOME to ${JDK_HOME}
+	${PATH} to include ${JDK_HOME}/bin
+
 ======================================================================
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index d564826369d..80b37c57199 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,69 +1,23 @@
-# $NetBSD: Makefile,v 1.1 2002/05/14 18:00:54 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/27 22:21:04 jschauma Exp $
 
 # MASTER_SITES is very special, and must end in "=":
 DISTNAME=	j2sdk-1_4_0-linux-i386
-PKGNAME=	sun-jdk-1.4.0
-CATEGORIES=     lang
+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=
-EXTRACT_SUFX=	.bin
 
-MAINTAINER=	jschauma@netbsd.org
-HOMEPAGE=	http://java.sun.com/
 COMMENT=	Sun's Java(tm) Development Kit 1.4.0
 
-DEPENDS=	sun-jre-1.4.0:../../lang/sun-jre14
+DEPENDS=	sun-jre14>=0:../../lang/sun-jre14
 
-CONFLICTS=	jdk-[0-9]* blackdown-j* sun-jdk-1.3*
-
-FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_CMD=	${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
 WRKSRC=		${WRKDIR}/j2sdk1.4.0
 
-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 !defined(JDK_HOME)
-JDK_HOME:=	${LOCALBASE}/java
-.endif
-
-NO_BUILD=	yes
-# since we change PREFIX:
-NO_MTREE=	yes
-
-ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386 Linux-*-i[3-6]86
-LDD=		${TRUE}
-
-post-fetch:
-	@${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-
-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:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}
-	${CHOWN} -hR ${BINOWN}:${BINGRP} ${WRKSRC}
-	${GTAR} -C ${WRKSRC} -cf- . | ${GTAR} -C ${PREFIX} -xpf-
+# these are part of JRE
+do-configure:
+	${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README
 
+.include "../../lang/sun-jre14/Makefile.common"
 .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
-
 PREFIX:=	${JDK_HOME}
diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST
index 8398bb9f6cd..0e4cc2127e3 100644
--- a/lang/sun-jdk14/PLIST
+++ b/lang/sun-jdk14/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2002/05/14 18:00:55 jschauma Exp $
-COPYRIGHT
-LICENSE
-README
+@comment $NetBSD: PLIST,v 1.2 2002/07/27 22:21:05 jschauma Exp $
 README.html
-bin/ControlPanel
 bin/HtmlConverter
 bin/appletviewer
 bin/extcheck
@@ -11,22 +7,14 @@ bin/idlj
 bin/jar
 bin/jarsigner
 bin/java-rmi.cgi
-bin/java_vm
 bin/javac
 bin/javadoc
 bin/javah
 bin/javap
 bin/jdb
-bin/keytool
 bin/native2ascii
-bin/orbd
-bin/policytool
 bin/rmic
-bin/rmid
-bin/rmiregistry
 bin/serialver
-bin/servertool
-bin/tnameserv
 demo/applets/Animator/Animation.class
 demo/applets/Animator/AnimationFrame.class
 demo/applets/Animator/Animator.class
@@ -903,57 +891,36 @@ lib/htmlconverter.jar
 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/idlj.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/orbd.1
-man/ja_JP.eucJP/man1/policytool.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/servertool.1
-man/ja_JP.eucJP/man1/tnameserv.1
 man/man1/appletviewer.1
 man/man1/extcheck.1
 man/man1/idlj.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/orbd.1
-man/man1/policytool.1
 man/man1/rmic.1
-man/man1/rmid.1
-man/man1/rmiregistry.1
 man/man1/serialver.1
-man/man1/servertool.1
-man/man1/tnameserv.1
 src.zip
-@dirrm man/ja_JP.eucJP/man1
-@dirrm man/ja_JP.eucJP
-@dirrm man/man1
-@dirrm man
 @dirrm include/linux
 @dirrm include
-@dirrm lib
+@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
@@ -1109,3 +1076,4 @@ src.zip
 @dirrm demo/applets/Animator
 @dirrm demo/applets
 @dirrm demo
+@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}