From 0a6dbf51d8ea112a1d164be260004ec795b4368d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Mon, 30 Mar 2026 16:03:03 +0200
Subject: [PATCH] pkgbase: Move all of ATF into the atf package

Parts of ATF (including the licence and some of the documentation) were
for some reason part of the tests package instead of the atf package.
Moving them to where they logically belong poses no problem since tests
already depends on atf.

PR:		294129
MFC after:	1 week
Reviewed by:	ivy
Differential Revision:	https://reviews.freebsd.org/D56158
---
 etc/mtree/BSD.usr.dist      |  4 ++--
 libexec/atf/atf-sh/Makefile |  1 -
 share/doc/atf/Makefile      | 12 ++++++------
 share/man/man1/Makefile     | 10 +++++-----
 share/man/man4/Makefile     | 10 +++++-----
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index b9ee785ab8b..7fa3f769e53 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -199,7 +199,7 @@
     sbin
     ..
     share
-        atf             tags=package=tests
+        atf             tags=package=atf
         ..
         bhyve
             gdb
@@ -236,7 +236,7 @@
         doc
             IPv6
             ..
-            atf             tags=package=tests
+            atf             tags=package=atf
             ..
             kyua            tags=package=tests
             ..
diff --git a/libexec/atf/atf-sh/Makefile b/libexec/atf/atf-sh/Makefile
index afd848581f3..a76b59e9a1a 100644
--- a/libexec/atf/atf-sh/Makefile
+++ b/libexec/atf/atf-sh/Makefile
@@ -71,7 +71,6 @@ FILESGROUPS=	SUBR
 
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
-SUBRTAGS=	package=tests
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
diff --git a/share/doc/atf/Makefile b/share/doc/atf/Makefile
index 27f820bf86a..e4a345f9b09 100644
--- a/share/doc/atf/Makefile
+++ b/share/doc/atf/Makefile
@@ -24,13 +24,13 @@
 # SUCH DAMAGE.
 #
 
-ATF=	${SRCTOP}/contrib/atf
-.PATH: ${ATF} ${ATF}/doc
+ATFTOP=	${SRCTOP}/contrib/atf
+.PATH: ${ATFTOP} ${ATFTOP}/doc
 
-FILESGROUPS=	TOP
+FILESGROUPS=	ATF
 
-TOPDIR=		${SHAREDIR}/doc/atf
-TOP=		AUTHORS COPYING NEWS README
-TOPTAGS=	package=tests
+ATFDIR=		${SHAREDIR}/doc/atf
+ATF=		AUTHORS COPYING NEWS README
+ATFPACKAGE=	atf
 
 .include <bsd.prog.mk>
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index c4ba33ff086..19d6a655ced 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -100,11 +100,11 @@ RUNTIMELINKS=\
 	builtin.1 while.1
 
 .if ${MK_TESTS} != "no"
-MANGROUPS+=	TESTS
-ATF=		${SRCTOP}/contrib/atf
-.PATH:		${ATF}/doc
-TESTS=		atf-test-program.1
-TESTSPACKAGE=	tests
+MANGROUPS+=	ATF
+ATFTOP=		${SRCTOP}/contrib/atf
+.PATH:		${ATFTOP}/doc
+ATF=		atf-test-program.1
+ATFPACKAGE=	atf
 .endif
 
 .include <bsd.prog.mk>
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 7612bead958..ade0168cb0a 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1054,11 +1054,11 @@ MAN+=		mlx5io.4
 .endif
 
 .if ${MK_TESTS} != "no"
-MANGROUPS+=	TESTS
-ATF=            ${SRCTOP}/contrib/atf
-.PATH:          ${ATF}/doc
-TESTS=		atf-test-case.4
-TESTSPACKAGE=	tests
+MANGROUPS+=	ATF
+ATFTOP=		${SRCTOP}/contrib/atf
+.PATH:          ${ATFTOP}/doc
+ATF=		atf-test-case.4
+ATFPACKAGE=	atf
 .endif
 
 .if ${MK_PF} != "no"