. Update to 1.5.0_10.

6 files changed, 68 insertions, 14 deletions

diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile
index fdb621dcea1f..34f1d09aba5e 100644
--- a/java/linux-sun-jdk15/Makefile
+++ b/java/linux-sun-jdk15/Makefile
@@ -32,10 +32,10 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 JDK_VERSION=	1.5.0
-JDK_REVISION=	07
+JDK_REVISION=	10
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
-DOWNLOAD_URL?=	http://java.sun.com/j2se/1.5.0/download.jsp
+DOWNLOAD_URL?=	http://java.sun.com/javase/downloads/index_jdk5.jsp
 PORTTITLE=	Java 2 Development Kit ${DL_JDK_VERSION} for Linux
 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/deploy.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar
@@ -57,7 +57,7 @@ pre-everything::
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} \
-	&& ${TAIL} -n +749 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
+	&& ${TAIL} -n +733 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
 	&& ${CHMOD} +x ${WRKDIR}/install.sfx \
 	&& ${WRKDIR}/install.sfx > /dev/null
 
diff --git a/java/linux-sun-jdk15/distinfo b/java/linux-sun-jdk15/distinfo
index 1e862a0f4820..0d3d888b534d 100644
--- a/java/linux-sun-jdk15/distinfo
+++ b/java/linux-sun-jdk15/distinfo
@@ -1,3 +1,3 @@
-MD5 (jdk-1_5_0_07-linux-i586.bin) = 1325082c36b4adcb71bc5449ae4c68cf
-SHA256 (jdk-1_5_0_07-linux-i586.bin) = 3f4c327aeb11b2c923a501b8315ce4261cec13dc0a9991264d3ba2e6edf86ce2
-SIZE (jdk-1_5_0_07-linux-i586.bin) = 49075062
+MD5 (jdk-1_5_0_10-linux-i586.bin) = d916c24bed9eef7aebc2626115e14a11
+SHA256 (jdk-1_5_0_10-linux-i586.bin) = 847a7ab4eeb6b922a280099bbfe210557b04126d9819deab7696f0be9a119b46
+SIZE (jdk-1_5_0_10-linux-i586.bin) = 49529389
diff --git a/java/linux-sun-jdk15/pkg-plist b/java/linux-sun-jdk15/pkg-plist
index 64e9f978ced1..5ef225d66df8 100644
--- a/java/linux-sun-jdk15/pkg-plist
+++ b/java/linux-sun-jdk15/pkg-plist
@@ -1726,10 +1726,12 @@
 %%T%%/jre/lib/zi/America/Argentina/Ushuaia
 %%T%%/jre/lib/zi/America/Aruba
 %%T%%/jre/lib/zi/America/Asuncion
+%%T%%/jre/lib/zi/America/Atikokan
 %%T%%/jre/lib/zi/America/Bahia
 %%T%%/jre/lib/zi/America/Barbados
 %%T%%/jre/lib/zi/America/Belem
 %%T%%/jre/lib/zi/America/Belize
+%%T%%/jre/lib/zi/America/Blanc-Sablon
 %%T%%/jre/lib/zi/America/Boa_Vista
 %%T%%/jre/lib/zi/America/Bogota
 %%T%%/jre/lib/zi/America/Boise
@@ -1741,7 +1743,6 @@
 %%T%%/jre/lib/zi/America/Cayman
 %%T%%/jre/lib/zi/America/Chicago
 %%T%%/jre/lib/zi/America/Chihuahua
-%%T%%/jre/lib/zi/America/Coral_Harbour
 %%T%%/jre/lib/zi/America/Costa_Rica
 %%T%%/jre/lib/zi/America/Cuiaba
 %%T%%/jre/lib/zi/America/Curacao
@@ -1770,7 +1771,9 @@
 %%T%%/jre/lib/zi/America/Indiana/Indianapolis
 %%T%%/jre/lib/zi/America/Indiana/Knox
 %%T%%/jre/lib/zi/America/Indiana/Marengo
+%%T%%/jre/lib/zi/America/Indiana/Petersburg
 %%T%%/jre/lib/zi/America/Indiana/Vevay
+%%T%%/jre/lib/zi/America/Indiana/Vincennes
 %%T%%/jre/lib/zi/America/Inuvik
 %%T%%/jre/lib/zi/America/Iqaluit
 %%T%%/jre/lib/zi/America/Jamaica
