1 files changed, 0 insertions, 107 deletions
diff --git a/main/tzdata/Makefile.patch b/main/tzdata/Makefile.patch
deleted file mode 100644
index 3d32e37ccd..0000000000
--- 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 && \