Update glimpse to 4.1, provided in pr 6508 by Johnny C. Lam.

Fixes some bugs, including a serious bug involving Boolean searches
of length 1 between versions 4.0 and 4.1.

5 files changed, 36 insertions, 46 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 32fbc656cda..84a3b656b1e 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.6 1998/08/20 15:17:28 tsarna Exp $
+# $NetBSD: Makefile,v 1.7 1998/12/03 12:39:42 frueauf Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
 #
 
-DISTNAME=       glimpse-4.0.src
-PKGNAME=	glimpse-4.0
+DISTNAME=       glimpse-4.1.src
+PKGNAME=	glimpse-4.1
+WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	textproc databases
 MASTER_SITES=   ftp://ftp.cs.arizona.edu/glimpse/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://glimpse.cs.arizona.edu/
@@ -17,6 +17,10 @@ GNU_CONFIGURE=	yes
 pre-configure:
 	chmod ugo+x ${WRKSRC}/configure
 
+post-configure:
+	${CP} -f ${FILESDIR}/autoconf.h \
+		 ${WRKSRC}/libtemplate/include/autoconf.h
+
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/glimpse
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/glimpse
diff --git a/textproc/glimpse/files/autoconf.h b/textproc/glimpse/files/autoconf.h
new file mode 100644
index 00000000000..16ab70f681a
--- /dev/null
+++ b/textproc/glimpse/files/autoconf.h
@@ -0,0 +1,14 @@
+/*	$NetBSD: autoconf.h,v 1.1 1998/12/03 12:39:43 frueauf Exp $	*/
+
+/*
+ * preprocessor variables used during build of glimpse-4.1
+ */
+
+#define HAVE_DIRENT_H 1
+#define HAVE_FLOCK 1
+#define HAVE_GETDTABLESIZE 1
+#define HAVE_SETLINEBUF 1
+#define HAVE_SETRLIMIT 1
+#define HAVE_STRDUP 1
+#define HAVE_STRERROR 1
+#define HAVE_SYSCONF 1
diff --git a/textproc/glimpse/files/md5 b/textproc/glimpse/files/md5
index 519c89b5b8f..be89eb8b023 100644
--- a/textproc/glimpse/files/md5
+++ b/textproc/glimpse/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:39 agc Exp $
+$NetBSD: md5,v 1.3 1998/12/03 12:39:43 frueauf Exp $
 
-MD5 (glimpse-4.0.src.tar.Z) = db877e3932760e26bad775af4c12fa27
+MD5 (glimpse-4.1.src.tar.gz) = 6c5c4f3e0011b366c5feaa2e8d1d3b28
diff --git a/textproc/glimpse/patches/patch-aa b/textproc/glimpse/patches/patch-aa
index c6af0fcb8b5..631eed0210c 100644
--- a/textproc/glimpse/patches/patch-aa
+++ b/textproc/glimpse/patches/patch-aa
@@ -1,14 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:14:12 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/12/03 12:39:45 frueauf Exp $
 
-*** agrep/agrep.c.orig	Thu Aug 22 07:51:14 1996
---- agrep/agrep.c	Thu Aug 22 07:51:27 1996
-***************
-*** 3,8 ****
---- 3,9 ----
-   * bgopal: (1993-4) added a library interface and removed some bugs: also
-   * selectively modified many routines to work with our text-compression algo.
-   */
-+ #include <sys/types.h>
-  #include <sys/stat.h>
-  #include "agrep.h"
-  #include "checkfile.h"
+--- main.c.orig	Mon Apr 28 00:14:04 1997
++++ main.c	Sun Nov 29 03:34:48 1998
+@@ -1059,7 +1059,7 @@
+ 		clargc = 0;
+ 		clargv = NULL;
+ 		cli_len = sizeof(cli_addr);
+-		if ((newsockfd = accept(sockfd, &cli_addr, &cli_len)) < 0) continue;
++		if ((newsockfd = accept(sockfd, (struct sockaddr *)&cli_addr, &cli_len)) < 0) continue;
+ 		if (getreq(newsockfd, glimpse_reqbuf, &clstdin, &clstdout, &clstderr, &clargc, &clargv, &clpid) < 0) {
+ 			ret = -1;
+ #if	DEBUG
diff --git a/textproc/glimpse/patches/patch-ab b/textproc/glimpse/patches/patch-ab
deleted file mode 100644
index 0f9110324b7..00000000000
--- a/textproc/glimpse/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:14:12 agc Exp $
-
-*** libtemplate/include/autoconf.h.in.orig	Thu Aug 22 07:51:39 1996
---- libtemplate/include/autoconf.h.in	Thu Aug 22 07:51:57 1996
-***************
-*** 156,165 ****
-  #undef HAVE_SRANDOM
-  
-  /* Define if you have strdup.  */
-! #undef HAVE_STRDUP
-  
-  /* Define if you have strerror.  */
-! #undef HAVE_STRERROR
-  
-  /* Define if you have sysconf.  */
-  #undef HAVE_SYSCONF
---- 156,165 ----
-  #undef HAVE_SRANDOM
-  
-  /* Define if you have strdup.  */
-! #define HAVE_STRDUP 1
-  
-  /* Define if you have strerror.  */
-! #define HAVE_STRERROR 1
-  
-  /* Define if you have sysconf.  */
-  #undef HAVE_SYSCONF