X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 18028DC0C5A for ; Sat, 3 Oct 2015 13:04:08 +0000 (UTC) Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 66279DC03A2; Sat, 3 Oct 2015 13:04:07 +0000 (UTC) Received: from localhost (ip5f5ac917.dynamic.kabel-deutschland.de [95.90.201.23]); by lithium.8pit.net (OpenSMTPD) with ESMTPSA id ec450646; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 3 Oct 2015 15:04:05 +0200 (CEST) From: =?UTF-8?q?S=C3=B6ren=20Tempel?= To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/tzdata: remove obsolet Makefile patch Date: Sat, 3 Oct 2015 15:03:58 +0200 Message-Id: <1443877438-26564-1-git-send-email-soeren+git@soeren-tempel.net> X-Mailer: git-send-email 2.6.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/tzdata/Makefile.patch | 107 --------------------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 main/tzdata/Makefile.patch diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch deleted file mode 100644 index 3d32e37..0000000 --- a/main/tzdata/Makefile.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- ./Makefile.orig -+++ ./Makefile -@@ -44,21 +44,21 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= /usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - - TZDIR_BASENAME= zoneinfo --TZDIR= $(TOPDIR)/etc/$(TZDIR_BASENAME) -+TZDIR= $(TOPDIR)/share/$(TZDIR_BASENAME) - - # Types to try, as an alternative to time_t. int64_t should be first. - TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -66,7 +66,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -323,15 +323,17 @@ - - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC+= -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - AR= ar - - # ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. - RANLIB= : - --TZCOBJS= zic.o -+TZCOBJS= zic.o scheck.o ialloc.o - TZDOBJS= zdump.o localtime.o asctime.o - DATEOBJS= date.o localtime.o strftime.o asctime.o - LIBSRCS= localtime.c asctime.c difftime.c -@@ -376,12 +378,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) - cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/. -- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/. -+ cp zic zdump $(DESTDIR)$(SBINDIR)/. -+ cp tzselect $(DESTDIR)$(BINDIR)/. - cp libtz.a $(DESTDIR)$(LIBDIR)/. - $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a - cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/. -@@ -430,18 +434,18 @@ - # to using them, or vice versa. - right_posix: right_only leapseconds - rm -fr $(DESTDIR)$(TZDIR)-leaps -- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \ -- $(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 \ -+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/posix \ - -L /dev/null $(TDATA) - - posix_right: posix_only leapseconds - rm -fr $(DESTDIR)$(TZDIR)-posix -- ln -s $(TZDIR_BASENAME) $(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 \ -+ $(ZIC) -y $(YEARISTYPE) -d $(DESTDIR)$(TZDIR)/right \ - -L leapseconds $(TDATA) - - posix_packrat: posix_only backzone -@@ -470,7 +474,7 @@ - chmod +x $@ - - check: check_character_set check_white_space check_links check_sorted \ -- check_tables check_web -+ check_tables - - check_character_set: $(ENCHILADA) - LC_ALL=en_US.utf8 && export LC_ALL && \ -- 2.6.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---