From f4fd2aa07cdeca58ff792aebeca5c572fd92dffc Mon Sep 17 00:00:00 2001
From: Lexi Winter <ivy@FreeBSD.org>
Date: Fri, 8 Aug 2025 16:14:07 +0100
Subject: [PATCH] libutil++: Move to clibs

This library only installs manual pages, so putting it in its own
package means we build a FreeBSD-libutil++-man package but not a
base FreeBSD-libutil++ package.  Without a base package, the man
package can't be installed due to the missing dependency.

We don't really need a separate package for a few manpages, so move
it to clibs.

Reviewed by:		des
Differential Revision:	https://reviews.freebsd.org/D51756
---
 lib/libutil++/Makefile                 | 2 +-
 release/packages/ucl/libutil++-all.ucl | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 release/packages/ucl/libutil++-all.ucl

diff --git a/lib/libutil++/Makefile b/lib/libutil++/Makefile
index df3074c2278..729a336ddb3 100644
--- a/lib/libutil++/Makefile
+++ b/lib/libutil++/Makefile
@@ -1,4 +1,4 @@
-PACKAGE=	lib${LIB}
+PACKAGE=	clibs
 LIB_CXX=	util++
 INTERNALLIB=	true
 SHLIB_MAJOR=	1
diff --git a/release/packages/ucl/libutil++-all.ucl b/release/packages/ucl/libutil++-all.ucl
deleted file mode 100644
index dfd77215dbc..00000000000
--- a/release/packages/ucl/libutil++-all.ucl
+++ /dev/null
@@ -1,4 +0,0 @@
-comment = "C++ utility library"
-desc = <<EOD
-libutil++ contains various C++ utility classes used by the base system.
-EOD