From nobody Sat Nov 19 19:11:38 2022 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 4NF3DB2Zjtz4hh4l; Sat, 19 Nov 2022 19:11:38 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NF3DB27cCz4HDF; Sat, 19 Nov 2022 19:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668885098; 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=IOomkDM+0sIeoEzGBBaPmEmT55uD4NGHLFnw529K3kU=; b=kjyC2L3+aAXCKhdTrTW+h55sgY0USiQ7OETYI0jSVn4+rBiNsRQbDbSK/xLYUZWWUQ2nAb Yp2vsiukRbIcdOyubnjZy2SCc//BHOEcrCHGZqPQHBb3aMQtjyfIY+KfRHbCXmI5ZSeV+t bdB33696DzB1K4Tr2K+XWUNxegcnhaxgYsjOdn2ShVTBB1mpaUVv6+KX6qFLtD+Qqy6v2O CX9o8MmMiHnkYBtMWBeYk5r+0iIS+MPn/ZCCBYmmrEl6mPbLRpi8F0rvz7AvXjqTQysYsN S5W7mVGWhIyHir11MeDxKmsiNTElhG96HeW8b06y2Cwggdyol4fzmlzUcAnqJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668885098; 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=IOomkDM+0sIeoEzGBBaPmEmT55uD4NGHLFnw529K3kU=; b=oVECQz6uZ4cVEH4+EIqhWVnGLYHhPKfJ1V544Qo7zB3UK9YMUyXpOfraBj/DQJjXKKPE9O 06Sx7k8DeYpoV5Z3tsGnA7nsvFa2qA+gqdMLNDHNJmxl5h+EIdjD1XowkoZyRbJM9rJRRf oUJZVXpTV5DM76oqfGZVMrv9F8oLx6em5YYEF0vCnqeIh21AFaPGt48Cw71zJ5isjGnKEC JQhKD3JysUH+eRWKppmxFKvnOlaAgZIxBF8zUGa3QBS0yVG+MHieyKgnCRiQra6NL18/i0 MsYUDV3IMizUrMT0PhxAQp+0AzNuILgCudkAmKwTdkcDX7IDUAXrzVwZFHqRuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668885098; a=rsa-sha256; cv=none; b=EEUoVb1vrv8KLawaPaA6q5ziNWljGMELM+VAy5b/vn2s0uYU9cUW8uDaDr2osPr+91AuiD xNFK4ZdSBBEf3oO1PWPfS61vOA2aEPc3h0BWmBwZoh68h4fZBErt3KLcAb+8wbS+iWqcPY DIHxWA4v2gHhvdLp0E4q0yh5Q3w4oWTqF5yL/3hH1Vqs8v0pqvVRB3mXCpVPE01JN+zY28 75/pkwovzZZ2r81nitraZIUl003ra0Jn6qotQ7gjGjiQaQttNjRplcY6IqFBuSK7QyUnKg TMXVd2CX4iQVZeOhzFrwC/6R5bB0SBwcl2MkxFJQhfdSEo6QoOYvuTVxG2IR9Q== 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 4NF3DB1C0pzwxM; Sat, 19 Nov 2022 19:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AJJBcIh052731; Sat, 19 Nov 2022 19:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJJBcBT052730; Sat, 19 Nov 2022 19:11:38 GMT (envelope-from git) Date: Sat, 19 Nov 2022 19:11:38 GMT Message-Id: <202211191911.2AJJBcBT052730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 62491112ae26 - stable/13 - gnu diff3: apply patch to committed src, rather than at build time 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 62491112ae26f6d876c10a9652de7476af9f0127 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=62491112ae26f6d876c10a9652de7476af9f0127 commit 62491112ae26f6d876c10a9652de7476af9f0127 Author: Ed Maste AuthorDate: 2022-11-11 19:48:40 +0000 Commit: Ed Maste CommitDate: 2022-11-19 19:10:48 +0000 gnu diff3: apply patch to committed src, rather than at build time This appears to be a leftover from the time we used a less-capable VCS. Reviewed by: delphij MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37368 (cherry picked from commit 3a13b5ac83a100ebb5a0da0579e418f19b3b630b) --- contrib/diff/src/diff3.c | 1 - gnu/usr.bin/diff3/Makefile | 6 ------ gnu/usr.bin/diff3/diff3.c.diff | 11 ----------- 3 files changed, 18 deletions(-) diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c index 261eeabfdfb1..c915d6b04c87 100644 --- a/contrib/diff/src/diff3.c +++ b/contrib/diff/src/diff3.c @@ -230,7 +230,6 @@ main (int argc, char **argv) initialize_main (&argc, &argv); program_name = argv[0]; setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); c_stack_action (0); diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 6549b7157ef6..4bbb87ddb65b 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -20,10 +20,4 @@ CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\" WARNS?= 0 -.for f in diff3.c -${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff - patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f} -CLEANFILES+= ${f} -.endfor - .include diff --git a/gnu/usr.bin/diff3/diff3.c.diff b/gnu/usr.bin/diff3/diff3.c.diff deleted file mode 100644 index 153d6e88c6d4..000000000000 --- a/gnu/usr.bin/diff3/diff3.c.diff +++ /dev/null @@ -1,11 +0,0 @@ -$FreeBSD$ ---- diff3.c.orig 2004-04-12 15:44:35.000000000 +0800 -+++ diff3.c 2007-06-15 14:49:23.903835977 +0800 -@@ -230,7 +230,6 @@ - initialize_main (&argc, &argv); - program_name = argv[0]; - setlocale (LC_ALL, ""); -- bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - c_stack_action (0); -