From owner-freebsd-stable@freebsd.org  Wed Jan  9 02:48:18 2019
Return-Path: <owner-freebsd-stable@freebsd.org>
Delivered-To: freebsd-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 721E114934EF
 for <freebsd-stable@mailman.ysv.freebsd.org>;
 Wed,  9 Jan 2019 02:48:18 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org
 [IPv6:2610:1c1:1:606c::24b:4])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 8C1D1971A7;
 Wed,  9 Jan 2019 02:48:17 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com
 [209.85.208.177])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G3" (verified OK))
 (Authenticated sender: kevans)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 3E6E25174;
 Wed,  9 Jan 2019 02:48:17 +0000 (UTC)
 (envelope-from kevans@freebsd.org)
Received: by mail-lj1-f177.google.com with SMTP id k19-v6so5153302lji.11;
 Tue, 08 Jan 2019 18:48:17 -0800 (PST)
X-Gm-Message-State: AJcUukdE2zaObZg1xwTbsf3TsZE1CoX8ztK/8X9PDJU8VOPpyfTs1K3q
 wZslMxY7ddz8VPmDzjz4a6p2JkjdW7S3byqvzqI=
X-Google-Smtp-Source: ALg8bN4ubhuUecqkLZkBwEJsoJCxhASuRtF+8Q15qbH8Pz/MIX5AttU3ql7pM2WoaFRZDm6QhrAqKEoBDJq6BpUtJFc=
X-Received: by 2002:a2e:9181:: with SMTP id f1-v6mr2289315ljg.64.1547002095648; 
 Tue, 08 Jan 2019 18:48:15 -0800 (PST)
MIME-Version: 1.0
References: <2719906.yzQzn1nXtE@photon.int.bluestop.org>
 <CACNAnaET7P1DX5Laev7X2f0tR+QHdbBgU4H9WC8UG5fegpxwqA@mail.gmail.com>
In-Reply-To: <CACNAnaET7P1DX5Laev7X2f0tR+QHdbBgU4H9WC8UG5fegpxwqA@mail.gmail.com>
From: Kyle Evans <kevans@freebsd.org>
Date: Tue, 8 Jan 2019 20:48:04 -0600
X-Gmail-Original-Message-ID: <CACNAnaEOduJ1TGQNerMPwx6hiiVSGAgPqHWLNy3f-5bO6Z+NOg@mail.gmail.com>
Message-ID: <CACNAnaEOduJ1TGQNerMPwx6hiiVSGAgPqHWLNy3f-5bO6Z+NOg@mail.gmail.com>
Subject: Re: grep(1) documents bsdgrep, but GNU grep is installed as 'grep'
To: Rebecca Cran <rebecca@bluestop.org>
Cc: Baptiste Daroussin <bapt@freebsd.org>, 
 "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-Rspamd-Queue-Id: 8C1D1971A7
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
 local_wl_from(0.00)[freebsd.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_LONG(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.98)[-0.976,0]
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-stable>, 
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Jan 2019 02:48:18 -0000

On Tue, Jan 8, 2019 at 7:44 PM Kyle Evans <kevans@freebsd.org> wrote:
>
> On Tue, Jan 8, 2019 at 7:36 PM Rebecca Cran via freebsd-stable
> <freebsd-stable@freebsd.org> wrote:
> >
> > grep(1) documents the "--exclude-dir" option, but running "grep" complains
> > it's unknown. Also, 'rgrep' doesn't exist.
> > It turns out that the grep binary is GNU grep 2.5.1, while bsdgrep supports
> > the option.
> >
> > Is WITH_BSD_GREP supposed to be defaulted to on for 12.0 and newer, or was the
> > man page switched over too soon?
> >
>
> Yeah, I think we botched that -- maybe we'll call it optimism. =(
> https://svnweb.freebsd.org/base/head/usr.bin/grep/Makefile?view=markup#l13
> should read "MAN1= bsdgrep.1 zgrep.1" rather than grep.1 zgrep.1, I
> believe. (CC bapt@ for a second eye, since this was during zgrep
> stuff)
>

It's a trivial enough fix that I verified it and just went ahead to
commit it as r342874; sorry for that!