summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gnu/usr.bin/patch/Makefile6
-rw-r--r--share/mk/bsd.own.mk1
-rw-r--r--tools/build/options/WITH_GNU_PATCH2
-rw-r--r--usr.bin/patch/Makefile10
4 files changed, 0 insertions, 19 deletions
diff --git a/gnu/usr.bin/patch/Makefile b/gnu/usr.bin/patch/Makefile
index 3f26cec..8d8cc7b 100644
--- a/gnu/usr.bin/patch/Makefile
+++ b/gnu/usr.bin/patch/Makefile
@@ -1,16 +1,10 @@
# $FreeBSD$
-.include <bsd.own.mk>
-
-.if ${MK_GNU_PATCH} == "yes"
-PROG= patch
-.else
PROG= gnupatch
CLEANFILES+= gnupatch.1
gnupatch.1: patch.1
cp ${.ALLSRC} ${.TARGET}
-.endif
SRCS= backupfile.c inp.c patch.c pch.c util.c version.c
CFLAGS+=-DHAVE_CONFIG_H
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 82c9a65a0..da758d5 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -373,7 +373,6 @@ __DEFAULT_NO_OPTIONS = \
CLANG_EXTRAS \
CTF \
DEBUG_FILES \
- GNU_PATCH \
GPL_DTC \
HESIOD \
LIBICONV_COMPAT \
diff --git a/tools/build/options/WITH_GNU_PATCH b/tools/build/options/WITH_GNU_PATCH
deleted file mode 100644
index d2a751f..0000000
--- a/tools/build/options/WITH_GNU_PATCH
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Install GNU-licensed patch as 'patch' instead of BSD patch.
diff --git a/usr.bin/patch/Makefile b/usr.bin/patch/Makefile
index 18261f6..a5f15c7 100644
--- a/usr.bin/patch/Makefile
+++ b/usr.bin/patch/Makefile
@@ -1,17 +1,7 @@
# $OpenBSD: Makefile,v 1.4 2005/05/16 15:22:46 espie Exp $
# $FreeBSD$
-.include <bsd.own.mk>
-
-.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
OpenPOWER on IntegriCloud