head	1.35;
access;
symbols
	RELENG_8_4:1.32.0.2
	RELENG_9_1_0_RELEASE:1.31.2.1.4.2
	RELENG_9_1:1.31.2.1.0.4
	RELENG_9_1_BP:1.31.2.1
	RELENG_8_3_0_RELEASE:1.30.30.1.8.1
	RELENG_8_3:1.30.30.1.0.8
	RELENG_8_3_BP:1.30.30.1
	RELENG_9_0_0_RELEASE:1.31.2.1.2.1
	RELENG_9_0:1.31.2.1.0.2
	RELENG_9_0_BP:1.31.2.1
	RELENG_9:1.31.0.2
	RELENG_9_BP:1.31
	RELENG_7_4_0_RELEASE:1.30.34.1
	RELENG_8_2_0_RELEASE:1.30.30.1.6.1
	RELENG_7_4:1.30.0.34
	RELENG_7_4_BP:1.30
	RELENG_8_2:1.30.30.1.0.6
	RELENG_8_2_BP:1.30.30.1
	RELENG_8_1_0_RELEASE:1.30.30.1.4.1
	RELENG_8_1:1.30.30.1.0.4
	RELENG_8_1_BP:1.30.30.1
	RELENG_7_3_0_RELEASE:1.30.32.1
	RELENG_7_3:1.30.0.32
	RELENG_7_3_BP:1.30
	RELENG_8_0_0_RELEASE:1.30.30.1.2.1
	RELENG_8_0:1.30.30.1.0.2
	RELENG_8_0_BP:1.30.30.1
	RELENG_8:1.30.0.30
	RELENG_8_BP:1.30
	RELENG_7_2_0_RELEASE:1.30.28.1
	RELENG_7_2:1.30.0.28
	RELENG_7_2_BP:1.30
	RELENG_7_1_0_RELEASE:1.30.26.1
	RELENG_6_4_0_RELEASE:1.30.24.1
	RELENG_7_1:1.30.0.26
	RELENG_7_1_BP:1.30
	RELENG_6_4:1.30.0.24
	RELENG_6_4_BP:1.30
	RELENG_7_0_0_RELEASE:1.30
	RELENG_6_3_0_RELEASE:1.30
	RELENG_7_0:1.30.0.22
	RELENG_7_0_BP:1.30
	RELENG_6_3:1.30.0.20
	RELENG_6_3_BP:1.30
	RELENG_7:1.30.0.18
	RELENG_7_BP:1.30
	RELENG_6_2_0_RELEASE:1.30
	RELENG_6_2:1.30.0.16
	RELENG_6_2_BP:1.30
	RELENG_5_5_0_RELEASE:1.30
	RELENG_5_5:1.30.0.14
	RELENG_5_5_BP:1.30
	RELENG_6_1_0_RELEASE:1.30
	RELENG_6_1:1.30.0.12
	RELENG_6_1_BP:1.30
	RELENG_6_0_0_RELEASE:1.30
	RELENG_6_0:1.30.0.10
	RELENG_6_0_BP:1.30
	RELENG_6:1.30.0.8
	RELENG_6_BP:1.30
	RELENG_5_4_0_RELEASE:1.30
	RELENG_5_4:1.30.0.6
	RELENG_5_4_BP:1.30
	RELENG_4_11_0_RELEASE:1.23
	RELENG_4_11:1.23.0.20
	RELENG_4_11_BP:1.23
	RELENG_5_3_0_RELEASE:1.30
	RELENG_5_3:1.30.0.4
	RELENG_5_3_BP:1.30
	RELENG_5:1.30.0.2
	RELENG_5_BP:1.30
	RELENG_4_10_0_RELEASE:1.23
	RELENG_4_10:1.23.0.18
	RELENG_4_10_BP:1.23
	RELENG_5_2_1_RELEASE:1.25
	RELENG_5_2_0_RELEASE:1.25
	RELENG_5_2:1.25.0.6
	RELENG_5_2_BP:1.25
	RELENG_4_9_0_RELEASE:1.23
	RELENG_4_9:1.23.0.16
	RELENG_4_9_BP:1.23
	RELENG_5_1_0_RELEASE:1.25
	RELENG_5_1:1.25.0.4
	RELENG_5_1_BP:1.25
	RELENG_4_8_0_RELEASE:1.23
	RELENG_4_8:1.23.0.14
	RELENG_4_8_BP:1.23
	RELENG_5_0_0_RELEASE:1.25
	RELENG_5_0:1.25.0.2
	RELENG_5_0_BP:1.25
	RELENG_4_7_0_RELEASE:1.23
	RELENG_4_7:1.23.0.12
	RELENG_4_7_BP:1.23
	RELENG_4_6_2_RELEASE:1.23
	RELENG_4_6_1_RELEASE:1.23
	RELENG_4_6_0_RELEASE:1.23
	RELENG_4_6:1.23.0.10
	RELENG_4_6_BP:1.23
	RELENG_4_5_0_RELEASE:1.23
	RELENG_4_5:1.23.0.8
	RELENG_4_5_BP:1.23
	RELENG_4_4_0_RELEASE:1.23
	RELENG_4_4:1.23.0.6
	RELENG_4_4_BP:1.23
	RELENG_4_3_0_RELEASE:1.23
	RELENG_4_3:1.23.0.4
	RELENG_4_3_BP:1.23
	RELENG_4_2_0_RELEASE:1.23
	RELENG_4_1_1_RELEASE:1.23
	PRE_SMPNG:1.23
	RELENG_4_1_0_RELEASE:1.23
	RELENG_3_5_0_RELEASE:1.14.2.3
	RELENG_4_0_0_RELEASE:1.23
	RELENG_4:1.23.0.2
	RELENG_4_BP:1.23
	RELENG_3_4_0_RELEASE:1.14.2.2
	RELENG_3_3_0_RELEASE:1.14.2.2
	RELENG_3_2_PAO:1.14.2.1.0.2
	RELENG_3_2_PAO_BP:1.14.2.1
	RELENG_3_2_0_RELEASE:1.14.2.1
	RELENG_3_1_0_RELEASE:1.14
	RELENG_3:1.14.0.2
	RELENG_3_BP:1.14
	RELENG_2_2_8_RELEASE:1.9
	RELENG_3_0_0_RELEASE:1.13
	RELENG_2_2_7_RELEASE:1.9
	RELENG_2_2_6_RELEASE:1.9
	RELENG_2_2_5_RELEASE:1.9
	RELENG_2_2_2_RELEASE:1.9
	RELENG_2_2_1_RELEASE:1.9
	RELENG_2_2_0_RELEASE:1.9
	RELENG_2_1_7_RELEASE:1.8.4.2
	RELENG_2_1_6_1_RELEASE:1.8.4.2
	RELENG_2_1_6_RELEASE:1.8.4.2
	RELENG_2_2:1.9.0.2
	RELENG_2_2_BP:1.9
	RELENG_2_1_5_RELEASE:1.8.4.2
	RELENG_2_1_0_RELEASE:1.8
	RELENG_2_1_0:1.8.0.4
	RELENG_2_1_0_BP:1.8
	RELENG_2_0_5_RELEASE:1.8
	RELENG_2_0_5:1.8.0.2
	RELENG_2_0_5_BP:1.8
	RELENG_2_0_5_ALPHA:1.8
	RELEASE_2_0:1.7
	BETA_2_0:1.7
	ALPHA_2_0:1.7.0.4
	MOVED_NEWCVS:1.7
	FINAL_1_1_5:1.7
	ALPHA_1_1_5:1.7
	FINAL_1_1:1.7
	GAMMA_1_1:1.7
	BETA_1_1:1.7.0.2
	BP_BETA_1_1:1.7
	FINAL_1_0:1.7
	EPSILON_1_0:1.7
	GAMMA_1_0:1.7
	BETA_1_0:1.7
	ALPHA_1_0:1.7
	GREP_1_6:1.1.1.1
	GNU:1.1.1;
