. Update to tzupdater 1.3.42.

6 files changed, 16 insertions, 12 deletions

diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 2afefc4de0af..ac7477f11d1f 100644
--- a/java/diablo-jdk15/Makefile
+++ b/java/diablo-jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -53,8 +53,8 @@ LIB_DEPENDS=	z.3:${PORTSDIR}/misc/compat6x
 
 .if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1_3_40
-TZUPDATE_TZVERSION=	2011h
+TZUPDATE_VERSION=	1_3_42
+TZUPDATE_TZVERSION=	2011k
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo
index 41ea4eb9ef41..f1567e7c1f89 100644
--- a/java/diablo-jdk15/distinfo
+++ b/java/diablo-jdk15/distinfo
@@ -2,5 +2,5 @@ SHA256 (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 2f2964506589589ccf4c
 SIZE (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 46868094
 SHA256 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
 SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
-SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
-SIZE (tzupdater-1_3_40-2011h.zip) = 251050
+SHA256 (tzupdater-1_3_42-2011k.zip) = 11b4221c8ff0dae1a401dc1d9f25b30f02a9e43810a60455406fdbd780e97249
+SIZE (tzupdater-1_3_42-2011k.zip) = 467016
diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index 93f1ff3f6519..e273bf01a2ed 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1657,6 +1657,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Freetown
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Gaborone
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Harare
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Johannesburg
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Juba
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kampala
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Khartoum
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Kigali
@@ -1861,8 +1862,9 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hebron
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ho_Chi_Minh
+diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 5025ea4c4aef..264cc032ec27 100644
--- a/java/diablo-jre15/Makefile
+++ b/java/diablo-jre15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	26
+PORTREVISION=	27
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -53,8 +53,8 @@ LIB_DEPENDS=	z.3:${PORTSDIR}/misc/compat6x
 
 .if defined(WITH_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1_3_40
-TZUPDATE_TZVERSION=	2011h
+TZUPDATE_VERSION=	1_3_42
+TZUPDATE_TZVERSION=	2011k
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/java/diablo-jre15/distinfo b/java/diablo-jre15/distinfo
index 5d458cf9421e..b43136493bc8 100644
--- a/java/diablo-jre15/distinfo
+++ b/java/diablo-jre15/distinfo
@@ -2,5 +2,5 @@ SHA256 (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = e242f4f8ee2973cf1dda
 SIZE (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 20580050
 SHA256 (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 4585f35124416de052c8be10f0f48536053ab5c33dc3b7d728bf6e84d9b42c14
 SIZE (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 23104037
-SHA256 (tzupdater-1_3_40-2011h.zip) = 5d768948b500d5151f32a5be479fe9466151f0b114c2db0210b7a27e2c96084d
-SIZE (tzupdater-1_3_40-2011h.zip) = 251050
+SHA256 (tzupdater-1_3_42-2011k.zip) = 11b4221c8ff0dae1a401dc1d9f25b30f02a9e43810a60455406fdbd780e97249
+SIZE (tzupdater-1_3_42-2011k.zip) = 467016
diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index d661da4d2be5..3cf88ec8f735 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -181,6 +181,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Freetown
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Gaborone
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Harare
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Johannesburg
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Juba
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Kampala
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Khartoum
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Kigali
@@ -385,8 +386,9 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Dubai
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Dushanbe
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Gaza
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Harbin
-diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hong_Kong
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hebron
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Ho_Chi_Minh
+diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hong_Kong
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hovd
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Irkutsk
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Jakarta