From nobody Thu Feb 26 04:23:20 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 4fLyxj0Ymcz6TF0x for ; Thu, 26 Feb 2026 04:23:21 +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 4fLyxh5Xz0z3Kdb for ; Thu, 26 Feb 2026 04:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772079800; 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=018kJ68TmLeBanIkbx5/5kaG+5HvsuA7q5smGKKqNeA=; b=FTJJeqs/2RVj/3ikEWmjhWsLAaL64M2f9vvL3c3/IbRhOs5OMe03ZRHm+sm0GrckYOoP29 g8WuOgHgvsF4ToRu74qfxnIZMORtPuRnde0EYrPrlD/MI3qoHX8MO6zr0p1lLqDjAEO14m z66ytLhNaUAvYHW88/TLNbXwoNRRutqOrTbvHcYPBuiA79/cAlwn3WoIfrFGr+N4Bc+LU7 lbLSuc2G5FSMEEwDYc9t0Rvb+Rt473NwdVfiocl3ZJoKJlDBPIbnyJhQ38DGvo/4gAlUcq iTYG96VBryjXSfvKCq9VL/ySU4tZgMd0XqqfAZkcOnZNqKACYUsp6Eoal+hcbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772079800; a=rsa-sha256; cv=none; b=UndgPvDhMKoKhPrC1Xnhx6hFvyKVeSTNMuYCdLcal6OiWYHl5QeVWjxl9zkfFoDxkKWQnc Xk9N1MFeQcP4QW1BZAfy7EU9WdrDrtgzpCdgw7pto9ixAomFQHpAjakme4vIFAJDuxNovf Vba81SHAYP4KWeafLx9sIbZ4o24N9MVowJNcoYY6QCvAwPmI+PDe2pywySE2dmeDn5OHdK Mg121W/bCakxz5zSYPw6hb9TJrrkQX1nzFw4/1GlcVe2c/5GKvr+jY0Rv4bztuS/OMmsS5 Va07hyQU5C2HWRqyrRwazRmtn40IEkoIEG0PTVFpcQjm+0Eg5zYz2ui0pp7Xxw== 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=1772079800; 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=018kJ68TmLeBanIkbx5/5kaG+5HvsuA7q5smGKKqNeA=; b=tb5MazaLOfUO79j+c/fea4TTtflHGIrQowuKijtuL0+wgwgHS9nBdFFWeXSI/lZCSYGl6j clYWPM83O0+9/UuGjfS4UlS4k+rGXcPiTqZL+R9QCejcyWaoIgoBBuPG9OuKvowtRf5fZE vg89g8cngVlLLWn6vfBW4aT3G998hllUbarCRL3NzGJrB2krPeT3WM3AL/73iILC+gAuJg HwFaYroruqiAhlzgAclB3UWJWJQvCji1sRZp39NXG1YZ0hGZqGkdIqdAHVLvRSKyg26CV7 QNGGF1tUJNNs/yoYaZYRkAqxzYGWczNSx/iJS2s8DBFt7u30LeJGQyjcPKoFyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fLyxh57JKz1LP for ; Thu, 26 Feb 2026 04:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36315 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Feb 2026 04:23:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 122de340a9bc - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 122de340a9bcd71eb32dfc1930b66188a1431c4e Auto-Submitted: auto-generated Date: Thu, 26 Feb 2026 04:23:20 +0000 Message-Id: <699fcab8.36315.2d3947cb@gitrepo.freebsd.org> 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 AuthorDate: 2026-02-20 18:20:04 +0000 Commit: Dag-Erling Smørgrav 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.gz