3 files changed, 27 insertions, 214 deletions

diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index f5f9c89a839b..9fbb5dba6150 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,15 +1,27 @@
 # $FreeBSD$
 
-.PATH:  ${.CURDIR}/../../../contrib/diff
+DIFFSRC=${.CURDIR}/../../../contrib/diff/src
+.PATH:  ${DIFFSRC} \
+	${.CURDIR}/../../../contrib/diff/lib \
+	${.CURDIR}/../../../contrib/diff/man
 
 PROG=		diff3
-SRCS=           diff3.c version.c
+SRCS=           diff3.c version-etc.c \
+		xmalloc.c error.c c-stack.c exitfail.c cmpbuf.c
 
 # Important for ctype macros!
 CFLAGS+=-funsigned-char
 
-CFLAGS+=-I${.CURDIR}/../../../contrib/diff
+CFLAGS+=-I${.CURDIR}/../../../contrib/diff/
+CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
+CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
 CFLAGS+=-DHAVE_CONFIG_H
-CFLAGS+=-DDIFF_PROGRAM=\"/usr/bin/diff\"
+CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
+
+.for f in diff3.c
+${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
+	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
+CLEANFILES+= ${f}
+.endfor
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/diff3/diff3.1 b/gnu/usr.bin/diff3/diff3.1
deleted file mode 100644
index 9873b0887d87..000000000000
--- a/gnu/usr.bin/diff3/diff3.1
+++ /dev/null
@@ -1,210 +0,0 @@
-.TH DIFF3 1 "22sep1993" "GNU Tools" "GNU Tools"
-.SH NAME
-diff3 \- find differences between three files
-.SH SYNOPSIS
-.B diff3
-[options] mine older yours
-.SH DESCRIPTION
-The
-.I diff3
-command compares three files and outputs descriptions
-of their differences.
-
-The files to compare are
-.IR mine ,
-.IR older ,
-and
-.IR yours .
-At most one of these three file names may be
-.BR \- ,
-which tells
-.I diff3
-to read the standard input for that file.
-.SS Options
-Below is a summary of all of the options that GNU
-.I diff3
-accepts.  Multiple single letter options (unless they take an argument)
-can be combined into a single command line argument.
-.TP
-.B \-a
-Treat all files as text and compare them line-by-line, even if they
-do not appear to be text.
-.TP
-.B \-A
-Incorporate all changes from
-.I older
-to
-.I yours
-into
-.IR mine ,
-surrounding all conflicts with bracket lines.
-.TP
-.B \-B
-Old behavior of -A.  Shows non-conflicts.
-.TP
-.B \-e
-Generate an
-.I ed
-script that incorporates all the changes from
-.I older
-to
-.I yours
-into
-.IR mine .
-.TP
-.B \-E
-Like
-.BR \-e ,
-except bracket lines from overlapping changes' first
-and third files.
-With
-.BR \-e ,
-an overlapping change looks like this:
-.sp
-.nf
-<<<<<<< \fImine\fP
-lines from \fImine\fP
-=======
-lines from \fIyours\fP
->>>>>>> \fIyours\fP
-.fi
-.TP
-.B \-\-ed
-Generate an
-.I ed
-script that incorporates all the changes from
-.I older
-to
-.I yours
-into
-.IR mine .
-.TP
-.B \-\-easy\-only
-Like
-.BR \-e ,
-except output only the nonoverlapping changes.
-.TP
-.B \-i
-Generate
-.B w
-and
-.B q
-commands at the end of the
-.I ed
-script for System V compatibility.  This option must be combined with
-one of the
-.B \-AeExX3
-options, and may not be combined with
-.BR \-m .
-.TP
-.B \-\-initial\-tab
-Output a tab rather than two spaces before the text of a line in normal format.
-This causes the alignment of tabs in the line to look normal.
-.TP
-.BI "\-L " label
-.ns
-.TP
-.BI \-\-label= label
-Use the label
-.I label
-for the brackets output by the
-.BR \-A ,
-.B \-E
-and
-.B \-X
-options.  This option may be given up to three
-times, one for each input file.  The default labels are the names of
-the input files.  Thus
-.B "diff3 \-L X \-L Y \-L Z \-m A B C"
-acts like
-.BR "diff3 \-m A B C ,
-except that the output looks like it came from
-files named
-.BR X ,
-.B Y
-and
-.B Z
-rather than from files
-named
-.BR A ,
-.B B
-and
-.BR C .
-.TP
-.B \-m
-.br
-.ns
-.TP
-.B \-\-merge
-Apply the edit script to the first file and send the result to standard
-output.  Unlike piping the output from
-.I diff3
-to
-.IR ed ,
-this
-works even for binary files and incomplete lines.
-.B \-A
-is assumed
-if no edit script option is specified.
-.TP
-.B \-\-overlap\-only
-Like
-.BR \-e ,
-except output only the overlapping changes.
-.TP
-.B \-\-show\-all
-Incorporate all unmerged changes from
-.I older
-to
-.I yours
-into
-.IR mine ,
-surrounding all overlapping changes with bracket lines.
-.TP
-.B \-\-show\-overlap
-Like
-.BR \-e ,
-except bracket lines from overlapping changes' first
-and third files.
-.TP
-.B \-T
-Output a tab rather than two spaces before the text of a line in normal format.
-This causes the alignment of tabs in the line to look normal.
-.TP
-.B \-\-text
-Treat all files as text and compare them line-by-line, even if they
-do not appear to be text.
-.TP
-.B \-v
-.br
-.ns
-.TP
-.B \-\-version
-Output the version number of
-.IR diff3 .
-.TP
-.B \-x
-Like
-.BR \-e ,
-except output only the overlapping changes.
-.TP
-.B \-X
-Like
-.BR \-E ,
-except output only the overlapping changes.
-In other words, like
-.BR \-x ,
-except bracket changes as in
-.BR \-E .
-.TP
-.B \-3
-Like
-.BR \-e ,
-except output only the nonoverlapping changes.
-.SH SEE ALSO
-cmp(1), comm(1), diff(1), ed(1), patch(1), sdiff(1).
-.SH DIAGNOSTICS
-An exit status of 0 means
-.I diff3
-was successful, 1 means some
-conflicts were found, and 2 means trouble.
diff --git a/gnu/usr.bin/diff3/diff3.c.diff b/gnu/usr.bin/diff3/diff3.c.diff
new file mode 100644
index 000000000000..153d6e88c6d4
--- /dev/null
+++ b/gnu/usr.bin/diff3/diff3.c.diff
@@ -0,0 +1,11 @@
+$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);
+