Update glimpse to 4.18.5. This release fixes compiler warnings, basically.

From Philip Paeps <philip@freebsd.org>.

4 files changed, 12 insertions, 41 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index cb69fc37b5f..e1ba6d56acf 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2007/08/12 13:17:12 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2008/06/05 17:19:52 ghen Exp $
 
-DISTNAME=	glimpse-4.18.0
-PKGREVISION=	1
+DISTNAME=	glimpse-4.18.5
 CATEGORIES=	textproc databases
 MASTER_SITES=	http://webglimpse.net/trial/
 
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index 1bfabf6aff5..a675d2ebb45 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.9 2007/08/09 18:26:57 joerg Exp $
+$NetBSD: distinfo,v 1.10 2008/06/05 17:19:52 ghen Exp $
 
-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 (glimpse-4.18.5.tar.gz) = a7a6168f3decab6cb6c674914259e2cf71be4e40
+RMD160 (glimpse-4.18.5.tar.gz) = c1012980e0e09de9c71e07ffed075817e0814eec
+Size (glimpse-4.18.5.tar.gz) = 410157 bytes
+SHA1 (patch-aa) = fa5342b901355fdaa3b4e2d7964f751a6d46122c
 SHA1 (patch-ab) = fdced623c88a201a3e28aadc8896d50c51774a66
 SHA1 (patch-ac) = be5a951ac1f4db5ab3c99ca8a6ef82c042019690
 SHA1 (patch-ad) = 6e1981e7b6e02eb2b3137e3adddc290ce3002f71
-SHA1 (patch-ae) = fdbcefba9e635b9135bab6b02be91311d5bac1c1
+SHA1 (patch-ae) = 9286a860909a661a7f2671b3447ae644d1e2802a
 SHA1 (patch-af) = 0ef79bdb8477b6426c9fd9a5b708dde7b7c0c6d7
 SHA1 (patch-ag) = 6ef9548db620934e1e7c91c456053898a07cb5f3
 SHA1 (patch-ah) = d374536e090c8f1571ee2e1145c06febce96eee2
diff --git a/textproc/glimpse/patches/patch-aa b/textproc/glimpse/patches/patch-aa
index 4b70228e1d1..f080efc71ad 100644
--- a/textproc/glimpse/patches/patch-aa
+++ b/textproc/glimpse/patches/patch-aa
@@ -1,7 +1,5 @@
-$NetBSD: patch-aa,v 1.4 2005/06/04 10:44:28 wiz Exp $
-
---- main.c.orig	2004-06-08 19:07:33.000000000 +0200
-+++ main.c
+--- main.c.orig	2006-03-13 20:35:22.000000000 +0100
++++ main.c	2008-06-05 17:04:54.000000000 +0200
 @@ -27,7 +27,9 @@
  
  /* Borrowed from C-Lib */
@@ -12,12 +10,3 @@ $NetBSD: patch-aa,v 1.4 2005/06/04 10:44:28 wiz Exp $
  
  #if	CLIENTSERVER
  #include "communicate.c"
-@@ -1080,7 +1082,7 @@ char *argv[];
- 		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-ae b/textproc/glimpse/patches/patch-ae
index 9933c86d680..35de4a4135f 100644
--- a/textproc/glimpse/patches/patch-ae
+++ b/textproc/glimpse/patches/patch-ae
@@ -1,7 +1,5 @@
-$NetBSD: patch-ae,v 1.2 2006/03/03 02:59:07 minskim Exp $
-
---- index/glimpse.c.orig	2002-09-27 14:41:11.000000000 -0700
-+++ index/glimpse.c
+--- index/glimpse.c.orig	2006-03-25 03:13:55.000000000 +0100
++++ index/glimpse.c	2008-06-05 18:21:07.000000000 +0200
 @@ -9,7 +9,9 @@
  #include <errno.h>
  
@@ -12,18 +10,3 @@ $NetBSD: patch-ae,v 1.2 2006/03/03 02:59:07 minskim Exp $
  extern FILE *TIMEFILE;	/* file descriptor for sorting .glimpse_filenames by time */
  #if	BG_DEBUG
  extern FILE  *LOGFILE; 	/* file descriptor for LOG output */
-@@ -19,12 +21,13 @@ extern FILE  *MESSAGEFILE;	/* file descr
- extern char  INDEX_DIR[MAX_LINE_LEN];
- extern struct stat istbuf;
- 
--extern char	*TEMP_DIR; /* directory to store glimpse temporary files, usually /tmp unless -T is specified */
- #ifdef BUILDCAST
- /* TEMP_DIR is normally defined in ../main.c; if we're building
-  * buildcast, that's not linked in, so we need to define one here. */
- /* char * TEMP_DIR = NULL; */
- static char * TEMP_DIR = "/tmp";
-+#else
-+extern char	*TEMP_DIR; /* directory to store glimpse temporary files, usually /tmp unless -T is specified */
- #endif /* BUILDCAST */
- extern int indexable_char[256];
- extern int GenerateHash;