@@ -1789,6 +1792,7 @@
 %%T%%/jre/lib/zi/America/Merida
 %%T%%/jre/lib/zi/America/Mexico_City
 %%T%%/jre/lib/zi/America/Miquelon
+%%T%%/jre/lib/zi/America/Moncton
 %%T%%/jre/lib/zi/America/Monterrey
 %%T%%/jre/lib/zi/America/Montevideo
 %%T%%/jre/lib/zi/America/Montreal
@@ -1799,6 +1803,7 @@
 %%T%%/jre/lib/zi/America/Nome
 %%T%%/jre/lib/zi/America/Noronha
 %%T%%/jre/lib/zi/America/North_Dakota/Center
+%%T%%/jre/lib/zi/America/North_Dakota/New_Salem
 %%T%%/jre/lib/zi/America/Panama
 %%T%%/jre/lib/zi/America/Pangnirtung
 %%T%%/jre/lib/zi/America/Paramaribo
@@ -1942,7 +1947,10 @@
 %%T%%/jre/lib/zi/Australia/Perth
 %%T%%/jre/lib/zi/Australia/Sydney
 %%T%%/jre/lib/zi/CET
+%%T%%/jre/lib/zi/CST6CDT
 %%T%%/jre/lib/zi/EET
+%%T%%/jre/lib/zi/EST
+%%T%%/jre/lib/zi/EST5EDT
 %%T%%/jre/lib/zi/Etc/GMT
 %%T%%/jre/lib/zi/Etc/GMT+1
 %%T%%/jre/lib/zi/Etc/GMT+10
@@ -2011,10 +2019,12 @@
 %%T%%/jre/lib/zi/Europe/Vaduz
 %%T%%/jre/lib/zi/Europe/Vienna
 %%T%%/jre/lib/zi/Europe/Vilnius
+%%T%%/jre/lib/zi/Europe/Volgograd
 %%T%%/jre/lib/zi/Europe/Warsaw
 %%T%%/jre/lib/zi/Europe/Zaporozhye
 %%T%%/jre/lib/zi/Europe/Zurich
 %%T%%/jre/lib/zi/GMT
+%%T%%/jre/lib/zi/HST
 %%T%%/jre/lib/zi/Indian/Antananarivo
 %%T%%/jre/lib/zi/Indian/Chagos
 %%T%%/jre/lib/zi/Indian/Christmas
@@ -2027,6 +2037,9 @@
 %%T%%/jre/lib/zi/Indian/Mayotte
 %%T%%/jre/lib/zi/Indian/Reunion
 %%T%%/jre/lib/zi/MET
+%%T%%/jre/lib/zi/MST
+%%T%%/jre/lib/zi/MST7MDT
+%%T%%/jre/lib/zi/PST8PDT
 %%T%%/jre/lib/zi/Pacific/Apia
 %%T%%/jre/lib/zi/Pacific/Auckland
 %%T%%/jre/lib/zi/Pacific/Chatham
@@ -2065,6 +2078,19 @@
 %%T%%/jre/lib/zi/Pacific/Truk
 %%T%%/jre/lib/zi/Pacific/Wake
 %%T%%/jre/lib/zi/Pacific/Wallis
+%%T%%/jre/lib/zi/SystemV/AST4
+%%T%%/jre/lib/zi/SystemV/AST4ADT
+%%T%%/jre/lib/zi/SystemV/CST6
+%%T%%/jre/lib/zi/SystemV/CST6CDT
+%%T%%/jre/lib/zi/SystemV/EST5
+%%T%%/jre/lib/zi/SystemV/EST5EDT
+%%T%%/jre/lib/zi/SystemV/HST10
+%%T%%/jre/lib/zi/SystemV/MST7
+%%T%%/jre/lib/zi/SystemV/MST7MDT
+%%T%%/jre/lib/zi/SystemV/PST8
+%%T%%/jre/lib/zi/SystemV/PST8PDT
+%%T%%/jre/lib/zi/SystemV/YST9
+%%T%%/jre/lib/zi/SystemV/YST9YDT
 %%T%%/jre/lib/zi/WET
 %%T%%/jre/lib/zi/ZoneInfoMappings
 %%T%%/jre/plugin/desktop/sun_java.desktop
@@ -2361,6 +2387,7 @@
 @dirrm %%T%%/jre/plugin/i386
 @dirrm %%T%%/jre/plugin/desktop
 @dirrm %%T%%/jre/plugin
