From e7258c42520c18c034f644b97377d8d2a0ad8b7c Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 1 Oct 2025 05:28:56 -0400
Subject: [PATCH] diff3: Move to own package

diff3 is the last remaining GPL-licensed userland component.  Move it
to its own package, so that it may be excluded if desired.

Reviewed by:	ivy
Sponsored by:	The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52810
---
 gnu/usr.bin/diff3/Makefile         |  3 ++-
 release/packages/ucl/diff3-all.ucl | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 release/packages/ucl/diff3-all.ucl

diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 4d7bb8a82e1..568733801a6 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,8 +1,9 @@
+PACKAGE= diff3
+
 DIFFSRC=${SRCTOP}/contrib/diff/src
 .PATH:  ${DIFFSRC} \
 	${SRCTOP}/contrib/diff/lib \
 	${SRCTOP}/contrib/diff/man
-
 PROG=		diff3
 SRCS=           diff3.c version-etc.c \
 		xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c
diff --git a/release/packages/ucl/diff3-all.ucl b/release/packages/ucl/diff3-all.ucl
new file mode 100644
index 00000000000..b4e53e63c67
--- /dev/null
+++ b/release/packages/ucl/diff3-all.ucl
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: ISC
+ */
+
+comment = "GNU 3-way file comparison and merge utility"
+
+desc = <<EOD
+Compares three files line by line, optionally merging them.
+EOD
+
+licenses = [ "GPL-2.0-or-later" ]
+
+annotations {
+	set = "optional,optional-jail"
+}