Upgrade to tzdata2011i

Africa
- Added South Sudan: Africa/Juba

Australasia:
- Samoa will go forward 24 hours at 30 December 2011 to better match
  the day of the week with its neighbours.

Europe:
- Europe/Kaliningrad will have the timezone KALT.

North America:
- Updates to Metlakatla historical data
- Newfoundland, Labrador and Resolute will do something which I
  can't figure out.

iso3166tab;
- Add SS for South Sudan.

7 files changed, 53 insertions, 4 deletions

diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index a35abf8ef79c..0768022df1fe 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneinfo
-DISTVERSION=	2011h
+DISTVERSION=	2011i
 CATEGORIES=	misc
 MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
 DISTNAME=	tzdata${DISTVERSION}
@@ -35,7 +35,7 @@ MASTER_SITES+=	http://people.freebsd.org/~edwin/
 
 # The following country codes can be missing from /usr/share/misc/iso3166 and
 # shouldn't appear in the zoneinfo file.
-MISSING=	ax bl gg im je me mf rs
+MISSING=	ax bl bq cw gg im je me mf rs ss sx
 
 .ifndef NOMISSING
 .for M in ${MISSING}
diff --git a/misc/zoneinfo/distinfo b/misc/zoneinfo/distinfo
index be79bb643388..e2a0aa996a6f 100644
--- a/misc/zoneinfo/distinfo
+++ b/misc/zoneinfo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tzdata2011h.tar.gz) = c098786d053736dd18d4f1fbebdf41554c6fd702a36f75c18f1c66712d2abc24
-SIZE (tzdata2011h.tar.gz) = 196441
+SHA256 (tzdata2011i.tar.gz) = f8dde7ca5e61f21ac34c8cdbef5568d00c829981211098f059d8104964c81ffa
+SIZE (tzdata2011i.tar.gz) = 198665
diff --git a/misc/zoneinfo/files/patchremove-bq b/misc/zoneinfo/files/patchremove-bq
new file mode 100644
index 000000000000..842fa8da2eaa
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-bq
@@ -0,0 +1,11 @@
+--- zone.tab.orig	2011-09-01 17:55:11.000000000 +1000
++++ zone.tab	2011-09-01 17:55:21.000000000 +1000
+@@ -86,7 +86,7 @@
+ BM	+3217-06446	Atlantic/Bermuda
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
+-BQ	+120903-0681636	America/Kralendijk
++#BQ	+120903-0681636	America/Kralendijk
+ BR	-0351-03225	America/Noronha	Atlantic islands
+ BR	-0127-04829	America/Belem	Amapa, E Para
+ BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
diff --git a/misc/zoneinfo/files/patchremove-cw b/misc/zoneinfo/files/patchremove-cw
new file mode 100644
index 000000000000..79146ed1b0f7
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-cw
@@ -0,0 +1,11 @@
+--- zone.tab.orig	2011-09-01 17:55:33.000000000 +1000
++++ zone.tab	2011-09-01 17:56:54.000000000 +1000
+@@ -155,7 +155,7 @@
+ CR	+0956-08405	America/Costa_Rica
+ CU	+2308-08222	America/Havana
+ CV	+1455-02331	Atlantic/Cape_Verde
+-CW	+1211-06900	America/Curacao
++#CW	+1211-06900	America/Curacao
+ CX	-1025+10543	Indian/Christmas
+ CY	+3510+03322	Asia/Nicosia
+ CZ	+5005+01426	Europe/Prague
diff --git a/misc/zoneinfo/files/patchremove-ss b/misc/zoneinfo/files/patchremove-ss
new file mode 100644
index 000000000000..b0a81963105b
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-ss
@@ -0,0 +1,11 @@
+--- zone.tab.orig	2011-09-01 17:52:14.000000000 +1000
++++ zone.tab	2011-09-01 17:52:21.000000000 +1000
+@@ -361,7 +361,7 @@
+ SN	+1440-01726	Africa/Dakar
+ SO	+0204+04522	Africa/Mogadishu
+ SR	+0550-05510	America/Paramaribo
+-SS	+0451+03136	Africa/Juba
++#SS	+0451+03136	Africa/Juba
+ ST	+0020+00644	Africa/Sao_Tome
+ SV	+1342-08912	America/El_Salvador
+ SX	+180305-0630250	America/Lower_Princes
diff --git a/misc/zoneinfo/files/patchremove-sx b/misc/zoneinfo/files/patchremove-sx
new file mode 100644
index 000000000000..dc9ce4132802
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-sx
@@ -0,0 +1,11 @@
+--- zone.tab.orig	2011-09-01 17:57:06.000000000 +1000
++++ zone.tab	2011-09-01 17:57:40.000000000 +1000
+@@ -364,7 +364,7 @@
+ SS	+0451+03136	Africa/Juba
+ ST	+0020+00644	Africa/Sao_Tome
+ SV	+1342-08912	America/El_Salvador
+-SX	+180305-0630250	America/Lower_Princes
++#SX	+180305-0630250	America/Lower_Princes
+ SY	+3330+03618	Asia/Damascus
+ SZ	-2618+03106	Africa/Mbabane
+ TC	+2128-07108	America/Grand_Turk
diff --git a/misc/zoneinfo/pkg-plist b/misc/zoneinfo/pkg-plist
index 3c766fdb83f9..1da1a6ff8041 100644
--- a/misc/zoneinfo/pkg-plist
+++ b/misc/zoneinfo/pkg-plist
@@ -23,6 +23,7 @@
 %%DATADIR%%/Africa/Gaborone
 %%DATADIR%%/Africa/Harare
 %%DATADIR%%/Africa/Johannesburg
+%%DATADIR%%/Africa/Juba
 %%DATADIR%%/Africa/Kampala
 %%DATADIR%%/Africa/Khartoum
 %%DATADIR%%/Africa/Kigali
@@ -125,9 +126,11 @@
 %%DATADIR%%/America/Juneau
 %%DATADIR%%/America/Kentucky/Louisville
 %%DATADIR%%/America/Kentucky/Monticello
+%%DATADIR%%/America/Kralendijk
 %%DATADIR%%/America/La_Paz
 %%DATADIR%%/America/Lima
 %%DATADIR%%/America/Los_Angeles
+%%DATADIR%%/America/Lower_Princes
 %%DATADIR%%/America/Maceio
 %%DATADIR%%/America/Managua
 %%DATADIR%%/America/Manaus
@@ -449,12 +452,14 @@
 %%DATADIR%%/Pacific/Palau
 %%DATADIR%%/Pacific/Pitcairn
 %%DATADIR%%/Pacific/Pohnpei
+%%DATADIR%%/Pacific/Ponape
 %%DATADIR%%/Pacific/Port_Moresby
 %%DATADIR%%/Pacific/Rarotonga
 %%DATADIR%%/Pacific/Saipan
 %%DATADIR%%/Pacific/Tahiti
 %%DATADIR%%/Pacific/Tarawa
 %%DATADIR%%/Pacific/Tongatapu
+%%DATADIR%%/Pacific/Truk
 %%DATADIR%%/Pacific/Wake
 %%DATADIR%%/Pacific/Wallis
 %%DATADIR%%/WET