git: da038df8c92b - main - share/zoneinfo: don't build obsolete SystemV zones

The branch main has been updated by philip:

URL: https://cgit.FreeBSD.org/src/commit/?id=da038df8c92b71060965bdc5dc400db54de35587

commit da038df8c92b71060965bdc5dc400db54de35587
Author:     Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2022-09-25 05:42:18 +0000
Commit:     Philip Paeps <philip@FreeBSD.org>
CommitDate: 2022-09-25 05:54:20 +0000

    share/zoneinfo: don't build obsolete SystemV zones
    
    The /usr/share/zoneinfo/SystemV directory has been empty on FreeBSD
    since 2006.  The upstream source file was removed in 2020.  Also stop
    passing yearisdate to zic(8).  This has not been necessary for years.
    The script has been removed upstream since 2020.
    
    MFC after:      3 days
---
 ObsoleteFiles.inc       |  1 +
 share/zoneinfo/Makefile | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index dc206ffafcef..2d3dcd361151 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -16424,6 +16424,7 @@ OLD_FILES+=usr/share/zoneinfo/SystemV/EST5
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT
 OLD_FILES+=usr/share/zoneinfo/SystemV/CST6
 OLD_FILES+=usr/share/zoneinfo/SystemV/AST4
+OLD_DIRS+=usr/share/zoneinfo
 OLD_FILES+=usr/share/doc/ntp/accopt.htm
 OLD_FILES+=usr/share/doc/ntp/assoc.htm
 OLD_FILES+=usr/share/doc/ntp/audio.htm
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 0360b59288ab..dfe148544bd6 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -33,7 +33,6 @@
 .include <src.opts.mk>
 
 PACKAGE=	zoneinfo
-CLEANFILES+=	yearistype
 CLEANDIRS+=	builddir
 CONTRIBDIR=	${SRCTOP}/contrib/tzdata/
 .PATH:		${CONTRIBDIR}
@@ -51,7 +50,7 @@ LEAPFILE=
 
 TZFILES=	africa antarctica asia australasia etcetera europe \
 		factory northamerica southamerica
-TZFILES+=	backward systemv
+TZFILES+=	backward
 POSIXRULES=	America/New_York
 
 TZFILES:=	${TZFILES:S/^/${CONTRIBDIR}/}
@@ -71,8 +70,7 @@ TZBUILDSUBDIRS=	\
 		Etc \
 		Europe \
 		Indian \
-		Pacific \
-		SystemV
+		Pacific
 TZBUILDSUBDIRS+= US Mexico Chile Canada Brazil
 
 .if !defined(_SKIP_BUILD)
@@ -80,12 +78,12 @@ all: zoneinfo
 .endif
 META_TARGETS+=	zoneinfo install-zoneinfo
 
-zoneinfo: yearistype ${TDATA}
+zoneinfo: ${TDATA}
 	mkdir -p ${TZBUILDDIR}
 	cd ${TZBUILDDIR}; mkdir -p ${TZBUILDSUBDIRS}
 	umask 022; cd ${.CURDIR}; \
 	zic -D -d ${TZBUILDDIR} -p ${POSIXRULES} -m ${NOBINMODE} \
-	    ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
+	    ${LEAPFILE} ${TZFILES}
 
 #
 # Sort TZS to ensure they are the same every build. find -s might