diff options
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 10 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 2 | ||||
| -rw-r--r-- | share/zoneinfo/Makefile | 13 | ||||
| -rw-r--r-- | share/zoneinfo/tests/Makefile | 2 |
4 files changed, 11 insertions, 16 deletions
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index b4eeb936c2ae..7dde14410be6 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -1253,16 +1253,26 @@ .. Australia .. + Brazil + .. + Canada + .. + Chile + .. Etc .. Europe .. Indian .. + Mexico + .. Pacific .. SystemV .. + US + .. .. .. src nochange diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 0e569287547c..6726ea702fec 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -218,7 +218,6 @@ __DEFAULT_NO_OPTIONS = \ SORT_THREADS \ SVN \ ZONEINFO_LEAPSECONDS_SUPPORT \ - ZONEINFO_OLD_TIMEZONES_SUPPORT \ # LEFT/RIGHT. Left options which default to "yes" unless their corresponding # RIGHT option is disabled. @@ -466,7 +465,6 @@ MK_GOOGLETEST:= no .if ${MK_ZONEINFO} == "no" MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no -MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no .endif .if ${MK_CROSS_COMPILER} == "no" diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 1cf1b42dfcc3..08867dc673fd 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -40,11 +40,6 @@ CONTRIBDIR= ${SRCTOP}/contrib/tzdata/ MK_ZONEINFO_LEAPSECONDS_SUPPORT= yes .endif -.if defined(OLDTIMEZONES) -.warning "Using backwards compatibility variable for OLDTIMEZONES; please use WITH_ZONEINFO_OLD_TIMEZONES_SUPPORT instead" -MK_ZONEINFO_OLD_TIMEZONES_SUPPORT= yes -.endif - .if ${MK_ZONEINFO_LEAPSECONDS_SUPPORT} != "no" LEAPFILE= -L ${CONTRIBDIR}leapseconds .else @@ -53,11 +48,8 @@ LEAPFILE= TZFILES= africa antarctica asia australasia etcetera europe \ factory northamerica southamerica -POSIXRULES= America/New_York - -.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no" TZFILES+= backward systemv -.endif +POSIXRULES= America/New_York TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/} @@ -78,10 +70,7 @@ TZBUILDSUBDIRS= \ Indian \ Pacific \ SystemV - -.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no" TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil -.endif .if !defined(_SKIP_BUILD) all: zoneinfo diff --git a/share/zoneinfo/tests/Makefile b/share/zoneinfo/tests/Makefile index b8515df02291..924da5c3a44e 100644 --- a/share/zoneinfo/tests/Makefile +++ b/share/zoneinfo/tests/Makefile @@ -8,10 +8,8 @@ PACKAGE= tests FILESGROUPS+= TESTFILES -.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no" ATF_TESTS_SH+= backward_test TESTFILES+= backward -.endif TESTFILES+= zoneinfo_common.sh TESTFILESPACKAGE= ${PACKAGE} |