. Update to 1.5.0_06.

Submitted by:	josef@ via hq@ (packing list fixes added by me)

6 files changed, 16 insertions, 20 deletions

diff --git a/java/linux-sun-jdk15/Makefile b/java/linux-sun-jdk15/Makefile
index 44b05a45a198..29e7a8cb3304 100644
--- a/java/linux-sun-jdk15/Makefile
+++ b/java/linux-sun-jdk15/Makefile
@@ -32,7 +32,7 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 JDK_VERSION=	1.5.0
-JDK_REVISION=	05
+JDK_REVISION=	06
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/j2se/1.5.0/download.jsp
diff --git a/java/linux-sun-jdk15/distinfo b/java/linux-sun-jdk15/distinfo
index 14603a946c97..4bfb60ea432c 100644
--- a/java/linux-sun-jdk15/distinfo
+++ b/java/linux-sun-jdk15/distinfo
@@ -1,3 +1,3 @@
-MD5 (jdk-1_5_0_05-linux-i586.bin) = 2f83bf2a38fff1f8ac51b02ec7391ca3
-SHA256 (jdk-1_5_0_05-linux-i586.bin) = c24b3a5eaa52eae6a1564dc845352828d8bfdb3c7fb25ba863cef2d2d772048c
-SIZE (jdk-1_5_0_05-linux-i586.bin) = 48836045
+MD5 (jdk-1_5_0_06-linux-i586.bin) = 3cdad4a383b93680f02f6f06198c2227
+SHA256 (jdk-1_5_0_06-linux-i586.bin) = 6e85ae9fe572041ea9084968d4f0dee3e1207a74b38aa9d982ab10ec66c32a12
+SIZE (jdk-1_5_0_06-linux-i586.bin) = 48974825
diff --git a/java/linux-sun-jdk15/pkg-plist b/java/linux-sun-jdk15/pkg-plist
index e2d97f1fab93..854da448cd91 100644
--- a/java/linux-sun-jdk15/pkg-plist
+++ b/java/linux-sun-jdk15/pkg-plist
@@ -1703,7 +1703,6 @@
 %%T%%/jre/lib/zi/Africa/Ouagadougou
 %%T%%/jre/lib/zi/Africa/Porto-Novo
 %%T%%/jre/lib/zi/Africa/Sao_Tome
-%%T%%/jre/lib/zi/Africa/Timbuktu
 %%T%%/jre/lib/zi/Africa/Tripoli
 %%T%%/jre/lib/zi/Africa/Tunis
 %%T%%/jre/lib/zi/Africa/Windhoek
@@ -1714,7 +1713,6 @@
 %%T%%/jre/lib/zi/America/Araguaina
 %%T%%/jre/lib/zi/America/Argentina/Buenos_Aires
 %%T%%/jre/lib/zi/America/Argentina/Catamarca
-%%T%%/jre/lib/zi/America/Argentina/ComodRivadavia
 %%T%%/jre/lib/zi/America/Argentina/Cordoba
 %%T%%/jre/lib/zi/America/Argentina/Jujuy
 %%T%%/jre/lib/zi/America/Argentina/La_Rioja
@@ -1740,6 +1738,7 @@
 %%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
@@ -1765,19 +1764,19 @@
 %%T%%/jre/lib/zi/America/Halifax
 %%T%%/jre/lib/zi/America/Havana
 %%T%%/jre/lib/zi/America/Hermosillo
+%%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/Vevay
-%%T%%/jre/lib/zi/America/Indianapolis
 %%T%%/jre/lib/zi/America/Inuvik
 %%T%%/jre/lib/zi/America/Iqaluit
 %%T%%/jre/lib/zi/America/Jamaica
 %%T%%/jre/lib/zi/America/Juneau
