merge 8.5

5 files changed, 193 insertions, 38 deletions

diff --git a/library/platform/platform.tcl b/library/platform/platform.tcl
index c596e60..35a22a3 100644
--- a/library/platform/platform.tcl
+++ b/library/platform/platform.tcl
@@ -165,7 +165,7 @@ proc ::platform::identify {} {
     global tcl_platform
 
     set id [generic]
-    regexp {^([^-]+)-([^-]+)$} $id -> plat ver wow cpu
+    regexp {^([^-]+)-([^-]+)$} $id -> plat cpu
 
     switch -- $plat {
 	solaris {
diff --git a/library/tzdata/America/Fort_Nelson b/library/tzdata/America/Fort_Nelson
new file mode 100644
index 0000000..d819368
--- /dev/null
+++ b/library/tzdata/America/Fort_Nelson
@@ -0,0 +1,151 @@
+# created by tools/tclZIC.tcl - do not edit
+
+set TZData(:America/Fort_Nelson) {
+    {-9223372036854775808 -29447 0 LMT}
+    {-2713880953 -28800 0 PST}
+    {-1632060000 -25200 1 PDT}
+    {-1615129200 -28800 0 PST}
+    {-880207200 -25200 1 PWT}
+    {-769395600 -25200 1 PPT}
+    {-765385200 -28800 0 PST}
+    {-757353600 -28800 0 PST}
+    {-725817600 -28800 0 PST}
+    {-715788000 -25200 1 PDT}
+    {-702486000 -28800 0 PST}
+    {-684338400 -25200 1 PDT}
+    {-671036400 -28800 0 PST}
+    {-652888800 -25200 1 PDT}
+    {-639586800 -28800 0 PST}
+    {-620834400 -25200 1 PDT}
+    {-608137200 -28800 0 PST}
+    {-589384800 -25200 1 PDT}
+    {-576082800 -28800 0 PST}
+    {-557935200 -25200 1 PDT}
+    {-544633200 -28800 0 PST}
+    {-526485600 -25200 1 PDT}
+    {-513183600 -28800 0 PST}
+    {-495036000 -25200 1 PDT}
+    {-481734000 -28800 0 PST}
+    {-463586400 -25200 1 PDT}
+    {-450284400 -28800 0 PST}
+    {-431532000 -25200 1 PDT}
+    {-418230000 -28800 0 PST}
+    {-400082400 -25200 1 PDT}
+    {-386780400 -28800 0 PST}
+    {-368632800 -25200 1 PDT}
+    {-355330800 -28800 0 PST}
+    {-337183200 -25200 1 PDT}
+    {-323881200 -28800 0 PST}
+    {-305733600 -25200 1 PDT}
+    {-292431600 -28800 0 PST}
+    {-273679200 -25200 1 PDT}
+    {-260982000 -28800 0 PST}
+    {-242229600 -25200 1 PDT}
+    {-226508400 -28800 0 PST}
+    {-210780000 -25200 1 PDT}
+    {-195058800 -28800 0 PST}
+    {-179330400 -25200 1 PDT}
+    {-163609200 -28800 0 PST}
+    {-147880800 -25200 1 PDT}
+    {-131554800 -28800 0 PST}
+    {-116431200 -25200 1 PDT}
+    {-100105200 -28800 0 PST}
+    {-84376800 -25200 1 PDT}
+    {-68655600 -28800 0 PST}
+    {-52927200 -25200 1 PDT}
+    {-37206000 -28800 0 PST}
+    {-21477600 -25200 1 PDT}
+    {-5756400 -28800 0 PST}
+    {9972000 -25200 1 PDT}
+    {25693200 -28800 0 PST}
+    {41421600 -25200 1 PDT}
+    {57747600 -28800 0 PST}
+    {73476000 -25200 1 PDT}
+    {89197200 -28800 0 PST}
+    {104925600 -25200 1 PDT}
+    {120646800 -28800 0 PST}
+    {136375200 -25200 1 PDT}
+    {152096400 -28800 0 PST}
+    {167824800 -25200 1 PDT}
+    {183546000 -28800 0 PST}
+    {199274400 -25200 1 PDT}
+    {215600400 -28800 0 PST}
+    {230724000 -25200 1 PDT}
+    {247050000 -28800 0 PST}
+    {262778400 -25200 1 PDT}
+    {278499600 -28800 0 PST}
+    {294228000 -25200 1 PDT}
+    {309949200 -28800 0 PST}
+    {325677600 -25200 1 PDT}
+    {341398800 -28800 0 PST}
+    {357127200 -25200 1 PDT}
+    {372848400 -28800 0 PST}
+    {388576800 -25200 1 PDT}
+    {404902800 -28800 0 PST}
+    {420026400 -25200 1 PDT}
+    {436352400 -28800 0 PST}
+    {452080800 -25200 1 PDT}
+    {467802000 -28800 0 PST}
+    {483530400 -25200 1 PDT}
+    {499251600 -28800 0 PST}
+    {514980000 -25200 1 PDT}
+    {530701200 -28800 0 PST}
+    {536486400 -28800 0 PST}
+    {544615200 -25200 1 PDT}
+    {562150800 -28800 0 PST}
+    {576064800 -25200 1 PDT}
+    {594205200 -28800 0 PST}
+    {607514400 -25200 1 PDT}
+    {625654800 -28800 0 PST}
+    {638964000 -25200 1 PDT}
+    {657104400 -28800 0 PST}
+    {671018400 -25200 1 PDT}
+    {688554000 -28800 0 PST}
+    {702468000 -25200 1 PDT}
+    {720003600 -28800 0 PST}
+    {733917600 -25200 1 PDT}
+    {752058000 -28800 0 PST}
+    {765367200 -25200 1 PDT}
+    {783507600 -28800 0 PST}
+    {796816800 -25200 1 PDT}
+    {814957200 -28800 0 PST}
+    {828871200 -25200 1 PDT}
+    {846406800 -28800 0 PST}
+    {860320800 -25200 1 PDT}
+    {877856400 -28800 0 PST}
+    {891770400 -25200 1 PDT}
+    {909306000 -28800 0 PST}
+    {923220000 -25200 1 PDT}
+    {941360400 -28800 0 PST}
+    {954669600 -25200 1 PDT}
+    {972810000 -28800 0 PST}
+    {986119200 -25200 1 PDT}
+    {1004259600 -28800 0 PST}
+    {1018173600 -25200 1 PDT}
+    {1035709200 -28800 0 PST}
+    {1049623200 -25200 1 PDT}
+    {1067158800 -28800 0 PST}
+    {1081072800 -25200 1 PDT}
+    {1099213200 -28800 0 PST}
+    {1112522400 -25200 1 PDT}
+    {1130662800 -28800 0 PST}
+    {1143972000 -25200 1 PDT}
+    {1162112400 -28800 0 PST}
+    {1173607200 -25200 1 PDT}
+    {1194166800 -28800 0 PST}
+    {1205056800 -25200 1 PDT}
+    {1225616400 -28800 0 PST}
+    {1236506400 -25200 1 PDT}
+    {1257066000 -28800 0 PST}
+    {1268560800 -25200 1 PDT}
+    {1289120400 -28800 0 PST}
+    {1300010400 -25200 1 PDT}
+    {1320570000 -28800 0 PST}
+    {1331460000 -25200 1 PDT}
+    {1352019600 -28800 0 PST}
+    {1362909600 -25200 1 PDT}
+    {1383469200 -28800 0 PST}
+    {1394359200 -25200 1 PDT}
+    {1414918800 -28800 0 PST}
+    {1425808800 -25200 0 MST}
+}
diff --git a/library/tzdata/Europe/Istanbul b/library/tzdata/Europe/Istanbul
index 7cb4820..8eadbc3 100644
--- a/library/tzdata/Europe/Istanbul
+++ b/library/tzdata/Europe/Istanbul
@@ -133,7 +133,8 @@ set TZData(:Europe/Istanbul) {
     {1396227600 10800 0 EEST}
     {1414285200 7200 0 EET}
     {1427590800 10800 1 EEST}
-    {1445734800 7200 0 EET}
+    {1445734800 10800 1 EEST}
+    {1446944400 7200 0 EET}
     {1459040400 10800 1 EEST}
     {1477789200 7200 0 EET}
     {1490490000 10800 1 EEST}
diff --git a/library/tzdata/Pacific/Fiji b/library/tzdata/Pacific/Fiji
index 4aae330..8f8b12f 100644
--- a/library/tzdata/Pacific/Fiji
+++ b/library/tzdata/Pacific/Fiji
@@ -20,9 +20,9 @@ set TZData(:Pacific/Fiji) {
     {1414850400 46800 1 FJST}
     {1421503200 43200 0 FJT}
     {1446300000 46800 1 FJST}
-    {1453557600 43200 0 FJT}
+    {1452952800 43200 0 FJT}
     {1478354400 46800 1 FJST}
-    {1485007200 43200 0 FJT}
+    {1484402400 43200 0 FJT}
     {1509804000 46800 1 FJST}
     {1516456800 43200 0 FJT}
     {1541253600 46800 1 FJST}
@@ -30,11 +30,11 @@ set TZData(:Pacific/Fiji) {
     {1572703200 46800 1 FJST}
     {1579356000 43200 0 FJT}
     {1604152800 46800 1 FJST}
-    {1611410400 43200 0 FJT}
+    {1610805600 43200 0 FJT}
     {1636207200 46800 1 FJST}
-    {1642860000 43200 0 FJT}
+    {1642255200 43200 0 FJT}
     {1667656800 46800 1 FJST}
-    {1674309600 43200 0 FJT}
+    {1673704800 43200 0 FJT}
     {1699106400 46800 1 FJST}
     {1705759200 43200 0 FJT}
     {1730556000 46800 1 FJST}
@@ -42,9 +42,9 @@ set TZData(:Pacific/Fiji) {
     {1762005600 46800 1 FJST}
     {1768658400 43200 0 FJT}
     {1793455200 46800 1 FJST}
-    {1800712800 43200 0 FJT}
+    {1800108000 43200 0 FJT}
     {1825509600 46800 1 FJST}
-    {1832162400 43200 0 FJT}
+    {1831557600 43200 0 FJT}
     {1856959200 46800 1 FJST}
     {1863612000 43200 0 FJT}
     {1888408800 46800 1 FJST}
@@ -54,9 +54,9 @@ set TZData(:Pacific/Fiji) {
     {1951308000 46800 1 FJST}
     {1957960800 43200 0 FJT}
     {1983362400 46800 1 FJST}
-    {1990015200 43200 0 FJT}
+    {1989410400 43200 0 FJT}
     {2014812000 46800 1 FJST}
-    {2021464800 43200 0 FJT}
+    {2020860000 43200 0 FJT}
     {2046261600 46800 1 FJST}
     {2052914400 43200 0 FJT}
     {2077711200 46800 1 FJST}
@@ -64,11 +64,11 @@ set TZData(:Pacific/Fiji) {
     {2109160800 46800 1 FJST}
     {2115813600 43200 0 FJT}
     {2140610400 46800 1 FJST}
-    {2147868000 43200 0 FJT}
+    {2147263200 43200 0 FJT}
     {2172664800 46800 1 FJST}
-    {2179317600 43200 0 FJT}
+    {2178712800 43200 0 FJT}
     {2204114400 46800 1 FJST}
-    {2210767200 43200 0 FJT}
+    {2210162400 43200 0 FJT}
     {2235564000 46800 1 FJST}
     {2242216800 43200 0 FJT}
     {2267013600 46800 1 FJST}
@@ -76,9 +76,9 @@ set TZData(:Pacific/Fiji) {
     {2298463200 46800 1 FJST}
     {2305116000 43200 0 FJT}
     {2329912800 46800 1 FJST}
-    {2337170400 43200 0 FJT}
+    {2336565600 43200 0 FJT}
     {2361967200 46800 1 FJST}
-    {2368620000 43200 0 FJT}
+    {2368015200 43200 0 FJT}
     {2393416800 46800 1 FJST}
     {2400069600 43200 0 FJT}
     {2424866400 46800 1 FJST}
@@ -86,11 +86,11 @@ set TZData(:Pacific/Fiji) {
     {2456316000 46800 1 FJST}
     {2462968800 43200 0 FJT}
     {2487765600 46800 1 FJST}
-    {2495023200 43200 0 FJT}
+    {2494418400 43200 0 FJT}
     {2519820000 46800 1 FJST}
-    {2526472800 43200 0 FJT}
+    {2525868000 43200 0 FJT}
     {2551269600 46800 1 FJST}
-    {2557922400 43200 0 FJT}
+    {2557317600 43200 0 FJT}
     {2582719200 46800 1 FJST}
     {2589372000 43200 0 FJT}
     {2614168800 46800 1 FJST}
@@ -98,9 +98,9 @@ set TZData(:Pacific/Fiji) {
     {2645618400 46800 1 FJST}
     {2652271200 43200 0 FJT}
     {2677068000 46800 1 FJST}
-    {2684325600 43200 0 FJT}
+    {2683720800 43200 0 FJT}
     {2709122400 46800 1 FJST}
-    {2715775200 43200 0 FJT}
+    {2715170400 43200 0 FJT}
     {2740572000 46800 1 FJST}
     {2747224800 43200 0 FJT}
     {2772021600 46800 1 FJST}
@@ -110,9 +110,9 @@ set TZData(:Pacific/Fiji) {
     {2834920800 46800 1 FJST}
     {2841573600 43200 0 FJT}
     {2866975200 46800 1 FJST}
-    {2873628000 43200 0 FJT}
+    {2873023200 43200 0 FJT}
     {2898424800 46800 1 FJST}
-    {2905077600 43200 0 FJT}
+    {2904472800 43200 0 FJT}
     {2929874400 46800 1 FJST}
     {2936527200 43200 0 FJT}
     {2961324000 46800 1 FJST}
@@ -120,11 +120,11 @@ set TZData(:Pacific/Fiji) {
     {2992773600 46800 1 FJST}
     {2999426400 43200 0 FJT}
     {3024223200 46800 1 FJST}
-    {3031480800 43200 0 FJT}
+    {3030876000 43200 0 FJT}
     {3056277600 46800 1 FJST}
-    {3062930400 43200 0 FJT}
+    {3062325600 43200 0 FJT}
     {3087727200 46800 1 FJST}
-    {3094380000 43200 0 FJT}
+    {3093775200 43200 0 FJT}
     {3119176800 46800 1 FJST}
     {3125829600 43200 0 FJT}
     {3150626400 46800 1 FJST}
@@ -132,9 +132,9 @@ set TZData(:Pacific/Fiji) {
     {3182076000 46800 1 FJST}
     {3188728800 43200 0 FJT}
     {3213525600 46800 1 FJST}
-    {3220783200 43200 0 FJT}
+    {3220178400 43200 0 FJT}
     {3245580000 46800 1 FJST}
-    {3252232800 43200 0 FJT}
+    {3251628000 43200 0 FJT}
     {3277029600 46800 1 FJST}
     {3283682400 43200 0 FJT}
     {3308479200 46800 1 FJST}
@@ -142,11 +142,11 @@ set TZData(:Pacific/Fiji) {
     {3339928800 46800 1 FJST}
     {3346581600 43200 0 FJT}
     {3371378400 46800 1 FJST}
-    {3378636000 43200 0 FJT}
+    {3378031200 43200 0 FJT}
     {3403432800 46800 1 FJST}
-    {3410085600 43200 0 FJT}
+    {3409480800 43200 0 FJT}
     {3434882400 46800 1 FJST}
-    {3441535200 43200 0 FJT}
+    {3440930400 43200 0 FJT}
     {3466332000 46800 1 FJST}
     {3472984800 43200 0 FJT}
     {3497781600 46800 1 FJST}
@@ -154,9 +154,9 @@ set TZData(:Pacific/Fiji) {
     {3529231200 46800 1 FJST}
     {3535884000 43200 0 FJT}
     {3560680800 46800 1 FJST}
-    {3567938400 43200 0 FJT}
+    {3567333600 43200 0 FJT}
     {3592735200 46800 1 FJST}
-    {3599388000 43200 0 FJT}
+    {3598783200 43200 0 FJT}
     {3624184800 46800 1 FJST}
     {3630837600 43200 0 FJT}
     {3655634400 46800 1 FJST}
@@ -166,9 +166,9 @@ set TZData(:Pacific/Fiji) {
     {3718533600 46800 1 FJST}
     {3725186400 43200 0 FJT}
     {3750588000 46800 1 FJST}
-    {3757240800 43200 0 FJT}
+    {3756636000 43200 0 FJT}
     {3782037600 46800 1 FJST}
-    {3788690400 43200 0 FJT}
+    {3788085600 43200 0 FJT}
     {3813487200 46800 1 FJST}
     {3820140000 43200 0 FJT}
     {3844936800 46800 1 FJST}
@@ -176,11 +176,11 @@ set TZData(:Pacific/Fiji) {
     {3876386400 46800 1 FJST}
     {3883039200 43200 0 FJT}
     {3907836000 46800 1 FJST}
-    {3915093600 43200 0 FJT}
+    {3914488800 43200 0 FJT}
     {3939890400 46800 1 FJST}
-    {3946543200 43200 0 FJT}
+    {3945938400 43200 0 FJT}
     {3971340000 46800 1 FJST}
-    {3977992800 43200 0 FJT}
+    {3977388000 43200 0 FJT}
     {4002789600 46800 1 FJST}
     {4009442400 43200 0 FJT}
     {4034239200 46800 1 FJST}
diff --git a/library/tzdata/Pacific/Norfolk b/library/tzdata/Pacific/Norfolk
index a8fac15..b12ab8c 100644
--- a/library/tzdata/Pacific/Norfolk
+++ b/library/tzdata/Pacific/Norfolk
@@ -4,4 +4,7 @@ set TZData(:Pacific/Norfolk) {
     {-9223372036854775808 40312 0 LMT}
     {-2177493112 40320 0 NMT}
     {-599656320 41400 0 NFT}
+    {152029800 45000 1 NFST}
+    {162912600 41400 0 NFT}
+    {1443882600 39600 0 NFT}
 }