diff options
| author | wiz <wiz@pkgsrc.org> | 2011-12-05 10:18:16 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-12-05 10:18:16 +0000 |
| commit | 81016a12b741adf30a6feda3b0cb631db87a22f9 (patch) | |
| tree | fbdb3060094be507cdde370ee0ff7fc458e2faef /www | |
| parent | 9ba7e83f73cbcb7831cfeb6bc08c56aa36109543 (diff) | |
| download | pkgsrc-81016a12b741adf30a6feda3b0cb631db87a22f9.tar.gz | |
Update htdig using htdig-devel. Update packages using it
and bump their PKGREVISIONs. Remove htdig-devel.
Diffstat (limited to 'www')
31 files changed, 317 insertions, 711 deletions
diff --git a/www/Makefile b/www/Makefile index cb8f9dbfd3b..01383864971 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.836 2011/11/29 10:40:46 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.837 2011/12/05 10:18:16 wiz Exp $ # COMMENT= Packages related to the World Wide Web @@ -148,7 +148,6 @@ SUBDIR+= heel SUBDIR+= hiawatha SUBDIR+= horde SUBDIR+= htdig -SUBDIR+= htdig-devel SUBDIR+= htmldoc SUBDIR+= htmldoc-x11 SUBDIR+= htmlfix diff --git a/www/htdig-devel/DEINSTALL b/www/htdig-devel/DEINSTALL deleted file mode 100644 index fd43da00390..00000000000 --- a/www/htdig-devel/DEINSTALL +++ /dev/null @@ -1,11 +0,0 @@ -#!@SH@ -# -# $NetBSD: DEINSTALL,v 1.1 2011/12/01 09:56:39 wiz Exp $ - -case "${STAGE}" in -DEINSTALL) - ${RM} -f ${PREFIX}/share/htdig/common/root2word.db - ${RM} -f ${PREFIX}/share/htdig/common/synonyms.db - ${RM} -f ${PREFIX}/share/htdig/common/word2root.db - ;; -esac diff --git a/www/htdig-devel/DESCR b/www/htdig-devel/DESCR deleted file mode 100644 index aedb7500b8a..00000000000 --- a/www/htdig-devel/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -The ht://Dig system is a complete world wide web indexing and searching -system for a small domain or intranet. diff --git a/www/htdig-devel/INSTALL b/www/htdig-devel/INSTALL deleted file mode 100644 index 10366f85588..00000000000 --- a/www/htdig-devel/INSTALL +++ /dev/null @@ -1,10 +0,0 @@ -#!@SH@ -# -# $NetBSD: INSTALL,v 1.3 2006/01/08 20:25:58 markd Exp $ - -case "${STAGE}" in -POST-INSTALL) - ${PREFIX}/bin/htfuzzy -v synonyms - ${PREFIX}/bin/htfuzzy -v endings - ;; -esac diff --git a/www/htdig-devel/MESSAGE b/www/htdig-devel/MESSAGE deleted file mode 100644 index c31620a7c0b..00000000000 --- a/www/htdig-devel/MESSAGE +++ /dev/null @@ -1,13 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2005/12/17 19:26:26 markd Exp $ - -The sample ${PREFIX}/bin/rundig script may be run to create a database -in the newly created empty directory, ${DBDIR}. A sample search -form, which may be used to search that database, has been installed to -${PREFIX}/share/examples/htdig/search.html. - -For an example of how to set up ht://Dig and integrate it with your web -site, you may wish to examine the scripts installed into -/var/wwwoffle/html/htdig/scripts by the www/wwwoffle package. - -=========================================================================== diff --git a/www/htdig-devel/Makefile b/www/htdig-devel/Makefile deleted file mode 100644 index 31cf2380faf..00000000000 --- a/www/htdig-devel/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# $NetBSD: Makefile,v 1.11 2011/12/01 09:56:39 wiz Exp $ - -DISTNAME= htdig-3.2.0b6 -PKGREVISION= 1 -CATEGORIES= www databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=htdig/} \ - http://www.htdig.org/files/ \ - http://www.it.htdig.org/files/ -EXTRACT_SUFX= .tar.bz2 - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://htdig.sourceforge.net/ -COMMENT= WWW indexing and searching system - -PKG_DESTDIR_SUPPORT= user-destdir - -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin -CONFIGURE_ARGS+= --with-common-dir=${PREFIX}/share/htdig/common -CONFIGURE_ARGS+= --with-config-dir=${PKG_SYSCONFDIR:Q} -CONFIGURE_ARGS+= --with-database-dir=${DBDIR:Q} -CONFIGURE_ARGS+= --with-image-dir=${PREFIX}/share/examples/htdig -CONFIGURE_ARGS+= --with-search-dir=${PREFIX}/share/examples/htdig -CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread" -CXXFLAGS+= -Wno-deprecated - -PKG_SYSCONFSUBDIR= htdig - -DBDIR?= ${VARBASE}/db/htdig -MESSAGE_SUBST+= DBDIR=${DBDIR} -OWN_DIRS+= ${DBDIR} - -CONF_FILES+= ${PREFIX}/share/examples/htdig/HtFileType-magic.mime \ - ${PKG_SYSCONFDIR}/HtFileType-magic.mime -CONF_FILES+= ${PREFIX}/share/examples/htdig/cookies.txt \ - ${PKG_SYSCONFDIR}/cookies.txt -CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \ - ${PKG_SYSCONFDIR}/htdig.conf -CONF_FILES+= ${PREFIX}/share/examples/htdig/mime.types \ - ${PKG_SYSCONFDIR}/mime.types - -.include "../../devel/zlib/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/htdig-devel/PLIST b/www/htdig-devel/PLIST deleted file mode 100644 index 2b6b05571c7..00000000000 --- a/www/htdig-devel/PLIST +++ /dev/null @@ -1,196 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2011/12/01 09:56:39 wiz Exp $ -bin/HtFileType -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 -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.la -lib/htdig/libfuzzy.la -lib/htdig/libht.la -lib/htdig/libhtnet.la -lib/htdig/libhtword.la -lib/htdig_db/libhtdb.la -libexec/cgi-bin/htsearch -libexec/cgi-bin/qtest -man/man1/htdig-pdfparser.1 -man/man1/htdig.1 -man/man1/htdump.1 -man/man1/htfuzzy.1 -man/man1/htload.1 -man/man1/htmerge.1 -man/man1/htnotify.1 -man/man1/htpurge.1 -man/man1/htsearch.1 -man/man1/htstat.1 -man/man1/rundig.1 -man/man8/htdigconfig.8 -share/examples/htdig/HtFileType-magic.mime -share/examples/htdig/button1.gif -share/examples/htdig/button1.png -share/examples/htdig/button10.gif -share/examples/htdig/button10.png -share/examples/htdig/button2.gif -share/examples/htdig/button2.png -share/examples/htdig/button3.gif -share/examples/htdig/button3.png -share/examples/htdig/button4.gif -share/examples/htdig/button4.png -share/examples/htdig/button5.gif -share/examples/htdig/button5.png -share/examples/htdig/button6.gif -share/examples/htdig/button6.png -share/examples/htdig/button7.gif -share/examples/htdig/button7.png -share/examples/htdig/button8.gif -share/examples/htdig/button8.png -share/examples/htdig/button9.gif -share/examples/htdig/button9.png -share/examples/htdig/buttonl.gif -share/examples/htdig/buttonl.png -share/examples/htdig/buttonr.gif -share/examples/htdig/buttonr.png -share/examples/htdig/cookies.txt -share/examples/htdig/htdig.conf -share/examples/htdig/htdig.gif -share/examples/htdig/htdig.png -share/examples/htdig/mime.types -share/examples/htdig/search.html -share/examples/htdig/star.gif -share/examples/htdig/star.png -share/examples/htdig/star_blank.gif -share/examples/htdig/star_blank.png -share/htdig/common/bad_words -share/htdig/common/english.0 -share/htdig/common/english.aff -share/htdig/common/footer.html -share/htdig/common/header.html -share/htdig/common/long.html -share/htdig/common/nomatch.html -share/htdig/common/short.html -share/htdig/common/synonyms -share/htdig/common/syntax.html -share/htdig/common/wrapper.html diff --git a/www/htdig-devel/distinfo b/www/htdig-devel/distinfo deleted file mode 100644 index b0d0ced1bf6..00000000000 --- a/www/htdig-devel/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: distinfo,v 1.7 2009/05/30 04:25:34 hasso Exp $ - -SHA1 (htdig-3.2.0b6.tar.bz2) = 0b28134386e78fe724c56583fbc61b280551122a -RMD160 (htdig-3.2.0b6.tar.bz2) = 1e0900e11618ffe3d43a6fc26163e3ed926a1012 -Size (htdig-3.2.0b6.tar.bz2) = 2498246 bytes -SHA1 (patch-aa) = 6f4d22f84fe8caa809c1062e210200d9cea1a555 -SHA1 (patch-ab) = 864655d311c2a9fe1f5de8b150587f3625a7c8c7 -SHA1 (patch-ac) = 7c1239444519c2eeb56b83d4b41a947ace51c389 -SHA1 (patch-af) = 17b6f2f18c805cab76bd3b399057e035af16c70d -SHA1 (patch-ag) = 6105b1526f31bb7b757c3ceeae286c7f2c0aa007 -SHA1 (patch-ah) = e6e87151c7bd0a44d138d431bdcc7ce7f950d1ee -SHA1 (patch-ai) = f49a6cf6bc385e1025c7aa90cb268e2117e61dab -SHA1 (patch-aj) = f9f500f11b01f3002d366f3c4abef7db161c99f1 diff --git a/www/htdig-devel/patches/patch-ab b/www/htdig-devel/patches/patch-ab deleted file mode 100644 index 62fa7c5b199..00000000000 --- a/www/htdig-devel/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2009/01/17 09:13:10 adam Exp $ - ---- htsearch/Display.cc.orig 2009-01-17 10:05:37.000000000 +0100 -+++ htsearch/Display.cc -@@ -1541,7 +1541,7 @@ Display::buildMatchList() - // seconds in a 365 days year). The formula gives less weight - // as the distance between the date document and the current time - // increases (the absolute value is for documents with future date) --#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(abs((n) - (dd)) / 31536000))) -+#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(abs((int)((n) - (dd))) / 31536000))) - date_score = DATE_FACTOR(date_factor, now, thisRef->DocTime()); - score += date_score; - } diff --git a/www/htdig-devel/patches/patch-ac b/www/htdig-devel/patches/patch-ac deleted file mode 100644 index 81f1acba5f7..00000000000 --- a/www/htdig-devel/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/05/30 04:25:34 hasso Exp $ - ---- db/mut_pthread.c.orig 2009-05-28 12:54:31 +0300 -+++ db/mut_pthread.c 2009-05-28 12:55:30 +0300 -@@ -201,7 +201,11 @@ CDB___db_pthread_mutex_lock(mutexp) - * call, and Solaris delivers the signal to the wrong - * LWP. - */ -- if (ret != 0 && ret != ETIME && ret != ETIMEDOUT) -+ if (ret != 0 && -+#ifdef ETIME -+ ret != ETIME && -+#endif -+ ret != ETIMEDOUT) - return (ret); - } - diff --git a/www/htdig-devel/patches/patch-af b/www/htdig-devel/patches/patch-af deleted file mode 100644 index dca85343836..00000000000 --- a/www/htdig-devel/patches/patch-af +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-af,v 1.2 2008/01/14 09:46:45 yyamano Exp $ - ---- htsearch/htsearch.cc.orig 2004-05-28 22:15:24.000000000 +0900 -+++ htsearch/htsearch.cc -@@ -68,7 +68,7 @@ StringList collectionList; - // reconised word prefixes (for field-restricted search and per-word fuzzy - // algorithms) in *descending* alphabetical order. - // Don't use a dictionary structure, as setup time outweights saving. --struct {char *name; unsigned int flag; } colonPrefix [] = -+static struct {char *name; unsigned int flag; } colonPrefix [] = - { - { "url", FLAG_URL }, - { "title", FLAG_TITLE }, -@@ -211,8 +211,7 @@ main(int ac, char **av) - } - if (access((char*)configFile, R_OK) < 0) - { -- reportError(form("Unable to read configuration file '%s'", -- configFile.get())); -+ reportError(form("Unable to read configuration file.")); - } - config->Read(configFile); - diff --git a/www/htdig-devel/patches/patch-ag b/www/htdig-devel/patches/patch-ag deleted file mode 100644 index 63f5f2fc04a..00000000000 --- a/www/htdig-devel/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.1.1.1 2005/12/17 19:26:26 markd Exp $ - ---- htfuzzy/htfuzzy.cc.orig 2004-05-29 01:15:20.000000000 +1200 -+++ htfuzzy/htfuzzy.cc -@@ -127,8 +127,7 @@ main(int ac, char **av) - config->Defaults(&defaults[0]); - if (access((char*)configFile, R_OK) < 0) - { -- reportError(form("Unable to find configuration file '%s'", -- configFile.get())); -+ reportError(form("Unable to find configuration file.")); - } - config->Read(configFile); - diff --git a/www/htdig-devel/patches/patch-ah b/www/htdig-devel/patches/patch-ah deleted file mode 100644 index d8377c11669..00000000000 --- a/www/htdig-devel/patches/patch-ah +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ah,v 1.1.1.1 2005/12/17 19:26:26 markd Exp $ - ---- httools/htmerge.cc.orig 2004-05-29 01:15:25.000000000 +1200 -+++ httools/htmerge.cc -@@ -118,8 +118,7 @@ int main(int ac, char **av) - - if (access((char*)configfile, R_OK) < 0) - { -- reportError(form("Unable to find configuration file '%s'", -- configfile.get())); -+ reportError(form("Unable to find configuration file.")); - } - - config->Read(configfile); diff --git a/www/htdig-devel/patches/patch-ai b/www/htdig-devel/patches/patch-ai deleted file mode 100644 index 1715b68b46a..00000000000 --- a/www/htdig-devel/patches/patch-ai +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2005/12/17 19:26:26 markd Exp $ - ---- installdir/Makefile.in.orig 2005-12-15 01:15:44.000000000 +1300 -+++ installdir/Makefile.in -@@ -496,10 +496,10 @@ uninstall-man: uninstall-man1 uninstall- - install-data-local: all - $(mkinstalldirs) $(DESTDIR)$(DATABASE_DIR) - @echo "Installing default configuration files..." -- $(mkinstalldirs) $(DESTDIR)$(CONFIG_DIR) -- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/htdig.conf ]; then sed -e s%@\DATABASE_DIR@%$(DATABASE_DIR)% -e s%@\IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(DESTDIR)$(CONFIG_DIR)/htdig.conf; echo $(DESTDIR)$(CONFIG_DIR)/htdig.conf;fi -- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/mime.types ]; then cp $(top_srcdir)/installdir/mime.types $(DESTDIR)$(CONFIG_DIR)/mime.types; echo $(DESTDIR)$(CONFIG_DIR)/mime.types;fi -- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime ]; then cp $(top_srcdir)/installdir/HtFileType-magic.mime $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime; echo $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime;fi -+ $(mkinstalldirs) $(DESTDIR)$(SEARCH_DIR) -+ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%@\DATABASE_DIR@%$(DATABASE_DIR)% -e s%@\IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(DESTDIR)$(SEARCH_DIR)/htdig.conf; echo $(DESTDIR)$(CONFIG_DIR)/htdig.conf;fi -+ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/mime.types ]; then cp $(top_srcdir)/installdir/mime.types $(DESTDIR)$(SEARCH_DIR)/mime.types; echo $(DESTDIR)$(CONFIG_DIR)/mime.types;fi -+ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/HtFileType-magic.mime ]; then cp $(top_srcdir)/installdir/HtFileType-magic.mime $(DESTDIR)$(SEARCH_DIR)/HtFileType-magic.mime; echo $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime;fi - $(mkinstalldirs) $(DESTDIR)$(SEARCH_DIR) - @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%@\IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(DESTDIR)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(DESTDIR)$(SEARCH_DIR)/$(SEARCH_FORM);fi - $(mkinstalldirs) $(DESTDIR)$(COMMON_DIR) -@@ -509,7 +509,7 @@ install-data-local: all - @for i in $(COMMONDICT); do \ - if [ ! -f $(DESTDIR)$(COMMON_DIR)/$$i ]; then $(INSTALL_DATA) $(top_srcdir)/installdir/$$i $(DESTDIR)$(COMMON_DIR)/$$i; echo $(DESTDIR)$(COMMON_DIR)/$$i; fi; \ - done && test -z "$$fail" -- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/cookies.txt ]; then cp $(top_srcdir)/installdir/cookies.txt $(DESTDIR)$(CONFIG_DIR)/cookies.txt; echo $(DESTDIR)$(CONFIG_DIR)/cookies.txt;fi -+ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/cookies.txt ]; then cp $(top_srcdir)/installdir/cookies.txt $(DESTDIR)$(SEARCH_DIR)/cookies.txt; echo $(DESTDIR)$(CONFIG_DIR)/cookies.txt;fi - @echo "Installing images..." - $(mkinstalldirs) $(DESTDIR)$(IMAGE_DIR) - @for i in $(IMAGES); do \ diff --git a/www/htdig-devel/patches/patch-aj b/www/htdig-devel/patches/patch-aj deleted file mode 100644 index ae735567a85..00000000000 --- a/www/htdig-devel/patches/patch-aj +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2006/07/02 14:36:31 markd Exp $ - ---- include/htconfig.h.orig 2006-06-24 00:56:56.544745000 +1200 -+++ include/htconfig.h -@@ -10,6 +10,7 @@ - - #include <config.h> - -+#ifndef __cplusplus - #if HAVE_STDBOOL_H - # include <stdbool.h> - #else -@@ -25,4 +26,4 @@ - # define true 1 - # define __bool_true_false_are_defined 1 - #endif -- -+#endif diff --git a/www/htdig/DEINSTALL b/www/htdig/DEINSTALL index 97e09ce792f..1fc1f372acc 100644 --- a/www/htdig/DEINSTALL +++ b/www/htdig/DEINSTALL @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: DEINSTALL,v 1.4 2011/12/01 09:55:58 wiz Exp $ +# $NetBSD: DEINSTALL,v 1.5 2011/12/05 10:18:16 wiz Exp $ case "${STAGE}" in DEINSTALL) diff --git a/www/htdig/INSTALL b/www/htdig/INSTALL index 13332b528bc..d7a24db4a80 100644 --- a/www/htdig/INSTALL +++ b/www/htdig/INSTALL @@ -1,6 +1,6 @@ #!@SH@ # -# $NetBSD: INSTALL,v 1.1 2003/12/18 04:05:28 grant Exp $ +# $NetBSD: INSTALL,v 1.2 2011/12/05 10:18:17 wiz Exp $ case "${STAGE}" in POST-INSTALL) diff --git a/www/htdig/MESSAGE b/www/htdig/MESSAGE index 67d41825feb..aafb09b26d5 100644 --- a/www/htdig/MESSAGE +++ b/www/htdig/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2003/12/18 04:05:28 grant Exp $ +$NetBSD: MESSAGE,v 1.5 2011/12/05 10:18:17 wiz Exp $ The sample ${PREFIX}/bin/rundig script may be run to create a database in the newly created empty directory, ${DBDIR}. A sample search diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 10a77f6178f..d0b339196ec 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,50 +1,45 @@ -# $NetBSD: Makefile,v 1.38 2011/12/01 09:55:58 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2011/12/05 10:18:17 wiz Exp $ -DISTNAME= htdig-3.1.6 -PKGREVISION= 6 +DISTNAME= htdig-3.2.0b6 +PKGREVISION= 1 CATEGORIES= www databases -MASTER_SITES= http://www.htdig.org/files/ \ - http://www.it.htdig.org/files/ \ - ftp://www.it.htdig.org/pub/htdig/files/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=htdig/} \ + http://www.htdig.org/files/ \ + http://www.it.htdig.org/files/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://htdig.sourceforge.net/ COMMENT= WWW indexing and searching system -USE_LANGUAGES= c c++ +PKG_DESTDIR_SUPPORT= user-destdir -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:Q} \ - --with-database-dir=${DBDIR:Q} \ - --with-image-dir=${PREFIX}/share/examples/htdig \ - --with-search-dir=${PREFIX}/share/examples/htdig -MAKE_ENV+= INSTALL_ROOT=${DESTDIR:Q} -CONFIGURE_ENV+= PDF_PARSER="${PREFIX}/bin/acroread" -CXXFLAGS+= -Wno-deprecated -CPPFLAGS+= ${CXXFLAGS} +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin +CONFIGURE_ARGS+= --with-common-dir=${PREFIX}/share/htdig/common +CONFIGURE_ARGS+= --with-config-dir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-database-dir=${DBDIR:Q} +CONFIGURE_ARGS+= --with-image-dir=${PREFIX}/share/examples/htdig +CONFIGURE_ARGS+= --with-search-dir=${PREFIX}/share/examples/htdig +CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread" +CXXFLAGS+= -Wno-deprecated PKG_SYSCONFSUBDIR= htdig -BUILD_DEFS+= VARBASE - DBDIR?= ${VARBASE}/db/htdig MESSAGE_SUBST+= DBDIR=${DBDIR} OWN_DIRS+= ${DBDIR} +CONF_FILES+= ${PREFIX}/share/examples/htdig/HtFileType-magic.mime \ + ${PKG_SYSCONFDIR}/HtFileType-magic.mime +CONF_FILES+= ${PREFIX}/share/examples/htdig/cookies.txt \ + ${PKG_SYSCONFDIR}/cookies.txt CONF_FILES+= ${PREFIX}/share/examples/htdig/htdig.conf \ ${PKG_SYSCONFDIR}/htdig.conf +CONF_FILES+= ${PREFIX}/share/examples/htdig/mime.types \ + ${PKG_SYSCONFDIR}/mime.types -EXTRACT_OPTS+= -x -EXTRACT_ELEMENTS= ${DISTNAME}/db* - -PKG_DESTDIR_SUPPORT= user-destdir - -.include "../../databases/db/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" - -post-patch: - ${TOUCH} ${WRKSRC}/configure - .include "../../mk/bsd.pkg.mk" diff --git a/www/htdig/PLIST b/www/htdig/PLIST index d9f62b71614..f3721ab4435 100644 --- a/www/htdig/PLIST +++ b/www/htdig/PLIST @@ -1,52 +1,196 @@ -@comment $NetBSD: PLIST,v 1.9 2011/12/01 09:55:58 wiz Exp $ -bin/htfuzzy +@comment $NetBSD: PLIST,v 1.10 2011/12/05 10:18:17 wiz Exp $ +bin/HtFileType +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 +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.la +lib/htdig/libfuzzy.la +lib/htdig/libht.la +lib/htdig/libhtnet.la +lib/htdig/libhtword.la +lib/htdig_db/libhtdb.la libexec/cgi-bin/htsearch -share/examples/htdig/htdig.conf -share/examples/htdig/search.html +libexec/cgi-bin/qtest +man/man1/htdig-pdfparser.1 +man/man1/htdig.1 +man/man1/htdump.1 +man/man1/htfuzzy.1 +man/man1/htload.1 +man/man1/htmerge.1 +man/man1/htnotify.1 +man/man1/htpurge.1 +man/man1/htsearch.1 +man/man1/htstat.1 +man/man1/rundig.1 +man/man8/htdigconfig.8 +share/examples/htdig/HtFileType-magic.mime share/examples/htdig/button1.gif -share/examples/htdig/button2.gif -share/examples/htdig/button3.gif -share/examples/htdig/button4.gif -share/examples/htdig/button5.gif -share/examples/htdig/button6.gif -share/examples/htdig/button7.gif -share/examples/htdig/button8.gif -share/examples/htdig/button9.gif -share/examples/htdig/buttonl.gif -share/examples/htdig/buttonr.gif -share/examples/htdig/button10.gif -share/examples/htdig/htdig.gif -share/examples/htdig/star.gif -share/examples/htdig/star_blank.gif share/examples/htdig/button1.png +share/examples/htdig/button10.gif +share/examples/htdig/button10.png +share/examples/htdig/button2.gif share/examples/htdig/button2.png +share/examples/htdig/button3.gif share/examples/htdig/button3.png +share/examples/htdig/button4.gif share/examples/htdig/button4.png +share/examples/htdig/button5.gif share/examples/htdig/button5.png +share/examples/htdig/button6.gif share/examples/htdig/button6.png +share/examples/htdig/button7.gif share/examples/htdig/button7.png +share/examples/htdig/button8.gif share/examples/htdig/button8.png +share/examples/htdig/button9.gif share/examples/htdig/button9.png +share/examples/htdig/buttonl.gif share/examples/htdig/buttonl.png +share/examples/htdig/buttonr.gif share/examples/htdig/buttonr.png -share/examples/htdig/button10.png +share/examples/htdig/cookies.txt +share/examples/htdig/htdig.conf +share/examples/htdig/htdig.gif share/examples/htdig/htdig.png +share/examples/htdig/mime.types +share/examples/htdig/search.html +share/examples/htdig/star.gif share/examples/htdig/star.png +share/examples/htdig/star_blank.gif share/examples/htdig/star_blank.png -share/htdig/common/header.html -share/htdig/common/footer.html -share/htdig/common/wrapper.html -share/htdig/common/nomatch.html -share/htdig/common/syntax.html -share/htdig/common/long.html -share/htdig/common/short.html share/htdig/common/bad_words share/htdig/common/english.0 share/htdig/common/english.aff +share/htdig/common/footer.html +share/htdig/common/header.html +share/htdig/common/long.html +share/htdig/common/nomatch.html +share/htdig/common/short.html share/htdig/common/synonyms +share/htdig/common/syntax.html +share/htdig/common/wrapper.html diff --git a/www/htdig/distinfo b/www/htdig/distinfo index aea0757bcce..95ef48c1ea9 100644 --- a/www/htdig/distinfo +++ b/www/htdig/distinfo @@ -1,14 +1,13 @@ -$NetBSD: distinfo,v 1.7 2009/11/30 01:28:45 dholland Exp $ +$NetBSD: distinfo,v 1.8 2011/12/05 10:18:17 wiz Exp $ -SHA1 (htdig-3.1.6.tar.gz) = 603fc244ba59ee1efcbe8f2ba087567cb14468d0 -RMD160 (htdig-3.1.6.tar.gz) = 1414943255f16cd278a31b8014a5bfe6c4400ead -Size (htdig-3.1.6.tar.gz) = 2068675 bytes -SHA1 (patch-ab) = 504136ce6ac0a2beed574c88ee6d9b8ef90d6564 -SHA1 (patch-ac) = d1f6ef3c4c7a2995217f391a4bf9d544e10f5a00 -SHA1 (patch-ad) = a727a2c3afdd697f0e2e46355f1e89bc70775bbf -SHA1 (patch-ae) = 1be8e82b97bb9b16dcc301f3f02e642a41945878 -SHA1 (patch-af) = f9c83efb788cb735f42df606ee451324795140d6 -SHA1 (patch-ag) = d3c0c1b043e27706834aecf7ac0b07651ed5b438 -SHA1 (patch-ah) = e4df51f19717527c3a368cdcaffb4f3c8e7be521 -SHA1 (patch-ai) = 123411dbd3cd53a8765f1130299873eb1aa91389 -SHA1 (patch-aj) = 1f661df74cbf2661737b0c76f8b04e04325909ca +SHA1 (htdig-3.2.0b6.tar.bz2) = 0b28134386e78fe724c56583fbc61b280551122a +RMD160 (htdig-3.2.0b6.tar.bz2) = 1e0900e11618ffe3d43a6fc26163e3ed926a1012 +Size (htdig-3.2.0b6.tar.bz2) = 2498246 bytes +SHA1 (patch-aa) = 6f4d22f84fe8caa809c1062e210200d9cea1a555 +SHA1 (patch-ab) = 864655d311c2a9fe1f5de8b150587f3625a7c8c7 +SHA1 (patch-ac) = 7c1239444519c2eeb56b83d4b41a947ace51c389 +SHA1 (patch-af) = 17b6f2f18c805cab76bd3b399057e035af16c70d +SHA1 (patch-ag) = 6105b1526f31bb7b757c3ceeae286c7f2c0aa007 +SHA1 (patch-ah) = e6e87151c7bd0a44d138d431bdcc7ce7f950d1ee +SHA1 (patch-ai) = f49a6cf6bc385e1025c7aa90cb268e2117e61dab +SHA1 (patch-aj) = f9f500f11b01f3002d366f3c4abef7db161c99f1 diff --git a/www/htdig-devel/patches/patch-aa b/www/htdig/patches/patch-aa index c516eb72005..54f8dfd59d1 100644 --- a/www/htdig-devel/patches/patch-aa +++ b/www/htdig/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2006/06/14 19:23:30 adam Exp $ +$NetBSD: patch-aa,v 1.4 2011/12/05 10:18:17 wiz Exp $ --- htsearch/Collection.h.orig 2006-06-14 21:30:31.000000000 +0200 +++ htsearch/Collection.h diff --git a/www/htdig/patches/patch-ab b/www/htdig/patches/patch-ab index b871778e45b..89f940fdd71 100644 --- a/www/htdig/patches/patch-ab +++ b/www/htdig/patches/patch-ab @@ -1,23 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2002/03/09 21:48:12 fredb Exp $ +$NetBSD: patch-ab,v 1.3 2011/12/05 10:18:17 wiz Exp $ ---- Makefile.in.orig Thu Jan 31 17:47:14 2002 -+++ Makefile.in -@@ -26,8 +26,7 @@ - top_builddir= . - include Makefile.config - --DIRS= db/dist \ -- htlib htcommon htfuzzy htdig \ -+DIRS= htlib htcommon htfuzzy htdig \ - htsearch htmerge htnotify - INSTALLDIRS= htfuzzy htdig \ - htsearch htmerge htnotify -@@ -93,7 +92,7 @@ - done && test -z "$$fail" - @echo "" - @echo "Installing default configuration files..." -- @if [ ! -f $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE) ]; then sed -e s%\@DATABASE_DIR\@%$(DATABASE_DIR)% -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE); echo $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE);fi -+ @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%\@DATABASE_DIR\@%$(DATABASE_DIR)% -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(INSTALL_ROOT)$(SEARCH_DIR)/htdig.conf; echo $(INSTALL_ROOT)$(DEFAULT_CONFIG_FILE);fi - @if [ ! -f $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(INSTALL_ROOT)$(SEARCH_DIR)/$(SEARCH_FORM);fi - @for i in $(COMMONHTML); do \ - if [ ! -f $(INSTALL_ROOT)$(COMMON_DIR)/$$i ]; then sed -e s%\@IMAGEDIR\@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/$$i >$(INSTALL_ROOT)$(COMMON_DIR)/$$i; echo $(INSTALL_ROOT)$(COMMON_DIR)/$$i;fi; \ +--- htsearch/Display.cc.orig 2009-01-17 10:05:37.000000000 +0100 ++++ htsearch/Display.cc +@@ -1541,7 +1541,7 @@ Display::buildMatchList() + // seconds in a 365 days year). The formula gives less weight + // as the distance between the date document and the current time + // increases (the absolute value is for documents with future date) +-#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(abs((n) - (dd)) / 31536000))) ++#define DATE_FACTOR(df, n, dd) ((df) * 100 / (1+(double)(abs((int)((n) - (dd))) / 31536000))) + date_score = DATE_FACTOR(date_factor, now, thisRef->DocTime()); + score += date_score; + } diff --git a/www/htdig/patches/patch-ac b/www/htdig/patches/patch-ac index 6141fd2bbd0..ea4c82846e0 100644 --- a/www/htdig/patches/patch-ac +++ b/www/htdig/patches/patch-ac @@ -1,20 +1,17 @@ -$NetBSD: patch-ac,v 1.1 1999/09/23 01:33:30 fredb Exp $ +$NetBSD: patch-ac,v 1.2 2011/12/05 10:18:17 wiz Exp $ ---- Makefile.config.in.orig Wed Apr 21 21:47:53 1999 -+++ Makefile.config.in Wed Sep 22 06:18:03 1999 -@@ -24,12 +24,11 @@ - SENDMAIL= @SENDMAIL@ +--- db/mut_pthread.c.orig 2009-05-28 12:54:31 +0300 ++++ db/mut_pthread.c 2009-05-28 12:55:30 +0300 +@@ -201,7 +201,11 @@ CDB___db_pthread_mutex_lock(mutexp) + * call, and Solaris delivers the signal to the wrong + * LWP. + */ +- if (ret != 0 && ret != ETIME && ret != ETIMEDOUT) ++ if (ret != 0 && ++#ifdef ETIME ++ ret != ETIME && ++#endif ++ ret != ETIMEDOUT) + return (ret); + } - DEFINES= -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" --LIBDIRS= -L../htlib -L../htcommon -L../db/dist -L/usr/lib -+LIBDIRS= -L../htlib -L../htcommon - INCS= -I$(top_srcdir)/htlib -I$(top_srcdir)/htcommon \ -- -I../db/dist -I../include -+ -I$(prefix)/include/db2 -I../include - HTLIBS= ../htcommon/libcommon.a \ -- ../htlib/libht.a \ -- ../db/dist/libdb.a -+ ../htlib/libht.a - LIBS= $(HTLIBS) @LIBS@ - - DIST= @PACKAGE@-@VERSION@ diff --git a/www/htdig/patches/patch-ad b/www/htdig/patches/patch-ad deleted file mode 100644 index 4460913f04b..00000000000 --- a/www/htdig/patches/patch-ad +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2002/03/09 21:48:12 fredb Exp $ - -Note to Porters -=============== - -This patch isn't actually used by the package, rather it's included for -the convenience of the packagers. If the subsequent patch to configure -fails, the patched configure.in can be used to regenerate configure. - ---- configure.in.orig Wed Apr 21 21:47:53 1999 -+++ configure.in Tue Sep 21 15:43:57 1999 -@@ -64,6 +64,7 @@ - AC_AIX - - dnl Checks for libraries. -+AC_CHECK_LIB(db2, db_appinit) - AC_CHECK_LIB(socket, socket) - AC_CHECK_LIB(nsl, t_accept) - if test $WITH_ZLIB = yes; then -@@ -140,7 +141,7 @@ - if test ! -d "./db"; then - mkdir db - fi --AC_CONFIG_SUBDIRS(db/dist) -+dnl AC_CONFIG_SUBDIRS(db/dist) - - AC_OUTPUT(CONFIG Makefile Makefile.config htcommon/Makefile htlib/Makefile htdig/Makefile htmerge/Makefile htnotify/Makefile htfuzzy/Makefile htsearch/Makefile makedp, chmod +x makedp, echo timestamp > stamp-h) - diff --git a/www/htdig/patches/patch-ae b/www/htdig/patches/patch-ae deleted file mode 100644 index 1453bfad23e..00000000000 --- a/www/htdig/patches/patch-ae +++ /dev/null @@ -1,91 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2002/03/09 21:48:12 fredb Exp $ - ---- configure.orig Thu Jan 31 17:47:14 2002 -+++ configure -@@ -1761,6 +1761,53 @@ - - - -+echo $ac_n "checking for db_appinit in -ldb2""... $ac_c" 1>&6 -+echo "configure:1766: checking for db_appinit in -ldb2" >&5 -+ac_lib_var=`echo db2'_'db_appinit | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ldb2 $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 1774 "configure" -+#include "confdefs.h" -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char db_appinit(); -+ -+int main() { -+db_appinit() -+; return 0; } -+EOF -+if { (eval echo configure:1785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo db2 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <<EOF -+#define $ac_tr_lib 1 -+EOF -+ -+ LIBS="-ldb2 $LIBS" -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ - echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 - echo "configure:1766: checking for socket in -lsocket" >&5 - ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` -@@ -2633,10 +2680,10 @@ - cross_compiling=$ac_cv_prog_cc_cross - - --if test ! -d "./db"; then -- mkdir db --fi --subdirs="db/dist" -+#if test ! -d "./db"; then -+# mkdir db -+#fi -+#subdirs="db/dist" - - - trap '' 1 2 15 -@@ -2807,7 +2854,7 @@ - s%@CPP@%$CPP%g - s%@CXXCPP@%$CXXCPP%g - s%@LIBOBJS@%$LIBOBJS%g --s%@subdirs@%$subdirs%g -+#s%@subdirs@%$subdirs%g - - CEOF - EOF -@@ -3027,7 +3074,7 @@ - rm -fr confdefs* $ac_clean_files - test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - --if test "$no_recursion" != yes; then -+if false; then - - # Remove --cache-file and --srcdir arguments so they do not pile up. - ac_sub_configure_args= diff --git a/www/htdig/patches/patch-af b/www/htdig/patches/patch-af index 366ae85780e..b4f3b02950d 100644 --- a/www/htdig/patches/patch-af +++ b/www/htdig/patches/patch-af @@ -1,14 +1,23 @@ -$NetBSD: patch-af,v 1.1 2005/03/20 20:34:27 salo Exp $ +$NetBSD: patch-af,v 1.2 2011/12/05 10:18:17 wiz Exp $ ---- htsearch/htsearch.cc.orig 2002-02-01 00:47:18.000000000 +0100 -+++ htsearch/htsearch.cc 2005-03-20 21:15:02.000000000 +0100 -@@ -145,8 +145,7 @@ - if (access(configFile, R_OK) < 0) - { - if (filenameok) filenamemsg << " '" << configFile.get() << "'"; -- reportError(form("Unable to read configuration file%s", -- filenamemsg.get())); -+ reportError(form("Unable to read configuration file.")); - } - config.Read(configFile); +--- htsearch/htsearch.cc.orig 2004-05-28 22:15:24.000000000 +0900 ++++ htsearch/htsearch.cc +@@ -68,7 +68,7 @@ StringList collectionList; + // reconised word prefixes (for field-restricted search and per-word fuzzy + // algorithms) in *descending* alphabetical order. + // Don't use a dictionary structure, as setup time outweights saving. +-struct {char *name; unsigned int flag; } colonPrefix [] = ++static struct {char *name; unsigned int flag; } colonPrefix [] = + { + { "url", FLAG_URL }, + { "title", FLAG_TITLE }, +@@ -211,8 +211,7 @@ main(int ac, char **av) + } + if (access((char*)configFile, R_OK) < 0) + { +- reportError(form("Unable to read configuration file '%s'", +- configFile.get())); ++ reportError(form("Unable to read configuration file.")); + } + config->Read(configFile); diff --git a/www/htdig/patches/patch-ag b/www/htdig/patches/patch-ag index 475841a3c97..adc4ae7d918 100644 --- a/www/htdig/patches/patch-ag +++ b/www/htdig/patches/patch-ag @@ -1,14 +1,14 @@ -$NetBSD: patch-ag,v 1.1 2005/03/20 20:34:27 salo Exp $ +$NetBSD: patch-ag,v 1.2 2011/12/05 10:18:17 wiz Exp $ ---- htfuzzy/htfuzzy.cc.orig 2002-02-01 00:47:17.000000000 +0100 -+++ htfuzzy/htfuzzy.cc 2005-03-20 21:16:14.000000000 +0100 -@@ -148,8 +148,7 @@ - config.Defaults(&defaults[0]); - if (access(configFile, R_OK) < 0) +--- htfuzzy/htfuzzy.cc.orig 2004-05-29 01:15:20.000000000 +1200 ++++ htfuzzy/htfuzzy.cc +@@ -127,8 +127,7 @@ main(int ac, char **av) + config->Defaults(&defaults[0]); + if (access((char*)configFile, R_OK) < 0) { - reportError(form("Unable to find configuration file '%s'", - configFile.get())); + reportError(form("Unable to find configuration file.")); } - config.Read(configFile); + config->Read(configFile); diff --git a/www/htdig/patches/patch-ah b/www/htdig/patches/patch-ah index 6aceb28ffd7..f34c2ad6ba8 100644 --- a/www/htdig/patches/patch-ah +++ b/www/htdig/patches/patch-ah @@ -1,14 +1,14 @@ -$NetBSD: patch-ah,v 1.1 2005/03/20 20:34:27 salo Exp $ +$NetBSD: patch-ah,v 1.2 2011/12/05 10:18:17 wiz Exp $ ---- htmerge/htmerge.cc.orig 2002-02-01 00:47:18.000000000 +0100 -+++ htmerge/htmerge.cc 2005-03-20 21:24:02.000000000 +0100 -@@ -116,8 +116,7 @@ +--- httools/htmerge.cc.orig 2004-05-29 01:15:25.000000000 +1200 ++++ httools/htmerge.cc +@@ -118,8 +118,7 @@ int main(int ac, char **av) - if (access(configfile, R_OK) < 0) + if (access((char*)configfile, R_OK) < 0) { - reportError(form("Unable to find configuration file '%s'", - configfile.get())); + reportError(form("Unable to find configuration file.")); } - config.Read(configfile); + config->Read(configfile); diff --git a/www/htdig/patches/patch-ai b/www/htdig/patches/patch-ai index f5e5d7dbad6..cb37a4fb418 100644 --- a/www/htdig/patches/patch-ai +++ b/www/htdig/patches/patch-ai @@ -1,22 +1,28 @@ -$NetBSD: patch-ai,v 1.1 2007/01/24 10:25:15 sborrill Exp $ +$NetBSD: patch-ai,v 1.2 2011/12/05 10:18:17 wiz Exp $ ---- htnotify/htnotify.cc.orig 2002-01-31 23:47:18.000000000 +0000 -+++ htnotify/htnotify.cc 2007-01-24 09:50:09.000000000 +0000 -@@ -185,7 +185,7 @@ - // define default preamble text - blank string - preambleText = ""; - -- if (prefixfile != NULL) -+ if (prefixfile != NULL && prefixfile[0] != 0) - { - ifstream in(prefixfile); - char buffer[1024]; -@@ -212,7 +212,7 @@ - postambleText << " http://www.htdig.org/meta.html\n\n"; - postambleText << "Cheers!\n\nht://Dig Notification Service\n"; - -- if (suffixfile != NULL) -+ if (suffixfile != NULL && suffixfile[0] != 0) - { - ifstream in(suffixfile); - char buffer[1024]; +--- installdir/Makefile.in.orig 2005-12-15 01:15:44.000000000 +1300 ++++ installdir/Makefile.in +@@ -496,10 +496,10 @@ uninstall-man: uninstall-man1 uninstall- + install-data-local: all + $(mkinstalldirs) $(DESTDIR)$(DATABASE_DIR) + @echo "Installing default configuration files..." +- $(mkinstalldirs) $(DESTDIR)$(CONFIG_DIR) +- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/htdig.conf ]; then sed -e s%@\DATABASE_DIR@%$(DATABASE_DIR)% -e s%@\IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(DESTDIR)$(CONFIG_DIR)/htdig.conf; echo $(DESTDIR)$(CONFIG_DIR)/htdig.conf;fi +- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/mime.types ]; then cp $(top_srcdir)/installdir/mime.types $(DESTDIR)$(CONFIG_DIR)/mime.types; echo $(DESTDIR)$(CONFIG_DIR)/mime.types;fi +- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime ]; then cp $(top_srcdir)/installdir/HtFileType-magic.mime $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime; echo $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime;fi ++ $(mkinstalldirs) $(DESTDIR)$(SEARCH_DIR) ++ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/htdig.conf ]; then sed -e s%@\DATABASE_DIR@%$(DATABASE_DIR)% -e s%@\IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/htdig.conf >$(DESTDIR)$(SEARCH_DIR)/htdig.conf; echo $(DESTDIR)$(CONFIG_DIR)/htdig.conf;fi ++ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/mime.types ]; then cp $(top_srcdir)/installdir/mime.types $(DESTDIR)$(SEARCH_DIR)/mime.types; echo $(DESTDIR)$(CONFIG_DIR)/mime.types;fi ++ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/HtFileType-magic.mime ]; then cp $(top_srcdir)/installdir/HtFileType-magic.mime $(DESTDIR)$(SEARCH_DIR)/HtFileType-magic.mime; echo $(DESTDIR)$(CONFIG_DIR)/HtFileType-magic.mime;fi + $(mkinstalldirs) $(DESTDIR)$(SEARCH_DIR) + @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/$(SEARCH_FORM) ]; then sed -e s%@\IMAGEDIR@%$(IMAGE_URL_PREFIX)% $(top_srcdir)/installdir/search.html >$(DESTDIR)$(SEARCH_DIR)/$(SEARCH_FORM); echo $(DESTDIR)$(SEARCH_DIR)/$(SEARCH_FORM);fi + $(mkinstalldirs) $(DESTDIR)$(COMMON_DIR) +@@ -509,7 +509,7 @@ install-data-local: all + @for i in $(COMMONDICT); do \ + if [ ! -f $(DESTDIR)$(COMMON_DIR)/$$i ]; then $(INSTALL_DATA) $(top_srcdir)/installdir/$$i $(DESTDIR)$(COMMON_DIR)/$$i; echo $(DESTDIR)$(COMMON_DIR)/$$i; fi; \ + done && test -z "$$fail" +- @if [ ! -f $(DESTDIR)$(CONFIG_DIR)/cookies.txt ]; then cp $(top_srcdir)/installdir/cookies.txt $(DESTDIR)$(CONFIG_DIR)/cookies.txt; echo $(DESTDIR)$(CONFIG_DIR)/cookies.txt;fi ++ @if [ ! -f $(DESTDIR)$(SEARCH_DIR)/cookies.txt ]; then cp $(top_srcdir)/installdir/cookies.txt $(DESTDIR)$(SEARCH_DIR)/cookies.txt; echo $(DESTDIR)$(CONFIG_DIR)/cookies.txt;fi + @echo "Installing images..." + $(mkinstalldirs) $(DESTDIR)$(IMAGE_DIR) + @for i in $(IMAGES); do \ diff --git a/www/htdig/patches/patch-aj b/www/htdig/patches/patch-aj index 8133a482931..7afc7987b43 100644 --- a/www/htdig/patches/patch-aj +++ b/www/htdig/patches/patch-aj @@ -1,15 +1,18 @@ -$NetBSD: patch-aj,v 1.1 2009/11/30 01:28:45 dholland Exp $ +$NetBSD: patch-aj,v 1.2 2011/12/05 10:18:17 wiz Exp $ -Fix LP64 build. - ---- htdig/SGMLEntities.cc~ 2002-01-31 18:47:17.000000000 -0500 -+++ htdig/SGMLEntities.cc 2009-11-29 20:30:47.000000000 -0500 -@@ -154,7 +154,7 @@ SGMLEntities::translate(char *entity) - return ' '; - if (junk.trans->Exists(entity)) - { -- return (unsigned char) ((int) (*junk.trans)[entity]); -+ return (unsigned char) ((int)(intptr_t) (*junk.trans)[entity]); - } - else if (*entity == '#' && isdigit(entity[1])) - { +--- include/htconfig.h.orig 2006-06-24 00:56:56.544745000 +1200 ++++ include/htconfig.h +@@ -10,6 +10,7 @@ + + #include <config.h> + ++#ifndef __cplusplus + #if HAVE_STDBOOL_H + # include <stdbool.h> + #else +@@ -25,4 +26,4 @@ + # define true 1 + # define __bool_true_false_are_defined 1 + #endif +- ++#endif |