From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 21 22:50:20 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 160E816A403 for ; Sat, 21 Oct 2006 22:50:20 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B234643D5A for ; Sat, 21 Oct 2006 22:50:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k9LMoI97024222 for ; Sat, 21 Oct 2006 22:50:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k9LMoITf024218; Sat, 21 Oct 2006 22:50:18 GMT (envelope-from gnats) Resent-Date: Sat, 21 Oct 2006 22:50:18 GMT Resent-Message-Id: <200610212250.k9LMoITf024218@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB54B16A407 for ; Sat, 21 Oct 2006 22:50:08 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail4out.barnet.com.au (mail4.barnet.com.au [202.83.178.125]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2FAD943D46 for ; Sat, 21 Oct 2006 22:50:08 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mail4out.barnet.com.au (Postfix, from userid 1001) id 83A6A37BAEB; Sun, 22 Oct 2006 08:50:07 +1000 (EST) Received: from mail4auth.barnet.com.au (mail4.barnet.com.au [202.83.178.125]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail4.barnet.com.au (Postfix) with ESMTP id 4067A4226B4 for ; Sun, 22 Oct 2006 08:50:07 +1000 (EST) Received: from k7.mavetju (k7.mavetju.org [10.251.1.18]) by mail4auth.barnet.com.au (Postfix) with ESMTP id B552C37BAE7 for ; Sun, 22 Oct 2006 08:50:06 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id 8B6E355; Sun, 22 Oct 2006 08:50:06 +1000 (EST) Message-Id: <20061021225006.8B6E355@k7.mavetju> Date: Sun, 22 Oct 2006 08:50:06 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/104664: [patch] fix misc/zoneinfo runtime X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Oct 2006 22:50:20 -0000 >Number: 104664 >Category: ports >Synopsis: [patch] fix misc/zoneinfo runtime >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: Sat Oct 21 22:50:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 6.1-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386 >Description: Redo method of determining which patches should be applied. >How-To-Repeat: >Fix: ? work Index: Makefile =================================================================== RCS file: /home/pcvs/ports/misc/zoneinfo/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- Makefile 12 Oct 2006 11:41:16 -0000 1.11 +++ Makefile 21 Oct 2006 22:48:29 -0000 @@ -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 @@ 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 -.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 - -HAS_JE!= ${GREP} -c ^JE /usr/share/misc/iso3166 || ${TRUE} -.if ${HAS_JE} == "0" -EXTRA_PATCHES+= ${FILESDIR}/patchremove-je +# 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 + +.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; \ Index: files/patch4-zone.tab =================================================================== RCS file: files/patch4-zone.tab diff -N files/patch4-zone.tab --- files/patch4-zone.tab 28 Mar 2006 02:15:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ ---- zone.tab.orig Tue Mar 28 13:09:09 2006 -+++ zone.tab Tue Mar 28 13:09:18 2006 -@@ -65,7 +65,7 @@ - AU -1228+13050 Australia/Darwin Northern Territory - AU -3157+11551 Australia/Perth Western Australia - AW +1230-06858 America/Aruba --AX +6006+01957 Europe/Mariehamn -+#AX +6006+01957 Europe/Mariehamn - AZ +4023+04951 Asia/Baku - BA +4352+01825 Europe/Sarajevo - BB +1306-05937 America/Barbados Index: files/patchremove-ax =================================================================== RCS file: files/patchremove-ax diff -N files/patchremove-ax --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patchremove-ax 21 Oct 2006 22:48:29 -0000 @@ -0,0 +1,11 @@ +--- zone.tab.orig Tue Mar 28 13:09:09 2006 ++++ zone.tab Tue Mar 28 13:09:18 2006 +@@ -65,7 +65,7 @@ + AU -1228+13050 Australia/Darwin Northern Territory + AU -3157+11551 Australia/Perth Western Australia + AW +1230-06858 America/Aruba +-AX +6006+01957 Europe/Mariehamn ++#AX +6006+01957 Europe/Mariehamn + AZ +4023+04951 Asia/Baku + BA +4352+01825 Europe/Sarajevo + BB +1306-05937 America/Barbados Index: files/patchremove-me =================================================================== RCS file: files/patchremove-me diff -N files/patchremove-me --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patchremove-me 21 Oct 2006 22:48:29 -0000 @@ -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 Index: files/patchremove-rs =================================================================== RCS file: files/patchremove-rs diff -N files/patchremove-rs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patchremove-rs 21 Oct 2006 22:48:29 -0000 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: