5 files changed, 4 insertions, 48 deletions

diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index 2dd4a38b9d07..8bbc64806cba 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneinfo
-DISTVERSION=	2008e
-PORTREVISION=	1
+DISTVERSION=	2008f
 CATEGORIES=	misc
 MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
 DISTNAME=	tzdata${DISTVERSION}
diff --git a/misc/zoneinfo/distinfo b/misc/zoneinfo/distinfo
index c4a5b7969f04..ac55f00214e6 100644
--- a/misc/zoneinfo/distinfo
+++ b/misc/zoneinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (tzdata2008e.tar.gz) = 3b4578110a3d193ed9a00d61f27aba28
-SHA256 (tzdata2008e.tar.gz) = ddd526edfaf0d43fbe8facf772feb13266ae3cdddaf69a612b7a74cf37036548
-SIZE (tzdata2008e.tar.gz) = 171200
+MD5 (tzdata2008f.tar.gz) = aa3b077a7b786d46c131303b1d75deee
+SHA256 (tzdata2008f.tar.gz) = 81e0d0d86acd072f233a7ac9413f95f147ac64355e3d09708c228af115c05678
+SIZE (tzdata2008f.tar.gz) = 172882
diff --git a/misc/zoneinfo/files/patch-africa b/misc/zoneinfo/files/patch-africa
deleted file mode 100644
index 964cb7745561..000000000000
--- a/misc/zoneinfo/files/patch-africa
+++ /dev/null
@@ -1,11 +0,0 @@
---- africa.orig	2008-07-21 05:47:07.000000000 +1000
-+++ africa	2008-09-06 12:53:01.000000000 +1000
-@@ -542,7 +542,7 @@
- Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
- Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
- Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
--Rule	Morocco	2008	only	-	Sep	28	 0:00	0	-
-+Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
- 			 0:00	Morocco	WE%sT	1984 Mar 16
diff --git a/misc/zoneinfo/files/patch-asia b/misc/zoneinfo/files/patch-asia
deleted file mode 100644
index 16941db62769..000000000000
--- a/misc/zoneinfo/files/patch-asia
+++ /dev/null
@@ -1,11 +0,0 @@
---- asia.orig	2008-07-21 05:09:44.000000000 +1000
-+++ asia	2008-09-06 12:53:01.000000000 +1000
-@@ -1545,7 +1545,7 @@
- Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
- Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
- Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
--Rule Pakistan	2008	only	-	Sep	1	0:00	0	-
-+Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
- # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
- Zone	Asia/Karachi	4:28:12 -	LMT	1907
- 			5:30	-	IST	1942 Sep
diff --git a/misc/zoneinfo/files/patch-southamerica b/misc/zoneinfo/files/patch-southamerica
deleted file mode 100644
index 8e58499340d8..000000000000
--- a/misc/zoneinfo/files/patch-southamerica
+++ /dev/null
@@ -1,21 +0,0 @@
---- southamerica.orig	2008-09-06 12:58:32.000000000 +1000
-+++ southamerica	2008-09-06 13:03:06.000000000 +1000
-@@ -166,7 +166,7 @@
- # are quite possibly wrong, but are more likely than no DST at all.
- Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
- Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
--Rule	Arg	2008	max	-	Oct	Sun>=1	0:00	1:00	S
-+Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
-  
- # From Mariano Absatz (2004-05-21):
- # Today it was officially published that the Province of Mendoza is changing
-@@ -724,7 +724,8 @@
- Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
- # Decree <a href="http://pcdsh01.on.br/DecHV6212.gif">6,212</a> (2007-09-26),
- # adopted by the same states as before.
--Rule	Brazil	2007	max	-	Oct	Sun>=8	 0:00	1:00	S
-+Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
-+Rule	Brazil	2008	max	-	Oct	Sun>=15	 0:00	1:00	S
- Rule	Brazil	2008	max	-	Feb	Sun>=15	 0:00	0	-
- # The latest ruleset listed above says that the following states observe DST:
- # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.