From nobody Sun Feb 22 20:03:48 2026 X-Original-To: dev-commits-src-main@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 4fJw0k3V1cz6TgT9; Sun, 22 Feb 2026 20:03:50 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJw0k2s2Jz3Hyy; Sun, 22 Feb 2026 20:03:50 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771790630; 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: in-reply-to:in-reply-to:references:references; bh=g5/IZPAZfWDQypafTnGxslkjvilrTMpajAjviGo7d98=; b=aEsmEo4O4HankgPIhAwb5s4bZ4wg3G7yb2YMNoJ5li9W5S6aG905cL86cN+kIw2V0G+Z6C psWRzkLPaz4hjKn57Cb7FMZkguLqqPFUhdwwJmzzf+9bU7EsQHYqoNAytNCp8TvHc3YCi2 cM3kCf1X13HRCvagPoS3JsirTtI4aA1LZBuKVoBiBgQaQlYff3K7dVDReInWTKnOSNHcjK J+MCfvQanWIUPKq8cR/GPfCOJAXq0a0bEoEIRMiBt6hTxviXeYGMgRpX5JEZSig5MD8Cwc 3vWJA5KY+vlbNDIi9VNiZvpQjAf9dpRH8s6Ss/SfBt+CKlKJTzS3jJADfiTrmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771790630; a=rsa-sha256; cv=none; b=ObWeOZF3jPGzW0Or9CoVWV1Y9b7t0PALhkHyzy9gWMKhsiXxqYi5BTiCbpHUUqXcPhpKci JdzP0OLOatuRn1H6AZifNzLmif6QREmGSu3JItR4LnjluFmobJvwCQgG4Kd60FRuNPzCBI dhyyFIz69BC5tgMEHg6FQFAZsEzbsYsh0F0MLUEk2Yh4h4Wn09MIGvPOWvbCIDEithTeKp aoDwux+wqmkFT1giWvICZU0EQyFb8sHbqR4264nWGSOwV1moNqGb5/HDbAZMT/PEiA74Bx x8ik8W0a5vDwJ5eFCM7rNWjR1STGQx8tnkO6jtj5nQ11ExxBdVVhTNv9Wm0Kog== 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=1771790630; 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: in-reply-to:in-reply-to:references:references; bh=g5/IZPAZfWDQypafTnGxslkjvilrTMpajAjviGo7d98=; b=tH3qYun/5XznED0pTp8WCTC6jV4ghNsA5EbpsRScerVkUiJAgNG2dPhNiUifJjG15Dplnu z+xHXoWHvR0LN+KdXA/qtYmGYomeTxbBe9idn4MpXdj/HOmbg9Ftb0g6AvMvkmJZmSLCU+ hXxgzAP5v0HI0EXz0GhRb+jjvYcXK6FzDsB2wo4NzTzKJY5VXKSJREvfSYJ1PVFawDQUSL L5eH2wcfUDHsO/79SZHUiOzQ6Z01mlKpnVB6bdwgYrmbKa34wJlJNkz8FMzQ1rw1e9Yv2W HuSQidPI47FE9eedLLdHMY4mS/+ruGBgxmapLZAbDvaDVbmVbLl/2P+/Q0LUKA== Received: from [192.168.1.10] (c-73-40-187-156.hsd1.pa.comcast.net [73.40.187.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fJw0k0xdzz16gb; Sun, 22 Feb 2026 20:03:50 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.106.26021521 Date: Sun, 22 Feb 2026 15:03:48 -0500 Subject: Re: d4f6cb754249 - main - build: Move all of lp under LPR option From: Ravi Pokala To: Dag-Erling =?UTF-8?B?U23DuHJncmF2?= , , , Message-ID: Thread-Topic: d4f6cb754249 - main - build: Move all of lp under LPR option References: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> In-Reply-To: <699a2335.220a6.2c3156ae@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable Hi des, Why is the package "lp", when the conditional uses "LPR"? Shouldn't they ma= tch? Thanks, Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of Dag-Erling Sm=C3=B8rgrav > Date: Saturday, February 21, 2026 at 16:27 To: >, >, > Subject: git: d4f6cb754249 - main - build: Move all of lp under LPR option The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd4f6cb75424950ee776833ebc6b578= 55c094a610 commit d4f6cb75424950ee776833ebc6b57855c094a610 Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2026-02-20 18:20:04 +0000 Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2026-02-21 21:25:49 +0000 build: Move all of lp under LPR option * Tag related directories with package=3Dlp * 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=3Dpackage=3Dlp + ru tags=3Dpackage=3Dlp .. .. 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=3Dpackage=3Dlp + ru tags=3Dpackage=3Dlp .. .. sendmail @@ -352,7 +352,7 @@ .. ppp .. - printing + printing tags=3Dpackage=3Dlp .. 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=3D BSD_daemon \ perfmon \ ppi \ ppp \ - printing \ ses \ scsi_target \ sound \ @@ -250,6 +249,8 @@ SE_PPP=3D \ ppp.secret.span-isp \ ppp.secret.span-isp.working +.if ${MK_LPR} !=3D "no" +LDIRS+=3D printing SE_DIRS+=3D printing SE_PRINTINGPACKAGE=3Dlp SE_PRINTING=3D \ @@ -269,6 +270,7 @@ SE_PRINTING=3D \ psif \ pstf \ pstfX +.endif SE_DIRS+=3D ses SE_SES=3D \ 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}+=3D TOOLCHAIN TOOLCHAINPACKAGE=3D toolchain TOOLCHAIN=3D ar.5 -MANGROUPS+=3D LP +MANGROUPS.${MK_LPR}+=3D LP LPPACKAGE=3D lp LP=3D hosts.lpd.5 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/Opti= onalObsoleteFiles.inc index 81379ea452bb..648d0d3b297d 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5292,11 +5292,29 @@ OLD_FILES+=3Dusr/share/doc/smm/07.lpd/paper.ascii.gz OLD_DIRS+=3Dusr/share/doc/smm/07.lpd OLD_FILES+=3Dusr/share/examples/etc/hosts.lpd OLD_FILES+=3Dusr/share/examples/etc/printcap +OLD_FILES+=3Dusr/share/examples/printing/diablo-if-net +OLD_FILES+=3Dusr/share/examples/printing/hpdf +OLD_FILES+=3Dusr/share/examples/printing/hpif +OLD_FILES+=3Dusr/share/examples/printing/hpof +OLD_FILES+=3Dusr/share/examples/printing/hprf +OLD_FILES+=3Dusr/share/examples/printing/hpvf +OLD_FILES+=3Dusr/share/examples/printing/if-simple +OLD_FILES+=3Dusr/share/examples/printing/if-simpleX +OLD_FILES+=3Dusr/share/examples/printing/ifhp +OLD_FILES+=3Dusr/share/examples/printing/make-ps-header +OLD_FILES+=3Dusr/share/examples/printing/netprint +OLD_FILES+=3Dusr/share/examples/printing/psdf +OLD_FILES+=3Dusr/share/examples/printing/psdfX +OLD_FILES+=3Dusr/share/examples/printing/psif +OLD_FILES+=3Dusr/share/examples/printing/pstf +OLD_FILES+=3Dusr/share/examples/printing/pstfX +OLD_DIRS+=3Dusr/share/examples/printing OLD_FILES+=3Dusr/share/man/man1/lp.1.gz OLD_FILES+=3Dusr/share/man/man1/lpq.1.gz OLD_FILES+=3Dusr/share/man/man1/lpr.1.gz OLD_FILES+=3Dusr/share/man/man1/lprm.1.gz OLD_FILES+=3Dusr/share/man/man1/lptest.1.gz +OLD_FILES+=3Dusr/share/man/man5/hosts.lpd.5.gz OLD_FILES+=3Dusr/share/man/man5/printcap.5.gz OLD_FILES+=3Dusr/share/man/man8/chkprintcap.8.gz OLD_FILES+=3Dusr/share/man/man8/lpc.8.gz