From owner-p4-projects@FreeBSD.ORG  Sun Jun 29 17:08:54 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 34D521065679; Sun, 29 Jun 2008 17:08:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA6AF1065675
	for <perforce@freebsd.org>; Sun, 29 Jun 2008 17:08:53 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D95A38FC16
	for <perforce@freebsd.org>; Sun, 29 Jun 2008 17:08:53 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5TH8rbT081597
	for <perforce@freebsd.org>; Sun, 29 Jun 2008 17:08:53 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5TH8rXF081595
	for perforce@freebsd.org; Sun, 29 Jun 2008 17:08:53 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 29 Jun 2008 17:08:53 GMT
Message-Id: <200806291708.m5TH8rXF081595@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144292 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jun 2008 17:08:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=144292

Change 144292 by gabor@gabor_server on 2008/06/29 17:08:51

	- Arrange the knobs for the upcoming BSD grep

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/src/share/mk/bsd.own.mk#2 edit
.. //depot/projects/soc2008/gabor_textproc/src/tools/build/options/WITHOUT_GNU_GREP#2 delete
.. //depot/projects/soc2008/gabor_textproc/src/tools/build/options/WITH_GNU_GREP#1 add
.. //depot/projects/soc2008/gabor_textproc/src/usr.bin/Makefile#2 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/src/share/mk/bsd.own.mk#2 (text+ko) ====

@@ -297,6 +297,7 @@
     BLUETOOTH \
     BOOT \
     BSD_CPIO \
+    BSD_GREP \
     BZIP2 \
     CALENDAR \
     CDDL \
@@ -313,7 +314,6 @@
     GCOV \
     GDB \
     GNU \
-    GNU_GREP \
     GPIB \
     GROFF \
     HTML \

==== //depot/projects/soc2008/gabor_textproc/src/usr.bin/Makefile#2 (text+ko) ====

@@ -76,6 +76,7 @@
 	getent \
 	getopt \
 	${_gprof} \
+	${_grep} \
 	gzip \
 	head \
 	${_hesinfo} \
@@ -273,6 +274,10 @@
 .endif
 .endif
 
+.if ${MK_BSD_GREP} != "no"
+_grep=		grep
+.endif
+
 .if ${MK_HESIOD} != "no"
 _hesinfo=	hesinfo
 .endif