From 42b90e2beca8af6210dfb0cf24a0e21e8c9dcf1b Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Sat, 3 May 2008 05:16:06 +0000 Subject: . Update to tzupdater 1.3.5. This patch is based on that submitted in the PR but also fixes the packing list and the path to tzupdater and bumps PORTREVISION. PR: 123187 Submitted by: Greg Larkin --- java/diablo-jdk15/Makefile | 8 ++++---- java/diablo-jdk15/distinfo | 6 +++--- java/diablo-jdk15/pkg-plist | 7 +++++-- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'java') diff --git a/java/diablo-jdk15/Makefile b/java/diablo-jdk15/Makefile index 4adc1a0c694d..5362a06f170b 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= 9 +PORTREVISION= 10 CATEGORIES= java devel MASTER_SITES= # PKGNAMEPREFIX= diablo- @@ -58,8 +58,8 @@ IGNORE= Only available for FreeBSD 5.x/i386 and FreeBSD 6.x/amd64 and later .if !defined(WITHOUT_TZUPDATE) EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -TZUPDATE_VERSION= 1.3.3 -TZUPDATE_TZVERSION= 2007k +TZUPDATE_VERSION= 1_3_5 +TZUPDATE_TZVERSION= 2008b TZUPDATEFILE= tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -108,7 +108,7 @@ post-extract: pre-install: @# Update time zones @-${WRKSRC}/bin/java -jar \ - ${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc + ${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc @-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata* .endif diff --git a/java/diablo-jdk15/distinfo b/java/diablo-jdk15/distinfo index e4d568b4710f..1b9d648cd97f 100644 --- a/java/diablo-jdk15/distinfo +++ b/java/diablo-jdk15/distinfo @@ -7,6 +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.3.3-2007k.zip) = beeab3fe5cad31b993197d6e74bacb90 -SHA256 (tzupdater-1.3.3-2007k.zip) = 056d3cb5ff8becb9d37ff0fec0da10fe881f42cc1eedbda3b39f5e2e7c6a8062 -SIZE (tzupdater-1.3.3-2007k.zip) = 263715 +MD5 (tzupdater-1_3_5-2008b.zip) = 139213d195a608d086e1d7eb5b126d81 +SHA256 (tzupdater-1_3_5-2008b.zip) = 841afee8af42299a1dbbcf6b07917b83aef374eb982d7e898acc95700308c62b +SIZE (tzupdater-1_3_5-2008b.zip) = 263679 diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist index 104a5ea97ee2..b04d120f97ae 100644 --- a/java/diablo-jdk15/pkg-plist +++ b/java/diablo-jdk15/pkg-plist @@ -1696,6 +1696,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 @@ -1839,7 +1840,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 @@ -1851,6 +1852,7 @@ 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 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hong_Kong +%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Ho_Chi_Minh diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Hovd diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Irkutsk diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Jakarta @@ -1861,6 +1863,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 @@ -1884,7 +1887,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 -- cgit v1.2.3