Update htdig to 3.1.6. Many bug fixes, including one security-related fix.

The following is from the web page:

Release notes for htdig-3.1.6 1 Feb 2002
As  with  previous  releases,  this  version  cleans up some remaining bugs and adds a few
heavily-requested  features.  As  the  latest  stable  release,  it is recommended for all
production servers.
 * Fixed  another  nasty security hole in htsearch, which would allow a denial of service
   attack  or  forcing  htsearch  to  read  in  config files outside of the configuration
   directory.
 * Fixed some problems with htmerge, including problems with words beginning with special
   characters and merging multiple databases.
 * Fixed a bug in handling hopcounts.
 * Fixed problems in handling non-standard relative HTTP redirects.
 * Fixed bugs in external parsers support including being confused by charset information
   in the Content-Type header and handling binary output from external converters.
 * Fixed  bugs  in  the  default English endings database. (Under ispell, it wasn't quite
   intended for the accuracy needed for our usage.)
 * Fixed additional bugs in the endings fuzzy algorithm.
 * Fixed bugs with compiling with gcc-3.0 and later.
 * Fixed bugs compiling and running on Mac OS X.
 * Fixed  problems  with  servers not returning a Last-Modified date--now assums indexing
   time as modification time.
 * Fixed a variety of bugs in the HTML parser to more flexibly handle non-standard HTML.
 * Fixed  problems  in  the  TCP  connection  code  and will more reliably timeout when a
   connection hangs and will retry bad connections several times before giving up.
 * Added the -m "minimal" flag to htdig for only indexing a set list of URLs and made the
   -l (log) flag the default behavior so that htdig will stop and restart automatically.
 * Added  htdump  and  htload programs for dumping ASCII representations of the databases
   and reloading the same.
 * Added  support  for  htnotify to collect multiple URLs and allow easy customization of
   notification    messages,    including    the    new    attributes   htnotify_replyto,
   htnotify_webmaster, htnotify_prefix_file, and htnotify_suffix_file.
 * Added  a  new "accents" fuzzy algorithm to morph accents, including the new accents_db
   attribute.
 * Added  a  'list  all'  feature  to  htsearch  with  a  query  of  '*'  or  the current
   prefix_match_character.
 * Added date restricted searching to htsearch including relative dates.
 * Added documentation on running ht://Dig and the rundig script.
 * Added  METADESCRIPTION  and  NSTARS  variables  to  the  htsearch templates as well as
   support for $=(var) template variable references.
 * Added  new  config attributes to htsearch for restrict and exclude which work like the
   normal htsearch form variables if the form variables are not set.
 * Added  many  new attributes, including ignore_dead_servers description_meta_tag_names,
   max_keywords,      translate_latin1,      url_rewrite_rules,     search_rewrite_rules,
   anchor_target,    ignore_alt_text,    search_results_contenttype,    boolean_keywords,
   boolean_syntax_errors,    multimatch_method,    maximum_page_buttons,    max_excerpts,
   plural_suffix, any_keywords and use_doc_date.
 * Extended  the build_select_lists attribute to support select multiple, radio boxes and
   checkboxes.
 * Revised  the documentation to make it clearer in parts, including the url_part_aliases
   attribute.
 * Updated  various  contributed  utilities  including  doc2html,  xmlsearch,  rundig.sh,
   htparsedoc, acroconv.pl, multidig, etc.
 * A  variety  of  other bug fixes, and many documentation updates. See the ChangeLog for
   details.

1 files changed, 20 insertions, 5 deletions

diff --git a/www/htdig/Makefile b/www/htdig/Makefile
index 78b6384bf31..e84fc230fa2 100644
--- a/www/htdig/Makefile
+++ b/www/htdig/Makefile
@@ -1,10 +1,16 @@
-# $NetBSD: Makefile,v 1.11 2001/06/11 06:34:55 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2002/03/09 21:48:11 fredb Exp $
 #
 
-DISTNAME=	htdig-3.1.5
+DISTNAME=	htdig-3.1.6
 CATEGORIES=	www databases
 MASTER_SITES=	http://www.htdig.org/files/ \
-		ftp://ftp.htdig.org/
+		ftp://ftp.htdig.org/ \
+		${MASTER_SITE_SOURCEFORGE:=files/} \
+		${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/htdig/} \
+		http://htdig.europeanservers.net/files/ \
+		http://www.it.htdig.org/files/ \
+		ftp://www.it.htdig.org/pub/htdig/ \
+		http://www.opdenbrouw.nl/htdig/maindocs/files/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://htdig.sourceforge.net/
@@ -14,13 +20,22 @@ DEPENDS+=	db-2.7.7:../../databases/db
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \
+		--with-common-dir=${PREFIX}/share/htdig/common \
+		--with-config-dir=${PKG_SYSCONFDIR}/htdig/ \
+		--with-database-dir=/var/db/htdig \
 		--with-image-dir=${PREFIX}/share/examples/htdig \
 		--with-search-dir=${PREFIX}/share/examples/htdig
 CPPFLAGS+=	-I${PREFIX}/include/db2
+PLIST_SUBST=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+
+post-patch:
+	${TOUCH} ${WRKSRC}/configure
 
 post-install:
-	if [ ! -f ${PREFIX}/etc/htdig/htdig.conf ]; then \
-	  ${CP} ${PREFIX}/share/examples/htdig/htdig.conf ${PREFIX}/etc/htdig/; \
+	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/htdig
+	if [ ! -f ${PKG_SYSCONFDIR}/htdig/htdig.conf ]; then \
+		${CP} ${PREFIX}/share/examples/htdig/htdig.conf \
+			${PKG_SYSCONFDIR}/htdig/; \
 	fi
 	${PREFIX}/bin/htfuzzy -v synonyms
 	${PREFIX}/bin/htfuzzy -v endings