From nobody Thu Oct 30 12:34:54 2025 X-Original-To: dev-commits-src-branches@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 4cy3Tq0bfyz6FbpB; Thu, 30 Oct 2025 12:34:55 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cy3Tp2RQFz3Bv5; Thu, 30 Oct 2025 12:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761827694; 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=IomGtr5heehuNzaQ88Rs2W3BKupSUbdW2lwcprEbu+Q=; b=T80mFMSfYKU8kszHtZsM7/2tm9dxsbmizYeRLcro7kKNpAI2nAKuRPqmhQ7t3fEU8204F7 NOOKhC+9q9Dg0/+zNGNsoyzJohzv1Qi9qet1b9Lu36NXAMNk8dPyJnmfq5fQ5EwfhFDe9z ZZPQr6pFr/7wHbjjooKnk+bvvKsOQWxISJOK7mUBRabojlK9VZZdzLJbwKnPN2dmnN8nd5 JnwVu6Nl7w34kwqll9hQgq2swIq2LIMkvTqmqoOdo6hTAdubKaaB40iKXkFAaUpUCO6XAU rothrPIWzC8dW8f0nCof6ue+v5EJ1p3TjtwmjhNOjW1+3bUXZKM88XLGMeDswQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761827694; 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=IomGtr5heehuNzaQ88Rs2W3BKupSUbdW2lwcprEbu+Q=; b=OMUUmBTLYkFLojTx3nI0t9mdAwMI+jUwqFSMnAYiJ/s8bVHhcLFtpoxIVGHcinIkSAMBNu TJOdTxHXI+1/7XJPFRj4cH4Gns2K5XqsuOZ7MwUBtYIRsdfql5PApHCngAxFeUzkWDE7A2 MbzZJBg88uGgFQ8t6z4n5nD52katq9ZFShA1OJTax8NUP1LpqQTz/HJAlCQSjr7szegTbA FRy80axHtSBEv3s4y0gFzPGejajmoCSocLtn9Vsq3H97j0c0pXFTpXqOMpTINuG1ACGlzO rtZwvtU+KnzX4C380c4PyMsS7NVEtDpYjVOQd/Ll45xC4FAfpHUp8ZOICKsTgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761827694; a=rsa-sha256; cv=none; b=tM6lRwQR7NZCvGLAKBjGqKd96DsXxSgj1tj6ukRrlPIklq/zRyx63tz3WEhdH27oLNW2B6 zvk8IbIW+rFf/EKO/rlS0EYXdFzUAm/AV76wcaQOY+fE+vngAlBN65RkRMhbcsW2ymgKiL Z3A60nB+cC8a5mrckSw71O8jlo8KlUeTQ2WSR3uZ2VC5RnUM3EsMElWiC1nmHYdUjEFX+T IzrFJdKVq/Xr+O05+s6LpDYadfpYn2pdLU/7CZHzq766haQuiIqoApDeoWFKk7pp+o0u+O a5qbMcogbGFKPxjV7dU2KaUcy5PVmYPwyj8/a9W+GclayvnBriklRAGTNXGyKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cy3Tp1hGJz70h; Thu, 30 Oct 2025 12:34:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59UCYsrv006258; Thu, 30 Oct 2025 12:34:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59UCYshH006255; Thu, 30 Oct 2025 12:34:54 GMT (envelope-from git) Date: Thu, 30 Oct 2025 12:34:54 GMT Message-Id: <202510301234.59UCYshH006255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 7a572fd52e5a - stable/15 - share/man/man5: Use MANGROUPS.yes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7a572fd52e5a35e00754add9111d247487e70f98 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=7a572fd52e5a35e00754add9111d247487e70f98 commit 7a572fd52e5a35e00754add9111d247487e70f98 Author: Lexi Winter AuthorDate: 2025-10-25 17:27:23 +0000 Commit: Lexi Winter CommitDate: 2025-10-30 12:34:28 +0000 share/man/man5: Use MANGROUPS.yes Simplify the Makefile logic by using MANGROUPS.yes for optional packages. Also, move bluetooth manpages to the correct package, add the correct conditional for OpenSSH (MK_OPENSSH), and properly alphabetise the file. MFC after: 3 days Reviewed by: emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D53127 (cherry picked from commit 82f96b2bc983163a890f1782d3091701498b78a2) --- share/man/man5/Makefile | 70 ++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index c13a8b7afde2..abf4b59d184b 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -43,20 +43,6 @@ MAN= a.out.5 \ style.mdoc.5 \ sysctl.conf.5 \ -.if ${MK_BLUETOOTH} != "no" -MAN+= bluetooth.device.conf.5 \ - bluetooth.hosts.5 \ - bluetooth.protocols.5 -.endif - -.if ${MK_FREEBSD_UPDATE} != "no" -MAN+= freebsd-update.conf.5 -.endif - -.if ${MK_HESIOD} != "no" -MAN+= hesiod.conf.5 -.endif - MLINKS= dir.5 dirent.5 MLINKS+=fs.5 inode.5 MLINKS+=hosts.equiv.5 rhosts.5 @@ -69,37 +55,46 @@ MANGROUPS+= ACCT ACCT= acct.5 ACCTPACKAGE= acct -MANGROUPS+= BOOTLOADER +MANGROUPS.${MK_BLUETOOTH}+= BLUETOOTH +BLUETOOTHPACKAGE= bluetooth +BLUETOOTH= bluetooth.device.conf.5 \ + bluetooth.hosts.5 \ + bluetooth.protocols.5 + +MANGROUPS+= BOOTLOADER +BOOTLOADERPACKAGE= bootloader BOOTLOADER= device.hints.5 -BOOTLOADERPACKAGE=bootloader -.if ${MK_TOOLCHAIN} != "no" -MANGROUPS+= TOOLCHAIN +MANGROUPS.${MK_FREEBSD_UPDATE}+= FREEBSD_UPDATE +FREEBSD_UPDATE= freebsd-update.conf.5 + +MANGROUPS.${MK_HESIOD}+= HESIOD +HESIOD= hesiod.conf.5 + +MANGROUPS.${MK_TOOLCHAIN}+= TOOLCHAIN +TOOLCHAINPACKAGE= toolchain TOOLCHAIN= ar.5 -TOOLCHAINPACKAGE=toolchain -.endif -MANGROUPS+= LP +MANGROUPS+= LP +LPPACKAGE= lp LP= hosts.lpd.5 -LPPACKAGE= lp -MANGROUPS+= PERIODIC +MANGROUPS+= PERIODIC +PERIODICPACKAGE= periodic PERIODIC= periodic.conf.5 -PERIODICPACKAGE=periodic -.if ${MK_PF} != "no" -MANGROUPS+= PF +MANGROUPS.${MK_PF}+= PF +PFPACKAGE= pf PF= pf.conf.5 \ pf.os.5 -PFPACKAGE= pf -.endif -MANGROUPS+= RC +MANGROUPS+= RC +RCPACKAGE= rc RC= rc.conf.5 RCLINKS= rc.conf.5 rc.conf.local.5 -RCPACKAGE= rc -MANGROUPS+= RUNTIME +MANGROUPS+= RUNTIME +RUNTIMEPACKAGE= runtime RUNTIME= devfs.conf.5 \ devfs.rules.5 \ fstab.5 \ @@ -107,19 +102,18 @@ RUNTIME= devfs.conf.5 \ RUNTIMELINKS= passwd.5 master.passwd.5 RUNTIMELINKS+= passwd.5 pwd.db.5 RUNTIMELINKS+= passwd.5 spwd.db.5 -RUNTIMEPACKAGE= runtime -MANGROUPS+= SMB +MANGROUPS+= SMB +SMBPACKAGE= smbutils SMB= nsmb.conf.5 -SMBPACKAGE= smbutils -MANGROUPS+= SSH +MANGROUPS.${MK_OPENSSH}+= SSH +SSHPACKAGE= ssh SSH= moduli.5 -SSHPACKAGE= ssh -MANGROUPS+= UFS +MANGROUPS+= UFS +UFSPACKAGE= ufs UFS= fs.5 -UFSPACKAGE= ufs # This makes more sense for amd64 and i386 but # we decide to install all manpages in all architectures