http://www.freebsd.org/cgi/query-pr.cgi?pr=138150

I thought this patch got commited after 7.2-RELEASE, before 6.4-RELEASE,
However Wed Apr 21 15:21:51 CEST 2010, checking in all of
6.4, 7.3, 8.0, I see 
	mtree -eU
so the patch would still apply,
but I now dont want it to, else make world aborts on
	mtree -eu
as my /usr/local is a symbolic link, not a directory

From jhs@@@berklix.com Mon Aug 24 23:09:29 2009
Date: Mon, 24 Aug 2009 23:08:39 +0200 (CEST)
Message-Id: <200908242108.n7OL8d8Z063802@@@fire.js.berklix.net>
To: FreeBSD-gnats-submit@@@freebsd.org
Subject: fix for src/etc/Makefile mtree 
From: "Julian H. Stacey" <jhs@@@berklix.com>
Reply-To: "Julian H. Stacey" <jhs@@@berklix.com>
Cc: Doug Barton <dougb@@@freebsd.org>, "Julian H. Stacey" <jhs@@@berklix.com>
X-send-pr-version: 3.113
X-GNATS-Notify: 


>Submitter-Id:	current-users
>Originator:	Julian H. Stacey
>Organization:	http://berklix.com BSD Linux Unix Consultancy, Munich/Muenchen.
>Confidential:	no 
>Synopsis:	fix for src/etc/Makefile mtree 
>Severity:	serious 
>Priority:	medium 
>Category:	bin
>Class:		change-request 
>Release:	FreeBSD 7.2-RELEASE i386
>Environment:
System: FreeBSD wind.js.berklix.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Sun Aug 23 19:02:54 CEST 2009 jhs@@@laps.js.berklix.net:/usr/src/sys/i386/compile/WIND.small i386

	
>Description:
	
If one has an old file named
	/etc/security
instead of a directory of same name, then
	cd /usr/src/etc ; make distrib-dirs
fails to detect & fix it. (Well, it bleats an error, but make rolls on.)


>How-To-Repeat:
	
	mv /etc/security /etc/security.MOVED
	cp /etc/motd /etc/security
	cd /usr/src/etc ; make distrib-dirs
	ls -l /etc/security
	rm /etc/security
	mv /etc/security.MOVED /etc/security

>Fix:

	
Apply this unified diff

--- 7.2-RELEASE/src/etc/Makefile.orig	2009-08-24 22:11:05.000000000 +0200
+++ new/src/etc/Makefile	2009-08-24 22:16:39.000000000 +0200
@@ -243,21 +243,21 @@
 .endif
 
 distrib-dirs:
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
-	mtree -eU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
+	mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
+	mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
+	mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
+	mtree -eu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 .if ${MK_BIND_LIBS} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
+	mtree -deu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
 	    -p ${DESTDIR}/usr/include
 .endif
 .if ${MK_BIND_MTREE} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
+	mtree -deu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
 	    -p ${DESTDIR}/var/named
 .endif
 .if ${MK_SENDMAIL} != "no"
-	mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
+	mtree -deu ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .