On 1.6.1 zlib.h needs to be included before err.h to avoid shadow warnings.

6 files changed, 67 insertions, 2 deletions

diff --git a/textproc/bgrep/Makefile b/textproc/bgrep/Makefile
index e7bdcc01f25..d8ad8055a38 100644
--- a/textproc/bgrep/Makefile
+++ b/textproc/bgrep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/08/25 11:13:00 cjep Exp $
+# $NetBSD: Makefile,v 1.2 2003/08/27 18:32:46 jmc Exp $
 #
 
 DISTNAME=	bgrep-20030825
@@ -9,6 +9,7 @@ MAINTAINER=	cjep@netbsd.org
 HOMEPAGE=	# none
 COMMENT=	BSD version of grep as in NetBSD othersrc
 
+WRKSRC=		${WRKDIR}/nbgrep-20030825
 CONFLICTS+=		bsdgrep-*
 #ONLY_FOR_PLATFORM=	NetBSD-1.6*-*
 
diff --git a/textproc/bgrep/distinfo b/textproc/bgrep/distinfo
index 6a98512a928..df0475c325c 100644
--- a/textproc/bgrep/distinfo
+++ b/textproc/bgrep/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/08/25 11:13:00 cjep Exp $
+$NetBSD: distinfo,v 1.2 2003/08/27 18:32:47 jmc Exp $
 
 SHA1 (bgrep-20030825.tar.gz) = 847f81eb1530fb7372c91607270f5b77de661518
 Size (bgrep-20030825.tar.gz) = 12921 bytes
 SHA1 (patch-aa) = c147bb05387e01b6f7e0ec8a918b09e77da2103c
+SHA1 (patch-ab) = c7fa54dedb0925d342549cbc56197bf2d8e4e47b
+SHA1 (patch-ac) = e5b3d3a2bc069f123a7f568f72ded291f3ac49ea
+SHA1 (patch-ad) = 8080d6fa8f5faa40055ad1f067c1669d682956d2
+SHA1 (patch-ae) = 360972fb9c9a759cce1ad726ad14647b8b140a4e
diff --git a/textproc/bgrep/patches/patch-ab b/textproc/bgrep/patches/patch-ab
new file mode 100644
index 00000000000..280b6874e21
--- /dev/null
+++ b/textproc/bgrep/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.1 2003/08/27 18:32:48 jmc Exp $
+
+--- file.c.orig	Wed Aug 27 12:59:52 2003
++++ file.c	Wed Aug 27 13:00:09 2003
+@@ -34,10 +34,10 @@
+ 
+ #include <sys/param.h>
+ 
++#include <zlib.h>
+ #include <err.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <zlib.h>
+ 
+ #include "grep.h"
+ 
diff --git a/textproc/bgrep/patches/patch-ac b/textproc/bgrep/patches/patch-ac
new file mode 100644
index 00000000000..c40ca4662a2
--- /dev/null
+++ b/textproc/bgrep/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2003/08/27 18:32:48 jmc Exp $
+
+--- grep.c.orig	Wed Aug 27 13:00:48 2003
++++ grep.c	Wed Aug 27 13:01:03 2003
+@@ -37,6 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++#include <zlib.h>
+ #include <err.h>
+ #include <errno.h>
+ #include <getopt.h>
diff --git a/textproc/bgrep/patches/patch-ad b/textproc/bgrep/patches/patch-ad
new file mode 100644
index 00000000000..c6f49b1fdfc
--- /dev/null
+++ b/textproc/bgrep/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2003/08/27 18:32:48 jmc Exp $
+
+--- mmfile.c.orig	Wed Aug 27 13:01:21 2003
++++ mmfile.c	Wed Aug 27 13:01:42 2003
+@@ -36,6 +36,7 @@
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ 
++#include <zlib.h>
+ #include <err.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
diff --git a/textproc/bgrep/patches/patch-ae b/textproc/bgrep/patches/patch-ae
new file mode 100644
index 00000000000..8b7d0e29344
--- /dev/null
+++ b/textproc/bgrep/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2003/08/27 18:32:49 jmc Exp $
+
+--- util.c.orig	Wed Aug 27 13:01:54 2003
++++ util.c	Wed Aug 27 13:02:02 2003
+@@ -36,6 +36,7 @@
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
++#include <zlib.h>
+ #include <err.h>
+ #include <errno.h>
+ #include <fts.h>
+@@ -44,7 +45,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <zlib.h>
+ 
+ #include "grep.h"
+