4 files changed, 81 insertions, 5 deletions

diff --git a/java/diablo-jre16/Makefile b/java/diablo-jre16/Makefile
index 685b6dd4fa4b..827dc9752e03 100644
--- a/java/diablo-jre16/Makefile
+++ b/java/diablo-jre16/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
 DISTNAME=	${PKGNAMEPREFIX}latte-${JRE_OSREL}-${ARCH}-${JRE_VERSION}_${RELEASE_VERSION}-b${BUILD_VERSION}
 EXTRACT_SUFX=	.tar.bz2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Java Runtime Environment ${JRE_VERSION}_${RELEASE_VERSION}.${BUILD_VERSION}
@@ -34,6 +37,9 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}16
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}jre${JRE_VERSION}_${RELEASE_VERSION}
 NO_BUILD=	yes
 
+OPTIONS=	POLICY	"Install the Unlimited Strength Policy Files"	off \
+		TZUPDATE	"Update the time zone data"	on
+
 SUB_FILES+=	pkg-install \
 		pkg-deinstall
 SUB_LIST+=	ARCH="${ARCH}" \
@@ -61,10 +67,32 @@ PLIST_SUB+=	CLIENTVM=""
 PLIST_SUB+=	CLIENTVM="@comment "
 .endif
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) && defined(JRE_OSREL)
+.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
+
+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(JRE_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\
+manually.\n\n
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})#{
 Please access\n\
 \n\
   ${DOWNLOAD_URL}\n\
@@ -72,7 +100,22 @@ Please access\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\n
-.endif
+.endif#}
+.if defined(WITH_POLICY) && !exists(${DISTDIR}/${POLICYFILE})#{
+DISTFILE_INSTRUCTIONS+=Please open\n\n\
+\ \ \ \ http://java.sun.com/javase/downloads/\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\
+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#}
 
 pre-fetch:
 .if defined(DISTFILE_INSTRUCTIONS)
@@ -80,10 +123,33 @@ pre-fetch:
 	@exit 1
 .endif
 
+post-extract:
+.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}/lib/zi
+	@${MV} -f ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/zi ${WRKSRC}/lib/
+	@${ECHO_CMD} "done"
+	@-${RM} -rf ${WRKSRC}/lib/zi.tzdata*
+.endif
+
 do-install:
 	${MKDIR} "${INSTALL_DIR}"
 	cd "${WRKSRC}" && ${FIND} . \
 	  | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} "${INSTALL_DIR}"
+	${INSTALL_DATA} ${FILESDIR}/cacerts \
+		${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}/lib/security/cacerts
+.if defined(WITH_POLICY)
+	${INSTALL_DATA} ${WRKDIR}/jce/*.jar ${PREFIX}/${PKGNAMEPREFIX}jre${JRE_VERSION}/lib/security
+.endif
 
 post-install:
 	# Register the VM
diff --git a/java/diablo-jre16/distinfo b/java/diablo-jre16/distinfo
index c446ef1ff6fe..c87c218b1ae0 100644
--- a/java/diablo-jre16/distinfo
+++ b/java/diablo-jre16/distinfo
@@ -10,3 +10,9 @@ SIZE (diablo-latte-freebsd7-amd64-1.6.0_07-b02.tar.bz2) = 27350295
 MD5 (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 1084a29226718b328193dea07b9efa10
 SHA256 (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = d4cfbdaa0a8d8f819b54b8f4005686ff1a62b59107ef02619fd2366ad0abf4d4
 SIZE (diablo-latte-freebsd7-i386-1.6.0_07-b02.tar.bz2) = 28718252
+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-jre16/files/cacerts b/java/diablo-jre16/files/cacerts
new file mode 100644
index 000000000000..8a77934aaa29
--- /dev/null
+++ b/java/diablo-jre16/files/cacerts
diff --git a/java/diablo-jre16/pkg-plist b/java/diablo-jre16/pkg-plist
index 331d3fa07100..6bd4a931974d 100644
--- a/java/diablo-jre16/pkg-plist
+++ b/java/diablo-jre16/pkg-plist
@@ -281,6 +281,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/La_Rioja
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/Mendoza
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/Rio_Gallegos
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/San_Juan
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Argentina/San_Luis
 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
@@ -379,6 +380,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/America/Recife
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Regina
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Resolute
 diablo-jre%%JRE_VERSION%%/lib/zi/America/Rio_Branco
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/America/Santarem
 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
@@ -423,7 +425,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Bangkok
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Beirut
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Bishkek
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Brunei
-diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Calcutta
+%%TZORIGINAL%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Calcutta
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Choibalsan
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Chongqing
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Colombo
@@ -434,6 +436,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Dubai
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Dushanbe
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Gaza
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Harbin
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Ho_Chi_Minh
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hong_Kong
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Hovd
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Irkutsk
@@ -445,6 +448,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Kamchatka
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Karachi
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Kashgar
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Katmandu
+%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Kolkata
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Krasnoyarsk
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Kuala_Lumpur
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Kuching
@@ -468,7 +472,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Riyadh
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Riyadh87
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Riyadh88
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Riyadh89
-diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Saigon
+%%TZORIGINAL%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Saigon
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Sakhalin
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Samarkand
 diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Seoul