locks; strict;
comment	@# @;


1.35
date	2013.06.07.00.27.12;	author svnexp;	state Exp;
branches;
next	1.34;

1.34
date	2013.06.06.00.39.02;	author svnexp;	state Exp;
branches;
next	1.33;

1.33
date	2013.05.22.00.36.02;	author svnexp;	state Exp;
branches;
next	1.32;

1.32
date	2012.11.17.01.49.11;	author svnexp;	state Exp;
branches
	1.32.2.1;
next	1.31;

1.31
date	2011.05.25.01.04.12;	author obrien;	state Exp;
branches
	1.31.2.1;
next	1.30;

1.30
date	2004.07.04.10.05.37;	author tjr;	state Exp;
branches
	1.30.8.1
	1.30.18.1
	1.30.24.1
	1.30.26.1
	1.30.28.1
	1.30.30.1
	1.30.32.1
	1.30.34.1;
next	1.29;

1.29
date	2004.03.01.08.37.20;	author ache;	state Exp;
branches;
next	1.28;

1.28
date	2004.02.17.05.38.45;	author ache;	state Exp;
branches;
next	1.27;

1.27
date	2004.02.16.22.43.05;	author ache;	state Exp;
branches;
next	1.26;

1.26
date	2004.02.05.22.44.22;	author ru;	state Exp;
branches;
next	1.25;

