Date: Sat, 19 Nov 2022 19:11:38 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 62491112ae26 - stable/13 - gnu diff3: apply patch to committed src, rather than at build time Message-ID: <202211191911.2AJJBcBT052730@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=62491112ae26f6d876c10a9652de7476af9f0127 commit 62491112ae26f6d876c10a9652de7476af9f0127 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-11-11 19:48:40 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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 <bsd.prog.mk> 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); -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211191911.2AJJBcBT052730>