7 files changed, 35 insertions, 13 deletions

diff --git a/misc/zoneinfo/Makefile b/misc/zoneinfo/Makefile
index daf47449ca49..5bd57372d910 100644
--- a/misc/zoneinfo/Makefile
+++ b/misc/zoneinfo/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	zoneinfo
-DISTVERSION=	2007h
-PORTREVISION=	1
+DISTVERSION=	2007j
 CATEGORIES=	misc
 MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
 DISTNAME=	tzdata${DISTVERSION}
@@ -36,14 +35,16 @@ MASTER_SITES+=	http://people.freebsd.org/~edwin/
 
 # The following country codes can be missing from /usr/share/misc/iso3166 and
 # shouldn't appear in the zoneinfo file.
-MISSING=	ax gg im je me rs
+MISSING=	ax bl gg im je me mf rs
 
+.ifndef NOMISSING
 .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
+.endif
 
 do-build:
 	umask 022; \
@@ -62,7 +63,7 @@ post-install:
 test-patches:
 .for M in ${MISSING}
 	make clean
-	EXTRA_PATCHES=${FILESDIR}/patchremove-${M} make patch
+	NOMISSING=1 EXTRA_PATCHES=${FILESDIR}/patchremove-${M} make patch
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/misc/zoneinfo/distinfo b/misc/zoneinfo/distinfo
index 585b98425d11..48a086bd5907 100644
--- a/misc/zoneinfo/distinfo
+++ b/misc/zoneinfo/distinfo
@@ -1,3 +1,3 @@
-MD5 (tzdata2007h.tar.gz) = da8b4fb3abd4f1403b0bd2a4675a91ab
-SHA256 (tzdata2007h.tar.gz) = 8f16f0db83073c8ccb3702f9173c4991200c78e64ebd358fce9cbbf4371a2148
-SIZE (tzdata2007h.tar.gz) = 162187
+MD5 (tzdata2007j.tar.gz) = cca2880ec98ad43a0a6ba0bc9beb81c1
+SHA256 (tzdata2007j.tar.gz) = 0319a3dc08f05a92b5c409cc7278a45fa6194bcdfdd27918554bd3d8d6d33c6d
+SIZE (tzdata2007j.tar.gz) = 163202
diff --git a/misc/zoneinfo/files/patchremove-bl b/misc/zoneinfo/files/patchremove-bl
new file mode 100644
index 000000000000..558fb6c7c4ce
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-bl
@@ -0,0 +1,11 @@
+--- zone.tab.orig	Tue Dec  4 09:46:40 2007
++++ zone.tab	Tue Dec  4 09:46:50 2007
+@@ -77,7 +77,7 @@
+ BH	+2623+05035	Asia/Bahrain
+ BI	-0323+02922	Africa/Bujumbura
+ BJ	+0629+00237	Africa/Porto-Novo
+-BL	+1753-06251	America/St_Barthelemy
++#BL	+1753-06251	America/St_Barthelemy
+ BM	+3217-06446	Atlantic/Bermuda
+ BN	+0456+11455	Asia/Brunei
+ BO	-1630-06809	America/La_Paz
diff --git a/misc/zoneinfo/files/patchremove-me b/misc/zoneinfo/files/patchremove-me
index d8f604c4fe78..5a1144dca70c 100644
--- a/misc/zoneinfo/files/patchremove-me
+++ b/misc/zoneinfo/files/patchremove-me
@@ -1,11 +1,8 @@
---- zone.tab.orig	Tue Nov 28 08:11:37 2006
-+++ zone.tab	Tue Nov 28 08:11:46 2006
-@@ -247,7 +247,7 @@
+--- zone.tab.orig	Tue Dec  4 01:50:41 2007
++++ zone.tab	Tue Dec  4 09:57:33 2007
+@@ -250,4 +250,4 @@
  MA	+3339-00735	Africa/Casablanca
  MC	+4342+00723	Europe/Monaco
  MD	+4700+02850	Europe/Chisinau
 -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
diff --git a/misc/zoneinfo/files/patchremove-mf b/misc/zoneinfo/files/patchremove-mf
new file mode 100644
index 000000000000..440a45ff56f4
--- /dev/null
+++ b/misc/zoneinfo/files/patchremove-mf
@@ -0,0 +1,7 @@
+--- zone.tab.orig	Tue Dec  4 01:50:41 2007
++++ zone.tab	Tue Dec  4 09:57:33 2007
+@@ -254,3 +254,3 @@
+-MF	+1804-06305	America/Marigot
++#MF	+1804-06305	America/Marigot
+ MG	-1855+04731	Indian/Antananarivo
+ MH	+0709+17112	Pacific/Majuro	most locations
diff --git a/misc/zoneinfo/pkg-descr b/misc/zoneinfo/pkg-descr
index 1a9e70384cfb..d4c2f3aae37f 100644
--- a/misc/zoneinfo/pkg-descr
+++ b/misc/zoneinfo/pkg-descr
@@ -1,2 +1,6 @@
 Updates to /usr/share/zoneinfo.
+
 Note that this port overwrites system files in /usr/share/zoneinfo.
+
+If you build your systems from source, please add MK_ZONEINFO="no"
+to your /etc/make.conf.
diff --git a/misc/zoneinfo/pkg-plist b/misc/zoneinfo/pkg-plist
index 6d200a631992..94bb0280e70c 100644
--- a/misc/zoneinfo/pkg-plist
+++ b/misc/zoneinfo/pkg-plist
@@ -129,6 +129,7 @@ share/zoneinfo/America/Maceio
 share/zoneinfo/America/Managua
 share/zoneinfo/America/Manaus
 share/zoneinfo/America/Martinique
+share/zoneinfo/America/Marigot
 share/zoneinfo/America/Mazatlan
 share/zoneinfo/America/Menominee
 share/zoneinfo/America/Merida
@@ -165,6 +166,7 @@ share/zoneinfo/America/Santo_Domingo
 share/zoneinfo/America/Sao_Paulo
 share/zoneinfo/America/Scoresbysund
 share/zoneinfo/America/Shiprock
+share/zoneinfo/America/St_Barthelemy
 share/zoneinfo/America/St_Johns
 share/zoneinfo/America/St_Kitts
 share/zoneinfo/America/St_Lucia