===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/share/zoneinfo/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/share/zoneinfo/Makefile	2019/11/07 16:25:05	1.14
+++ src/share/zoneinfo/Makefile	2020/10/07 22:33:31	1.15
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.14 2019/11/07 16:25:05 sthen Exp $
+#	$OpenBSD: Makefile,v 1.15 2020/10/07 22:33:31 millert Exp $
 #	$NetBSD: Makefile,v 1.14 1995/04/22 12:10:17 cgd Exp $
 
 # Change the line below for your time zone (after finding the zone you want in
@@ -38,48 +38,38 @@
 
 REDO=		posix_only
 
-# Since "." may not be in PATH...
-YEARISTYPE=	${.CURDIR}/datfiles/yearistype.sh
-YEARISTYPECOPY=	${.OBJDIR}/yearistypecopy
-
-YDATA=		africa antarctica asia australasia \
-		europe northamerica southamerica pacificnew etcetera factory \
+TDATA=		africa antarctica asia australasia \
+		europe northamerica southamerica etcetera factory \
 		backward
-NDATA=		systemv
-TDATA=		$(YDATA) $(NDATA)
 TABDATA=	iso3166.tab zone.tab zone1970.tab
-DATA=		$(YDATA) $(NDATA) $(TABDATA) leapseconds # yearistype.sh
+DATA=		$(TDATA) $(TABDATA) leapseconds
 USNO=		usno1988 usno1989 usno1989a usno1995 usno1997
 
-ZIC=zic
+ZIC=		zic
 
-all:	${YEARISTYPECOPY}
+all:
 
-${YEARISTYPECOPY}:
-	cp ${YEARISTYPE} yearistypecopy
-	chmod u+x yearistypecopy
-
-posix_only: ${TDATA} ${YEARISTYPECOPY}
+posix_only: ${TDATA}
 	(cd ${.CURDIR}/datfiles; \
-	    ${ZIC} -y ${YEARISTYPECOPY} -d ${TZDIR} -L /dev/null ${TDATA})
+	    ${ZIC} -d ${TZDIR} -L /dev/null ${TDATA})
 
-right_only: leapseconds ${TDATA} ${YEARISTYPECOPY}
+right_only: leapseconds ${TDATA}
 	(cd ${.CURDIR}/datfiles; \
-	    ${ZIC} -y ${YEARISTYPECOPY} -d ${TZDIR} -L leapseconds ${TDATA})
+	    ${ZIC} -d ${TZDIR} -L leapseconds ${TDATA})
 
-other_two: leapseconds ${TDATA} ${YEARISTYPECOPY}
+other_two: leapseconds ${TDATA}
 	(cd ${.CURDIR}/datfiles; \
-	    ${ZIC} -y ${YEARISTYPECOPY} -d ${TZDIR}/posix -L /dev/null ${TDATA})
+	    ${ZIC} -d ${TZDIR}/posix -L /dev/null ${TDATA})
 	(cd ${.CURDIR}/datfiles; \
-	    ${ZIC} -y ${YEARISTYPECOPY} -d ${TZDIR}/right -L leapseconds ${TDATA})
+	    ${ZIC} -d ${TZDIR}/right -L leapseconds ${TDATA})
 
 posix_right: posix_only other_two
 
 right_posix: right_only other_two
 
-realinstall: ${DATA} ${REDO} ${YEARISTYPECOPY}
+realinstall: ${DATA} ${REDO}
 	(cd ${.CURDIR}/datfiles; \
-	    ${ZIC} -y ${YEARISTYPECOPY} -d ${TZDIR} -p ${POSIXRULES})
+	    ${ZIC} -d ${TZDIR} -p ${POSIXRULES})
 	chown -R ${BINOWN}:${BINGRP} ${TZDIR}
 	find ${TZDIR} \
 		-type f -exec chmod a=r {} + -o \
@@ -91,8 +81,6 @@
 	${INSTALL} -c -o root -g bin -m 644 ${.CURDIR}/datfiles/zone1970.tab \
 	    ${DESTDIR}/usr/share/zoneinfo
 
-
-CLEANFILES+= yearistypecopy
 
 .PATH:	${.CURDIR}/datfiles
 .include <bsd.prog.mk>