From owner-svn-src-all@freebsd.org Fri Mar 11 23:45:22 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29BE6ACD18B; Fri, 11 Mar 2016 23:45:22 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AD838E67; Fri, 11 Mar 2016 23:45:21 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BNjKUe010747; Fri, 11 Mar 2016 23:45:20 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BNjK3V010745; Fri, 11 Mar 2016 23:45:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603112345.u2BNjK3V010745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Fri, 11 Mar 2016 23:45:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296698 - head/share/zoneinfo X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2016 23:45:22 -0000 Author: bdrewery Date: Fri Mar 11 23:45:20 2016 New Revision: 296698 URL: https://svnweb.freebsd.org/changeset/base/296698 Log: DIRDEPS_BUILD: Reduce restaging here. This also fixes meta tracking for the beforeinstall since it had been marked .PHONY before (in bsd.sys.mk). Sponsored by: EMC / Isilon Storage Division Modified: head/share/zoneinfo/Makefile head/share/zoneinfo/Makefile.depend Modified: head/share/zoneinfo/Makefile ============================================================================== --- head/share/zoneinfo/Makefile Fri Mar 11 23:45:17 2016 (r296697) +++ head/share/zoneinfo/Makefile Fri Mar 11 23:45:20 2016 (r296698) @@ -70,22 +70,27 @@ TZBUILDSUBDIRS= \ .if !defined(_SKIP_BUILD) all: zoneinfo .endif +META_COOKIES+= zoneinfo install-zoneinfo -.PHONY: zoneinfo -zoneinfo: yearistype ${TDATA} +zoneinfo: yearistype ${TDATA} ${META_NOPHONY} + ${META_COOKIE_RM} 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} + ${META_COOKIE_TOUCH} -beforeinstall: +beforeinstall: install-zoneinfo +install-zoneinfo: ${META_NOPHONY} + ${META_COOKIE_RM} 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/ + ${META_COOKIE_TOUCH} afterinstall: # Modified: head/share/zoneinfo/Makefile.depend ============================================================================== --- head/share/zoneinfo/Makefile.depend Fri Mar 11 23:45:17 2016 (r296697) +++ head/share/zoneinfo/Makefile.depend Fri Mar 11 23:45:20 2016 (r296698) @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + usr.bin/xinstall.host \ .include