git: 24e4dcf4ba5e - main - packages: Move ctf-tools to ctf

The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=24e4dcf4ba5e9dedcf89efd358ea3e1fe5867020

commit 24e4dcf4ba5e9dedcf89efd358ea3e1fe5867020
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-09-30 08:29:37 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-09-30 09:56:09 +0000

    packages: Move ctf-tools to ctf
    
    Remove the ctf-tools package.  Add a new package which contains the
    previous contents of ctf-tools along with libctf.  This removes
    CDDL-licensed code from the utilities package.
    
    Set LIB_PACKAGE for libctf so that DTrace runtime doesn't need to
    install the tools.
    
    MFC after:      1 day
    Reviewed by:    bapt
    Sponsored by:   https://www.patreon.com/bsdivy
    Differential Revision:  https://reviews.freebsd.org/D52776
---
 cddl/lib/libctf/Makefile                                | 2 ++
 cddl/usr.bin/ctfconvert/Makefile                        | 2 +-
 cddl/usr.bin/ctfdump/Makefile                           | 2 +-
 cddl/usr.bin/ctfmerge/Makefile                          | 2 +-
 release/packages/ucl/{ctf-tools-all.ucl => ctf-all.ucl} | 5 +++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 10854482cd21..1c605182bc1d 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -2,6 +2,8 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
 
+PACKAGE=	ctf
+LIB_PACKAGE=
 LIB=		ctf
 SRCS=		ctf_create.c \
 		ctf_decl.c \
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index cd9f850f480c..df53c46b7246 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
 
-PACKAGE=	ctf-tools
+PACKAGE=	ctf
 PROG=		ctfconvert
 SRCS=		alist.c \
 		ctf.c \
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index 23ded7458bed..357598583ae7 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -1,7 +1,7 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
 
-PACKAGE=	ctf-tools
+PACKAGE=	ctf
 PROG=		ctfdump
 SRCS=		dump.c \
 		symbol.c \
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index 4cd9511f911c..81bccc047a25 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -1,7 +1,7 @@
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
 
-PACKAGE=	ctf-tools
+PACKAGE=	ctf
 PROG=		ctfmerge
 SRCS=		alist.c \
 		barrier.c \
diff --git a/release/packages/ucl/ctf-tools-all.ucl b/release/packages/ucl/ctf-all.ucl
similarity index 88%
rename from release/packages/ucl/ctf-tools-all.ucl
rename to release/packages/ucl/ctf-all.ucl
index df2955dafab5..941990908373 100644
--- a/release/packages/ucl/ctf-tools-all.ucl
+++ b/release/packages/ucl/ctf-all.ucl
@@ -21,7 +21,7 @@
  * text is licensed under the CDDL.
  */
 
-comment = "Compact C Type Format (CTF) utilities"
+comment = "Compact C Type Format (CTF)"
 
 desc = <<EOD
 The Compact C Type Format (CTF) is a method of encoding type information for C
@@ -29,7 +29,8 @@ programs inside ELF objects.  Compared to the common DWARF debug symbol format,
 CTF is intended specifically for runtime program analyzers such as DTrace.
 
 This package provides the ctfconvert(1), ctfdump(1) and ctfmerge(1) utilities
-which are used to work with CTF data.
+which are used to work with CTF data, and the libctf library which allows
+application to access CTF debugging information programatically.
 EOD
 
 licenses = [ "CDDL-1.0" ]