Add java-env.mk support; bump PKGREVISION.

2 files changed, 28 insertions, 12 deletions

diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 8a2f1db3e72..875572b2688 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.39 2004/07/02 13:42:39 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2004/07/29 00:50:59 tv Exp $
 #
 
 VERSION=	1.1.8
 PKGNAME=	jdk-${VERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/ \
 		ftp://ftp.de.NetBSD.org/pub/NetBSD/misc/java/i386/${VERSION}/
@@ -16,7 +16,10 @@ LICENSE=	jdk-license
 
 .include "../../mk/bsd.prefs.mk"
 
-JVM_HOME=	${PREFIX}/java/jdk-${VERSION}
+JAVA_HOME=	${PREFIX}/java/jdk-${VERSION}
+JAVA_NAME=	jdk11
+JAVA_WRAPPERS=	appletviewer jar java javac javadoc javah javakey \
+		javap jdb rmic rmiregistry serialver
 
 .if ${OBJECT_FMT} == "ELF"
 DISTNAME=	jdk${VERSION}-rc1-elf
@@ -29,13 +32,12 @@ PLIST_SRC=	${PKGDIR}/PLIST-aout
 .endif
 PLIST_SRC+=	${PKGDIR}/PLIST
 
-MESSAGE_SUBST+=	JVM_HOME=${JVM_HOME:Q}
+MESSAGE_SUBST+=	JAVA_HOME=${JAVA_HOME:Q}
 
 CHECK_SHLIBS=	no
 
 NO_BUILDLINK=	yes
 USE_PKGINSTALL=	yes
-NO_BUILD=	yes
 
 ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86
 RESTRICTED=	"No redistribution of the Java(tm) Development Kit"
@@ -44,7 +46,7 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-OWNDIRS+=	${JVM_HOME} ${JVM_HOME}/lib ${JVM_HOME}/lib/security
+OWNDIRS+=	${JAVA_HOME} ${JAVA_HOME}/lib ${JAVA_HOME}/lib/security
 SFILES=		appletviewer.properties		awt.properties
 SFILES+=	content-types.properties	font.properties
 SFILES+=	font.properties.ISO8859_15_FDIS	font.properties.cs
@@ -58,7 +60,7 @@ SFILES+=	psfont.properties.ja		serialver.properties
 SFILES+=	security/java.security
 SUPPORT_FILES=	# empty
 .for FILE in ${SFILES}
-SUPPORT_FILES+=	${JVM_HOME}/lib/${FILE}.default ${JVM_HOME}/lib/${FILE}
+SUPPORT_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
 do-configure:
@@ -85,10 +87,13 @@ post-patch:
 	${LN} -sf . ${WRKSRC}/jre
 .endif
 
+do-build: # empty, but cannot use NO_BUILD with java-env.mk
+
 do-install:
 	${RM} -f ${WRKSRC}/*.orig
-	${INSTALL_PROGRAM_DIR} ${JVM_HOME}
-	cd ${WRKSRC} && ${PAX} -rw . ${JVM_HOME}
-	${RM} -f ${JVM_HOME}/bin/i386/green_threads/javac.orig
+	${INSTALL_PROGRAM_DIR} ${JAVA_HOME}
+	cd ${WRKSRC} && ${PAX} -rw . ${JAVA_HOME}
+	${RM} -f ${JAVA_HOME}/bin/i386/green_threads/javac.orig
 
+.include "../../mk/java-env.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/jdk/PLIST b/lang/jdk/PLIST
index e7b0761baea..4e6d795bbd7 100644
--- a/lang/jdk/PLIST
+++ b/lang/jdk/PLIST
@@ -1,4 +1,16 @@
-@comment $NetBSD: PLIST,v 1.6 2004/07/01 00:00:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/07/29 00:50:59 tv Exp $
+bin/jdk11-appletviewer
+bin/jdk11-jar
+bin/jdk11-java
+bin/jdk11-javac
+bin/jdk11-javadoc
+bin/jdk11-javah
+bin/jdk11-javakey
+bin/jdk11-javap
+bin/jdk11-jdb
+bin/jdk11-rmic
+bin/jdk11-rmiregistry
+bin/jdk11-serialver
 java/jdk-1.1.8/CHANGES
 java/jdk-1.1.8/COPYRIGHT
 java/jdk-1.1.8/LICENSE
@@ -577,4 +589,3 @@ java/jdk-1.1.8/src.zip
 @dirrm java/jdk-1.1.8/bin/i386
 @dirrm java/jdk-1.1.8/bin
 @dirrm java/jdk-1.1.8
-@unexec ${RMDIR} %D/java 2>/dev/null || ${TRUE}