svn commit: r360290 - in stable/11: etc/mtree share/mk share/zoneinfo share/zoneinfo/tests

[Xin LI]

Author: delphij
Date: Sat Apr 25 05:51:58 2020
New Revision: 360290
URL: https://svnweb.freebsd.org/changeset/base/360290

Log:
  MFC r359736: Always install backward compatibility timezones, as they
  are installed on all major Linux distributions as well as NetBSD and
  OpenBSD.

Modified:
  stable/11/etc/mtree/BSD.usr.dist
  stable/11/share/mk/src.opts.mk
  stable/11/share/zoneinfo/Makefile
  stable/11/share/zoneinfo/tests/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/mtree/BSD.usr.dist
==============================================================================
--- stable/11/etc/mtree/BSD.usr.dist	Sat Apr 25 02:18:59 2020	(r360289)
+++ stable/11/etc/mtree/BSD.usr.dist	Sat Apr 25 05:51:58 2020	(r360290)
@@ -1491,15 +1491,25 @@
             ..
             Australia
             ..
+            Brazil
+            ..
+            Canada
+            ..
+            Chile
+            ..
             Etc
             ..
             Europe
             ..
             Indian
             ..
+            Mexico
+            ..
             Pacific
             ..
             SystemV
+            ..
+            US
             ..
         ..
     ..

Modified: stable/11/share/mk/src.opts.mk
==============================================================================
--- stable/11/share/mk/src.opts.mk	Sat Apr 25 02:18:59 2020	(r360289)
+++ stable/11/share/mk/src.opts.mk	Sat Apr 25 05:51:58 2020	(r360290)
@@ -210,7 +210,6 @@ __DEFAULT_NO_OPTIONS = \
     SORT_THREADS \
     SVN \
     ZONEINFO_LEAPSECONDS_SUPPORT \
-    ZONEINFO_OLD_TIMEZONES_SUPPORT \
 
 
 #
@@ -457,7 +456,6 @@ MK_GROFF:=	no
 
 .if ${MK_ZONEINFO} == "no"
 MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
-MK_ZONEINFO_OLD_TIMEZONES_SUPPORT:= no
 .endif
 
 .if ${MK_CROSS_COMPILER} == "no"

Modified: stable/11/share/zoneinfo/Makefile
==============================================================================
--- stable/11/share/zoneinfo/Makefile	Sat Apr 25 02:18:59 2020	(r360289)
+++ stable/11/share/zoneinfo/Makefile	Sat Apr 25 05:51:58 2020	(r360290)
@@ -40,11 +40,6 @@ CONTRIBDIR=	${.CURDIR}/../../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,12 +48,9 @@ LEAPFILE=
 
 TZFILES=	africa antarctica asia australasia etcetera europe \
 		factory northamerica southamerica
+TZFILES+=	backward systemv
 POSIXRULES=	America/New_York
 
-.if ${MK_ZONEINFO_OLD_TIMEZONES_SUPPORT} != "no"
-TZFILES+=	backward systemv
-.endif
-
 TZFILES:=	${TZFILES:S/^/${CONTRIBDIR}/}
 
 TZBUILDDIR=	${.OBJDIR}/builddir
@@ -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

Modified: stable/11/share/zoneinfo/tests/Makefile
==============================================================================
--- stable/11/share/zoneinfo/tests/Makefile	Sat Apr 25 02:18:59 2020	(r360289)
+++ stable/11/share/zoneinfo/tests/Makefile	Sat Apr 25 05:51:58 2020	(r360290)
@@ -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}