Drop build option switch for the older GNU patch.
As promised, drop the option to make the older GNU patch the default. GNU patch is still being built but something drastic may happen to it to it before Release.
This commit is contained in:
parent
8e0caa60f2
commit
4b97b38825
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=255014
@ -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
|
||||
|
@ -373,7 +373,6 @@ __DEFAULT_NO_OPTIONS = \
|
||||
CLANG_EXTRAS \
|
||||
CTF \
|
||||
DEBUG_FILES \
|
||||
GNU_PATCH \
|
||||
GPL_DTC \
|
||||
HESIOD \
|
||||
LIBICONV_COMPAT \
|
||||
|
@ -1,2 +0,0 @@
|
||||
.\" $FreeBSD$
|
||||
Install GNU-licensed patch as 'patch' instead of BSD patch.
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user