diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-02-20 18:20:04 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2026-02-21 21:25:49 +0000 |
| commit | d4f6cb75424950ee776833ebc6b57855c094a610 (patch) | |
| tree | 6a74e845497ae749cd6fc3c56e733ffd4d003281 | |
| parent | 7965c93e4d4103ba6ed7ac1e5f1599c93cbcdbf7 (diff) | |
build: Move all of lp under LPR option
* Tag related directories with package=lp
* Make the examples/printing directory conditional on MK_LPR
* Make the hosts.lpd(5) manual page conditional on MK_LPR
MFC after: 3 days
| -rw-r--r-- | etc/mtree/BSD.debug.dist | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 6 | ||||
| -rw-r--r-- | share/examples/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man5/Makefile | 2 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 18 |
5 files changed, 27 insertions, 7 deletions
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 62a6342c9eac..5eabea923cbd 100644 --- 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 index 3366bf939948..b9ee785ab8b2 100644 --- 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 index 09bbf820e574..0174792d2ecb 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -25,7 +25,6 @@ LDIRS= BSD_daemon \ perfmon \ ppi \ ppp \ - printing \ ses \ scsi_target \ sound \ @@ -250,6 +249,8 @@ SE_PPP= \ ppp.secret.span-isp \ ppp.secret.span-isp.working +.if ${MK_LPR} != "no" +LDIRS+= printing SE_DIRS+= printing SE_PRINTINGPACKAGE=lp SE_PRINTING= \ @@ -269,6 +270,7 @@ SE_PRINTING= \ psif \ pstf \ pstfX +.endif SE_DIRS+= ses SE_SES= \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index abf4b59d184b..f950df8fdb47 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -75,7 +75,7 @@ MANGROUPS.${MK_TOOLCHAIN}+= TOOLCHAIN 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 index 81379ea452bb..648d0d3b297d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5292,11 +5292,29 @@ OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz 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 |