Update to 4.15. Changes are mostly bugfixes and small enhancements.

5 files changed, 34 insertions, 51 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 30219bca528..7297e42882f 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2001/06/07 21:41:05 jtb Exp $
+# $NetBSD: Makefile,v 1.14 2001/10/13 23:43:29 mjl Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
 #
 
-DISTNAME=       glimpse-4.1.src
-PKGNAME=	glimpse-4.1
-WRKSRC=		${WRKDIR}/${PKGNAME}
+DISTNAME=	glimpse-4.15
 CATEGORIES=	textproc databases
-MASTER_SITES=   ftp://ftp.cs.arizona.edu/glimpse/
+MASTER_SITES=   http://webglimpse.net/trial/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://glimpse.cs.arizona.edu/
+HOMEPAGE=	http://webglimpse.net/
 COMMENT=	Text search engine
 
 LICENSE=	glimpse-license
@@ -21,16 +19,11 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 pre-configure:
-	${CHMOD} ugo+x ${WRKSRC}/configure
-
-post-configure:
-	${CP} -f ${FILESDIR}/autoconf.h \
-		 ${WRKSRC}/libtemplate/include/autoconf.h
+	cd ${WRKSRC}; make distclean
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glimpse
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/glimpse
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/glimpse
-	${INSTALL_PROGRAM} ${WRKSRC}/index/wgconvert ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index 15fdb63288f..487c0efea87 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 15:04:57 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/10/13 23:43:29 mjl Exp $
 
-SHA1 (glimpse-4.1.src.tar.gz) = 42022a91575482c670d1396a1ea0d18605a909d1
-Size (glimpse-4.1.src.tar.gz) = 394803 bytes
+SHA1 (glimpse-4.15.tar.gz) = 16218dafa13d4cf32e25fffdcb4c1ba4316a2a82
+Size (glimpse-4.15.tar.gz) = 425475 bytes
 SHA1 (patch-aa) = f8797b6910bca22324e30d06c1cb48f34ddbb49a
-SHA1 (patch-ab) = 52f1ef132a529b800f5f6af723798aab2312836f
+SHA1 (patch-ad) = 7c6dd0c04f539351ad82afb82dfc60db8e50158b
diff --git a/textproc/glimpse/patches/patch-ab b/textproc/glimpse/patches/patch-ab
deleted file mode 100644
index b1a2c2298ef..00000000000
--- a/textproc/glimpse/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2000/08/04 00:06:22 jlam Exp $
-
---- Makefile.in.orig	Wed Nov 20 21:28:42 1996
-+++ Makefile.in	Thu Aug  3 19:54:40 2000
-@@ -34,7 +34,8 @@
- 
- CFLAGS		= @CFLAGS@ -O -DSTRUCTURED_QUERIES=1
- ALL_CFLAGS      = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
--LINKFLAGS	= @LDFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
-+LDFLAGS		= @LDFLAGS@
-+LINKFLAGS	= -L$(AGREPDIR) -L$(COMPRESSDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) $(LDFLAGS)
- 
- .c.o:
- 		$(CC) -c $(ALL_CFLAGS) $<
-@@ -99,10 +100,10 @@
- 	cd $(COMPRESSDIR); $(MAKE)
- 
- $(PROG):	main.o $(OBJS) $(SRC) $(HDRS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(COMPRESSDIR)/lib$(LIBCOMPRESS).a
--	 $(CC) $(LINKFLAGS) -L$(AGREPDIR) -L$(COMPRESSDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -o $(PROG) main.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS)
-+	 $(CC) $(LINKFLAGS) -o $(PROG) main.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS)
- 
- $(PROGSERVER):	main_server.o $(OBJS) $(SRC) $(HDRS) $(AGREPDIR)/lib$(LIBAGREP).a $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a $(TEMPLATEDIR)/$(LIBUTIL)/lib$(LIBUTIL).a $(COMPRESSDIR)/lib$(LIBCOMPRESS).a
--	 $(CC) $(LINKFLAGS) -L$(COMPRESSDIR) -L$(AGREPDIR) -L$(TEMPLATEDIR)/$(LIBTEMPLATE) -L$(TEMPLATEDIR)/$(LIBUTIL) -o $(PROGSERVER) main_server.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS)
-+	 $(CC) $(LINKFLAGS) -o $(PROGSERVER) main_server.o $(OBJS) -l$(LIBAGREP) -l$(LIBTEMPLATE) -l$(LIBUTIL) $(LIBS)
- 
- $(TEMPLATEDIR)/$(LIBTEMPLATE)/lib$(LIBTEMPLATE).a:
- 	cd $(TEMPLATEDIR) ; $(MAKE)
diff --git a/textproc/glimpse/patches/patch-ad b/textproc/glimpse/patches/patch-ad
new file mode 100644
index 00000000000..122dfbb6234
--- /dev/null
+++ b/textproc/glimpse/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/10/13 23:43:30 mjl 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"
+ 
+ cat > conftest.$ac_ext <<EOF
+ #line 1757 "configure"
diff --git a/textproc/glimpse/pkg/PLIST b/textproc/glimpse/pkg/PLIST
index 08d723f999a..fb07917eddd 100644
--- a/textproc/glimpse/pkg/PLIST
+++ b/textproc/glimpse/pkg/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:04:58 agc Exp $
-bin/glimpseindex
+@comment $NetBSD: PLIST,v 1.3 2001/10/13 23:43:30 mjl Exp $
+bin/tbuild
+bin/cast
+bin/uncast
 bin/agrep
-bin/glimpseserver
-bin/glimpse
+bin/buildcast
+bin/glimpseindex
 bin/wgconvert
-man/man1/glimpse.1.gz
-man/man1/glimpseindex.1.gz
-man/man1/glimpseserver.1.gz
-man/man1/agrep.1.gz
+bin/glimpse
+bin/glimpseserver
+man/man1/glimpse.1
+man/man1/glimpseindex.1
+man/man1/glimpseserver.1
+man/man1/agrep.1
 share/doc/glimpse/COPYRIGHT
 share/doc/glimpse/README
 @dirrm share/doc/glimpse