6 files changed, 18 insertions, 14 deletions

diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index 0c7178cc5c3f..61c24752f04b 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=	23
+PORTREVISION=	24
 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_35
-TZUPDATE_TZVERSION=	2011b
+TZUPDATE_VERSION=	1_3_38
+TZUPDATE_TZVERSION=	2011e
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
@@ -87,9 +87,9 @@ with a web browser and \"Accept\" the End User License Agreement for\n\
 ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\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
 .endif
diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo
index 80758b9d9955..0a574ff56267 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_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-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index 9b480fec5a08..93f1ff3f6519 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1771,6 +1771,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
 %%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Moncton
@@ -1807,6 +1808,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-jre15/Makefile b/java/diablo-jre15/Makefile
index afe563cca609..6f3f938b419c 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=	23
+PORTREVISION=	24
 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_35
-TZUPDATE_TZVERSION=	2011b
+TZUPDATE_VERSION=	1_3_38
+TZUPDATE_TZVERSION=	2011e
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
@@ -87,9 +87,9 @@ with a web browser and \"Accept\" the End User License Agreement for\n\
 ${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n\n
 .endif
 .if defined(WITH_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
 .endif
diff --git a/java/diablo-jre15/distinfo b/java/diablo-jre15/distinfo
index 268a35d15ce4..1fc6dc808762 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_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-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index 03343074c413..d661da4d2be5 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -295,6 +295,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
 %%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Moncton
@@ -331,6 +332,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