[FUG-BR] Patch para o zoneinfo - ENC: Error on tzsetup version 2006n

[Carlos Anderson Jardim]

Pessoal ta ai o patch para aplicar sobre o zoneinfo hehehe

--------------- CUT ---------------
? 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	16 Oct 2006 22:05:33 -0000
@@ -6,6 +6,7 @@

  PORTNAME=	zoneinfo
  DISTVERSION=	2006n
+PORTREVISION=	1
  CATEGORIES=	misc
  MASTER_SITES=	ftp://elsie.nci.nih.gov/pub/
  DISTNAME=	tzdata${DISTVERSION}
@@ -34,6 +35,11 @@
  EXTRA_PATCHES+=	${FILESDIR}/patch4-zone.tab
  .endif

+HAS_AX!=	${GREP} -c ^AX /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_AX} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-ax
+.endif
+
  HAS_GG!=	${GREP} -c ^GG /usr/share/misc/iso3166 || ${TRUE}
  .if ${HAS_GG} == "0"
  EXTRA_PATCHES+=	${FILESDIR}/patchremove-gg
@@ -49,6 +55,16 @@
  EXTRA_PATCHES+=	${FILESDIR}/patchremove-je
  .endif

+HAS_ME!=	${GREP} -c ^ME /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_ME} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-me
+.endif
+
+HAS_RS!=	${GREP} -c ^RS /usr/share/misc/iso3166 || ${TRUE}
+.if ${HAS_RS} == "0"
+EXTRA_PATCHES+=	${FILESDIR}/patchremove-rs
+.endif
+
  do-build:
  	umask 022; \
  	cd ${WRKSRC}; \
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	16 Oct 2006 22:05:33 -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	16 Oct 2006 22:05:33 -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	16 Oct 2006 22:05:33 -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

--------------- CUT ---------------


-------- Mensagem original --------
Assunto: Re: Error on tzsetup version 2006n
Data: Tue, 17 Oct 2006 08:07:45 +1000
De: Edwin Groothuis <edwin em mavetju.org>
Para: Carlos Anderson Jardim <cajardim em valesaude.com.br>
Referências: <4533F839.7020801 em valesaude.com.br>

On Mon, Oct 16, 2006 at 06:23:05PM -0300, Carlos Anderson Jardim wrote:
> Please, see this error on zoneinfo (ports)
> 
> # tzsetup
> tzsetup: /usr/share/zoneinfo/zone.tab:250: country code `ME' unknown
> and
> tzsetup: /usr/share/zoneinfo/zone.tab:315: country code `RS' unknown

Aha, I had caught the one about ME, but not about RS. I've submitted
a patch to be approved by portmgr (ports freeze) so it should be
fixed soon. Hopefully.

See attached patch for a temporary fix.

Edwin

-- 
Edwin Groothuis      |            Personal website: http://www.mavetju.org
edwin em mavetju.org    |          Weblog: http://weblog.barnet.com.au/edwin/




--------------------------------
Carlos Anderson Jardim
Tecnologia da Informacao - Redes e Internet
Santa Casa de São José dos Campos
Linux User #403727
FUG-BR User #381
Tel.: (12) 3925-1873 - 3925-1925

-- 
Esta mensagem foi verificada pelo sistema de antivírus e
 acredita-se estar livre de perigo.