Date: Fri, 26 Jul 2013 21:25:19 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253689 - in head: gnu/usr.bin/patch share/mk tools/build/options usr.bin/patch Message-ID: <201307262125.r6QLPJjd031784@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Fri Jul 26 21:25:18 2013 New Revision: 253689 URL: http://svnweb.freebsd.org/changeset/base/253689 Log: 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 Added: head/tools/build/options/WITH_GNU_PATCH - copied, changed from r253470, head/tools/build/options/WITH_BSD_PATCH Deleted: head/tools/build/options/WITH_BSD_PATCH Modified: head/gnu/usr.bin/patch/Makefile head/share/mk/bsd.own.mk head/usr.bin/patch/Makefile Modified: head/gnu/usr.bin/patch/Makefile ============================================================================== --- head/gnu/usr.bin/patch/Makefile Fri Jul 26 20:54:33 2013 (r253688) +++ head/gnu/usr.bin/patch/Makefile Fri Jul 26 21:25:18 2013 (r253689) @@ -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 Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Fri Jul 26 20:54:33 2013 (r253688) +++ head/share/mk/bsd.own.mk Fri Jul 26 21:25:18 2013 (r253689) @@ -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 \ Copied and modified: head/tools/build/options/WITH_GNU_PATCH (from r253470, head/tools/build/options/WITH_BSD_PATCH) ============================================================================== --- head/tools/build/options/WITH_BSD_PATCH Fri Jul 19 12:43:20 2013 (r253470, copy source) +++ head/tools/build/options/WITH_GNU_PATCH Fri Jul 26 21:25:18 2013 (r253689) @@ -1,2 +1,2 @@ .\" $FreeBSD$ -Install BSD-licensed patch as 'patch' instead of GNU patch. +Install GNU-licensed patch as 'patch' instead of BSD patch. Modified: head/usr.bin/patch/Makefile ============================================================================== --- head/usr.bin/patch/Makefile Fri Jul 26 20:54:33 2013 (r253688) +++ head/usr.bin/patch/Makefile Fri Jul 26 21:25:18 2013 (r253689) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307262125.r6QLPJjd031784>