Update to 2006k

3 files changed, 358 insertions, 338 deletions

diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index 234f1b6d057d..20e257991323 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneinfo
-DISTVERSION=	2006g
+DISTVERSION=	2006k
 CATEGORIES=	misc
 MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
 DISTNAME=	tzdata${DISTVERSION}
@@ -31,7 +31,22 @@ NO_PACKAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-EXTRA_PATCHES=	${FILESDIR}/patch4-zone.tab
+EXTRA_PATCHES+=	${FILESDIR}/patch4-zone.tab
+.endif
+
+HAS_GG!=	${GREP} -c ^GG /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_GG} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-gg
+.endif
+
+HAS_IM!=	${GREP} -c ^IM /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_IM} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-im
+.endif
+
+HAS_JE!=	${GREP} -c ^JE /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_JE} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-je
 .endif
 
 do-build:
diff --git a/misc/zoneinfo/distinfo b/misc/zoneinfo/distinfo
index d43ac7c6f43d..1afc0f68597c 100644
--- a/misc/zoneinfo/distinfo
+++ b/misc/zoneinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (tzdata2006g.tar.gz) = fed13df17e2e386f4c31b0962d3ed356
-SHA256 (tzdata2006g.tar.gz) = 028a5d8bc3771876cf43b497e8b8691acae8263af34b0a8de3e014f01a5558d0
-SIZE (tzdata2006g.tar.gz) = 153042
+MD5 (tzdata2006k.tar.gz) = a7a5f3b147ed6d3c0d31cd9fc2563caf
+SHA256 (tzdata2006k.tar.gz) = 2d74ecaedd4a8b8c5ee6d74b7fe776ddf5f73fbb6cb39718d3d677d49fba99a5
+SIZE (tzdata2006k.tar.gz) = 156379
diff --git a/misc/zoneinfo/pkg-plist b/misc/zoneinfo/pkg-plist
index 85de4bcc8fa1..300dd5f9d523 100644
--- a/misc/zoneinfo/pkg-plist
+++ b/misc/zoneinfo/pkg-plist
@@ -1,310 +1,304 @@
-share/zoneinfo/Africa/Ceuta
-share/zoneinfo/Africa/Luanda
-share/zoneinfo/Africa/Porto-Novo
-share/zoneinfo/Africa/Gaborone
-share/zoneinfo/Africa/Ouagadougou
-share/zoneinfo/Africa/Bujumbura
-share/zoneinfo/Africa/Douala
-share/zoneinfo/Africa/Bangui
-share/zoneinfo/Africa/Ndjamena
-share/zoneinfo/Africa/Kinshasa
-share/zoneinfo/Africa/Lubumbashi
-share/zoneinfo/Africa/Brazzaville
 share/zoneinfo/Africa/Abidjan
-share/zoneinfo/Africa/Djibouti
-share/zoneinfo/Africa/Cairo
-share/zoneinfo/Africa/Malabo
-share/zoneinfo/Africa/Asmera
+share/zoneinfo/Africa/Accra
 share/zoneinfo/Africa/Addis_Ababa
-share/zoneinfo/Africa/Libreville
+share/zoneinfo/Africa/Algiers
+share/zoneinfo/Africa/Asmera
+share/zoneinfo/Africa/Bamako
+share/zoneinfo/Africa/Bangui
 share/zoneinfo/Africa/Banjul
-share/zoneinfo/Africa/Accra
-share/zoneinfo/Africa/Conakry
 share/zoneinfo/Africa/Bissau
-share/zoneinfo/Africa/Nairobi
-share/zoneinfo/Africa/Maseru
-share/zoneinfo/Africa/Monrovia
-share/zoneinfo/Africa/Tripoli
 share/zoneinfo/Africa/Blantyre
-share/zoneinfo/Africa/Bamako
-share/zoneinfo/Africa/Nouakchott
+share/zoneinfo/Africa/Brazzaville
+share/zoneinfo/Africa/Bujumbura
+share/zoneinfo/Africa/Cairo
 share/zoneinfo/Africa/Casablanca
-share/zoneinfo/Africa/El_Aaiun
-share/zoneinfo/Africa/Maputo
-share/zoneinfo/Africa/Windhoek
-share/zoneinfo/Africa/Niamey
-share/zoneinfo/Africa/Lagos
-share/zoneinfo/Africa/Kigali
-share/zoneinfo/Africa/Sao_Tome
+share/zoneinfo/Africa/Ceuta
+share/zoneinfo/Africa/Conakry
 share/zoneinfo/Africa/Dakar
+share/zoneinfo/Africa/Dar_es_Salaam
+share/zoneinfo/Africa/Djibouti
+share/zoneinfo/Africa/Douala
+share/zoneinfo/Africa/El_Aaiun
 share/zoneinfo/Africa/Freetown
-share/zoneinfo/Africa/Mogadishu
+share/zoneinfo/Africa/Gaborone
+share/zoneinfo/Africa/Harare
 share/zoneinfo/Africa/Johannesburg
