. Update to tzupdater 1.2.2.

6 files changed, 14 insertions, 40 deletions

diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 7858beb3428b..717d63ac4029 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=	6
+PORTREVISION=	7
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -58,8 +58,8 @@ IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 
 .if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1.2.1
-TZUPDATE_TZVERSION=	2007f
+TZUPDATE_VERSION=	1.2.2
+TZUPDATE_TZVERSION=	2007g
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}-${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 3c245baaa799..2d332ddee15f 100644
--- a/java/diablo-jdk15/distinfo
+++ b/java/diablo-jdk15/distinfo
@@ -7,6 +7,6 @@ SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
 MD5 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = ac3a83b3a52cef7e1727ce32d91574d6
 SHA256 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = fda84f24f4eb489b04ce3185dfe7d70bffbbe624400ae086222a3892cc1ba305
 SIZE (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 54304946
-MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
-SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
-SIZE (tzupdater-1_2_1-2007f.zip) = 258198
+MD5 (tzupdater-1_2_2-2007g.zip) = 73e6a2bae29288dfb6fc0108a2ba06ed
+SHA256 (tzupdater-1_2_2-2007g.zip) = 77b7e7ecd69ad28b717efc25f5f63986af8eb46ce077c492b98b61234db1f1fc
+SIZE (tzupdater-1_2_2-2007g.zip) = 478102
diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index f048db2ccfc9..23e0951ce3f0 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1747,6 +1747,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Indianapolis
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Petersburg
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Tell_City
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vincennes
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Winamac
@@ -2054,19 +2055,6 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4ADT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6CDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5EDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/HST10
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7MDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8PDT
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9
-%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9YDT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/WET
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop
@@ -2358,7 +2346,6 @@ diablo-jdk%%JDK_VERSION%%/src.zip
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/%%ARCH%%
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin
-%%TZUPDATE%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 662dc5a80dfb..78f4687fa5a3 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=	6
+PORTREVISION=	7
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -58,8 +58,8 @@ IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 
 .if defined(WITH_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1.2.1
-TZUPDATE_TZVERSION=	2007f
+TZUPDATE_VERSION=	1.2.2
+TZUPDATE_TZVERSION=	2007g
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}-${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 52eefa2f25d9..ba52969776af 100644
--- a/java/diablo-jre15/distinfo
+++ b/java/diablo-jre15/distinfo
@@ -7,6 +7,6 @@ SIZE (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 23104037
 MD5 (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 8d678db9f1e88a63bfa8fde387ebe36f
 SHA256 (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = f684f425a9cf07e2d8cfe90d1cb6e543d162b026003e7fcf9b655dd8f8f9e3f5
 SIZE (diablo-latte-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 23036449
-MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
-SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
-SIZE (tzupdater-1_2_1-2007f.zip) = 258198
+MD5 (tzupdater-1_2_2-2007g.zip) = 73e6a2bae29288dfb6fc0108a2ba06ed
+SHA256 (tzupdater-1_2_2-2007g.zip) = 77b7e7ecd69ad28b717efc25f5f63986af8eb46ce077c492b98b61234db1f1fc
+SIZE (tzupdater-1_2_2-2007g.zip) = 478102
diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index 3a74debd79a7..a2308afbdf2e 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -271,6 +271,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Indianapolis
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Knox
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Marengo
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Petersburg
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Tell_City
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Vevay
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Vincennes
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Winamac
@@ -578,19 +579,6 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Tongatapu
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Truk
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Wake
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Wallis
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/AST4
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/AST4ADT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/CST6
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/CST6CDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/EST5
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/EST5EDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/HST10
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/MST7
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/MST7MDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/PST8
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/PST8PDT
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/YST9
-%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/SystemV/YST9YDT
 diablo-jre%%JRE_VERSION%%/lib/zi/WET
 diablo-jre%%JRE_VERSION%%/lib/zi/ZoneInfoMappings
 diablo-jre%%JRE_VERSION%%/man/ja
@@ -634,7 +622,6 @@ diablo-jre%%JRE_VERSION%%/man/man1/unpack200.1
 @dirrm diablo-jre%%JRE_VERSION%%/man/ja_JP.eucJP/man1
 @dirrm diablo-jre%%JRE_VERSION%%/man/ja_JP.eucJP
 @dirrm diablo-jre%%JRE_VERSION%%/man
-%%TZUPDATE%%@dirrm diablo-jre%%JRE_VERSION%%/lib/zi/SystemV
 @dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Pacific
 @dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Indian
 @dirrm diablo-jre%%JRE_VERSION%%/lib/zi/Europe