Backout addition of -L switch to mtree. Using -L breaks the

build process in too many cases. Adding mtree to bootstrap-tools
to solve this breaks the upgrade path because mtree needs a
libc that has strtofflags and fflagstostr.

etc/Makefile

@@ -143,12 +143,12 @@ distribution:
 .endif
 
 distrib-dirs:
-	mtree -deLU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
-	mtree -deLU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
-	mtree -deLU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
-	mtree -deLU -f ${.CURDIR}/mtree/BSD.include.dist \
+	mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
+	mtree -deU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
+	mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
+	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
-	mtree -deLU -f ${.CURDIR}/mtree/BSD.include.dist \
+	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/libdata/perl/5.6.0/mach
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/locale; \

include/Makefile

@@ -105,7 +105,7 @@ copies:
 .for i in ${LNOHEADERDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
 .endfor
-	mtree -deLU -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
+	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
 .for i in ${LDIRS} ${LSUBDIRS}
 	cd ${.CURDIR}/../sys; \

release/Makefile

@@ -334,13 +334,13 @@ release.1:
 	for i in ${DISTRIBUTIONS} ; do \
 		mkdir ${RD}/trees/$$i && \
 		mkdir ${RD}/dists/$$i && \
-		mtree -deLU -f ${MTREEFILES}/BSD.root.dist \
+		mtree -deU -f ${MTREEFILES}/BSD.root.dist \
 		    -p ${RD}/trees/$$i > /dev/null && \
-		mtree -deLU -f ${MTREEFILES}/BSD.usr.dist \
+		mtree -deU -f ${MTREEFILES}/BSD.usr.dist \
 		    -p ${RD}/trees/$$i/usr > /dev/null && \
-		mtree -deLU -f ${MTREEFILES}/BSD.include.dist \
+		mtree -deU -f ${MTREEFILES}/BSD.include.dist \
 		    -p ${RD}/trees/$$i/usr/include > /dev/null && \
-		mtree -deLU -f ${MTREEFILES}/BSD.var.dist \
+		mtree -deU -f ${MTREEFILES}/BSD.var.dist \
 		    -p ${RD}/trees/$$i/var > /dev/null ; \
 	done
 	touch release.1
@@ -697,7 +697,7 @@ doTARBALL:
 		  cp -p ${.CURDIR}/scripts/$${TD}-install.sh ${RD}/dists/${TD}/install.sh; \
 		fi && \
 		if [ "${SD}" != "/usr/src" ]; then \
-			mtree -L -c -i -p ${SD}/${ARG} \
+			mtree -c -i -p ${SD}/${ARG} \
 			  -k gname,md5digest,mode,nlink,uname,size,link,type \
 			  > ${RD}/dists/${TD}/$$tn.mtree ; \
 		else \

release/picobsd/build/Makefile.mfs

@@ -14,9 +14,9 @@ all: tree links
 tree:
 	@echo "--- making tree"
 	@( if [ -f mfs.mtree ] ; then \
-		mtree -deLU -f mfs.mtree -p ${DESTDIR}; \
+		mtree -deU -f mfs.mtree -p ${DESTDIR}; \
 	else \
-		mtree -deLU -f ../build/mfs.mtree -p ${DESTDIR} ;  \
+		mtree -deU -f ../build/mfs.mtree -p ${DESTDIR} ;  \
 	fi )
 
 links: tree

release/picobsd/custom/Makefile.mfs

@@ -13,7 +13,7 @@ all: tree links
 
 tree:
 	@echo "--- making tree"
-	@mtree -deLU -f ${.CURDIR}/mfs.mtree -p ${DESTDIR} 2>&1 > /dev/null
+	@mtree -deU -f ${.CURDIR}/mfs.mtree -p ${DESTDIR} 2>&1 > /dev/null
 
 links: tree
 	@echo "--- making links"

release/picobsd/dial/Makefile.mfs

@@ -27,7 +27,7 @@ LOCALE_LINKS=${US_LOCALE_LINKS}
 all: tree links
 
 tree:
-	mtree -deLU -f ../build/mfs.mtree -p ${DESTDIR}
+	mtree -deU -f ../build/mfs.mtree -p ${DESTDIR}
 
 links: tree
 	(cd ${DESTDIR}; \

release/picobsd/install/Makefile.mfs

@@ -12,7 +12,7 @@ MY_DEVS= std tun2 cuaa0 cuaa1 cuaa2 vty10 fd0 wd0s1h pty0 wd0 wd1 wd2 wd3 da0 da
 all: tree links files
 
 tree:
-	mtree -deLU -f mfs.mtree -p ${DESTDIR}
+	mtree -deU -f mfs.mtree -p ${DESTDIR}
 
 links: tree
 	(cd ${DESTDIR}; \