+share/zoneinfo/Africa/Kampala
 share/zoneinfo/Africa/Khartoum
-share/zoneinfo/Africa/Mbabane
-share/zoneinfo/Africa/Dar_es_Salaam
+share/zoneinfo/Africa/Kigali
+share/zoneinfo/Africa/Kinshasa
+share/zoneinfo/Africa/Lagos
+share/zoneinfo/Africa/Libreville
 share/zoneinfo/Africa/Lome
-share/zoneinfo/Africa/Tunis
-share/zoneinfo/Africa/Kampala
+share/zoneinfo/Africa/Luanda
+share/zoneinfo/Africa/Lubumbashi
 share/zoneinfo/Africa/Lusaka
-share/zoneinfo/Africa/Harare
-share/zoneinfo/Africa/Algiers
-share/zoneinfo/America/Argentina/Ushuaia
+share/zoneinfo/Africa/Malabo
+share/zoneinfo/Africa/Maputo
+share/zoneinfo/Africa/Maseru
+share/zoneinfo/Africa/Mbabane
+share/zoneinfo/Africa/Mogadishu
+share/zoneinfo/Africa/Monrovia
+share/zoneinfo/Africa/Nairobi
+share/zoneinfo/Africa/Ndjamena
+share/zoneinfo/Africa/Niamey
+share/zoneinfo/Africa/Nouakchott
+share/zoneinfo/Africa/Ouagadougou
+share/zoneinfo/Africa/Porto-Novo
+share/zoneinfo/Africa/Sao_Tome
+share/zoneinfo/Africa/Tripoli
+share/zoneinfo/Africa/Tunis
+share/zoneinfo/Africa/Windhoek
+share/zoneinfo/America/Adak
+share/zoneinfo/America/Anchorage
+share/zoneinfo/America/Anguilla
+share/zoneinfo/America/Antigua
+share/zoneinfo/America/Araguaina
+share/zoneinfo/America/Argentina/Buenos_Aires
+share/zoneinfo/America/Argentina/Catamarca
 share/zoneinfo/America/Argentina/Cordoba
-share/zoneinfo/America/Argentina/Tucuman
-share/zoneinfo/America/Argentina/La_Rioja
-share/zoneinfo/America/Argentina/San_Juan
 share/zoneinfo/America/Argentina/Jujuy
-share/zoneinfo/America/Argentina/Catamarca
+share/zoneinfo/America/Argentina/La_Rioja
 share/zoneinfo/America/Argentina/Mendoza
 share/zoneinfo/America/Argentina/Rio_Gallegos
-share/zoneinfo/America/Argentina/Buenos_Aires
-share/zoneinfo/America/Indiana/Indianapolis
-share/zoneinfo/America/Indiana/Marengo
-share/zoneinfo/America/Indiana/Vincennes
-share/zoneinfo/America/Indiana/Petersburg
-share/zoneinfo/America/Indiana/Knox
-share/zoneinfo/America/Indiana/Vevay
-share/zoneinfo/America/Kentucky/Louisville
-share/zoneinfo/America/Kentucky/Monticello
-share/zoneinfo/America/North_Dakota/Center
-share/zoneinfo/America/North_Dakota/New_Salem
-share/zoneinfo/America/New_York
-share/zoneinfo/America/Chicago
-share/zoneinfo/America/Denver
-share/zoneinfo/America/Los_Angeles
-share/zoneinfo/America/Juneau
-share/zoneinfo/America/Yakutat
-share/zoneinfo/America/Anchorage
-share/zoneinfo/America/Nome
-share/zoneinfo/America/Adak
-share/zoneinfo/America/Phoenix
+share/zoneinfo/America/Argentina/San_Juan
+share/zoneinfo/America/Argentina/Tucuman
+share/zoneinfo/America/Argentina/Ushuaia
+share/zoneinfo/America/Aruba
+share/zoneinfo/America/Asuncion
+share/zoneinfo/America/Atikokan
+share/zoneinfo/America/Bahia
+share/zoneinfo/America/Barbados
+share/zoneinfo/America/Belem
+share/zoneinfo/America/Belize
+share/zoneinfo/America/Blanc-Sablon
+share/zoneinfo/America/Boa_Vista
+share/zoneinfo/America/Bogota
 share/zoneinfo/America/Boise
-share/zoneinfo/America/Detroit
-share/zoneinfo/America/Menominee
-share/zoneinfo/America/St_Johns
-share/zoneinfo/America/Goose_Bay
-share/zoneinfo/America/Halifax
-share/zoneinfo/America/Glace_Bay
-share/zoneinfo/America/Moncton
-share/zoneinfo/America/Montreal
-share/zoneinfo/America/Toronto
-share/zoneinfo/America/Thunder_Bay
-share/zoneinfo/America/Nipigon
-share/zoneinfo/America/Rainy_River
-share/zoneinfo/America/Winnipeg
-share/zoneinfo/America/Regina
-share/zoneinfo/America/Swift_Current
-share/zoneinfo/America/Edmonton
-share/zoneinfo/America/Vancouver
-share/zoneinfo/America/Dawson_Creek
-share/zoneinfo/America/Pangnirtung
-share/zoneinfo/America/Iqaluit
-share/zoneinfo/America/Coral_Harbour
-share/zoneinfo/America/Rankin_Inlet
 share/zoneinfo/America/Cambridge_Bay
