Index: head/share/i18n/esdb/Makefile.part
===================================================================
--- head/share/i18n/esdb/Makefile.part	(revision 296696)
+++ head/share/i18n/esdb/Makefile.part	(revision 296697)
@@ -1,82 +1,84 @@
 # $FreeBSD$
 # $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $
 
 MKESDB?= ${.OBJDIR}/../../../../usr.bin/mkesdb_static/mkesdb_static
 
 PARTFILE?= ${.CURDIR}/${CODE}.part
 ALIASFILE?= ${.CURDIR}/${CODE}.alias
 .if !defined(NO_SEP)
 SEP?=	-
 .endif
 .if exists(${PARTFILE})
 PART!=	sed '/^\#/d;/^ *$$/d' ${PARTFILE}
 .endif
 .if !defined(NO_EPREFIX)
 CODESETS?= ${PART:C/^/${CODE}${SEP}/}
 EPREFIX?= ${CODE}${SEP}
 .else
 CODESETS?= ${PART}
 EPREFIX?=	
 .endif
 ESUBDIR?= ${CODE}
 ESDB?=	${CODESETS:C/$/.esdb/:S/:/@/}
 
 FILES+=	${ESDB}
 FILESDIR= ${ESDBDIR}/${ESUBDIR}
 
 .SUFFIXES: .src .esdb
 
 .src.esdb:
 	${MKESDB} -o $@ $>
 
 CLEANFILES+= ${ESDB} esdb.dir.${ESUBDIR} esdb.alias.${ESUBDIR}
 
 # ----------------------------------------------------------------------
 # esdb.dir
 #
 esdb.dir.${ESUBDIR}: ${PARTFILE}
 	echo "# ${CODE}" >${.TARGET}
 .for i in ${PART}
 	printf "%-32s%s\n" "${EPREFIX}$i" \
 		"${ESUBDIR}/${EPREFIX}${i:S/:/@/}.esdb" >>${.TARGET}
 .endfor
 	echo >>${.TARGET}
 
 # ----------------------------------------------------------------------
 # esdb.alias
 #
 .for i in ${PART:S/:/@/}
 ${CODE}_$i_aliases!= echo \
 	`sed \
 	    '/^\#/d;/^ *$$/d;/^${i:S/@/:/}[ 	]/!d;s/^[^ 	]*[ 	]*//' \
 		${ALIASFILE}`
 .endfor
 esdb.alias.${ESUBDIR}: ${PARTFILE} ${ALIASFILE}
 	echo "# ${CODE}" >${.TARGET}
 .for i in ${PART:S/:/@/}
 .for j in ${${CODE}_$i_aliases}
 	printf "%-32s%s\n" "$j" "${EPREFIX}${i:S/@/:/}" >>${.TARGET}
 .endfor
 .endfor
 	echo >>${.TARGET}
 
+.if !defined(_SKIP_BUILD)
 all: esdb.dir.${ESUBDIR} esdb.alias.${ESUBDIR} codesets
+.endif
 codesets: ${ESDB}
 
 .if !defined(NO_PREPROC)
 .for i in ${PART}
 .if !exists(${EPREFIX}${i:S/:/@/}.src)
 ${EPREFIX}${i:S/:/@/}.src: ${CODE}.src
 	sed ${SED_EXP:S@%%PART%%@${i}@} ${.CURDIR}/${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
 	@echo ${EPREFIX}${i:S/:/@/}.src >>.tmpfiles
 .endif
 .endfor
 .endif
 
 .if exists(.tmpfiles)
 TMPFILES!= cat .tmpfiles
 CLEANFILES+= ${TMPFILES} .tmpfiles
 .endif
 
 .include "./Makefile.inc"
 .include <bsd.prog.mk>
Index: head/share/zoneinfo/Makefile
===================================================================
--- head/share/zoneinfo/Makefile	(revision 296696)
+++ head/share/zoneinfo/Makefile	(revision 296697)
@@ -1,108 +1,110 @@
 # $FreeBSD$
 
 #
 # HOW TO UPDATE THE ZONEINFO DATA
 #
 # With the use of subversion, this is a little bit simpler than the CVS method.
 #
 # Import the new sources to the vendor branch:
 #
 # $ cd ~/svn/vendor/tzdata/dist
 # $ tar zxvf /usr/ports/distfile/tzdata2008X.tar.gz
 #   (check with "svn stat" and "svn diff" if it all makes sense)
 # $ svn commit	# Commit message: "Vendor import of tzdata2008X (+details)" 
 #
 # Tag it
 #
 # $ cd ~/svn/vendor/tzdata
 # $ svn cp svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist \
 #	svn+ssh://svn.freebsd.org/base/vendor/tzdata/tzdata2008X
 # $ svn commit	# Commit message: "Tag of tzdata2008X"
 #
 # Merge-from-vendor
 #
 # $ cd ~/svn/head/contrib/tzdata
 # $ svn update
 # $ svn merge -c X --accept=postpone \
 #	svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist .
 # $ svn commit	# Commit message: "MFV of tzdata2008X"
 #
 
 CLEANFILES+=	yearistype
 CLEANDIRS+=	builddir
 CONTRIBDIR=	${.CURDIR}/../../contrib/tzdata/
 .PATH:		${CONTRIBDIR}
 
 .if defined(LEAPSECONDS)
 LEAPFILE=	-L ${CONTRIBDIR}leapseconds
 .else
 LEAPFILE=
 .endif
 
 TZFILES=	africa antarctica asia australasia etcetera europe \
 		factory northamerica southamerica
 POSIXRULES=	America/New_York
 
 .if defined(OLDTIMEZONES)
 TZFILES+=	backward systemv
 .endif
 
 TZFILES:=	${TZFILES:S/^/${CONTRIBDIR}/}
 
 TZBUILDDIR=	${.OBJDIR}/builddir
 TZBUILDSUBDIRS=	\
 		Africa \
 		America/Argentina \
 		America/Indiana \
 		America/Kentucky \
 		America/North_Dakota \
 		Antarctica \
 		Arctic \
 		Asia \
 		Atlantic \
 		Australia \
 		Etc \
 		Europe \
 		Indian \
 		Pacific \
 		SystemV
 
+.if !defined(_SKIP_BUILD)
 all: zoneinfo
+.endif
 
 .PHONY: zoneinfo
 zoneinfo: yearistype ${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}
 
 beforeinstall:
 	cd ${TZBUILDDIR} && \
 	    find -s * -type f -print -exec ${INSTALL} \
 	    -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    \{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
 
 afterinstall:
 #
 # If the file /var/db/zoneinfo exists, and it is owned by root:wheel,
 # and the contents of it exists in /usr/share/zoneinfo, then reinstall
 # it.
 #
 	@if [ -f ${DESTDIR}/var/db/zoneinfo -a -O ${DESTDIR}/var/db/zoneinfo \
 	    -a -G ${DESTDIR}/var/db/zoneinfo ]; then \
 		zf=$$(cat ${DESTDIR}/var/db/zoneinfo); \
 		if [ -f ${DESTDIR}/usr/share/zoneinfo/$${zf} ]; then \
 			if [ ! -z "${DESTDIR}" ]; then \
 				optC="-C ${DESTDIR}"; \
 			fi; \
 			echo "Updating /etc/localtime"; \
 			tzsetup $${optC} -r; \
 		fi; \
 	else \
 		echo "Run tzsetup(8) manually to update /etc/localtime."; \
 	fi
 
 .include <bsd.prog.mk>