From nobody Thu May 07 22:17:29 2026 X-Original-To: dev-commits-src-all@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 4gBRSt4YZ6z6c4w1 for ; Thu, 07 May 2026 22:17:34 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gBRSt3CYXz3ctH for ; Thu, 07 May 2026 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778192254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DRCX86gmBU6nYdOpFLznFlsn2RoO2yMhDcTIdotIKeo=; b=F0ZvvfHXa+TOi81pq1+8cqnevrSQLXwNazAu3jHyqe7Mnm8s/np/N3yyuP4MkIjCPjiJfl WDw7o+3MPW5OpQX3E5eprCNiYUZlCvVzy38282ilPw2EPw+PcdhTSW/fNwR46eoCyygRNw t9vQ5P/5SBYFcvEzRakD4BwGevkKz5soYyA3y2T+GBJbMM+u6DnH+ALXd7Yw466pMeYLNN Uj/Bk1UsBX5+8naF/8nzSMIQ1ehYnSy1zUOdQZQV8odxl5mcihuxmdmNjlWEEs7zy5Zf7I /uXoIBGOSo6ZYMxrlFte9GPr0QNz+AzD46sGiV89UcBGWK7dvdqRt7FHHAKXSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778192254; a=rsa-sha256; cv=none; b=YuuO/+a/QDEshaie6LA6K0fcwxPaFIFJkuijDfbOGlkV4DnkE2Pq6mNIcIFTXzdn24pAa8 cSqsYmPAJ4FoDKTx8Zbwt4rNiQeffcEwWbU3mpQtIEK1keXf+1xieZNMSjCedHoz/pTP7J JCbhvp+VmoFa9/a4tKUAsFqknEOpKEpmuQ/gg59eNV445u2zw2sGENZAwmuPhm6HwIRSm9 AVKi63PVvdZXafgvv4hwW4y20VCLza+rCTFj4Ic/5EIK8TMLv5lukmnWJPI7T+dlreS2nP EXFQ4JuCzavBfvrkAJK8RxERR+hCd1Bcz/lBxi45/FBaXcJL3+FEJXmqBbCZBQ== 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=1778192254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DRCX86gmBU6nYdOpFLznFlsn2RoO2yMhDcTIdotIKeo=; b=hA1F8ps/Z6FVfe7bhOgQrVdVkvxDRQxGTo/GaHDHSvTvc89n8z7qMjk6iHi4ctfcJz4oFz S2JZlj2XizhISa0HRiX2QJPaMEMrUGpeNEiVCnBvYpnaxrrXkDpojWJSAcQOKAds7DD954 jqii4ArU2nI/1XVF/VJlwwlbaDn7V6FkY/EzCT2WzKPcekyx7Zyd4s/O2L+rMj0C2uhBsM FjOrCHkkSKwaHJSrK4c6ZZeoYrBRMDmTWaKqIVOrf3ykWyX42rgunfnBihOJhMF3X5xWM/ HIyT7SGJbO2cyTrp3KYC9sMxWSk1g38/YCEL4/46zyYCrWyOPrKEEDQZlCA24Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gBRSt2THwzlsN for ; Thu, 07 May 2026 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32dab by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 07 May 2026 22:17:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: a9b681e4a5c7 - releng/15.1 - man: Kill off MANSUBDIRs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17 Auto-Submitted: auto-generated Date: Thu, 07 May 2026 22:17:29 +0000 Message-Id: <69fd0f79.32dab.10bbb2fb@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17 commit a9b681e4a5c7c9ff1ef7f67886b27a2dab541c17 Author: Alexander Ziaee AuthorDate: 2026-05-03 17:53:25 +0000 Commit: Colin Percival 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