-share/zoneinfo/America/Yellowknife
-share/zoneinfo/America/Inuvik
-share/zoneinfo/America/Whitehorse
-share/zoneinfo/America/Dawson
+share/zoneinfo/America/Campo_Grande
 share/zoneinfo/America/Cancun
-share/zoneinfo/America/Merida
-share/zoneinfo/America/Monterrey
-share/zoneinfo/America/Mexico_City
-share/zoneinfo/America/Chihuahua
-share/zoneinfo/America/Hermosillo
-share/zoneinfo/America/Mazatlan
-share/zoneinfo/America/Tijuana
-share/zoneinfo/America/Anguilla
-share/zoneinfo/America/Antigua
-share/zoneinfo/America/Nassau
-share/zoneinfo/America/Barbados
-share/zoneinfo/America/Belize
+share/zoneinfo/America/Caracas
+share/zoneinfo/America/Cayenne
 share/zoneinfo/America/Cayman
+share/zoneinfo/America/Chicago
+share/zoneinfo/America/Chihuahua
 share/zoneinfo/America/Costa_Rica
-share/zoneinfo/America/Havana
+share/zoneinfo/America/Cuiaba
+share/zoneinfo/America/Curacao
+share/zoneinfo/America/Danmarkshavn
+share/zoneinfo/America/Dawson
+share/zoneinfo/America/Dawson_Creek
+share/zoneinfo/America/Denver
+share/zoneinfo/America/Detroit
 share/zoneinfo/America/Dominica
-share/zoneinfo/America/Santo_Domingo
+share/zoneinfo/America/Edmonton
+share/zoneinfo/America/Eirunepe
 share/zoneinfo/America/El_Salvador
+share/zoneinfo/America/Fortaleza
+share/zoneinfo/America/Glace_Bay
+share/zoneinfo/America/Godthab
+share/zoneinfo/America/Goose_Bay
+share/zoneinfo/America/Grand_Turk
 share/zoneinfo/America/Grenada
 share/zoneinfo/America/Guadeloupe
 share/zoneinfo/America/Guatemala
-share/zoneinfo/America/Port-au-Prince
-share/zoneinfo/America/Tegucigalpa
+share/zoneinfo/America/Guayaquil
+share/zoneinfo/America/Guyana
+share/zoneinfo/America/Halifax
+share/zoneinfo/America/Havana
+share/zoneinfo/America/Hermosillo
+share/zoneinfo/America/Indiana/Indianapolis
+share/zoneinfo/America/Indiana/Knox
+share/zoneinfo/America/Indiana/Marengo
+share/zoneinfo/America/Indiana/Petersburg
+share/zoneinfo/America/Indiana/Vevay
+share/zoneinfo/America/Indiana/Vincennes
+share/zoneinfo/America/Inuvik
+share/zoneinfo/America/Iqaluit
 share/zoneinfo/America/Jamaica
+share/zoneinfo/America/Juneau
+share/zoneinfo/America/Kentucky/Louisville
+share/zoneinfo/America/Kentucky/Monticello
+share/zoneinfo/America/La_Paz
+share/zoneinfo/America/Lima
+share/zoneinfo/America/Los_Angeles
+share/zoneinfo/America/Maceio
+share/zoneinfo/America/Managua
+share/zoneinfo/America/Manaus
 share/zoneinfo/America/Martinique
+share/zoneinfo/America/Mazatlan
+share/zoneinfo/America/Menominee
+share/zoneinfo/America/Merida
+share/zoneinfo/America/Mexico_City
+share/zoneinfo/America/Miquelon
+share/zoneinfo/America/Moncton
+share/zoneinfo/America/Monterrey
+share/zoneinfo/America/Montevideo
+share/zoneinfo/America/Montreal
 share/zoneinfo/America/Montserrat
-share/zoneinfo/America/Managua
+share/zoneinfo/America/Nassau
+share/zoneinfo/America/New_York
+share/zoneinfo/America/Nipigon
+share/zoneinfo/America/Nome
+share/zoneinfo/America/Noronha
+share/zoneinfo/America/North_Dakota/Center
+share/zoneinfo/America/North_Dakota/New_Salem
 share/zoneinfo/America/Panama
+share/zoneinfo/America/Pangnirtung
+share/zoneinfo/America/Paramaribo
+share/zoneinfo/America/Phoenix
+share/zoneinfo/America/Port-au-Prince
+share/zoneinfo/America/Port_of_Spain
+share/zoneinfo/America/Porto_Velho
 share/zoneinfo/America/Puerto_Rico
