aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2007-03-05 13:23:34 +0800
committerglewis <glewis@FreeBSD.org>2007-03-05 13:23:34 +0800
commit9b20230364487eb1c4ed93e75dab7ec22d134284 (patch)
treec8279e1b94adcec507b28cbd79a5c546b3b10206 /java
parent446e50ed6fbb6f71ded51a223c40fc32abd8071b (diff)
downloadfreebsd-ports-gnome-9b20230364487eb1c4ed93e75dab7ec22d134284.tar.gz
freebsd-ports-gnome-9b20230364487eb1c4ed93e75dab7ec22d134284.tar.zst
freebsd-ports-gnome-9b20230364487eb1c4ed93e75dab7ec22d134284.zip
. Add a TZUPDATE option, defaulting to on, which will update the time zone
data for the JDK using Sun's tzupdater. Bump PORTREVISION.
Diffstat (limited to 'java')
-rw-r--r--java/diablo-jdk15/Makefile43
-rw-r--r--java/diablo-jdk15/distinfo3
-rw-r--r--java/diablo-jdk15/pkg-plist37
3 files changed, 76 insertions, 7 deletions
diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile
index e9df991dd378..f6cefb696de5 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= 1
+PORTREVISION= 2
CATEGORIES= java devel
MASTER_SITES= #
PKGNAMEPREFIX= diablo-
@@ -35,6 +35,8 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}15
WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}jdk${JDK_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 @@ JDK_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,36 @@ PLIST_SUB+= WEB="@comment "
PLIST_SUB+= CLIENTVM="@comment "
.endif
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
+.if (!exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) || (defined(WITH_TZUPDATE) && !exists(${DISTDIR}/${TZUPDATEFILE}))) && !defined(PACKAGE_BUILDING) && defined(JDK_OSREL)
ECHO_MSG=/usr/bin/printf
IGNORE= :\n\
Because of licensing restrictions, you must fetch the distribution\n\
-manually. Please access\n\
+manually.\n\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\
\"Caffe Diablo ${JDK_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}/jre/lib/zi.tzdata2005n
.endif
do-install:
diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo
index 46c480e74c97..f8c103ac9722 100644
--- a/java/diablo-jdk15/distinfo
+++ b/java/diablo-jdk15/distinfo
@@ -7,3 +7,6 @@ SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
MD5 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = ac3a83b3a52cef7e1727ce32d91574d6
SHA256 (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = fda84f24f4eb489b04ce3185dfe7d70bffbbe624400ae086222a3892cc1ba305
SIZE (diablo-caffe-freebsd5-i386-1.5.0_07-b01.tar.bz2) = 54304946
+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-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index fefbb27d7c88..05ab8275438b 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1635,7 +1635,8 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmara
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
@@ -1699,10 +1700,12 @@ 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
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Atikokan
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bahia
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Blanc-Sablon
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
@@ -1714,7 +1717,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Coral_Harbour
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Coral_Harbour
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
@@ -1743,7 +1746,9 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Indianapolis
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Petersburg
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vincennes
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
@@ -1762,6 +1767,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
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
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
@@ -1772,6 +1778,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/New_Salem
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
@@ -1897,7 +1904,8 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faroe
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
@@ -1908,6 +1916,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Currie
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Eucla
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
@@ -1915,7 +1924,10 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CET
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CST6CDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EET
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST5EDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
@@ -1984,10 +1996,12 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Volgograd
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/GMT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/HST
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
@@ -2000,6 +2014,9 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MET
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST7MDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/PST8PDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
@@ -2038,6 +2055,19 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4ADT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6CDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5EDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/HST10
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7MDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8PDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9YDT
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/WET
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
%%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop
@@ -2329,6 +2359,7 @@ diablo-jdk%%JDK_VERSION%%/src.zip
%%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/%%ARCH%%
%%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop
%%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin
+%%TZUPDATE%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV
@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian
@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe