Update build skeleton after diffutils 2.8.7 update.

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>