-share/zoneinfo/America/St_Kitts
-share/zoneinfo/America/St_Lucia
-share/zoneinfo/America/Miquelon
-share/zoneinfo/America/St_Vincent
-share/zoneinfo/America/Grand_Turk
-share/zoneinfo/America/Tortola
-share/zoneinfo/America/St_Thomas
-share/zoneinfo/America/Aruba
-share/zoneinfo/America/La_Paz
-share/zoneinfo/America/Noronha
-share/zoneinfo/America/Belem
-share/zoneinfo/America/Fortaleza
+share/zoneinfo/America/Rainy_River
+share/zoneinfo/America/Rankin_Inlet
 share/zoneinfo/America/Recife
-share/zoneinfo/America/Araguaina
-share/zoneinfo/America/Maceio
-share/zoneinfo/America/Bahia
-share/zoneinfo/America/Sao_Paulo
-share/zoneinfo/America/Campo_Grande
-share/zoneinfo/America/Cuiaba
-share/zoneinfo/America/Porto_Velho
-share/zoneinfo/America/Boa_Vista
-share/zoneinfo/America/Manaus
-share/zoneinfo/America/Eirunepe
+share/zoneinfo/America/Regina
 share/zoneinfo/America/Rio_Branco
 share/zoneinfo/America/Santiago
-share/zoneinfo/America/Bogota
-share/zoneinfo/America/Curacao
-share/zoneinfo/America/Guayaquil
-share/zoneinfo/America/Cayenne
-share/zoneinfo/America/Guyana
-share/zoneinfo/America/Asuncion
-share/zoneinfo/America/Lima
-share/zoneinfo/America/Paramaribo
-share/zoneinfo/America/Port_of_Spain
-share/zoneinfo/America/Montevideo
-share/zoneinfo/America/Caracas
-share/zoneinfo/America/Danmarkshavn
-share/zoneinfo/America/Shiprock
+share/zoneinfo/America/Santo_Domingo
+share/zoneinfo/America/Sao_Paulo
 share/zoneinfo/America/Scoresbysund
-share/zoneinfo/America/Godthab
+share/zoneinfo/America/Shiprock
+share/zoneinfo/America/St_Johns
+share/zoneinfo/America/St_Kitts
+share/zoneinfo/America/St_Lucia
+share/zoneinfo/America/St_Thomas
+share/zoneinfo/America/St_Vincent
+share/zoneinfo/America/Swift_Current
+share/zoneinfo/America/Tegucigalpa
 share/zoneinfo/America/Thule
-share/zoneinfo/Antarctica/South_Pole
+share/zoneinfo/America/Thunder_Bay
+share/zoneinfo/America/Tijuana
+share/zoneinfo/America/Toronto
+share/zoneinfo/America/Tortola
+share/zoneinfo/America/Vancouver
+share/zoneinfo/America/Whitehorse
+share/zoneinfo/America/Winnipeg
+share/zoneinfo/America/Yakutat
+share/zoneinfo/America/Yellowknife
+share/zoneinfo/Antarctica/Casey
 share/zoneinfo/Antarctica/Davis
-share/zoneinfo/Antarctica/Mawson
 share/zoneinfo/Antarctica/DumontDUrville
+share/zoneinfo/Antarctica/Mawson
+share/zoneinfo/Antarctica/McMurdo
+share/zoneinfo/Antarctica/Palmer
+share/zoneinfo/Antarctica/Rothera
+share/zoneinfo/Antarctica/South_Pole
 share/zoneinfo/Antarctica/Syowa
 share/zoneinfo/Antarctica/Vostok
-share/zoneinfo/Antarctica/Rothera
-share/zoneinfo/Antarctica/Palmer
-share/zoneinfo/Antarctica/McMurdo
-share/zoneinfo/Antarctica/Casey
 share/zoneinfo/Arctic/Longyearbyen
-share/zoneinfo/Asia/Istanbul
-share/zoneinfo/Asia/Yerevan
-share/zoneinfo/Asia/Baku
+share/zoneinfo/Asia/Aden
+share/zoneinfo/Asia/Almaty
+share/zoneinfo/Asia/Amman
+share/zoneinfo/Asia/Anadyr
+share/zoneinfo/Asia/Aqtau
+share/zoneinfo/Asia/Aqtobe
+share/zoneinfo/Asia/Ashgabat
+share/zoneinfo/Asia/Baghdad
 share/zoneinfo/Asia/Bahrain
-share/zoneinfo/Asia/Dhaka
-share/zoneinfo/Asia/Thimphu
+share/zoneinfo/Asia/Baku
+share/zoneinfo/Asia/Bangkok
+share/zoneinfo/Asia/Beirut
+share/zoneinfo/Asia/Bishkek
 share/zoneinfo/Asia/Brunei
-share/zoneinfo/Asia/Rangoon
-share/zoneinfo/Asia/Phnom_Penh
-share/zoneinfo/Asia/Harbin
-share/zoneinfo/Asia/Shanghai
+share/zoneinfo/Asia/Calcutta
+share/zoneinfo/Asia/Choibalsan
 share/zoneinfo/Asia/Chongqing
