[src/netbsd-6-1]: src/share/zoneinfo Back out all changes to this file accide...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/388a115ed555
branches:  netbsd-6-1
changeset: 776315:388a115ed555
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Mar 26 12:19:22 2018 +0000

description:
Back out all changes to this file accidently included in the pullup of
tickt #1539.

diffstat:

 share/zoneinfo/Makefile |  1037 ++++------------------------------------------
 1 files changed, 102 insertions(+), 935 deletions(-)

diffs (truncated from 1087 to 300 lines):

diff -r ba8a604a530d -r 388a115ed555 share/zoneinfo/Makefile
--- a/share/zoneinfo/Makefile   Sun Mar 25 18:36:12 2018 +0000
+++ b/share/zoneinfo/Makefile   Mon Mar 26 12:19:22 2018 +0000
@@ -1,43 +1,19 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# Package name for the code distribution.
-PACKAGE=       tzcode
+#      $NetBSD: Makefile,v 1.43.18.4 2018/03/26 12:19:22 martin Exp $
 
-# Version number for the distribution, overridden in the 'tarballs' rule below.
-VERSION=       unknown
-
-# Email address for bug reports.
-BUGEMAIL=      tz%iana.org@localhost
+.include <bsd.own.mk>
 
-# Choose source data features.  To get new features right away, use:
-#      DATAFORM=       vanguard
-# To wait a while before using new features, to give downstream users
-# time to upgrade zic (the default), use:
-#      DATAFORM=       main
-# To wait even longer for new features, use:
-#      DATAFORM=       rearguard
-DATAFORM=              main
+TZDISTDIR=${.CURDIR}
 
-# Change the line below for your time zone (after finding the zone you want in
-# the time zone files, or adding it to a time zone file).
-# Alternately, if you discover you've got the wrong time zone, you can just
-#      zic -l rightzone
-# to correct things.
-# Use the command
-#      make zonenames
-# to get a list of the values you can use for LOCALTIME.
-
-LOCALTIME=     GMT
+.PATH: ${TZDISTDIR}
 
 # If you want something other than Eastern United States time as a template
 # for handling POSIX-style time zone environment variables,
 # change the line below (after finding the zone you want in the
 # time zone files, or adding it to a time zone file).
-# When a POSIX-style environment variable is handled, the rules in the
+# (When a POSIX-style environment variable is handled, the rules in the
 # template file are used to determine "spring forward" and "fall back" days and
 # times; the environment variable itself specifies UT offsets of standard and
-# daylight saving time.
+# summer time.)
 # Alternately, if you discover you've got the wrong time zone, you can just
 #      zic -p rightzone
 # to correct things.
@@ -48,72 +24,18 @@
 
 POSIXRULES=    America/New_York
 
-# Also see TZDEFRULESTRING below, which takes effect only
-# if the time zone files cannot be accessed.
-
-
-# Installation locations.
-#
-# The defaults are suitable for Debian, except that if REDO is
-# posix_right or right_posix then files that Debian puts under
-# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
-# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
-# respectively.  Problems with the Debian approach are discussed in
-# the commentary for the right_posix rule (below).
-
-# Destination directory, which can be used for staging.
-# 'make DESTDIR=/stage install' installs under /stage (e.g., to
-# /stage/etc/localtime instead of to /etc/localtime).  Files under
-# /stage are not intended to work as-is, but can be copied by hand to
-# the root directory later.  If DESTDIR is empty, 'make install' does
-# not stage, but installs directly into production locations.
-DESTDIR =
-
-# Everything is installed into subdirectories of TOPDIR, and used there.
-# TOPDIR should be empty (meaning the root directory),
-# or a directory name that does not end in "/".
-# TOPDIR should be empty or an absolute name unless you're just testing.
-TOPDIR =
-
-# The default local time zone is taken from the file TZDEFAULT.
-TZDEFAULT = $(TOPDIR)/etc/localtime
-
-# The subdirectory containing installed program and data files, and
-# likewise for installed files that can be shared among architectures.
-# These should be relative file names.
-USRDIR = usr
-USRSHAREDIR = $(USRDIR)/share
-
 # "Compiled" time zone information is placed in the "TZDIR" directory
 # (and subdirectories).
-# TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
-TZDIR_BASENAME=        zoneinfo
-TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
+# Use an absolute path name for TZDIR unless you're just testing the software.
+# Note: ${DESTDIR} is prepended to this for the actual copy.
 
-# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
-BINDIR = $(TOPDIR)/$(USRDIR)/bin
-
-# The "zdump" command goes in:
-ZDUMPDIR = $(BINDIR)
-
-# The "zic" command goes in:
-ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
+TZDIR= /usr/share/zoneinfo
 
