git: 4f13c347fb31 - stable/15 - pkgbase: Move all of ATF into the atf package
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Apr 2026 15:52:42 UTC
The branch stable/15 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=4f13c347fb31e9d463dd194d0d21115f2318a8d2
commit 4f13c347fb31e9d463dd194d0d21115f2318a8d2
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-03-30 14:03:03 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-04-07 15:52:08 +0000
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
(cherry picked from commit 0a6dbf51d8ea112a1d164be260004ec795b4368d)
---
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 e43a9b341003..fcc1d5de55be 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 afd848581f36..a76b59e9a1aa 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 27f820bf86a0..e4a345f9b092 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 d3975c8e8084..c58de8345efc 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -99,11 +99,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 47e624f9c014..b23e69960f42 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1048,11 +1048,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"