6 files changed, 20 insertions, 16 deletions

diff --git a/java/diablo-jdk16/Makefile b/java/diablo-jdk16/Makefile
index 43e56b1429f4..842f2bb65e20 100644
--- a/java/diablo-jdk16/Makefile
+++ b/java/diablo-jdk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -77,8 +77,8 @@ POLICYFILE=	jce_policy-6.zip
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_35
-TZUPDATE_TZVERSION=	2011b
+TZUPDATE_VERSION=	1_3_38
+TZUPDATE_TZVERSION=	2011e
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 .if !defined(WITHOUT_TZUPDATE)
 DISTFILES+=		${TZUPDATEFILE}
@@ -101,15 +101,15 @@ with a web browser and \"Accept\" the End User License Agreement for\n\
 .endif#}
 .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
 DISTFILE_INSTRUCTIONS+=Please open\n\n\
-\ \ \ \ http://java.sun.com/javase/downloads/\n\n\
+\ \ \ \ http://www.oracle.com/technetwork/java/javase/downloads/index.html\n\n\
 in a web browser and follow the \"Download\" link for \"Java\n\
 Cryptography Extension (JCE) Unlimited Strength Jurisdiction\n\
 Policy Files 6\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
 .endif#}
 .if !defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
-DISTFILE_INSTRUCTIONS += Please open http://java.sun.com/javase/downloads/index.jsp\n\
+DISTFILE_INSTRUCTIONS += Please open http://www.oracle.com/technetwork/java/javase/downloads/index.html\n\
 in a web browser and follow the \"Download\" link for\n\
-\"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
+\"JDK DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
 time zone update file, ${TZUPDATEFILE}.\n\n
 .endif#}
 DISTFILE_INSTRUCTIONS+=Please place the downloaded file(s) in ${DISTDIR}.\n\n
diff --git a/java/diablo-jdk16/distinfo b/java/diablo-jdk16/distinfo
index 9107c8aa3ff1..55adefb3d0d3 100644
--- a/java/diablo-jdk16/distinfo
+++ b/java/diablo-jdk16/distinfo
@@ -8,5 +8,5 @@ SHA256 (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 971a537f8e852166fa94a
 SIZE (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 64093245
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_35-2011b.zip) = 9e7e966082da08842fcdb462ead9ddd789490765bccfd8f03c7fe9fa429a7f99
-SIZE (tzupdater-1_3_35-2011b.zip) = 256834
+SHA256 (tzupdater-1_3_38-2011e.zip) = cfe7683d5721ab322a8e847f741a24f0bf35f5654a8ff86c3e234220f9b770b1
+SIZE (tzupdater-1_3_38-2011e.zip) = 258948
diff --git a/java/diablo-jdk16/pkg-plist b/java/diablo-jdk16/pkg-plist
index c84168f6e244..1dc7ba351d4d 100644
--- a/java/diablo-jdk16/pkg-plist
+++ b/java/diablo-jdk16/pkg-plist
@@ -1945,6 +1945,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Martinique
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mazatlan
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Metlakatla
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Moncton
@@ -1981,6 +1982,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santiago
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santo_Domingo
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Sao_Paulo
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Scoresbysund
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Sitka
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Johns
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Kitts
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/St_Lucia
diff --git a/java/diablo-jre16/Makefile b/java/diablo-jre16/Makefile
index a0ca973d9934..0ada013e6781 100644
--- a/java/diablo-jre16/Makefile
+++ b/java/diablo-jre16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -78,8 +78,8 @@ POLICYFILE=	jce_policy-6.zip
 DISTFILES+=	${POLICYFILE}
 .endif
 
-TZUPDATE_VERSION=	1_3_35
-TZUPDATE_TZVERSION=	2011b
+TZUPDATE_VERSION=	1_3_38
+TZUPDATE_TZVERSION=	2011e
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 .if !defined(WITHOUT_TZUPDATE)
 DISTFILES+=		${TZUPDATEFILE}
@@ -105,15 +105,15 @@ ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n\n
 .endif#}
 .if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
 DISTFILE_INSTRUCTIONS+=Please open\n\n\
-\ \ \ \ http://java.sun.com/javase/downloads/\n\n\
+\ \ \ \ http://www.oracle.com/technetwork/java/javase/downloads/index.html\n\n\
 in a web browser and follow the \"Download\" link for \"Java\n\
 Cryptography Extension (JCE) Unlimited Strength Jurisdiction\n\
 Policy Files 6\" to obtain the JCE policy file, ${POLICYFILE}.\n\n
 .endif#}
 .if !defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})#{
-DISTFILE_INSTRUCTIONS += Please open http://java.sun.com/javase/downloads/index.jsp\n\
+DISTFILE_INSTRUCTIONS += Please open http://www.oracle.com/technetwork/java/javase/downloads/index.html\n\
 in a web browser and follow the \"Download\" link for\n\
-\"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
+\"JDK DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
 time zone update file, ${TZUPDATEFILE}.\n\n
 .endif#}
 DISTFILE_INSTRUCTIONS+=Please place the downloaded file(s) in ${DISTDIR}.\n\n
diff --git a/java/diablo-jre16/distinfo b/java/diablo-jre16/distinfo
index 6513acb1c6cd..00254df13ea6 100644
--- a/java/diablo-jre16/distinfo
+++ b/java/diablo-jre16/distinfo
@@ -8,5 +8,5 @@ SHA256 (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = d4cfbdaa0a8d8f819b54b
 SIZE (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 28718252
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
-SHA256 (tzupdater-1_3_35-2011b.zip) = 9e7e966082da08842fcdb462ead9ddd789490765bccfd8f03c7fe9fa429a7f99
-SIZE (tzupdater-1_3_35-2011b.zip) = 256834
+SHA256 (tzupdater-1_3_38-2011e.zip) = cfe7683d5721ab322a8e847f741a24f0bf35f5654a8ff86c3e234220f9b770b1
+SIZE (tzupdater-1_3_38-2011e.zip) = 258948
diff --git a/java/diablo-jre16/pkg-plist b/java/diablo-jre16/pkg-plist
index 99bccbff0556..8e2aa15b7577 100644
--- a/java/diablo-jre16/pkg-plist
+++ b/java/diablo-jre16/pkg-plist
@@ -355,6 +355,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Martinique
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Mazatlan
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Menominee
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Merida
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Metlakatla
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Mexico_City
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Miquelon
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Moncton
@@ -391,6 +392,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Santiago
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Santo_Domingo
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Sao_Paulo
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Scoresbysund
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Sitka
 diablo-jre%%JRE_VERSION%%/lib/zi/America/St_Johns
 diablo-jre%%JRE_VERSION%%/lib/zi/America/St_Kitts
 diablo-jre%%JRE_VERSION%%/lib/zi/America/St_Lucia