From owner-svn-src-stable@FreeBSD.ORG Fri Feb 20 01:03:45 2015 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B323BB0D; Fri, 20 Feb 2015 01:03:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 83418112; Fri, 20 Feb 2015 01:03:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1K13jAK014404; Fri, 20 Feb 2015 01:03:45 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1K13ikG014398; Fri, 20 Feb 2015 01:03:44 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201502200103.t1K13ikG014398@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Fri, 20 Feb 2015 01:03:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r279036 - in stable/8/gnu/usr.bin: diff diff3 sdiff X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Feb 2015 01:03:45 -0000 Author: ian Date: Fri Feb 20 01:03:44 2015 New Revision: 279036 URL: https://svnweb.freebsd.org/changeset/base/279036 Log: MFC r204227: Remove -b .orig from patch commands, since it's the default. This allows an 8-stable build to work on a system with newer tools that don't have the old -b option. Modified: stable/8/gnu/usr.bin/diff/Makefile stable/8/gnu/usr.bin/diff3/Makefile stable/8/gnu/usr.bin/sdiff/Makefile Directory Properties: stable/8/gnu/usr.bin/diff/ (props changed) stable/8/gnu/usr.bin/diff3/ (props changed) stable/8/gnu/usr.bin/sdiff/ (props changed) Modified: stable/8/gnu/usr.bin/diff/Makefile ============================================================================== --- stable/8/gnu/usr.bin/diff/Makefile Fri Feb 20 01:02:32 2015 (r279035) +++ stable/8/gnu/usr.bin/diff/Makefile Fri Feb 20 01:03:44 2015 (r279036) @@ -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: stable/8/gnu/usr.bin/diff3/Makefile ============================================================================== --- stable/8/gnu/usr.bin/diff3/Makefile Fri Feb 20 01:02:32 2015 (r279035) +++ stable/8/gnu/usr.bin/diff3/Makefile Fri Feb 20 01:03:44 2015 (r279036) @@ -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: stable/8/gnu/usr.bin/sdiff/Makefile ============================================================================== --- stable/8/gnu/usr.bin/sdiff/Makefile Fri Feb 20 01:02:32 2015 (r279035) +++ stable/8/gnu/usr.bin/sdiff/Makefile Fri Feb 20 01:03:44 2015 (r279036) @@ -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