4 files changed, 32 insertions, 17 deletions

diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index be6215cd85bd..2918600904d1 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	zoneinfo
 DISTVERSION=	2006n
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
 DISTNAME=	tzdata${DISTVERSION}
@@ -23,31 +24,23 @@ TZFILES=	africa antarctica asia australasia etcetera europe \
 POSIXRULES=	America/New_York
 
 # Prevent packages if on the FreeBSD building cluster. This because
-# it overwrite system files and directories.
+# it overwrites system files and directories.
 .if defined(PACKAGE_BUILDING)
 NO_PACKAGE=	yes
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-EXTRA_PATCHES+=	${FILESDIR}/patch4-zone.tab
-.endif
-
-HAS_GG!=	${GREP} -c ^GG /usr/share/misc/iso3166 || ${TRUE}
-.if ${HAS_GG} == "0"
-EXTRA_PATCHES+=	${FILESDIR}/patchremove-gg
-.endif
-
-HAS_IM!=	${GREP} -c ^IM /usr/share/misc/iso3166 || ${TRUE}
-.if ${HAS_IM} == "0"
-EXTRA_PATCHES+=	${FILESDIR}/patchremove-im
-.endif
+# The following country codes can be missing from /usr/share/misc/iso3166 and
+# shouldn't appear in the zoneinfo file.
+MISSING=	ax gg im je me rs
 
-HAS_JE!=	${GREP} -c ^JE /usr/share/misc/iso3166 || ${TRUE}
-.if ${HAS_JE} == "0"
-EXTRA_PATCHES+=	${FILESDIR}/patchremove-je
+.for M in ${MISSING}
+HAS_${M:U}!=	${GREP} -c ^${M:U} /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_${M:U}} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-${M}
 .endif
+.endfor
 
 do-build:
 	umask 022; \
diff --git a/misc/zoneinfo/files/patch4-zone.tab b/misc/zoneinfo/files/patchremove-ax
index 6b9f86387128..6b9f86387128 100644
--- a/misc/zoneinfo/files/patch4-zone.tab
+++ b/misc/zoneinfo/files/patchremove-ax
diff --git a/misc/zoneinfo/files/patchremove-me b/misc/zoneinfo/files/patchremove-me
new file mode 100644
index 000000000000..2d69cbc3d738
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-me
@@ -0,0 +1,11 @@
+--- zone.tab.orig	Tue Oct 17 07:38:12 2006
++++ zone.tab	Tue Oct 17 07:38:31 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
+ MG	-1855+04731	Indian/Antananarivo
+ MH	+0709+17112	Pacific/Majuro	most locations
+ MH	+0905+16720	Pacific/Kwajalein	Kwajalein
diff --git a/misc/zoneinfo/files/patchremove-rs b/misc/zoneinfo/files/patchremove-rs
new file mode 100644
index 000000000000..c466c6ee6b82
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-rs
@@ -0,0 +1,11 @@
+--- zone.tab.orig	Tue Oct 17 07:38:12 2006
++++ zone.tab	Tue Oct 17 07:38:31 2006
+@@ -312,7 +312,7 @@
+ QA	+2517+05132	Asia/Qatar
+ RE	-2052+05528	Indian/Reunion
+ RO	+4426+02606	Europe/Bucharest
+-RS	+4450+02030	Europe/Belgrade
++#RS	+4450+02030	Europe/Belgrade
+ RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+ RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
+ RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea