. 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.
This commit is contained in:
parent
049bbfcaa6
commit
d84b40aded
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=249631
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= jdk
|
||||
PORTVERSION= ${JDK_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(WITHOUT_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}
|
||||
@ -103,11 +103,14 @@ pre-fetch:
|
||||
.if !defined(WITHOUT_TZUPDATE)
|
||||
post-extract:
|
||||
@${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}/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
|
||||
|
@ -4,6 +4,6 @@ SIZE (diablo-caffe-freebsd6-amd64-1.5.0_07-b01.tar.bz2) = 46868094
|
||||
MD5 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 611e29db0b841d8c1cd170582946a666
|
||||
SHA256 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
|
||||
SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
|
||||
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
|
||||
|
@ -1877,6 +1877,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Makassar
|
||||
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Manila
|
||||
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Muscat
|
||||
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Nicosia
|
||||
%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novokuznetsk
|
||||
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Novosibirsk
|
||||
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Omsk
|
||||
diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Asia/Oral
|
||||
@ -1935,6 +1936,7 @@ 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
|
||||
@ -2009,6 +2011,7 @@ 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
|
||||
@ -2021,6 +2024,7 @@ 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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user