git: a9b681e4a5c7 - releng/15.1 - man: Kill off MANSUBDIRs

The branch releng/15.1 has been updated by cperciva:

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

commit a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17
Author:     Alexander Ziaee <ziaee@FreeBSD.org>
AuthorDate: 2026-05-03 17:53:25 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2026-05-07 22:16:16 +0000

    man: Kill off MANSUBDIRs
    
    Three architecture dependent manuals are installed to MANSUBDIRs,
    creating at least two empty manual page directories on everyone's
    boxxen. Move those manuals to their canonical area, enhancing clarity,
    grepability, removing useless inodes, and increasing consistency with
    the rest of the architecture dependent manuals which are unconditionally
    installed, and noted at the top of the rendered manual.
    
    Approved by:    re (cperciva)
    MFC after: 3 days
    
    (cherry picked from commit 809504f331fd3588e36b54255196379bdb59890a)
    (cherry picked from commit 55709c8a46a470af78c0c818b36ac90615728c44)
---
 ObsoleteFiles.inc       | 9 +++++++++
 usr.sbin/apm/Makefile   | 1 -
 usr.sbin/apmd/Makefile  | 1 -
 usr.sbin/nvram/Makefile | 1 -
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index d8090aa28cc7..ebf2f4e6ceba 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,15 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20260503: Kill off MANSUBDIRs
+OLD_FILES+=usr/share/man/man8/amd64/apm.8.gz
+OLD_FILES+=usr/share/man/man8/amd64/apmconf.8.gz
+OLD_FILES+=usr/share/man/man8/i386/apmd.8.gz
+OLD_FILES+=usr/share/man/man8/powerpc/nvram.8.gz
+OLD_DIRS+=usr/share/man/man8/amd64
+OLD_DIRS+=usr/share/man/man8/i386
+OLD_DIRS+=usr/share/man/man8/powerpc
+
 # 20260430: Regenerate trust store
 OLD_FILES+=usr/share/certs/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
 OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Premium.pem
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index f9b3e11d22fa..81f47b8ff7b6 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,6 +1,5 @@
 PROG=	apm
 MAN=	apm.8
-MANSUBDIR= /${MACHINE_CPUARCH}
 
 PACKAGE=apm
 
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index bfe59cc7cd7d..9e693c630308 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,7 +1,6 @@
 CONFS=	apmd.conf
 PROG=	apmd
 MAN=	apmd.8
-MANSUBDIR= /i386
 SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 
 PACKAGE=apm
diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile
index 7d27790ed132..4988763c73b4 100644
--- a/usr.sbin/nvram/Makefile
+++ b/usr.sbin/nvram/Makefile
@@ -1,5 +1,4 @@
 PROG=	nvram
 MAN=	nvram.8
-MANSUBDIR= /powerpc
 
 .include <bsd.prog.mk>