12 files changed, 65 insertions, 35 deletions

diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 2e15085f8c92..977934994d97 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=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -57,9 +57,9 @@ 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.1.0
-TZUPDATE_TZVERSION=	2007c
-TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATE_VERSION=	1.2.1
+TZUPDATE_TZVERSION=	2007f
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=		TZORIGINAL="@comment "
diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo
index 6a49018c6dd5..3c245baaa799 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.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198
diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index 9e7f45ca52fc..f048db2ccfc9 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1792,6 +1792,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rainy_River
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rankin_Inlet
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Resolute
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
@@ -2053,6 +2054,19 @@ 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
@@ -2344,6 +2358,7 @@ 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 cf3c8250b74d..eebe9a6ccd96 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=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -57,9 +57,9 @@ 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.1.0
-TZUPDATE_TZVERSION=	2007c
-TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATE_VERSION=	1.2.1
+TZUPDATE_TZVERSION=	2007f
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=		TZORIGINAL="@comment "
diff --git a/java/diablo-jre15/distinfo b/java/diablo-jre15/distinfo
index 7578e8f17f92..52eefa2f25d9 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.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198
diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index 3d67f67d1045..3a74debd79a7 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -316,6 +316,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Rainy_River
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Rankin_Inlet
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Recife
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Regina
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Resolute
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Rio_Branco
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Santiago
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Santo_Domingo
@@ -577,6 +578,19 @@ 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
@@ -620,6 +634,7 @@ 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
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index ee190e0e467f..3c8270fbcb2d 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk14.html
@@ -15,7 +15,7 @@ SCSL_SRCFILE=	j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
-TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=	${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
 
 MAINTAINER=	glewis@FreeBSD.org
@@ -54,8 +54,8 @@ JDK_VERSION=	1.4.2
 JDK_PATCHSET_VERSION=	8
 LATEST_LINK=	jdk14
 
-TZUPDATE_VERSION=	1.1.0
-TZUPDATE_TZVERSION=	2007c
+TZUPDATE_VERSION=	1.2.1
+TZUPDATE_TZVERSION=	2007f
 
 SUN_LINUX_JDK_VERSION=  1.4.2
 
diff --git a/java/jdk14/distinfo b/java/jdk14/distinfo
index 54c7beb070cc..2546d2e9f9d9 100644
--- a/java/jdk14/distinfo
+++ b/java/jdk14/distinfo
@@ -10,6 +10,6 @@ SIZE (bsd-jdk14-patches-8.tar.gz) = 1148395
 MD5 (jce_policy-1_4_2.zip) = ff961c5f5326191c5ac2e4624d756f7e
 SHA256 (jce_policy-1_4_2.zip) = 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097
 SIZE (jce_policy-1_4_2.zip) = 12195
-MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index d5bea5215a12..14b922ac8d97 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -50,14 +50,14 @@ SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
-TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 
 JDK_VERSION=	1.5.0
 JDK_PATCHSET_VERSION=	4
 LATEST_LINK=	jdk15
 
-TZUPDATE_VERSION=	1.1.0
-TZUPDATE_TZVERSION=	2007c
+TZUPDATE_VERSION=	1.2.1
+TZUPDATE_TZVERSION=	2007f
 
 SUN_LINUX_JDK_VERSION=	1.4.2
 
diff --git a/java/jdk15/distinfo b/java/jdk15/distinfo
index 2a45a1d3ed0f..77fa51c54dfc 100644
--- a/java/jdk15/distinfo
+++ b/java/jdk15/distinfo
@@ -10,6 +10,6 @@ SIZE (bsd-jdk15-patches-4.tar.bz2) = 746062
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
-MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198
diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index d5bea5215a12..14b922ac8d97 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}p${JDK_PATCHSET_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.sun.com/software/java2/download.html
 #		 http://www.eyesbeyond.com/freebsddom/java/jdk15.html
@@ -50,14 +50,14 @@ SCSL_SRCFILE=	jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
 SCSL_BINFILE=	jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
 PATCHSETFILE=	bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
 POLICYFILE=	jce_policy-${JDK_VERSION:S/./_/g}.zip
-TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+TZUPDATEFILE=	tzupdater-${TZUPDATE_VERSION:S/./_/g}-${TZUPDATE_TZVERSION}.zip
 
 JDK_VERSION=	1.5.0
 JDK_PATCHSET_VERSION=	4
 LATEST_LINK=	jdk15
 
-TZUPDATE_VERSION=	1.1.0
-TZUPDATE_TZVERSION=	2007c
+TZUPDATE_VERSION=	1.2.1
+TZUPDATE_TZVERSION=	2007f
 
 SUN_LINUX_JDK_VERSION=	1.4.2
 
diff --git a/java/jdk16/distinfo b/java/jdk16/distinfo
index 2a45a1d3ed0f..77fa51c54dfc 100644
--- a/java/jdk16/distinfo
+++ b/java/jdk16/distinfo
@@ -10,6 +10,6 @@ SIZE (bsd-jdk15-patches-4.tar.bz2) = 746062
 MD5 (jce_policy-1_5_0.zip) = 169441bba1ca95e84e030e116f258d79
 SHA256 (jce_policy-1_5_0.zip) = 4de78da737c6d66b74eb6caebf6bdb0648825a95e2909e815678a0d306bf6d8b
 SIZE (jce_policy-1_5_0.zip) = 8826
-MD5 (tzupdater-1.1.0-2007c.zip) = 1f1e1573d77dd9387a0ef3f2d93e759b
-SHA256 (tzupdater-1.1.0-2007c.zip) = 252d2d390bb1a0df27650603cbca6e5931e29c13d9c3b3538290a58cad06d769
-SIZE (tzupdater-1.1.0-2007c.zip) = 480534
+MD5 (tzupdater-1_2_1-2007f.zip) = f2ea5ca92b89ef767488a7ffd351cb3f
+SHA256 (tzupdater-1_2_1-2007f.zip) = 48c21fe64c9fcf8c612ea2ec5043e4bbeb37fea2e07d980d7297b130a32a29c1
+SIZE (tzupdater-1_2_1-2007f.zip) = 258198