summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2013-07-26 21:25:18 +0000
committerpfg <pfg@FreeBSD.org>2013-07-26 21:25:18 +0000
commit97ac613107cbd046b09fe26d250509b3ed473a3b (patch)
tree3b33b51036ef1670f42ba2fde2fde9a137e4d612 /gnu
parent45f9b76a043a567f6b7ee8f35ea3c17fbd555acf (diff)
downloadFreeBSD-src-97ac613107cbd046b09fe26d250509b3ed473a3b.zip
FreeBSD-src-97ac613107cbd046b09fe26d250509b3ed473a3b.tar.gz
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
Diffstat (limited to 'gnu')
-rw-r--r--gnu/usr.bin/patch/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/usr.bin/patch/Makefile b/gnu/usr.bin/patch/Makefile
index 76d28e8..3f26cec 100644
--- a/gnu/usr.bin/patch/Makefile
+++ b/gnu/usr.bin/patch/Makefile
@@ -2,14 +2,14 @@
.include <bsd.own.mk>
-.if ${MK_BSD_PATCH} == "yes"
+.if ${MK_GNU_PATCH} == "yes"
+PROG= patch
+.else
PROG= gnupatch
CLEANFILES+= gnupatch.1
gnupatch.1: patch.1
cp ${.ALLSRC} ${.TARGET}
-.else
-PROG= patch
.endif
SRCS= backupfile.c inp.c patch.c pch.c util.c version.c
OpenPOWER on IntegriCloud