-# Manual pages go in subdirectories of. . .
-MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
-
-# Library functions are put in an archive in LIBDIR.
-LIBDIR = $(TOPDIR)/$(USRDIR)/lib
-
-
-# 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
-
-# If you want only POSIX time, with time values interpreted as
-# seconds since the epoch (not counting leap seconds), use
+# If you always want time values interpreted as "seconds since the epoch
+# (not counting leap seconds)", use
 #      REDO=           posix_only
-# below.  If you want only "right" time, with values interpreted
-# as seconds since the epoch (counting leap seconds), use
+# below.  If you always want right time values interpreted as "seconds since
+# the epoch" (counting leap seconds)", use
 #      REDO=           right_only
 # below.  If you want both sets of data available, with leap seconds not
 # counted normally, use
@@ -121,864 +43,109 @@
 # below.  If you want both sets of data available, with leap seconds counted
 # normally, use
 #      REDO=           right_posix
-# below.  POSIX mandates that leap seconds not be counted; for compatibility
-# with it, use "posix_only" or "posix_right".  Use POSIX time on systems with
-# leap smearing; this can work better than unsmeared "right" time with
-# applications that are not leap second aware, and is closer to unsmeared
-# "right" time than unsmeared POSIX time is (e.g., 0.5 vs 1.0 s max error).
-
-REDO=          posix_right
-
-# To install data in text form that has all the information of the binary data,
-# (optionally incorporating leap second information), use
-#      TZDATA_TEXT=    tzdata.zi leapseconds
-# To install text data without leap second information (e.g., because
-# REDO='posix_only'), use
-#      TZDATA_TEXT=    tzdata.zi
-# To avoid installing text data, use
-#      TZDATA_TEXT=
-
-TZDATA_TEXT=   leapseconds tzdata.zi
+# below.
 
-# For backward-compatibility links for old zone names, use
-#      BACKWARD=       backward
-# If you also want the link US/Pacific-New, even though it is confusing
-# and is planned to be removed from the database eventually, use
-#      BACKWARD=       backward pacificnew
-# To omit these links, use
-#      BACKWARD=
-
-BACKWARD=      backward
-
-# If you want out-of-scope and often-wrong data from the file 'backzone', use
-#      PACKRATDATA=    backzone
-# To omit this data, use
-#      PACKRATDATA=
-
-PACKRATDATA=
-
-# The name of a locale using the UTF-8 encoding, used during self-tests.
-# The tests are skipped if the name does not appear to work on this system.
-
-UTF8_LOCALE=   en_US.utf8
+REDO=          posix_only
 
 # Since "." may not be in PATH...
-
-YEARISTYPE=    ./yearistype
-
-# Non-default libraries needed to link.
-LDLIBS=
+YEARISTYPE=    "${HOST_SH} ${TZDISTDIR}/yearistype.sh"
 
