From nobody Tue Mar 10 08:22:37 2026 X-Original-To: dev-commits-src-all@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 4fVRhL30tfz6V8r4 for ; Tue, 10 Mar 2026 08:22: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 4fVRhL2PD1z3hSq for ; Tue, 10 Mar 2026 08:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773130962; 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=wc2cpVpNAvZLsnxfPDECVh3w0E+vdsD3aGdaLNJ87kc=; b=Aw+QI04qgjljFIBn60wceuHnrHpXvdPWr/a2hjqASaabQTu3dLifqABoeBJaW3mGHtCmZx inqukW51YXPu8bcmO7BG2l0iUmfRWUFVcEeQkpqlLbZl7IMcYRjNt/97yCHXGXcVoAbpyv F06j4leMfG44aRRJi1Z/O7MPN7O2Ym+ZeXvAV5utD+vm0938GlHuLWBJcnnz12cGoeqlkx dzc0l+Bp4tXGOdAwalJivtxcf25QBCA6L6EAArjx/YBih19uZXX9mh4pUhDRMcggk8+MUN y6QPQxmxVljfYMajGh8sUDqkqVD4eB+J86zAcfzkt9Hyk/1vLnX09wpwmRlKWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773130962; a=rsa-sha256; cv=none; b=CzGmaXrkpFci6OO8UhmzkM7si2+V1gPXM91wvbZctpCXzxhoYPUWqdoQw+/HSNQuqhiw55 o5xvLIMJ1JxpzY48kXO5zQJ3fn2ccLofCpD/ljdOj2d/wcBPhMYZbB4vYTFdqK1cKf3GEu XNJHCUzlWkvctZR4cjEepHGgZW04l99sR9Mo98clvOyugM+zXGoEsxc09rzGeZwW+b3ReQ bzBDSK3fvVmNy3UMQaVMvhS5XMd889KtUpdSNSbCBKSCyDFZXf5PDiJdPdFWCIJVACSsSG S8u9831mr8tNnZA2DQpkRQSgrUixYhO4fGGfofpb5WbVMSzJMY38K6M5efV1Hg== 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=1773130962; 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=wc2cpVpNAvZLsnxfPDECVh3w0E+vdsD3aGdaLNJ87kc=; b=B/n/9PjfGfK/Vc38lhRb5fXs0MVsYE9Dc3A4ZhBX4eprKdNK/F7X8rzZg9Sn9Ax1Hn5e2K XYGFPw7ml0U1aQY9eCgzDBebbKKW12WjsrHgPK6tSk1s/fYijTTqkyHmbMM8lqSXWbZyek AII3e4UNIE3cnP6ApcrPWz6+G8jg1v3hzBSLD9XlY6EusWbvlVlp07irSf12r7ywg+Rjpx nLCMoc9LMz9YrrVEC0unSaHmEZVVRKvCj0vJgvtJhMsp0XlTBpW91nlglbZoE5Q48P7o4e PxKwTVaEx7IzlddPMtzSWN7CQOpqrtk8oXuE/xU9U1/9AGR1VBAiMSM+WAGCwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fVRhL1kSdz14S6 for ; Tue, 10 Mar 2026 08:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38587 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Mar 2026 08:22:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: df5b2cf2b31b - main - Complete removal of GNU diff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b Auto-Submitted: auto-generated Date: Tue, 10 Mar 2026 08:22:37 +0000 Message-Id: <69afd4cd.38587.61f40234@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b commit df5b2cf2b31bf66e3b21c772b39f6cc6406dcb7b Author: Dag-Erling Smørgrav AuthorDate: 2026-03-10 08:21:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-03-10 08:21:32 +0000 Complete removal of GNU diff Fixes: 9a44e42a2b8f ("Retire GNU diff3") Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D55423 --- usr.bin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index d536f26ab0da..6ca784ef6cb6 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -29,6 +29,7 @@ SUBDIR= apply \ ctlstat \ cut \ diff \ + diff3 \ dirname \ dtc \ du \ @@ -206,7 +207,6 @@ SUBDIR.${MK_GAMES}+= pom SUBDIR.${MK_GAMES}+= primes SUBDIR.${MK_GAMES}+= random SUBDIR+= gh-bc -SUBDIR+= diff3 SUBDIR.${MK_HESIOD}+= hesinfo SUBDIR.${MK_ICONV}+= iconv SUBDIR.${MK_ICONV}+= mkcsmapper