+%%T%%/jre/lib/zi/America/Kentucky/Louisville
 %%T%%/jre/lib/zi/America/Kentucky/Monticello
 %%T%%/jre/lib/zi/America/La_Paz
 %%T%%/jre/lib/zi/America/Lima
 %%T%%/jre/lib/zi/America/Los_Angeles
-%%T%%/jre/lib/zi/America/Louisville
 %%T%%/jre/lib/zi/America/Maceio
 %%T%%/jre/lib/zi/America/Managua
 %%T%%/jre/lib/zi/America/Manaus
@@ -1931,6 +1930,7 @@
 %%T%%/jre/lib/zi/Australia/Adelaide
 %%T%%/jre/lib/zi/Australia/Brisbane
 %%T%%/jre/lib/zi/Australia/Broken_Hill
+%%T%%/jre/lib/zi/Australia/Currie
 %%T%%/jre/lib/zi/Australia/Darwin
 %%T%%/jre/lib/zi/Australia/Hobart
 %%T%%/jre/lib/zi/Australia/Lindeman
@@ -1972,7 +1972,6 @@
 %%T%%/jre/lib/zi/Europe/Amsterdam
 %%T%%/jre/lib/zi/Europe/Andorra
 %%T%%/jre/lib/zi/Europe/Athens
-%%T%%/jre/lib/zi/Europe/Belfast
 %%T%%/jre/lib/zi/Europe/Belgrade
 %%T%%/jre/lib/zi/Europe/Berlin
 %%T%%/jre/lib/zi/Europe/Brussels
@@ -2063,7 +2062,6 @@
 %%T%%/jre/lib/zi/Pacific/Truk
 %%T%%/jre/lib/zi/Pacific/Wake
 %%T%%/jre/lib/zi/Pacific/Wallis
-%%T%%/jre/lib/zi/Pacific/Yap
 %%T%%/jre/lib/zi/WET
 %%T%%/jre/lib/zi/ZoneInfoMappings
 %%T%%/jre/plugin/desktop/sun_java.desktop
diff --git a/java/linux-sun-jdk16/Makefile b/java/linux-sun-jdk16/Makefile
index 44b05a45a198..29e7a8cb3304 100644
--- a/java/linux-sun-jdk16/Makefile
+++ b/java/linux-sun-jdk16/Makefile
@@ -32,7 +32,7 @@ NO_BUILD=	yes
 USE_LINUX=	yes
 USE_XLIB=	yes
 JDK_VERSION=	1.5.0
-JDK_REVISION=	05
+JDK_REVISION=	06
 DL_JDK_VERSION=	${JDK_VERSION}_${JDK_REVISION}
 ONLY_FOR_ARCHS=	i386 amd64
 DOWNLOAD_URL?=	http://java.sun.com/j2se/1.5.0/download.jsp
diff --git a/java/linux-sun-jdk16/distinfo b/java/linux-sun-jdk16/distinfo
index 14603a946c97..4bfb60ea432c 100644
--- a/java/linux-sun-jdk16/distinfo
+++ b/java/linux-sun-jdk16/distinfo
@@ -1,3 +1,3 @@
-MD5 (jdk-1_5_0_05-linux-i586.bin) = 2f83bf2a38fff1f8ac51b02ec7391ca3
-SHA256 (jdk-1_5_0_05-linux-i586.bin) = c24b3a5eaa52eae6a1564dc845352828d8bfdb3c7fb25ba863cef2d2d772048c
-SIZE (jdk-1_5_0_05-linux-i586.bin) = 48836045
+MD5 (jdk-1_5_0_06-linux-i586.bin) = 3cdad4a383b93680f02f6f06198c2227
+SHA256 (jdk-1_5_0_06-linux-i586.bin) = 6e85ae9fe572041ea9084968d4f0dee3e1207a74b38aa9d982ab10ec66c32a12
+SIZE (jdk-1_5_0_06-linux-i586.bin) = 48974825
diff --git a/java/linux-sun-jdk16/pkg-plist b/java/linux-sun-jdk16/pkg-plist
index e2d97f1fab93..854da448cd91 100644
--- a/java/linux-sun-jdk16/pkg-plist
+++ b/java/linux-sun-jdk16/pkg-plist
@@ -1703,7 +1703,6 @@
 %%T%%/jre/lib/zi/Africa/Ouagadougou
 %%T%%/jre/lib/zi/Africa/Porto-Novo
 %%T%%/jre/lib/zi/Africa/Sao_Tome
