3 files changed, 75 insertions, 7 deletions

diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile
index 6e531559cce0..2f255d08c27b 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=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -35,6 +35,8 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}15
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}jre${JRE_VERSION}_${RELEASE_VERSION}
 NO_BUILD=	yes
 
+OPTIONS=	TZUPDATE	"Update the time zone data"	on
+
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
 PKG_IGNORE_DEPENDS=	'^[^x|^j]'
@@ -51,6 +53,20 @@ JRE_OSREL=freebsd5
 IGNORE=		Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later
 .endif
 
+.if defined(WITH_TZUPDATE)
+EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+TZUPDATE_VERSION=	1.0.1
+TZUPDATE_TZVERSION=	2007a
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION:S/./_/g}.zip
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
+PLIST_SUB+=		TZORIGINAL="@comment "
+PLIST_SUB+=		TZUPDATE=""
+.else
+PLIST_SUB+=		TZORIGINAL=""
+PLIST_SUB+=		TZUPDATE="@comment "
+.endif
+
 .if ${ARCH} == "i386"
 PLIST_SUB+=	WEB=""
 PLIST_SUB+=	CLIENTVM=""
@@ -59,17 +75,35 @@ PLIST_SUB+=	WEB="@comment "
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) && defined(JRE_OSREL)
+.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JRE_OSREL)
 ECHO_MSG=/usr/bin/printf
 IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the distribution\n\
-manually.  Please access\n\
+manually.\n
+.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) 
+IGNORE += Please access\n\
 \n\
   ${DOWNLOAD_URL}\n\
 \n\
 with a web browser and \"Accept\" the End User License Agreement for\n\
 \"Latte Diablo ${JRE_VERSION}\".  Please place the downloaded\n\
-${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n
+${DISTNAME}${EXTRACT_SUFX} in ${DISTDIR}.\n\n
+.endif
+.if defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})
+IGNORE += Please open http://java.sun.com/javase/downloads/index.jsp\n\
+in a web browser and follow the \"Download\" link for\n\
+\"JDK US DST Timezone Update Tool - ${TZUPDATE_VERSION}\" to obtain the\n\
+time zone update file, ${TZUPDATEFILE}.\n\n
+.endif
+.endif
+
+.if defined(WITH_TZUPDATE)
+post-extract:
+	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
+	@# Update time zones
+	@-${WRKSRC}/bin/java -jar \
+		${WRKDIR}/tzupdater${TZUPDATE_TZVERSION}/tzupdater.jar -u
+	@${RM} -rf ${WRKSRC}/lib/zi.tzdata2005n
 .endif
 
 do-install:
diff --git a/java/diablo-jre15/distinfo b/java/diablo-jre15/distinfo
index e137a257db8e..d9ff02128877 100644
--- a/java/diablo-jre15/distinfo
+++ b/java/diablo-jre15/distinfo
@@ -7,3 +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_0_1.zip) = 0f2a4d1321ccf503ebfa73aa4f06b2b4
+SHA256 (tzupdater-1_0_1.zip) = d0ab27a16df850e5a3c26bea927fa3a9ce3f0b6a43c836d43cfbb6dae95df0fe
+SIZE (tzupdater-1_0_1.zip) = 253959
diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist
index eb5c2eb460ea..614bdd734064 100644
--- a/java/diablo-jre15/pkg-plist
+++ b/java/diablo-jre15/pkg-plist
@@ -159,7 +159,8 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Abidjan
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Accra
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Addis_Ababa
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Algiers
-diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Asmera
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Asmara
+%%TZORIGINAL%%diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Asmera
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Bamako
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Bangui
 diablo-jre%%JRE_VERSION%%/lib/zi/Africa/Banjul
@@ -223,10 +224,12 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/Tucuman
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/Ushuaia
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Aruba
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Asuncion
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Atikokan
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Bahia
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Barbados
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Belem
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Belize
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Blanc-Sablon
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Boa_Vista
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Bogota
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Boise
@@ -238,7 +241,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Cayenne
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Cayman
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Chicago
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Chihuahua
-diablo-jre%%JRE_VERSION%%/lib/zi/America/Coral_Harbour
+%%TZORIGINAL%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Coral_Harbour
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Costa_Rica
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Cuiaba
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Curacao
@@ -267,7 +270,9 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Hermosillo
 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
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Vevay
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Indiana/Vincennes
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Inuvik
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Iqaluit
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Jamaica
@@ -286,6 +291,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Menominee
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Merida
 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
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Monterrey
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Montevideo
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Montreal
@@ -296,6 +302,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Nipigon
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Nome
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Noronha
 diablo-jre%%JRE_VERSION%%/lib/zi/America/North_Dakota/Center
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/North_Dakota/New_Salem
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Panama
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Pangnirtung
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Paramaribo
@@ -421,7 +428,8 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Azores
 diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Bermuda
 diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Canary
 diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Cape_Verde
-diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Faeroe
+%%TZORIGINAL%%diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Faeroe
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Faroe
 diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Madeira
 diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/Reykjavik
 diablo-jre%%JRE_VERSION%%/lib/zi/Atlantic/South_Georgia
@@ -432,6 +440,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Brisbane
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Broken_Hill
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Currie
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Darwin
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Eucla
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Hobart
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Lindeman
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Lord_Howe
@@ -439,7 +448,10 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Melbourne
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Perth
 diablo-jre%%JRE_VERSION%%/lib/zi/Australia/Sydney
 diablo-jre%%JRE_VERSION%%/lib/zi/CET
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/CST6CDT
 diablo-jre%%JRE_VERSION%%/lib/zi/EET
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/EST
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/EST5EDT
 diablo-jre%%JRE_VERSION%%/lib/zi/Etc/GMT
 diablo-jre%%JRE_VERSION%%/lib/zi/Etc/GMT+1
 diablo-jre%%JRE_VERSION%%/lib/zi/Etc/GMT+10
@@ -508,10 +520,12 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Uzhgorod
 diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Vaduz
 diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Vienna
 diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Vilnius
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Volgograd
 diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Warsaw
 diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Zaporozhye
 diablo-jre%%JRE_VERSION%%/lib/zi/Europe/Zurich
 diablo-jre%%JRE_VERSION%%/lib/zi/GMT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/HST
 diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Antananarivo
 diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Chagos
 diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Christmas
@@ -524,6 +538,9 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Mauritius
 diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Mayotte
 diablo-jre%%JRE_VERSION%%/lib/zi/Indian/Reunion
 diablo-jre%%JRE_VERSION%%/lib/zi/MET
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/MST
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/MST7MDT
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/PST8PDT
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Apia
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Auckland
 diablo-jre%%JRE_VERSION%%/lib/zi/Pacific/Chatham
@@ -562,6 +579,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
@@ -605,6 +635,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