From owner-svn-src-all@freebsd.org Fri Nov 13 17:25:21 2015 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 AB264A2E403; Fri, 13 Nov 2015 17:25:21 +0000 (UTC) (envelope-from brd@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 476EB107D; Fri, 13 Nov 2015 17:25:21 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tADHPKTk051556; Fri, 13 Nov 2015 17:25:20 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tADHPKip051554; Fri, 13 Nov 2015 17:25:20 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201511131725.tADHPKip051554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Fri, 13 Nov 2015 17:25:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290772 - in head/etc: . mtree 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.20 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, 13 Nov 2015 17:25:21 -0000 Author: brd (doc,ports committer) Date: Fri Nov 13 17:25:20 2015 New Revision: 290772 URL: https://svnweb.freebsd.org/changeset/base/290772 Log: Fix a few files that where being incorrectly installed as one file. This was caused by the nvi upgrade fallout in r281994. So add the missing directories back to the mtree and add distrib-cleanup target to retroactively remove the files that should have been directories. Reviewed by: bdrewery Approved by: bdrewery Modified: head/etc/Makefile head/etc/mtree/BSD.usr.dist Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Fri Nov 13 17:25:14 2015 (r290771) +++ head/etc/Makefile Fri Nov 13 17:25:20 2015 (r290772) @@ -365,7 +365,19 @@ MTREES+= mtree/BSD.sendmail.dist / MTREES+= ../${mtree} / .endfor -distrib-dirs: ${MTREES:N/*} +# Clean up some directories that where mistakenly created as files that +# should not have been as part of the nvi update in r281994. +# This should be removed after 11.0-RELEASE. +DISTRIB_CLEANUP_SHARE_FILES= ${SHAREDIR}/doc/usd/10.exref ${SHAREDIR}/doc/usd/11.edit +DISTRIB_CLEANUP_SHARE_FILES+= ${SHAREDIR}/doc/usd/12.vi ${SHAREDIR}/doc/usd/13.viref +distrib-cleanup: .PHONY + for file in ${DISTRIB_CLEANUP_SHARE_FILES}; do \ + if [ -f ${DESTDIR}/$${file} ]; then \ + rm -f ${DESTDIR}/$${file}; \ + fi; \ + done + +distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY @set ${MTREES}; \ while test $$# -ge 2; do \ m=${.CURDIR}/$$1; \ Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Fri Nov 13 17:25:14 2015 (r290771) +++ head/etc/mtree/BSD.usr.dist Fri Nov 13 17:25:20 2015 (r290772) @@ -286,6 +286,14 @@ .. 07.mail .. + 10.exref + .. + 11.edit + .. + 12.vi + .. + 13.viref + .. 18.msdiffs .. 19.memacros