diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2013-07-26 21:25:18 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2013-07-26 21:25:18 +0000 |
| commit | 21244d522787c25ce4187cbd9b523e266b6ca8c6 (patch) | |
| tree | 3b33b51036ef1670f42ba2fde2fde9a137e4d612 /usr.bin/patch | |
| parent | 4ff45b8b45ef196d30c5f07ee69f273fa4c30f17 (diff) | |
| download | src-21244d522787c25ce4187cbd9b523e266b6ca8c6.tar.gz src-21244d522787c25ce4187cbd9b523e266b6ca8c6.zip | |
Make the BSD-licensed patch the default.
The BSD-licensed patch(1) command has matured and it's behaviour
can be considered equivalent to the older version of GNU patch
in the tree.
The switch has been extensively tested [1] and only two ports
presented regressions, which have since been fixed.
For convenience a new WITH_GNU_PATCH option is available,
but it will likely be removed in the near future.
PR: 176313
Approved by: portmgr
Notes
Notes:
svn path=/head/; revision=253689
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/patch/Makefile b/usr.bin/patch/Makefile index 382a05fc0e54..18261f677dfe 100644 --- a/usr.bin/patch/Makefile +++ b/usr.bin/patch/Makefile @@ -3,14 +3,14 @@ .include <bsd.own.mk> -.if ${MK_BSD_PATCH} == "yes" -PROG= patch -.else +.if ${MK_GNU_PATCH} == "yes" PROG= bsdpatch CLEANFILES+= bsdpatch.1 bsdpatch.1: patch.1 cp ${.ALLSRC} ${.TARGET} +.else +PROG= patch .endif SRCS= backupfile.c inp.c mkpath.c patch.c pch.c util.c |