Update to 2006p (which fixes the Australian WA changes in timezones)

5 files changed, 13 insertions, 44 deletions

diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index e55384f20849..392a49a65d35 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneinfo
-DISTVERSION=	2006o
-PORTVERSION=	1
+DISTVERSION=	2006p
 CATEGORIES=	misc
 MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
 DISTNAME=	tzdata${DISTVERSION}
diff --git a/misc/zoneinfo/distinfo b/misc/zoneinfo/distinfo
index 2525849a60d1..f47cc2c4be8c 100644
--- a/misc/zoneinfo/distinfo
+++ b/misc/zoneinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (tzdata2006o.tar.gz) = 1dc760409e9a7e6a2f29152d26503c5d
-SHA256 (tzdata2006o.tar.gz) = 89637e234141fb03f5485b1fb7bf871202568c8daf5933e5e4a04b4ceabf3dfa
-SIZE (tzdata2006o.tar.gz) = 157064
+MD5 (tzdata2006p.tar.gz) = cbdf758536710f444de1467fdc19594f
+SHA256 (tzdata2006p.tar.gz) = 6b246374b468d8ead477541f4624b74cd1da2b3de7ef757a3fc40ca29cfb29bc
+SIZE (tzdata2006p.tar.gz) = 157220
diff --git a/misc/zoneinfo/files/patch-fixau b/misc/zoneinfo/files/patch-fixau
deleted file mode 100644
index 773c7f05342e..000000000000
--- a/misc/zoneinfo/files/patch-fixau
+++ /dev/null
@@ -1,30 +0,0 @@
---- australasia.orig	Mon Nov 27 22:42:33 2006
-+++ australasia	Mon Nov 27 22:44:47 2006
-@@ -29,6 +29,18 @@
- 			 9:00	-	CST	1899 May
- 			 9:30	Aus	CST
- # Western Australia
-+#
-+# From Peter Jeremy (2006-11-22)
-+# The WA Parliament has just passed legislation to trial Daylight Saving
-+# for 3 years, starting in December 2006.
-+#  http://www.parliament.wa.gov.au/parliament/bills.nsf/BillProgressPopup?openForm&ParentUNID=9A1B183144403DA54825721200088DF1
-+#
-+# Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-+Rule   AW      2007    2009    -       Oct     lastSun 2:00s   1:00    -
-+Rule   AW      2006    only    -       Dec     3       2:00s   0       -
-+Rule   AW      2007    2009    -       Mar     lastSun 2:00s   1:00    -
-+# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-+
- Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
- 			 8:00	Aus	WST	1943 Jul
- 			 8:00	-	WST	1974 Oct lastSun 2:00s
-@@ -37,7 +49,7 @@
- 			 8:00	1:00	WST	1984 Mar Sun>=1 2:00s
- 			 8:00	-	WST	1991 Nov 17 2:00s
- 			 8:00	1:00	WST	1992 Mar Sun>=1 2:00s
--			 8:00	-	WST
-+			 8:00	AW	WST
- # Queensland
- #
- # From Alex Livingston (1996-11-01):
diff --git a/misc/zoneinfo/files/patchremove-je b/misc/zoneinfo/files/patchremove-je
index 1a0057d196fc..cb3bc83c8be2 100644
--- a/misc/zoneinfo/files/patchremove-je
+++ b/misc/zoneinfo/files/patchremove-je
@@ -1,11 +1,11 @@
---- zone.tab	Tue Aug 29 18:15:23 2006
-+++ zone.tab.orig	Tue Aug 29 18:15:14 2006
-@@ -213,7 +213,7 @@
+--- zone.tab.orig	Tue Nov 28 08:10:12 2006
++++ zone.tab	Tue Nov 28 08:10:25 2006
+@@ -212,7 +212,7 @@
  IR	+3540+05126	Asia/Tehran
  IS	+6409-02151	Atlantic/Reykjavik
  IT	+4154+01229	Europe/Rome
--JE	+4912-00237	Europe/Jersey
-+#JE	+4912-00237	Europe/Jersey
+-JE	+4912-00207	Europe/Jersey
++#JE	+4912-00207	Europe/Jersey
  JM	+1800-07648	America/Jamaica
  JO	+3157+03556	Asia/Amman
  JP	+353916+1394441	Asia/Tokyo
diff --git a/misc/zoneinfo/files/patchremove-me b/misc/zoneinfo/files/patchremove-me
index 2d69cbc3d738..d8f604c4fe78 100644
--- a/misc/zoneinfo/files/patchremove-me
+++ b/misc/zoneinfo/files/patchremove-me
@@ -1,11 +1,11 @@
---- zone.tab.orig	Tue Oct 17 07:38:12 2006
-+++ zone.tab	Tue Oct 17 07:38:31 2006
+--- zone.tab.orig	Tue Nov 28 08:11:37 2006
++++ zone.tab	Tue Nov 28 08:11:46 2006
 @@ -247,7 +247,7 @@
  MA	+3339-00735	Africa/Casablanca
  MC	+4342+00723	Europe/Monaco
  MD	+4700+02850	Europe/Chisinau
--ME	+4247+01928	Europe/Podgorica
-+#ME	+4247+01928	Europe/Podgorica
+-ME	+4226+01916	Europe/Podgorica
++#ME	+4226+01916	Europe/Podgorica
  MG	-1855+04731	Indian/Antananarivo
  MH	+0709+17112	Pacific/Majuro	most locations
  MH	+0905+16720	Pacific/Kwajalein	Kwajalein