1.25
date	2002.10.20.07.50.20;	author obrien;	state Exp;
branches;
next	1.24;

1.24
date	2002.09.16.04.27.29;	author obrien;	state Exp;
branches;
next	1.23;

1.23
date	2000.01.18.09.52.00;	author ru;	state Exp;
branches
	1.23.2.1;
next	1.22;

1.22
date	2000.01.04.03.27.32;	author obrien;	state Exp;
branches;
next	1.21;

1.21
date	99.11.22.09.48.04;	author obrien;	state Exp;
branches;
next	1.20;

1.20
date	99.11.22.09.13.43;	author obrien;	state Exp;
branches;
next	1.19;

1.19
date	99.11.21.09.44.26;	author peter;	state Exp;
branches;
next	1.18;

1.18
date	99.11.20.09.40.03;	author peter;	state Exp;
branches;
next	1.17;

1.17
date	99.10.28.10.34.16;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	99.08.27.23.35.37;	author peter;	state Exp;
branches;
next	1.15;

1.15
date	99.02.09.17.22.51;	author wosch;	state Exp;
branches;
next	1.14;

1.14
date	98.11.14.23.37.32;	author wosch;	state Exp;
branches
	1.14.2.1;
next	1.13;

1.13
date	98.10.02.07.14.32;	author obrien;	state Exp;
branches;
next	1.12;

1.12
date	98.03.07.16.13.57;	author wosch;	state Exp;
branches;
next	1.11;

1.11
date	97.12.21.19.15.02;	author wosch;	state Exp;
branches;
next	1.10;

1.10
date	97.12.20.18.46.06;	author wosch;	state Exp;
branches;
next	1.9;

1.9
date	96.02.02.06.45.24;	author wosch;	state Exp;
branches;
next	1.8;

1.8
date	95.01.11.05.06.56;	author ache;	state Exp;
branches
	1.8.4.1;
next	1.7;

1.7
date	93.07.16.17.44.04;	author rgrimes;	state Exp;
branches;
next	1.6;

1.6
date	93.07.08.16.18.50;	author conklin;	state Exp;
branches
	1.6.2.1;
next	1.5;

1.5
date	93.07.06.18.53.50;	author nate;	state Exp;
branches;
next	1.4;

1.4
date	93.07.06.18.45.59;	author nate;	state Exp;
branches;
next	1.3;

1.3
date	93.07.06.18.44.52;	author nate;	state Exp;
branches;
next	1.2;

1.2
date	93.06.29.06.19.29;	author nate;	state Exp;
branches;
next	1.1;

1.1
date	93.06.29.06.04.43;	author nate;	state Exp;
branches
	1.1.1.1;
next	;

1.32.2.1
date	2012.11.17.01.49.11;	author svnexp;	state dead;
branches;
next	1.32.2.2;

1.32.2.2
date	2013.03.28.13.02.50;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.31.2.1.2.1
	1.31.2.1.4.1;
next	1.31.2.2;

1.31.2.2
date	2012.11.17.11.36.13;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.31.2.1.2.2;

1.31.2.1.2.2
date	2012.11.17.08.36.13;	author svnexp;	state Exp;
branches;
next	;

1.31.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.31.2.1.4.2;

1.31.2.1.4.2
date	2012.11.17.08.47.03;	author svnexp;	state Exp;
branches;
next	;

1.30.8.1
date	2012.11.17.07.39.19;	author svnexp;	state Exp;
branches;
next	;

1.30.18.1
date	2012.11.17.08.01.33;	author svnexp;	state Exp;
branches;
next	;

1.30.24.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.30.26.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.30.28.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.30.30.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.30.30.1.2.1
	1.30.30.1.4.1
	1.30.30.1.6.1
	1.30.30.1.8.1;
next	1.30.30.2;

1.30.30.2
date	2012.11.17.10.35.59;	author svnexp;	state Exp;
branches;
next	;

1.30.30.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.30.30.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.30.30.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.30.30.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.30.30.1.8.2;

