diff options
| author | glewis <glewis@FreeBSD.org> | 2010-02-12 10:40:58 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2010-02-12 10:40:58 +0800 |
| commit | 7cd8be38a13bf7444d7f4ff8eb7c6f4abd8f1aa5 (patch) | |
| tree | 3cee002f82f82991e13d8ab07024505e0cab0c02 /java/diablo-jre15 | |
| parent | df76f17b5d40ddab8d5ac97b97d8995b72b1f7a5 (diff) | |
| download | freebsd-ports-gnome-7cd8be38a13bf7444d7f4ff8eb7c6f4abd8f1aa5.tar.gz freebsd-ports-gnome-7cd8be38a13bf7444d7f4ff8eb7c6f4abd8f1aa5.tar.zst freebsd-ports-gnome-7cd8be38a13bf7444d7f4ff8eb7c6f4abd8f1aa5.zip | |
. Update to tzupdater 1.3.25.
. Switch to installing the timezone updates by just copying over the
zoneinfo files rather than actually the running updater (this is
consistent with the diablo-{jdk,jre}16 ports.
Diffstat (limited to 'java/diablo-jre15')
| -rw-r--r-- | java/diablo-jre15/Makefile | 17 | ||||
| -rw-r--r-- | java/diablo-jre15/distinfo | 6 | ||||
| -rw-r--r-- | java/diablo-jre15/pkg-plist | 4 |
3 files changed, 17 insertions, 10 deletions
diff --git a/java/diablo-jre15/Makefile b/java/diablo-jre15/Makefile index 09c7fe104969..e7971543a6fe 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= 17 +PORTREVISION= 18 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_21 -TZUPDATE_TZVERSION= 2009p +TZUPDATE_VERSION= 1_3_25 +TZUPDATE_TZVERSION= 2009u TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -100,16 +100,19 @@ pre-fetch: @exit 1 .endif -.if defined(WITH_TZUPDATE) post-extract: +.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..." - @${WRKSRC}/bin/java -jar \ - ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc + @${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* + @-${RM} -rf ${WRKSRC}/lib/zi.tzdata* .endif do-install: diff --git a/java/diablo-jre15/distinfo b/java/diablo-jre15/distinfo index ee4ade12c57a..31484f9b5adc 100644 --- a/java/diablo-jre15/distinfo +++ b/java/diablo-jre15/distinfo @@ -4,6 +4,6 @@ SIZE (diablo-latte-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 20580050 MD5 (diablo-latte-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 4ab052253faf251129737e999916de1b 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 -MD5 (tzupdater-1_3_21-2009p.zip) = cf2c40eddbe989efb16d00e1f6df5946 -SHA256 (tzupdater-1_3_21-2009p.zip) = 55d84dd5723b3d355de8d505d15d97c2d1b0d1cbed5e3273fec7a4f8b57e8d3f -SIZE (tzupdater-1_3_21-2009p.zip) = 261418 +MD5 (tzupdater-1_3_25-2009u.zip) = 13d0dc6d3de7f4c5112913755281c0c0 +SHA256 (tzupdater-1_3_25-2009u.zip) = b2440ceffc322496546be0384a29bfc6322b290cdc1ef82ce363d742bcc357cc +SIZE (tzupdater-1_3_25-2009u.zip) = 485247 diff --git a/java/diablo-jre15/pkg-plist b/java/diablo-jre15/pkg-plist index 6a8682a01920..31344bcd7fe5 100644 --- a/java/diablo-jre15/pkg-plist +++ b/java/diablo-jre15/pkg-plist @@ -401,6 +401,7 @@ diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Makassar diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Manila diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Muscat diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Nicosia +%%TZUPDATE%%diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Novokuznetsk diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Novosibirsk diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Omsk diablo-jre%%JRE_VERSION%%/lib/zi/Asia/Oral @@ -459,6 +460,7 @@ 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 @@ -533,6 +535,7 @@ 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 @@ -545,6 +548,7 @@ 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 |