+@dirrm %%T%%/jre/lib/zi/SystemV
 @dirrm %%T%%/jre/lib/zi/Pacific
 @dirrm %%T%%/jre/lib/zi/Indian
 @dirrm %%T%%/jre/lib/zi/Europe
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index fdb621dcea1f..34f1d09aba5e 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -32,10 +32,10 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 JDK_VERSION=	1.5.0
-JDK_REVISION=	07
+JDK_REVISION=	10
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
-DOWNLOAD_URL?=	http://java.sun.com/j2se/1.5.0/download.jsp
+DOWNLOAD_URL?=	http://java.sun.com/javase/downloads/index_jdk5.jsp
 PORTTITLE=	Java 2 Development Kit ${DL_JDK_VERSION} for Linux
 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/deploy.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar
@@ -57,7 +57,7 @@ pre-everything::
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@cd ${WRKDIR} \
-	&& ${TAIL} -n +749 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
+	&& ${TAIL} -n +733 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/install.sfx \
 	&& ${CHMOD} +x ${WRKDIR}/install.sfx \
 	&& ${WRKDIR}/install.sfx > /dev/null
 
diff --git a/java/linux-sun-jdk16/distinfo b/java/linux-sun-jdk16/distinfo
index 1e862a0f4820..0d3d888b534d 100644
--- a/java/linux-sun-jdk16/distinfo
+++ b/java/linux-sun-jdk16/distinfo
@@ -1,3 +1,3 @@
-MD5 (jdk-1_5_0_07-linux-i586.bin) = 1325082c36b4adcb71bc5449ae4c68cf
-SHA256 (jdk-1_5_0_07-linux-i586.bin) = 3f4c327aeb11b2c923a501b8315ce4261cec13dc0a9991264d3ba2e6edf86ce2
-SIZE (jdk-1_5_0_07-linux-i586.bin) = 49075062
+MD5 (jdk-1_5_0_10-linux-i586.bin) = d916c24bed9eef7aebc2626115e14a11
+SHA256 (jdk-1_5_0_10-linux-i586.bin) = 847a7ab4eeb6b922a280099bbfe210557b04126d9819deab7696f0be9a119b46
+SIZE (jdk-1_5_0_10-linux-i586.bin) = 49529389
diff --git a/java/linux-sun-jdk16/pkg-plist b/java/linux-sun-jdk16/pkg-plist
index 64e9f978ced1..5ef225d66df8 100644
--- a/java/linux-sun-jdk16/pkg-plist
+++ b/java/linux-sun-jdk16/pkg-plist
@@ -1726,10 +1726,12 @@
 %%T%%/jre/lib/zi/America/Argentina/Ushuaia
 %%T%%/jre/lib/zi/America/Aruba
 %%T%%/jre/lib/zi/America/Asuncion
+%%T%%/jre/lib/zi/America/Atikokan
 %%T%%/jre/lib/zi/America/Bahia
 %%T%%/jre/lib/zi/America/Barbados
 %%T%%/jre/lib/zi/America/Belem
 %%T%%/jre/lib/zi/America/Belize
+%%T%%/jre/lib/zi/America/Blanc-Sablon
 %%T%%/jre/lib/zi/America/Boa_Vista
 %%T%%/jre/lib/zi/America/Bogota
 %%T%%/jre/lib/zi/America/Boise
@@ -1741,7 +1743,6 @@
 %%T%%/jre/lib/zi/America/Cayman
 %%T%%/jre/lib/zi/America/Chicago
 %%T%%/jre/lib/zi/America/Chihuahua
-%%T%%/jre/lib/zi/America/Coral_Harbour
 %%T%%/jre/lib/zi/America/Costa_Rica
 %%T%%/jre/lib/zi/America/Cuiaba
 %%T%%/jre/lib/zi/America/Curacao
@@ -1770,7 +1771,9 @@
 %%T%%/jre/lib/zi/America/Indiana/Indianapolis
 %%T%%/jre/lib/zi/America/Indiana/Knox
 %%T%%/jre/lib/zi/America/Indiana/Marengo
+%%T%%/jre/lib/zi/America/Indiana/Petersburg
 %%T%%/jre/lib/zi/America/Indiana/Vevay
+%%T%%/jre/lib/zi/America/Indiana/Vincennes
 %%T%%/jre/lib/zi/America/Inuvik
 %%T%%/jre/lib/zi/America/Iqaluit
 %%T%%/jre/lib/zi/America/Jamaica
@@ -1789,6 +1792,7 @@
 %%T%%/jre/lib/zi/America/Merida
 %%T%%/jre/lib/zi/America/Mexico_City
 %%T%%/jre/lib/zi/America/Miquelon
