From 3cb2b7ac3b05d5f1e3c04c585bbd020424b6635e Mon Sep 17 00:00:00 2001 From: kurt Date: Fri, 13 Apr 2007 00:29:48 +0000 Subject: [PATCH] - work-around libpthread limitations in javaForkAndExec() by adjusting the child process to not set file descriptors back to blocking when closing them. This fixes the netbeans build failure since a libpthread fix is not evident. - update the North America time zone file to account for the tz changes (from ian@) - use X11BASE - SHARED_ONLY=Yes --- devel/jdk/1.5/Makefile | 9 +- ...-j2se_make_sun_javazic_tzdata_northamerica | 1858 +++++++++++++++++ ..._solaris_native_java_lang_UNIXProcess_md_c | 55 + devel/jdk/1.5/pkg/PFRAG.no-no_web-jre | 7 +- devel/jdk/1.5/pkg/PFRAG.no-no_web-main | 12 +- devel/jdk/1.5/pkg/PLIST-jre | 20 +- devel/jdk/1.5/pkg/PLIST-main | 20 +- 7 files changed, 1962 insertions(+), 19 deletions(-) create mode 100644 devel/jdk/1.5/patches/patch-j2se_make_sun_javazic_tzdata_northamerica create mode 100644 devel/jdk/1.5/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c diff --git a/devel/jdk/1.5/Makefile b/devel/jdk/1.5/Makefile index 896f7be2403..11565d74994 100644 --- a/devel/jdk/1.5/Makefile +++ b/devel/jdk/1.5/Makefile @@ -1,5 +1,6 @@ -# $OpenBSD: Makefile,v 1.35 2007/04/08 12:43:06 kurt Exp $ +# $OpenBSD: Makefile,v 1.36 2007/04/13 00:29:48 kurt Exp $ +SHARED_ONLY= Yes ONLY_FOR_ARCHS= amd64 i386 COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}" @@ -7,8 +8,8 @@ COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}" V= 1.5.0 DISTNAME= jdk-1_5_0 PKGNAME= jdk-${V} -PKGNAME-main= jdk-${V}p29 -PKGNAME-jre= jre-${V}p29 +PKGNAME-main= jdk-${V}p30 +PKGNAME-jre= jre-${V}p30 CATEGORIES= devel/jdk java @@ -55,7 +56,7 @@ MAKE_ENV= ALT_MOTIF_DIR="${LOCALBASE}" \ LANG="C" \ CC="${CC}" \ CXX="${CXX}" \ - DEFAULT_LD_LIBRARY_PATH="/usr/lib:/usr/X11R6/lib:${LOCALBASE}/lib" \ + DEFAULT_LD_LIBRARY_PATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \ HOTSPOT_BUILD_JOBS=`sysctl -n hw.ncpu` # Error message for distfile. diff --git a/devel/jdk/1.5/patches/patch-j2se_make_sun_javazic_tzdata_northamerica b/devel/jdk/1.5/patches/patch-j2se_make_sun_javazic_tzdata_northamerica new file mode 100644 index 00000000000..88bc64fcfba --- /dev/null +++ b/devel/jdk/1.5/patches/patch-j2se_make_sun_javazic_tzdata_northamerica @@ -0,0 +1,1858 @@ +$OpenBSD: patch-j2se_make_sun_javazic_tzdata_northamerica,v 1.1 2007/04/13 00:29:48 kurt Exp $ +--- j2se/make/sun/javazic/tzdata/northamerica.orig Mon Mar 26 14:20:30 2007 ++++ j2se/make/sun/javazic/tzdata/northamerica Mon Mar 26 14:20:40 2007 +@@ -1,11 +1,14 @@ +-# @(#)northamerica 7.63 ++# $OpenBSD: patch-j2se_make_sun_javazic_tzdata_northamerica,v 1.1 2007/04/13 00:29:48 kurt Exp $ ++# @(#)northamerica 8.12 ++# 
++
+ # also includes Central America and the Caribbean
+ 
+ # This data is by no means authoritative; if you think you know better,
+ # go ahead and edit the file (and please send any changes to
+ # tz@elsie.nci.nih.gov for general use in the future).
+ 
+-# From Paul Eggert  (1999-03-22):
++# From Paul Eggert (1999-03-22):
+ # A reliable and entertaining source about time zones is
+ # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
+ 
+@@ -24,12 +27,16 @@
+ # His proposal was adopted by the railroads on 1883-11-18 at 12:00,
+ # and the most of the country soon followed suit.
+ 
+-# From Paul Eggert  (1995-12-19):
++# From Paul Eggert (2005-04-16):
++# That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
++# See p 46 of David Prerau, Seize the daylight, Thunder's Mouth Press (2005).
++
++# From Paul Eggert (2006-03-22):
+ # A good source for time zone historical data in the US is
+ # Thomas G. Shanks, The American Atlas (5th edition),
+ # San Diego: ACS Publications, Inc. (1991).
+ # Make sure you have the errata sheet; the book is somewhat useless without it.
+-# It is the source for the US and Puerto Rico entries below.
++# It is the source for most of the pre-1991 US entries below.
+ 
+ # From Paul Eggert (2001-03-06):
+ # Daylight Saving Time was first suggested as a joke by Benjamin Franklin
+@@ -48,7 +55,8 @@
+ #	to push people into bed earlier, and get them up earlier, to make
+ #	them healthy, wealthy and wise in spite of themselves.
+ #
+-#	-- Robertson Davies, The Diary of Samuel Marchbanks (1947), XIX, Sunday
++#	-- Robertson Davies, The diary of Samuel Marchbanks,
++#	   Clarke, Irwin (1947), XIX, Sunday
+ #
+ # For more about the first ten years of DST in the United States, see
+ # Robert Garland's 
+@@ -78,7 +86,7 @@
+ # Time' instead of the old familiar 'Eastern War Time.'  Peace is wonderful."
+ #  (August 1945) by way of confirmation.
+ 
+-# From Joseph Gallant , citing
++# From Joseph Gallant citing
+ # George H. Douglas, _The Early Days of Radio Broadcasting_ (1987):
+ # At 7 P.M. (Eastern War Time) [on 1945-08-14], the networks were set
+ # to switch to London for Attlee's address, but the American people
+@@ -105,22 +113,47 @@
+ #
+ # He had scored a 20-second scoop on other broadcasters.
+ 
++# From Arthur David Olson (2005-08-22):
++# Paul has been careful to use the "US" rules only in those locations
++# that are part of the United States; this reflects the real scope of
++# U.S. government action.  So even though the "US" rules have changed
++# in the latest release, other countries won't be affected.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	US	1918	1919	-	Mar	lastSun	2:00	1:00	D
+ Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
+ Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
+ Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
+ Rule	US	1945	only	-	Sep	30	2:00	0	S
+-Rule	US	1967	max	-	Oct	lastSun	2:00	0	S
++Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
+ Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
+ Rule	US	1974	only	-	Jan	6	2:00	1:00	D
+ Rule	US	1975	only	-	Feb	23	2:00	1:00	D
+ Rule	US	1976	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+-# 
+-# H.R.177
+-#  (introduced 1999-01-06) would change April to March in the above rule.
++Rule	US	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
++Rule	US	2007	max	-	Mar	Sun>=8	2:00	1:00	D
++Rule	US	2007	max	-	Nov	Sun>=1	2:00	0	S
+ 
++# From Arthur David Olson, 2005-12-19
++# We generate the files specified below to guard against old files with
++# obsolete information being left in the time zone binary directory.
++# We limit the list to names that have appeared in previous versions of
++# this time zone package.
++# We do these as separate Zones rather than as Links to avoid problems if
++# a particular place changes whether it observes DST.
++# We put these specifications here in the northamerica file both to
++# increase the chances that they'll actually get compiled and to
++# avoid the need to duplicate the US rules in another file.
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone	EST		 -5:00	-	EST
++Zone	MST		 -7:00	-	MST
++Zone	HST		-10:00	-	HST
++Zone	EST5EDT		 -5:00	US	E%sT
++Zone	CST6CDT		 -6:00	US	C%sT
++Zone	MST7MDT		 -7:00	US	M%sT
++Zone	PST8PDT		 -8:00	US	P%sT
++
+ # From Bob Devine (1988-01-28):
+ # ...Alaska (and Hawaii) had the timezone names changed in 1967.
+ #    old			 new
+@@ -193,25 +226,57 @@ Rule	US	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+ #	Samoa standard time
+ # The law doesn't give abbreviations.
+ #
+-# From Paul Eggert (1995-12-19):
+-# Shanks uses 1983-10-30, not 1983-11-30, for the 1983 transitions.
+-# Go with Shanks.
+-#
+ # From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
+ # Public law 106-564 (2000-12-23) introduced the abbreviation
+ # "Chamorro Standard Time" for time in Guam and the Northern Marianas.
+ # See the file "australasia".
+ 
++# From Arthur David Olson, 2005-08-09
++# The following was signed into law on 2005-08-08.
++#
++# H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
++#   (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
++#   U.S.C. 260a(a)) is amended--
++#     (1) by striking `first Sunday of April' and inserting `second
++#     Sunday of March'; and
++#     (2) by striking `last Sunday of October' and inserting `first
++#     Sunday of November'.
++#   (b) Effective Date- Subsection (a) shall take effect 1 year after the
++#   date of enactment of this Act or March 1, 2007, whichever is later.
++#   (c) Report to Congress- Not later than 9 months after the effective
++#   date stated in subsection (b), the Secretary shall report to Congress
++#   on the impact of this section on energy consumption in the United
++#   States.
++#   (d) Right to Revert- Congress retains the right to revert the
++#   Daylight Saving Time back to the 2005 time schedules once the
++#   Department study is complete.
+ 
+ # US eastern time, represented by New York
+ 
+ # Connecticut, Delaware, District of Columbia, most of Florida,
+-# Georgia, southeast Indiana (Clark, Dearborn, Floyd, Harrison, and
+-# Ohio counties), eastern Kentucky, Maine, Maryland, Massachusetts,
++# Georgia, southeast Indiana (Dearborn and Ohio counties), eastern Kentucky
++# (except America/Kentucky/Louisville below), Maine, Maryland, Massachusetts,
+ # New Hampshire, New Jersey, New York, North Carolina, Ohio,
+ # Pennsylvania, Rhode Island, South Carolina, eastern Tennessee,
+ # Vermont, Virginia, West Virginia
+ 
++# From Dave Cantor (2004-11-02):
++# Early this summer I had the occasion to visit the Mount Washington
++# Observatory weather station atop (of course!) Mount Washington [, NH]....
++# One of the staff members said that the station was on Eastern Standard Time
++# and didn't change their clocks for Daylight Saving ... so that their
++# reports will always have times which are 5 hours behind UTC.
++
++# From Paul Eggert (2005-08-26):
++# According to today's Huntsville Times
++# 
++# a few towns on Alabama's "eastern border with Georgia, such as Phenix City
++# in Russell County, Lanett in Chambers County and some towns in Lee County,
++# set their watches and clocks on Eastern time."  It quotes H.H. "Bubba"
++# Roberts, city administrator in Phenix City. as saying "We are in the Central
++# time zone, but we do go by the Eastern time zone because so many people work
++# in Columbus."
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
+ Rule	NYC	1920	only	-	Oct	lastSun	2:00	0	S
+@@ -219,7 +284,7 @@ Rule	NYC	1921	1966	-	Apr	lastSun	2:00	1:00	D
+ Rule	NYC	1921	1954	-	Sep	lastSun	2:00	0	S
+ Rule	NYC	1955	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:00
++Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:03:58
+ 			-5:00	US	E%sT	1920
+ 			-5:00	NYC	E%sT	1942
+ 			-5:00	US	E%sT	1946
+@@ -228,13 +293,22 @@ Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:00
+ 
+ # US central time, represented by Chicago
+ 
+-# Alabama, Arkansas, Florida panhandle, Illinois, western Indiana
++# Alabama, Arkansas, Florida panhandle (Bay, Calhoun, Escambia,
++# Gulf, Holmes, Jackson, Okaloosa, Santa Rosa, Walton, and
++# Washington counties), Illinois, western Indiana
+ # (Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer,
+ # Vanderburgh, and Warrick counties), Iowa, most of Kansas, western
+ # Kentucky, Louisiana, Minnesota, Mississippi, Missouri, eastern
+ # Nebraska, eastern North Dakota, Oklahoma, eastern South Dakota,
+ # western Tennessee, most of Texas, Wisconsin
+ 
++# From Larry M. Smith (2006-04-26) re Wisconsin:
++# http://www.legis.state.wi.us/statutes/Stat0175.pdf ...
++# is currently enforced at the 01:00 time of change.  Because the local
++# "bar time" in the state corresponds to 02:00, a number of citations
++# are issued for the "sale of class 'B' alcohol after prohibited
++# hours" within the deviated hour of this change every year....
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
+ Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
+@@ -243,7 +317,7 @@ Rule	Chicago	1922	1966	-	Apr	lastSun	2:00	1:00	D
+ Rule	Chicago	1922	1954	-	Sep	lastSun	2:00	0	S
+ Rule	Chicago	1955	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:00
++Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
+ 			-6:00	US	C%sT	1920
+ 			-6:00	Chicago	C%sT	1936 Mar  1 2:00
+ 			-5:00	-	EST	1936 Nov 15 2:00
+@@ -252,13 +326,23 @@ Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:00
+ 			-6:00	Chicago	C%sT	1967
+ 			-6:00	US	C%sT
+ # Oliver County, ND switched from mountain to central time on 1992-10-25.
+-Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:00
++Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
+ 			-7:00	US	M%sT	1992 Oct 25 02:00
+ 			-6:00	US	C%sT
++# Morton County, ND, switched from mountain to central time on
++# 2003-10-26, except for the area around Mandan which was already central time.
++# See .
++# Officially this switch also included part of Sioux County, and
++# Jones, Mellette, and Todd Counties in South Dakota;
++# but in practice these other counties were already observing central time.
++# See .
++Zone America/North_Dakota/New_Salem -6:45:39 - LMT 1883 Nov 18 12:14:21
++			-7:00	US	M%sT	2003 Oct 26 02:00
++			-6:00	US	C%sT
+ 
+ # US mountain time, represented by Denver
+ #
+-# Colorado, southern Idaho, far western Kansas, Montana, western
++# Colorado, far western Kansas, Montana, western
+ # Nebraska, Nevada border (Jackpot, Owyhee, and Mountain City),
+ # New Mexico, southwestern North Dakota, far eastern Oregon,
+ # western South Dakota, far western Texas (El Paso County, Hudspeth County,
+@@ -271,7 +355,7 @@ Rule	Denver	1921	only	-	May	22	2:00	0	S
+ Rule	Denver	1965	1966	-	Apr	lastSun	2:00	1:00	D
+ Rule	Denver	1965	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00
++Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00:04
+ 			-7:00	US	M%sT	1920
+ 			-7:00	Denver	M%sT	1942
+ 			-7:00	US	M%sT	1946
+@@ -280,7 +364,9 @@ Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00
+ 
+ # US Pacific time, represented by Los Angeles
+ #
+-# California, northern Idaho, most of Nevada, most of Oregon, and Washington
++# California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
++# Idaho, Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties),
++# most of Nevada, most of Oregon, and Washington
+ #
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	CA	1948	only	-	Mar	14	2:00	1:00	D
+@@ -289,7 +375,7 @@ Rule	CA	1950	1966	-	Apr	lastSun	2:00	1:00	D
+ Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
+ Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:00
++Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:07:02
+ 			-8:00	US	P%sT	1946
+ 			-8:00	CA	P%sT	1967
+ 			-8:00	US	P%sT
+@@ -319,21 +405,24 @@ Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+ 			 -8:00	US	P%sT	1946
+ 			 -8:00	-	PST	1969
+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+ 			 -9:18:55 -	LMT	1900 Aug 20 12:00
+ 			 -9:00	-	YST	1942
+ 			 -9:00	US	Y%sT	1946
+ 			 -9:00	-	YST	1969
+-			 -9:00	US	Y%sT	1983 Oct 30 2:00
++			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Anchorage	 14:00:24 -	LMT	1867 Oct 18
+ 			 -9:59:36 -	LMT	1900 Aug 20 12:00
+ 			-10:00	-	CAT	1942
+-			-10:00	US	CAT/CAWT 1946
++			-10:00	US	CAT/CAWT 1945 Aug 14 23:00u
++			-10:00	US	CAT/CAPT 1946 # Peace
+ 			-10:00	-	CAT	1967 Apr
+ 			-10:00	-	AHST	1969
+ 			-10:00	US	AH%sT	1983 Oct 30 2:00
++			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Nome	 12:58:21 -	LMT	1867 Oct 18
+ 			-11:01:38 -	LMT	1900 Aug 20 12:00
+@@ -342,6 +431,7 @@ Zone America/Nome	 12:58:21 -	LMT	1867 Oct 18
+ 			-11:00	-	NST	1967 Apr
+ 			-11:00	-	BST	1969
+ 			-11:00	US	B%sT	1983 Oct 30 2:00
++			 -9:00	US	Y%sT	1983 Nov 30
+ 			 -9:00	US	AK%sT
+ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
+ 			-11:46:38 -	LMT	1900 Aug 20 12:00
+@@ -350,11 +440,28 @@ Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
+ 			-11:00	-	NST	1967 Apr
+ 			-11:00	-	BST	1969
+ 			-11:00	US	B%sT	1983 Oct 30 2:00
++			-10:00	US	AH%sT	1983 Nov 30
+ 			-10:00	US	HA%sT
++# The following switches don't quite make our 1970 cutoff.
++#
+ # Shanks writes that part of southwest Alaska (e.g. Aniak)
+ # switched from -11:00 to -10:00 on 1968-09-22 at 02:00,
+ # and another part (e.g. Akiak) made the same switch five weeks later.
+-# These switches don't quite make our 1970 cutoff.
++#
++# From David Flater (2004-11-09):
++# In e-mail, 2004-11-02, Ray Hudson, historian/liaison to the Unalaska
++# Historic Preservation Commission, provided this information, which
++# suggests that Unalaska deviated from statutory time from early 1967
++# possibly until 1983:
++#
++#  Minutes of the Unalaska City Council Meeting, January 10, 1967:
++#  "Except for St. Paul and Akutan, Unalaska is the only important
++#  location not on Alaska Standard Time.  The following resolution was
++#  made by William Robinson and seconded by Henry Swanson:  Be it
++#  resolved that the City of Unalaska hereby goes to Alaska Standard
++#  Time as of midnight Friday, January 13, 1967 (1 A.M. Saturday,
++#  January 14, Alaska Standard Time.)  This resolution was passed with
++#  three votes for and one against."
+ 
+ # Hawaii
+ #
+@@ -396,7 +503,7 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1900 Jan  1 12:0
+ # Shanks says the 1944 experiment came to an end on 1944-03-17.
+ # Go with the Arizona State Library instead.
+ 
+-Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 12:00
++Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
+ 			-7:00	US	M%sT	1944 Jan  1 00:01
+ 			-7:00	-	MST	1944 Apr  1 00:01
+ 			-7:00	US	M%sT	1944 Oct  1 00:01
+@@ -405,16 +512,22 @@ Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 12:00
+ 			-7:00	-	MST
+ # From Arthur David Olson (1988-02-13):
+ # A writer from the Inter Tribal Council of Arizona, Inc.,
+-# notes in private correspondence dated 12/28/87 that "Presently, only the
++# notes in private correspondence dated 1987-12-28 that "Presently, only the
+ # Navajo Nation participates in the Daylight Saving Time policy, due to its
+ # large size and location in three states."  (The "only" means that other
+ # tribal nations don't use DST.)
+ 
+ Link America/Denver America/Shiprock
+ 
+-# Southern Idaho and eastern Oregon switched four weeks late in 1974.
++# Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
++# Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
++# Custer, Elmore, Franklin, Fremont, Gem, Gooding, Jefferson, Jerome,
++# Lemhi, Lincoln, Madison, Minidoka, Oneida, Owyhee, Payette, Power,
++# Teton, Twin Falls, Valley, Washington counties) and eastern Oregon
++# switched four weeks late in 1974.
++#
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:00
++Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
+ 			-8:00	US	P%sT	1923 May 13 2:00
+ 			-7:00	US	M%sT	1974
+ 			-7:00	-	MST	1974 Feb  3 2:00
+@@ -425,40 +538,63 @@ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:00
+ # For a map of Indiana's time zone regions, see:
+ # 
+ # What time is it in Indiana?
+-#  (1999-04-06)
++#  (2006-03-01)
+ #
+-# From Paul Eggert (1995-12-19):
+-# Indiana generally observes either EST all year, or CST/CDT,
+-# but areas near Cincinnati and Louisville use those cities' timekeeping
+-# and in 1969 and 1970 the whole state observed daylight time;
+-# and there are other exceptions as noted below.
+-# Shanks partitions Indiana into 345 regions, each with its own time history,
+-# and writes ``Even newspaper reports present contradictory information.''
+-# Fortunately, most of the complexity occurred before our cutoff date of 1970.
++# From Paul Eggert (2006-03-22):
++# Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
++# with the following exceptions:
+ #
+-# Since 1970, EST-only Indiana has been like America/Indianapolis,
+-# with exceptions noted below for Crawford, Starke, and Switzerland counties.
+-# The parts of Indiana not listed below have been like America/Chicago,
+-# America/Louisville, or America/New_York.
++# - Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer,
++#   Vandenburgh, and Warrick counties have been like America/Chicago.
+ #
++# - Dearborn and Ohio counties have been like America/New_York.
++#
++# - Clark, Floyd, and Harrison counties have been like
++#   America/Kentucky/Louisville.
++#
++# - Daviess, Dubois, Knox, Martin, Perry, and Pulaski counties
++#   have been like America/Indiana/Vincennes.
++#
++# - Crawford, Pike, Starke, and Switzerland counties have their own time zone
++#   histories as noted below.
++#
++# Shanks partitioned Indiana into 345 regions, each with its own time history,
++# and wrote ``Even newspaper reports present contradictory information.''
++# Those Hoosiers!  Such a flighty and changeable people!
++# Fortunately, most of the complexity occurred before our cutoff date of 1970.
++#
+ # Other than Indianapolis, the Indiana place names are so nondescript
+ # that they would be ambiguous if we left them at the `America' level.
+ # So we reluctantly put them all in a subdirectory `America/Indiana'.
+-#
+-# Most of EST-only Indiana last observed DST in 1970.
+ 
+-# From Paul Eggert (2001-03-06), following a tip by Markus Kuhn:
+-# Pam Belluck reported in the New York Times (2001-01-31) that the
+-# Indiana Legislature is considering a bill to adopt DST statewide.
+-# Her article mentioned Vevay, whose post office observes a different
+-# time zone from Danner's Hardware across the street.
++# From Paul Eggert (2005-08-16):
++# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
+ 
++# From Nathan Stratton Treadway (2006-03-30):
++# http://www.dot.gov/affairs/dot0406.htm [3705 B]
++# From Deborah Goldsmith (2006-01-18):
++# http://dmses.dot.gov/docimages/pdf95/382329_web.pdf [2.9 MB]
++# From Paul Eggert (2006-01-20):
++# It says "DOT is relocating the time zone boundary in Indiana to move Starke,
++# Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
++# Eastern Time Zone to the Central Time Zone.... The effective date of
++# this rule is 2:OO a.m. EST Sunday, April 2, 2006, which is the
++# changeover date from standard time to Daylight Saving Time."
++# Strictly speaking, this means the affected counties will change their
++# clocks twice that night, but this obviously is in error.  The intent
++# is that 01:59:59 EST be followed by 02:00:00 CDT.
++
++# From Gwillim Law (2007-02-10):
++# The Associated Press has been reporting that Pulaski County, Indiana is
++# going to switch from Central to Eastern Time on March 11, 2007....
++# http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/702070524/0/LOCAL
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
+ Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
+ Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:00
++Zone America/Indiana/Indianapolis -5:44:38 - LMT 1883 Nov 18 12:15:22
+ 			-6:00	US	C%sT	1920
+ 			-6:00 Indianapolis C%sT	1942
+ 			-6:00	US	C%sT	1946
+@@ -467,27 +603,66 @@ Zone America/Indianapolis -5:44:38 - LMT 1883 Nov 18 1
+ 			-6:00	-	CST	1958 Apr 27 2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1971
+-			-5:00	-	EST
+-Link America/Indianapolis America/Indiana/Indianapolis
++			-5:00	-	EST	2006
++			-5:00	US	E%sT
+ #
+-# Part of Crawford County, Indiana, last observed DST in 1975,
+-# and left its clocks alone in 1974.
++# Eastern Crawford County, Indiana, left its clocks alone in 1974,
++# as well as from 1976 through 2005.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule	Marengo	1951	only	-	Apr	lastSun	2:00	1:00	D
+ Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
+ Rule	Marengo	1954	1960	-	Apr	lastSun	2:00	1:00	D
+ Rule	Marengo	1954	1960	-	Sep	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:00
++Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:14:37
+ 			-6:00	US	C%sT	1951
+ 			-6:00	Marengo	C%sT	1961 Apr 30 2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1974 Jan  6 2:00
+ 			-6:00	1:00	CDT	1974 Oct 27 2:00
+ 			-5:00	US	E%sT	1976
+-			-5:00	-	EST
++			-5:00	-	EST	2006
++			-5:00	US	E%sT
+ #
+-# Starke County, Indiana
++# Daviess, Dubois, Knox, Martin, and Perry Counties, Indiana,
++# switched from eastern to central time in April 2006.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
++Rule Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
++Rule Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
++Rule Vincennes	1953	1954	-	Apr	lastSun	2:00	1:00	D
++Rule Vincennes	1953	1959	-	Sep	lastSun	2:00	0	S
++Rule Vincennes	1955	only	-	May	 1	0:00	1:00	D
++Rule Vincennes	1956	1963	-	Apr	lastSun	2:00	1:00	D
++Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
++Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
++Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
++			-6:00	US	C%sT	1946
++			-6:00 Vincennes	C%sT	1964 Apr 26 2:00
++			-5:00	-	EST	1969
++			-5:00	US	E%sT	1971
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT
++#
++# Pike County, Indiana moved from central to eastern time in 1977,
++# then switched back in 2006.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
++Rule	Pike	1955	only	-	May	 1	0:00	1:00	D
++Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
++Rule	Pike	1956	1964	-	Apr	lastSun	2:00	1:00	D
++Rule	Pike	1961	1964	-	Oct	lastSun	2:00	0	S
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
++			-6:00	US	C%sT	1955
++			-6:00	Pike	C%sT	1965 Apr 25 2:00
++			-5:00	-	EST	1966 Oct 30 2:00
++			-6:00	US	C%sT	1977 Oct 30 2:00
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT
++#
++# Starke County, Indiana moved from central to eastern time in 1991,
++# then switched back in 2006.
+ # From Arthur David Olson (1991-10-28):
+ # An article on page A3 of the Sunday, 1991-10-27 Washington Post
+ # notes that Starke County switched from Central time to Eastern time as of
+@@ -499,23 +674,42 @@ Rule	Starke	1955	1956	-	Oct	lastSun	2:00	0	S
+ Rule	Starke	1957	1958	-	Sep	lastSun	2:00	0	S
+ Rule	Starke	1959	1961	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:00
++Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:13:30
+ 			-6:00	US	C%sT	1947
+ 			-6:00	Starke	C%sT	1962 Apr 29 2:00
+ 			-5:00	-	EST	1963 Oct 27 2:00
+ 			-6:00	US	C%sT	1991 Oct 27 2:00
+-			-5:00	-	EST
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT
+ #
+-# Switzerland County, Indiana, last observed DST in 1972.
++# Pulaski County, Indiana, switched from eastern to central time in
++# April 2006 and then switched back in March 2007.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
++Rule	Pulaski	1946	1960	-	Apr	lastSun	2:00	1:00	D
++Rule	Pulaski	1946	1954	-	Sep	lastSun	2:00	0	S
++Rule	Pulaski	1955	1956	-	Oct	lastSun	2:00	0	S
++Rule	Pulaski	1957	1960	-	Sep	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:00
++Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
++			-6:00	US	C%sT	1946
++			-6:00	Pulaski	C%sT	1961 Apr 30 2:00
++			-5:00	-	EST	1969
++			-5:00	US	E%sT	1971
++			-5:00	-	EST	2006 Apr  2 2:00
++			-6:00	US	C%sT	2007 Mar 11 2:00
++			-5:00	US	E%sT
++#
++# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
+ 			-6:00	US	C%sT	1954 Apr 25 2:00
+ 			-5:00	-	EST	1969
+ 			-5:00	US	E%sT	1973
+-			-5:00	-	EST
++			-5:00	-	EST	2006
++			-5:00	US	E%sT
+ 
+ # Part of Kentucky left its clocks alone in 1974.
+-# This also includes a part of Indiana immediately adjacent to Louisville.
++# This also includes Clark, Floyd, and Harrison counties in Indiana.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule Louisville	1921	only	-	May	1	2:00	1:00	D
+ Rule Louisville	1921	only	-	Sep	1	2:00	0	S
+@@ -525,7 +719,7 @@ Rule Louisville	1946	only	-	Jun	2	2:00	0	S
+ Rule Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
+ Rule Louisville	1956	1960	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Louisville	-5:43:02 -	LMT	1883 Nov 18 12:00
++Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
+ 			-6:00	US	C%sT	1921
+ 			-6:00 Louisville C%sT	1942
+ 			-6:00	US	C%sT	1946
+@@ -534,9 +728,8 @@ Zone America/Louisville	-5:43:02 -	LMT	1883 Nov 18 12:
+ 			-5:00	US	E%sT	1974 Jan  6 2:00
+ 			-6:00	1:00	CDT	1974 Oct 27 2:00
+ 			-5:00	US	E%sT
+-Link America/Louisville America/Kentucky/Louisville
+ #
+-# Wayne, Clinton, and Russell Counties, Kentucky
++# Wayne County, Kentucky
+ #
+ # From
+ # 
+@@ -562,7 +755,7 @@ Link America/Louisville America/Kentucky/Louisville
+ # Federal Register 65, 160 (2000-08-17), page 50154-50158.
+ # 
+ #
+-Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:00
++Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
+ 			-6:00	US	C%sT	1946
+ 			-6:00	-	CST	1968
+ 			-6:00	US	C%sT	2000 Oct 29  2:00
+@@ -633,7 +826,8 @@ Zone America/Detroit	-5:32:11 -	LMT	1905
+ 			-5:00	-	EST	1975 Apr 27 2:00
+ 			-5:00	US	E%sT
+ #
+-# The Michigan border with Wisconsin switched from EST to CST/CDT in 1973.
++# Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
++# switched from EST to CST/CDT in 1973.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
+ Rule Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
+ Rule Menominee	1946	only	-	Sep	lastSun	2:00	0	S
+@@ -657,24 +851,13 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:0
+ # _Los Angeles Times_ (1998-11-10), A1, A10; it cites
+ # Jimmy Skaggs, _The Great Guano Rush_ (1994).
+ 
+-# Old names, for S5 users
+-
+-# Link	LINK-FROM		LINK-TO
+-Link	America/New_York	EST5EDT
+-Link	America/Chicago		CST6CDT
+-Link	America/Denver		MST7MDT
+-Link	America/Los_Angeles	PST8PDT
+-Link	America/Indianapolis	EST
+-Link	America/Phoenix		MST
+-Link	Pacific/Honolulu	HST
+-
+ ################################################################################
+ 
+ 
+-# From Paul Eggert  (1999-10-29):
+-# A good source for time zone historical data outside the US is
+-# Thomas G. Shanks, The International Atlas (5th edition),
+-# San Diego: ACS Publications, Inc. (1999).
++# From Paul Eggert (2006-03-22):
++# A good source for time zone historical data outside the U.S. is
++# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
++# San Diego: ACS Publications, Inc. (2003).
+ #
+ # Gwillim Law writes that a good source
+ # for recent time zone data is the International Air Transport
+@@ -682,8 +865,8 @@ Link	Pacific/Honolulu	HST
+ # published semiannually.  Law sent in several helpful summaries
+ # of the IATA's data after 1990.
+ #
+-# Except where otherwise noted, Shanks is the source for entries through 1990,
+-# and IATA SSIM is the source for entries after 1990.
++# Except where otherwise noted, Shanks & Pottenger is the source for
++# entries through 1990, and IATA SSIM is the source for entries afterwards.
+ #
+ # Other sources occasionally used include:
+ #
+@@ -699,7 +882,7 @@ Link	Pacific/Honolulu	HST
+ 
+ # Canada
+ 
+-# From Alain LaBont  (1994-11-14):
++# From Alain LaBont (1994-11-14):
+ # I post here the time zone abbreviations standardized in Canada
+ # for both English and French in the CAN/CSA-Z234.4-89 standard....
+ #
+@@ -728,24 +911,77 @@ Link	Pacific/Honolulu	HST
+ #	T: de Terre-Neuve
+ #	Y: du Yukon		Yukon
+ #
+-# From Paul Eggert  (1994-11-22):
++# From Paul Eggert (1994-11-22):
+ # Alas, this sort of thing must be handled by localization software.
+ 
+-# Unless otherwise specified, the data for Canada are all from Shanks.
++# Unless otherwise specified, the data for Canada are all from Shanks
++# & Pottenger.
+ 
+-# From Paul Eggert (2000-10-02):
++# From Chris Walton (2006-04-01, 2006-04-25, 2006-06-26, 2007-01-31):
++# The British Columbia government announced yesterday that it will
++# adjust daylight savings next year to align with changes in the
++# U.S. and the rest of Canada....
++# http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm
++# ...
++# Nova Scotia
++# Daylight saving time will be extended by four weeks starting in 2007....
++# http://www.gov.ns.ca/just/regulations/rg2/2006/ma1206.pdf
++#
++# [For New Brunswick] the new legislation dictates that the time change is to
++# be done at 02:00 instead of 00:01.
++# http://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
++# ...
++# Manitoba has traditionally changed the clock every fall at 03:00.
++# As of 2006, the transition is to take place one hour earlier at 02:00.
++# http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
++# ...
++# [Alberta, Ontario, Quebec] will follow US rules.
++# http://www.qp.gov.ab.ca/documents/spring/CH03_06.CFM
++# http://www.e-laws.gov.on.ca/DBLaws/Source/Regs/English/2006/R06111_e.htm
++# http://www2.publicationsduquebec.gouv.qc.ca/dynamicSearch/telecharge.php?type=5&file=2006C39A.PDF
++# ...
++# P.E.I. will follow US rules....
++# http://www.assembly.pe.ca/bills/pdf_chapter/62/3/chapter-41.pdf
++# ...
++# Province of Newfoundland and Labrador....
++# http://www.hoa.gov.nl.ca/hoa/bills/Bill0634.htm
++# ...
++# Yukon
++# http://www.gov.yk.ca/legislation/regs/oic2006_127.pdf
++# ...
++# N.W.T. will follow US rules.  Whoever maintains the government web site
++# does not seem to believe in bookmarks.  To see the news release, click the
++# following link and search for "Daylight Savings Time Change".  Press the
++# "Daylight Savings Time Change" link; it will fire off a popup using
++# JavaScript.
++# http://www.exec.gov.nt.ca/currentnews/currentPR.asp?mode=archive
++# ...
++# No formal announcement has been made from the Nunavut Government.
++# The premier of Nunavut claimed in August of 2005 that he did not
++# want to touch the issue; nothing more has been heard since.  It is
++# likely Nunavut will eventually follow the rest of the country but
++# there will certainly be confusion on March 11/2007 if no formal
++# announcement is made.  Currently the TZ database and Microsoft make
++# assumptions that Nunavut will follow the rest of the country.
++
++
++# From Paul Eggert (2006-04-25):
+ # H. David Matthews and Mary Vincent's map
+-# 
++# 
+ # "It's about TIME", _Canadian Geographic_ (September-October 1998)
+ #  contains detailed boundaries for regions observing nonstandard
+ # time and daylight saving time arrangements in Canada circa 1998.
+ #
+-# INMS, the Institute for National Measurement Standards in Ottawa, has
+-# 
++# INMS, the Institute for National Measurement Standards in Ottawa, has 
+ # information about standard and daylight saving time zones in Canada.
+ #  (updated periodically).
+ # Its unofficial information is often taken from Matthews and Vincent.
+ 
++# From Paul Eggert (2006-06-27):
++# For now, assume all of DST-observing Canada will fall into line with the
++# new US DST rules,
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
+ Rule	Canada	1918	only	-	Oct	31	2:00	0	S
+@@ -753,11 +989,13 @@ Rule	Canada	1942	only	-	Feb	 9	2:00	1:00	W # War
+ Rule	Canada	1945	only	-	Aug	14	23:00u	1:00	P # Peace
+ Rule	Canada	1945	only	-	Sep	30	2:00	0	S
+ Rule	Canada	1974	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	Canada	1974	max	-	Oct	lastSun	2:00	0	S
+-Rule	Canada	1987	max	-	Apr	Sun>=1	2:00	1:00	D
++Rule	Canada	1974	2006	-	Oct	lastSun	2:00	0	S
++Rule	Canada	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
++Rule	Canada	2007	max	-	Mar	Sun>=8	2:00	1:00	D
++Rule	Canada	2007	max	-	Nov	Sun>=1	2:00	0	S
+ 
+ 
+-# Newfoundland (and far southeast Labrador)
++# Newfoundland and Labrador
+ 
+ # From Paul Eggert (2000-10-02):
+ # Matthews and Vincent (1998) write that Labrador should use NST/NDT,
+@@ -768,20 +1006,21 @@ Rule	Canada	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	StJohns	1917	only	-	Apr	 8	2:00	1:00	D
+ Rule	StJohns	1917	only	-	Sep	17	2:00	0	S
+-# Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks.
++# Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
+ Rule	StJohns	1919	only	-	May	 5	23:00	1:00	D
+ Rule	StJohns	1919	only	-	Aug	12	23:00	0	S
+-# For 1931-1935 Whitman gives Apr same date; go with Shanks.
++# For 1931-1935 Whitman gives Apr same date; go with Shanks & Pottenger.
+ Rule	StJohns	1920	1935	-	May	Sun>=1	23:00	1:00	D
+ Rule	StJohns	1920	1935	-	Oct	lastSun	23:00	0	S
+-# For 1936-1941 Whitman gives May Sun>=8 and Oct Sun>=1; go with Shanks.
++# For 1936-1941 Whitman gives May Sun>=8 and Oct Sun>=1; go with Shanks &
++# Pottenger.
+ Rule	StJohns	1936	1941	-	May	Mon>=9	0:00	1:00	D
+ Rule	StJohns	1936	1941	-	Oct	Mon>=2	0:00	0	S
+ # Whitman gives the following transitions:
+ # 1942 03-01/12-31, 1943 05-30/09-05, 1944 07-10/09-02, 1945 01-01/10-07
+-# but go with Shanks and assume they used Canadian rules.
++# but go with Shanks & Pottenger and assume they used Canadian rules.
+ # For 1946-9 Whitman gives May 5,4,9,1 - Oct 1,5,3,2, and for 1950 he gives
+-# Apr 30 - Sep 24; go with Shanks.
++# Apr 30 - Sep 24; go with Shanks & Pottenger.
+ Rule	StJohns	1946	1950	-	May	Sun>=8	2:00	1:00	D
+ Rule	StJohns	1946	1950	-	Oct	Sun>=2	2:00	0	S
+ Rule	StJohns	1951	1986	-	Apr	lastSun	2:00	1:00	D
+@@ -791,9 +1030,12 @@ Rule	StJohns	1960	1986	-	Oct	lastSun	2:00	0	S
+ # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
+ # at 00:01 local time.  For now, assume it started in 1987.
+ Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
+-Rule	StJohns	1987	max	-	Oct	lastSun	0:01	0	S
++Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
+ Rule	StJohns	1988	only	-	Apr	Sun>=1	0:01	2:00	DD
+-Rule	StJohns	1989	max	-	Apr	Sun>=1	0:01	1:00	D
++Rule	StJohns	1989	2006	-	Apr	Sun>=1	0:01	1:00	D
++Rule	StJohns	2007	max	-	Mar	Sun>=8	0:01	1:00	D
++Rule	StJohns	2007	max	-	Nov	Sun>=1	0:01	0	S
++#
+ # St John's has an apostrophe, but Posix file names can't have apostrophes.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/St_Johns	-3:30:52 -	LMT	1884
+@@ -819,62 +1061,58 @@ Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Val
+ 			-4:00	StJohns	A%sT
+ 
+ 
+-# west Labrador, New Brunswick, Nova Scotia, Prince Edward I
++# west Labrador, Nova Scotia, Prince Edward I
+ 
+-# From Paul Eggert (1996-06-12):
+-# Shanks writes that since 1970 most of this region has been like Halifax.
+-# Many locales did not observe peacetime DST until 1972;
++# From Paul Eggert (2006-03-22):
++# Shanks & Pottenger write that since 1970 most of this region has been like
++# Halifax.  Many locales did not observe peacetime DST until 1972;
+ # Glace Bay, NS is the largest that we know of.
+-# Shanks also writes that Liverpool, NS was the only town in Canada to observe
+-# DST in 1971 but not 1970; for now we'll assume this is a typo.
++# Shanks & Pottenger also write that Liverpool, NS was the only town
++# in Canada to observe DST in 1971 but not 1970; for now we'll assume
++# this is a typo.
+ 
+-# From Paul Eggert (2000-10-02):
+-# INMS (2000-09-12) says that, since 1988 at least, New Brunswick switches
+-# at 00:01 local time.  FIXME: verify and create a new Zone for this.
+-
+-
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule Halifax	1916	only	-	Apr	 1	0:00	1:00	D
+-Rule Halifax	1916	only	-	Oct	 1	0:00	0	S
+-Rule Halifax	1920	only	-	May	 9	0:00	1:00	D
+-Rule Halifax	1920	only	-	Aug	29	0:00	0	S
+-Rule Halifax	1921	only	-	May	 6	0:00	1:00	D
+-Rule Halifax	1921	1922	-	Sep	 5	0:00	0	S
+-Rule Halifax	1922	only	-	Apr	30	0:00	1:00	D
+-Rule Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
+-Rule Halifax	1923	only	-	Sep	 4	0:00	0	S
+-Rule Halifax	1924	only	-	Sep	15	0:00	0	S
+-Rule Halifax	1925	only	-	Sep	28	0:00	0	S
+-Rule Halifax	1926	only	-	May	16	0:00	1:00	D
+-Rule Halifax	1926	only	-	Sep	13	0:00	0	S
+-Rule Halifax	1927	only	-	May	 1	0:00	1:00	D
+-Rule Halifax	1927	only	-	Sep	26	0:00	0	S
+-Rule Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
+-Rule Halifax	1928	only	-	Sep	 9	0:00	0	S
+-Rule Halifax	1929	only	-	Sep	 3	0:00	0	S
+-Rule Halifax	1930	only	-	Sep	15	0:00	0	S
+-Rule Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
+-Rule Halifax	1932	only	-	May	 1	0:00	1:00	D
+-Rule Halifax	1933	only	-	Apr	30	0:00	1:00	D
+-Rule Halifax	1933	only	-	Oct	 2	0:00	0	S
+-Rule Halifax	1934	only	-	May	20	0:00	1:00	D
+-Rule Halifax	1934	only	-	Sep	16	0:00	0	S
+-Rule Halifax	1935	only	-	Jun	 2	0:00	1:00	D
+-Rule Halifax	1935	only	-	Sep	30	0:00	0	S
+-Rule Halifax	1936	only	-	Jun	 1	0:00	1:00	D
+-Rule Halifax	1936	only	-	Sep	14	0:00	0	S
+-Rule Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
+-Rule Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
+-Rule Halifax	1939	only	-	May	28	0:00	1:00	D
+-Rule Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
+-Rule Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
+-Rule Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
+-Rule Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
+-Rule Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
+-Rule Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
++Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
++Rule	Halifax	1916	only	-	Oct	 1	0:00	0	S
++Rule	Halifax	1920	only	-	May	 9	0:00	1:00	D
++Rule	Halifax	1920	only	-	Aug	29	0:00	0	S
++Rule	Halifax	1921	only	-	May	 6	0:00	1:00	D
++Rule	Halifax	1921	1922	-	Sep	 5	0:00	0	S
++Rule	Halifax	1922	only	-	Apr	30	0:00	1:00	D
++Rule	Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
++Rule	Halifax	1923	only	-	Sep	 4	0:00	0	S
++Rule	Halifax	1924	only	-	Sep	15	0:00	0	S
++Rule	Halifax	1925	only	-	Sep	28	0:00	0	S
++Rule	Halifax	1926	only	-	May	16	0:00	1:00	D
++Rule	Halifax	1926	only	-	Sep	13	0:00	0	S
++Rule	Halifax	1927	only	-	May	 1	0:00	1:00	D
++Rule	Halifax	1927	only	-	Sep	26	0:00	0	S
++Rule	Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
++Rule	Halifax	1928	only	-	Sep	 9	0:00	0	S
++Rule	Halifax	1929	only	-	Sep	 3	0:00	0	S
++Rule	Halifax	1930	only	-	Sep	15	0:00	0	S
++Rule	Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
++Rule	Halifax	1932	only	-	May	 1	0:00	1:00	D
++Rule	Halifax	1933	only	-	Apr	30	0:00	1:00	D
++Rule	Halifax	1933	only	-	Oct	 2	0:00	0	S
++Rule	Halifax	1934	only	-	May	20	0:00	1:00	D
++Rule	Halifax	1934	only	-	Sep	16	0:00	0	S
++Rule	Halifax	1935	only	-	Jun	 2	0:00	1:00	D
++Rule	Halifax	1935	only	-	Sep	30	0:00	0	S
++Rule	Halifax	1936	only	-	Jun	 1	0:00	1:00	D
++Rule	Halifax	1936	only	-	Sep	14	0:00	0	S
++Rule	Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
++Rule	Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
++Rule	Halifax	1939	only	-	May	28	0:00	1:00	D
++Rule	Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
++Rule	Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
++Rule	Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
++Rule	Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
++Rule	Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
+ 			-4:00	Halifax	A%sT	1918
+@@ -890,12 +1128,110 @@ Zone America/Glace_Bay	-3:59:48 -	LMT	1902 Jun 15
+ 			-4:00	Halifax	A%sT	1974
+ 			-4:00	Canada	A%sT
+ 
++# New Brunswick
+ 
+-# Ontario, Quebec
++# From Paul Eggert (2007-01-31):
++# The Time Definition Act 
++# says they changed at 00:01 through 2006, and
++#  makes it
++# clear that this was the case since at least 1993.
++# For now, assume it started in 1993.
+ 
+-# From Paul Eggert (1996-06-12):
+-# Shanks writes that since 1970 most of Ontario has been like Toronto,
+-# and most of Quebec has been like Montreal.
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Moncton	1933	1935	-	Jun	Sun>=8	1:00	1:00	D
++Rule	Moncton	1933	1935	-	Sep	Sun>=8	1:00	0	S
++Rule	Moncton	1936	1938	-	Jun	Sun>=1	1:00	1:00	D
++Rule	Moncton	1936	1938	-	Sep	Sun>=1	1:00	0	S
++Rule	Moncton	1939	only	-	May	27	1:00	1:00	D
++Rule	Moncton	1939	1941	-	Sep	Sat>=21	1:00	0	S
++Rule	Moncton	1940	only	-	May	19	1:00	1:00	D
++Rule	Moncton	1941	only	-	May	 4	1:00	1:00	D
++Rule	Moncton	1946	1972	-	Apr	lastSun	2:00	1:00	D
++Rule	Moncton	1946	1956	-	Sep	lastSun	2:00	0	S
++Rule	Moncton	1957	1972	-	Oct	lastSun	2:00	0	S
++Rule	Moncton	1993	2006	-	Apr	Sun>=1	0:01	1:00	D
++Rule	Moncton	1993	2006	-	Oct	lastSun	0:01	0	S
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
++			-5:00	-	EST	1902 Jun 15
++			-4:00	Canada	A%sT	1933
++			-4:00	Moncton	A%sT	1942
++			-4:00	Canada	A%sT	1946
++			-4:00	Moncton	A%sT	1973
++			-4:00	Canada	A%sT	1993
++			-4:00	Moncton	A%sT	2007
++			-4:00	Canada	A%sT
++
++# Quebec
++
++# From Paul Eggert (2006-07-09):
++# Shanks & Pottenger write that since 1970 most of Quebec has been
++# like Montreal.
++
++# From Paul Eggert (2006-06-27):
++# Matthews and Vincent (1998) also write that Quebec east of the -63
++# meridian is supposed to observe AST, but residents as far east as
++# Natashquan use EST/EDT, and residents east of Natashquan use AST.
++# In "Official time in Quebec" the Quebec department of justice writes in
++# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
++# that "The residents of the Municipality of the
++# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
++# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
++# written and use Atlantic standard time all year round. The same applies to
++# the residents of the Native facilities along the lower North Shore."
++# 
++# says this common practice was codified into law as of 2007.
++# For lack of better info, guess this practice began around 1970, contra to
++# Shanks & Pottenger who have this region observing AST/ADT.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
++Rule	Mont	1917	only	-	Apr	24	0:00	0	S
++Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
++Rule	Mont	1919	only	-	Oct	25	2:30	0	S
++Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
++Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
++Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
++Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
++Rule	Mont	1924	only	-	May	17	2:00	1:00	D
++Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
++Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
++# The 1927-to-1937 rules can be expressed more simply as
++# Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
++# Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
++# The rules below avoid use of 24:00
++# (which pre-1998 versions of zic cannot handle).
++Rule	Mont	1927	only	-	May	1	0:00	1:00	D
++Rule	Mont	1927	1932	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1928	1931	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1932	only	-	May	1	0:00	1:00	D
++Rule	Mont	1933	1940	-	Apr	lastSun	0:00	1:00	D
++Rule	Mont	1933	only	-	Oct	1	0:00	0	S
++Rule	Mont	1934	1939	-	Sep	lastSun	0:00	0	S
++Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
++Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
++Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
++Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++
++# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
++Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
++			-4:00	Canada	A%sT	1970
++			-4:00	-	AST
++Zone America/Montreal	-4:54:16 -	LMT	1884
++			-5:00	Mont	E%sT	1918
++			-5:00	Canada	E%sT	1919
++			-5:00	Mont	E%sT	1942 Feb  9 2:00s
++			-5:00	Canada	E%sT	1946
++			-5:00	Mont	E%sT	1974
++			-5:00	Canada	E%sT
++
++
++# Ontario
++
++# From Paul Eggert (2006-07-09):
++# Shanks & Pottenger write that since 1970 most of Ontario has been like
++# Toronto.
+ # Thunder Bay skipped DST in 1973.
+ # Many smaller locales did not observe peacetime DST until 1974;
+ # Nipigon (EST) and Rainy River (CST) are the largest that we know of.
+@@ -925,42 +1261,46 @@ Zone America/Glace_Bay	-3:59:48 -	LMT	1902 Jun 15
+ # says that Ontario east of 90W uses EST/EDT, and west of 90W uses CST/CDT.
+ # Officially Atikokan is therefore on CST/CDT, and most likely this report
+ # concerns a non-official time observed as a matter of local practice.
+-# For what it's worth, Shanks says that Atikokan has agreed with
+-# Rainy River ever since standard time was introduced.
+-
++#
+ # From Paul Eggert (2000-10-02):
+ # Matthews and Vincent (1998) write that Atikokan, Pickle Lake, and
+ # New Osnaburgh observe CST all year, that Big Trout Lake observes
+ # CST/CDT, and that Upsala and Shebandowan observe EST/EDT, all in
+ # violation of the official Ontario rules.
+-# They also write that Quebec east of the -63 meridian is supposed to
+-# observe AST, but residents as far east as Natashquan use EST/EDT,
+-# and residents east of Natashquan use AST.
+-# We probably need Zones for far east Quebec and for Atikokan,
+-# but we don't know when their practices started.
++#
++# From Paul Eggert (2006-07-09):
++# Chris Walton (2006-07-06) mentioned an article by Stephanie MacLellan in the
++# 2005-07-21 Chronicle-Journal, which said:
++#
++#	The clocks in Atikokan stay set on standard time year-round.
++#	This means they spend about half the time on central time and
++#	the other half on eastern time.
++#
++#	For the most part, the system works, Mayor Dennis Brown said.
++#
++#	"The majority of businesses in Atikokan deal more with Eastern
++#	Canada, but there are some that deal with Western Canada," he
++#	said.  "I don't see any changes happening here."
++#
++# Walton also writes "Supposedly Pickle Lake and Mishkeegogamang
++# [New Osnaburgh] follow the same practice."
+ 
+-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
+-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
+-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
+-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
+-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
+-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
+-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
+-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
+-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
+-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
+-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
+-Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
+-Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
+-Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
+-Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
+-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
+-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
+-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
+-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
+-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
++# From Garry McKinnon (2006-07-14) via Chris Walton:
++# I chatted with a member of my board who has an outstanding memory
++# and a long history in Atikokan (and in the telecom industry) and he
++# can say for certain that Atikokan has been practicing the current
++# time keeping since 1952, at least.
+ 
++# From Paul Eggert (2006-07-17):
++# Shanks & Pottenger say that Atikokan has agreed with Rainy River
++# ever since standard time was introduced, but the information from
++# McKinnon sounds more authoritative.  For now, assume that Atikokan
++# switched to EST immediately after WWII era daylight saving time
++# ended.  This matches the old (less-populous) America/Coral_Harbour
++# entry since our cutoff date of 1970, so we can move
++# America/Coral_Harbour to the 'backward' file.
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Toronto	1919	only	-	Mar	30	23:30	1:00	D
+ Rule	Toronto	1919	only	-	Oct	26	0:00	0	S
+ Rule	Toronto	1920	only	-	May	 2	2:00	1:00	D
+@@ -968,17 +1308,23 @@ Rule	Toronto	1920	only	-	Sep	26	0:00	0	S
+ Rule	Toronto	1921	only	-	May	15	2:00	1:00	D
+ Rule	Toronto	1921	only	-	Sep	15	2:00	0	S
+ Rule	Toronto	1922	1923	-	May	Sun>=8	2:00	1:00	D
+-# Shanks says 1923-09-19; assume it's a typo and that "-16" was meant.
++# Shanks & Pottenger say 1923-09-19; assume it's a typo and that "-16"
++# was meant.
+ Rule	Toronto	1922	1926	-	Sep	Sun>=15	2:00	0	S
+ Rule	Toronto	1924	1927	-	May	Sun>=1	2:00	1:00	D
+-Rule	Toronto	1927	1928	-	Sep	lastSun	2:00	0	S
+-Rule	Toronto	1928	only	-	Apr	lastSun	2:00	1:00	D
+-Rule	Toronto	1929	only	-	Apr	lastSun	0:00	1:00	D
+-Rule	Toronto	1929	only	-	Sep	lastSun	0:00	0	S
+-Rule	Toronto	1930	1937	-	Apr	lastSat	24:00	1:00	D
+-Rule	Toronto	1930	1937	-	Sep	lastSat	24:00	0	S
+-Rule	Toronto	1938	1940	-	Apr	lastSun	0:00	1:00	D
+-Rule	Toronto	1938	1939	-	Sep	lastSun	0:00	0	S
++# The 1927-to-1939 rules can be expressed more simply as
++# Rule	Toronto	1927	1937	-	Sep	Sun>=25	2:00	0	S
++# Rule	Toronto	1928	1937	-	Apr	Sun>=25	2:00	1:00	D
++# Rule	Toronto	1938	1940	-	Apr	lastSun	2:00	1:00	D
++# Rule	Toronto	1938	1939	-	Sep	lastSun	2:00	0	S
++# The rules below avoid use of Sun>=25
++# (which pre-2004 versions of zic cannot handle).
++Rule	Toronto	1927	1932	-	Sep	lastSun	2:00	0	S
++Rule	Toronto	1928	1931	-	Apr	lastSun	2:00	1:00	D
++Rule	Toronto	1932	only	-	May	1	2:00	1:00	D
++Rule	Toronto	1933	1940	-	Apr	lastSun	2:00	1:00	D
++Rule	Toronto	1933	only	-	Oct	1	2:00	0	S
++Rule	Toronto	1934	1939	-	Sep	lastSun	2:00	0	S
+ Rule	Toronto	1945	1946	-	Sep	lastSun	2:00	0	S
+ Rule	Toronto	1946	only	-	Apr	lastSun	2:00	1:00	D
+ Rule	Toronto	1947	1949	-	Apr	lastSun	0:00	1:00	D
+@@ -987,33 +1333,31 @@ Rule	Toronto	1949	only	-	Nov	lastSun	0:00	0	S
+ Rule	Toronto	1950	1973	-	Apr	lastSun	2:00	1:00	D
+ Rule	Toronto	1950	only	-	Nov	lastSun	2:00	0	S
+ Rule	Toronto	1951	1956	-	Sep	lastSun	2:00	0	S
+-# Shanks says Toronto ended DST a week early in 1971, namely on 1971-10-24,
+-# but Mark Brader wrote (2003-05-31) that he checked the 1971-10-30 issue
+-# of the Toronto Star, and it said that DST ended 1971-10-31 as usual.
++# Shanks & Pottenger say Toronto ended DST a week early in 1971,
++# namely on 1971-10-24, but Mark Brader wrote (2003-05-31) that this
++# is wrong, and that he had confirmed it by checking the 1971-10-30
++# Toronto Star, which said that DST was ending 1971-10-31 as usual.
+ Rule	Toronto	1957	1973	-	Oct	lastSun	2:00	0	S
+ 
+ # From Paul Eggert (2003-07-27):
+ # Willett (1914-03) writes (p. 17) "In the Cities of Fort William, and
+ # Port Arthur, Ontario, the principle of the Bill has been in
+ # operation for the past three years, and in the City of Moose Jaw,
+-# Saskatchewan, for one year."  Assume that the Thunder Bay region
+-# observed DST starting 1910, and Moose Jaw starting 1912, as this
+-# matches the Toronto Star report about Moose Jaw.  For lack of better
+-# info, assume the Thunder Bay region used Willett's proposal, namely
+-# third Sunday in April at 02:00 to third Sunday in September at
+-# 03:00; also assume that they continued until Canada instituted
+-# uniform DST in 1918.
+-Rule	Thunder	1910	1917	-	Apr	Sun>=15	2:00s	1:00	D
+-Rule	Thunder	1910	1917	-	Sep	Sun>=15	2:00s	0	S
++# Saskatchewan, for one year."
+ 
++# From David Bryan via Tory Tronrud, Director/Curator,
++# Thunder Bay Museum (2003-11-12):
++# There is some suggestion, however, that, by-law or not, daylight
++# savings time was being practiced in Fort William and Port Arthur
++# before 1909.... [I]n 1910, the line between the Eastern and Central
++# Time Zones was permanently moved about two hundred miles west to
++# include the Thunder Bay area....  When Canada adopted daylight
++# savings time in 1916, Fort William and Port Arthur, having done so
++# already, did not change their clocks....  During the Second World
++# War,... [t]he cities agreed to implement DST during the summer
++# months for the remainder of the war years.
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Montreal	-4:54:16 -	LMT	1884
+-			-5:00	Mont	E%sT	1918
+-			-5:00	Canada	E%sT	1919
+-			-5:00	Mont	E%sT	1942 Feb  9 2:00s
+-			-5:00	Canada	E%sT	1946
+-			-5:00	Mont	E%sT	1974
+-			-5:00	Canada	E%sT
+ Zone America/Toronto	-5:17:32 -	LMT	1895
+ 			-5:00	Canada	E%sT	1919
+ 			-5:00	Toronto	E%sT	1942 Feb  9 2:00s
+@@ -1021,9 +1365,8 @@ Zone America/Toronto	-5:17:32 -	LMT	1895
+ 			-5:00	Toronto	E%sT	1974
+ 			-5:00	Canada	E%sT
+ Zone America/Thunder_Bay -5:57:00 -	LMT	1895
+-			-5:00	Thunder	E%sT	1918
+-			-5:00	Canada	E%sT	1940 Sep 29
+-			-5:00	1:00	EDT	1942 Feb  9 2:00s
++			-6:00	-	CST	1910
++			-5:00	-	EST	1942
+ 			-5:00	Canada	E%sT	1970
+ 			-5:00	Mont	E%sT	1973
+ 			-5:00	-	EST	1974
+@@ -1032,14 +1375,38 @@ Zone America/Nipigon	-5:53:04 -	LMT	1895
+ 			-5:00	Canada	E%sT	1940 Sep 29
+ 			-5:00	1:00	EDT	1942 Feb  9 2:00s
+ 			-5:00	Canada	E%sT
+-Zone America/Rainy_River -6:17:56 -	LMT	1895
++Zone America/Rainy_River -6:18:16 -	LMT	1895
+ 			-6:00	Canada	C%sT	1940 Sep 29
+ 			-6:00	1:00	CDT	1942 Feb  9 2:00s
+ 			-6:00	Canada	C%sT
++Zone America/Atikokan	-6:06:28 -	LMT	1895
++			-6:00	Canada	C%sT	1940 Sep 29
++			-6:00	1:00	CDT	1942 Feb  9 2:00s
++			-6:00	Canada	C%sT	1945 Sep 30 2:00
++			-5:00	-	EST
+ 
+ 
+ # Manitoba
+ 
++# From Rob Douglas (2006-04-06):
++# the old Manitoba Time Act - as amended by Bill 2, assented to
++# March 27, 1987 ... said ...
++# "between two o'clock Central Standard Time in the morning of
++# the first Sunday of April of each year and two o'clock Central
++# Standard Time in the morning of the last Sunday of October next
++# following, one hour in advance of Central Standard Time."...
++# I believe that the English legislation [of the old time act] had =
++# been assented to (March 22, 1967)....
++# Also, as far as I can tell, there was no order-in-council varying
++# the time of Daylight Saving Time for 2005 and so the provisions of
++# the 1987 version would apply - the changeover was at 2:00 Central
++# Standard Time (i.e. not until 3:00 Central Daylight Time).
++
++# From Paul Eggert (2006-04-10):
++# Shanks & Pottenger say Manitoba switched at 02:00 (not 02:00s)
++# starting 1966.  Since 02:00s is clearly correct for 1967 on, assume
++# it was also 02:00s in 1966.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
+ Rule	Winn	1916	only	-	Sep	17	0:00	0	S
+@@ -1062,16 +1429,13 @@ Rule	Winn	1959	only	-	Oct	lastSun	2:00	0	S
+ Rule	Winn	1960	only	-	Sep	lastSun	2:00	0	S
+ Rule	Winn	1963	only	-	Apr	lastSun	2:00	1:00	D
+ Rule	Winn	1963	only	-	Sep	22	2:00	0	S
+-Rule	Winn	1966	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	Winn	1966	1986	-	Oct	lastSun	2:00	0	S
+-Rule	Winn	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+-# From Paul Eggert (2000-10-02):
+-# INMS (2000-09-12) says that, since 1988 at least, Manitoba switches from
+-# DST at 03:00 local time.  For now, assume it started in 1987.
+-Rule	Winn	1987	max	-	Oct	lastSun	2:00s	0	S
++Rule	Winn	1966	1986	-	Apr	lastSun	2:00s	1:00	D
++Rule	Winn	1966	2005	-	Oct	lastSun	2:00s	0	S
++Rule	Winn	1987	2005	-	Apr	Sun>=1	2:00s	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
+-			-6:00	Winn	C%sT
++			-6:00	Winn	C%sT	2006
++			-6:00	Canada	C%sT
+ 
+ 
+ # Saskatchewan
+@@ -1090,14 +1454,14 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
+ # Willett (1914-03) notes that DST "has been in operation ... in the
+ # City of Moose Jaw, Saskatchewan, for one year."
+ 
+-# From Paul Eggert (2000-10-02):
+-# Shanks writes that since 1970 most of this region has been like Regina.
++# From Paul Eggert (2006-03-22):
++# Shanks & Pottenger say that since 1970 this region has mostly been as Regina.
+ # Some western towns (e.g. Swift Current) switched from MST/MDT to CST in 1972.
+ # Other western towns (e.g. Lloydminster) are like Edmonton.
+ # Matthews and Vincent (1998) write that Denare Beach and Creighton
+ # are like Winnipeg, in violation of Saskatchewan law.
+ 
+-# From W. Jones  (1992-11-06):
++# From W. Jones (1992-11-06):
+ # The. . .below is based on information I got from our law library, the
+ # provincial archives, and the provincial Community Services department.
+ # A precise history would require digging through newspaper archives, and
+@@ -1123,6 +1487,11 @@ Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
+ # rules any more; all other districts appear to have used CST year round
+ # since sometime in the 1960s.
+ 
++# From Chris Walton (2006-06-26):
++# The Saskatchewan time act which was last updated in 1996 is about 30 pages
++# long and rather painful to read.
++# http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Regina	1918	only	-	Apr	14	2:00	1:00	D
+ Rule	Regina	1918	only	-	Oct	31	2:00	0	S
+@@ -1177,17 +1546,18 @@ Rule	Edm	1967	only	-	Oct	lastSun	2:00	0	S
+ Rule	Edm	1969	only	-	Apr	lastSun	2:00	1:00	D
+ Rule	Edm	1969	only	-	Oct	lastSun	2:00	0	S
+ Rule	Edm	1972	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	Edm	1972	max	-	Oct	lastSun	2:00	0	S
+-Rule	Edm	1987	max	-	Apr	Sun>=1	2:00	1:00	D
++Rule	Edm	1972	2006	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
+-			-7:00	Edm	M%sT
++			-7:00	Edm	M%sT	1987
++			-7:00	Canada	M%sT
+ 
+ 
+ # British Columbia
+ 
+-# From Paul Eggert (2000-10-02):
+-# Shanks writes that since 1970 most of this region has been like Vancouver.
++# From Paul Eggert (2006-03-22):
++# Shanks & Pottenger write that since 1970 most of this region has
++# been like Vancouver.
+ # Dawson Creek uses MST.  Much of east BC is like Edmonton.
+ # Matthews and Vincent (1998) write that Creston is like Dawson Creek.
+ 
+@@ -1200,11 +1570,11 @@ Rule	Vanc	1945	only	-	Sep	30	2:00	0	S
+ Rule	Vanc	1946	1986	-	Apr	lastSun	2:00	1:00	D
+ Rule	Vanc	1946	only	-	Oct	13	2:00	0	S
+ Rule	Vanc	1947	1961	-	Sep	lastSun	2:00	0	S
+-Rule	Vanc	1962	max	-	Oct	lastSun	2:00	0	S
+-Rule	Vanc	1987	max	-	Apr	Sun>=1	2:00	1:00	D
++Rule	Vanc	1962	2006	-	Oct	lastSun	2:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Vancouver	-8:12:28 -	LMT	1884
+-			-8:00	Vanc	P%sT
++			-8:00	Vanc	P%sT	1987
++			-8:00	Canada	P%sT
+ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
+ 			-8:00	Canada	P%sT	1947
+ 			-8:00	Vanc	P%sT	1972 Aug 30 2:00
+@@ -1213,16 +1583,21 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
+ 
+ # Northwest Territories, Nunavut, Yukon
+ 
+-# From Paul Eggert (1999-10-29):
++# From Paul Eggert (2006-03-22):
+ # Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
+-# Mathew Englander  (1996-10-07) gives the following refs:
++# Mathew Englander (1996-10-07) gives the following refs:
+ #	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
+ #	c. 7 defines Yukon standard time as UTC-9.  This is still valid;
+ #	see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
+ #	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
+ #	* O.I.C. 1980/02 established DST.
+ #	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
+-# Shanks says Yukon's 1973-10-28 switch was at 2:00; go with Englander.
++# Shanks & Pottenger say Yukon's 1973-10-28 switch was at 2:00; go
++# with Englander.
++# From Chris Walton (2006-06-26):
++# Here is a link to the old daylight saving portion of the interpretation
++# act which was last updated in 1987:
++# http://www.gov.yk.ca/legislation/regs/oic1987_056.pdf
+ 
+ # From Rives McDow (1999-09-04):
+ # Nunavut ... moved ... to incorporate the whole territory into one time zone.
+@@ -1240,8 +1615,6 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
+ #  (1999) reports that Pangnirtung operates on eastern time,
+ # and that Coral Harbour does not observe DST.  We don't know when
+ # Pangnirtung switched to eastern time; we'll guess 1995.
+-# We'll ignore the claim about Coral Harbour for now,
+-# since we have no further info.
+ 
+ # From Rives McDow (1999-11-08):
+ # On October 31, when the rest of Nunavut went to Central time,
+@@ -1316,6 +1689,23 @@ Zone America/Dawson_Creek -8:00:56 -	LMT	1884
+ # more.
+ # [Also see  (2001-03-09).]
+ 
++# From Gwillim Law (2005-05-21):
++# According to maps at
++# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SWE.jpg
++# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SSE.jpg
++# (both dated 2003), and
++# http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
++# (from a 1998 Canadian Geographic article), the de facto and de jure time
++# for Southampton Island (at the north end of Hudson Bay) is UTC-5 all year
++# round.  Using Google, it's easy to find other websites that confirm this.
++# I wasn't able to find how far back this time regimen goes, but since it
++# predates the creation of Nunavut, it probably goes back many years....
++# The Inuktitut name of Coral Harbour is Sallit, but it's rarely used.
++#
++# From Paul Eggert (2005-07-26):
++# For lack of better information, assume that Southampton Island observed
++# daylight saving only during wartime.
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
+ Rule	NT_YK	1918	only	-	Oct	27	2:00	0	S
+@@ -1327,8 +1717,8 @@ Rule	NT_YK	1945	only	-	Sep	30	2:00	0	S
+ Rule	NT_YK	1965	only	-	Apr	lastSun	0:00	2:00	DD
+ Rule	NT_YK	1965	only	-	Oct	lastSun	2:00	0	S
+ Rule	NT_YK	1980	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	NT_YK	1980	max	-	Oct	lastSun	2:00	0	S
+-Rule	NT_YK	1987	max	-	Apr	Sun>=1	2:00	1:00	D
++Rule	NT_YK	1980	2006	-	Oct	lastSun	2:00	0	S
++Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Pangnirtung -4:22:56 -	LMT	1884
+ 			-4:00	NT_YK	A%sT	1995 Apr Sun>=1 2:00
+@@ -1339,7 +1729,11 @@ Zone America/Iqaluit	-4:33:52 -	LMT	1884 # Frobisher B
+ 			-5:00	NT_YK	E%sT	1999 Oct 31 2:00
+ 			-6:00	Canada	C%sT	2000 Oct 29 2:00
+ 			-5:00	Canada	E%sT
+-Zone America/Rankin_Inlet -6:08:40 -	LMT	1884
++# Now subsumed by America/Atikokan.
++#Zone America/Coral_Harbour -5:32:40 -	LMT	1884
++#			-5:00	NT_YK	E%sT	1946
++#			-5:00	-	EST
++Zone America/Rankin_Inlet -6:08:20 -	LMT	1884
+ 			-6:00	NT_YK	C%sT	2000 Oct 29 2:00
+ 			-5:00	-	EST	2001 Apr  1 3:00
+ 			-6:00	Canada	C%sT
+@@ -1350,16 +1744,20 @@ Zone America/Cambridge_Bay -7:00:20 -	LMT	1884
+ 			-6:00	-	CST	2001 Apr  1 3:00
+ 			-7:00	Canada	M%sT
+ Zone America/Yellowknife -7:37:24 -	LMT	1884
+-			-7:00	NT_YK	M%sT
+-Zone America/Inuvik	-8:54:00 -	LMT	1884
++			-7:00	NT_YK	M%sT	1980
++			-7:00	Canada	M%sT
++Zone America/Inuvik	-8:54:52 -	LMT	1884
+ 			-8:00	NT_YK	P%sT	1979 Apr lastSun 2:00
+-			-7:00	NT_YK	M%sT
++			-7:00	NT_YK	M%sT	1980
++			-7:00	Canada	M%sT
+ Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
+ 			-9:00	NT_YK	Y%sT	1966 Jul 1 2:00
+-			-8:00	NT_YK	P%sT
++			-8:00	NT_YK	P%sT	1980
++			-8:00	Canada	P%sT
+ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+ 			-9:00	NT_YK	Y%sT	1973 Oct 28 0:00
+-			-8:00	NT_YK	P%sT
++			-8:00	NT_YK	P%sT	1980
++			-8:00	Canada	P%sT
+ 
+ 
+ ###############################################################################
+@@ -1373,16 +1771,12 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+ # history of Mexican local time (in Spanish)
+ # .
+ #
+-# Here are the discrepancies between Shanks and the MLoC.
++# Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
+ # (In all cases we go with the MLoC.)
+-# Shanks reports that Baja was at -8:00 in 1922/1923.
+-# Shanks says the 1930 transition in Baja was 1930-11-16.
+-# Shanks reports no DST during summer 1931.
+-# Shanks reports a transition at 1032-03-30 23:00, not 1932-04-01.
+-# Shanks does not report transitions for Baja in 1945 or 1948.
+-# Shanks reports southern Mexico transitions on 1981-12-01, not 12-23.
+-# Shanks says Quintana Roo switched to -6:00 on 1982-12-02, and to -5:00
+-# on 1997-10-26 at 02:00.
++# S&P report that Baja was at -8:00 in 1922/1923.
++# S&P say the 1930 transition in Baja was 1930-11-16.
++# S&P report no DST during summer 1931.
++# S&P report a transition at 1932-03-30 23:00, not 1932-04-01.
+ 
+ # From Gwillim Law (2001-02-20):
+ # There are some other discrepancies between the Decrees page and the
+@@ -1390,11 +1784,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
+ # the researchers who prepared the Decrees page failed to find some of
+ # the relevant documents.
+ 
+-# From Paul Eggert (2000-07-26):
+-# Shanks gives 1942-04-01 instead of 1942-04-24, and omits the 1981
+-# and 1988 DST experiments.  Go with spin.com.mx.
+-
+-# From Alan Perry  (1996-02-15):
++# From Alan Perry (1996-02-15):
+ # A guy from our Mexico subsidiary finally found the Presidential Decree
+ # outlining the timezone changes in Mexico.
+ #
+@@ -1593,7 +1983,8 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:
+ 			-8:00	-	PST	1931 Apr  1
+ 			-8:00	1:00	PDT	1931 Sep 30
+ 			-8:00	-	PST	1942 Apr 24
+-			-8:00	1:00	PWT	1945 Nov 12
++			-8:00	1:00	PWT	1945 Aug 14 23:00u
++			-8:00	1:00	PPT	1945 Nov 12 # Peace
+ 			-8:00	-	PST	1948 Apr  5
+ 			-8:00	1:00	PDT	1949 Jan 14
+ 			-8:00	-	PST	1954
+@@ -1603,12 +1994,13 @@ Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:
+ 			-8:00	Mexico	P%sT	2001
+ 			-8:00	US	P%sT	2002 Feb 20
+ 			-8:00	Mexico	P%sT
+-# From Paul Eggert (2001-03-05):
++# From Paul Eggert (2006-03-22):
+ # Formerly there was an America/Ensenada zone, which differed from
+ # America/Tijuana only in that it did not observe DST from 1976
+-# through 1995.  This was as per Shanks.  However, Guy Harris reports
++# through 1995.  This was as per Shanks (1999).  But Shanks & Pottenger say
++# Ensenada did not observe DST from 1948 through 1975.  Guy Harris reports
+ # that the 1987 OAG says "Only Ensenada, Mexicale, San Felipe and
+-# Tijuana observe DST," which contradicts Shanks but does imply that
++# Tijuana observe DST," which agrees with Shanks & Pottenger but implies that
+ # DST-observance was a town-by-town matter back then.  This concerns
+ # data after 1970 so most likely there should be at least one Zone
+ # other than America/Tijuana for Baja, but it's not clear yet what its
+@@ -1631,13 +2023,19 @@ Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
+ 			-4:00	-	AST
+ 
+ # Bahamas
++#
++# From Sue Williams (2006-12-07):
++# The Bahamas announced about a month ago that they plan to change their DST 
++# rules to sync with the U.S. starting in 2007....
++# http://www.jonesbahamas.com/?c=45&a=10412
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+-Rule	Bahamas	1964	max	-	Oct	lastSun	2:00	0	S
++Rule	Bahamas	1964	2006	-	Oct	lastSun	2:00	0	S
+ Rule	Bahamas	1964	1986	-	Apr	lastSun	2:00	1:00	D
+-Rule	Bahamas	1987	max	-	Apr	Sun>=1	2:00	1:00	D
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Nassau	-5:09:24 -	LMT	1912 Mar 2
+-			-5:00	Bahamas	E%sT
++			-5:00	Bahamas	E%sT	1976
++			-5:00	US	E%sT
+ 
+ # Barbados
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+@@ -1652,7 +2050,7 @@ Zone America/Barbados	-3:58:28 -	LMT	1924		# Bridgetow
+ 			-4:00	Barb	A%sT
+ 
+ # Belize
+-# Whitman entirely disagrees with Shanks; go with Shanks.
++# Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	HD
+ Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	S
+@@ -1665,10 +2063,20 @@ Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
+ 			-6:00	Belize	C%sT
+ 
+ # Bermuda
++
++# From Dan Jones, reporting in The Royal Gazette (2006-06-26):
++
++# Next year, however, clocks in the US will go forward on the second Sunday
++# in March, until the first Sunday in November.  And, after the Time Zone
++# (Seasonal Variation) Bill 2006 was passed in the House of Assembly on
++# Friday, the same thing will happen in Bermuda.
++# http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
++
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone Atlantic/Bermuda	-4:19:04 -	LMT	1930 Jan  1 2:00    # Hamilton
+ 			-4:00	-	AST	1974 Apr 28 2:00
+-			-4:00	Bahamas	A%sT
++			-4:00	Bahamas	A%sT	1976
++			-4:00	US	A%sT
+ 
+ # Cayman Is
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1681,7 +2089,8 @@ Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
+ Rule	CR	1979	1980	-	Feb	lastSun	0:00	1:00	D
+ Rule	CR	1979	1980	-	Jun	Sun>=1	0:00	0	S
+ Rule	CR	1991	1992	-	Jan	Sat>=15	0:00	1:00	D
+-# IATA SSIM (1991-09) says the following was at 1:00; go with Shanks.
++# IATA SSIM (1991-09) says the following was at 1:00;
++# go with Shanks & Pottenger.
+ Rule	CR	1991	only	-	Jul	 1	0:00	0	S
+ Rule	CR	1992	only	-	Mar	15	0:00	0	S
+ # There are too many San Joses elsewhere, so we'll use `Costa Rica'.
+@@ -1705,6 +2114,28 @@ Zone America/Costa_Rica	-5:36:20 -	LMT	1890		# San Jos
+ # to DST--and one more hour on 1999-04-04--when the announcers will have
+ # returned to Baltimore, which switches on that date.)
+ 
++# From Evert van der Veer via Steffen Thorsen (2004-10-28):
++# Cuba is not going back to standard time this year.
++# From Paul Eggert (2006-03-22):
++# http://www.granma.cu/ingles/2004/septiembre/juev30/41medid-i.html
++# says that it's due to a problem at the Antonio Guiteras
++# thermoelectric plant, and says "This October there will be no return
++# to normal hours (after daylight saving time)".
++# For now, let's assume that it's a temporary measure.
++
++# From Carlos A. Carnero Delgado (2005-11-12):
++# This year (just like in 2004-2005) there's no change in time zone
++# adjustment in Cuba.  We will stay in daylight saving time:
++# http://www.granma.cu/espanol/2005/noviembre/mier9/horario.html
++
++# From Jesper Norgaard Welen (2006-10-21):
++# An article in GRANMA INTERNACIONAL claims that Cuba will end
++# the 3 years of permanent DST next weekend, see
++# http://www.granma.cu/ingles/2006/octubre/lun16/43horario.html
++# "On Saturday night, October 28 going into Sunday, October 29, at 01:00,
++# watches should be set back one hour -- going back to 00:00 hours -- returning
++# to the normal schedule....
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
+ Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
+@@ -1733,8 +2164,9 @@ Rule	Cuba	1991	1995	-	Oct	Sun>=8	0:00s	0	S
+ Rule	Cuba	1996	only	-	Oct	 6	0:00s	0	S
+ Rule	Cuba	1997	only	-	Oct	12	0:00s	0	S
+ Rule	Cuba	1998	1999	-	Mar	lastSun	0:00s	1:00	D
+-Rule	Cuba	1998	max	-	Oct	lastSun	0:00s	0	S
++Rule	Cuba	1998	2003	-	Oct	lastSun	0:00s	0	S
+ Rule	Cuba	2000	max	-	Apr	Sun>=1	0:00s	1:00	D
++Rule	Cuba	2006	max	-	Oct	lastSun	0:00s	0	S
+ 
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Havana	-5:29:28 -	LMT	1890
+@@ -1782,6 +2214,7 @@ Zone America/Santo_Domingo -4:39:36 -	LMT	1890
+ 			-4:00	-	AST
+ 
+ # El Salvador
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Salv	1987	1988	-	May	Sun>=1	0:00	1:00	D
+ Rule	Salv	1987	1988	-	Sep	lastSun	0:00	0	S
+@@ -1802,6 +2235,19 @@ Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Po
+ 			-4:00	-	AST
+ 
+ # Guatemala
++#
++# From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen:
++# Diario Co Latino, at
++# http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079,
++# says in an article dated 2006-04-19 that the Guatemalan government had
++# decided on that date to advance official time by 60 minutes, to lessen the
++# impact of the elevated cost of oil....  Daylight saving time will last from
++# 2006-04-29 24:00 (Guatemalan standard time) to 2006-09-30 (time unspecified).
++# From Paul Eggert (2006-06-22):
++# The Ministry of Energy and Mines, press release CP-15/2006
++# (2006-04-19), says DST ends at 24:00.  See
++# .
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Guat	1973	only	-	Nov	25	0:00	1:00	D
+ Rule	Guat	1974	only	-	Feb	24	0:00	0	S
+@@ -1809,28 +2255,93 @@ Rule	Guat	1983	only	-	May	21	0:00	1:00	D
+ Rule	Guat	1983	only	-	Sep	22	0:00	0	S
+ Rule	Guat	1991	only	-	Mar	23	0:00	1:00	D
+ Rule	Guat	1991	only	-	Sep	 7	0:00	0	S
++Rule	Guat	2006	only	-	Apr	30	0:00	1:00	D
++Rule	Guat	2006	only	-	Oct	 1	0:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
+ 			-6:00	Guat	C%sT
+ 
+ # Haiti
++# From Gwillim Law (2005-04-15):
++# Risto O. Nykanen wrote me that Haiti is now on DST.
++# I searched for confirmation, and I found a
++#  press release
++# on the Web page of the Haitian Consulate in Chicago (2005-03-31),
++# .  Translated from French, it says:
++#
++#  "The Prime Minister's Communication Office notifies the public in general
++#   and the press in particular that, following a decision of the Interior
++#   Ministry and the Territorial Collectivities [I suppose that means the
++#   provinces], Haiti will move to Eastern Daylight Time in the night from next
++#   Saturday the 2nd to Sunday the 3rd.
++#
++#  "Consequently, the Prime Minister's Communication Office wishes to inform
++#   the population that the country's clocks will be set forward one hour
++#   starting at midnight.  This provision will hold until the last Saturday in
++#   October 2005.
++#
++#  "Port-au-Prince, March 31, 2005"
++#
++# From Steffen Thorsen (2006-04-04):
++# I have been informed by users that Haiti observes DST this year like
++# last year, so the current "only" rule for 2005 might be changed to a
++# "max" rule or to last until 2006. (Who knows if they will observe DST
++# next year or if they will extend their DST like US/Canada next year).
++#
++# I have found this article about it (in French):
++# http://www.haitipressnetwork.com/news.cfm?articleID=7612
++#
++# The reason seems to be an energy crisis.
++
++
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
+ Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
+ Rule	Haiti	1983	1987	-	Oct	lastSun	0:00	0	S
+-# Shanks says AT is 2:00, but IATA SSIM (1991/1997) says 1:00s.  Go with IATA.
++# Shanks & Pottenger say AT is 2:00, but IATA SSIM (1991/1997) says 1:00s.
++# Go with IATA.
+ Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
+ Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
++Rule	Haiti	2005	max	-	Apr	Sun>=1	0:00	1:00	D
++Rule	Haiti	2005	max	-	Oct	lastSun	0:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Port-au-Prince -4:49:20 -	LMT	1890
+ 			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
+ 			-5:00	Haiti	E%sT
+ 
+ # Honduras
+-# Shanks says 1921 Jan 1; go with Whitman's more precise Apr 1.
++# Shanks & Pottenger say 1921 Jan 1; go with Whitman's more precise Apr 1.
++
++# From Paul Eggert (2006-05-05):
++# worldtimezone.com reports a 2006-05-02 Spanish-language AP article
++# saying Honduras will start using DST midnight Saturday, effective 4
++# months until September.  La Tribuna reported today
++#  that Manuel Zelaya, the president
++# of Honduras, refused to back down on this.
++
++# From Jesper Norgaard Welen (2006-08-08):
++# It seems that Honduras has returned from DST to standard time this Monday at
++# 00:00 hours (prolonging Sunday to 25 hours duration).
++# http://www.worldtimezone.com/dst_news/dst_news_honduras04.html
++
++# From Paul Eggert (2006-08-08):
++# Also see Diario El Heraldo, The country returns to standard time (2006-08-08)
++# .
++# It mentions executive decree 18-2006.
++
++# From Steffen Thorsen (2006-08-17):
++# Honduras will observe DST from 2007 to 2009, exact dates are not
++# published, I have located this authoritative source:
++# http://www.presidencia.gob.hn/noticia.aspx?nId=47
++
++# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
++Rule	Hond	1987	1988	-	May	Sun>=1	0:00	1:00	D
++Rule	Hond	1987	1988	-	Sep	lastSun	0:00	0	S
++Rule	Hond	2006	2009	-	May	Sun>=1	0:00	1:00	D
++Rule	Hond	2006	2009	-	Aug	Mon>=1	0:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
+-			-6:00	Salv	C%sT
++			-6:00	Hond	C%sT
+ #
+ # Great Swan I ceded by US to Honduras in 1972
+ 
+@@ -1842,7 +2353,7 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
+ # From U. S. Naval Observatory (1989-01-19):
+ # JAMAICA             5 H  BEHIND UTC
+ 
+-# From Shanks:
++# From Shanks & Pottenger:
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Jamaica	-5:07:12 -	LMT	1890		# Kingston
+ 			-5:07:12 -	KMT	1912 Feb    # Kingston Mean Time
+@@ -1859,32 +2370,77 @@ Zone America/Martinique	-4:04:20 -      LMT	1890		# Fo
+ 			-4:00	-	AST
+ 
+ # Montserrat
+-# From Paul Eggert (1997-08-31):
+-# Recent volcanic eruptions have forced evacuation of Plymouth, the capital.
+-# Luckily, Olveston, the current de facto capital, has the same longitude.
++# From Paul Eggert (2006-03-22):
++# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
++# world.gazetteer.com says Cork Hill is the most populous location now.
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+-Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Olveston
++Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Cork Hill
+ 			-4:00	-	AST
+ 
+ # Nicaragua
+ #
+-# From Steffen Thorsen (1998-12-29):
+-# Nicaragua seems to be back at -6:00 but I have not been able to find when
+-# they changed from -5:00.
++# This uses Shanks & Pottenger for times before 2005.
+ #
++# From Steffen Thorsen (2005-04-12):
++# I've got reports from 8 different people that Nicaragua just started
++# DST on Sunday 2005-04-10, in order to save energy because of
++# expensive petroleum.  The exact end date for DST is not yet
++# announced, only "September" but some sites also say "mid-September".
++# Some background information is available on the President's official site:
++# http://www.presidencia.gob.ni/Presidencia/Files_index/Secretaria/Notas%20de%20Prensa/Presidente/2005/ABRIL/Gobierno-de-nicaragua-adelanta-hora-oficial-06abril.htm
++# The Decree, no 23-2005 is available here:
++# http://www.presidencia.gob.ni/buscador_gaceta/BD/DECRETOS/2005/Decreto%2023-2005%20Se%20adelanta%20en%20una%20hora%20en%20todo%20el%20territorio%20nacional%20apartir%20de%20las%2024horas%20del%2009%20de%20Abril.pdf
++#
++# From Paul Eggert (2005-05-01):
++# The decree doesn't say anything about daylight saving, but for now let's
++# assume that it is daylight saving....
++#
++# From Gwillim Law (2005-04-21):
++# The Associated Press story on the time change, which can be found at
++# http://www.lapalmainteractivo.com/guias/content/gen/ap/America_Latina/AMC_GEN_NICARAGUA_HORA.html
++# and elsewhere, says (fifth paragraph, translated from Spanish):  "The last
++# time that a change of clocks was applied to save energy was in the year 2000
++# during the Arnoldo Aleman administration."...
++# The northamerica file says that Nicaragua has been on UTC-6 continuously
++# since December 1998.  I wasn't able to find any details of Nicaraguan time
++# changes in 2000.  Perhaps a note could be added to the northamerica file, to
++# the effect that we have indirect evidence that DST was observed in 2000.
++#
++# From Jesper Norgaard Welen (2005-11-02):
++# Nicaragua left DST the 2005-10-02 at 00:00 (local time).
++# http://www.presidencia.gob.ni/presidencia/files_index/secretaria/comunicados/2005/septiembre/26septiembre-cambio-hora.htm
++# (2005-09-26)
++#
++# From Jesper Norgaard Welen (2006-05-05):
++# http://www.elnuevodiario.com.ni/2006/05/01/nacionales/18410
++# (my informal translation)
++# By order of the president of the republic, Enrique Bolanos, Nicaragua
++# advanced by sixty minutes their official time, yesterday at 2 in the
++# morning, and will stay that way until 30.th. of september.
++#
++# From Jesper Norgaard Welen (2006-09-30):
++# http://www.presidencia.gob.ni/buscador_gaceta/BD/DECRETOS/2006/D-063-2006P-PRN-Cambio-Hora.pdf
++# My informal translation runs:
++# The natural sun time is restored in all the national territory, in that the
++# time is returned one hour at 01:00 am of October 1 of 2006.
++#
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	Nic	1979	1980	-	Mar	Sun>=16	0:00	1:00	D
+ Rule	Nic	1979	1980	-	Jun	Mon>=23	0:00	0	S
+-Rule	Nic	1992	only	-	Jan	1	4:00	1:00	D
+-Rule	Nic	1992	only	-	Sep	24	0:00	0	S
++Rule	Nic	2005	only	-	Apr	10	0:00	1:00	D
++Rule	Nic	2005	only	-	Oct	Sun>=1	0:00	0	S
++Rule	Nic	2006	only	-	Apr	30	2:00	1:00	D
++Rule	Nic	2006	only	-	Oct	Sun>=1	1:00	0	S
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	America/Managua	-5:45:08 -	LMT	1890
+ 			-5:45:12 -	MMT	1934 Jun 23 # Managua Mean Time?
+ 			-6:00	-	CST	1973 May
+ 			-5:00	-	EST	1975 Feb 16
+-			-6:00	Nic	C%sT	1993 Jan 1 4:00
+-			-5:00	-	EST	1998 Dec
+-			-6:00	-	CST
++			-6:00	Nic	C%sT	1992 Jan  1 4:00
++			-5:00	-	EST	1992 Sep 24
++			-6:00	-	CST	1993
++			-5:00	-	EST	1997
++			-6:00	Nic	C%sT
+ 
+ # Panama
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+@@ -1897,7 +2453,7 @@ Zone	America/Panama	-5:18:08 -	LMT	1890
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
+ 			-4:00	-	AST	1942 May  3
+-			-4:00	1:00	AWT	1945 Sep 30  2:00
++			-4:00	US	A%sT	1946
+ 			-4:00	-	AST
+ 
+ # St Kitts-Nevis
+@@ -1926,8 +2482,8 @@ Zone America/St_Vincent	-4:04:56 -	LMT	1890		# Kingsto
+ 			-4:00	-	AST
+ 
+ # Turks and Caicos
+-# From Paul Eggert (1998-08-06):
+-# Shanks says they use US DST rules, but IATA SSIM (1991/1998)
++# From Paul Eggert (2006-03-22):
++# Shanks & Pottenger say they use US DST rules, but IATA SSIM (1991/1998)
+ # says they switch at midnight.  Go with IATA SSIM.
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule	TC	1979	1986	-	Apr	lastSun	0:00	1:00	D
diff --git a/devel/jdk/1.5/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c b/devel/jdk/1.5/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c
new file mode 100644
index 00000000000..d21f30bd595
--- /dev/null
+++ b/devel/jdk/1.5/patches/patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c
@@ -0,0 +1,55 @@
+$OpenBSD: patch-j2se_src_solaris_native_java_lang_UNIXProcess_md_c,v 1.3 2007/04/13 00:29:48 kurt Exp $
+--- j2se/src/solaris/native/java/lang/UNIXProcess_md.c.orig	Thu Apr 12 06:28:13 2007
++++ j2se/src/solaris/native/java/lang/UNIXProcess_md.c	Thu Apr 12 06:34:01 2007
+@@ -304,14 +304,18 @@ Java_java_lang_UNIXProcess_waitForProcessExit(JNIEnv* 
+ 
+ #if defined(__OpenBSD__)
+ /*
+- * On OpenBSD closefrom will close only the opened fds without
+- * having to use heuristics and is safe to use when single
+- * threaded.
++ * Directly call _thread_sys_closefrom() so the child process
++ * doesn't reset the parrent's file descriptors to be blocking.
++ * This function is only called from the child process which
++ * is single threaded and about to call execvp() so it is
++ * safe to bypass the threaded closefrom().
+  */
++int _thread_sys_closefrom(int);
++
+ static int
+ closeDescriptors(void)
+ {
+-	return closefrom(3);
++	return _thread_sys_closefrom(3);
+ }
+ 
+ #else
+@@ -559,6 +563,28 @@ Java_java_lang_UNIXProcess_forkAndExec(JNIEnv *env,
+ 
+     if (resultPid == 0) {
+ 	/* Child process */
++
++#ifdef __OpenBSD__
++// XXXBSD: Work-around userland pthread implementation issue.
++// Closing file descriptors will reset them to be blocking.
++// This is problematic for the parent when it attemts to use
++// the blocking fd and deadlocks. Setting them to non-blocking
++// in the child prevents the close/dup2 from resetting them.
++    {
++	int flags;
++	flags = fcntl(STDIN_FILENO, F_GETFL, NULL);
++	if (flags != -1)
++	    fcntl(STDIN_FILENO, F_SETFL, flags | O_NONBLOCK);
++
++	flags = fcntl(STDOUT_FILENO, F_GETFL, NULL);
++	if (flags != -1)
++	    fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK);
++
++	flags = fcntl(STDERR_FILENO, F_GETFL, NULL);
++	if (flags != -1)
++	    fcntl(STDOUT_FILENO, F_SETFL, flags | O_NONBLOCK);
++    }
++#endif
+ 
+ 	/* Close the parent sides of the pipe.
+ 	   Give the child sides of the pipes the right fileno's.
diff --git a/devel/jdk/1.5/pkg/PFRAG.no-no_web-jre b/devel/jdk/1.5/pkg/PFRAG.no-no_web-jre
index 46e7defe31a..97e5ab7d710 100644
--- a/devel/jdk/1.5/pkg/PFRAG.no-no_web-jre
+++ b/devel/jdk/1.5/pkg/PFRAG.no-no_web-jre
@@ -1,9 +1,13 @@
+@comment $OpenBSD: PFRAG.no-no_web-jre,v 1.3 2007/04/13 00:29:48 kurt Exp $
 ${JREHOME}/bin/ControlPanel
 ${JREHOME}/bin/java_vm
 ${JREHOME}/bin/javaws
 ${JREHOME}/javaws/
 ${JREHOME}/javaws/javaws
 ${JREHOME}/lib/deploy.jar
+${JREHOME}/lib/${MACHINE_ARCH}/libdeploy.so
+${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
+${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
 ${JREHOME}/lib/images/icons/
 ${JREHOME}/lib/images/icons/sun-java.png
 ${JREHOME}/lib/images/icons/sun-java_HighContrast.png
@@ -73,7 +77,4 @@ ${JREHOME}/plugin/desktop/sun_java.desktop
 ${JREHOME}/plugin/desktop/sun_java.png
 ${JREHOME}/plugin/${MACHINE_ARCH}/
 ${JREHOME}/plugin/${MACHINE_ARCH}/ns7/
-${JREHOME}/lib/${MACHINE_ARCH}/libdeploy.so
-${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
-${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
 ${JREHOME}/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so
diff --git a/devel/jdk/1.5/pkg/PFRAG.no-no_web-main b/devel/jdk/1.5/pkg/PFRAG.no-no_web-main
index 73e3662e2ad..7532926d2b7 100644
--- a/devel/jdk/1.5/pkg/PFRAG.no-no_web-main
+++ b/devel/jdk/1.5/pkg/PFRAG.no-no_web-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.no-no_web-main,v 1.2 2007/02/01 21:00:52 kurt Exp $
+@comment $OpenBSD: PFRAG.no-no_web-main,v 1.3 2007/04/13 00:29:49 kurt Exp $
 ${JDKHOME}/bin/ControlPanel
 ${JDKHOME}/bin/HtmlConverter
 ${JDKHOME}/bin/javaws
@@ -523,14 +523,14 @@ ${JDKHOME}/jre/bin/javaws
 ${JDKHOME}/jre/bin/javaws_g
 ${JDKHOME}/jre/javaws/
 ${JDKHOME}/jre/javaws/javaws
+${JDKHOME}/jre/lib/deploy.jar
+${JDKHOME}/jre/lib/deploy_g.jar
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy_g.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_jni_g.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
 ${JDKHOME}/jre/lib/${MACHINE_ARCH}/libjavaplugin_nscp_g.so
-${JDKHOME}/jre/lib/deploy.jar
-${JDKHOME}/jre/lib/deploy_g.jar
 ${JDKHOME}/jre/lib/images/icons/
 ${JDKHOME}/jre/lib/images/icons/sun-java.png
 ${JDKHOME}/jre/lib/images/icons/sun-java_HighContrast.png
@@ -596,13 +596,13 @@ ${JDKHOME}/jre/lib/plugin.jar
 ${JDKHOME}/jre/lib/plugin_g.jar
 ${JDKHOME}/jre/lib/security/javaws.policy
 ${JDKHOME}/jre/plugin/
+${JDKHOME}/jre/plugin/desktop/
+${JDKHOME}/jre/plugin/desktop/sun_java.desktop
+${JDKHOME}/jre/plugin/desktop/sun_java.png
 ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/
 ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/
 ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji.so
 ${JDKHOME}/jre/plugin/${MACHINE_ARCH}/ns7/libjavaplugin_oji_g.so
-${JDKHOME}/jre/plugin/desktop/
-${JDKHOME}/jre/plugin/desktop/sun_java.desktop
-${JDKHOME}/jre/plugin/desktop/sun_java.png
 ${JDKHOME}/lib/htmlconverter.jar
 ${JDKHOME}/lib/htmlconverter_g.jar
 @man ${JDKHOME}/man/man1/javaws.1
diff --git a/devel/jdk/1.5/pkg/PLIST-jre b/devel/jdk/1.5/pkg/PLIST-jre
index 82bea4c8bed..099fd7a970e 100644
--- a/devel/jdk/1.5/pkg/PLIST-jre
+++ b/devel/jdk/1.5/pkg/PLIST-jre
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-jre,v 1.8 2007/02/01 21:00:52 kurt Exp $
+@comment $OpenBSD: PLIST-jre,v 1.9 2007/04/13 00:29:49 kurt Exp $
 @option no-default-conflict
 @conflict jre->=1.5,<1.6
 @pkgpath devel/jdk/1.5,-jre,native_bootstrap
@@ -195,10 +195,12 @@ ${JREHOME}/lib/zi/America/Antigua
 ${JREHOME}/lib/zi/America/Araguaina
 ${JREHOME}/lib/zi/America/Aruba
 ${JREHOME}/lib/zi/America/Asuncion
+${JREHOME}/lib/zi/America/Atikokan
 ${JREHOME}/lib/zi/America/Bahia
 ${JREHOME}/lib/zi/America/Barbados
 ${JREHOME}/lib/zi/America/Belem
 ${JREHOME}/lib/zi/America/Belize
+${JREHOME}/lib/zi/America/Blanc-Sablon
 ${JREHOME}/lib/zi/America/Boa_Vista
 ${JREHOME}/lib/zi/America/Bogota
 ${JREHOME}/lib/zi/America/Boise
@@ -239,21 +241,24 @@ ${JREHOME}/lib/zi/America/Halifax
 ${JREHOME}/lib/zi/America/Havana
 ${JREHOME}/lib/zi/America/Hermosillo
 ${JREHOME}/lib/zi/America/Indiana/
+${JREHOME}/lib/zi/America/Indiana/Indianapolis
 ${JREHOME}/lib/zi/America/Indiana/Knox
 ${JREHOME}/lib/zi/America/Indiana/Marengo
+${JREHOME}/lib/zi/America/Indiana/Petersburg
 ${JREHOME}/lib/zi/America/Indiana/Vevay
-${JREHOME}/lib/zi/America/Indianapolis
+${JREHOME}/lib/zi/America/Indiana/Vincennes
+${JREHOME}/lib/zi/America/Indiana/Winamac
 ${JREHOME}/lib/zi/America/Inuvik
 ${JREHOME}/lib/zi/America/Iqaluit
 ${JREHOME}/lib/zi/America/Jamaica
 ${JREHOME}/lib/zi/America/Jujuy
 ${JREHOME}/lib/zi/America/Juneau
 ${JREHOME}/lib/zi/America/Kentucky/
+${JREHOME}/lib/zi/America/Kentucky/Louisville
 ${JREHOME}/lib/zi/America/Kentucky/Monticello
 ${JREHOME}/lib/zi/America/La_Paz
 ${JREHOME}/lib/zi/America/Lima
 ${JREHOME}/lib/zi/America/Los_Angeles
-${JREHOME}/lib/zi/America/Louisville
 ${JREHOME}/lib/zi/America/Maceio
 ${JREHOME}/lib/zi/America/Managua
 ${JREHOME}/lib/zi/America/Manaus
@@ -264,6 +269,7 @@ ${JREHOME}/lib/zi/America/Menominee
 ${JREHOME}/lib/zi/America/Merida
 ${JREHOME}/lib/zi/America/Mexico_City
 ${JREHOME}/lib/zi/America/Miquelon
+${JREHOME}/lib/zi/America/Moncton
 ${JREHOME}/lib/zi/America/Monterrey
 ${JREHOME}/lib/zi/America/Montevideo
 ${JREHOME}/lib/zi/America/Montreal
@@ -275,6 +281,7 @@ ${JREHOME}/lib/zi/America/Nome
 ${JREHOME}/lib/zi/America/Noronha
 ${JREHOME}/lib/zi/America/North_Dakota/
 ${JREHOME}/lib/zi/America/North_Dakota/Center
+${JREHOME}/lib/zi/America/North_Dakota/New_Salem
 ${JREHOME}/lib/zi/America/Panama
 ${JREHOME}/lib/zi/America/Pangnirtung
 ${JREHOME}/lib/zi/America/Paramaribo
@@ -421,7 +428,10 @@ ${JREHOME}/lib/zi/Australia/Melbourne
 ${JREHOME}/lib/zi/Australia/Perth
 ${JREHOME}/lib/zi/Australia/Sydney
 ${JREHOME}/lib/zi/CET
+${JREHOME}/lib/zi/CST6CDT
 ${JREHOME}/lib/zi/EET
+${JREHOME}/lib/zi/EST
+${JREHOME}/lib/zi/EST5EDT
 ${JREHOME}/lib/zi/Etc/
 ${JREHOME}/lib/zi/Etc/GMT
 ${JREHOME}/lib/zi/Etc/GMT+1
@@ -497,6 +507,7 @@ ${JREHOME}/lib/zi/Europe/Warsaw
 ${JREHOME}/lib/zi/Europe/Zaporozhye
 ${JREHOME}/lib/zi/Europe/Zurich
 ${JREHOME}/lib/zi/GMT
+${JREHOME}/lib/zi/HST
 ${JREHOME}/lib/zi/Indian/
 ${JREHOME}/lib/zi/Indian/Antananarivo
 ${JREHOME}/lib/zi/Indian/Chagos
@@ -510,6 +521,9 @@ ${JREHOME}/lib/zi/Indian/Mauritius
 ${JREHOME}/lib/zi/Indian/Mayotte
 ${JREHOME}/lib/zi/Indian/Reunion
 ${JREHOME}/lib/zi/MET
+${JREHOME}/lib/zi/MST
+${JREHOME}/lib/zi/MST7MDT
+${JREHOME}/lib/zi/PST8PDT
 ${JREHOME}/lib/zi/Pacific/
 ${JREHOME}/lib/zi/Pacific/Apia
 ${JREHOME}/lib/zi/Pacific/Auckland
diff --git a/devel/jdk/1.5/pkg/PLIST-main b/devel/jdk/1.5/pkg/PLIST-main
index 79acf604676..b42a21cdc74 100644
--- a/devel/jdk/1.5/pkg/PLIST-main
+++ b/devel/jdk/1.5/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2007/02/01 21:00:52 kurt Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2007/04/13 00:29:49 kurt Exp $
 @option no-default-conflict
 @conflict jdk->=1.5,<1.6
 @pkgpath devel/jdk/1.5,native_bootstrap
@@ -993,10 +993,12 @@ ${JDKHOME}/jre/lib/zi/America/Antigua
 ${JDKHOME}/jre/lib/zi/America/Araguaina
 ${JDKHOME}/jre/lib/zi/America/Aruba
 ${JDKHOME}/jre/lib/zi/America/Asuncion
+${JDKHOME}/jre/lib/zi/America/Atikokan
 ${JDKHOME}/jre/lib/zi/America/Bahia
 ${JDKHOME}/jre/lib/zi/America/Barbados
 ${JDKHOME}/jre/lib/zi/America/Belem
 ${JDKHOME}/jre/lib/zi/America/Belize
+${JDKHOME}/jre/lib/zi/America/Blanc-Sablon
 ${JDKHOME}/jre/lib/zi/America/Boa_Vista
 ${JDKHOME}/jre/lib/zi/America/Bogota
 ${JDKHOME}/jre/lib/zi/America/Boise
@@ -1037,21 +1039,24 @@ ${JDKHOME}/jre/lib/zi/America/Halifax
 ${JDKHOME}/jre/lib/zi/America/Havana
 ${JDKHOME}/jre/lib/zi/America/Hermosillo
 ${JDKHOME}/jre/lib/zi/America/Indiana/
+${JDKHOME}/jre/lib/zi/America/Indiana/Indianapolis
 ${JDKHOME}/jre/lib/zi/America/Indiana/Knox
 ${JDKHOME}/jre/lib/zi/America/Indiana/Marengo
+${JDKHOME}/jre/lib/zi/America/Indiana/Petersburg
 ${JDKHOME}/jre/lib/zi/America/Indiana/Vevay
-${JDKHOME}/jre/lib/zi/America/Indianapolis
+${JDKHOME}/jre/lib/zi/America/Indiana/Vincennes
+${JDKHOME}/jre/lib/zi/America/Indiana/Winamac
 ${JDKHOME}/jre/lib/zi/America/Inuvik
 ${JDKHOME}/jre/lib/zi/America/Iqaluit
 ${JDKHOME}/jre/lib/zi/America/Jamaica
 ${JDKHOME}/jre/lib/zi/America/Jujuy
 ${JDKHOME}/jre/lib/zi/America/Juneau
 ${JDKHOME}/jre/lib/zi/America/Kentucky/
+${JDKHOME}/jre/lib/zi/America/Kentucky/Louisville
 ${JDKHOME}/jre/lib/zi/America/Kentucky/Monticello
 ${JDKHOME}/jre/lib/zi/America/La_Paz
 ${JDKHOME}/jre/lib/zi/America/Lima
 ${JDKHOME}/jre/lib/zi/America/Los_Angeles
-${JDKHOME}/jre/lib/zi/America/Louisville
 ${JDKHOME}/jre/lib/zi/America/Maceio
 ${JDKHOME}/jre/lib/zi/America/Managua
 ${JDKHOME}/jre/lib/zi/America/Manaus
@@ -1062,6 +1067,7 @@ ${JDKHOME}/jre/lib/zi/America/Menominee
 ${JDKHOME}/jre/lib/zi/America/Merida
 ${JDKHOME}/jre/lib/zi/America/Mexico_City
 ${JDKHOME}/jre/lib/zi/America/Miquelon
+${JDKHOME}/jre/lib/zi/America/Moncton
 ${JDKHOME}/jre/lib/zi/America/Monterrey
 ${JDKHOME}/jre/lib/zi/America/Montevideo
 ${JDKHOME}/jre/lib/zi/America/Montreal
@@ -1073,6 +1079,7 @@ ${JDKHOME}/jre/lib/zi/America/Nome
 ${JDKHOME}/jre/lib/zi/America/Noronha
 ${JDKHOME}/jre/lib/zi/America/North_Dakota/
 ${JDKHOME}/jre/lib/zi/America/North_Dakota/Center
+${JDKHOME}/jre/lib/zi/America/North_Dakota/New_Salem
 ${JDKHOME}/jre/lib/zi/America/Panama
 ${JDKHOME}/jre/lib/zi/America/Pangnirtung
 ${JDKHOME}/jre/lib/zi/America/Paramaribo
@@ -1219,7 +1226,10 @@ ${JDKHOME}/jre/lib/zi/Australia/Melbourne
 ${JDKHOME}/jre/lib/zi/Australia/Perth
 ${JDKHOME}/jre/lib/zi/Australia/Sydney
 ${JDKHOME}/jre/lib/zi/CET
+${JDKHOME}/jre/lib/zi/CST6CDT
 ${JDKHOME}/jre/lib/zi/EET
+${JDKHOME}/jre/lib/zi/EST
+${JDKHOME}/jre/lib/zi/EST5EDT
 ${JDKHOME}/jre/lib/zi/Etc/
 ${JDKHOME}/jre/lib/zi/Etc/GMT
 ${JDKHOME}/jre/lib/zi/Etc/GMT+1
@@ -1295,6 +1305,7 @@ ${JDKHOME}/jre/lib/zi/Europe/Warsaw
 ${JDKHOME}/jre/lib/zi/Europe/Zaporozhye
 ${JDKHOME}/jre/lib/zi/Europe/Zurich
 ${JDKHOME}/jre/lib/zi/GMT
+${JDKHOME}/jre/lib/zi/HST
 ${JDKHOME}/jre/lib/zi/Indian/
 ${JDKHOME}/jre/lib/zi/Indian/Antananarivo
 ${JDKHOME}/jre/lib/zi/Indian/Chagos
@@ -1308,6 +1319,9 @@ ${JDKHOME}/jre/lib/zi/Indian/Mauritius
 ${JDKHOME}/jre/lib/zi/Indian/Mayotte
 ${JDKHOME}/jre/lib/zi/Indian/Reunion
 ${JDKHOME}/jre/lib/zi/MET
+${JDKHOME}/jre/lib/zi/MST
+${JDKHOME}/jre/lib/zi/MST7MDT
+${JDKHOME}/jre/lib/zi/PST8PDT
 ${JDKHOME}/jre/lib/zi/Pacific/
 ${JDKHOME}/jre/lib/zi/Pacific/Apia
 ${JDKHOME}/jre/lib/zi/Pacific/Auckland