Class Data Sharing, while fast, is apparently also touchy. Do the

classes.jsa generation at the last possible moment, in the INSTALL script.

(Somewhere in the generated file is a hash of the pathname used to generate
it, and -Xshare:on failed with the classes.jsa generated in the build tree.)

5 files changed, 22 insertions, 10 deletions

diff --git a/lang/sun-jre15/DEINSTALL.tmpl b/lang/sun-jre15/DEINSTALL.tmpl
new file mode 100644
index 00000000000..dfd396aafd1
--- /dev/null
+++ b/lang/sun-jre15/DEINSTALL.tmpl
@@ -0,0 +1,6 @@
+# $NetBSD: DEINSTALL.tmpl,v 1.1 2004/10/09 04:19:10 tv Exp $
+
+case ${STAGE} in
+DEINSTALL)
+	${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
+esac
diff --git a/lang/sun-jre15/INSTALL.tmpl b/lang/sun-jre15/INSTALL.tmpl
new file mode 100644
index 00000000000..fc12924153a
--- /dev/null
+++ b/lang/sun-jre15/INSTALL.tmpl
@@ -0,0 +1,6 @@
+# $NetBSD: INSTALL.tmpl,v 1.1 2004/10/09 04:19:10 tv Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	${PREFIX}/bin/sun15-java -Xshare:dump;;
+esac
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index 904d53ba334..e97f09533d0 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2004/10/09 03:53:48 tv Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/09 04:19:10 tv Exp $
 
 # Note: Regen distinfo with SUN_JRE15_USE_JCE=YES
 
 DISTNAME=	jre-1_5_0-linux-i586
 PKGNAME=	sun-jre15-5.0
-PKGREVISION=	3
+PKGREVISION=	4
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.5.0
@@ -26,10 +26,14 @@ SUPPORT_FILES=	# empty
 .for FILE in ${SFILES}
 SUPPORT_FILES+=	${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
-HEADER_EXTRA_TMPL=${WRKDIR}/HEADER.tmpl
 
 .include "../../mk/bsd.prefs.mk"
 
+HEADER_EXTRA_TMPL=	${WRKDIR}/HEADER.tmpl
+INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL.tmpl
+DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL.tmpl
+FILES_SUBST+=		JAVA_HOME=${JAVA_HOME:Q}
+
 BUILD_DEFS+=		SUN_JRE15_USE_JCE
 PLIST_SRC=      	${WRKDIR}/PLIST
 
@@ -49,9 +53,6 @@ do-configure:
 	${SED} '/@SUN_JRE15_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
-post-extract:
-	@${ULIMIT_CMD_datasize} && cd ${WRKSRC} && bin/java -Xshare:dump
-
 #
 # re-create sfiles.mk from properties and config files
 #
diff --git a/lang/sun-jre15/Makefile.common b/lang/sun-jre15/Makefile.common
index b5846828f01..e9572f3fb75 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2004/10/09 03:53:48 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/10/09 04:19:10 tv Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -23,7 +23,7 @@ JAVA_HOME=	${LOCALBASE}/java/sun-1.5
 JAVA_NAME=	sun15
 JAVA_UNLIMIT=	datasize
 
-MESSAGE_SUBST+=	JAVA_HOME="${JAVA_HOME}"
+MESSAGE_SUBST+=	JAVA_HOME=${JAVA_HOME:Q}
 
 .if ${OPSYS} == "NetBSD"
 DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
diff --git a/lang/sun-jre15/PLIST b/lang/sun-jre15/PLIST
index 65a4f5d63d8..eb1877edfad 100644
--- a/lang/sun-jre15/PLIST
+++ b/lang/sun-jre15/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/10/09 03:53:48 tv Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/10/09 04:19:10 tv Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -81,7 +81,6 @@ java/sun-1.5/lib/fonts/LucidaTypewriterBold.ttf
 java/sun-1.5/lib/fonts/LucidaTypewriterRegular.ttf
 java/sun-1.5/lib/fonts/fonts.dir
 java/sun-1.5/lib/${MACHINE_ARCH}/awt_robot
-java/sun-1.5/lib/${MACHINE_ARCH}/client/classes.jsa
 java/sun-1.5/lib/${MACHINE_ARCH}/client/Xusage.txt
 java/sun-1.5/lib/${MACHINE_ARCH}/client/libjsig.so
 java/sun-1.5/lib/${MACHINE_ARCH}/client/libjvm.so