From owner-svn-src-head@FreeBSD.ORG  Mon Feb 22 22:32:24 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2738106566C;
	Mon, 22 Feb 2010 22:32:24 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 78DF68FC12;
	Mon, 22 Feb 2010 22:32:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1MMWOI5077750;
	Mon, 22 Feb 2010 22:32:24 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1MMWOPA077745;
	Mon, 22 Feb 2010 22:32:24 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201002222232.o1MMWOPA077745@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 22 Feb 2010 22:32:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204227 - in head/gnu/usr.bin: diff diff3 sdiff
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Feb 2010 22:32:24 -0000

Author: delphij
Date: Mon Feb 22 22:32:24 2010
New Revision: 204227
URL: http://svn.freebsd.org/changeset/base/204227

Log:
  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.

Modified:
  head/gnu/usr.bin/diff/Makefile
  head/gnu/usr.bin/diff3/Makefile
  head/gnu/usr.bin/sdiff/Makefile

Modified: head/gnu/usr.bin/diff/Makefile
==============================================================================
--- head/gnu/usr.bin/diff/Makefile	Mon Feb 22 22:27:26 2010	(r204226)
+++ head/gnu/usr.bin/diff/Makefile	Mon Feb 22 22:32:24 2010	(r204227)
@@ -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
 

Modified: head/gnu/usr.bin/diff3/Makefile
==============================================================================
--- head/gnu/usr.bin/diff3/Makefile	Mon Feb 22 22:27:26 2010	(r204226)
+++ head/gnu/usr.bin/diff3/Makefile	Mon Feb 22 22:32:24 2010	(r204227)
@@ -20,7 +20,7 @@ CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bi
 
 .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
 

Modified: head/gnu/usr.bin/sdiff/Makefile
==============================================================================
--- head/gnu/usr.bin/sdiff/Makefile	Mon Feb 22 22:27:26 2010	(r204226)
+++ head/gnu/usr.bin/sdiff/Makefile	Mon Feb 22 22:32:24 2010	(r204227)
@@ -21,7 +21,7 @@ CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bi
 
 .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