Thu Dec 26 20:19:17 2013 UTC ()
Change comments and variables to reduce differences with upstream.
No change in the installed files.


(apb)
diff -r1.45 -r1.46 src/share/zoneinfo/Makefile
cvs diff -r1.45 -r1.46 src/share/zoneinfo/Attic/Makefile (expand / switch to unified diff)

--- src/share/zoneinfo/Attic/Makefile 2013/12/26 17:09:39 1.45
+++ src/share/zoneinfo/Attic/Makefile 2013/12/26 20:19:17 1.46
@@ -1,63 +1,65 @@ @@ -1,63 +1,65 @@
1# $NetBSD: Makefile,v 1.45 2013/12/26 17:09:39 apb Exp $ 1# $NetBSD: Makefile,v 1.46 2013/12/26 20:19:17 apb Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# Change the line below for your time zone (after finding the zone you want in 
6# the time zone files, or adding it to a time zone file). 
7# Alternately, if you discover you've got the wrong time zone, you can just 
8# zic -l rightzone 
9 
10# If you want something other than Eastern United States time as a template 5# If you want something other than Eastern United States time as a template
11# for handling POSIX-style time zone environment variables, 6# for handling POSIX-style time zone environment variables,
12# change the line below (after finding the zone you want in the 7# change the line below (after finding the zone you want in the
13# time zone files, or adding it to a time zone file). 8# time zone files, or adding it to a time zone file).
14# (When a POSIX-style environment variable is handled, the rules in the 9# (When a POSIX-style environment variable is handled, the rules in the
15# template file are used to determine "spring forward" and "fall back" days and 10# template file are used to determine "spring forward" and "fall back" days and
16# times; the environment variable itself specifies UT offsets of standard and 11# times; the environment variable itself specifies UT offsets of standard and
17# summer time.) 12# summer time.)
18# Alternately, if you discover you've got the wrong time zone, you can just 13# Alternately, if you discover you've got the wrong time zone, you can just
19# zic -p rightzone 14# zic -p rightzone
 15# to correct things.
 16# Use the command
 17# make zonenames
 18# to get a list of the values you can use for POSIXRULES.
 19# If you want POSIX compatibility, use "America/New_York".
20 20
21POSIXRULES= US/Pacific 21POSIXRULES= America/New_York
22 22
 23# "Compiled" time zone information is placed in the "TZDIR" directory
 24# (and subdirectories).
23# Use an absolute path name for TZDIR unless you're just testing the software. 25# Use an absolute path name for TZDIR unless you're just testing the software.
24# Note: ${DESTDIR} is prepended to this for the actual copy. 26# Note: ${DESTDIR} is prepended to this for the actual copy.
25 27
26TZDIR= /usr/share/zoneinfo 28TZDIR= /usr/share/zoneinfo
27 29
28# If you always want time values interpreted as "seconds since the epoch 30# If you always want time values interpreted as "seconds since the epoch
29# (not counting leap seconds)", use 31# (not counting leap seconds)", use
30# REDO= posix_only 32# REDO= posix_only
31# below. If you always want right time values interpreted as "seconds since 33# below. If you always want right time values interpreted as "seconds since
32# the epoch" (counting leap seconds)", use 34# the epoch" (counting leap seconds)", use
33# REDO= right_only 35# REDO= right_only
34# below. If you want both sets of data available, with leap seconds not 36# below. If you want both sets of data available, with leap seconds not
35# counted normally, use 37# counted normally, use
36# REDO= posix_right 38# REDO= posix_right
37# below. If you want both sets of data available, with leap seconds counted 39# below. If you want both sets of data available, with leap seconds counted
38# normally, use 40# normally, use
39# REDO= right_posix 41# REDO= right_posix
40# below. 42# below.
41 43
42REDO= posix_only 44REDO= posix_only
43 45
44# Since "." may not be in PATH... 46# Since "." may not be in PATH...
45YEARISTYPE= "${HOST_SH} ${.CURDIR}/yearistype.sh" 47YEARISTYPE= "${HOST_SH} ${.CURDIR}/yearistype.sh"
46 48
47YDATA= africa antarctica asia australasia \ 49PRIMARY_YDATA= africa antarctica asia australasia \
48 europe northamerica southamerica pacificnew etcetera factory \ 50 europe northamerica southamerica
49 backward 51YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward
50NDATA= systemv 52NDATA= systemv factory
51TDATA= $(YDATA) $(NDATA) 53TDATA= $(YDATA) $(NDATA)
52TABDATA= iso3166.tab zone.tab 54TABDATA= iso3166.tab zone.tab
53DATA= $(YDATA) $(NDATA) leapseconds # yearistype.sh 55DATA= $(YDATA) $(NDATA) leapseconds # yearistype.sh
54 56
55TZBUILDDIR= ${.OBJDIR}/builddir 57TZBUILDDIR= ${.OBJDIR}/builddir
56 58
57.PHONY: posix_only 59.PHONY: posix_only
58posix_only: ${TDATA} 60posix_only: ${TDATA}
59 ${_MKTARGET_CREATE} 61 ${_MKTARGET_CREATE}
60 mkdir -p ${TZBUILDDIR} 62 mkdir -p ${TZBUILDDIR}
61 cd ${.CURDIR} && \ 63 cd ${.CURDIR} && \
62 ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L /dev/null ${TDATA} 64 ${TOOL_ZIC} -y ${YEARISTYPE} -d ${TZBUILDDIR} -L /dev/null ${TDATA}
63 65