svn commit: r290772 - in head/etc: . mtree

[Brad Davis]

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