From 0b7fec6762dc8e5033f083cf949edf73e739103f Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Wed, 25 May 2011 01:04:12 +0000
Subject: 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
---
 usr.bin/Makefile      |  6 +-----
 usr.bin/grep/Makefile | 11 +++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 85a9180..f258347 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -57,7 +57,7 @@ SUBDIR=	alias \
 	getconf \
 	getent \
 	getopt \
-	${_grep} \
+	grep \
 	gzip \
 	head \
 	hexdump \
@@ -227,10 +227,6 @@ SUBDIR+=	bluetooth
 SUBDIR+=	cpio
 .endif
 
-.if ${MK_BSD_GREP} != "no"
-_grep=		grep
-.endif
-
 .if ${MK_CALENDAR} != "no"
 SUBDIR+=	calendar
 .endif
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index 98fceeb..8cd490d 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -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=	fastgrep.c 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,6 +23,10 @@ MLINKS= grep.1 egrep.1 \
 	grep.1 zgrep.1 \
 	grep.1 zegrep.1 \
 	grep.1 zfgrep.1
+.endif
+
+bsdgrep.1: grep.1
+	cp ${.ALLSRC} ${.TARGET}
 
 WARNS?=	6
 
-- 
cgit v1.1