-%%T%%/jre/lib/zi/Africa/Timbuktu
 %%T%%/jre/lib/zi/Africa/Tripoli
 %%T%%/jre/lib/zi/Africa/Tunis
 %%T%%/jre/lib/zi/Africa/Windhoek
@@ -1714,7 +1713,6 @@
 %%T%%/jre/lib/zi/America/Araguaina
 %%T%%/jre/lib/zi/America/Argentina/Buenos_Aires
 %%T%%/jre/lib/zi/America/Argentina/Catamarca
-%%T%%/jre/lib/zi/America/Argentina/ComodRivadavia
 %%T%%/jre/lib/zi/America/Argentina/Cordoba
 %%T%%/jre/lib/zi/America/Argentina/Jujuy
 %%T%%/jre/lib/zi/America/Argentina/La_Rioja
@@ -1740,6 +1738,7 @@
 %%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
@@ -1765,19 +1764,19 @@
 %%T%%/jre/lib/zi/America/Halifax
 %%T%%/jre/lib/zi/America/Havana
 %%T%%/jre/lib/zi/America/Hermosillo
+%%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/Vevay
-%%T%%/jre/lib/zi/America/Indianapolis
 %%T%%/jre/lib/zi/America/Inuvik
 %%T%%/jre/lib/zi/America/Iqaluit
 %%T%%/jre/lib/zi/America/Jamaica
 %%T%%/jre/lib/zi/America/Juneau
+%%T%%/jre/lib/zi/America/Kentucky/Louisville
 %%T%%/jre/lib/zi/America/Kentucky/Monticello
 %%T%%/jre/lib/zi/America/La_Paz
 %%T%%/jre/lib/zi/America/Lima
 %%T%%/jre/lib/zi/America/Los_Angeles
-%%T%%/jre/lib/zi/America/Louisville
 %%T%%/jre/lib/zi/America/Maceio
 %%T%%/jre/lib/zi/America/Managua
 %%T%%/jre/lib/zi/America/Manaus
@@ -1931,6 +1930,7 @@
 %%T%%/jre/lib/zi/Australia/Adelaide
 %%T%%/jre/lib/zi/Australia/Brisbane
 %%T%%/jre/lib/zi/Australia/Broken_Hill
+%%T%%/jre/lib/zi/Australia/Currie
 %%T%%/jre/lib/zi/Australia/Darwin
 %%T%%/jre/lib/zi/Australia/Hobart
 %%T%%/jre/lib/zi/Australia/Lindeman
@@ -1972,7 +1972,6 @@
 %%T%%/jre/lib/zi/Europe/Amsterdam
 %%T%%/jre/lib/zi/Europe/Andorra
 %%T%%/jre/lib/zi/Europe/Athens
-%%T%%/jre/lib/zi/Europe/Belfast
 %%T%%/jre/lib/zi/Europe/Belgrade
 %%T%%/jre/lib/zi/Europe/Berlin
 %%T%%/jre/lib/zi/Europe/Brussels
@@ -2063,7 +2062,6 @@
 %%T%%/jre/lib/zi/Pacific/Truk
 %%T%%/jre/lib/zi/Pacific/Wake
 %%T%%/jre/lib/zi/Pacific/Wallis
-%%T%%/jre/lib/zi/Pacific/Yap
 %%T%%/jre/lib/zi/WET
 %%T%%/jre/lib/zi/ZoneInfoMappings
 %%T%%/jre/plugin/desktop/sun_java.desktop