From owner-svn-src-head@FreeBSD.ORG  Thu Jun  2 13:12:59 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2251106566B;
	Thu,  2 Jun 2011 13:12:59 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (acme.spoerlein.net
	[IPv6:2a01:4f8:131:23c2::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D4418FC0A;
	Thu,  2 Jun 2011 13:12:59 +0000 (UTC)
Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1])
	by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id p52DCw8E016434
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);
	Thu, 2 Jun 2011 15:12:58 +0200 (CEST)
	(envelope-from uqs@spoerlein.net)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net;
	s=dkim200908; t=1307020378;
	bh=dv5emNxbKhwNmfEoTEojEOpfS1ijWqBz+YKG90jK8Qk=;
	h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version:
	Content-Type:In-Reply-To;
	b=jD7vvNZRP03SxJwqVpenzTCqRDUcFy2i5IMusdatYg1K2ePjncIIeJqCYIgjgmXZ/
	z4ZHJIYqQHW6fQ2NKbQCItq1FCRB5RsXe0cH+qva96D1yMcf5ZWVdxx+7HqDluo5Gw
	fLIta9texniCdyfKQfgjZHA5vtI5XqkSD1ZbTjv4=
Date: Thu, 2 Jun 2011 15:12:58 +0200
From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net>
To: "David E. O'Brien" <obrien@FreeBSD.org>
Message-ID: <20110602131257.GV1002@acme.spoerlein.net>
Mail-Followup-To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@spoerlein.net>,
	"David E. O'Brien" <obrien@FreeBSD.org>, src-committers@FreeBSD.org,
	svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org
References: <201105250104.p4P14DLb092748@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201105250104.p4P14DLb092748@svn.freebsd.org>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
	src-committers@FreeBSD.org
Subject: Re: svn commit: r222273 - in head: gnu/usr.bin gnu/usr.bin/grep
 tools/build/options usr.bin usr.bin/grep
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jun 2011 13:12:59 -0000

On Wed, 25.05.2011 at 01:04:13 +0000, David E. O'Brien wrote:
> Author: obrien
> Date: Wed May 25 01:04:12 2011
> New Revision: 222273
> URL: http://svn.freebsd.org/changeset/base/222273
> 
> Log:
>   Build and install a BSD licensed grep.
>   If WITH_BSD_GREP is not set, it will be 'bsdgrep' and GNUgrep will be
>   '[ef]grep'.  Otherwise, BSD-grep will be the grep family, and GNUgrep
>   will be 'gnugrep'.
>   
>   Discussed with: brooks
> 
> Modified:
>   head/gnu/usr.bin/Makefile
>   head/gnu/usr.bin/grep/Makefile
>   head/tools/build/options/WITH_BSD_GREP
>   head/usr.bin/Makefile
>   head/usr.bin/grep/Makefile
> 
> Modified: head/gnu/usr.bin/Makefile
> ==============================================================================
> --- head/gnu/usr.bin/Makefile	Wed May 25 00:34:25 2011	(r222272)
> +++ head/gnu/usr.bin/Makefile	Wed May 25 01:04:12 2011	(r222273)
> @@ -27,9 +27,7 @@ _groff=		groff
>  .endif
>  .endif
>  
> -.if ${MK_BSD_GREP} != "yes"
>  _grep=          grep
> -.endif
>  

You should have done the same here as in usr.bin/Makefile, i.e. get rid
of the ${_grep} variable completely. Just saying ...

Uli