From aa74e2f883c289fdcf911bbb7f3255a9c4ab5196 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 22 Feb 2010 22:32:24 +0000
Subject: [PATCH] POSIX patch(1) would treat -b as different meaning (the
 functionality is to be provided by --suffix).  Looking at the usage here in
 diffutils, it seems that we can just get rid of the -b .orig stuff.  This
 resolves a problem that can triggered if we move toward to a more
 permissively licensed patch(1) program.

---
 gnu/usr.bin/diff/Makefile  | 2 +-
 gnu/usr.bin/diff3/Makefile | 2 +-
 gnu/usr.bin/sdiff/Makefile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index 25d439f83e5..ba5ab653834 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -29,7 +29,7 @@ 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
 
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index 9fbb5dba615..6e9f8670d19 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -20,7 +20,7 @@ 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
 
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index c40cd4d9d56..efadcf2b8b2 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -21,7 +21,7 @@ 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