Various fixes:

  - Use nbcompat correctly.
  - Support newer zlib API.
  - Handle catpages correctly.

Fixes build on SunOS at least.

11 files changed, 171 insertions, 11 deletions

diff --git a/textproc/bsdgrep-devel/Makefile b/textproc/bsdgrep-devel/Makefile
index 7790dbb905b..d2af248dc4c 100644
--- a/textproc/bsdgrep-devel/Makefile
+++ b/textproc/bsdgrep-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2012/10/25 06:55:43 asau Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/09 10:56:53 jperkin Exp $
 #
 
 DISTNAME=	bsdgrep-20071201
@@ -13,9 +13,12 @@ LICENSE=	original-bsd
 
 USE_FEATURES+=		cdefs fts_open
 USE_BSD_MAKEFILE=	yes
+USE_TOOLS+=		nroff
 BUILDLINK_TRANSFORM+=	rm:-Werror
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+MAKE_ENV+=	LIBS=${LIBS:Q}
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 post-patch:
 	${SED} -e 's|grep|bgrep|g' ${WRKSRC}/grep.1 > ${WRKSRC}/bgrep.1
diff --git a/textproc/bsdgrep-devel/PLIST b/textproc/bsdgrep-devel/PLIST
index a5e3c2aaeef..3a6f24fb6ff 100644
--- a/textproc/bsdgrep-devel/PLIST
+++ b/textproc/bsdgrep-devel/PLIST
@@ -1,10 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/03 21:42:53 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/07/09 10:56:54 jperkin Exp $
 bin/bgrep
 bin/ebgrep
 bin/fbgrep
 bin/zbgrep
 bin/zebgrep
 bin/zfbgrep
+man/cat1/bgrep.0
+man/cat1/ebgrep.0
+man/cat1/fbgrep.0
+man/cat1/zbgrep.0
+man/cat1/zebgrep.0
+man/cat1/zfbgrep.0
 man/man1/bgrep.1
 man/man1/ebgrep.1
 man/man1/fbgrep.1
diff --git a/textproc/bsdgrep-devel/distinfo b/textproc/bsdgrep-devel/distinfo
index bbceac79f1b..102b61229a4 100644
--- a/textproc/bsdgrep-devel/distinfo
+++ b/textproc/bsdgrep-devel/distinfo
@@ -1,6 +1,13 @@
-$NetBSD: distinfo,v 1.13 2011/09/29 20:46:59 wiz Exp $
+$NetBSD: distinfo,v 1.14 2015/07/09 10:56:54 jperkin Exp $
 
 SHA1 (bsdgrep-20071201.tar.gz) = ae5eabcaa6fbf1760023ee6f3d4a596fe1db9039
 RMD160 (bsdgrep-20071201.tar.gz) = 915ac4d8c6a44e56a6bf88454e7cc9ae5dc7f363
 Size (bsdgrep-20071201.tar.gz) = 13161 bytes
-SHA1 (patch-aa) = cd477be4588aed5c09b4fdd920d84fdc27119185
+SHA1 (patch-aa) = df62793f9b86cffc0c7c98efe5fe71b010e26d11
+SHA1 (patch-binary.c) = c762d925ccf2d4f03477a1e546eb7a5aacd54d39
+SHA1 (patch-file.c) = bfa823c4d47f1f3315a4533f4a56d62fa822daf3
+SHA1 (patch-grep.c) = 657a0780e76b9eb6d8b7257fbe81c3ff3f02423b
+SHA1 (patch-grep.h) = e06a5163da09bef733f84817bbd9516394150bc3
+SHA1 (patch-mmfile.c) = bec0d58484b0a1eb3229efaf288745bc65d518e7
+SHA1 (patch-queue.c) = 2398c2821f39c39388e16365a19fa2be652bb626
+SHA1 (patch-util.c) = c204e9ad9e8f3dc99e48626e03f66274de2e2919
diff --git a/textproc/bsdgrep-devel/patches/patch-aa b/textproc/bsdgrep-devel/patches/patch-aa
index fee1ebdbe7e..82c52cd8ee3 100644
--- a/textproc/bsdgrep-devel/patches/patch-aa
+++ b/textproc/bsdgrep-devel/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2011/09/29 20:46:59 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2015/07/09 10:56:54 jperkin Exp $
+
+Call it bgrep.  Pass pkgsrc variables.
 
 --- Makefile.orig	2006-05-15 21:12:21.000000000 +0000
-+++ Makefile	2007-12-08 23:52:46.000000000 +0000
-@@ -2,21 +1,26 @@
++++ Makefile
+@@ -2,18 +2,18 @@
  
 -PROG=	grep
 +PROG=	bgrep
@@ -31,13 +33,14 @@ $NetBSD: patch-aa,v 1.5 2011/09/29 20:46:59 wiz Exp $
 +	bgrep.1 zebgrep.1	\
 +	bgrep.1 zfbgrep.1
  
- LDADD=  -lz
+-LDADD=  -lz
++LDADD=	-lz ${LIBS}
  
- WARNS=	4
+@@ -21,2 +21,7 @@ WARNS=	4
  
 +PREFIX?=	/usr/local
 +MANDIR=		${PREFIX}/man
 +BINDIR=		${PREFIX}/bin
-+MKCATPAGES=	no
++MKCATPAGES?=	no
 +
  .include <bsd.prog.mk>
