. Update to 1.4.2-01. This addresses

  http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt

  Unfortunately this version seems to have problems on 4.x.

3 files changed, 32 insertions, 13 deletions

diff --git a/java/linux-blackdown-jdk14/Makefile b/java/linux-blackdown-jdk14/Makefile
index 6920bd505d0..5430c00c886 100644
--- a/java/linux-blackdown-jdk14/Makefile
+++ b/java/linux-blackdown-jdk14/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java
-MASTER_SITES=	ftp://ftp.nluug.nl/pub/os/Linux/java/jdk/${DOWNLOAD_DIR}/ \
-		ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \
+MASTER_SITES=	ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/${DOWNLOAD_DIR}/ \
 		ftp://ftp.tux.org/pub/java/${DOWNLOAD_DIR}/
 PKGNAMEPREFIX=	linux-blackdown-
-DISTNAME=	j2sdk-${JDK_VERSION}${JDK_VER_SUFFIX}-linux-i586-gcc2.95
+DISTNAME=	j2sdk-${JDK_VERSION}${JDK_VER_SUFFIX}-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	znerd@FreeBSD.org
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
 RUN_DEPENDS=	${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
 
 EXTRACT_CMD=		${TAIL}
-EXTRACT_BEFORE_ARGS=	+482
+EXTRACT_BEFORE_ARGS=	+564
 EXTRACT_AFTER_ARGS=	| ${BZIP2_CMD} -dc | ${TAR} xf -
 USE_BZIP2=	yes
 LATEST_LINK=	linux-blackdown-jdk14
@@ -33,8 +33,8 @@ PLIST_SUB+=	T=${APP_HOME:S/^${PREFIX}\///} PORTVERSION=${PORTVERSION}
 NO_BUILD=	yes
 USE_LINUX=	yes
 JDK_VERSION=	1.4.2
-JDK_VER_SUFFIX=	-rc1
-DOWNLOAD_DIR=	${PORTNAME:U}-${JDK_VERSION}/${ARCH}/rc1
+JDK_VER_SUFFIX=	-01
+DOWNLOAD_DIR=	${PORTNAME:U}-${JDK_VERSION}/${ARCH}/01
 ONLY_FOR_ARCHS=	i386
 
 NO_CDROM=	"License doesn\'t allow distribution with fee"
@@ -50,6 +50,8 @@ post-fetch:
 post-patch:
 	@${ECHO} -n ">> Removing unneeded files..."
 	@${FIND} ${WRKSRC} -name '*.orig' -print | ${XARGS} ${RM} -f
+	@${RM} -rf ${WRKSRC}/demo/jfc/SwingSet2/resources
+	@${RM} -rf ${WRKSRC}/demo/plugin/jfc/SwingSet2/resources
 	@${ECHO} " [ DONE ]"
 
 do-install:
diff --git a/java/linux-blackdown-jdk14/distinfo b/java/linux-blackdown-jdk14/distinfo
index b79b20b24ed..97e3d3b300f 100644
--- a/java/linux-blackdown-jdk14/distinfo
+++ b/java/linux-blackdown-jdk14/distinfo
@@ -1,2 +1,2 @@
-MD5 (j2sdk-1.4.2-rc1-linux-i586-gcc2.95.bin) = a8e522f8f17c05ef320de7a7e79a2ed6
-SIZE (j2sdk-1.4.2-rc1-linux-i586-gcc2.95.bin) = 33766113
+MD5 (j2sdk-1.4.2-01-linux-i586.bin) = dbb87efd16b8d25cdd3fe6a8782a8e75
+SIZE (j2sdk-1.4.2-01-linux-i586.bin) = 37639008
diff --git a/java/linux-blackdown-jdk14/pkg-plist b/java/linux-blackdown-jdk14/pkg-plist
index ccfb2ba3264..f82bab331d8 100644
--- a/java/linux-blackdown-jdk14/pkg-plist
+++ b/java/linux-blackdown-jdk14/pkg-plist
@@ -32,6 +32,7 @@
 %%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
@@ -893,8 +894,8 @@
 %%T%%/jre/LICENSE
 %%T%%/jre/README
 %%T%%/jre/THIRDPARTYLICENSEREADME.txt
-%%T%%/jre/Welcome.html
 %%T%%/jre/bin/ControlPanel
+%%T%%/jre/bin/HtmlConverter
 %%T%%/jre/bin/java
 %%T%%/jre/bin/java_vm
 %%T%%/jre/bin/javaws
@@ -954,27 +955,42 @@
 %%T%%/jre/lib/ext/sunjce_provider.jar
 %%T%%/jre/lib/flavormap.properties
 %%T%%/jre/lib/font.properties
+%%T%%/jre/lib/font.properties.Mandrakelinux
 %%T%%/jre/lib/font.properties.Redhat6.1
 %%T%%/jre/lib/font.properties.Redhat8.0
+%%T%%/jre/lib/font.properties.SuSE
 %%T%%/jre/lib/font.properties.SuSE8.0
 %%T%%/jre/lib/font.properties.ja
+%%T%%/jre/lib/font.properties.ja.Redhat3
 %%T%%/jre/lib/font.properties.ja.Redhat6.1
 %%T%%/jre/lib/font.properties.ja.Redhat6.2
 %%T%%/jre/lib/font.properties.ja.Redhat7.2
 %%T%%/jre/lib/font.properties.ja.Redhat7.3
 %%T%%/jre/lib/font.properties.ja.Redhat8.0
-%%T%%/jre/lib/font.properties.ja.Sun
 %%T%%/jre/lib/font.properties.ja.Turbo
 %%T%%/jre/lib/font.properties.ja.Turbo6.0
+%%T%%/jre/lib/font.properties.ja_JP.Sun
+%%T%%/jre/lib/font.properties.ja_JP.Sun2003
 %%T%%/jre/lib/font.properties.ja_JP_UTF8.Sun
-%%T%%/jre/lib/font.properties.ko.Redhat8.0
+%%T%%/jre/lib/font.properties.ja_JP_UTF8.Sun2003
+%%T%%/jre/lib/font.properties.ko.Redhat
+%%T%%/jre/lib/font.properties.ko.Redhat2.1
+%%T%%/jre/lib/font.properties.ko_KR.Sun
+%%T%%/jre/lib/font.properties.ko_KR_UTF8.Sun
+%%T%%/jre/lib/font.properties.ko_KR_UTF8.Sun2003
 %%T%%/jre/lib/font.properties.zh.Turbo
-%%T%%/jre/lib/font.properties.zh_CN.Redhat8.0
+%%T%%/jre/lib/font.properties.zh_CN.Redhat
+%%T%%/jre/lib/font.properties.zh_CN.Redhat2.1
 %%T%%/jre/lib/font.properties.zh_CN.Sun
 %%T%%/jre/lib/font.properties.zh_CN_UTF8.Sun
-%%T%%/jre/lib/font.properties.zh_TW.Redhat8.0
+%%T%%/jre/lib/font.properties.zh_HK.Sun
+%%T%%/jre/lib/font.properties.zh_HK_UTF8.Sun
+%%T%%/jre/lib/font.properties.zh_HK_UTF8.Sun2003
+%%T%%/jre/lib/font.properties.zh_TW.Redhat
+%%T%%/jre/lib/font.properties.zh_TW.Redhat2.1
 %%T%%/jre/lib/font.properties.zh_TW.Sun
 %%T%%/jre/lib/font.properties.zh_TW_UTF8.Sun
+%%T%%/jre/lib/font.properties.zh_TW_UTF8.Sun2003
 %%T%%/jre/lib/fonts/LucidaBrightDemiBold.ttf
 %%T%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
 %%T%%/jre/lib/fonts/LucidaBrightItalic.ttf
@@ -988,6 +1004,7 @@
 %%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