Date: Thu, 26 Feb 2026 04:23:20 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 122de340a9bc - stable/15 - build: Move all of lp under LPR option Message-ID: <699fcab8.36315.2d3947cb@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=122de340a9bcd71eb32dfc1930b66188a1431c4e commit 122de340a9bcd71eb32dfc1930b66188a1431c4e Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2026-02-20 18:20:04 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-02-26 04:23:04 +0000 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 (cherry picked from commit d4f6cb75424950ee776833ebc6b57855c094a610) --- etc/mtree/BSD.debug.dist | 4 ++-- etc/mtree/BSD.usr.dist | 6 +++--- share/examples/Makefile | 4 +++- share/man/man5/Makefile | 2 +- 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 8959b281f578..0b4ee248702b 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -57,8 +57,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 ad2d8c5b39a4..0a7cfc1b8018 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 @@ -354,7 +354,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 3617e2d4df40..b0d80ab26211 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.gzhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?699fcab8.36315.2d3947cb>