From nobody Mon Mar 30 14:04:15 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 4fktKK1X7Gz6WSLW for ; Mon, 30 Mar 2026 14:04:21 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fktKJ65Zmz3pmk for ; Mon, 30 Mar 2026 14:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774879460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KbLvfYA406bwTCtx8HPoMRkVEz+e0j+3XOXvUjtc9o=; b=XuvgOX1g4i71p+VUjmyUeHzpmdds1+VrfxW9CPh1juaQerz6m8CjggR1E/UPnj5aVzTdG/ MRZjTgRqesCfrJ7UWcxm1e6nWubyuCHUvx5WIwTQ6E0ekuN8DY8CpU1IViPqLUG2H6SyaM jc1EtLRXEABx8rv3AwHII4DH52nAkCm3v1SeoewxHutViKCbOvKUrhQkBNAseCKLtoVOjp zqppR3U/K6SRUZQ8UwwOYBUDzpejQbb+b1CjehaWAU00JeQFq9RkP2n1iahhsEtiqIz3/b 7D4mBuq7tK19aYqzx8UYgPr5a4amCYpVNgmPA1mVvJn2eAgzUcl07OIH2G5/WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774879460; a=rsa-sha256; cv=none; b=wRNd6NQxFe1B0fEHM3v7IEgXgKU1+eX6madlw9MWWsewBG9sCMWbhe10qW0HgfyRfrLd7j TtGppU3yv8JXOcXvALN0eIa4fdisIsEhLIwnVbrfdAWRHkkptnIm2kYspPIGKItB/Am9DI oUZBpLzDWOhB2hvrdp6eQiZiKmL7ged2DVL/2KcveJfNBUVDhiqyWp7RERgQlXgZDygMJ1 t3EcTzT7FTbiYlLgiUzT2EXoS4sdt4EIOoH+MskVD1PNGeRQoPdIbO6B3ncDPz2XxCCJrz TwTsOls0cJo2FTy680+6EDh+fU0XJjodbUYXCiHClK1AQEoMY26WcJsXMMuSXA== 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=1774879460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KbLvfYA406bwTCtx8HPoMRkVEz+e0j+3XOXvUjtc9o=; b=dEgfD+RpgGQ8yGSdi9qMZO+w4LvOGxJVLIxFr9PROF220vDH9fhKGDsQHpbXgsIvQmBBOi GSxkNHEd7H03RfuFbI9vUf19R8MW7oXHSHejg5b0OyjQJBx+HF0eheQfLGjZ0KS+Q/qaMM pwXLajZqsN0+Zqs3JGyxR4am2AgbQqacx0z8SktV4HMh1NTxFpJgiGF6fgF3J0f9OBkeiN 9bPCF18taV4Fq1kQRnVv1V6FQAC9Zj6HsR1H8wwNRZpcT0Hqbk8XuPYREXcN3OthNYvp4I L0XUIXFjHRrK0/j4IrJIm1M3sr7VvcUkR/v5vCKQFkVZAsIJZRjGFG71x4eZ6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fktKJ5dQ1zmG3 for ; Mon, 30 Mar 2026 14:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24de6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 30 Mar 2026 14:04:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 0a6dbf51d8ea - main - pkgbase: Move all of ATF into the atf package 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a6dbf51d8ea112a1d164be260004ec795b4368d Auto-Submitted: auto-generated Date: Mon, 30 Mar 2026 14:04:15 +0000 Message-Id: <69ca82df.24de6.2baba8c0@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0a6dbf51d8ea112a1d164be260004ec795b4368d commit 0a6dbf51d8ea112a1d164be260004ec795b4368d Author: Dag-Erling Smørgrav AuthorDate: 2026-03-30 14:03:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-30 14:03:29 +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 --- 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 b9ee785ab8b2..7fa3f769e53a 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 diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index c4ba33ff086b..19d6a655ced6 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 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 7612bead9580..ade0168cb0a6 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"