Page MenuHomeFreeBSD
Files F145780605

D55408.id172348.diff
No OneTemporary
Actions

D55408.id172348.diff
View Options

diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -61,8 +61,8 @@
libexec
bsdinstall
..
- lpr
- ru
+ lpr tags=package=lp
+ ru tags=package=lp
..
..
sendmail
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -181,8 +181,8 @@
..
hyperv
..
- lpr
- ru
+ lpr tags=package=lp
+ ru tags=package=lp
..
..
sendmail
@@ -352,7 +352,7 @@
..
ppp
..
- printing
+ printing tags=package=lp
..
scsi_target
..
diff --git a/share/examples/Makefile b/share/examples/Makefile
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -25,7 +25,6 @@
perfmon \
ppi \
ppp \
- printing \
ses \
scsi_target \
sound \
@@ -42,6 +41,10 @@
eps.patch \
poster.sh
+.if ${MK_LPR} != "no"
+LDIRS+= printing
+.endif
+
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64"
.if ${MK_BHYVE} != "no"
LDIRS+= bhyve
@@ -250,6 +253,7 @@
ppp.secret.span-isp \
ppp.secret.span-isp.working
+.if ${MK_LPR} != "no"
SE_DIRS+= printing
SE_PRINTINGPACKAGE=lp
SE_PRINTING= \
@@ -269,6 +273,7 @@
psif \
pstf \
pstfX
+.endif
SE_DIRS+= ses
SE_SES= \
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -75,7 +75,7 @@
TOOLCHAINPACKAGE= toolchain
TOOLCHAIN= ar.5
-MANGROUPS+= LP
+MANGROUPS.${MK_LPR}+= LP
LPPACKAGE= lp
LP= hosts.lpd.5
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -5292,11 +5292,29 @@
OLD_DIRS+=usr/share/doc/smm/07.lpd
OLD_FILES+=usr/share/examples/etc/hosts.lpd
OLD_FILES+=usr/share/examples/etc/printcap
+OLD_FILES+=usr/share/examples/printing/diablo-if-net
+OLD_FILES+=usr/share/examples/printing/hpdf
+OLD_FILES+=usr/share/examples/printing/hpif
+OLD_FILES+=usr/share/examples/printing/hpof
+OLD_FILES+=usr/share/examples/printing/hprf
+OLD_FILES+=usr/share/examples/printing/hpvf
+OLD_FILES+=usr/share/examples/printing/if-simple
+OLD_FILES+=usr/share/examples/printing/if-simpleX
+OLD_FILES+=usr/share/examples/printing/ifhp
+OLD_FILES+=usr/share/examples/printing/make-ps-header
+OLD_FILES+=usr/share/examples/printing/netprint
+OLD_FILES+=usr/share/examples/printing/psdf
+OLD_FILES+=usr/share/examples/printing/psdfX
+OLD_FILES+=usr/share/examples/printing/psif
+OLD_FILES+=usr/share/examples/printing/pstf
+OLD_FILES+=usr/share/examples/printing/pstfX
+OLD_DIRS+=usr/share/examples/printing
OLD_FILES+=usr/share/man/man1/lp.1.gz
OLD_FILES+=usr/share/man/man1/lpq.1.gz
OLD_FILES+=usr/share/man/man1/lpr.1.gz
OLD_FILES+=usr/share/man/man1/lprm.1.gz
OLD_FILES+=usr/share/man/man1/lptest.1.gz
+OLD_FILES+=usr/share/man/man5/hosts.lpd.5.gz
OLD_FILES+=usr/share/man/man5/printcap.5.gz
OLD_FILES+=usr/share/man/man8/chkprintcap.8.gz
OLD_FILES+=usr/share/man/man8/lpc.8.gz

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 25, 10:00 AM (5 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28986069
Default Alt Text
D55408.id172348.diff (3 KB)

Event Timeline