diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-29 07:16:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-29 07:16:47 +0000 |
| commit | 9960f32f3dc5aeeec5299c2e74bf10e878981f75 (patch) | |
| tree | a0c9ca54e3255988e87a49c5358fbc2ff59098f2 /main/tzdata/Makefile.patch | |
| parent | 243ed29a35ec0a3b37027b45dfe4629079512383 (diff) | |
| download | aports-9960f32f3dc5aeeec5299c2e74bf10e878981f75.tar.bz2 aports-9960f32f3dc5aeeec5299c2e74bf10e878981f75.tar.xz | |
main/tzdata: upgrade to 2013h
Diffstat (limited to 'main/tzdata/Makefile.patch')
| -rw-r--r-- | main/tzdata/Makefile.patch | 60 |
1 files changed, 20 insertions, 40 deletions
diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch index f496098f30..49693efac8 100644 --- a/main/tzdata/Makefile.patch +++ b/main/tzdata/Makefile.patch @@ -1,13 +1,5 @@ - - Fix up default paths - - Support env CC - - Don't build/install libtz.a - - Don't install man-pages provided by sys-apps/man-pages - - Move zic, zdump to sbin and tzselect to bin ala glibc - - Install posix zoneinfo into zoneinfo/posix/ instead of zoneinfo-posix/ ala glibc - - Install leaps zoneinfo into zoneinfo/right/ ala glibc - ---- a/Makefile -+++ b/Makefile +--- ./Makefile.orig 2013-10-25 22:34:35.000000000 +0000 ++++ ./Makefile 2013-10-29 07:15:04.554083434 +0000 @@ -45,21 +45,21 @@ # Everything gets put in subdirectories of. . . @@ -42,7 +34,7 @@ # Library functions are put in an archive in LIBDIR. -@@ -294,8 +294,10 @@ +@@ -298,8 +298,10 @@ ############################################################################### @@ -53,43 +45,31 @@ +CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" +endif - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -338,14 +340,16 @@ + AR= ar - ALL: all date - --install: all $(DATA) $(REDO) $(DESTDIR)$(TZLIB) $(MANS) -+install: all $(DATA) $(REDO) $(MANS) +@@ -352,12 +354,14 @@ + install: all $(DATA) $(REDO) $(MANS) + mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \ + $(DESTDIR)$(LIBDIR) \ ++ $(DESTDIR)$(SBINDIR) $(DESTDIR)$(BINDIR) \ + $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ + $(DESTDIR)$(MANDIR)/man8 $(ZIC) -y $(YEARISTYPE) \ -d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(DESTDIR)$(TZDIR)/iso3166.tab \ - $(DESTDIR)$(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. -- -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(ETCDIR) + cp -f iso3166.tab zone.tab $(DESTDIR)$(TZDIR)/. - cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. -+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(SBINDIR) + cp zic zdump $(DESTDIR)$(SBINDIR)/. -+ -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR) + cp tzselect $(DESTDIR)$(BINDIR)/. - -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(MANDIR) \ - $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \ - $(DESTDIR)$(MANDIR)/man8 -@@ -356,8 +360,6 @@ - $(DESTDIR)$(MANDIR)/man8/zdump.8 \ - $(DESTDIR)$(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. -- cp tzfile.5 $(DESTDIR)$(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/. - - INSTALL: ALL install date.1 - -mkdir $(DESTDIR)$(TOPDIR) $(DESTDIR)$(BINDIR) -@@ -405,17 +407,17 @@ + cp libtz.a $(DESTDIR)$(LIBDIR)/. + $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a + cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. +@@ -406,18 +410,18 @@ + # to using them, or vice versa. right_posix: right_only leapseconds rm -fr $(DESTDIR)$(TZDIR)-leaps - ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ -+ ln -s . $(DESTDIR)$(TZDIR)/right || \ - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ ++ ln -s . $(DESTDIR)$(TZDIR)/right || \ + $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ -L leapseconds $(TDATA) - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ @@ -99,8 +79,8 @@ posix_right: posix_only leapseconds rm -fr $(DESTDIR)$(TZDIR)-posix - ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \ -+ ln -s . $(DESTDIR)$(TZDIR)/posix || \ - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-posix \ ++ ln -s . $(DESTDIR)$(TZDIR)/posix || \ + $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)-leaps \ @@ -108,7 +88,7 @@ -L leapseconds $(TDATA) zones: $(REDO) -@@ -442,7 +442,7 @@ +@@ -440,7 +444,7 @@ <$? >$@ chmod +x $@ |