git: 82f96b2bc983 - main - share/man/man5: Use MANGROUPS.yes

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=82f96b2bc983163a890f1782d3091701498b78a2

commit 82f96b2bc983163a890f1782d3091701498b78a2
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-10-25 17:27:23 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-10-26 02:25:58 +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
---
 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