From owner-svn-src-head@freebsd.org Fri Mar 11 23:45:12 2016 Return-Path: Delivered-To: svn-src-head@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 0EFC6ACD0F9; Fri, 11 Mar 2016 23:45:12 +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 C2AFFB12; Fri, 11 Mar 2016 23:45:11 +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 u2BNjA4p010605; Fri, 11 Mar 2016 23:45:10 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BNjANT010597; Fri, 11 Mar 2016 23:45:10 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603112345.u2BNjANT010597@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:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296695 - in head: etc etc/defaults share/examples share/sendmail targets/pseudo/userland/share X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Mar 2016 23:45:12 -0000 Author: bdrewery Date: Fri Mar 11 23:45:09 2016 New Revision: 296695 URL: https://svnweb.freebsd.org/changeset/base/296695 Log: DIRDEPS_BUILD: Fix staging of share/sendmail and share/examples. Sponsored by: EMC / Isilon Storage Division Added: head/etc/defaults/Makefile.depend - copied, changed from r296694, head/share/sendmail/Makefile.depend head/share/examples/Makefile.depend - copied, changed from r296694, head/share/sendmail/Makefile.depend Modified: head/etc/Makefile head/etc/defaults/Makefile head/share/examples/Makefile head/share/sendmail/Makefile head/share/sendmail/Makefile.depend head/targets/pseudo/userland/share/Makefile.depend Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Fri Mar 11 23:45:05 2016 (r296694) +++ head/etc/Makefile Fri Mar 11 23:45:09 2016 (r296695) @@ -3,6 +3,9 @@ .include +# No need as it is empty and just causes rebuilds since this file does so much. +UPDATE_DEPENDFILE= no + SUBDIR= \ newsyslog.conf.d @@ -450,11 +453,16 @@ distrib-dirs: ${MTREES:N/*} distrib-clea done .endif -etc-examples: +etc-examples-install: + ${META_COOKIE_RM} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}${SHAREDIR}/examples/etc - ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ + ${META_COOKIE_TOUCH} + +etc-examples: etc-examples-install + ${_+_}cd ${.CURDIR}/defaults; \ + ${MAKE} ${${MK_STAGING} == "yes":?all:install} \ DESTDIR=${DESTDIR}${SHAREDIR}/examples .include Modified: head/etc/defaults/Makefile ============================================================================== --- head/etc/defaults/Makefile Fri Mar 11 23:45:05 2016 (r296694) +++ head/etc/defaults/Makefile Fri Mar 11 23:45:09 2016 (r296695) @@ -3,7 +3,6 @@ .include FILES= devfs.rules periodic.conf rc.conf -NO_OBJ= FILESDIR= /etc/defaults .if ${MK_BLUETOOTH} != "no" Copied and modified: head/etc/defaults/Makefile.depend (from r296694, head/share/sendmail/Makefile.depend) ============================================================================== Modified: head/share/examples/Makefile ============================================================================== --- head/share/examples/Makefile Fri Mar 11 23:45:05 2016 (r296694) +++ head/share/examples/Makefile Fri Mar 11 23:45:09 2016 (r296695) @@ -219,9 +219,11 @@ XFILES+= bhyve/vmrun.sh SHARED?= copies beforeinstall: ${SHARED} etc-examples +META_COOKIES+= copies symlinks .ORDER: ${SHARED} etc-examples copies: + ${META_COOKIE_RM} .for i in ${LDIRS} if [ -L ${DESTDIR}${BINDIR}/$i ]; then \ rm -f ${DESTDIR}${BINDIR}/$i; \ @@ -233,16 +235,19 @@ copies: ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ ${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file} .endfor + ${META_COOKIE_TOUCH} symlinks: + ${META_COOKIE_RM} .for i in ${LDIRS} rm -rf ${DESTDIR}${BINDIR}/$i ln -s ${.CURDIR}/$i ${DESTDIR}${BINDIR}/$i .endfor + ${META_COOKIE_TOUCH} etc-examples: .if ${SHARED} != "symlinks" - (cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) + ${_+_}(cd ${.CURDIR}/../../etc; ${MAKE} etc-examples) .endif .if ${SHARED} != "symlinks" @@ -261,4 +266,4 @@ SUBDIR+=tests SUBDIR_PARALLEL= -.include +.include Copied and modified: head/share/examples/Makefile.depend (from r296694, head/share/sendmail/Makefile.depend) ============================================================================== --- head/share/sendmail/Makefile.depend Fri Mar 11 23:45:05 2016 (r296694, copy source) +++ head/share/examples/Makefile.depend Fri Mar 11 23:45:09 2016 (r296695) @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + usr.bin/xinstall.host \ .include Modified: head/share/sendmail/Makefile ============================================================================== --- head/share/sendmail/Makefile Fri Mar 11 23:45:05 2016 (r296694) +++ head/share/sendmail/Makefile Fri Mar 11 23:45:09 2016 (r296695) @@ -16,8 +16,10 @@ SHARED?= copies all clean cleandir depend lint tags: beforeinstall: ${SHARED} +META_COOKIES+= copies symlinks -copies:: +copies: + ${META_COOKIE_RM} if [ -L ${DDIR}/${CFDIR} ]; then rm -f ${DDIR}/${CFDIR}; fi .for dir in ${CFDIRS} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir} @@ -25,8 +27,11 @@ copies:: .for file in ${CFFILES} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} .endfor + ${META_COOKIE_TOUCH} -symlinks:: +symlinks: + ${META_COOKIE_RM} rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR} + ${META_COOKIE_TOUCH} .include Modified: head/share/sendmail/Makefile.depend ============================================================================== --- head/share/sendmail/Makefile.depend Fri Mar 11 23:45:05 2016 (r296694) +++ head/share/sendmail/Makefile.depend Fri Mar 11 23:45:09 2016 (r296695) @@ -2,6 +2,7 @@ # Autogenerated - do NOT edit! DIRDEPS = \ + usr.bin/xinstall.host \ .include Modified: head/targets/pseudo/userland/share/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/share/Makefile.depend Fri Mar 11 23:45:05 2016 (r296694) +++ head/targets/pseudo/userland/share/Makefile.depend Fri Mar 11 23:45:09 2016 (r296695) @@ -85,6 +85,7 @@ DIRDEPS = \ share/doc/usd/title \ share/dtrace \ share/dtrace/toolkit \ + share/examples \ share/examples/atf \ share/examples/ipfilter \ share/examples/pf \