Major overhaul of the port to celebrate the upgrade to 3.2.0b5.

The 3.2.x series contains many enhanced features, most notably
built in SSL capabilities.

Changes for the port itself:
1. Add new MASTER_SITES.
2. Search for an apache binary, not a document directory.
3. The new version uses libtool, so add USE_LIBTOOL per portlint.
4. The new configure script is much more thorough, so use a more complete
set of options, and sort them in "./configure --help" order.
5. CXXFLAGS hackery no longer needed in FreeBSD 5.x, but
6. A patch to include headers for select() is needed in RELENG_4.
7. Install PORTDOCS, especially the very thorough html help files.
8. Add SIZE to distinfo.
9. Make deletion of directories with user-configurable stuff conditional.

4 files changed, 298 insertions, 64 deletions

diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 622e121c9fa1..b2281d962711 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -6,48 +6,49 @@
 #
 
 PORTNAME=	htdig
-PORTVERSION=	3.1.6
+PORTVERSION=	3.2.0.b5
 CATEGORIES=	textproc www
-MASTER_SITES=	http://www.htdig.org/files/ \
+MASTER_SITES=	http://htdig.sourceforge.net/files/ \
+		http://www.htdig.org/files/ \
+		http://www.opdenbrouw.nl/htdig/files/ \
 		ftp://ftp.ntua.gr/pub/www/htdig/
+DISTNAME=	htdig-3.2.0b5
 
 MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	A www indexing and searching system
 
-RUN_DEPENDS=	${LOCALBASE}/share/doc/apache:${PORTSDIR}/${APACHE_PORT}
+RUN_DEPENDS=	${LOCALBASE}/sbin/httpd:${PORTSDIR}/${APACHE_PORT}
+
+USE_LIBTOOL=	yes
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \
-		--with-image-dir=${PREFIX}/share/apache/icons/htdig \
-		--with-search-dir=${PREFIX}/share/apache/htdocs \
+CONFIGURE_ARGS=	--with-config-dir=${PREFIX}/etc/htdig \
+		--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf \
 		--with-common-dir=${PREFIX}/share/htdig/common \
 		--with-database-dir=${PREFIX}/share/htdig/database \
-		--with-config-dir=${PREFIX}/etc/htdig \
-		--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf
+		--with-cgi-bin-dir=${PREFIX}/www/cgi-bin \
+		--with-search-dir=${PREFIX}/www/data \
+		--with-image-dir=${PREFIX}/www/icons/htdig \
+		--with-image-url-prefix=/icons/htdig \
+		--with-ssl \
+		--with-apache=${LOCALBASE}/sbin
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500037
-CONFIGURE_ENV+=	CXXFLAGS=-Wno-deprecated CPPFLAGS=-Wno-deprecated
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES+=	${PATCHDIR}/RELENG_4-patch-htnet_SSLConnection.cc
 .endif
 
-BUILD_TARGET=	depends all
-
-post-patch:
-.for file in CONFIG CONFIG.in
-	@ ${CP} ${WRKSRC}/${file} ${WRKSRC}/${file}.Dist
-	@ ${SED} -e 's#/conf#/etc#' \
-		-e 's#/common#/share/htdig#' \
-		-e 's#/db#/share/htdig#' \
-	${WRKSRC}/${file}.Dist > ${WRKSRC}/${file}
+post-install:
+	@${MV} ${PREFIX}/etc/htdig/htdig.conf ${PREFIX}/etc/htdig/htdig.conf.sample
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}/html
+.for f in ChangeLog ChangeLog.0 README STATUS
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
-.for file in dist/configure dist/configure.in docs/ref/program/thread.html
-	@ ${CP} ${WRKSRC}/db/${file} ${WRKSRC}/db/${file}.Dist
-	@ ${SED} -e 's#-lc_r#${PTHREAD_LIBS:S/"//g}#g' \
-		${WRKSRC}/db/${file}.Dist > ${WRKSRC}/db/${file}
+.for f in *.html *.gif
+	@${INSTALL_DATA} ${WRKSRC}/htdoc/${f} ${DOCSDIR}/html
 .endfor
