. Add the option to update the time zone files and set it to use the

  current tzupdater (1.3.9-2008g).

3 files changed, 51 insertions, 10 deletions

diff --git a/java/diablo-jdk16/Makefile b/java/diablo-jdk16/Makefile
index 434ebf6be412..234d80b2dc9a 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=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -36,9 +36,8 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}16
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}jdk${JDK_VERSION}_${RELEASE_VERSION}
 NO_BUILD=	yes
 
-OPTIONS=	POLICY	"Install the Unlimited Strength Policy Files" off
-
-POLICYFILE=	jce_policy-6.zip
+OPTIONS=	POLICY	"Install the Unlimited Strength Policy Files" off \
+		TZUPDATE	"Update the time zone data"	on
 
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
@@ -67,12 +66,28 @@ PLIST_SUB+=	CLIENTVM=""
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if defined(WITH_POLICY)
+.if defined(WITH_POLICY) || !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+.endif
+
+POLICYFILE=	jce_policy-6.zip
+.if defined(WITH_POLICY)
 DISTFILES+=	${POLICYFILE}
 .endif
 
-.if !defined(PACKAGE_BUILDING) && defined(JDK_OSREL) && (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})))#{
+TZUPDATE_VERSION=	1_3_9
+TZUPDATE_TZVERSION=	2008g
+TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
+.if !defined(WITHOUT_TZUPDATE)
+DISTFILES+=		${TZUPDATEFILE}
+PLIST_SUB+=		TZORIGINAL="@comment "
+PLIST_SUB+=		TZUPDATE=""
+.else
+PLIST_SUB+=		TZORIGINAL=""
+PLIST_SUB+=		TZUPDATE="@comment "
+.endif
+
+.if !defined(PACKAGE_BUILDING) && defined(JDK_OSREL) && (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})) || (!defined(WITHOUT_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE})))#{
 DISTFILE_INSTRUCTIONS=\n\
 Because of licensing restrictions, you must fetch the distribution\n\
 manually.\n\n
@@ -89,6 +104,12 @@ 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\
+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#}
 DISTFILE_INSTRUCTIONS+=Please place the downloaded file(s) in ${DISTDIR}.\n\n
 .endif#}
 
@@ -98,9 +119,22 @@ pre-fetch:
 	@exit 1
 .endif
 
-.if defined(WITH_POLICY)
 post-extract:
-	@unzip -qo ${DISTDIR}/${POLICYFILE} -d ${WRKDIR}
+.if defined(WITH_POLICY)
+	@${UNZIP_CMD} -qo ${DISTDIR}/${POLICYFILE} -d ${WRKDIR}
+.endif
+.if !defined(WITHOUT_TZUPDATE)
+	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
+	@${UNZIP_CMD} -qo ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -d ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/
+	@${MKDIR} ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi
+	@${UNZIP_CMD} -qo ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/data/tzdata${TZUPDATE_TZVERSION}.zip -d ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi
+
+pre-install:
+	@${ECHO_CMD} -n "Updating time zones..."
+	@${RM} -rf ${WRKSRC}/jre/lib/zi
+	@${MV} -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/jre/lib/
+	@${ECHO_CMD} "done"
+	@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata*
 .endif
 
 do-install:
diff --git a/java/diablo-jdk16/distinfo b/java/diablo-jdk16/distinfo
index 9daffcd1b537..51e96c138b0a 100644
--- a/java/diablo-jdk16/distinfo
+++ b/java/diablo-jdk16/distinfo
@@ -13,3 +13,6 @@ SIZE (diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 64093245
 MD5 (jce_policy-6.zip) = b20f9d6ed14e55d73a5ed204bca01e7a
 SHA256 (jce_policy-6.zip) = d0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262
 SIZE (jce_policy-6.zip) = 9101
+MD5 (tzupdater-1_3_9-2008g.zip) = 3eb68b0297ac359c788f91095688d9b6
+SHA256 (tzupdater-1_3_9-2008g.zip) = 9a84c954c1562df0e17a40cb313556248c2bc609bc995c12e772f7e24773c5d7
+SIZE (tzupdater-1_3_9-2008g.zip) = 264885
diff --git a/java/diablo-jdk16/pkg-plist b/java/diablo-jdk16/pkg-plist
index 0bef2b7a2086..198997cb94af 100644
--- a/java/diablo-jdk16/pkg-plist
+++ b/java/diablo-jdk16/pkg-plist
@@ -1871,6 +1871,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/La_Rioja
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Mendoza
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Rio_Gallegos
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/San_Juan
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/San_Luis
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Tucuman
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Ushuaia
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
@@ -1969,6 +1970,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Recife
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Regina
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Resolute
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Rio_Branco
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Santarem
 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
@@ -2013,7 +2015,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bangkok
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Beirut
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Bishkek
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Brunei
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Calcutta
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Calcutta
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Choibalsan
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Chongqing
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Colombo
@@ -2024,6 +2026,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dubai
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Dushanbe
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Gaza
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Harbin
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ho_Chi_Minh
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk
@@ -2035,6 +2038,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kamchatka
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Karachi
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kashgar
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Katmandu
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kolkata
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Krasnoyarsk
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuala_Lumpur
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Kuching
@@ -2058,7 +2062,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh87
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh88
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Riyadh89
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Saigon
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Saigon
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Sakhalin
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Samarkand
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Seoul