-share/zoneinfo/Asia/Urumqi
-share/zoneinfo/Asia/Kashgar
-share/zoneinfo/Asia/Hong_Kong
-share/zoneinfo/Asia/Taipei
-share/zoneinfo/Asia/Macau
-share/zoneinfo/Asia/Nicosia
-share/zoneinfo/Asia/Tbilisi
+share/zoneinfo/Asia/Colombo
+share/zoneinfo/Asia/Damascus
+share/zoneinfo/Asia/Dhaka
 share/zoneinfo/Asia/Dili
-share/zoneinfo/Asia/Calcutta
+share/zoneinfo/Asia/Dubai
+share/zoneinfo/Asia/Dushanbe
+share/zoneinfo/Asia/Gaza
+share/zoneinfo/Asia/Harbin
+share/zoneinfo/Asia/Hong_Kong
+share/zoneinfo/Asia/Hovd
+share/zoneinfo/Asia/Irkutsk
+share/zoneinfo/Asia/Istanbul
 share/zoneinfo/Asia/Jakarta
-share/zoneinfo/Asia/Pontianak
-share/zoneinfo/Asia/Makassar
 share/zoneinfo/Asia/Jayapura
-share/zoneinfo/Asia/Tehran
-share/zoneinfo/Asia/Baghdad
 share/zoneinfo/Asia/Jerusalem
-share/zoneinfo/Asia/Tokyo
-share/zoneinfo/Asia/Amman
-share/zoneinfo/Asia/Almaty
-share/zoneinfo/Asia/Qyzylorda
-share/zoneinfo/Asia/Aqtobe
-share/zoneinfo/Asia/Aqtau
-share/zoneinfo/Asia/Oral
-share/zoneinfo/Asia/Bishkek
-share/zoneinfo/Asia/Seoul
-share/zoneinfo/Asia/Pyongyang
-share/zoneinfo/Asia/Kuwait
-share/zoneinfo/Asia/Vientiane
-share/zoneinfo/Asia/Beirut
+share/zoneinfo/Asia/Kabul
+share/zoneinfo/Asia/Kamchatka
+share/zoneinfo/Asia/Karachi
+share/zoneinfo/Asia/Kashgar
+share/zoneinfo/Asia/Katmandu
+share/zoneinfo/Asia/Krasnoyarsk
 share/zoneinfo/Asia/Kuala_Lumpur
 share/zoneinfo/Asia/Kuching
-share/zoneinfo/Asia/Hovd
-share/zoneinfo/Asia/Ulaanbaatar
-share/zoneinfo/Asia/Choibalsan
-share/zoneinfo/Asia/Katmandu
-share/zoneinfo/Asia/Muscat
-share/zoneinfo/Asia/Karachi
-share/zoneinfo/Asia/Gaza
+share/zoneinfo/Asia/Kuwait
+share/zoneinfo/Asia/Macau
+share/zoneinfo/Asia/Magadan
+share/zoneinfo/Asia/Makassar
 share/zoneinfo/Asia/Manila
+share/zoneinfo/Asia/Muscat
+share/zoneinfo/Asia/Nicosia
+share/zoneinfo/Asia/Novosibirsk
+share/zoneinfo/Asia/Omsk
+share/zoneinfo/Asia/Oral
+share/zoneinfo/Asia/Phnom_Penh
+share/zoneinfo/Asia/Pontianak
+share/zoneinfo/Asia/Pyongyang
 share/zoneinfo/Asia/Qatar
+share/zoneinfo/Asia/Qyzylorda
+share/zoneinfo/Asia/Rangoon
 share/zoneinfo/Asia/Riyadh
-share/zoneinfo/Asia/Singapore
-share/zoneinfo/Asia/Colombo
-share/zoneinfo/Asia/Damascus
-share/zoneinfo/Asia/Dushanbe
-share/zoneinfo/Asia/Bangkok
-share/zoneinfo/Asia/Ashgabat
-share/zoneinfo/Asia/Dubai
+share/zoneinfo/Asia/Saigon
+share/zoneinfo/Asia/Sakhalin
 share/zoneinfo/Asia/Samarkand
+share/zoneinfo/Asia/Seoul
+share/zoneinfo/Asia/Shanghai
+share/zoneinfo/Asia/Singapore
+share/zoneinfo/Asia/Taipei
 share/zoneinfo/Asia/Tashkent
-share/zoneinfo/Asia/Saigon
-share/zoneinfo/Asia/Aden
-share/zoneinfo/Asia/Yekaterinburg
-share/zoneinfo/Asia/Omsk
-share/zoneinfo/Asia/Novosibirsk
-share/zoneinfo/Asia/Krasnoyarsk
-share/zoneinfo/Asia/Irkutsk
-share/zoneinfo/Asia/Yakutsk
+share/zoneinfo/Asia/Tbilisi
+share/zoneinfo/Asia/Tehran
+share/zoneinfo/Asia/Thimphu
+share/zoneinfo/Asia/Tokyo
+share/zoneinfo/Asia/Ulaanbaatar
+share/zoneinfo/Asia/Urumqi
+share/zoneinfo/Asia/Vientiane
 share/zoneinfo/Asia/Vladivostok
