aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2022-11-11 19:48:40 +0000
committerEd Maste <emaste@FreeBSD.org>2022-11-14 02:33:40 +0000
commit3a13b5ac83a100ebb5a0da0579e418f19b3b630b (patch)
tree35ff140a506082a3c9d932381e02afc68d18cad4 /gnu
parent032b04626b671ec16deacd479569998b96c96142 (diff)
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/diff3/Makefile6
-rw-r--r--gnu/usr.bin/diff3/diff3.c.diff11
2 files changed, 0 insertions, 17 deletions
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);
-