- Removed the .CURDIR/.OBJDIR magic, it is not necessary here.

- Let the built-in sys.mk rule produce the "yearistype" script.
- Install zone files with mode 444 (now that the -m option of
  zic(8) has been fixed).

share/zoneinfo/Makefile

@@ -16,23 +16,13 @@ POSIXRULES=	America/New_York
 TZFILES+=	backward
 .endif
 
-.if exists(${.OBJDIR}/yearistype)
-YEARISTYPE=	${.OBJDIR}/yearistype
-.else
-YEARISTYPE=	${.CURDIR}/yearistype
-.endif
-
 all: yearistype
 
-yearistype: yearistype.sh
-	cp ${.ALLSRC} ${.TARGET}
-	chmod +x ${.TARGET}
-
 beforeinstall:
 	umask 022; cd ${.CURDIR}; \
 	zic -D -d ${DESTDIR}/usr/share/zoneinfo -p ${POSIXRULES} \
-	    -u ${BINOWN} -g ${BINGRP} \
-	    ${LEAPFILE} -y ${YEARISTYPE} ${TZFILES}
+	    -u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+	    ${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/