+%%T%%/jre/lib/zi/America/Moncton
 %%T%%/jre/lib/zi/America/Monterrey
 %%T%%/jre/lib/zi/America/Montevideo
 %%T%%/jre/lib/zi/America/Montreal
@@ -1799,6 +1803,7 @@
 %%T%%/jre/lib/zi/America/Nome
 %%T%%/jre/lib/zi/America/Noronha
 %%T%%/jre/lib/zi/America/North_Dakota/Center
+%%T%%/jre/lib/zi/America/North_Dakota/New_Salem
 %%T%%/jre/lib/zi/America/Panama
 %%T%%/jre/lib/zi/America/Pangnirtung
 %%T%%/jre/lib/zi/America/Paramaribo
@@ -1942,7 +1947,10 @@
 %%T%%/jre/lib/zi/Australia/Perth
 %%T%%/jre/lib/zi/Australia/Sydney
 %%T%%/jre/lib/zi/CET
+%%T%%/jre/lib/zi/CST6CDT
 %%T%%/jre/lib/zi/EET
+%%T%%/jre/lib/zi/EST
+%%T%%/jre/lib/zi/EST5EDT
 %%T%%/jre/lib/zi/Etc/GMT
 %%T%%/jre/lib/zi/Etc/GMT+1
 %%T%%/jre/lib/zi/Etc/GMT+10
@@ -2011,10 +2019,12 @@
 %%T%%/jre/lib/zi/Europe/Vaduz
 %%T%%/jre/lib/zi/Europe/Vienna
 %%T%%/jre/lib/zi/Europe/Vilnius
+%%T%%/jre/lib/zi/Europe/Volgograd
 %%T%%/jre/lib/zi/Europe/Warsaw
 %%T%%/jre/lib/zi/Europe/Zaporozhye
 %%T%%/jre/lib/zi/Europe/Zurich
 %%T%%/jre/lib/zi/GMT
+%%T%%/jre/lib/zi/HST
 %%T%%/jre/lib/zi/Indian/Antananarivo
 %%T%%/jre/lib/zi/Indian/Chagos
 %%T%%/jre/lib/zi/Indian/Christmas
@@ -2027,6 +2037,9 @@
 %%T%%/jre/lib/zi/Indian/Mayotte
 %%T%%/jre/lib/zi/Indian/Reunion
 %%T%%/jre/lib/zi/MET
+%%T%%/jre/lib/zi/MST
+%%T%%/jre/lib/zi/MST7MDT
+%%T%%/jre/lib/zi/PST8PDT
 %%T%%/jre/lib/zi/Pacific/Apia
 %%T%%/jre/lib/zi/Pacific/Auckland
 %%T%%/jre/lib/zi/Pacific/Chatham
@@ -2065,6 +2078,19 @@
 %%T%%/jre/lib/zi/Pacific/Truk
 %%T%%/jre/lib/zi/Pacific/Wake
 %%T%%/jre/lib/zi/Pacific/Wallis
+%%T%%/jre/lib/zi/SystemV/AST4
+%%T%%/jre/lib/zi/SystemV/AST4ADT
+%%T%%/jre/lib/zi/SystemV/CST6
+%%T%%/jre/lib/zi/SystemV/CST6CDT
+%%T%%/jre/lib/zi/SystemV/EST5
+%%T%%/jre/lib/zi/SystemV/EST5EDT
+%%T%%/jre/lib/zi/SystemV/HST10
+%%T%%/jre/lib/zi/SystemV/MST7
+%%T%%/jre/lib/zi/SystemV/MST7MDT
+%%T%%/jre/lib/zi/SystemV/PST8
+%%T%%/jre/lib/zi/SystemV/PST8PDT
+%%T%%/jre/lib/zi/SystemV/YST9
+%%T%%/jre/lib/zi/SystemV/YST9YDT
 %%T%%/jre/lib/zi/WET
 %%T%%/jre/lib/zi/ZoneInfoMappings
 %%T%%/jre/plugin/desktop/sun_java.desktop
@@ -2361,6 +2387,7 @@
 @dirrm %%T%%/jre/plugin/i386
 @dirrm %%T%%/jre/plugin/desktop
 @dirrm %%T%%/jre/plugin
+@dirrm %%T%%/jre/lib/zi/SystemV
 @dirrm %%T%%/jre/lib/zi/Pacific
 @dirrm %%T%%/jre/lib/zi/Indian
 @dirrm %%T%%/jre/lib/zi/Europe