Had problems to build Version 1.5.15 (latest snapshot of developement),

therefore only update to version 1.5 (-stable), although this is from april.

4 files changed, 25 insertions, 48 deletions

diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index dd39b9f78850..ebbb184d5ac3 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -3,15 +3,13 @@
 # Date created:		Fri Mar  1 19:43:52 MET 1996
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.6 1997/06/12 17:26:33 asami Exp $
+# $Id: Makefile,v 1.7 1997/10/09 21:04:41 andreas Exp $
 #
 
-DISTNAME=	harvest-1.4.pl2
-PKGNAME=	harvest-1.4.2
+DISTNAME=	harvest-1.5
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.cs.colorado.edu/pub/distribs/harvest/ \
-		ftp://ftp.ask.uni-karlsruhe.de/pub/infosystems/harvest/ \
-		ftp://ftp.sunet.se/pub/nir/harvest/
+MASTER_SITES=	ftp://ftp.tardis.ed.ac.uk/pub/harvest/ \
+		ftp://ftp.nlanr.net/Mirror/Harvest/develop/snapshots/
 EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	andreas@FreeBSD.ORG
diff --git a/www/harvest/distinfo b/www/harvest/distinfo
index 067b7637bc90..b8547bf3951d 100644
--- a/www/harvest/distinfo
+++ b/www/harvest/distinfo
@@ -1 +1 @@
-MD5 (harvest-1.4.pl2-src.tar.gz) = 67facbc1e598d2aa97d25fb6577fff8f
+MD5 (harvest-1.5-src.tar.gz) = 708fd9ac95fd7606ee35d569a0c33a4c
diff --git a/www/harvest/pkg-descr b/www/harvest/pkg-descr
index 77786af0c309..387030a46a77 100644
--- a/www/harvest/pkg-descr
+++ b/www/harvest/pkg-descr
@@ -1,18 +1,17 @@
-Harvest is an integrated set of tools to gather, extract, organize, search,
-cache, and replicate relevant information across the Internet.  With modest
-effort users can tailor Harvest to digest information in many different
-formats, and offer custom search services on the Internet.  Moreover, Harvest
-makes very efficient use of network traffic, remote servers, and disk space.
+This is Harvest Indexer version 1.5, an updated version of the Indexing Code
+originally developed by the Harvest project (http://harvest.transarc.com/).
 
-You can learn more about and experiment with Harvest starting with the 
-Harvest Home Page at: 
+As they are no longer developing the code this version contains many 
+improvements and bug fixes over 1.4pl2, the last official release.
 
-	http://harvest.cs.colorado.edu/
+If you are interested in contributing patches or ideas, please mail
+harvest@tardis.ed.ac.uk.
 
-Source code fixes will occasionally be made available in the Fixes/
-directory.  Binary distributions will be rebuilt approximately every one
-to two months.  We urge you to compile the source code if you want to
-incorporate fixes immediately.
+Information on new releases will be sent to the harvest-announce mailing
+list. To subscribe send mail to harvest-announce-request@tardis.ed.ac.uk
+containing the message "subscribe"
 
-The Harvest documentation is on-line, and is available via the Home Page.
-For further assistance, see http://harvest.cs.colorado.edu/support.html.
+Bug reports can be mailed to harvest-bugs@tardis.ed.ac.uk
+
+Documentation: Information on this version of the Harvest software
+is available from http://www.tardis.ed.ac.uk/harvest/                                        
diff --git a/www/harvest/pkg-plist b/www/harvest/pkg-plist
index 646bc84c933b..179a64a0a43c 100644
--- a/www/harvest/pkg-plist
+++ b/www/harvest/pkg-plist
@@ -4,28 +4,6 @@ harvest/bin/Gatherer
 harvest/bin/Harvest
 harvest/bin/broker
 harvest/bin/gather
-harvest/brokers/AdminTools/cgi-bin/bdaddopt.cgi
-harvest/brokers/AdminTools/cgi-bin/bdapply.cgi
-harvest/brokers/AdminTools/cgi-bin/bdhome.cgi
-harvest/brokers/AdminTools/cgi-bin/bdtool.cgi
-harvest/brokers/AdminTools/cgi-bin/bdupdate.cgi
-harvest/brokers/AdminTools/cgi-bin/oldupdate.cgi
-harvest/brokers/AdminTools/descriptions/descriptions
-harvest/brokers/AdminTools/hsr.conf
-harvest/brokers/AdminTools/lib/bdhome.html.in
-harvest/brokers/AdminTools/lib/bdlibrary.pl
-harvest/brokers/AdminTools/lib/bdmanual.html.in
-harvest/brokers/AdminTools/lib/bdtool.html.in
-harvest/brokers/AdminTools/lib/broker.tags
-harvest/brokers/AdminTools/lib/cgi.pl
-harvest/brokers/AdminTools/lib/configure.pl
-harvest/brokers/AdminTools/lib/gatherer.tags
-harvest/brokers/AdminTools/lib/hsrlibrary.pl
-harvest/brokers/AdminTools/tools/bddisplay
-harvest/brokers/AdminTools/tools/bdlogs
-harvest/brokers/AdminTools/tools/bdmanual
-harvest/brokers/AdminTools/tools/bdstop
-harvest/brokers/AdminTools/tools/tools
 harvest/brokers/Attributes.html
 harvest/brokers/adminhelp.html
 harvest/brokers/queryhelp.html
@@ -46,6 +24,7 @@ harvest/cgi-bin/HarvestGather.cgi
 harvest/cgi-bin/cgiparse.pl
 harvest/cgi-bin/lib/BrokerQuery.cf
 harvest/cgi-bin/lib/Sample.cf
+harvest/cgi-bin/nph-search.cgi
 harvest/gatherers/example-1/RunGatherer
 harvest/gatherers/example-1/example-1.cf
 harvest/gatherers/example-2/RunGatherer
@@ -79,6 +58,7 @@ harvest/gatherers/example-5/mydomain-host-filter
 harvest/gatherers/example-5/mydomain-url-filter
 harvest/lib/broker/BrokerRestart
 harvest/lib/broker/RunBrokers.sh
+harvest/lib/broker/agrep
 harvest/lib/broker/brkclient
 harvest/lib/broker/dumpregistry
 harvest/lib/broker/glimpse
@@ -86,12 +66,9 @@ harvest/lib/broker/glimpseindex
 harvest/lib/broker/glimpseserver
 harvest/lib/broker/info-to-html.pl
 harvest/lib/broker/mkbrokerstats.pl
-harvest/lib/chat2.pl
 harvest/lib/ctime.pl
 harvest/lib/dateconv.pl
-harvest/lib/ftp.pl
 harvest/lib/ftpget
-harvest/lib/ftpget.pl
 harvest/lib/gatherer/Archive.sum
 harvest/lib/gatherer/Binary-raw.sum
 harvest/lib/gatherer/Binary.sum
@@ -145,9 +122,11 @@ harvest/lib/gatherer/gatherd
 harvest/lib/gatherer/gdbmutil
 harvest/lib/gatherer/get-include-files
 harvest/lib/gatherer/gifinfo
-harvest/lib/gatherer/gopherenum
+harvest/lib/gatherer/gopherenum-breadth
+harvest/lib/gatherer/gopherenum-depth
 harvest/lib/gatherer/hexbin
-harvest/lib/gatherer/httpenum
+harvest/lib/gatherer/httpenum-breadth
+harvest/lib/gatherer/httpenum-depth
 harvest/lib/gatherer/kill-gatherd
 harvest/lib/gatherer/l2h.pl
 harvest/lib/gatherer/magic
@@ -179,6 +158,7 @@ harvest/lib/gatherer/sgmls-lib/HTML/html-0s.dtd
 harvest/lib/gatherer/sgmls-lib/HTML/html-1.dtd
 harvest/lib/gatherer/sgmls-lib/HTML/html-1s.dtd
 harvest/lib/gatherer/sgmls-lib/HTML/html-3.dtd
+harvest/lib/gatherer/sgmls-lib/HTML/html-32.dtd
 harvest/lib/gatherer/sgmls-lib/HTML/html-hj.dtd
 harvest/lib/gatherer/sgmls-lib/HTML/html-mcom.dtd
 harvest/lib/gatherer/sgmls-lib/HTML/html-s.dtd