From nobody Sat Feb 21 21:27:17 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fJKvV1wsTz6SHwD for ; Sat, 21 Feb 2026 21:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJKvT6zJjz3N2B for ; Sat, 21 Feb 2026 21:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m60a10MlCXYazoOhtUqpj7Q8W++sG8ousBZJV/YUIMM=; b=utkAtwZPFufPjNcKpKJWV0ZQKycHZ9/+biW0GeYPNNOokyrNqRPvj75HTozxsWBu/ZKKnw hWc0CPlSosMpxxDhrH7qrCFEo/3PDVz4Z+oAHwvF49JvD/R6Ln6yPMiWbi9c+ZgESPBJ9F Wp8SBAra3a1Dnf5I09TEcq/nZF1UBEtng/SSpSfUaP1HlBfMollPI045tjfBbqKlBVw+RF 4bvEVFn4k6bAgRCA7vnDhnhNFTjgOfkZ+jxQqlNWyR1tG13A/dBgCzLKCH5s6PDZTV8Nhs Q+K737m/ZuBynSe7WryL3UoWQYj0IxhBqi+DH/2ih9Xf5zTqrzzvf5Ur8goyxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709238; a=rsa-sha256; cv=none; b=htWhm5AiODRdmpY5965QFts6jdwevgDQ2XOKG04KRz3/3eUNcO5cKd4MXntq0klIdaGvot +STnnfBALdeJkAXmbirfrVFKFlXfJoyA0/cYR3tGgwEnH9UJhW1RXbtWLO1EXyfN1/HpWC BBEoJzn1w414XluSsjDjF3rzZXpVkr6bL4zXedwajQR9Ewwe29kgK2Gg0o0/+2FnlZHQW5 g0LIlXxa4uHEBvw31ymmK8oX1HVSYX66GuS2UkC0C0Yz60xcjz4bL9RWMnhj7gf+yrwdHL ApslYdemLXh8PYiOSBrRPcHMvUOn7FH/SnPK5n2SgJY8ifEdrwke884uw+6EOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m60a10MlCXYazoOhtUqpj7Q8W++sG8ousBZJV/YUIMM=; b=RyvxufzNPjvt47ItISaiNqq+7a9s5UTimleDkAdXacEPQoSygG7Z6F+DW8GiXDIVMx+Jg5 PzGFTvfBEvPBxJgODGzLSTq+9VqCPPMcUAgvpdxzeqqaBZvlcFScPGq/LEM7o2N94cRW10 X3cJ9U5E+D5Tdqv1r2r3j/ZjCGXZwjQMwkSmnFXG3a9jsjaNmONQBpiMZhHM1MSIBw/PZz piJafIZQZXnAH5Zz7boouoA76H2HDS5M99iHGGctmV8Fvnx57+QEXYNcr42tI8XKif4OtV I0Wt/wbFG42nkJd67CNJaQTuc3giXZWzX2phFrtUHe0g1b2A0118nMLlsHKyuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJKvT5p1sz1D6 for ; Sat, 21 Feb 2026 21:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 220a6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:27:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: d4f6cb754249 - main - build: Move all of lp under LPR option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4f6cb75424950ee776833ebc6b57855c094a610 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:27:17 +0000 Message-Id: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d4f6cb75424950ee776833ebc6b57855c094a610 commit d4f6cb75424950ee776833ebc6b57855c094a610 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-20 18:20:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 21:25:49 +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 --- 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 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