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

5 files changed, 9 insertions, 9 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
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 0da1607..08bcca1 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -364,7 +364,6 @@ __DEFAULT_YES_OPTIONS = \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
-    BSD_PATCH \
     BIND_IDN \
     BIND_LARGE_FILE \
     BIND_LIBS \
@@ -375,6 +374,7 @@ __DEFAULT_NO_OPTIONS = \
     CLANG_EXTRAS \
     CTF \
     DEBUG_FILES \
+    GNU_PATCH \
     GPL_DTC \
     HESIOD \
     ICONV \
diff --git a/tools/build/options/WITH_BSD_PATCH b/tools/build/options/WITH_BSD_PATCH
deleted file mode 100644
index 8430d2a..0000000
--- a/tools/build/options/WITH_BSD_PATCH
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install BSD-licensed patch as 'patch' instead of GNU patch.
diff --git a/tools/build/options/WITH_GNU_PATCH b/tools/build/options/WITH_GNU_PATCH
new file mode 100644
index 0000000..d2a751f
--- /dev/null
+++ b/tools/build/options/WITH_GNU_PATCH
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Install GNU-licensed patch as 'patch' instead of BSD patch.
diff --git a/usr.bin/patch/Makefile b/usr.bin/patch/Makefile
index 382a05f..18261f6 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