-share/zoneinfo/Asia/Sakhalin
-share/zoneinfo/Asia/Magadan
-share/zoneinfo/Asia/Kamchatka
-share/zoneinfo/Asia/Anadyr
-share/zoneinfo/Asia/Kabul
-share/zoneinfo/Atlantic/Jan_Mayen
-share/zoneinfo/Atlantic/St_Helena
-share/zoneinfo/Atlantic/Faeroe
-share/zoneinfo/Atlantic/Reykjavik
+share/zoneinfo/Asia/Yakutsk
+share/zoneinfo/Asia/Yekaterinburg
+share/zoneinfo/Asia/Yerevan
 share/zoneinfo/Atlantic/Azores
-share/zoneinfo/Atlantic/Madeira
-share/zoneinfo/Atlantic/Canary
 share/zoneinfo/Atlantic/Bermuda
-share/zoneinfo/Atlantic/Stanley
-share/zoneinfo/Atlantic/South_Georgia
+share/zoneinfo/Atlantic/Canary
 share/zoneinfo/Atlantic/Cape_Verde
-share/zoneinfo/Australia/Lord_Howe
-share/zoneinfo/Australia/Perth
-share/zoneinfo/Australia/Brisbane
-share/zoneinfo/Australia/Lindeman
+share/zoneinfo/Atlantic/Faeroe
+share/zoneinfo/Atlantic/Jan_Mayen
+share/zoneinfo/Atlantic/Madeira
+share/zoneinfo/Atlantic/Reykjavik
+share/zoneinfo/Atlantic/South_Georgia
+share/zoneinfo/Atlantic/St_Helena
+share/zoneinfo/Atlantic/Stanley
 share/zoneinfo/Australia/Adelaide
-share/zoneinfo/Australia/Hobart
+share/zoneinfo/Australia/Brisbane
+share/zoneinfo/Australia/Broken_Hill
 share/zoneinfo/Australia/Currie
+share/zoneinfo/Australia/Darwin
+share/zoneinfo/Australia/Hobart
+share/zoneinfo/Australia/Lindeman
+share/zoneinfo/Australia/Lord_Howe
 share/zoneinfo/Australia/Melbourne
+share/zoneinfo/Australia/Perth
 share/zoneinfo/Australia/Sydney
-share/zoneinfo/Australia/Broken_Hill
-share/zoneinfo/Australia/Darwin
-share/zoneinfo/Etc/GMT0
-share/zoneinfo/Etc/UTC
-share/zoneinfo/Etc/UCT
-share/zoneinfo/Etc/GMT-14
-share/zoneinfo/Etc/GMT-13
-share/zoneinfo/Etc/GMT-12
-share/zoneinfo/Etc/GMT-11
-share/zoneinfo/Etc/GMT-10
-share/zoneinfo/Etc/GMT-9
-share/zoneinfo/Etc/GMT-8
-share/zoneinfo/Etc/GMT-7
-share/zoneinfo/Etc/GMT-6
-share/zoneinfo/Etc/GMT-5
-share/zoneinfo/Etc/GMT-4
-share/zoneinfo/Etc/GMT-3
-share/zoneinfo/Etc/GMT-2
-share/zoneinfo/Etc/GMT-1
+share/zoneinfo/CET
+share/zoneinfo/CST6CDT
+share/zoneinfo/EET
+share/zoneinfo/EST
+share/zoneinfo/EST5EDT
+share/zoneinfo/Etc/GMT
+share/zoneinfo/Etc/GMT+0
 share/zoneinfo/Etc/GMT+1
+share/zoneinfo/Etc/GMT+10
+share/zoneinfo/Etc/GMT+11
+share/zoneinfo/Etc/GMT+12
 share/zoneinfo/Etc/GMT+2
 share/zoneinfo/Etc/GMT+3
 share/zoneinfo/Etc/GMT+4
@@ -313,129 +307,140 @@ share/zoneinfo/Etc/GMT+6
 share/zoneinfo/Etc/GMT+7
 share/zoneinfo/Etc/GMT+8
 share/zoneinfo/Etc/GMT+9
-share/zoneinfo/Etc/GMT+10
-share/zoneinfo/Etc/GMT+11
-share/zoneinfo/Etc/GMT+12
+share/zoneinfo/Etc/GMT-0
+share/zoneinfo/Etc/GMT-1
+share/zoneinfo/Etc/GMT-10
+share/zoneinfo/Etc/GMT-11
+share/zoneinfo/Etc/GMT-12
+share/zoneinfo/Etc/GMT-13
+share/zoneinfo/Etc/GMT-14
+share/zoneinfo/Etc/GMT-2
+share/zoneinfo/Etc/GMT-3
+share/zoneinfo/Etc/GMT-4
+share/zoneinfo/Etc/GMT-5
+share/zoneinfo/Etc/GMT-6
+share/zoneinfo/Etc/GMT-7
+share/zoneinfo/Etc/GMT-8
+share/zoneinfo/Etc/GMT-9
+share/zoneinfo/Etc/GMT0
+share/zoneinfo/Etc/Greenwich
+share/zoneinfo/Etc/UCT
+share/zoneinfo/Etc/UTC
 share/zoneinfo/Etc/Universal