-
-post-install:
-	@ ${MV} ${PREFIX}/etc/htdig/htdig.conf ${PREFIX}/etc/htdig/htdig.conf.sample
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/htdig/distinfo b/textproc/htdig/distinfo
index 52ea45c11a4e..0829de6f9606 100644
--- a/textproc/htdig/distinfo
+++ b/textproc/htdig/distinfo
@@ -1 +1,2 @@
-MD5 (htdig-3.1.6.tar.gz) = 7a2f20d8d6149efd8d119bb2ebf55f23
+MD5 (htdig-3.2.0b5.tar.gz) = 9068738dcb2048b1960de637ba81f7c9
+SIZE (htdig-3.2.0b5.tar.gz) = 2845736
diff --git a/textproc/htdig/files/RELENG_4-patch-htnet_SSLConnection.cc b/textproc/htdig/files/RELENG_4-patch-htnet_SSLConnection.cc
new file mode 100644
index 000000000000..08b527d31ab1
--- /dev/null
+++ b/textproc/htdig/files/RELENG_4-patch-htnet_SSLConnection.cc
@@ -0,0 +1,13 @@
+--- htnet/SSLConnection.cc.orig	Mon Jul 21 01:16:11 2003
++++ htnet/SSLConnection.cc	Fri Mar 19 00:57:38 2004
+@@ -29,6 +29,10 @@
+ #include <iostream.h>
+ #endif /* HAVE_STD */
+ 
++#include <sys/types.h>
++#include <sys/time.h>
++#include <unistd.h>
++
+ // Global needed only once in HtDig
+ //
+ SSL_CTX *SSLConnection::ctx = NULL;
diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist
index 4a74211f153e..b36a9ad7a1aa 100644
--- a/textproc/htdig/pkg-plist
+++ b/textproc/htdig/pkg-plist
@@ -1,43 +1,159 @@
+bin/htdb_dump
+bin/htdb_load
+bin/htdb_stat
 bin/htdig
 bin/htdump
 bin/htfuzzy
 bin/htload
 bin/htmerge
 bin/htnotify
+bin/htpurge
+bin/htstat
 bin/rundig
+etc/htdig/HtFileType-magic.mime
+etc/htdig/cookies.txt
 etc/htdig/htdig.conf.sample
