diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c --- a/contrib/diff/src/diff3.c +++ b/contrib/diff/src/diff3.c @@ -230,7 +230,6 @@ 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 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -20,10 +20,4 @@ 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 --- 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); -