-share/zoneinfo/Etc/GMT
 share/zoneinfo/Etc/Zulu
-share/zoneinfo/Etc/Greenwich
-share/zoneinfo/Etc/GMT-0
-share/zoneinfo/Etc/GMT+0
-share/zoneinfo/Europe/Bratislava
-share/zoneinfo/Europe/Dublin
-share/zoneinfo/Europe/Tirane
+share/zoneinfo/Europe/Amsterdam
 share/zoneinfo/Europe/Andorra
-share/zoneinfo/Europe/Vienna
-share/zoneinfo/Europe/Minsk
+share/zoneinfo/Europe/Athens
+share/zoneinfo/Europe/Belgrade
+share/zoneinfo/Europe/Berlin
+share/zoneinfo/Europe/Bratislava
 share/zoneinfo/Europe/Brussels
-share/zoneinfo/Europe/Sofia
-share/zoneinfo/Europe/Prague
+share/zoneinfo/Europe/Bucharest
+share/zoneinfo/Europe/Budapest
+share/zoneinfo/Europe/Chisinau
 share/zoneinfo/Europe/Copenhagen
-share/zoneinfo/Europe/Tallinn
-share/zoneinfo/Europe/Helsinki
-share/zoneinfo/Europe/Paris
-share/zoneinfo/Europe/Berlin
+share/zoneinfo/Europe/Dublin
 share/zoneinfo/Europe/Gibraltar
-share/zoneinfo/Europe/Athens
-share/zoneinfo/Europe/Budapest
-share/zoneinfo/Europe/Rome
-share/zoneinfo/Europe/Riga
-share/zoneinfo/Europe/Vaduz
-share/zoneinfo/Europe/Vilnius
+share/zoneinfo/Europe/Guernsey
+share/zoneinfo/Europe/Helsinki
+share/zoneinfo/Europe/Isle_of_Man
+share/zoneinfo/Europe/Istanbul
+share/zoneinfo/Europe/Jersey
+share/zoneinfo/Europe/Kaliningrad
+share/zoneinfo/Europe/Kiev
+share/zoneinfo/Europe/Lisbon
+share/zoneinfo/Europe/Ljubljana
+share/zoneinfo/Europe/London
 share/zoneinfo/Europe/Luxembourg
+share/zoneinfo/Europe/Madrid
 share/zoneinfo/Europe/Malta
-share/zoneinfo/Europe/Chisinau
+share/zoneinfo/Europe/Mariehamn
+share/zoneinfo/Europe/Minsk
 share/zoneinfo/Europe/Monaco
-share/zoneinfo/Europe/Amsterdam
-share/zoneinfo/Europe/Oslo
-share/zoneinfo/Europe/Warsaw
-share/zoneinfo/Europe/Lisbon
-share/zoneinfo/Europe/Bucharest
-share/zoneinfo/Europe/Kaliningrad
 share/zoneinfo/Europe/Moscow
-share/zoneinfo/Europe/Samara
-share/zoneinfo/Europe/Belgrade
-share/zoneinfo/Europe/Madrid
-share/zoneinfo/Europe/Stockholm
-share/zoneinfo/Europe/Zurich
-share/zoneinfo/Europe/Istanbul
-share/zoneinfo/Europe/Kiev
-share/zoneinfo/Europe/Uzhgorod
-share/zoneinfo/Europe/Zaporozhye
-share/zoneinfo/Europe/Simferopol
 share/zoneinfo/Europe/Nicosia
-share/zoneinfo/Europe/Mariehamn
-share/zoneinfo/Europe/Vatican
+share/zoneinfo/Europe/Oslo
+share/zoneinfo/Europe/Paris
+share/zoneinfo/Europe/Prague
+share/zoneinfo/Europe/Riga
+share/zoneinfo/Europe/Rome
+share/zoneinfo/Europe/Samara
 share/zoneinfo/Europe/San_Marino
-share/zoneinfo/Europe/Ljubljana
 share/zoneinfo/Europe/Sarajevo
+share/zoneinfo/Europe/Simferopol
 share/zoneinfo/Europe/Skopje
+share/zoneinfo/Europe/Sofia
+share/zoneinfo/Europe/Stockholm
+share/zoneinfo/Europe/Tallinn
+share/zoneinfo/Europe/Tirane
+share/zoneinfo/Europe/Uzhgorod
+share/zoneinfo/Europe/Vaduz
+share/zoneinfo/Europe/Vatican
+share/zoneinfo/Europe/Vienna
+share/zoneinfo/Europe/Vilnius
+share/zoneinfo/Europe/Volgograd
+share/zoneinfo/Europe/Warsaw
 share/zoneinfo/Europe/Zagreb
