. Update to 1.4.2-02.

. Get the i386 version even for amd64.
. Note that this version doesn't work on FreeBSD 4.x.

3 files changed, 26 insertions, 15 deletions

diff --git a/java/linux-blackdown-jdk14/Makefile b/java/linux-blackdown-jdk14/Makefile
index 95e2d4e3ee6b..7dbe7cdc0b57 100644
--- a/java/linux-blackdown-jdk14/Makefile
+++ b/java/linux-blackdown-jdk14/Makefile
@@ -21,7 +21,7 @@ COMMENT=	Blackdown Java Development Kit 1.4 for Linux
 RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
 
 EXTRACT_CMD=		${TAIL}
-EXTRACT_BEFORE_ARGS=	+564
+EXTRACT_BEFORE_ARGS=	+592
 EXTRACT_AFTER_ARGS=	| ${BZIP2_CMD} -dc | ${TAR} xf -
 USE_BZIP2=	yes
 USE_LINUX=	yes
@@ -33,17 +33,23 @@ PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 
 NO_BUILD=	yes
 JDK_VERSION=	1.4.2
-JDK_VER_SUFFIX=	-01
-DOWNLOAD_DIR=	${PORTNAME:U}-${JDK_VERSION}/${ARCH}/01
+JDK_VER_SUFFIX=	-02
+DOWNLOAD_DIR=	${PORTNAME:U}-${JDK_VERSION}/i386/02
 ONLY_FOR_ARCHS=	i386 amd64
 
 NO_CDROM=	"License doesn\'t allow distribution with fee"
 NO_PACKAGE=	"License doesn\'t allow binary distributions"
 
 APP_HOME=	${PREFIX}/${PKGNAMEPREFIX}${PORTNAME}${JDK_VERSION}
+PACKED_JARS=	lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar
+UNPACK_CMD=	${APP_HOME}/lib/unpack
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 504000
+IGNORE=		does not run (core dumps: Bad System Call)
+.endif
+
 post-fetch:
 	@${CHMOD} +x ${DISTDIR}/${DISTFILES}
 
