From 21250f5121ee51c841db44c766454e79e98e7c82 Mon Sep 17 00:00:00 2001 From: piernov Date: Sun, 5 Aug 2012 23:16:32 +0200 Subject: tzdata 2012e-1 màj port MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tzdata/tzcode-makefile.patch | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'tzdata/tzcode-makefile.patch') diff --git a/tzdata/tzcode-makefile.patch b/tzdata/tzcode-makefile.patch index f506f67a1..80515c8de 100644 --- a/tzdata/tzcode-makefile.patch +++ b/tzdata/tzcode-makefile.patch @@ -1,7 +1,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile ---- tzcode.orig/Makefile 2011-11-01 17:05:10.019362464 +0100 -+++ tzcode/Makefile 2011-11-01 17:10:20.071702206 +0100 -@@ -37,17 +37,17 @@ +--- tzcode.orig/Makefile 2012-08-03 19:21:09.713863123 +0200 ++++ tzcode/Makefile 2012-08-03 19:21:31.769750400 +0200 +@@ -39,17 +39,17 @@ # Everything gets put in subdirectories of. . . @@ -22,7 +22,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile # If you "make INSTALL", the "date" command gets installed in. . . -@@ -86,7 +86,7 @@ +@@ -88,7 +88,7 @@ # Non-default libraries needed to link. # Add -lintl if you want to use `gettext' on Solaris. @@ -31,7 +31,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile # Add the following to the end of the "CFLAGS=" line as needed. # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?) -@@ -212,7 +212,7 @@ +@@ -214,7 +214,7 @@ # before the first Monday in January when a "%V" format is used and January 1 # falls on a Friday, Saturday, or Sunday. @@ -40,7 +40,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile # If you want zic's -s option used when installing, uncomment the next line # ZFLAGS= -s -@@ -221,7 +221,7 @@ +@@ -223,7 +223,7 @@ ZIC= $(zic) $(ZFLAGS) # The name of a Posix-compliant `awk' on your system. @@ -48,8 +48,8 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile +AWK= awk # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -242,8 +242,10 @@ + # The default is appropriate for Ubuntu. +@@ -257,8 +257,10 @@ ############################################################################### @@ -62,7 +62,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -283,14 +285,16 @@ +@@ -298,14 +300,16 @@ ALL: all date @@ -83,7 +83,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 -rm -f $(MANDIR)/man3/newctime.3 \ $(MANDIR)/man3/newtzset.3 \ -@@ -299,13 +303,11 @@ +@@ -314,13 +318,11 @@ $(MANDIR)/man8/zdump.8 \ $(MANDIR)/man8/zic.8 cp newctime.3 newtzset.3 $(MANDIR)/man3/. @@ -99,7 +99,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile -rm -f $(MANDIR)/man1/date.1 cp date.1 $(MANDIR)/man1/. -@@ -335,9 +337,9 @@ +@@ -354,9 +356,9 @@ # You must replace all of $(TZDIR) to switch from not using leap seconds # to using them, or vice versa. other_two: zic leapseconds $(TDATA) @@ -111,7 +111,7 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile posix_right: posix_only other_two -@@ -362,7 +364,7 @@ +@@ -382,7 +384,7 @@ <$? >$@ chmod +x $@ @@ -121,11 +121,11 @@ diff -Nru tzcode.orig/Makefile tzcode/Makefile check_tables: checktab.awk $(PRIMARY_YDATA) $(AWK) -f checktab.awk $(PRIMARY_YDATA) diff -Nru tzcode.orig/tzselect.ksh tzcode/tzselect.ksh ---- tzcode.orig/tzselect.ksh 2011-11-01 17:05:10.019362464 +0100 -+++ tzcode/tzselect.ksh 2011-11-01 17:06:02.997454135 +0100 +--- tzcode.orig/tzselect.ksh 2012-08-03 19:21:09.713863123 +0200 ++++ tzcode/tzselect.ksh 2012-08-03 19:21:31.773083616 +0200 @@ -1,4 +1,4 @@ -#! /bin/ksh +#! /bin/bash - VERSION='@(#)tzselect.ksh 8.2' + TZVERSION=see_Makefile -- cgit v1.2.3-70-g09d2