Update to 4.18.0, provided by Jeroen Ruigrok van der Werven in PR 30424.

Includes a number of patches to fix build on DragonFlyBSD.

Changes since 4.17.2:
Glimpse 4.18.0 has new configure script generated by autoconf 2.57
- may fix compilation problems on FreeBSD

19 files changed, 259 insertions, 25 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 3b6c87445db..f1e35d2aecd 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/04 10:44:28 wiz Exp $
 
-DISTNAME=	glimpse-4.17.2
-PKGREVISION=	1
+DISTNAME=	glimpse-4.18.0
 CATEGORIES=	textproc databases
 MASTER_SITES=   http://webglimpse.net/trial/
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	asmodai@in-nomine.org
 HOMEPAGE=	http://webglimpse.net/
 COMMENT=	Text search engine
 
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index d37696c88e6..9b835918593 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1,7 +1,22 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 14:48:42 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/06/04 10:44:28 wiz Exp $
 
-SHA1 (glimpse-4.17.2.tar.gz) = 7bed076200132a4ecfe8779116926904bfa9efb6
-RMD160 (glimpse-4.17.2.tar.gz) = d877684a70a1d254fa0fa4757109a82dae8bf171
-Size (glimpse-4.17.2.tar.gz) = 407328 bytes
-SHA1 (patch-aa) = f8797b6910bca22324e30d06c1cb48f34ddbb49a
-SHA1 (patch-ad) = 7c6dd0c04f539351ad82afb82dfc60db8e50158b
+SHA1 (glimpse-4.18.0.tar.gz) = 15c832f241a9d59e67e167167d3c3dd6f53549d8
+RMD160 (glimpse-4.18.0.tar.gz) = 879503214e48d6e32bc45660c5992851e6af4418
+Size (glimpse-4.18.0.tar.gz) = 401361 bytes
+SHA1 (patch-aa) = 1f40e44ae7ca9078569b9faba03d57cb81f97180
+SHA1 (patch-ab) = fdced623c88a201a3e28aadc8896d50c51774a66
+SHA1 (patch-ac) = be5a951ac1f4db5ab3c99ca8a6ef82c042019690
+SHA1 (patch-ad) = 6e1981e7b6e02eb2b3137e3adddc290ce3002f71
+SHA1 (patch-ae) = 221b70e1324da7e7ee8bf6b6bc0a704f91bc6d29
+SHA1 (patch-af) = 0ef79bdb8477b6426c9fd9a5b708dde7b7c0c6d7
+SHA1 (patch-ag) = 6ef9548db620934e1e7c91c456053898a07cb5f3
+SHA1 (patch-ah) = d374536e090c8f1571ee2e1145c06febce96eee2
+SHA1 (patch-ai) = a42f2feefd087661f84a853e3616584527402db0
+SHA1 (patch-aj) = e4f8f557f23213f2b2224084b853d1c269caf091
+SHA1 (patch-ak) = 35b637bf404fa0f22d669e922eeb33f7a37010c6
+SHA1 (patch-al) = 84ee54521e8086e83f68a78db40a2d6f0cd86cc9
+SHA1 (patch-am) = 6438bb41b5816d5b7172a20a02472632d0e3bf82
+SHA1 (patch-an) = 898cdfd1d90083c494c15a9c84d8db196a833ae4
+SHA1 (patch-ao) = f1cb44f3d2e940adffe04ebdb7ee149fb9df8a64
+SHA1 (patch-ap) = ff5f0223544631fca4c3fcc9f1448a7c46b818e8
+SHA1 (patch-aq) = b39d669c1a362724668781762376583df6039d87
diff --git a/textproc/glimpse/patches/patch-aa b/textproc/glimpse/patches/patch-aa
index 631eed0210c..4b70228e1d1 100644
--- a/textproc/glimpse/patches/patch-aa
+++ b/textproc/glimpse/patches/patch-aa
@@ -1,8 +1,18 @@
-$NetBSD: patch-aa,v 1.3 1998/12/03 12:39:45 frueauf Exp $
+$NetBSD: patch-aa,v 1.4 2005/06/04 10:44:28 wiz Exp $
 
