Update port to 3.6 level, with help from James Fitzgibbons.

4 files changed, 42 insertions, 34 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index d11f27af9960..50f1d8c7da8a 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,33 +1,32 @@
 # New ports collection makefile for:	glimpse
-# Version required:     3.5
-# Date created:         22 Dec 1995
-# Whom:                 chuckr@glue.umd.edu
+# Version required:	3.6
+# Date created:		25 August 1996
+# Whom:			chuckr@freebsd.org
 #
-# $Id: Makefile,v 1.3 1996/05/20 06:55:44 asami Exp $
+# $Id: Makefile,v 1.4 1996/05/20 08:17:37 asami Exp $
 #
 
-DISTNAME=       glimpse-3.5.src
-PKGNAME=	glimpse-3.5
+DISTNAME=       glimpse-3.6.src
+PKGNAME=	glimpse-3.6
 CATEGORIES+=	misc
 MASTER_SITES=   ftp://ftp.cs.arizona.edu/glimpse/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	chuckr@glue.umd.edu
+MAINTAINER=	chuckr@freebsd.org
 
 NO_CDROM=	yes	# Restrictive copyright (don't sell for profit)
 GNU_CONFIGURE=	yes
 
 pre-configure:
 	chmod ugo+x ${WRKSRC}/configure
-	chmod ugo+x ${WRKSRC}/mkinstalldirs
 
 post-install:
 	mkdir -p ${PREFIX}/share/doc/glimpse
-	cp ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/glimpse
-	cp ${WRKSRC}/README ${PREFIX}/share/doc/glimpse
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/glimpse
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glimpse
 .if !defined(NOMANCOMPRESS)
 	for file in glimpse glimpseindex glimpseserver agrep; do \
-	  gzip -9nf ${PREFIX}/man/man1/$$file.1; \
+	gzip -9nf ${PREFIX}/man/man1/$$file.1; \
 	done
 .endif
 
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index e646f2f4ca41..d74293e848ff 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1 +1 @@
-MD5 (glimpse-3.5.src.tar.Z) = 35927f7bf996fceb47d32db25c81804d
+MD5 (glimpse-3.6.src.tar.Z) = 00db2cad791271544e64f627c77c4818
diff --git a/textproc/glimpse/files/patch-aa b/textproc/glimpse/files/patch-aa
index 50abe3931a95..9b2b4bc7b14d 100644
--- a/textproc/glimpse/files/patch-aa
+++ b/textproc/glimpse/files/patch-aa
@@ -1,12 +1,19 @@
-diff -ur libtemplate/util/strerror.c libtemplate/util/strerror.c
---- libtemplate/util/strerror.c	Tue Oct 10 19:16:19 1995
-+++ libtemplate/util/strerror.c	Thu Dec 21 10:49:13 1995
-@@ -60,7 +60,7 @@
- int n;
- {
- 	extern int sys_nerr;
--	extern char *sys_errlist[];
-+	extern __const char *__const sys_errlist[];
- 
- 	if (n < 0 || n >= sys_nerr)
- 		return (NULL);
+*** Makefile.in.orig	Thu Aug 22 08:07:39 1996
+--- Makefile.in	Thu Aug 22 08:07:47 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) $<
diff --git a/textproc/glimpse/files/patch-ab b/textproc/glimpse/files/patch-ab
index f2f4e1d8dd9a..75353d6e210d 100644
--- a/textproc/glimpse/files/patch-ab
+++ b/textproc/glimpse/files/patch-ab
@@ -1,10 +1,12 @@
---- agrep/agrep.c.orig	Mon May 20 14:05:35 1996
-+++ agrep/agrep.c	Mon May 20 14:06:00 1996
-@@ -3,6 +3,7 @@
-  * 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"
+*** 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"