-share/apache/cgi-bin/htsearch
-share/apache/htdocs/search.html
-share/apache/icons/htdig/button1.gif
-share/apache/icons/htdig/button1.png
-share/apache/icons/htdig/button10.gif
-share/apache/icons/htdig/button10.png
-share/apache/icons/htdig/button2.gif
-share/apache/icons/htdig/button2.png
-share/apache/icons/htdig/button3.gif
-share/apache/icons/htdig/button3.png
-share/apache/icons/htdig/button4.gif
-share/apache/icons/htdig/button4.png
-share/apache/icons/htdig/button5.gif
-share/apache/icons/htdig/button5.png
-share/apache/icons/htdig/button6.gif
-share/apache/icons/htdig/button6.png
-share/apache/icons/htdig/button7.gif
-share/apache/icons/htdig/button7.png
-share/apache/icons/htdig/button8.gif
-share/apache/icons/htdig/button8.png
-share/apache/icons/htdig/button9.gif
-share/apache/icons/htdig/button9.png
-share/apache/icons/htdig/buttonl.gif
-share/apache/icons/htdig/buttonl.png
-share/apache/icons/htdig/buttonr.gif
-share/apache/icons/htdig/buttonr.png
-share/apache/icons/htdig/htdig.gif
-share/apache/icons/htdig/htdig.png
-share/apache/icons/htdig/star.gif
-share/apache/icons/htdig/star.png
-share/apache/icons/htdig/star_blank.gif
-share/apache/icons/htdig/star_blank.png
+etc/htdig/mime.types
+include/htdig/Configuration.h
+include/htdig/Connection.h
+include/htdig/DB2_db.h
+include/htdig/Database.h
+include/htdig/Dictionary.h
+include/htdig/HtCodec.h
+include/htdig/HtCookie.h
+include/htdig/HtCookieInFileJar.h
+include/htdig/HtCookieJar.h
+include/htdig/HtCookieMemJar.h
+include/htdig/HtDateTime.h
+include/htdig/HtFTP.h
+include/htdig/HtFile.h
+include/htdig/HtHTTP.h
+include/htdig/HtHTTPBasic.h
+include/htdig/HtHTTPSecure.h
+include/htdig/HtHeap.h
+include/htdig/HtMaxMin.h
+include/htdig/HtNNTP.h
+include/htdig/HtPack.h
+include/htdig/HtRandom.h
+include/htdig/HtRegex.h
+include/htdig/HtRegexList.h
+include/htdig/HtRegexReplace.h
+include/htdig/HtRegexReplaceList.h
+include/htdig/HtTime.h
+include/htdig/HtVector.h
+include/htdig/HtVectorGeneric.h
+include/htdig/HtVectorGenericCode.h
+include/htdig/HtVector_String.h
+include/htdig/HtVector_int.h
+include/htdig/HtWordCodec.h
+include/htdig/HtWordType.h
+include/htdig/IntObject.h
+include/htdig/List.h
+include/htdig/Object.h
+include/htdig/ParsedString.h
+include/htdig/Queue.h
+include/htdig/QuotedStringList.h
+include/htdig/SSLConnection.h
+include/htdig/Stack.h
+include/htdig/StringList.h
+include/htdig/StringMatch.h
+include/htdig/Transport.h
+include/htdig/WordBitCompress.h
+include/htdig/WordCaseIsAStatements.h
+include/htdig/WordContext.h
+include/htdig/WordCursor.h
+include/htdig/WordDB.h
+include/htdig/WordDBCompress.h
+include/htdig/WordDBInfo.h
+include/htdig/WordDBPage.h
+include/htdig/WordKey.h
+include/htdig/WordKeyInfo.h
+include/htdig/WordList.h
+include/htdig/WordMonitor.h
+include/htdig/WordRecord.h
+include/htdig/WordRecordInfo.h
+include/htdig/WordReference.h
+include/htdig/WordStat.h
+include/htdig/WordType.h
+include/htdig/ber.h
+include/htdig/clib.h
+include/htdig/good_strtok.h
+include/htdig/gregex.h
+include/htdig/htString.h
+include/htdig/htconfig.h
+include/htdig/lib.h
+include/htdig/libdefs.h
+include/htdig/md5.h
+include/htdig/mhash_md5.h
+include/htdig/myqsort.h
+include/htdig_db/btree.h
+include/htdig_db/btree_auto.h
+include/htdig_db/btree_ext.h
+include/htdig_db/common_ext.h
+include/htdig_db/crdel_auto.h
+include/htdig_db/db.h
+include/htdig_db/db_am.h
+include/htdig_db/db_auto.h
+include/htdig_db/db_config.h
+include/htdig_db/db_dispatch.h
+include/htdig_db/db_ext.h
+include/htdig_db/db_int.h
+include/htdig_db/db_join.h
+include/htdig_db/db_page.h
+include/htdig_db/db_shash.h
+include/htdig_db/db_swap.h
+include/htdig_db/debug.h
+include/htdig_db/env_ext.h
+include/htdig_db/hash.h
+include/htdig_db/hash_auto.h
+include/htdig_db/hash_ext.h
+include/htdig_db/lock.h
+include/htdig_db/lock_ext.h
+include/htdig_db/log.h
+include/htdig_db/log_auto.h
+include/htdig_db/log_ext.h
+include/htdig_db/mp.h
+include/htdig_db/mp_ext.h
+include/htdig_db/mutex.h
+include/htdig_db/mutex_ext.h
+include/htdig_db/os.h
+include/htdig_db/os_ext.h
+include/htdig_db/os_jump.h
+include/htdig_db/qam.h
+include/htdig_db/qam_auto.h
+include/htdig_db/qam_ext.h
+include/htdig_db/queue.h
+include/htdig_db/region.h
+include/htdig_db/shqueue.h
+include/htdig_db/txn.h
+include/htdig_db/txn_auto.h
+include/htdig_db/txn_ext.h
+include/htdig_db/xa.h
+include/htdig_db/xa_ext.h
+lib/htdig/libcommon-3.2.0.so
+lib/htdig/libcommon.a
+lib/htdig/libcommon.la
+lib/htdig/libcommon.so
+lib/htdig/libfuzzy-3.2.0.so
+lib/htdig/libfuzzy.a
+lib/htdig/libfuzzy.la
+lib/htdig/libfuzzy.so
+lib/htdig/libht-3.2.0.so
+lib/htdig/libht.a
+lib/htdig/libht.la
+lib/htdig/libht.so
+lib/htdig/libhtnet-3.2.0.so
+lib/htdig/libhtnet.a
+lib/htdig/libhtnet.la
+lib/htdig/libhtnet.so
+lib/htdig/libhtword-3.2.0.so
+lib/htdig/libhtword.a
+lib/htdig/libhtword.la
+lib/htdig/libhtword.so
+lib/htdig_db/libhtdb-3.2.0.so
+lib/htdig_db/libhtdb.a
+lib/htdig_db/libhtdb.la
+lib/htdig_db/libhtdb.so
 share/htdig/common/bad_words
 share/htdig/common/english.0
 share/htdig/common/english.aff
