head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.22
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.20
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.18
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.16
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.14
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.12
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.10
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.8
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.6
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.4
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.2
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.3.0.16
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.14
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.12
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.10
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.8
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.6
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.4
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.2
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.1.1.1.0.16
	pkgsrc-2005Q3-base:1.1.1.1
	pkgsrc-2005Q2:1.1.1.1.0.14
	pkgsrc-2005Q2-base:1.1.1.1
	pkgsrc-2005Q1:1.1.1.1.0.12
	pkgsrc-2005Q1-base:1.1.1.1
	pkgsrc-2004Q4:1.1.1.1.0.10
	pkgsrc-2004Q4-base:1.1.1.1
	pkgsrc-2004Q3:1.1.1.1.0.8
	pkgsrc-2004Q3-base:1.1.1.1
	pkgsrc-2004Q2:1.1.1.1.0.6
	pkgsrc-2004Q2-base:1.1.1.1
	pkgsrc-2004Q1:1.1.1.1.0.4
	pkgsrc-2004Q1-base:1.1.1.1
	pkgsrc-2003Q4:1.1.1.1.0.2
	pkgsrc-2003Q4-base:1.1.1.1
	pkgsrc-devel:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2007.12.06.21.43.21;	author cjep;	state dead;
branches;
next	1.3;

1.3
date	2005.12.18.14.27.01;	author joerg;	state Exp;
branches;
next	1.2;

1.2
date	2005.12.08.17.24.32;	author joerg;	state Exp;
branches;
next	1.1;

1.1
date	2003.08.31.09.37.51;	author cjep;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.08.31.09.37.51;	author cjep;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update to 20071201.
* Sync with src/usr.bin/grep
@
text
@$NetBSD: patch-ac,v 1.3 2005/12/18 14:27:01 joerg Exp $

--- grep.c.orig	2004-05-05 14:34:55.000000000 +0000
+++ grep.c
@@@@ -37,6 +37,7 @@@@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+#include <zlib.h>
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
@@@@ -111,7 +112,7 @@@@ int binbehave = BIN_FILE_BIN;
 int dirbehave = GREP_READ;
 int devbehave = GREP_READ;
 /*int linkbehave = LINK_FOLLOW;*/
-char *stdin_label;
+const char *stdin_label;
 
 enum {
 	BIN_OPT = CHAR_MAX + 1,
@@@@ -137,7 +138,7 @@@@ usage(void)
 	exit(2);
 }
 
-static char *optstr = "0123456789A:B:C:D:EFGHILUVZabcd:e:f:hilm:noqrsuvwxyz";
+static const char optstr[] = "0123456789A:B:C:D:EFGHILUVZabcd:e:f:hilm:noqrsuvwxyz";
 
 struct option long_options[] =
 {
@


1.3
log
@Remove CVS ids in context, otherwise the patch checksum is incomplete.
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.2 2005/12/08 17:24:32 joerg Exp $
@


1.2
log
@Since this is compiled with -Werror and GCC 3.4 doesn't like
the string const cast-away, pass down the constness.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
@@@@ -37,6 +37,7 @@@@ __RCSID("$NetBSD: grep.c,v 1.2 2004/05/0
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD: patch-ac,v 1.1 2003/08/27 18:32:48 jmc Exp $
d3 3
a5 3
--- grep.c.orig	Wed Aug 27 13:00:48 2003
+++ grep.c	Wed Aug 27 13:01:03 2003
@@@@ -37,6 +37,7 @@@@
d13 18
@


1.1.1.1
log
@After discussion with grant, reimport bgrep as bsdgrep-devel.
@
text
@@