mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-07 18:54:21 +00:00
Code Issues Releases Activity

share/zoneinfo: don't build obsolete SystemV zones

Browse Source 
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
This commit is contained in:
Philip Paeps 2022-09-25 13:42:18 +08:00
parent 1576451a39
commit da038df8c9
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ObsoleteFiles.inc
View File

@ -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

10
share/zoneinfo/Makefile
View File

@ -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