Date: Fri, 20 Feb 2015 01:03:44 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> 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 Message-ID: <201502200103.t1K13ikG014398@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502200103.t1K13ikG014398>