summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-12-22 04:50:05 +0000
committerMike Frysinger <vapier@gentoo.org>2008-12-22 04:50:05 +0000
commit5bdc6a12d2b69346f17cf71bdee3b1717fa87726 (patch)
tree990d7ee08b095a0e23cef4f61d63ee137c08b66c /sys-libs/timezone-data/files
parentSilence QA warnings with binary-only libtfmessbsp.so. (diff)
downloadgentoo-2-5bdc6a12d2b69346f17cf71bdee3b1717fa87726.tar.gz
gentoo-2-5bdc6a12d2b69346f17cf71bdee3b1717fa87726.tar.bz2
gentoo-2-5bdc6a12d2b69346f17cf71bdee3b1717fa87726.zip
old
Diffstat (limited to 'sys-libs/timezone-data/files')
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch121
-rw-r--r--sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch41
2 files changed, 0 insertions, 162 deletions
diff --git a/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch b/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
deleted file mode 100644
index ce05fe70efb4..000000000000
--- a/sys-libs/timezone-data/files/timezone-data-2005n-makefile.patch
+++ /dev/null
@@ -1,121 +0,0 @@
- - Fix up default paths
- - Support env DESTDIR / LDFLAGS / CFLAGS / CC
- - Use awk instead of nawk
- - 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
- - Disable broken web test
- - Make sure tzselect uses #!/bin/bash and not #!/bin/ksh
-
---- Makefile
-+++ Makefile
-@@ -35,5 +35,5 @@
- # Everything gets put in subdirectories of. . .
-
--TOPDIR= /usr/local
-+TOPDIR= $(DESTDIR)/usr
-
- # "Compiled" time zone information is placed in the "TZDIR" directory
-@@ -41,9 +41,9 @@
- # Use an absolute path name for TZDIR unless you're just testing the software.
-
--TZDIR= $(TOPDIR)/etc/zoneinfo
-+TZDIR= $(TOPDIR)/share/zoneinfo
-
- # 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. . .
-@@ -53,5 +53,5 @@
- # Manual pages go in subdirectories of. . .
-
--MANDIR= $(TOPDIR)/man
-+MANDIR= $(TOPDIR)/share/man
-
- # Library functions are put in an archive in LIBDIR.
-@@ -84,5 +84,5 @@
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
-
- # Add the following to the end of the "CFLAGS=" line as needed.
-@@ -211,5 +211,5 @@
- # falls on a Friday, Saturday, or Sunday.
-
--CFLAGS=
-+CFLAGS += -std=gnu99
-
- # If you want zic's -s option used when installing, uncomment the next line
-@@ -220,5 +220,5 @@
-
- # The name of a Posix-compliant `awk' on your system.
--AWK= nawk
-+AWK= awk
-
- # The path where SGML DTDs are kept.
-@@ -241,8 +241,10 @@
-
- ###############################################################################
-
--cc= cc
--CC= $(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+= -DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+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
-@@ -281,11 +281,13 @@
- ALL: all date
-
--install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install: all $(DATA) $(REDO) $(MANS) $(TABDATA)
- $(ZIC) -y $(YEARISTYPE) \
- -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- cp iso3166.tab zone.tab $(TZDIR)/.
-- -mkdir $(TOPDIR) $(ETCDIR)
-- cp tzselect zic zdump $(ETCDIR)/.
-+ -mkdir $(TOPDIR) $(SBINDIR)
-+ cp zic zdump $(SBINDIR)/.
-+ -mkdir $(TOPDIR) $(BINDIR)
-+ cp tzselect $(BINDIR)/.
- -mkdir $(TOPDIR) $(MANDIR) \
- $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
-@@ -297,6 +299,4 @@
- $(MANDIR)/man8/zic.8
- cp newctime.3 newtzset.3 $(MANDIR)/man3/.
-- cp tzfile.5 $(MANDIR)/man5/.
-- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
-
- INSTALL: ALL install date.1
-@@ -333,7 +333,7 @@
- # to using them, or vice versa.
- other_two: zic leapseconds $(TDATA)
-- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- $(ZIC) -y $(YEARISTYPE) \
-- -d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+ -d $(TZDIR)/right -L leapseconds $(TDATA)
-
- posix_right: posix_only other_two
-@@ -366,5 +366,5 @@
- chmod +x $@
-
--check: check_tables check_web
-+check: check_tables
-
- check_tables: checktab.awk $(PRIMARY_YDATA)
---- tzselect.ksh
-+++ tzselect.ksh
-@@ -1,3 +1,3 @@
--#! /bin/ksh
-+#! /bin/bash
-
- # '@(#)tzselect.ksh 1.8'
diff --git a/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch b/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch
deleted file mode 100644
index 4e45160fa16e..000000000000
--- a/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Get some real sanity into the linking situation.
-- LDLIBS is for libraries only.
-- Flags to the linking are passed as LDFLAGS, not LFLAGS.
-- LDFLAGS was missed for the 'date' target.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar Makefile Makefile
---- Makefile 2008-10-14 02:31:04.388508402 -0700
-+++ Makefile 2008-10-14 02:36:18.931855910 -0700
-@@ -83,7 +83,7 @@
-
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=$(LDFLAGS)
-+LDLIBS=
-
- # Add the following to the end of the "CFLAGS=" line as needed.
- # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?)
-@@ -309,10 +309,10 @@
- cp date.1 $(MANDIR)/man1/.
-
- zdump: $(TZDOBJS)
-- $(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
-
- zic: $(TZCOBJS) yearistype
-- $(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
-
- yearistype: yearistype.sh
- cp yearistype.sh yearistype
-@@ -351,7 +351,7 @@
- then ranlib $@ ; fi
-
- date: $(DATEOBJS)
-- $(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
-+ $(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
- $(LDLIBS) -lc -o $@
-
- tzselect: tzselect.ksh