From owner-svn-src-all@FreeBSD.ORG Thu Aug 29 00:38:25 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BBD469F7; Thu, 29 Aug 2013 00:38:25 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E7E62440; Thu, 29 Aug 2013 00:38:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7T0cPUu005148; Thu, 29 Aug 2013 00:38:25 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7T0cPXZ005138; Thu, 29 Aug 2013 00:38:25 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201308290038.r7T0cPXZ005138@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Thu, 29 Aug 2013 00:38:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r255014 - in head: gnu/usr.bin/patch share/mk tools/build/options usr.bin/patch X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Aug 2013 00:38:25 -0000 Author: pfg Date: Thu Aug 29 00:38:24 2013 New Revision: 255014 URL: http://svnweb.freebsd.org/changeset/base/255014 Log: 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. Deleted: head/tools/build/options/WITH_GNU_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 Wed Aug 28 23:59:38 2013 (r255013) +++ head/gnu/usr.bin/patch/Makefile Thu Aug 29 00:38:24 2013 (r255014) @@ -1,16 +1,10 @@ # $FreeBSD$ -.include - -.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 Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Wed Aug 28 23:59:38 2013 (r255013) +++ head/share/mk/bsd.own.mk Thu Aug 29 00:38:24 2013 (r255014) @@ -373,7 +373,6 @@ __DEFAULT_NO_OPTIONS = \ CLANG_EXTRAS \ CTF \ DEBUG_FILES \ - GNU_PATCH \ GPL_DTC \ HESIOD \ LIBICONV_COMPAT \ Modified: head/usr.bin/patch/Makefile ============================================================================== --- head/usr.bin/patch/Makefile Wed Aug 28 23:59:38 2013 (r255013) +++ head/usr.bin/patch/Makefile Thu Aug 29 00:38:24 2013 (r255014) @@ -1,17 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2005/05/16 15:22:46 espie Exp $ # $FreeBSD$ -.include - -.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