From owner-svn-src-user@FreeBSD.ORG  Tue Jun 28 01:32:18 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90C2F106566B;
	Tue, 28 Jun 2011 01:32:18 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 818798FC13;
	Tue, 28 Jun 2011 01:32:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5S1WIkD022434;
	Tue, 28 Jun 2011 01:32:18 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5S1WIjg022432;
	Tue, 28 Jun 2011 01:32:18 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201106280132.p5S1WIjg022432@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 28 Jun 2011 01:32:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223617 - user/gabor/tre-integration/usr.bin/grep
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Jun 2011 01:32:18 -0000

Author: gabor
Date: Tue Jun 28 01:32:18 2011
New Revision: 223617
URL: http://svn.freebsd.org/changeset/base/223617

Log:
  - Reduce diffs from HEAD

Modified:
  user/gabor/tre-integration/usr.bin/grep/Makefile

Modified: user/gabor/tre-integration/usr.bin/grep/Makefile
==============================================================================
--- user/gabor/tre-integration/usr.bin/grep/Makefile	Tue Jun 28 00:58:12 2011	(r223616)
+++ user/gabor/tre-integration/usr.bin/grep/Makefile	Tue Jun 28 01:32:18 2011	(r223617)
@@ -2,9 +2,16 @@
 #	$FreeBSD$
 #	$OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
 
+.include <bsd.own.mk>
+
+.if ${MK_BSD_GREP} == "yes"
 PROG=	grep
+.else
+PROG=	bsdgrep
+.endif
 SRCS=	file.c grep.c queue.c util.c
 
+.if ${MK_BSD_GREP} == "yes"
 LINKS=	${BINDIR}/grep ${BINDIR}/egrep \
 	${BINDIR}/grep ${BINDIR}/fgrep \
 	${BINDIR}/grep ${BINDIR}/zgrep \
@@ -16,8 +23,10 @@ MLINKS= grep.1 egrep.1 \
 	grep.1 zgrep.1 \
 	grep.1 zegrep.1 \
 	grep.1 zfgrep.1
+.endif
 
-WARNS?=	6
+bsdgrep.1: grep.1
+	cp ${.ALLSRC} ${.TARGET}
 
 LDADD=	-lz -lbz2
 DPADD=	${LIBZ} ${LIBBZ2}