1.30.30.1.8.2
date	2012.11.17.08.24.40;	author svnexp;	state Exp;
branches;
next	;

1.30.32.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.30.34.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.30.34.2;

1.30.34.2
date	2012.11.17.08.16.39;	author svnexp;	state Exp;
branches;
next	;

1.23.2.1
date	2012.11.17.07.23.03;	author svnexp;	state Exp;
branches;
next	;

1.14.2.1
date	99.05.10.22.28.15;	author dt;	state Exp;
branches;
next	1.14.2.2;

1.14.2.2
date	99.08.29.14.33.07;	author peter;	state Exp;
branches;
next	1.14.2.3;

1.14.2.3
date	99.12.31.09.55.49;	author ru;	state Exp;
branches;
next	;

1.8.4.1
date	96.05.29.22.34.06;	author jkh;	state Exp;
branches;
next	1.8.4.2;

1.8.4.2
date	96.06.05.02.40.02;	author jkh;	state Exp;
branches;
next	;

1.6.2.1
date	93.07.15.07.30.47;	author rgrimes;	state Exp;
branches;
next	;

1.1.1.1
date	93.06.29.06.04.44;	author nate;	state Exp;
branches;
next	;


desc
@@


1.35
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251468
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/gnu/usr.bin/grep/Makefile 251468 2013-06-06 11:59:38Z jkim $

.include <bsd.own.mk>

GREP_LIBZ=YES

.if ${MK_BSD_GREP} != "yes"
PROG=	grep
.else
PROG=	gnugrep
.endif
SRCS=	closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
	xstrtoumax.c

CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H

.if ${MK_BSD_GREP} != "yes"
LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
	${BINDIR}/grep ${BINDIR}/fgrep
MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
.endif

DPADD=	${LIBGNUREGEX} ${LIBBZ2}
LDADD=	-lgnuregex -lbz2

.if ${MK_BSD_GREP} != "yes"
LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
	${BINDIR}/grep ${BINDIR}/bzegrep \
	${BINDIR}/grep ${BINDIR}/bzfgrep
MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1
.endif

.if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
LDADD+=	-lz
DPADD+=	${LIBZ}
CFLAGS+=-DHAVE_LIBZ=1
.if ${MK_BSD_GREP} != "yes"
LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \
	${BINDIR}/grep ${BINDIR}/zegrep \
	${BINDIR}/grep ${BINDIR}/zfgrep
MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
.endif
.endif

gnugrep.1: grep.1
	cp ${.ALLSRC} ${.TARGET}

SUBDIR+=doc

check:	all
	@@failed=0; total=0; \
	for tst in ${TESTS}; do \
		total=$$(($$total+1)); \
		if GREP=${.OBJDIR}/${PROG} srcdir=${.CURDIR}/tests \
		   ${.CURDIR}/tests/$$tst; then \
			echo "PASS: $$tst"; \
		else \
			failed=$$(($$failed+1)); \
			echo "FAIL: $$tst"; \
		fi; \
	done; \
	if [ "$$failed" -eq 0 ]; then \
		echo "All $$total tests passed"; \
	else \
		echo "$$failed of $$total tests failed"; \
	fi

TESTS=	warning.sh khadafy.sh spencer1.sh bre.sh ere.sh status.sh empty.sh \
	options.sh backref.sh file.sh

.include <bsd.prog.mk>
@


1.34
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251438
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/usr.bin/grep/Makefile 251438 2013-06-05 21:31:06Z jkim $
d16 1
a16 2
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../contrib/libgnuregex
CFLAGS+=-DHAVE_CONFIG_H -D__USE_GNU
@


1.33
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250861
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/usr.bin/grep/Makefile 250861 2013-05-21 17:30:27Z marcel $
d16 2
a17 1
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../lib/libregex -DHAVE_CONFIG_H
@


1.32
log
@Switching exporter and resync
@
text
@d1 1
a1 1
# $FreeBSD: head/gnu/usr.bin/grep/Makefile 222273 2011-05-25 01:04:12Z obrien $
d16 1
a16 1
CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H
@


1.32.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:50 +0000
@
text
@d1 72
@


1.32.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 57
# $FreeBSD: releng/8.4/gnu/usr.bin/grep/Makefile 131558 2004-07-04 10:05:37Z tjr $

GREP_LIBZ=YES

PROG=	grep
SRCS=	closeout.c dfa.c error.c exclude.c grep.c grepmat.c hard-locale.c \
	isdir.c kwset.c obstack.c quotearg.c savedir.c search.c xmalloc.c \
	xstrtoumax.c

