From 26de3a17b7069bdda137ef35ef7aefcf2332f76d Mon Sep 17 00:00:00 2001
From: Brad Davis <brd@FreeBSD.org>
Date: Fri, 13 Nov 2015 17:25:20 +0000
Subject: [PATCH] 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
---
 etc/Makefile           | 14 +++++++++++++-
 etc/mtree/BSD.usr.dist |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/etc/Makefile b/etc/Makefile
index 7340a35a5fad..de9038fce1ef 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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; \
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 0dd1ea44d1ea..e510d10db2fa 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -286,6 +286,14 @@
                 ..
                 07.mail
                 ..
+                10.exref
+                ..
+                11.edit
+                ..
+                12.vi
+                ..
+                13.viref
+                ..
                 18.msdiffs
                 ..
                 19.memacros