---- main.c.orig	Mon Apr 28 00:14:04 1997
-+++ main.c	Sun Nov 29 03:34:48 1998
-@@ -1059,7 +1059,7 @@
+--- main.c.orig	2004-06-08 19:07:33.000000000 +0200
++++ main.c
+@@ -27,7 +27,9 @@
+ 
+ /* Borrowed from C-Lib */
+ extern char **environ;
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ #if	CLIENTSERVER
+ #include "communicate.c"
+@@ -1080,7 +1082,7 @@ char *argv[];
  		clargc = 0;
  		clargv = NULL;
  		cli_len = sizeof(cli_addr);
diff --git a/textproc/glimpse/patches/patch-ab b/textproc/glimpse/patches/patch-ab
new file mode 100644
index 00000000000..afae232a344
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.6 2005/06/04 10:44:28 wiz Exp $
+
+--- agrep/agrep.c.orig	2003-01-25 21:15:05.000000000 +0100
++++ agrep/agrep.c
+@@ -11,7 +11,9 @@
+ #define PRINT(s)
+ 
+ extern char **environ;
++#ifndef errno
+ extern int errno;
++#endif
+ int pattern_index;	/* index in argv where the pattern is */
+ 
+ int glimpse_isserver=0;	/* so that there is no user interaction */
diff --git a/textproc/glimpse/patches/patch-ac b/textproc/glimpse/patches/patch-ac
new file mode 100644
index 00000000000..7ab249cf54e
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2005/06/04 10:44:28 wiz Exp $
+
+--- agrep/asearch.c.orig	1999-11-03 21:37:06.000000000 +0100
++++ agrep/asearch.c
+@@ -9,7 +9,9 @@ extern long CurrentFileTime;
+ extern int I, num_of_matched, prev_num_of_matched, TRUNCATE;
+ 
+ extern int CurrentByteOffset;
++#ifndef errno
+ extern int errno;
++#endif
+ extern CHAR *agrep_inbuffer;
+ extern int  agrep_inlen;
+ extern int  agrep_initialfd;
diff --git a/textproc/glimpse/patches/patch-ad b/textproc/glimpse/patches/patch-ad
index 122dfbb6234..11f25a3d5f7 100644
--- a/textproc/glimpse/patches/patch-ad
+++ b/textproc/glimpse/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2001/10/13 23:43:30 mjl Exp $
+$NetBSD: patch-ad,v 1.2 2005/06/04 10:44:28 wiz Exp $
 
---- configure.orig	Tue Aug 21 06:37:16 2001
-+++ configure	Sun Oct 14 01:12:16 2001
-@@ -1873,7 +1873,7 @@
- else
-   ac_save_LIBS="$LIBS"
- LIBS="-ldl  $LIBS"
--INDEXLIBS="-ldl $INDEXLIBS"
-+INDEXLIBS="$INDEXLIBS"
+--- agrep/bitap.c.orig	2002-11-30 01:47:27.000000000 +0100
++++ agrep/bitap.c
+@@ -34,7 +34,9 @@ extern CHAR *agrep_outbuffer;
+ extern int agrep_outlen;
+ extern int agrep_outpointer;
+ extern FILE *agrep_finalfp;
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ extern int NEW_FILE, POST_FILTER;
  
