From nobody Wed Oct 1 13:24:51 2025 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 4ccFyq4hX3z69cW9; Wed, 01 Oct 2025 13:24:51 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccFyq3xfDz40PZ; Wed, 01 Oct 2025 13:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759325091; 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=y7BW0byLrAIHpPmznWyALrgpvAF2NLonn92WZNnCJ2s=; b=VPMqVWdx3t44EZntM4xOp6a+mXkUxRYXt3G0k2iUoKd5XqxnFM+57Puo8m/XLNKqjhLw+D MXnyq5GrQEbgGJXoQnSH9tuPAFpe+jPOQ1ELrlw95Ojy2dWZTH2oUMJiQxJmo4R3SxRKhk mkPmj+O/xYnRSpRhxaAcLp2oTDcGrRzoyjttBvYAG0Ckb2ip8m8tJyrymS171O41Dxi3YG 4j5SkzMvJI9HOIze9pv11ckgGMxFBKKm4yrrOAbxegwW4taeL33XQxlgYrL4kLyE7t9lIl 9FOujSmQ83SqMK1LPC0yBKCxHQhDl7GXlKDh/yWOWS5ySfzOnVDgkyOo0auQCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759325091; 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=y7BW0byLrAIHpPmznWyALrgpvAF2NLonn92WZNnCJ2s=; b=s9cDvtjN48ZajYlKP3tMKR6AXVSEQCP1doAAK0DQvVmjTsZIxEmFnAV3i4RgyNKkVpASeJ 9fX2jWOFjIWKHlPRe156qQ1J/T+u6T87H+wtizFe/qT1MvZbp6BwsAkNwWshitdIzt4Ky8 p7qzv/EI4Y8GE9YX/91upB6vJf9y0wWkQateARlRUo+qjvRM9azH483C2sHaw3ci55GsFr tegsfh/+7yQ4GZeOFymQfxIEbE2BAaZDq0t1cMuZ873cxuxCABUEm0PNNq0o/+UQ01mXtz XzdcE3gKqV5bo9DJMc9M7Y6mwW4g0hyWYaiJXVncPkj3pGPbsQ4fCHX1Q04Gqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759325091; a=rsa-sha256; cv=none; b=YasjIBB7MhoAyZiPDnx3N1ZcPCK3B0Py1ezqWn3ud8uOiHZi/e5iEx2DUNuMiRxEbrTVh3 sVhAzXmEobPB46HYXzxEWZx/7LxS/1uNFOxBftPE7w23KD3KVz38Yqu/jq2l/Xl/nXPO0V SUuI8r9ywmcy8MIBysWS3pbT9ISaoDB+No8WUlVhVYLEJnaL0KsNt/ZK3A6Z8HhhW3WJPO 7ZJuW6v/EL+8TvQujHLgGl8oalR94LSKfrXnp/b7r4i2Sv/Vj7yu+5O+9hb/gL4mCzDaBz sLg7wepFgNGIdKW65HuURoecY1XSvXswBO/m5IhEfpK+4eeR3rkJZAS5r9RQAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ccFyq3G6Zz7b1; Wed, 01 Oct 2025 13:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 591DOppL053259; Wed, 1 Oct 2025 13:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591DOpWT053256; Wed, 1 Oct 2025 13:24:51 GMT (envelope-from git) Date: Wed, 1 Oct 2025 13:24:51 GMT Message-Id: <202510011324.591DOpWT053256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e7258c42520c - main - diff3: Move to own 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7258c42520c18c034f644b97377d8d2a0ad8b7c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e7258c42520c18c034f644b97377d8d2a0ad8b7c commit e7258c42520c18c034f644b97377d8d2a0ad8b7c Author: Ed Maste AuthorDate: 2025-10-01 09:28:56 +0000 Commit: Ed Maste CommitDate: 2025-10-01 13:23:40 +0000 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(-) diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 4d7bb8a82e1c..568733801a6b 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 000000000000..b4e53e63c67f --- /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 = <