CFLAGS+=-I${.CURDIR} -I${DESTDIR}/usr/include/gnu -DHAVE_CONFIG_H

LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
	${BINDIR}/grep ${BINDIR}/fgrep
MLINKS=	grep.1 egrep.1 grep.1 fgrep.1

DPADD=	${LIBGNUREGEX} ${LIBBZ2}
LDADD=	-lgnuregex -lbz2

LINKS+=	${BINDIR}/grep ${BINDIR}/bzgrep \
	${BINDIR}/grep ${BINDIR}/bzegrep \
	${BINDIR}/grep ${BINDIR}/bzfgrep
MLINKS+=grep.1 bzgrep.1 grep.1 bzegrep.1 grep.1 bzfgrep.1

.if defined(GREP_LIBZ) && !empty(GREP_LIBZ)
LDADD+=	-lz
DPADD+=	${LIBZ}
CFLAGS+=-DHAVE_LIBZ=1
LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \
	${BINDIR}/grep ${BINDIR}/zegrep \
	${BINDIR}/grep ${BINDIR}/zfgrep
MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
.endif

SUBDIR+=doc

check:	all
	@@failed=0; total=0; \
	for tst in ${TESTS}; do \
		total=$$(($$total+1)); \
		if GREP=${.OBJDIR}/${PROG} srcdir=${.CURDIR}/tests \
		   ${.CURDIR}/tests/$$tst; then \
			echo "PASS: $$tst"; \
		else \
			failed=$$(($$failed+1)); \
			echo "FAIL: $$tst"; \
		fi; \
	done; \
	if [ "$$failed" -eq 0 ]; then \
		echo "All $$total tests passed"; \
	else \
		echo "$$failed of $$total tests failed"; \
	fi

TESTS=	warning.sh khadafy.sh spencer1.sh bre.sh ere.sh status.sh empty.sh \
	options.sh backref.sh file.sh

.include <bsd.prog.mk>
@


1.31
log
@SVN rev 222273 on 2011-05-25 01:04:12Z by obrien

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
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.31.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.31.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/gnu/usr.bin/grep/Makefile 222273 2011-05-25 01:04:12Z obrien $
@


1.31.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.31.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/gnu/usr.bin/grep/Makefile 222273 2011-05-25 01:04:12Z obrien $
@


1.31.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.31.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/gnu/usr.bin/grep/Makefile 222273 2011-05-25 01:04:12Z obrien $
@


1.30
log
@Update for grep 2.5.1.
@
text
@d3 2
d7 1
d9 3
d18 1
d22 1
d27 1
d32 1
d38 1
d44 4
@


1.30.18.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/gnu/usr.bin/grep/Makefile 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.30.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/gnu/usr.bin/grep/Makefile 147906 2005-07-11 04:14:43Z cvs2svn $
@


1.30.34.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.30.34.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/gnu/usr.bin/grep/Makefile 172506 2007-10-10 16:59:15Z cvs2svn $
@


1.30.32.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.30.30.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.30.30.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/gnu/usr.bin/grep/Makefile 131558 2004-07-04 10:05:37Z tjr $
@


1.30.30.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.30.30.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/gnu/usr.bin/grep/Makefile 131558 2004-07-04 10:05:37Z tjr $
@


1.30.30.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.30.30.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.30.30.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.30.28.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.30.26.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.30.24.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.29
log
@Merge conflicts, upgrade
@
text
@d6 3
a8 1
SRCS=	dfa.c grep.c grepmat.c kwset.c obstack.c savedir.c search.c
d55 1
a55 1
	options.sh
@


1.28
log
@Oops, use -I${DESTDIR}/usr/include/gnu instead of ... /../../include/gnu
@
text
@d6 1
a6 1
SRCS=   dfa.c grep.c kwset.c obstack.c savedir.c search.c
@


1.27
log
@1) Remove files no longer needed.
2) Switch back to regex.h
@
text
@d8 1
a8 1
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../../../include/gnu -DHAVE_CONFIG_H
@


1.26
log
@Fixed style of DPADD and LDADD assignments as per style.Makefile(5).
@
text
@d6 1
a6 1
SRCS=	dfa.c getopt.c getopt1.c grep.c kwset.c obstack.c savedir.c search.c
d8 1
a8 1
CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H
@


