Re: mtree patch for WITHOUT_LPR

On Sat, 7 Nov 2015, Dmitry Morozovsky wrote:

> > > +++ etc/mtree/BSD.include.dist	(working copy)
> > > _at__at_ -7,10 +7,6 _at__at_
> > >  .
> > >      arpa
> > >      ..
> > > -    atf-c
> > > -    ..
> > > -    atf-c++
> > > -    ..
> > 
> > Why?
> 
> ehhm...  Well, it seems coincidence, but my stable/10 system install these 
> two on every installworld, and complaints about them every check-old
> 
> Looking at Makefiles, yes, I do not see any connection with lpr, sorry for 
> that.

Ah I see. I incorrectly started patching stable/10 instead of current.  atf 
things seem to be non-MFCed leftoversi or some side story.

Here is (hopefully correct) simplified patch against head:

Index: etc/Makefile
===================================================================
--- etc/Makefile	(revision 290360)
+++ etc/Makefile	(working copy)
_at__at_ -351,6 +351,9 _at__at_
 MTREES+=	mtree/BSD.lib32.dist		/usr
 MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
 .endif
+.if ${MK_LPR} != "no"
+MTREES+=	mtree/BSD.lpr.dist		/usr
+.endif
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
Index: etc/mtree/BSD.lpr.dist
===================================================================
--- etc/mtree/BSD.lpr.dist	(nonexistent)
+++ etc/mtree/BSD.lpr.dist	(working copy)
_at__at_ -0,0 +1,30 _at__at_
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    include
+        atf-c
+        ..
+        atf-c++
+        ..
+    libexec
+        lpr
+            ru
+            ..
+        ..
+    share
+        atf
+        ..
+        doc
+            atf
+            ..
+            smm
+                07.lpd
+                ..
+            ..
+        ..
+    ..
+..
Index: etc/mtree/BSD.usr.dist
===================================================================
--- etc/mtree/BSD.usr.dist	(revision 290360)
+++ etc/mtree/BSD.usr.dist	(working copy)
_at__at_ -118,10 +118,6 _at__at_
         ..
         hyperv
         ..
-        lpr
-            ru
-            ..
-        ..
         sendmail
         ..
         sm.bin
_at__at_ -266,8 +262,6 _at__at_
                 ..
                 06.nfs
                 ..
-                07.lpd
-                ..
                 08.sendmailop
                 ..
                 11.timedop
Index: etc/mtree/Makefile
===================================================================
--- etc/mtree/Makefile	(revision 290360)
+++ etc/mtree/Makefile	(working copy)
_at__at_ -6,6 +6,7 _at__at_
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.lib32.dist} \
+	${_BSD.lpr.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
_at__at_ -20,6 +21,9 _at__at_
 .if ${MK_LIB32} != "no"
 _BSD.lib32.dist=	BSD.lib32.dist
 .endif
+.if ${MK_LPR} != "no"
+_BSD.lpr.dist=		BSD.lpr.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif

-- 
Sincerely,
D.Marck                                     [DM5020, MCK-RIPE, DM3-RIPN]
[ FreeBSD committer:                                 marck_at_FreeBSD.org ]
------------------------------------------------------------------------
*** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck_at_rinet.ru ***
------------------------------------------------------------------------