@@ -49,8 +165,111 @@ share/htdig/common/short.html
 share/htdig/common/synonyms
 share/htdig/common/syntax.html
 share/htdig/common/wrapper.html
-@dirrm etc/htdig
-@dirrm share/apache/icons/htdig
-@dirrm share/htdig/common
-@dirrm share/htdig/database
-@dirrm share/htdig
+www/cgi-bin/htsearch
+www/cgi-bin/qtest
+www/data/search.html
+www/icons/htdig/button1.gif
+www/icons/htdig/button1.png
+www/icons/htdig/button10.gif
+www/icons/htdig/button10.png
+www/icons/htdig/button2.gif
+www/icons/htdig/button2.png
+www/icons/htdig/button3.gif
+www/icons/htdig/button3.png
+www/icons/htdig/button4.gif
+www/icons/htdig/button4.png
+www/icons/htdig/button5.gif
+www/icons/htdig/button5.png
+www/icons/htdig/button6.gif
+www/icons/htdig/button6.png
+www/icons/htdig/button7.gif
+www/icons/htdig/button7.png
+www/icons/htdig/button8.gif
+www/icons/htdig/button8.png
+www/icons/htdig/button9.gif
+www/icons/htdig/button9.png
+www/icons/htdig/buttonl.gif
+www/icons/htdig/buttonl.png
+www/icons/htdig/buttonr.gif
+www/icons/htdig/buttonr.png
+www/icons/htdig/htdig.gif
+www/icons/htdig/htdig.png
+www/icons/htdig/star.gif
+www/icons/htdig/star.png
+www/icons/htdig/star_blank.gif
+www/icons/htdig/star_blank.png
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.0
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/STATUS
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RELEASE.html
+%%PORTDOCS%%%%DOCSDIR%%/html/THANKS.html
+%%PORTDOCS%%%%DOCSDIR%%/html/TODO.html
+%%PORTDOCS%%%%DOCSDIR%%/html/all.html
+%%PORTDOCS%%%%DOCSDIR%%/html/attrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/attrs_head.html
+%%PORTDOCS%%%%DOCSDIR%%/html/attrs_tail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/author.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bdot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_blocks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_byname.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_byname_head.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_byname_tail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_byprog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_byprog_head.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_byprog_tail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_general.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_types.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cf_variables.html
+%%PORTDOCS%%%%DOCSDIR%%/html/config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/confindex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/confmenu.html
+%%PORTDOCS%%%%DOCSDIR%%/html/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dot.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/htdig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/htdig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htdig_big.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/htdump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htfuzzy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htload.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htmerge.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htnotify.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htpurge.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hts_form.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hts_general.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hts_menu.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hts_method.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hts_selectors.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hts_templates.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htsearch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/htstat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/isp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ma_menu.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailarchive.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/main.html
+%%PORTDOCS%%%%DOCSDIR%%/html/meta.html
+%%PORTDOCS%%%%DOCSDIR%%/html/notification.html
+%%PORTDOCS%%%%DOCSDIR%%/html/require.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rundig.html
+%%PORTDOCS%%%%DOCSDIR%%/html/running.html
+%%PORTDOCS%%%%DOCSDIR%%/html/triangle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/up.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/upgrade.html
+%%PORTDOCS%%%%DOCSDIR%%/html/uses.html
+%%PORTDOCS%%%%DOCSDIR%%/html/where.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/htdig
+@dirrm include/htdig_db
+@dirrm lib/htdig
+@dirrm lib/htdig_db
+@dirrm www/icons/htdig
+@unexec rmdir %D/share/htdig/common 2>/dev/null || true
+@unexec rmdir %D/share/htdig/database 2>/dev/null || true
+@unexec rmdir %D/share/htdig 2>/dev/null || true
+@unexec rmdir %D/etc/htdig 2>/dev/null || true