1.25
log
@We HAVE_STPCPY now.
@
text
@d14 2
a15 4
DPADD+=	${LIBGNUREGEX}
DPADD+=	${LIBBZ2}
LDADD+=	-lgnuregex
LDADD+=	-lbz2
@


1.24
log
@Create bzgrep.
@
text
@d6 1
a6 2
SRCS=	dfa.c getopt.c getopt1.c grep.c kwset.c obstack.c savedir.c search.c \
	stpcpy.c
@


1.23
log
@Back out previous revision because someone upgraded our
texinfo system to one that understands "command{foo}".
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.22 2000/01/04 03:27:32 obrien Exp $
d16 1
d18 6
@


1.23.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/gnu/usr.bin/grep/Makefile 57955 2000-03-13 04:59:44Z cvs2svn $
@


1.22
log
@Turn off GNU Info docs until someone upgrades our texinfo system to one
that understands "command{foo}".
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.21 1999/11/22 09:48:04 obrien Exp $
d28 1
a28 3
# XXX: cannot build docs until our texinfo system is updated to understand
#      "command{foo}".
# SUBDIR+=doc
@


1.21
log
@Make the tests work again.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.20 1999/11/22 09:13:43 obrien Exp $
d28 3
a30 1
SUBDIR+=doc
@


1.20
log
@Finish proper hookup of GNU Grep 2.3, including docs & config header file,
rather than the compile commandline from hell.

Submitted by:	ru
@
text
@d1 1
a1 1
# $FreeBSD$
d34 2
a35 2
		if GREP=${.OBJDIR}/${PROG} srcdir=${GREPDIR}/tests \
		   ${GREPDIR}/tests/$$tst; then \
@


1.19
log
@Apply a bandaid to the grep Makefile to try and get it to compile and stop
breaking world.
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.18 1999/11/20 09:40:03 peter Exp $
d3 1
a3 4
MAINTAINER= wosch

GREP_LIBZ= YES
GREP_FTS=  YES
d6 1
a6 1
SRCS=	dfa.c grep.c getopt.c getopt1.c kwset.c obstack.c savedir.c search.c \
a7 3
CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \
	-DHAVE_GETPAGESIZE=1 -DHAVE_MEMCHR=1 -DHAVE_STRERROR=1 \
	-DHAVE_VALLOC=1 -DHAVE_WORKING_MMAP=1 -DVERSION=\"2.3\" -DHAVE_DIRENT_H
d9 3
a11 1
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
d13 1
a13 1
MLINKS= grep.1 egrep.1 grep.1 fgrep.1
d15 2
a16 2
DPADD+= ${LIBGNUREGEX}
LDADD+= -lgnuregex
d19 4
a22 4
LDADD+= -lz
DPADD+= ${LIBZ}
CFLAGS+= -DHAVE_LIBZ=1
LINKS+= ${BINDIR}/grep ${BINDIR}/zgrep \
d24 2
a25 5
	${BINDIR}/grep ${BINDIR}/zfgrep 
MLINKS+= grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
.endif
.if defined(GREP_FTS) && !empty(GREP_FTS)
CFLAGS+= -DHAVE_FTS=1
d27 2
d31 19
a49 1
	sh ${.CURDIR}/tests/check.sh ${.CURDIR}/tests
@


1.18
log
@Back out the botched attempt to update to gnu grep 2.3 (lots of history
was lost).  Restore original version to try and avoid breaking the build
while David O'brien does a proper set of imports and merges.

Requested by:	obrien
@
text
@d1 1
a1 1
# $FreeBSD: src/gnu/usr.bin/grep/Makefile,v 1.17 1999/10/28 10:34:16 ru Exp $
d9 2
a10 1
SRCS=   dfa.c grep.c getopt.c kwset.c obstack.c search.c
d13 1
a13 1
	-DHAVE_VALLOC=1 -DHAVE_WORKING_MMAP=1
@


1.17
log
@Upgrade grep to version 2.3
@
text
@d1 1
a1 1
# $FreeBSD$
d3 1
a3 1
GREP_LIBZ=YES
d5 2
a6 3
GREPDIR=${.CURDIR}/../../../contrib/grep

.PATH:	${GREPDIR}/src ${GREPDIR}/doc
d9 4
a12 3
SRCS=	dfa.c getopt.c getopt1.c grep.c kwset.c obstack.c \
	savedir.c search.c stpcpy.c
CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H
d24 1
a24 1
CFLAGS+=-DHAVE_LIBZ=1
d27 5
a31 2
	${BINDIR}/grep ${BINDIR}/zfgrep
MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
a33 2
SUBDIR+=doc

d35 1
a35 19
	@@failed=0; total=0; \
	for tst in ${TESTS}; do \
		total=$$(($$total+1)); \
		if GREP=${.OBJDIR}/${PROG} srcdir=${GREPDIR}/tests \
		   ${GREPDIR}/tests/$$tst; then \
			echo "PASS: $$tst"; \
		else \
			failed=$$(($$failed+1)); \
			echo "FAIL: $$tst"; \
		fi; \
	done; \
	if [ "$$failed" -eq 0 ]; then \
		echo "All $$total tests passed"; \
	else \
		echo "$$failed of $$total tests failed"; \
	fi

TESTS=	warning.sh khadafy.sh spencer1.sh bre.sh ere.sh \
	status.sh empty.sh options.sh
@


1.16
log
@$Id$ -> $FreeBSD$
@
text
@d3 1
a3 1
MAINTAINER= wosch
d5 3
a7 2
GREP_LIBZ= YES
GREP_FTS=  YES
d10 3
a12 4
SRCS=   dfa.c grep.c getopt.c kwset.c obstack.c search.c
CFLAGS+=-DGREP -DHAVE_STRING_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_UNISTD_H=1 \
	-DHAVE_GETPAGESIZE=1 -DHAVE_MEMCHR=1 -DHAVE_STRERROR=1 \
	-DHAVE_VALLOC=1 -DHAVE_WORKING_MMAP=1
d24 1
a24 1
CFLAGS+= -DHAVE_LIBZ=1
d27 2
a28 5
	${BINDIR}/grep ${BINDIR}/zfgrep 
MLINKS+= grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
.endif
.if defined(GREP_FTS) && !empty(GREP_FTS)
CFLAGS+= -DHAVE_FTS=1
d30 2
d34 19
a52 1
	sh ${.CURDIR}/tests/check.sh ${.CURDIR}/tests
@


1.15
log
@Added myself as maintainer.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.14 1998/11/14 23:37:32 wosch Exp $
@


1.14
log
@Use mmap for reading files. This is faster than read().
@
text
@d1 3
a3 1
#	$Id: Makefile,v 1.13 1998/10/02 07:14:32 obrien Exp $
@


1.14.2.1
log
@Revert previous commit, since it caused problems.

OKed by:	wosch
@
text
@d10 1
a10 1
	-DHAVE_VALLOC=1
@


1.14.2.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.14.2.3
log
@MFC: Update to GNU grep 2.3
@
text
@d3 2
a4 1
GREP_LIBZ=YES
d7 4
a10 2
SRCS=	dfa.c getopt.c getopt1.c grep.c kwset.c obstack.c savedir.c search.c \
	stpcpy.c
d12 1
a12 3
CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H

LINKS+=	${BINDIR}/grep ${BINDIR}/egrep \
d14 1
a14 1
MLINKS=	grep.1 egrep.1 grep.1 fgrep.1
d16 2
a17 2
DPADD+=	${LIBGNUREGEX}
LDADD+=	-lgnuregex
d20 4
a23 4
LDADD+=	-lz
DPADD+=	${LIBZ}
CFLAGS+=-DHAVE_LIBZ=1
LINKS+=	${BINDIR}/grep ${BINDIR}/zgrep \
d25 5
a29 2
	${BINDIR}/grep ${BINDIR}/zfgrep
MLINKS+=grep.1 zgrep.1 grep.1 zegrep.1 grep.1 zfgrep.1
a31 2
SUBDIR+=doc

d33 1
a33 19
	@@failed=0; total=0; \
	for tst in ${TESTS}; do \
		total=$$(($$total+1)); \
		if GREP=${.OBJDIR}/${PROG} srcdir=${.CURDIR}/tests \
		   ${.CURDIR}/tests/$$tst; then \
			echo "PASS: $$tst"; \
		else \
			failed=$$(($$failed+1)); \
			echo "FAIL: $$tst"; \
		fi; \
	done; \
	if [ "$$failed" -eq 0 ]; then \
		echo "All $$total tests passed"; \
	else \
		echo "$$failed of $$total tests failed"; \
	fi

TESTS=	warning.sh khadafy.sh spencer1.sh bre.sh ere.sh status.sh empty.sh \
	options.sh
@


1.13
log
@Install z*grep manpages
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.12 1998/03/07 16:13:57 wosch Exp $
d10 1
a10 1
	-DHAVE_VALLOC=1
@


