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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