- cat > conftest.$ac_ext <<EOF
- #line 1757 "configure"
diff --git a/textproc/glimpse/patches/patch-ae b/textproc/glimpse/patches/patch-ae
new file mode 100644
index 00000000000..123214e9eff
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- index/glimpse.c.orig	2002-09-27 23:41:11.000000000 +0200
++++ index/glimpse.c
+@@ -9,7 +9,9 @@
+ #include <errno.h>
+ 
+ extern char **environ;
++#ifndef errno
+ extern int errno;
++#endif
+ extern FILE *TIMEFILE;	/* file descriptor for sorting .glimpse_filenames by time */
+ #if	BG_DEBUG
+ extern FILE  *LOGFILE; 	/* file descriptor for LOG output */
diff --git a/textproc/glimpse/patches/patch-af b/textproc/glimpse/patches/patch-af
new file mode 100644
index 00000000000..ab798862d2f
--- /dev/null
+++ b/textproc/glimpse/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/checkfile.c.orig	1999-11-03 21:37:06.000000000 +0100
++++ agrep/checkfile.c
+@@ -24,7 +24,9 @@
+ #define MAXLINE 512
+ 
+ extern char Progname[];
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ unsigned char ibuf[MAXLINE];
+ 
diff --git a/textproc/glimpse/patches/patch-ag b/textproc/glimpse/patches/patch-ag
new file mode 100644
index 00000000000..d31c76be982
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- libtemplate/util/Makefile.in.orig	2001-05-21 06:49:00.000000000 +0200
++++ libtemplate/util/Makefile.in
+@@ -21,7 +21,7 @@ DEFS            =
+ 
+ DEBUG           =
+ INCLUDE         = -I../include
+-CFLAGS          = $(DEFS) $(INCLUDE)
++CFLAGS          = -D__STRICT_ANSI__ $(DEFS) $(INCLUDE)
+ 
+ LIBFILE         = libutil.a
+ LIBDIR		= ../lib
diff --git a/textproc/glimpse/patches/patch-ah b/textproc/glimpse/patches/patch-ah
new file mode 100644
index 00000000000..22220aa3f8a
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/checksg.c.orig	2002-09-27 23:41:09.000000000 +0200
++++ agrep/checksg.c
+@@ -3,7 +3,9 @@
+ #include "checkfile.h"
+ #include <errno.h>
+ 
++#ifndef errno
+ extern int errno;
++#endif
+ extern CHAR Progname[MAXNAME]; 
+ extern int SGREP, PAT_FILE, PAT_BUFFER, EXITONERROR, SIMPLEPATTERN,
+ 	CONSTANT, D, NOUPPER, JUMP, I, LINENUM, INVERSE, WORDBOUND, WHOLELINE,
diff --git a/textproc/glimpse/patches/patch-ai b/textproc/glimpse/patches/patch-ai
new file mode 100644
index 00000000000..5db2e0e2288
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/compat.c.orig	2003-01-25 21:09:08.000000000 +0100
++++ agrep/compat.c
+@@ -16,7 +16,9 @@ extern JUMP;
+ extern char Progname[MAXNAME];
+ extern int agrep_initialfd;
+ extern int EXITONERROR;
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ int
+ compat()
diff --git a/textproc/glimpse/patches/patch-aj b/textproc/glimpse/patches/patch-aj
new file mode 100644
index 00000000000..cf13ca364a8
--- /dev/null
+++ b/textproc/glimpse/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/maskgen.c.orig	2002-09-27 23:41:09.000000000 +0200
++++ agrep/maskgen.c
+@@ -8,7 +8,9 @@ extern int AND, REGEX, NOUPPER, D_length
+ extern unsigned char Progname[];
+ extern int agrep_initialfd;
+ extern int EXITONERROR;
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ int
+ maskgen(Pattern, D)
diff --git a/textproc/glimpse/patches/patch-ak b/textproc/glimpse/patches/patch-ak
new file mode 100644
index 00000000000..ce6ea372e65
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/newmgrep.c.orig	1999-11-03 21:37:06.000000000 +0100
++++ agrep/newmgrep.c
+@@ -66,7 +66,9 @@ extern FILE *agrep_finalfp;
+ extern int agrep_outpointer;
+ extern int agrep_outlen;
+ extern CHAR * agrep_outbuffer;
++#ifndef errno
+ extern int errno;
++#endif
+ extern int NEW_FILE, POST_FILTER;
+ 
+ extern int tuncompressible();
diff --git a/textproc/glimpse/patches/patch-al b/textproc/glimpse/patches/patch-al
new file mode 100644
index 00000000000..a6bead27769
--- /dev/null
+++ b/textproc/glimpse/patches/patch-al
@@ -0,0 +1,14 @@
+$NetBSD: patch-al,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/preprocess.c.orig	2002-09-27 23:41:09.000000000 +0200
++++ agrep/preprocess.c
+@@ -26,7 +26,9 @@ extern CHAR tc_D_pattern[MaxDelimit * 2]
+ extern int table[WORD][WORD];
+ extern int agrep_initialfd;
+ extern int EXITONERROR;
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ extern int  multifd;
+ extern char *multibuf;
diff --git a/textproc/glimpse/patches/patch-am b/textproc/glimpse/patches/patch-am
new file mode 100644
index 00000000000..0b1d2e204f9
--- /dev/null
+++ b/textproc/glimpse/patches/patch-am
@@ -0,0 +1,14 @@
+$NetBSD: patch-am,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- agrep/sgrep.c.orig	1999-11-01 21:32:58.000000000 +0100
++++ agrep/sgrep.c
+@@ -65,7 +65,9 @@ extern CHARTYPE * agrep_outbuffer;
+ extern int NEW_FILE, POST_FILTER;
+ 
+ extern int EXITONERROR;
++#ifndef errno
+ extern int errno;
++#endif
+ extern int TCOMPRESSED;
+ extern int EASYSEARCH;
+ extern char FREQ_FILE[MAX_LINE_LEN], HASH_FILE[MAX_LINE_LEN], STRING_FILE[MAX_LINE_LEN];
diff --git a/textproc/glimpse/patches/patch-an b/textproc/glimpse/patches/patch-an
new file mode 100644
index 00000000000..74a2a4dc9aa
--- /dev/null
+++ b/textproc/glimpse/patches/patch-an
@@ -0,0 +1,14 @@
+$NetBSD: patch-an,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- get_index.c.orig	2002-09-27 23:41:07.000000000 +0200
++++ get_index.c
+@@ -15,7 +15,9 @@ extern	int	WHOLEFILESCOPE;
+ extern	unsigned int *dest_index_set;
+ extern	unsigned char *dest_index_buf;
+ extern	int	mask_int[32];
++#ifndef errno
+ extern	int	errno;
++#endif
+ extern	int	ByteLevelIndex;
+ extern  int	RecordLevelIndex;
+ extern  int	rdelim_len;
diff --git a/textproc/glimpse/patches/patch-ao b/textproc/glimpse/patches/patch-ao
new file mode 100644
index 00000000000..c2cd2b3072e
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ao
@@ -0,0 +1,14 @@
+$NetBSD: patch-ao,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- index/build_in.c.orig	2002-10-11 07:28:32.000000000 +0200
++++ index/build_in.c
+@@ -605,7 +605,9 @@ traverse1()
+     int ret;
+     char s[MAX_LINE_LEN], es1[MAX_LINE_LEN], es2[MAX_LINE_LEN], es3[MAX_LINE_LEN];
+     char s1[MAX_LINE_LEN];
++#ifndef errno
+     extern int errno;
++#endif
+     static int maxsortlinelen = 0;
+     int	i;
+ 
diff --git a/textproc/glimpse/patches/patch-ap b/textproc/glimpse/patches/patch-ap
new file mode 100644
index 00000000000..18c4c178204
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ap
@@ -0,0 +1,14 @@
+$NetBSD: patch-ap,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- index/convert.c.orig	2002-05-03 06:43:17.000000000 +0200
++++ index/convert.c
+@@ -43,7 +43,9 @@ int		allocate_and_fill(/* out unsigned c
+ 
+ 
+ /* Imported variables */
++#ifndef errno
+ extern int	errno;
++#endif
+ extern int	get_index_type();	/* from io.c */
+ extern int	file_num;		/* from io.c */
+ extern int	mask_int[32];		/* from io.c */
diff --git a/textproc/glimpse/patches/patch-aq b/textproc/glimpse/patches/patch-aq
new file mode 100644
index 00000000000..423c198ff83
--- /dev/null
+++ b/textproc/glimpse/patches/patch-aq
@@ -0,0 +1,14 @@
+$NetBSD: patch-aq,v 1.1 2005/06/04 10:44:29 wiz Exp $
+
+--- index/partition.c.orig	2002-09-27 23:41:11.000000000 +0200
++++ index/partition.c
+@@ -28,7 +28,9 @@ int  new_partition;
+ int  files_per_partition;
+ int  files_in_partition;
+ int  ATLEASTONEFILE = 0;
++#ifndef errno
+ extern int errno;
++#endif
+ 
+ char patbuf[MAX_PAT];
+ extern unsigned char *src_index_buf;