MASTER_SITE gone, switch to new one

Update to 4.12.6

6 files changed, 76 insertions, 39 deletions

diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 7fb18f773b69..4b0a1a7fd4af 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,5 @@
 # New ports collection makefile for:	glimpse
+# http://webglimpse.org/
 # Date created:		25 August 1996
 # Whom:			chuckr@freebsd.org
 #
@@ -6,22 +7,19 @@
 #
 
 PORTNAME=	glimpse
-PORTVERSION= 	4.1
+PORTVERSION=    4.12.6
 CATEGORIES=	textproc databases
-MASTER_SITES=   ftp://ftp.cs.arizona.edu/glimpse/
-DISTNAME=	${PKGNAME}.src
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=   ftp://ftp.polito.it/pub/tools/unix/harvest/
 
 MAINTAINER=	chuckr@freebsd.org
 
-WRKSRC=         ${WRKDIR}/glimpse-4.1
-USE_GMAKE=	yes
 NO_CDROM=	"Restrictive copyright (don't sell for profit)"
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=  CFLAGS="${CFLAGS} -DISO_CHAR_SET=1"
 MAN1=		glimpse.1 glimpseindex.1 glimpseserver.1 agrep.1
 
 pre-configure:
+	${RM} ${WRKSRC}/config.cache
 	${CHMOD} ugo+x ${WRKSRC}/configure
 
 post-install:
diff --git a/textproc/glimpse/distinfo b/textproc/glimpse/distinfo
index 59533b762d9a..b1b1eb84666a 100644
--- a/textproc/glimpse/distinfo
+++ b/textproc/glimpse/distinfo
@@ -1 +1 @@
-MD5 (glimpse-4.1.src.tar.Z) = 2ebfa2792591f758134b3808d3c52869
+MD5 (glimpse-4.12.6.tar.gz) = 1741abb8c6cb7ab376a5b2aa1d4f9a6b
diff --git a/textproc/glimpse/files/patch-ab b/textproc/glimpse/files/patch-ab
index 5738b75594bf..06e70a4db2de 100644
--- a/textproc/glimpse/files/patch-ab
+++ b/textproc/glimpse/files/patch-ab
@@ -1,25 +1,46 @@
-*** 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
-***************
-*** 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
+--- libtemplate/include/autoconf.h.in.orig	Thu Nov 21 05:28:49 1996
++++ libtemplate/include/autoconf.h.in	Fri May  5 21:23:48 2000
+@@ -108,7 +108,7 @@
+ #undef HAVE_BZERO
+ 
+ /* Define if you have flock.  */
+-#undef HAVE_FLOCK
++#define HAVE_FLOCK
+ 
+ /* Define if you have fsync.  */
+ #undef HAVE_FSYNC
+@@ -120,7 +120,7 @@
+ #undef HAVE_GETCWD
+ 
+ /* Define if you have getdtablesize.  */
+-#undef HAVE_GETDTABLESIZE
++#define HAVE_GETDTABLESIZE
+ 
+ /* Define if you have lrand48.  */
+ #undef HAVE_LRAND48
+@@ -144,10 +144,10 @@
+ #undef HAVE_RENAME
+ 
+ /* Define if you have setlinebuf.  */
+-#undef HAVE_SETLINEBUF
++#define HAVE_SETLINEBUF
+ 
+ /* Define if you have setrlimit.  */
+-#undef HAVE_SETRLIMIT
++#define HAVE_SETRLIMIT
+ 
+ /* Define if you have srand48.  */
+ #undef HAVE_SRAND48
+@@ -156,10 +156,10 @@
+ #undef HAVE_SRANDOM
+ 
+ /* Define if you have strdup.  */
+-#undef HAVE_STRDUP
++#define HAVE_STRDUP 1
+ 
+ /* Define if you have strerror.  */
+-#undef HAVE_STRERROR
++#define HAVE_STRERROR
+ 
+ /* Define if you have sysconf.  */
+ #undef HAVE_SYSCONF
diff --git a/textproc/glimpse/files/patch-ad b/textproc/glimpse/files/patch-ad
index 852e9e2da023..b88c8f9dba40 100644
--- a/textproc/glimpse/files/patch-ad
+++ b/textproc/glimpse/files/patch-ad
@@ -1,11 +1,25 @@
---- Makefile.in~	Thu Nov 21 12:58:42 1996
-+++ Makefile.in	Thu Apr  8 23:01:33 1999
-@@ -32,7 +32,7 @@
- COMPRESSDIR	= compress
+--- Makefile.in.orig	Sat Jul 24 01:24:43 1999
++++ Makefile.in	Fri May  5 21:52:52 2000
+@@ -35,7 +35,7 @@
  COMPRESSSRC	= $(srcdir)/$(COMPRESSDIR)
+ DESTDIR		= $(srcdir)/bin
  
 -CFLAGS		= @CFLAGS@ -O -DSTRUCTURED_QUERIES=1
 +CFLAGS		= -O @CFLAGS@ -DSTRUCTURED_QUERIES=1
  ALL_CFLAGS      = $(CFLAGS) $(DEFS) -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
  LINKFLAGS	= @LDFLAGS@ -I$(INDEXSRC) -I$(AGREPSRC) -I$(TEMPLATESRC)/include
  
+@@ -85,11 +85,11 @@
+ install:	all installdirs
+ 		cd $(DESTDIR) ;\
+ 		for f in $(ALL_PROGS) ; do \
+-			$(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix)$(f) ;\
++			$(INSTALL_PROGRAM) $$f $(bindir)/$(binprefix) ;\
+ 		done
+ 		cd $(srcdir) ;\
+ 		for f in $(ALL_MANS) ; do \
+-			$(INSTALL_DATA) $$f $(mandir)/$(manprefix)$(f).$(manext) ;\
++			$(INSTALL_DATA) $$f $(mandir)/$(manprefix) ;\
+ 		done
+ #		$(INSTALL_PROGRAM) $(PROGINDEX) $(bindir)/$(binprefix)glimpseindex
+ #		$(INSTALL_PROGRAM) $(PROGAGREP) $(bindir)/$(binprefix)agrep
diff --git a/textproc/glimpse/pkg-descr b/textproc/glimpse/pkg-descr
index 2d1fd9ba009b..af7f8ae2057a 100644
--- a/textproc/glimpse/pkg-descr
+++ b/textproc/glimpse/pkg-descr
@@ -11,4 +11,4 @@ needle anywhere in your file system, all you have to do is say
 glimpse  needle  and  all  lines containing needle will appear preceded
 by the file name.
 
-WWW: http://glimpse.cs.arizona.edu/
+WWW: http://webglimpse.org/
diff --git a/textproc/glimpse/pkg-plist b/textproc/glimpse/pkg-plist
index b4190e1d3d57..cad2320678f3 100644
--- a/textproc/glimpse/pkg-plist
+++ b/textproc/glimpse/pkg-plist
@@ -1,7 +1,11 @@
-bin/glimpseindex
 bin/agrep
-bin/glimpseserver
+bin/buildcast
+bin/cast
 bin/glimpse
+bin/glimpseindex
+bin/glimpseserver
+bin/tbuild
+bin/uncast
 bin/wgconvert
 share/doc/glimpse/COPYRIGHT
 share/doc/glimpse/README