Index: misc/zoneinfo/Makefile =================================================================== --- misc/zoneinfo/Makefile +++ misc/zoneinfo/Makefile @@ -3,6 +3,7 @@ PORTNAME= zoneinfo DISTVERSION= 2020a +PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= https://data.iana.org/time-zones/releases/ \ ftp://ftp.iana.org/tz/releases/ @@ -17,21 +18,26 @@ PREFIX= /usr NO_ARCH= yes -OPTIONS_DEFINE= BACKWARD -OPTIONS_DEFAULT= +OPTIONS_DEFINE= BACKWARD BACKWARD20 +OPTIONS_DEFAULT=BACKWARD OPTIONS_SUB= yes -BACKWARD_DESC= Include backwards compatible zones +BACKWARD_DESC= Include recent backwards compatible zones BACKWARD_VARS= tzfiles+=backward +BACKWARD20_DESC=Include ancient backwards compatible zones +BACKWARD20_IMPLIES=BACKWARD + TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica systemv POSIXRULES= America/New_York -# Run both of: -# "make DEVELOPER=1 WITHOUT=BACKWARD do-clean test-pkgplist" +# Run all of: +# make DEVELOPER=1 WITHOUT="BACKWARD BACKWARD20" do-clean test-pkgplist +# and +# make DEVELOPER=1 WITH=BACKWARD WITHOUT=BACKWARD20 do-clean test-pkgplist # and -# "make DEVELOPER=1 WITH=BACKWARD do-clean test-pkgplist" +# make DEVELOPER=1 WITH=BACKWARD20 do-clean test-pkgplist # before commiting! # Make sure it breaks when the distfile isn't there anymore. @@ -74,6 +80,17 @@ $$1 != "" { print; }' <$${fn}.bak >$${fn}; \ done +# Unless BACKWARD20 is on, remove everything from "backward" that is also +# in the files/backward-exclude file, plus the "UCT" zones. + +post-patch-BACKWARD20-off: + cd ${WRKSRC}; \ + ${AWK} 'BEGIN { ex["UCT"] = 1; ex["Etc/UCT"] = 1; }; \ + FILENAME ~ /-exclude$$/ && /^Link/ { ex[$$3] = 1; }; \ + FILENAME ~ /backward$$/ && (!/^Link/ || !ex[$$3]) { print; }' \ + ${FILESDIR}/backward-exclude backward >backward.patched \ + && ${MV} backward.patched backward + do-build: umask 022; \ cd ${WRKSRC}; \ Index: misc/zoneinfo/files/backward-exclude =================================================================== --- /dev/null +++ misc/zoneinfo/files/backward-exclude @@ -0,0 +1,83 @@ +# This file is a copy of a 2000 version of "backward" + +Link America/Adak America/Atka +Link America/Tijuana America/Ensenada +Link America/Indianapolis America/Fort_Wayne +Link America/Indiana/Knox America/Knox_IN +Link America/St_Thomas America/Virgin +Link Asia/Jerusalem Asia/Tel_Aviv +Link Asia/Ulaanbaatar Asia/Ulan_Bator +Link Australia/Sydney Australia/ACT +Link Australia/Sydney Australia/Canberra +Link Australia/Lord_Howe Australia/LHI +Link Australia/Sydney Australia/NSW +Link Australia/Darwin Australia/North +Link Australia/Brisbane Australia/Queensland +Link Australia/Adelaide Australia/South +Link Australia/Hobart Australia/Tasmania +Link Australia/Melbourne Australia/Victoria +Link Australia/Perth Australia/West +Link Australia/Broken_Hill Australia/Yancowinna +Link America/Porto_Acre Brazil/Acre +Link America/Noronha Brazil/DeNoronha +Link America/Sao_Paulo Brazil/East +Link America/Manaus Brazil/West +Link America/Halifax Canada/Atlantic +Link America/Winnipeg Canada/Central +Link America/Regina Canada/East-Saskatchewan +Link America/Montreal Canada/Eastern +Link America/Edmonton Canada/Mountain +Link America/St_Johns Canada/Newfoundland +Link America/Vancouver Canada/Pacific +Link America/Regina Canada/Saskatchewan +Link America/Whitehorse Canada/Yukon +Link America/Santiago Chile/Continental +Link Pacific/Easter Chile/EasterIsland +Link America/Havana Cuba +Link Africa/Cairo Egypt +Link Europe/Dublin Eire +Link Europe/London GB +Link Europe/London GB-Eire +Link Etc/GMT+0 GMT+0 +Link Etc/GMT-0 GMT-0 +Link Etc/GMT0 GMT0 +Link Etc/Greenwich Greenwich +Link Asia/Hong_Kong Hongkong +Link Atlantic/Reykjavik Iceland +Link Asia/Tehran Iran +Link Asia/Jerusalem Israel +Link America/Jamaica Jamaica +Link Asia/Tokyo Japan +Link Pacific/Kwajalein Kwajalein +Link Africa/Tripoli Libya +Link America/Tijuana Mexico/BajaNorte +Link America/Mazatlan Mexico/BajaSur +Link America/Mexico_City Mexico/General +Link America/Denver Navajo +Link Pacific/Auckland NZ +Link Pacific/Chatham NZ-CHAT +Link Pacific/Pago_Pago Pacific/Samoa +Link Asia/Shanghai PRC +Link Europe/Warsaw Poland +Link Europe/Lisbon Portugal +Link Asia/Taipei ROC +Link Asia/Seoul ROK +Link Asia/Singapore Singapore +Link Europe/Istanbul Turkey +Link Etc/UCT UCT +Link America/Anchorage US/Alaska +Link America/Adak US/Aleutian +Link America/Phoenix US/Arizona +Link America/Chicago US/Central +Link America/Indianapolis US/East-Indiana +Link America/New_York US/Eastern +Link Pacific/Honolulu US/Hawaii +Link America/Indiana/Knox US/Indiana-Starke +Link America/Detroit US/Michigan +Link America/Denver US/Mountain +Link America/Los_Angeles US/Pacific +Link Pacific/Pago_Pago US/Samoa +Link Etc/UTC UTC +Link Etc/Universal Universal +Link Europe/Moscow W-SU +Link Etc/Zulu Zulu Index: misc/zoneinfo/pkg-plist =================================================================== --- misc/zoneinfo/pkg-plist +++ misc/zoneinfo/pkg-plist @@ -479,17 +479,13 @@ %%BACKWARD%%%%DATADIR%%/Africa/Asmera %%BACKWARD%%%%DATADIR%%/Africa/Timbuktu %%BACKWARD%%%%DATADIR%%/America/Argentina/ComodRivadavia -%%BACKWARD%%%%DATADIR%%/America/Atka %%BACKWARD%%%%DATADIR%%/America/Buenos_Aires %%BACKWARD%%%%DATADIR%%/America/Catamarca %%BACKWARD%%%%DATADIR%%/America/Coral_Harbour %%BACKWARD%%%%DATADIR%%/America/Cordoba -%%BACKWARD%%%%DATADIR%%/America/Ensenada -%%BACKWARD%%%%DATADIR%%/America/Fort_Wayne %%BACKWARD%%%%DATADIR%%/America/Godthab %%BACKWARD%%%%DATADIR%%/America/Indianapolis %%BACKWARD%%%%DATADIR%%/America/Jujuy -%%BACKWARD%%%%DATADIR%%/America/Knox_IN %%BACKWARD%%%%DATADIR%%/America/Louisville %%BACKWARD%%%%DATADIR%%/America/Mendoza %%BACKWARD%%%%DATADIR%%/America/Montreal @@ -497,7 +493,6 @@ %%BACKWARD%%%%DATADIR%%/America/Rosario %%BACKWARD%%%%DATADIR%%/America/Santa_Isabel %%BACKWARD%%%%DATADIR%%/America/Shiprock -%%BACKWARD%%%%DATADIR%%/America/Virgin %%BACKWARD%%%%DATADIR%%/Antarctica/South_Pole %%BACKWARD%%%%DATADIR%%/Asia/Ashkhabad %%BACKWARD%%%%DATADIR%%/Asia/Calcutta @@ -510,88 +505,93 @@ %%BACKWARD%%%%DATADIR%%/Asia/Macao %%BACKWARD%%%%DATADIR%%/Asia/Rangoon %%BACKWARD%%%%DATADIR%%/Asia/Saigon -%%BACKWARD%%%%DATADIR%%/Asia/Tel_Aviv %%BACKWARD%%%%DATADIR%%/Asia/Thimbu %%BACKWARD%%%%DATADIR%%/Asia/Ujung_Pandang -%%BACKWARD%%%%DATADIR%%/Asia/Ulan_Bator %%BACKWARD%%%%DATADIR%%/Atlantic/Faeroe %%BACKWARD%%%%DATADIR%%/Atlantic/Jan_Mayen -%%BACKWARD%%%%DATADIR%%/Australia/ACT -%%BACKWARD%%%%DATADIR%%/Australia/Canberra -%%BACKWARD%%%%DATADIR%%/Australia/LHI -%%BACKWARD%%%%DATADIR%%/Australia/NSW -%%BACKWARD%%%%DATADIR%%/Australia/North -%%BACKWARD%%%%DATADIR%%/Australia/Queensland -%%BACKWARD%%%%DATADIR%%/Australia/South -%%BACKWARD%%%%DATADIR%%/Australia/Tasmania -%%BACKWARD%%%%DATADIR%%/Australia/Victoria -%%BACKWARD%%%%DATADIR%%/Australia/West -%%BACKWARD%%%%DATADIR%%/Australia/Yancowinna -%%BACKWARD%%%%DATADIR%%/Brazil/Acre -%%BACKWARD%%%%DATADIR%%/Brazil/DeNoronha -%%BACKWARD%%%%DATADIR%%/Brazil/East -%%BACKWARD%%%%DATADIR%%/Brazil/West -%%BACKWARD%%%%DATADIR%%/Canada/Atlantic -%%BACKWARD%%%%DATADIR%%/Canada/Central -%%BACKWARD%%%%DATADIR%%/Canada/Eastern -%%BACKWARD%%%%DATADIR%%/Canada/Mountain -%%BACKWARD%%%%DATADIR%%/Canada/Newfoundland -%%BACKWARD%%%%DATADIR%%/Canada/Pacific -%%BACKWARD%%%%DATADIR%%/Canada/Saskatchewan -%%BACKWARD%%%%DATADIR%%/Canada/Yukon -%%BACKWARD%%%%DATADIR%%/Chile/Continental -%%BACKWARD%%%%DATADIR%%/Chile/EasterIsland -%%BACKWARD%%%%DATADIR%%/Cuba -%%BACKWARD%%%%DATADIR%%/Egypt -%%BACKWARD%%%%DATADIR%%/Eire -%%BACKWARD%%%%DATADIR%%/Etc/UCT %%BACKWARD%%%%DATADIR%%/Europe/Belfast %%BACKWARD%%%%DATADIR%%/Europe/Tiraspol -%%BACKWARD%%%%DATADIR%%/GB -%%BACKWARD%%%%DATADIR%%/GB-Eire -%%BACKWARD%%%%DATADIR%%/GMT+0 -%%BACKWARD%%%%DATADIR%%/GMT-0 -%%BACKWARD%%%%DATADIR%%/GMT0 -%%BACKWARD%%%%DATADIR%%/Greenwich -%%BACKWARD%%%%DATADIR%%/Hongkong -%%BACKWARD%%%%DATADIR%%/Iceland -%%BACKWARD%%%%DATADIR%%/Iran -%%BACKWARD%%%%DATADIR%%/Israel -%%BACKWARD%%%%DATADIR%%/Jamaica -%%BACKWARD%%%%DATADIR%%/Japan -%%BACKWARD%%%%DATADIR%%/Kwajalein -%%BACKWARD%%%%DATADIR%%/Libya -%%BACKWARD%%%%DATADIR%%/Mexico/BajaNorte -%%BACKWARD%%%%DATADIR%%/Mexico/BajaSur -%%BACKWARD%%%%DATADIR%%/Mexico/General -%%BACKWARD%%%%DATADIR%%/NZ -%%BACKWARD%%%%DATADIR%%/NZ-CHAT -%%BACKWARD%%%%DATADIR%%/Navajo -%%BACKWARD%%%%DATADIR%%/PRC %%BACKWARD%%%%DATADIR%%/Pacific/Johnston %%BACKWARD%%%%DATADIR%%/Pacific/Ponape -%%BACKWARD%%%%DATADIR%%/Pacific/Samoa %%BACKWARD%%%%DATADIR%%/Pacific/Truk %%BACKWARD%%%%DATADIR%%/Pacific/Yap -%%BACKWARD%%%%DATADIR%%/Poland -%%BACKWARD%%%%DATADIR%%/Portugal -%%BACKWARD%%%%DATADIR%%/ROC -%%BACKWARD%%%%DATADIR%%/ROK -%%BACKWARD%%%%DATADIR%%/Singapore -%%BACKWARD%%%%DATADIR%%/Turkey -%%BACKWARD%%%%DATADIR%%/UCT -%%BACKWARD%%%%DATADIR%%/US/Alaska -%%BACKWARD%%%%DATADIR%%/US/Aleutian -%%BACKWARD%%%%DATADIR%%/US/Arizona -%%BACKWARD%%%%DATADIR%%/US/Central -%%BACKWARD%%%%DATADIR%%/US/East-Indiana -%%BACKWARD%%%%DATADIR%%/US/Eastern -%%BACKWARD%%%%DATADIR%%/US/Hawaii -%%BACKWARD%%%%DATADIR%%/US/Indiana-Starke -%%BACKWARD%%%%DATADIR%%/US/Michigan -%%BACKWARD%%%%DATADIR%%/US/Mountain -%%BACKWARD%%%%DATADIR%%/US/Pacific -%%BACKWARD%%%%DATADIR%%/US/Samoa -%%BACKWARD%%%%DATADIR%%/Universal -%%BACKWARD%%%%DATADIR%%/W-SU -%%BACKWARD%%%%DATADIR%%/Zulu +%%BACKWARD20%%%%DATADIR%%/America/Atka +%%BACKWARD20%%%%DATADIR%%/America/Ensenada +%%BACKWARD20%%%%DATADIR%%/America/Fort_Wayne +%%BACKWARD20%%%%DATADIR%%/America/Knox_IN +%%BACKWARD20%%%%DATADIR%%/America/Virgin +%%BACKWARD20%%%%DATADIR%%/Asia/Tel_Aviv +%%BACKWARD20%%%%DATADIR%%/Asia/Ulan_Bator +%%BACKWARD20%%%%DATADIR%%/Australia/ACT +%%BACKWARD20%%%%DATADIR%%/Australia/Canberra +%%BACKWARD20%%%%DATADIR%%/Australia/LHI +%%BACKWARD20%%%%DATADIR%%/Australia/NSW +%%BACKWARD20%%%%DATADIR%%/Australia/North +%%BACKWARD20%%%%DATADIR%%/Australia/Queensland +%%BACKWARD20%%%%DATADIR%%/Australia/South +%%BACKWARD20%%%%DATADIR%%/Australia/Tasmania +%%BACKWARD20%%%%DATADIR%%/Australia/Victoria +%%BACKWARD20%%%%DATADIR%%/Australia/West +%%BACKWARD20%%%%DATADIR%%/Australia/Yancowinna +%%BACKWARD20%%%%DATADIR%%/Brazil/Acre +%%BACKWARD20%%%%DATADIR%%/Brazil/DeNoronha +%%BACKWARD20%%%%DATADIR%%/Brazil/East +%%BACKWARD20%%%%DATADIR%%/Brazil/West +%%BACKWARD20%%%%DATADIR%%/Canada/Atlantic +%%BACKWARD20%%%%DATADIR%%/Canada/Central +%%BACKWARD20%%%%DATADIR%%/Canada/Eastern +%%BACKWARD20%%%%DATADIR%%/Canada/Mountain +%%BACKWARD20%%%%DATADIR%%/Canada/Newfoundland +%%BACKWARD20%%%%DATADIR%%/Canada/Pacific +%%BACKWARD20%%%%DATADIR%%/Canada/Saskatchewan +%%BACKWARD20%%%%DATADIR%%/Canada/Yukon +%%BACKWARD20%%%%DATADIR%%/Chile/Continental +%%BACKWARD20%%%%DATADIR%%/Chile/EasterIsland +%%BACKWARD20%%%%DATADIR%%/Cuba +%%BACKWARD20%%%%DATADIR%%/Egypt +%%BACKWARD20%%%%DATADIR%%/Eire +%%BACKWARD20%%%%DATADIR%%/Etc/UCT +%%BACKWARD20%%%%DATADIR%%/GB +%%BACKWARD20%%%%DATADIR%%/GB-Eire +%%BACKWARD20%%%%DATADIR%%/GMT+0 +%%BACKWARD20%%%%DATADIR%%/GMT-0 +%%BACKWARD20%%%%DATADIR%%/GMT0 +%%BACKWARD20%%%%DATADIR%%/Greenwich +%%BACKWARD20%%%%DATADIR%%/Hongkong +%%BACKWARD20%%%%DATADIR%%/Iceland +%%BACKWARD20%%%%DATADIR%%/Iran +%%BACKWARD20%%%%DATADIR%%/Israel +%%BACKWARD20%%%%DATADIR%%/Jamaica +%%BACKWARD20%%%%DATADIR%%/Japan +%%BACKWARD20%%%%DATADIR%%/Kwajalein +%%BACKWARD20%%%%DATADIR%%/Libya +%%BACKWARD20%%%%DATADIR%%/Mexico/BajaNorte +%%BACKWARD20%%%%DATADIR%%/Mexico/BajaSur +%%BACKWARD20%%%%DATADIR%%/Mexico/General +%%BACKWARD20%%%%DATADIR%%/NZ +%%BACKWARD20%%%%DATADIR%%/NZ-CHAT +%%BACKWARD20%%%%DATADIR%%/Navajo +%%BACKWARD20%%%%DATADIR%%/PRC +%%BACKWARD20%%%%DATADIR%%/Pacific/Samoa +%%BACKWARD20%%%%DATADIR%%/Poland +%%BACKWARD20%%%%DATADIR%%/Portugal +%%BACKWARD20%%%%DATADIR%%/ROC +%%BACKWARD20%%%%DATADIR%%/ROK +%%BACKWARD20%%%%DATADIR%%/Singapore +%%BACKWARD20%%%%DATADIR%%/Turkey +%%BACKWARD20%%%%DATADIR%%/UCT +%%BACKWARD20%%%%DATADIR%%/US/Alaska +%%BACKWARD20%%%%DATADIR%%/US/Aleutian +%%BACKWARD20%%%%DATADIR%%/US/Arizona +%%BACKWARD20%%%%DATADIR%%/US/Central +%%BACKWARD20%%%%DATADIR%%/US/East-Indiana +%%BACKWARD20%%%%DATADIR%%/US/Eastern +%%BACKWARD20%%%%DATADIR%%/US/Hawaii +%%BACKWARD20%%%%DATADIR%%/US/Indiana-Starke +%%BACKWARD20%%%%DATADIR%%/US/Michigan +%%BACKWARD20%%%%DATADIR%%/US/Mountain +%%BACKWARD20%%%%DATADIR%%/US/Pacific +%%BACKWARD20%%%%DATADIR%%/US/Samoa +%%BACKWARD20%%%%DATADIR%%/Universal +%%BACKWARD20%%%%DATADIR%%/W-SU +%%BACKWARD20%%%%DATADIR%%/Zulu