Index: stable/8/gnu/usr.bin/diff/Makefile
===================================================================
--- stable/8/gnu/usr.bin/diff/Makefile	(revision 279035)
+++ stable/8/gnu/usr.bin/diff/Makefile	(revision 279036)
@@ -1,36 +1,36 @@
 # $FreeBSD$
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH: ${DIFFSRC} \
        ${.CURDIR}/../../../contrib/diff/lib \
        ${.CURDIR}/../../../contrib/diff/man
 
 PROG=	diff
 SRCS=   analyze.c context.c diff.c dir.c ed.c ifdef.c io.c \
 	normal.c side.c util.c \
 	xmalloc.c strtoumax.c cmpbuf.c exitfail.c error.c quotesys.c \
 	strftime.c c-stack.c basename.c exclude.c hard-locale.c \
 	file-type.c posixver.c prepargs.c version-etc.c
 
 # Important for ctype macros!
 CFLAGS+=-funsigned-char
 
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DPR_PROGRAM=\"/usr/bin/pr\"
 CFLAGS+=-I${DESTDIR}/usr/include/gnu
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
 
 SUBDIR+=doc
 
 DPADD=	${LIBGNUREGEX}
 LDADD=	-lgnuregex
 
 .for f in diff.c context.c
 ${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
-	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
+	patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
 CLEANFILES+= ${f}
 .endfor
 
 .include <bsd.prog.mk>
Index: stable/8/gnu/usr.bin/diff
===================================================================
--- stable/8/gnu/usr.bin/diff	(revision 279035)
+++ stable/8/gnu/usr.bin/diff	(revision 279036)

Property changes on: stable/8/gnu/usr.bin/diff
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/gnu/usr.bin/diff:r204227
Index: stable/8/gnu/usr.bin/diff3/Makefile
===================================================================
--- stable/8/gnu/usr.bin/diff3/Makefile	(revision 279035)
+++ stable/8/gnu/usr.bin/diff3/Makefile	(revision 279036)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH:  ${DIFFSRC} \
 	${.CURDIR}/../../../contrib/diff/lib \
 	${.CURDIR}/../../../contrib/diff/man
 
 PROG=		diff3
 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/src
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
 CFLAGS+=-DHAVE_CONFIG_H
 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}
+	patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
 CLEANFILES+= ${f}
 .endfor
 
 .include <bsd.prog.mk>
Index: stable/8/gnu/usr.bin/diff3
===================================================================
--- stable/8/gnu/usr.bin/diff3	(revision 279035)
+++ stable/8/gnu/usr.bin/diff3	(revision 279036)

Property changes on: stable/8/gnu/usr.bin/diff3
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/gnu/usr.bin/diff:r204227
Index: stable/8/gnu/usr.bin/sdiff/Makefile
===================================================================
--- stable/8/gnu/usr.bin/sdiff/Makefile	(revision 279035)
+++ stable/8/gnu/usr.bin/sdiff/Makefile	(revision 279036)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 DIFFSRC=${.CURDIR}/../../../contrib/diff/src
 .PATH:  ${DIFFSRC} \
 	${.CURDIR}/../../../contrib/diff/lib \
 	${.CURDIR}/../../../contrib/diff/man
 
 PROG=		sdiff
 SRCS=           sdiff.c version-etc.c \
 		error.c xmalloc.c c-stack.c basename.c strtoumax.c \
 		exitfail.c
 
 # Important for ctype macros!
 CFLAGS+=-funsigned-char
 
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/src
 CFLAGS+=-I${.CURDIR}/../../../contrib/diff/lib
 CFLAGS+=-DHAVE_CONFIG_H
 CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\"
 
 .for f in sdiff.c
 ${f}: ${DIFFSRC}/${f} ${.CURDIR}/${f}.diff
-	patch -s -b .orig -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
+	patch -s -o ${.TARGET} < ${.CURDIR}/${f}.diff ${DIFFSRC}/${f}
 CLEANFILES+= ${f}
 .endfor
 
 .include <bsd.prog.mk>
Index: stable/8/gnu/usr.bin/sdiff
===================================================================
--- stable/8/gnu/usr.bin/sdiff	(revision 279035)
+++ stable/8/gnu/usr.bin/sdiff	(revision 279036)

Property changes on: stable/8/gnu/usr.bin/sdiff
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/gnu/usr.bin/sdiff:r204227