diff --git a/misc/global-tz/Makefile b/misc/global-tz/Makefile index 2fa87fb6995a..0bf7714b3b84 100644 --- a/misc/global-tz/Makefile +++ b/misc/global-tz/Makefile @@ -1,80 +1,80 @@ PORTNAME= global-tz -DISTVERSION= 2025bgtz +DISTVERSION= 2026agtz CATEGORIES= misc MASTER_SITES= https://github.com/JodaOrg/${PORTNAME}/releases/download/${DISTVERSION}/:tzdata \ https://raw.githubusercontent.com/JodaOrg/${PORTNAME}/${DISTVERSION}/:tab DISTNAME= tzdata${DISTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:tzdata \ zone1970.tab:tab DIST_SUBDIR= ${DISTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= philip@FreeBSD.org COMMENT= Fork of the IANA Time Zone Database with expanded pre-1970 data WWW= https://github.com/JodaOrg/global-tz LICENSE= PD NO_WRKSUBDIR= yes PREFIX= /usr DATADIR= ${PREFIX}/share/zoneinfo NO_ARCH= yes TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica backward POSIXRULES= America/New_York # XXX The global-tz distribution omits the zone1970.tab file, precluding # it from being a drop-in replacement for the IANA Time Zone Database. post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/zone1970.tab ${WRKSRC} # tzsetup objects (fatally) if any entry in zone.tab or zone1970.tab # refers to a country code that doesn't exist in misc/iso3166. While # arguably that should be fixed, for compatibility we remove such # entries here to avoid the problem. # # This used to be done by adding patch files for each country to # remove, but that doesn't work for zone1970.tab. # # We generate a list of all 2-letter codes that are NOT in iso3166; # then, for any entry in zone.tab or zone1970.tab that contains a bad # code: first emit a commented-out version of the line, then a version # with the bad codes stripped out of the first field (unless this # leaves the first field empty). post-patch: cd ${WRKSRC}; \ badc=$$(${AWK} '/^[^\#]/ { t[$$1]=1; }; \ END { for (i=0; i<676; ++i) { \ c = sprintf("%c%c", 65+int(i/26), 65+(i%26)); \ if (!(c in t)) print c; \ } \ }' \ /usr/share/misc/iso3166 | \ ${SED} -n -e '1h; 1!H; $${g;s/\n/|/g;p;}'); \ for fn in zone.tab zone1970.tab; do \ ${MV} $${fn} $${fn}.bak; \ ${AWK} -v FS="\t" -v OFS="\t" -v re="(^|,)($${badc})" \ '/^[^#]/ && $$1 ~ re { \ print "#" $$0; \ gsub(re,"",$$1); \ sub(/^,/,"",$$1); \ }; \ $$1 != "" { print; }' <$${fn}.bak >$${fn}; \ done do-build: umask 022; \ cd ${WRKSRC}; \ zic -d ${WRKSRC}/zoneinfo -p ${POSIXRULES} -m ${NOBINMODE} \ -y ${.OBJDIR}/yearistype ${TZFILES} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/zoneinfo (cd ${WRKSRC}/zoneinfo && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/zoneinfo) ${INSTALL_DATA} ${WRKSRC}/zone.tab ${STAGEDIR}${PREFIX}/share/zoneinfo ${INSTALL_DATA} ${WRKSRC}/zone1970.tab ${STAGEDIR}${PREFIX}/share/zoneinfo .include diff --git a/misc/global-tz/distinfo b/misc/global-tz/distinfo index 6c78dbb4e1c8..a5a0a2b9eb75 100644 --- a/misc/global-tz/distinfo +++ b/misc/global-tz/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1743740958 -SHA256 (tzdata2025bgtz/tzdata2025bgtz.tar.gz) = dac024fdd34c85f2f74f1a4f2c45c21baa94ec60787de14c4808ce87b5011115 -SIZE (tzdata2025bgtz/tzdata2025bgtz.tar.gz) = 463989 -SHA256 (tzdata2025bgtz/zone1970.tab) = 57194e43b001b8f832987b21b82953d997aeeaebeb53a8520140bc12d7d8cfcc -SIZE (tzdata2025bgtz/zone1970.tab) = 17597 +TIMESTAMP = 1774074473 +SHA256 (tzdata2026agtz/tzdata2026agtz.tar.gz) = 793b85e7fc68bc5a62e35546b574202739526bcdcc99114cca8433e16f3ff591 +SIZE (tzdata2026agtz/tzdata2026agtz.tar.gz) = 471423 +SHA256 (tzdata2026agtz/zone1970.tab) = e9d9fe30942a880f756b73f649667d8647a1ecf2131149445d9cc24c65e4ee8f +SIZE (tzdata2026agtz/zone1970.tab) = 17605 diff --git a/misc/global-tz/files/patch-zone1970.tab b/misc/global-tz/files/patch-zone1970.tab deleted file mode 100644 index 5d285cc7b189..000000000000 --- a/misc/global-tz/files/patch-zone1970.tab +++ /dev/null @@ -1,12 +0,0 @@ ---- zone1970.tab.orig 2019-06-22 19:39:01 UTC -+++ zone1970.tab -@@ -9,7 +9,8 @@ - # UTF-8 encoding. The columns of the table are as follows: - # - # 1. The countries that overlap the timezone, as a comma-separated list --# of ISO 3166 2-character country codes. See the file 'iso3166.tab'. -+# of ISO 3166 2-character country codes. -+# See the file '/usr/share/misc/iso3166'. - # 2. Latitude and longitude of the timezone's principal location - # in ISO 6709 sign-degrees-minutes-seconds format, - # either ±DDMM±DDDMM or ±DDMMSS±DDDMMSS,