From 2f1b352d4cee9be6b3b7479234e9aa3ebd0abc54 Mon Sep 17 00:00:00 2001
From: Chuck Robey <chuckr@FreeBSD.org>
Date: Sat, 11 Jan 1997 05:30:28 +0000
Subject: [PATCH] Upgrade glimpse port to version 4.0. Submitted by:	Bakul
 Shah <bakul@plexuscom.com>

---
 textproc/glimpse/Makefile       |  6 +++---
 textproc/glimpse/distinfo       |  2 +-
 textproc/glimpse/files/patch-aa | 29 +++++++++++----------------
 textproc/glimpse/files/patch-ab | 35 ++++++++++++++++++++++-----------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index eb4117b22f81..49eaac762999 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -3,11 +3,11 @@
 # Date created:		25 August 1996
 # Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.7 1996/11/17 09:05:49 obrien Exp $
+# $Id: Makefile,v 1.8 1996/12/07 09:28:44 max Exp $
 #
 
-DISTNAME=       glimpse-3.6.src
-PKGNAME=	glimpse-3.6
+DISTNAME=       glimpse-4.0.src
+PKGNAME=	glimpse-4.0
 CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.cs.arizona.edu/glimpse/
 EXTRACT_SUFX=	.tar.Z
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index d74293e848ff..68b1bb958165 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1 +1 @@
-MD5 (glimpse-3.6.src.tar.Z) = 00db2cad791271544e64f627c77c4818
+MD5 (glimpse-4.0.src.tar.Z) = db877e3932760e26bad775af4c12fa27
diff --git a/textproc/glimpse/files/patch-aa b/textproc/glimpse/files/patch-aa
index 9b2b4bc7b14d..75353d6e210d 100644
--- a/textproc/glimpse/files/patch-aa
+++ b/textproc/glimpse/files/patch-aa
@@ -1,19 +1,12 @@
-*** Makefile.in.orig	Thu Aug 22 08:07:39 1996
---- Makefile.in	Thu Aug 22 08:07:47 1996
+*** agrep/agrep.c.orig	Thu Aug 22 07:51:14 1996
+--- agrep/agrep.c	Thu Aug 22 07:51:27 1996
 ***************
-*** 34,40 ****
-  
-  CFLAGS		= @CFLAGS@ -O -DSTRUCTURED_QUERIES=1
-  ALL_CFLAGS      = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
-! LINKFLAGS	= @LINKFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
-  
-  .c.o:
-  		$(CC) -c $(ALL_CFLAGS) $<
---- 34,40 ----
-  
-  CFLAGS		= @CFLAGS@ -O -DSTRUCTURED_QUERIES=1
-  ALL_CFLAGS      = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
-! LINKFLAGS	= -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
-  
-  .c.o:
-  		$(CC) -c $(ALL_CFLAGS) $<
+*** 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"
diff --git a/textproc/glimpse/files/patch-ab b/textproc/glimpse/files/patch-ab
index 75353d6e210d..5738b75594bf 100644
--- a/textproc/glimpse/files/patch-ab
+++ b/textproc/glimpse/files/patch-ab
@@ -1,12 +1,25 @@
-*** agrep/agrep.c.orig	Thu Aug 22 07:51:14 1996
---- agrep/agrep.c	Thu Aug 22 07:51:27 1996
+*** 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
 ***************
-*** 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"
+*** 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