summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2011-05-25 01:04:12 +0000
committerobrien <obrien@FreeBSD.org>2011-05-25 01:04:12 +0000
commit0b7fec6762dc8e5033f083cf949edf73e739103f (patch)
tree2d062953dece4440112f7980c27ef3b097cb7e54 /usr.bin
parent2a56bd31552754fcf7be84e5f869a380215e53b1 (diff)
downloadFreeBSD-src-0b7fec6762dc8e5033f083cf949edf73e739103f.zip
FreeBSD-src-0b7fec6762dc8e5033f083cf949edf73e739103f.tar.gz
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
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/Makefile6
-rw-r--r--usr.bin/grep/Makefile11
2 files changed, 12 insertions, 5 deletions
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
OpenPOWER on IntegriCloud