Skip site navigation (1)Skip section navigation (2)
Date:      Tue,  4 Dec 2007 10:04:36 +1100 (EST)
From:      Edwin Groothuis <edwin@mavetju.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/118409: [patch] update misc/zoneinfo to 2007j
Message-ID:  <20071203230436.D8CA124F@k7.mavetju>
Resent-Message-ID: <200712032310.lB3NA2Wc096446@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         118409
>Category:       ports
>Synopsis:       [patch] update misc/zoneinfo to 2007j
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 03 23:10:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.2-RELEASE-p4 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/misc/zoneinfo/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	11 Oct 2007 21:12:40 -0000	1.27
+++ Makefile	3 Dec 2007 23:03:35 -0000
@@ -5,8 +5,7 @@
 # $FreeBSD: ports/misc/zoneinfo/Makefile,v 1.27 2007/10/11 21:12:40 edwin Exp $
 
 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 @@
 
 # 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 @@
 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>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/misc/zoneinfo/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- distinfo	4 Oct 2007 12:43:06 -0000	1.17
+++ distinfo	3 Dec 2007 23:03:35 -0000
@@ -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
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/misc/zoneinfo/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr	27 Mar 2006 02:46:09 -0000	1.1
+++ pkg-descr	3 Dec 2007 23:03:35 -0000
@@ -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.
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/misc/zoneinfo/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	4 Oct 2007 12:43:06 -0000	1.6
+++ pkg-plist	3 Dec 2007 23:03:35 -0000
@@ -129,6 +129,7 @@
 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/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
Index: files/patchremove-bl
===================================================================
RCS file: files/patchremove-bl
diff -N files/patchremove-bl
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patchremove-bl	3 Dec 2007 23:03:35 -0000
@@ -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
Index: files/patchremove-me
===================================================================
RCS file: /home/pcvs/ports/misc/zoneinfo/files/patchremove-me,v
retrieving revision 1.2
diff -u -r1.2 patchremove-me
--- files/patchremove-me	27 Nov 2006 21:14:10 -0000	1.2
+++ files/patchremove-me	3 Dec 2007 23:03:35 -0000
@@ -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
Index: files/patchremove-mf
===================================================================
RCS file: files/patchremove-mf
diff -N files/patchremove-mf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patchremove-mf	3 Dec 2007 23:03:35 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071203230436.D8CA124F>