1.12
log
@Delete cc(1) debug option, typo from last commit.

Pointed out by: Sren Schmidt
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.11 1997/12/21 19:15:02 wosch Exp $
d26 1
@


1.11
log
@When called as `zgrep', the -Z argument is assumed. Make a
link from zgrep to grep.

Pointed out by: Tim Vanderhoek <hoek@@hwcn.org> and
                Mike Smith <mike@@smith.net.au>
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.10 1997/12/20 18:46:06 wosch Exp $
a2 1
CFLAGS=-g
@


1.10
log
@Added builtin decompression using zlib library, option -Z.

Enabled this new feature with the makefile variable GREP_LIBZ. If
you don't like it, compile with `make GREP_LIBZ='.

grep + zlib has several advantages:

- the shell script zgrep(1) will be basically a one line
  exec grep -Z "$@@"

- no shell script, no bugs. The current zgrep implementations
  have many bugs and some grep options are no supported.

- no shell script, no security risks.

- it is a magnitude faster than a shell script

Also fixed:
0 -> STDIN_FILENO
Close a file descriptor only if the open call was successfully. It does
not hurt for the open(2) function, but the gzclose(3) function
died in free() to free up (not) allocated memory.
@
text
@d1 1
a1 1
#	$Id$
d3 1
d24 3
@


1.9
log
@recursive grep, enabled with -DHAVE_FTS=1
enable mmap (-DHAVE_MMAP=1)
@
text
@d1 5
d10 1
a10 1
	-DHAVE_VALLOC=1 -DHAVE_MMAP=1 -DHAVE_FTS=1
d18 9
@


1.8
log
@Use -lgnuregex
Tune for 8bit ctype
@
text
@d5 1
a5 1
	-DHAVE_VALLOC=1
@


1.8.4.1
log
@Merge from HEAD, except:

	Clients that used gnumalloc still do, despite the merge.  We're not
	bringing phkmalloc over.

	Thread stuff left out.

	PCCARD support left out.
@
text
@d5 1
a5 1
	-DHAVE_VALLOC=1 -DHAVE_MMAP=1 -DHAVE_FTS=1
@


1.8.4.2
log
@This 3rd mega-commit should hopefully bring us back to where we were.
I can get it to `make world' succesfully, anyway!
@
text
@d5 1
a5 1
	-DHAVE_VALLOC=1
@


1.7
log
@Merge.  Fix LINKS+= with $DESTDIR$BINDIR in them, you do NOT need to
specify $DESTDIR on a LINKS+= line.
@
text
@d2 1
a2 1
SRCS=	dfa.c grep.c getopt.c kwset.c obstack.c regex.c search.c
d10 3
@


1.6
log
@Gnu grep 2.0 does fgrep too!
@
text
@d7 2
a8 2
LINKS+= ${DESTDIR}${BINDIR}/grep ${DESTDIR}${BINDIR}/egrep \
	${DESTDIR}${BINDIR}/grep ${DESTDIR}${BINDIR}/fgrep
@


1.6.2.1
log
@Removed ${DESTDIR} from MLINKS, since ${BINDIR} already takes care of
the DESTDIR item.
@
text
@d7 2
a8 2
LINKS+= ${BINDIR}/grep ${BINDIR}/egrep \
	${BINDIR}/grep ${BINDIR}/fgrep
@


1.5
log
@Removed egrep since the new grep is just a link to it w/out any changes
anymore
@
text
@a5 2
MLINKS= grep.1 egrep.1 
LINKS+= ${DESTDIR}${BINDIR}/grep ${DESTDIR}${BINDIR}/egrep
d7 3
d11 2
a12 2
check: all
	awk sh ${.CURDIR}/tests/check.sh ${.CURDIR}/tests
@


1.4
log
@Left an ugly in the Makefile
@
text
@a2 1

d6 2
@


1.3
log
@Update GNU grep to version 2.0
@
text
@a8 1
#check: ${.CURDIR}/grep
@


1.2
log
@Ugh, whoever did the port made a mess, I cleaned up the Makefile and
deleted un-necessary stuff
@
text
@d1 6
d8 4
a11 4
PROG=	grep
SRCS=	dfa.c regex.c grep.c
CFLAGS+=-DSTDC_HEADERS=1 -DHAVE_UNISTD_H=1
MLINKS= grep.1 egrep.1
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
SRCS=	dfa.c regex.o grep.o
@


1.1.1.1
log
@Gnu e?grep 1.6
@
text
@@
