diff options
| author | delphij <delphij@FreeBSD.org> | 2010-02-22 22:32:24 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-02-22 22:32:24 +0000 |
| commit | 60522dd811ebd72da5bc94299affab4c8773cf38 (patch) | |
| tree | c594b25ca57c1aa89d2992948848ac76d303716e | |
| parent | 6009cffa64f25ae850064a3ac2f86ebcb374be5b (diff) | |
| download | FreeBSD-src-60522dd811ebd72da5bc94299affab4c8773cf38.zip FreeBSD-src-60522dd811ebd72da5bc94299affab4c8773cf38.tar.gz | |
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.
| -rw-r--r-- | gnu/usr.bin/diff/Makefile | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/diff3/Makefile | 2 | ||||
| -rw-r--r-- | 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 25d439f..ba5ab65 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 9fbb5db..6e9f867 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 c40cd4d..efadcf2 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 |