-share/zoneinfo/Europe/London
-share/zoneinfo/Indian/Cocos
+share/zoneinfo/Europe/Zaporozhye
+share/zoneinfo/Europe/Zurich
+share/zoneinfo/Factory
+share/zoneinfo/GMT
+share/zoneinfo/HST
 share/zoneinfo/Indian/Antananarivo
-share/zoneinfo/Indian/Mauritius
-share/zoneinfo/Indian/Mayotte
-share/zoneinfo/Indian/Reunion
-share/zoneinfo/Indian/Mahe
-share/zoneinfo/Indian/Kerguelen
 share/zoneinfo/Indian/Chagos
-share/zoneinfo/Indian/Maldives
 share/zoneinfo/Indian/Christmas
+share/zoneinfo/Indian/Cocos
 share/zoneinfo/Indian/Comoro
-share/zoneinfo/Pacific/Galapagos
+share/zoneinfo/Indian/Kerguelen
+share/zoneinfo/Indian/Mahe
+share/zoneinfo/Indian/Maldives
+share/zoneinfo/Indian/Mauritius
+share/zoneinfo/Indian/Mayotte
+share/zoneinfo/Indian/Reunion
+share/zoneinfo/MET
+share/zoneinfo/MST
+share/zoneinfo/MST7MDT
+share/zoneinfo/PST8PDT
+share/zoneinfo/Pacific/Apia
+share/zoneinfo/Pacific/Auckland
+share/zoneinfo/Pacific/Chatham
+share/zoneinfo/Pacific/Easter
+share/zoneinfo/Pacific/Efate
+share/zoneinfo/Pacific/Enderbury
+share/zoneinfo/Pacific/Fakaofo
 share/zoneinfo/Pacific/Fiji
+share/zoneinfo/Pacific/Funafuti
+share/zoneinfo/Pacific/Galapagos
 share/zoneinfo/Pacific/Gambier
-share/zoneinfo/Pacific/Marquesas
-share/zoneinfo/Pacific/Tahiti
+share/zoneinfo/Pacific/Guadalcanal
 share/zoneinfo/Pacific/Guam
-share/zoneinfo/Pacific/Tarawa
-share/zoneinfo/Pacific/Enderbury
+share/zoneinfo/Pacific/Honolulu
+share/zoneinfo/Pacific/Johnston
 share/zoneinfo/Pacific/Kiritimati
-share/zoneinfo/Pacific/Saipan
-share/zoneinfo/Pacific/Majuro
-share/zoneinfo/Pacific/Kwajalein
-share/zoneinfo/Pacific/Truk
-share/zoneinfo/Pacific/Ponape
 share/zoneinfo/Pacific/Kosrae
+share/zoneinfo/Pacific/Kwajalein
+share/zoneinfo/Pacific/Majuro
+share/zoneinfo/Pacific/Marquesas
+share/zoneinfo/Pacific/Midway
 share/zoneinfo/Pacific/Nauru
-share/zoneinfo/Pacific/Noumea
-share/zoneinfo/Pacific/Auckland
-share/zoneinfo/Pacific/Chatham
 share/zoneinfo/Pacific/Niue
 share/zoneinfo/Pacific/Norfolk
+share/zoneinfo/Pacific/Noumea
+share/zoneinfo/Pacific/Pago_Pago
 share/zoneinfo/Pacific/Palau
-share/zoneinfo/Pacific/Port_Moresby
 share/zoneinfo/Pacific/Pitcairn
-share/zoneinfo/Pacific/Pago_Pago
-share/zoneinfo/Pacific/Apia
-share/zoneinfo/Pacific/Guadalcanal
-share/zoneinfo/Pacific/Fakaofo
+share/zoneinfo/Pacific/Ponape
+share/zoneinfo/Pacific/Port_Moresby
+share/zoneinfo/Pacific/Rarotonga
+share/zoneinfo/Pacific/Saipan
+share/zoneinfo/Pacific/Tahiti
+share/zoneinfo/Pacific/Tarawa
 share/zoneinfo/Pacific/Tongatapu
-share/zoneinfo/Pacific/Funafuti
-share/zoneinfo/Pacific/Johnston
-share/zoneinfo/Pacific/Midway
+share/zoneinfo/Pacific/Truk
 share/zoneinfo/Pacific/Wake
-share/zoneinfo/Pacific/Efate
 share/zoneinfo/Pacific/Wallis
-share/zoneinfo/Pacific/Honolulu
-share/zoneinfo/Pacific/Easter
-share/zoneinfo/Pacific/Rarotonga
-share/zoneinfo/MST7MDT
-share/zoneinfo/PST8PDT
-share/zoneinfo/GMT
-share/zoneinfo/posixrules
 share/zoneinfo/WET
-share/zoneinfo/CET
-share/zoneinfo/MET
-share/zoneinfo/EET
-share/zoneinfo/Factory
-share/zoneinfo/EST
-share/zoneinfo/MST
-share/zoneinfo/HST
-share/zoneinfo/EST5EDT
-share/zoneinfo/CST6CDT
+share/zoneinfo/posixrules
 share/zoneinfo/zone.tab
 
 @dirrm share/zoneinfo/SystemV