-# Add the following to the end of the "CFLAGS=" line as needed to override
-# defaults specified in the source code.  "-DFOO" is equivalent to "-DFOO=1".
-#  -DBIG_BANG=-9999999LL if the Big Bang occurred at time -9999999 (see zic.c)
-#  -DDEPRECATE_TWO_DIGIT_YEARS for optional runtime warnings about strftime
-#      formats that generate only the last two digits of year numbers
-#  -DEPOCH_LOCAL if the 'time' function returns local time not UT
-#  -DEPOCH_OFFSET=N if the 'time' function returns a value N greater
-#      than what POSIX specifies, assuming local time is UT.
-#      For example, N is 252460800 on AmigaOS.
-#  -DHAVE_DECL_ASCTIME_R=0 if <time.h> does not declare asctime_r
-#  -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ'
-#  -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
-#  -DHAVE_GENERIC=0 if _Generic does not work
-#  -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
-#  -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
-#      ctime_r and asctime_r incompatibly with the POSIX standard
-#      (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
-#  -DHAVE_INTTYPES_H if you have a non-C99 compiler with <inttypes.h>
-#  -DHAVE_LINK=0 if your system lacks a link function
-#  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
-#  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
-#      localtime_rz can make zdump significantly faster, but is nonstandard.
-#  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
-#      functions like 'link' or variables like 'tzname' required by POSIX
-#  -DHAVE_SNPRINTF=0 if your system lacks the snprintf function
-#  -DHAVE_STDBOOL_H if you have a non-C99 compiler with <stdbool.h>
-#  -DHAVE_STDINT_H if you have a non-C99 compiler with <stdint.h>
-#  -DHAVE_STRFTIME_L if <time.h> declares locale_t and strftime_l
-#  -DHAVE_STRDUP=0 if your system lacks the strdup function
-#  -DHAVE_STRTOLL=0 if your system lacks the strtoll function
-#  -DHAVE_SYMLINK=0 if your system lacks the symlink function
-#  -DHAVE_SYS_STAT_H=0 if your compiler lacks a <sys/stat.h>
-#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a <sys/wait.h>
-#  -DHAVE_TZSET=0 if your system lacks a tzset function
-#  -DHAVE_UNISTD_H=0 if your compiler lacks a <unistd.h>
-#  -Dlocale_t=XXX if your system uses XXX instead of locale_t
-#  -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
-#      with external linkage, e.g., applications cannot define 'localtime'.
-#  -Dssize_t=long on hosts like MS-Windows that lack ssize_t
-#  -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has
-#      security implications and is not recommended for general use
-#  -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires;
-#      not needed by the main-program tz code, which is single-threaded.
-#      Append other compiler flags as needed, e.g., -pthread on GNU/Linux.
-#  -Dtime_tz=\"T\" to use T as the time_t type, rather than the system time_t
-#      This is intended for internal use only; it mangles external names.
-#  -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz"
-#  -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory;
-#      the default is system-supplied, typically "/usr/lib/locale"
-#  -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified
-#      DST transitions if the time zone files cannot be accessed
-#  -DUNINIT_TRAP if reading uninitialized storage can cause problems
-#      other than simply getting garbage data
-#  -DUSE_LTZ=0 to build zdump with the system time zone library
-#      Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
-#  -DZIC_MAX_ABBR_LEN_WO_WARN=3
-#      (or some other number) to set the maximum time zone abbreviation length
-#      that zic will accept without a warning (the default is 6)
-#  $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
-# Select instrumentation via "make GCC_INSTRUMENT='whatever'".
-GCC_INSTRUMENT = \
-  -fsanitize=undefined -fsanitize-address-use-after-scope \
-  -fsanitize-undefined-trap-on-error -fstack-protector
-GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
-  $(GCC_INSTRUMENT) \
-  -Wall -Wextra \
-  -Walloc-size-larger-than=100000 -Warray-bounds=2 \
-  -Wbad-function-cast -Wcast-align -Wdate-time \
-  -Wdeclaration-after-statement -Wdouble-promotion \
-  -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
-  -Winit-self -Wjump-misses-init -Wlogical-op \
-  -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-  -Wold-style-definition -Woverlength-strings -Wpointer-arith \
-  -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \
-  -Wsuggest-attribute=const -Wsuggest-attribute=format \
-  -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
-  -Wtrampolines -Wundef -Wuninitialized -Wunused \
-  -Wvariadic-macros -Wvla -Wwrite-strings \
-  -Wno-address -Wno-format-nonliteral -Wno-sign-compare \
-  -Wno-type-limits -Wno-unused-parameter
-#
-# If your system has a "GMT offset" field in its "struct tm"s
-# (or if you decide to add such a field in your system's "time.h" file),
-# add the name to a define such as
-#      -DTM_GMTOFF=tm_gmtoff
-# to the end of the "CFLAGS=" line.  If not defined, the code attempts to
-# guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
-# Similarly, if your system has a "zone abbreviation" field, define
-#      -DTM_ZONE=tm_zone
-# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
-# required by POSIX, but are widely available on GNU/Linux and BSD systems.
-#
-# The next batch of options control support for external variables
-# exported by tzcode.  In practice these variables are less useful
-# than TM_GMTOFF and TM_ZONE.  However, most of them are standardized.
-# #
-# # To omit or support the external variable "tzname", add one of:
-# #    -DHAVE_TZNAME=0
-# #    -DHAVE_TZNAME=1
-# # to the "CFLAGS=" line.  "tzname" is required by POSIX 1988 and later.
-# # If not defined, the code attempts to guess HAVE_TZNAME from other macros.
-# # Warning: unless time_tz is also defined, HAVE_TZNAME=1 can cause
-# # crashes when combined with some platforms' standard libraries,
-# # presumably due to memory allocation issues.
-# #
-# # To omit or support the external variables "timezone" and "daylight", add
-# #    -DUSG_COMPAT=0
-# #    -DUSG_COMPAT=1
-# # to the "CFLAGS=" line; "timezone" and "daylight" are inspired by
-# # Unix Systems Group code and are required by POSIX 2008 (with XSI) and later.
-# # If not defined, the code attempts to guess USG_COMPAT from other macros.
-# #