@@ -65,6 +71,14 @@ do-install:
 	@${CP} -R ${WRKSRC}/* ${APP_HOME}
 	@${CHOWN} -h -R ${LIBOWN}:${LIBGRP} ${APP_HOME}
 	@${ECHO} " [ DONE ]"
+	@${ECHO} -n ">> Unpacking JARs..."
+	@for i in ${PACKED_JARS}; do \
+	  if [ -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack ]; then \
+	    ${UNPACK_CMD} ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack ${APP_HOME}/$$i; \
+	    ${RM} -f ${APP_HOME}/`dirname $$i`/`basename $$i .jar`.pack; \
+	  fi \
+	done
+	@${ECHO} " [ DONE ]"
 
 	@${ECHO} -n ">> Registering with javavm..."
 	@${LOCALBASE}/bin/registervm "${APP_HOME}/bin/java # Linux-Blackdown-JDK${PORTVERSION}"
diff --git a/java/linux-blackdown-jdk14/distinfo b/java/linux-blackdown-jdk14/distinfo
index 97e3d3b300f9..9d162641cb60 100644
--- a/java/linux-blackdown-jdk14/distinfo
+++ b/java/linux-blackdown-jdk14/distinfo
@@ -1,2 +1,2 @@
-MD5 (j2sdk-1.4.2-01-linux-i586.bin) = dbb87efd16b8d25cdd3fe6a8782a8e75
-SIZE (j2sdk-1.4.2-01-linux-i586.bin) = 37639008
+MD5 (j2sdk-1.4.2-02-linux-i586.bin) = a65733528562794b7838407084cabd9a
+SIZE (j2sdk-1.4.2-02-linux-i586.bin) = 34361479
diff --git a/java/linux-blackdown-jdk14/pkg-plist b/java/linux-blackdown-jdk14/pkg-plist
index f836335d9396..d295105aa113 100644
--- a/java/linux-blackdown-jdk14/pkg-plist
+++ b/java/linux-blackdown-jdk14/pkg-plist
@@ -33,7 +33,6 @@
 %%T%%/bin/serialver
 %%T%%/bin/servertool
 %%T%%/bin/tnameserv
-%%T%%/demo/applets.html
 %%T%%/demo/applets/Animator/Animation.class
 %%T%%/demo/applets/Animator/AnimationFrame.class
 %%T%%/demo/applets/Animator/Animator.class
@@ -896,7 +895,6 @@
 %%T%%/jre/README
 %%T%%/jre/THIRDPARTYLICENSEREADME.txt
 %%T%%/jre/bin/ControlPanel
-%%T%%/jre/bin/HtmlConverter
 %%T%%/jre/bin/java
 %%T%%/jre/bin/java_vm
 %%T%%/jre/bin/javaws
@@ -914,7 +912,7 @@
 %%T%%/jre/javaws/javalogo52x88.gif
 %%T%%/jre/javaws/javaws
 %%T%%/jre/javaws/javaws-l10n.jar
-%%T%%/jre/javaws/javaws.pack
+%%T%%/jre/javaws/javaws.jar
 %%T%%/jre/javaws/javaws.policy
 %%T%%/jre/javaws/javawsbin
 %%T%%/jre/javaws/readme.html
@@ -943,7 +941,7 @@
 %%T%%/jre/javaws/resources/splash.jpg
 %%T%%/jre/javaws/sunlogo64x30.gif
 %%T%%/jre/lib/audio/soundbank.gm
-%%T%%/jre/lib/charsets.pack
+%%T%%/jre/lib/charsets.jar
 %%T%%/jre/lib/cmm/CIEXYZ.pf
 %%T%%/jre/lib/cmm/GRAY.pf
 %%T%%/jre/lib/cmm/LINEAR_RGB.pf
@@ -952,7 +950,7 @@
 %%T%%/jre/lib/content-types.properties
 %%T%%/jre/lib/ext/dnsns.jar
 %%T%%/jre/lib/ext/ldapsec.jar
-%%T%%/jre/lib/ext/localedata.pack
+%%T%%/jre/lib/ext/localedata.jar
 %%T%%/jre/lib/ext/sunjce_provider.jar
 %%T%%/jre/lib/flavormap.properties
 %%T%%/jre/lib/font.properties
@@ -1005,7 +1003,6 @@
 %%T%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
 %%T%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
 %%T%%/jre/lib/fonts/fonts.dir
-%%T%%/jre/lib/htmlconverter.jar
 %%T%%/jre/lib/i386/awt_robot
 %%T%%/jre/lib/i386/client/Xusage.txt
 %%T%%/jre/lib/i386/client/libjsig.so
@@ -1052,7 +1049,7 @@
 %%T%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif
 %%T%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
 %%T%%/jre/lib/jce.jar
-%%T%%/jre/lib/jsse.pack
+%%T%%/jre/lib/jsse.jar
 %%T%%/jre/lib/jvm.hprof.txt
 %%T%%/jre/lib/jvm.jcov.txt
 %%T%%/jre/lib/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -1068,10 +1065,10 @@
 %%T%%/jre/lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/jre/lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
 %%T%%/jre/lib/logging.properties
-%%T%%/jre/lib/plugin.pack
+%%T%%/jre/lib/plugin.jar
 %%T%%/jre/lib/psfont.properties.ja
 %%T%%/jre/lib/psfontj2d.properties
-%%T%%/jre/lib/rt.pack
+%%T%%/jre/lib/rt.jar
 %%T%%/jre/lib/security/US_export_policy.jar
 %%T%%/jre/lib/security/cacerts
 %%T%%/jre/lib/security/java.policy
@@ -1488,7 +1485,7 @@
 %%T%%/lib/htmlconverter.jar
 %%T%%/lib/ir.idl
 %%T%%/lib/orb.idl
-%%T%%/lib/tools.pack
+%%T%%/lib/tools.jar
 %%T%%/lib/unpack
 %%T%%/man/ja
 %%T%%/man/ja_JP.eucJP/man1/appletviewer.1.gz