From nobody Mon Mar 30 14:04:15 2026 X-Original-To: dev-commits-src-main@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 4fktKC6w3Jz6WSYv for ; Mon, 30 Mar 2026 14:04:15 +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 4fktKC5PSVz3pls for ; Mon, 30 Mar 2026 14:04:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774879455; 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=Dvvd4IDXjflmsnArP+QcC68fj6Ljg0Eam7b91VxLlbyXr7xzUltw7PjQm7FhEjK+wMCPN1 zM7z1kX7GTQGtBwjDX76Dk18/1Ig1r45N6jwmWuwfgOPADXrNwtqN6KRDbnneC9fcp9bQG w7KT1hRI3+RaX2ea5WtF3jdezVMSDE9szwjke//0zW+guf28u7Pkj5JebrvhK1UpI4iC4t tZZwLapIHFDoXIighv6jWmePsFg9O3s61Xz+vVnyULaIJRigO4c8eo71ga9eaNYGrI7Iu2 DSGKHWKYfqIT3ggm8SoyA5Mn49vXRd5ob0aUsTKNg3eRTqIChs+1z3DbbOc2nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774879455; a=rsa-sha256; cv=none; b=MwxAwaFY+Lw5w4VOMe4G21KzHz7cBy1xLeuGl5QvF91rTNleXwe+ihtqyvabrNtTq6MHoS cF8wUyAv16WTJMs4zWUnJOsv4RVOfL0OoP8DM/ingUThpIFtk5OLzoLOc/42IY422Y+42s HnKncrcKCazewLLuzaP961J+J5sC2qSMibpkmzv4J4qy+65v4aT8oguBPXrWKzTtznmJrS mFRcBdj2fG91OJ1Sedif0a7LdpeHWfZawPaKGQYQu1127+DvKtDn1PvUv8l8V6bEqSNAgS Xz5/qtfa+wg+Wq6oj5hzF+wviEED5oZQVJdWoRFWJM4fTuXcwd9O8DWsBoMaMQ== 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=1774879455; 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=FHLZQtkrvUvGpouF3mLJMjWabzjtCK8a8swB7jjn79PSygiF7JSecvcd1YczSw4XqpD2lS 55JCz+HAArGBfHS44MlsPAtpGKuR+OCu2UZ+Khvitn3Z19GrzPvxae6vPHnZp9TKFoVjQ4 7Kab/6FE+t1OJ/w6us+s7YAtdX9USNfMYyPc/KrkcX8bW73Fdxo01dyUzw1tvxV4Jz7ycm w9pLKDHPbiaXggEkbE6uCtljKAPaz5D5uWU3/KLMSvUVBVkUhJZ9/JXrNNkJTYorPgp6KX OgtiXVAD0cidfU6noeSLEAARn/Ufe9p9tz4QcFDo26cBgxfTL41GC6SX3+MFng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fktKC4V5gzm23 for ; Mon, 30 Mar 2026 14:04:15 +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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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"