Upgrade to 1.4.0_01.

6 files changed, 36 insertions, 36 deletions

diff --git a/java/linux-jdk14/Makefile b/java/linux-jdk14/Makefile
index 133b66518ee6..f0ca22c820f3 100644
--- a/java/linux-jdk14/Makefile
+++ b/java/linux-jdk14/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	${INSTALL_JDK_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-
-DISTNAME=	j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i386
+DISTNAME=	j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	znerd@FreeBSD.org
@@ -29,16 +29,16 @@ EXTRACT_CMD=		# empty
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.0
+WRKSRC=		${WRKDIR}/j2sdk1.4.0_01
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 
 NO_BUILD=	yes
 USE_LINUX=	yes
-DL_JDK_VERSION=	1.4.0
-INSTALL_JDK_VERSION=	1.4.0
+DL_JDK_VERSION=	1.4.0_01
+INSTALL_JDK_VERSION=	${DL_JDK_VERSION:S/_/./g}
 ONLY_FOR_ARCHS=	i386
 TARGET_DIR?=	${PREFIX}/${PKGBASE}${PORTVERSION}
-DOWNLOAD_URL?=	http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-1_4_0.config&platform=linux-i386
+DOWNLOAD_URL?=	http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-${DL_JDK_VERSION:S/./_/g}.config&platform=linux-i586
 PORTTITLE=	Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux
 
 .include <bsd.port.pre.mk>
diff --git a/java/linux-jdk14/distinfo b/java/linux-jdk14/distinfo
index 848855bf9b85..46f68c90fc95 100644
--- a/java/linux-jdk14/distinfo
+++ b/java/linux-jdk14/distinfo
@@ -1 +1 @@
-MD5 (j2sdk-1_4_0-linux-i386.bin) = 2b15d90d5edf6b7c2e2dbd6ec31331d6
+MD5 (j2sdk-1_4_0_01-linux-i586.bin) = 6e0ee081152cfe7287c946538fce41cf
diff --git a/java/linux-jdk14/pkg-plist b/java/linux-jdk14/pkg-plist
index d2b27f1aeb02..897510c113e4 100644
--- a/java/linux-jdk14/pkg-plist
+++ b/java/linux-jdk14/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
+%%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
 %%T%%/jre/bin/java
 %%T%%/jre/bin/keytool
 %%T%%/jre/bin/policytool
@@ -134,8 +134,8 @@
 %%T%%/jre/lib/zi/Africa/Dar_es_Salaam
 %%T%%/jre/lib/zi/Africa/Bangui
 %%T%%/jre/lib/zi/Africa/Ceuta
-%%T%%/jre/lib/zi/America/Danmarkshavn
 %%T%%/jre/lib/zi/America/Scoresbysund
+%%T%%/jre/lib/zi/America/Danmarkshavn
 %%T%%/jre/lib/zi/America/Godthab
 %%T%%/jre/lib/zi/America/Thule
 %%T%%/jre/lib/zi/America/Detroit
@@ -177,10 +177,10 @@
 %%T%%/jre/lib/zi/America/Tortola
 %%T%%/jre/lib/zi/America/St_Thomas
 %%T%%/jre/lib/zi/America/Winnipeg
+%%T%%/jre/lib/zi/America/North_Dakota/Center
 %%T%%/jre/lib/zi/America/Nome
 %%T%%/jre/lib/zi/America/Glace_Bay
 %%T%%/jre/lib/zi/America/Menominee
-%%T%%/jre/lib/zi/America/North_Dakota/Center
 %%T%%/jre/lib/zi/America/Port-au-Prince
 %%T%%/jre/lib/zi/America/Louisville
 %%T%%/jre/lib/zi/America/Dawson_Creek
@@ -242,8 +242,8 @@
 %%T%%/jre/lib/zi/America/Araguaina
 %%T%%/jre/lib/zi/America/Fortaleza
 %%T%%/jre/lib/zi/America/Porto_Velho
-%%T%%/jre/lib/zi/America/Catamarca
 %%T%%/jre/lib/zi/America/Cordoba
+%%T%%/jre/lib/zi/America/Catamarca
 %%T%%/jre/lib/zi/America/Curacao
 %%T%%/jre/lib/zi/America/Guyana
 %%T%%/jre/lib/zi/America/Mendoza
@@ -277,6 +277,7 @@
 %%T%%/jre/lib/zi/Asia/Taipei
 %%T%%/jre/lib/zi/Asia/Bahrain
 %%T%%/jre/lib/zi/Asia/Samarkand
+%%T%%/jre/lib/zi/Asia/Choibalsan
 %%T%%/jre/lib/zi/Asia/Dubai
 %%T%%/jre/lib/zi/Asia/Tashkent
 %%T%%/jre/lib/zi/Asia/Calcutta
@@ -294,6 +295,7 @@
 %%T%%/jre/lib/zi/Asia/Shanghai
 %%T%%/jre/lib/zi/Asia/Bishkek
 %%T%%/jre/lib/zi/Asia/Beirut
+%%T%%/jre/lib/zi/Asia/Chongqing
 %%T%%/jre/lib/zi/Asia/Seoul
 %%T%%/jre/lib/zi/Asia/Jakarta
 %%T%%/jre/lib/zi/Asia/Amman
@@ -319,6 +321,7 @@
 %%T%%/jre/lib/zi/Asia/Jerusalem
 %%T%%/jre/lib/zi/Asia/Kuala_Lumpur
 %%T%%/jre/lib/zi/Asia/Krasnoyarsk
+%%T%%/jre/lib/zi/Asia/Sakhalin
 %%T%%/jre/lib/zi/Asia/Omsk
 %%T%%/jre/lib/zi/Asia/Yakutsk
 %%T%%/jre/lib/zi/Asia/Irkutsk
@@ -331,9 +334,6 @@
 %%T%%/jre/lib/zi/Asia/Riyadh87
 %%T%%/jre/lib/zi/Asia/Riyadh88
 %%T%%/jre/lib/zi/Asia/Riyadh89
-%%T%%/jre/lib/zi/Asia/Choibalsan
-%%T%%/jre/lib/zi/Asia/Chongqing
-%%T%%/jre/lib/zi/Asia/Sakhalin
 %%T%%/jre/lib/zi/Atlantic/Cape_Verde
 %%T%%/jre/lib/zi/Atlantic/St_Helena
 %%T%%/jre/lib/zi/Atlantic/Madeira
@@ -514,11 +514,11 @@
 %%T%%/jre/Welcome.html
 %%T%%/jre/README
 %%T%%/jre/LICENSE
-%%T%%/jre/javaws-1_0_1_02-linux-int.zip
-%%T%%/jre/plugin/i386/ns4/javaplugin140.so
-%%T%%/jre/plugin/i386/ns600/libjavaplugin_oji140.so
-%%T%%/jre/plugin/i386/ns610/libjavaplugin_oji140.so
+%%T%%/jre/plugin/i386/ns4/javaplugin.so
+%%T%%/jre/plugin/i386/ns600/libjavaplugin_oji.so
+%%T%%/jre/plugin/i386/ns610/libjavaplugin_oji.so
 %%T%%/jre/ControlPanel.html
+%%T%%/jre/javaws-1_0_1_02-linux-int.zip
 %%T%%/lib/htmlconverter.jar
 %%T%%/lib/tools.jar
 %%T%%/lib/orb.idl
@@ -1482,8 +1482,8 @@
 @dirrm %%T%%/jre/lib/audio
 @dirrm %%T%%/jre/lib/zi/Africa
 @dirrm %%T%%/jre/lib/zi/America/Indiana
-@dirrm %%T%%/jre/lib/zi/America/Kentucky
 @dirrm %%T%%/jre/lib/zi/America/North_Dakota
+@dirrm %%T%%/jre/lib/zi/America/Kentucky
 @dirrm %%T%%/jre/lib/zi/America
 @dirrm %%T%%/jre/lib/zi/Antarctica
 @dirrm %%T%%/jre/lib/zi/Asia
diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile
index 133b66518ee6..f0ca22c820f3 100644
--- a/java/linux-sun-jdk14/Makefile
+++ b/java/linux-sun-jdk14/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	${INSTALL_JDK_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	linux-
-DISTNAME=	j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i386
+DISTNAME=	j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i586
 EXTRACT_SUFX=	.bin
 
 MAINTAINER=	znerd@FreeBSD.org
@@ -29,16 +29,16 @@ EXTRACT_CMD=		# empty
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
 
-WRKSRC=		${WRKDIR}/j2sdk1.4.0
+WRKSRC=		${WRKDIR}/j2sdk1.4.0_01
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 
 NO_BUILD=	yes
 USE_LINUX=	yes
-DL_JDK_VERSION=	1.4.0
-INSTALL_JDK_VERSION=	1.4.0
+DL_JDK_VERSION=	1.4.0_01
+INSTALL_JDK_VERSION=	${DL_JDK_VERSION:S/_/./g}
 ONLY_FOR_ARCHS=	i386
 TARGET_DIR?=	${PREFIX}/${PKGBASE}${PORTVERSION}
-DOWNLOAD_URL?=	http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-1_4_0.config&platform=linux-i386
+DOWNLOAD_URL?=	http://java.sun.com/Download6?url=/Download6&config-file=j2sdk-${DL_JDK_VERSION:S/./_/g}.config&platform=linux-i586
 PORTTITLE=	Java 2 Development Kit ${INSTALL_JDK_VERSION} for Linux
 
 .include <bsd.port.pre.mk>
diff --git a/java/linux-sun-jdk14/distinfo b/java/linux-sun-jdk14/distinfo
index 848855bf9b85..46f68c90fc95 100644
--- a/java/linux-sun-jdk14/distinfo
+++ b/java/linux-sun-jdk14/distinfo
@@ -1 +1 @@
-MD5 (j2sdk-1_4_0-linux-i386.bin) = 2b15d90d5edf6b7c2e2dbd6ec31331d6
+MD5 (j2sdk-1_4_0_01-linux-i586.bin) = 6e0ee081152cfe7287c946538fce41cf
diff --git a/java/linux-sun-jdk14/pkg-plist b/java/linux-sun-jdk14/pkg-plist
index d2b27f1aeb02..897510c113e4 100644
--- a/java/linux-sun-jdk14/pkg-plist
+++ b/java/linux-sun-jdk14/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
+%%LOCALBASE%%/bin/unregistervm "%D/%%T%%/bin/java"
 %%T%%/jre/bin/java
 %%T%%/jre/bin/keytool
 %%T%%/jre/bin/policytool
@@ -134,8 +134,8 @@
 %%T%%/jre/lib/zi/Africa/Dar_es_Salaam
 %%T%%/jre/lib/zi/Africa/Bangui
 %%T%%/jre/lib/zi/Africa/Ceuta
-%%T%%/jre/lib/zi/America/Danmarkshavn
 %%T%%/jre/lib/zi/America/Scoresbysund
+%%T%%/jre/lib/zi/America/Danmarkshavn
 %%T%%/jre/lib/zi/America/Godthab
 %%T%%/jre/lib/zi/America/Thule
 %%T%%/jre/lib/zi/America/Detroit
@@ -177,10 +177,10 @@
 %%T%%/jre/lib/zi/America/Tortola
 %%T%%/jre/lib/zi/America/St_Thomas
 %%T%%/jre/lib/zi/America/Winnipeg
+%%T%%/jre/lib/zi/America/North_Dakota/Center
 %%T%%/jre/lib/zi/America/Nome
 %%T%%/jre/lib/zi/America/Glace_Bay
 %%T%%/jre/lib/zi/America/Menominee
-%%T%%/jre/lib/zi/America/North_Dakota/Center
 %%T%%/jre/lib/zi/America/Port-au-Prince
 %%T%%/jre/lib/zi/America/Louisville
 %%T%%/jre/lib/zi/America/Dawson_Creek
@@ -242,8 +242,8 @@
 %%T%%/jre/lib/zi/America/Araguaina
 %%T%%/jre/lib/zi/America/Fortaleza
 %%T%%/jre/lib/zi/America/Porto_Velho
-%%T%%/jre/lib/zi/America/Catamarca
 %%T%%/jre/lib/zi/America/Cordoba
+%%T%%/jre/lib/zi/America/Catamarca
 %%T%%/jre/lib/zi/America/Curacao
 %%T%%/jre/lib/zi/America/Guyana
 %%T%%/jre/lib/zi/America/Mendoza
@@ -277,6 +277,7 @@
 %%T%%/jre/lib/zi/Asia/Taipei
 %%T%%/jre/lib/zi/Asia/Bahrain
 %%T%%/jre/lib/zi/Asia/Samarkand
+%%T%%/jre/lib/zi/Asia/Choibalsan
 %%T%%/jre/lib/zi/Asia/Dubai
 %%T%%/jre/lib/zi/Asia/Tashkent
 %%T%%/jre/lib/zi/Asia/Calcutta
@@ -294,6 +295,7 @@
 %%T%%/jre/lib/zi/Asia/Shanghai
 %%T%%/jre/lib/zi/Asia/Bishkek
 %%T%%/jre/lib/zi/Asia/Beirut
+%%T%%/jre/lib/zi/Asia/Chongqing
 %%T%%/jre/lib/zi/Asia/Seoul
 %%T%%/jre/lib/zi/Asia/Jakarta
 %%T%%/jre/lib/zi/Asia/Amman
@@ -319,6 +321,7 @@
 %%T%%/jre/lib/zi/Asia/Jerusalem
 %%T%%/jre/lib/zi/Asia/Kuala_Lumpur
 %%T%%/jre/lib/zi/Asia/Krasnoyarsk
+%%T%%/jre/lib/zi/Asia/Sakhalin
 %%T%%/jre/lib/zi/Asia/Omsk
 %%T%%/jre/lib/zi/Asia/Yakutsk
 %%T%%/jre/lib/zi/Asia/Irkutsk
@@ -331,9 +334,6 @@
 %%T%%/jre/lib/zi/Asia/Riyadh87
 %%T%%/jre/lib/zi/Asia/Riyadh88
 %%T%%/jre/lib/zi/Asia/Riyadh89
-%%T%%/jre/lib/zi/Asia/Choibalsan
-%%T%%/jre/lib/zi/Asia/Chongqing
-%%T%%/jre/lib/zi/Asia/Sakhalin
 %%T%%/jre/lib/zi/Atlantic/Cape_Verde
 %%T%%/jre/lib/zi/Atlantic/St_Helena
 %%T%%/jre/lib/zi/Atlantic/Madeira
@@ -514,11 +514,11 @@
 %%T%%/jre/Welcome.html
 %%T%%/jre/README
 %%T%%/jre/LICENSE
-%%T%%/jre/javaws-1_0_1_02-linux-int.zip
-%%T%%/jre/plugin/i386/ns4/javaplugin140.so
-%%T%%/jre/plugin/i386/ns600/libjavaplugin_oji140.so
-%%T%%/jre/plugin/i386/ns610/libjavaplugin_oji140.so
+%%T%%/jre/plugin/i386/ns4/javaplugin.so
+%%T%%/jre/plugin/i386/ns600/libjavaplugin_oji.so
+%%T%%/jre/plugin/i386/ns610/libjavaplugin_oji.so
 %%T%%/jre/ControlPanel.html
+%%T%%/jre/javaws-1_0_1_02-linux-int.zip
 %%T%%/lib/htmlconverter.jar
 %%T%%/lib/tools.jar
 %%T%%/lib/orb.idl
@@ -1482,8 +1482,8 @@
 @dirrm %%T%%/jre/lib/audio
 @dirrm %%T%%/jre/lib/zi/Africa
 @dirrm %%T%%/jre/lib/zi/America/Indiana
-@dirrm %%T%%/jre/lib/zi/America/Kentucky
 @dirrm %%T%%/jre/lib/zi/America/North_Dakota
+@dirrm %%T%%/jre/lib/zi/America/Kentucky
 @dirrm %%T%%/jre/lib/zi/America
 @dirrm %%T%%/jre/lib/zi/Antarctica
 @dirrm %%T%%/jre/lib/zi/Asia