1. Make the extractor compress the jarfiles. Sun has an annoying tendency

to store (mode-0) all classes in jarfiles, which in practice does *not*
provide any measureable speedup; rather, let's get back some diskspace.

2. Enable the new Class Data Sharing feature by doing a -Xshare:dump at
extract time and installing the resultant classes.jsa.

4 files changed, 14 insertions, 8 deletions

diff --git a/lang/sun-jdk15/Makefile b/lang/sun-jdk15/Makefile
index 7137018990b..acd1789e677 100644
--- a/lang/sun-jdk15/Makefile
+++ b/lang/sun-jdk15/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2004/10/05 22:09:23 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/10/09 03:53:48 tv Exp $
 
 DISTNAME=	jdk-1_5_0-linux-i586
 PKGNAME=	sun-jdk15-5.0
-PKGREVISION=	1
+PKGREVISION=	2
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 SDK, Standard Edition 1.5.0
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile
index d4e787ba3b7..904d53ba334 100644
--- a/lang/sun-jre15/Makefile
+++ b/lang/sun-jre15/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2004/10/06 16:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.6 2004/10/09 03:53:48 tv Exp $
 
 # Note: Regen distinfo with SUN_JRE15_USE_JCE=YES
 
 DISTNAME=	jre-1_5_0-linux-i586
 PKGNAME=	sun-jre15-5.0
-PKGREVISION=	2
+PKGREVISION=	3
 MASTER_SITES=	# empty
 
 COMMENT=	Sun's Java(tm) 2 Runtime Environment 1.5.0
@@ -49,8 +49,8 @@ do-configure:
 	${SED} '/@SUN_JRE15_USE_JCE@/d' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
-post-build:
-	
+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 a07bae744f6..b5846828f01 100644
--- a/lang/sun-jre15/Makefile.common
+++ b/lang/sun-jre15/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/09/30 22:11:53 rh Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/10/09 03:53:48 tv Exp $
 
 CATEGORIES=	lang java
 EXTRACT_SUFX=	.bin
@@ -30,6 +30,11 @@ DEPENDS+=	suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=	suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
 .endif
 
+# the following forces compression of jarfiles, which is a huge disk
+# space win and trivial to no speed reduction in the face of the
+# new class sharing in J2SE 5.0... -tvierling
+EXTRACT_ENV.bin+= UNPACK200_FLAGS=-Htrue
+
 USE_BUILDLINK3=	yes
 NO_MTREE=	yes	# since we change PREFIX
 LDD=		${TRUE}
diff --git a/lang/sun-jre15/PLIST b/lang/sun-jre15/PLIST
index 823d027796c..65a4f5d63d8 100644
--- a/lang/sun-jre15/PLIST
+++ b/lang/sun-jre15/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/10/06 16:44:52 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/10/09 03:53:48 tv Exp $
 bin/sun15-java
 bin/sun15-javaws
 bin/sun15-keytool
@@ -81,6 +81,7 @@ 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