From nobody Tue Apr 07 15:52:42 2026 X-Original-To: dev-commits-src-branches@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 4fqrLf4YR6z6YTC4 for ; Tue, 07 Apr 2026 15:52:42 +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 4fqrLf2j6cz3sxt for ; Tue, 07 Apr 2026 15:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775577162; 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=aedAT5T+tZNeSMxIWC5Vemog/WqksFoKw8eUUWoHeOI=; b=xdLenTDJaqjQj0LcEHGQaqYYttJ7CajZG6YLgQcqFz0ctyWmzeR0lz5qnflnM5mEQm3He5 L2JNAJfCVXnYd0KoSBdBFuVicNcYdIjyliLHth0wnHRAJ51CYrf64goAFhMrOdmctr39py rzB14Mj3H/FgmQuliN+xQmUL/OZUWAiNfYWpXefvR4vdSfQxkIWNTeoksBD6wgp8jJsQmI 4ieZBHxswMMqDMEpolVdAYr1d4WWQdFbXj7akUH75Cm2nlcwoENMlTsthqQ0OOIEeVG2Uw ZhebD+Ts8GNXGVZT7yP3bJt/crH3EIMF2FBiF7CWGd/JM9GyXsQyjJq9/tP1eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775577162; a=rsa-sha256; cv=none; b=lfc3VkjiS5szaETwf3h51JKw91kkeoythro2Bin22ehMcaKHf+xXQc6bVsXpLl3JQAqlXd 6F8IINzrrgd8G9pJIZCnu2/N780OCXoOSHR9BFO5llY2t1T16w9oQW250Luad/t2BGSEjz d9oecl4SkazS2mL7CGu2GM5MSLjAILwfngF2Qj4we/xLDDJzkXUagOPsGoxcjs9A08/L2i Jk3OLfigwMbNefTHSCtz8msk8LygZ/b/Uv2iKqTgq0WL1AKpeOrVJKy9s6eRRm8RmEo2Q1 gbSQcZV7QbjZ0fgm9LNkTKQql12I+J2vwxe7nTrE69SB0FZ3mB6O0Qb2htOlNA== 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=1775577162; 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=aedAT5T+tZNeSMxIWC5Vemog/WqksFoKw8eUUWoHeOI=; b=KrUYq8MsTVWpkfjmOHWYvdfO+sYNSh5EbIbwkSXk+UiLADrCAJF8J7n9NYbdswM9HYWy1k Q/rXuNvgSv1D72xwkWlpVFgUjnyHO2uPcqWnxBpavFvzadhHAUfTrN1DtHeIUjqdZLoQkH lRjaR8b54cResf6bJFD+UjsYsB6RKaASGiy3RFvCjbqvrvutf4Ile+i7G1FbqP4kTxB9Lf xAcHQUCIbwcnAJb5AztadCuzrO4pUbXkxzXgixO+7LxMxakro9RCogpjQ+9pPhNc+RGIn7 eU0vXbgqiDpaqbf/VCzLWsix5fSEjfrWgD5BlQ33L+E9SH/i3EmW5jCNE2GU5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqrLf2DPyzmDt for ; Tue, 07 Apr 2026 15:52:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45625 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:52:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 4f13c347fb31 - stable/15 - pkgbase: Move all of ATF into the atf package List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f13c347fb31e9d463dd194d0d21115f2318a8d2 Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:52:42 +0000 Message-Id: <69d5284a.45625.45ddec44@gitrepo.freebsd.org> 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 AuthorDate: 2026-03-30 14:03:03 +0000 Commit: Dag-Erling Smørgrav 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 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 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"