From 809504f331fd3588e36b54255196379bdb59890a Mon Sep 17 00:00:00 2001
From: Alexander Ziaee <ziaee@FreeBSD.org>
Date: Sun, 3 May 2026 13:53:25 -0400
Subject: [PATCH] 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.

MFC after: 3 days
---
 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 e290992077d..524ebcd8c61 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: Provide stdint.h macros unconditionally
 OLD_FILES+=usr/include/c++/v1/stdint.h
 
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index f9b3e11d22f..81f47b8ff7b 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 bfe59cc7cd7..9e693c63030 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 7d27790ed13..4988763c73b 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>