diff --git a/textproc/bsdgrep-devel/patches/patch-binary.c b/textproc/bsdgrep-devel/patches/patch-binary.c
new file mode 100644
index 00000000000..2a230a5eb98
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-binary.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-binary.c,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Use nbcompat headers.
+Update zlib API.
+
+--- binary.c.orig	2005-04-22 21:02:42.000000000 +0000
++++ binary.c
+@@ -29,3 +29,8 @@
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/cdefs.h>
++#else
+ #include <sys/cdefs.h>
++#endif
+ #ifndef lint
+@@ -69,3 +74,3 @@ bin_file(FILE *f)
+ int
+-gzbin_file(gzFile *f)
++gzbin_file(gzFile f)
+ {
diff --git a/textproc/bsdgrep-devel/patches/patch-file.c b/textproc/bsdgrep-devel/patches/patch-file.c
new file mode 100644
index 00000000000..823358fa5ce
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-file.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-file.c,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Use nbcompat headers.
+Update zlib API.
+
+--- file.c.orig	2007-12-06 20:33:48.000000000 +0000
++++ file.c
+@@ -29,3 +29,10 @@
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/stdio.h>
++#else
+ #include <sys/cdefs.h>
++#include <stdio.h>
++#endif
+ #ifndef lint
+@@ -38,3 +45,2 @@ __RCSID("$NetBSD: file.c,v 1.3 2007/12/0
+ #include <err.h>
+-#include <stdio.h>
+ #include <stdlib.h>
+@@ -55,3 +61,3 @@ struct file {
+ 	mmf_t *mmf;
+-	gzFile *gzf;
++	gzFile gzf;
+ };
+@@ -88,3 +94,3 @@ grepfgetln(FILE *f, size_t *len)
+ static char *
+-gzfgetln(gzFile *f, size_t *len)
++gzfgetln(gzFile f, size_t *len)
+ {
diff --git a/textproc/bsdgrep-devel/patches/patch-grep.c b/textproc/bsdgrep-devel/patches/patch-grep.c
new file mode 100644
index 00000000000..9b0df8ce758
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-grep.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-grep.c,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Use nbcompat headers.
+
+--- grep.c.orig	2006-05-15 21:12:21.000000000 +0000
++++ grep.c
+@@ -31,3 +31,8 @@
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/cdefs.h>
++#else
+ #include <sys/cdefs.h>
++#endif
+ #ifndef lint
diff --git a/textproc/bsdgrep-devel/patches/patch-grep.h b/textproc/bsdgrep-devel/patches/patch-grep.h
new file mode 100644
index 00000000000..749f0e1a75d
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-grep.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-grep.h,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Update zlib API.
+
+--- grep.h.orig	2007-12-06 05:37:06.000000000 +0000
++++ grep.h
+@@ -129,6 +129,6 @@ void grep_close(file_t *f);
+ 
+ /* binary.c */
+ int bin_file(FILE * f);
+-int gzbin_file(gzFile * f);
++int gzbin_file(gzFile f);
+ int mmbin_file(mmf_t *f);
+ 
diff --git a/textproc/bsdgrep-devel/patches/patch-mmfile.c b/textproc/bsdgrep-devel/patches/patch-mmfile.c
new file mode 100644
index 00000000000..44fbf832941
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-mmfile.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-mmfile.c,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Use nbcompat headers.
+
+--- mmfile.c.orig	2007-12-06 20:33:48.000000000 +0000
++++ mmfile.c
+@@ -29,3 +29,8 @@
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/cdefs.h>
++#else
+ #include <sys/cdefs.h>
++#endif
+ #ifndef lint
+@@ -46,2 +51,5 @@ __RCSID("$NetBSD: mmfile.c,v 1.4 2007/12
+ 
++#ifndef SIZE_T_MAX
++#define SIZE_T_MAX SIZE_MAX
++#endif
+ #define MAX_MAP_LEN (SIZE_T_MAX / 64)	/* ~70M is reasonable size */
diff --git a/textproc/bsdgrep-devel/patches/patch-queue.c b/textproc/bsdgrep-devel/patches/patch-queue.c
new file mode 100644
index 00000000000..828656f7a93
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-queue.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-queue.c,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Use nbcompat headers.
+
+--- queue.c.orig	2004-01-02 15:00:34.000000000 +0000
++++ queue.c
+@@ -29,3 +29,8 @@
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/cdefs.h>
++#else
+ #include <sys/cdefs.h>
++#endif
+ #ifndef lint
diff --git a/textproc/bsdgrep-devel/patches/patch-util.c b/textproc/bsdgrep-devel/patches/patch-util.c
new file mode 100644
index 00000000000..cc80e93c5cb
--- /dev/null
+++ b/textproc/bsdgrep-devel/patches/patch-util.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-util.c,v 1.1 2015/07/09 10:56:54 jperkin Exp $
+
+Use nbcompat headers.
+
+--- util.c.orig	2007-12-06 20:33:49.000000000 +0000
++++ util.c
+@@ -29,3 +29,8 @@
+ 
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat.h>
++#include <nbcompat/cdefs.h>
++#else
+ #include <sys/cdefs.h>
++#endif
+ #ifndef lint
+@@ -41,3 +46,7 @@ __RCSID("$NetBSD: util.c,v 1.5 2007/12/0
+ #include <errno.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/fts.h>
++#else
+ #include <fts.h>
++#endif
+ #include <regex.h>