- Update to 1.0.0

PR:		ports/113035
Submitted by:	Gea-Suan Lin <gslin_AT_gslin dot org>
Reviewed by:	maintainer (Jean-Francois Dockes)
Approved by:	maintainer

10 files changed, 138 insertions, 236 deletions

diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index 6a1763e5e567..9aa2f8159e20 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xapian-core
-PORTVERSION=	0.9.10
+PORTVERSION=	1.0.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
@@ -19,8 +19,9 @@ CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 xapian-compact.1 \
-		xapian-config.1 xapian-progsrv.1 xapian-tcpsrv.1
+MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 \
+		xapian-check.1 xapian-compact.1 xapian-config.1 \
+		xapian-progsrv.1 xapian-tcpsrv.1
 
 post-install:
 .for file in delve quest copydatabase
diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo
index 7effc2a2dd60..af5cddc029c8 100644
--- a/databases/xapian-core/distinfo
+++ b/databases/xapian-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (xapian-core-0.9.10.tar.gz) = a45d34a9539493cfdffe16fea8022faf
-SHA256 (xapian-core-0.9.10.tar.gz) = c1a61f6e3d03d1b29f49ef4d2d29fdfa7dd67bbe723c915873cb4f3df7f08381
-SIZE (xapian-core-0.9.10.tar.gz) = 2845654
+MD5 (xapian-core-1.0.0.tar.gz) = d6cd27103fc057f3a7c4d8d18bd3023d
+SHA256 (xapian-core-1.0.0.tar.gz) = de2f514e70eca9900d093f50b811919ebca2521959f57c14d4b10d85e08474f4
+SIZE (xapian-core-1.0.0.tar.gz) = 2562889
diff --git a/databases/xapian-core/files/patch-Makefile.in b/databases/xapian-core/files/patch-Makefile.in
new file mode 100644
index 000000000000..c667f3896a0f
--- /dev/null
+++ b/databases/xapian-core/files/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- Makefile.in.orig	Fri May 18 00:58:07 2007
++++ Makefile.in	Fri May 18 13:10:33 2007
+@@ -49,7 +49,8 @@
+ @VPATH_BUILD_TRUE@am__append_1 = -I$(top_builddir)/include \
+ @VPATH_BUILD_TRUE@	-I$(top_srcdir)/languages -Ilanguages \
+ @VPATH_BUILD_TRUE@	-I$(top_srcdir)/queryparser
+-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
++bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) 
++noinst_PROGRAMS = \
+ 	examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \
+ 	examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \
+ 	examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT)
+@@ -464,7 +465,7 @@
+ @BUILD_BACKEND_REMOTE_TRUE@am__EXEEXT_3 = bin/xapian-progsrv$(EXEEXT) \
+ @BUILD_BACKEND_REMOTE_TRUE@	bin/xapian-tcpsrv$(EXEEXT)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_bin_quartzcheck_OBJECTS =  \
+ 	bin/bin_quartzcheck-quartzcheck.$(OBJEXT)
+ bin_quartzcheck_OBJECTS = $(am_bin_quartzcheck_OBJECTS)
+@@ -909,9 +910,7 @@
+ libxapian_la_LDFLAGS = $(XAPIAN_LDFLAGS) -no-undefined -version-info $(LIBRARY_VERSION_INFO)
+ @MAINTAINER_NO_DOCS_FALSE@dist_man_MANS = xapian-config.1 \
+ @MAINTAINER_NO_DOCS_FALSE@	$(am__append_3) $(am__append_5) \
+-@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7) \
+-@MAINTAINER_NO_DOCS_FALSE@	examples/copydatabase.1 \
+-@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1
++@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7)
+ bin_quartzcheck_CXXFLAGS = -I$(top_srcdir)/backends/quartz
+ bin_quartzcheck_SOURCES = bin/quartzcheck.cc
+ bin_quartzcheck_LDADD = $(ldflags) libquartzcheck.la libxapian.la
diff --git a/databases/xapian-core/files/patch-examples-Makefile.in b/databases/xapian-core/files/patch-examples-Makefile.in
deleted file mode 100644
index db049a9bd3b9..000000000000
--- a/databases/xapian-core/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Fri Jul 15 12:22:59 2005
-+++ examples/Makefile.in	Mon Nov  7 12:02:24 2005
-@@ -442,7 +442,7 @@
- 	for dir in "$(DESTDIR)$(bindir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
--install: install-am
-+install:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
diff --git a/databases/xapian-core/pkg-plist b/databases/xapian-core/pkg-plist
index c50320de4f1c..11fbc225374a 100644
--- a/databases/xapian-core/pkg-plist
+++ b/databases/xapian-core/pkg-plist
@@ -1,7 +1,8 @@
 @comment $FreeBSD$
-bin/quartzcheck
-bin/quartzcompact
-bin/quartzdump
+bin/quartzcheck    
+bin/quartzcompact  
+bin/quartzdump  
+bin/xapian-check
 bin/xapian-compact
 bin/xapian-config
 bin/xapian-copydatabase
@@ -18,22 +19,23 @@ include/xapian/document.h
 include/xapian/enquire.h
 include/xapian/error.h
 include/xapian/errorhandler.h
-include/xapian/errortypes.h
 include/xapian/expanddecider.h
-include/xapian/output.h
 include/xapian/positioniterator.h
 include/xapian/postingiterator.h
 include/xapian/query.h
 include/xapian/queryparser.h
 include/xapian/stem.h
+include/xapian/termgenerator.h
 include/xapian/termiterator.h
 include/xapian/types.h
+include/xapian/unicode.h
 include/xapian/valueiterator.h
 include/xapian/version.h
+include/xapian/visibility.h
 lib/libxapian.a
 lib/libxapian.la
 lib/libxapian.so
-lib/libxapian.so.13
+lib/libxapian.so.14
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/annotated.html
@@ -59,13 +61,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocIDWrapper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocIDWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator-members.html
@@ -73,16 +70,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator__coll__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator__coll__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider-members.html
@@ -106,19 +95,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator-members.html
@@ -126,44 +102,17 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator__coll__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator__coll__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper__coll__graph.map
@@ -174,23 +123,15 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermGenerator-members.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermGenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermNameWrapper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermNameWrapper.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermPosWrapper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermPosWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__coll__graph.map
@@ -199,6 +140,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Utf8Iterator-members.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Utf8Iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator__coll__graph.map
@@ -254,14 +197,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__dep__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__dep__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__dep__incl.map
@@ -270,11 +205,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h__dep__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h__dep__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h__dep__incl.map
@@ -303,9 +233,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_rela.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_type.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_type.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_vars.html
@@ -359,18 +287,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.png
@@ -396,13 +312,9 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_func.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_type.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
@@ -448,6 +360,14 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__dep__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__dep__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h__dep__incl.map
@@ -461,6 +381,14 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h__dep__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h__dep__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__dep__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__dep__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__dep__incl.map
@@ -469,6 +397,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/visibility_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/xapian_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/bm25.html
 %%PORTDOCS%%%%DOCSDIR%%/code_structure.html
diff --git a/databases/xapian-core10/Makefile b/databases/xapian-core10/Makefile
index 6a1763e5e567..9aa2f8159e20 100644
--- a/databases/xapian-core10/Makefile
+++ b/databases/xapian-core10/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xapian-core
-PORTVERSION=	0.9.10
+PORTVERSION=	1.0.0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		${MASTER_SITE_LOCAL}
@@ -19,8 +19,9 @@ CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 xapian-compact.1 \
-		xapian-config.1 xapian-progsrv.1 xapian-tcpsrv.1
+MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 \
+		xapian-check.1 xapian-compact.1 xapian-config.1 \
+		xapian-progsrv.1 xapian-tcpsrv.1
 
 post-install:
 .for file in delve quest copydatabase
diff --git a/databases/xapian-core10/distinfo b/databases/xapian-core10/distinfo
index 7effc2a2dd60..af5cddc029c8 100644
--- a/databases/xapian-core10/distinfo
+++ b/databases/xapian-core10/distinfo
@@ -1,3 +1,3 @@
-MD5 (xapian-core-0.9.10.tar.gz) = a45d34a9539493cfdffe16fea8022faf
-SHA256 (xapian-core-0.9.10.tar.gz) = c1a61f6e3d03d1b29f49ef4d2d29fdfa7dd67bbe723c915873cb4f3df7f08381
-SIZE (xapian-core-0.9.10.tar.gz) = 2845654
+MD5 (xapian-core-1.0.0.tar.gz) = d6cd27103fc057f3a7c4d8d18bd3023d
+SHA256 (xapian-core-1.0.0.tar.gz) = de2f514e70eca9900d093f50b811919ebca2521959f57c14d4b10d85e08474f4
+SIZE (xapian-core-1.0.0.tar.gz) = 2562889
diff --git a/databases/xapian-core10/files/patch-Makefile.in b/databases/xapian-core10/files/patch-Makefile.in
new file mode 100644
index 000000000000..c667f3896a0f
--- /dev/null
+++ b/databases/xapian-core10/files/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- Makefile.in.orig	Fri May 18 00:58:07 2007
++++ Makefile.in	Fri May 18 13:10:33 2007
+@@ -49,7 +49,8 @@
+ @VPATH_BUILD_TRUE@am__append_1 = -I$(top_builddir)/include \
+ @VPATH_BUILD_TRUE@	-I$(top_srcdir)/languages -Ilanguages \
+ @VPATH_BUILD_TRUE@	-I$(top_srcdir)/queryparser
+-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
++bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) 
++noinst_PROGRAMS = \
+ 	examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \
+ 	examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \
+ 	examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT)
+@@ -464,7 +465,7 @@
+ @BUILD_BACKEND_REMOTE_TRUE@am__EXEEXT_3 = bin/xapian-progsrv$(EXEEXT) \
+ @BUILD_BACKEND_REMOTE_TRUE@	bin/xapian-tcpsrv$(EXEEXT)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+-PROGRAMS = $(bin_PROGRAMS)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_bin_quartzcheck_OBJECTS =  \
+ 	bin/bin_quartzcheck-quartzcheck.$(OBJEXT)
+ bin_quartzcheck_OBJECTS = $(am_bin_quartzcheck_OBJECTS)
+@@ -909,9 +910,7 @@
+ libxapian_la_LDFLAGS = $(XAPIAN_LDFLAGS) -no-undefined -version-info $(LIBRARY_VERSION_INFO)
+ @MAINTAINER_NO_DOCS_FALSE@dist_man_MANS = xapian-config.1 \
+ @MAINTAINER_NO_DOCS_FALSE@	$(am__append_3) $(am__append_5) \
+-@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7) \
+-@MAINTAINER_NO_DOCS_FALSE@	examples/copydatabase.1 \
+-@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1
++@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7)
+ bin_quartzcheck_CXXFLAGS = -I$(top_srcdir)/backends/quartz
+ bin_quartzcheck_SOURCES = bin/quartzcheck.cc
+ bin_quartzcheck_LDADD = $(ldflags) libquartzcheck.la libxapian.la
diff --git a/databases/xapian-core10/files/patch-examples-Makefile.in b/databases/xapian-core10/files/patch-examples-Makefile.in
deleted file mode 100644
index db049a9bd3b9..000000000000
--- a/databases/xapian-core10/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Fri Jul 15 12:22:59 2005
-+++ examples/Makefile.in	Mon Nov  7 12:02:24 2005
-@@ -442,7 +442,7 @@
- 	for dir in "$(DESTDIR)$(bindir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
--install: install-am
-+install:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
diff --git a/databases/xapian-core10/pkg-plist b/databases/xapian-core10/pkg-plist
index c50320de4f1c..11fbc225374a 100644
--- a/databases/xapian-core10/pkg-plist
+++ b/databases/xapian-core10/pkg-plist
@@ -1,7 +1,8 @@
 @comment $FreeBSD$
-bin/quartzcheck
-bin/quartzcompact
-bin/quartzdump
+bin/quartzcheck    
+bin/quartzcompact  
+bin/quartzdump  
+bin/xapian-check
 bin/xapian-compact
 bin/xapian-config
 bin/xapian-copydatabase
@@ -18,22 +19,23 @@ include/xapian/document.h
 include/xapian/enquire.h
 include/xapian/error.h
 include/xapian/errorhandler.h
-include/xapian/errortypes.h
 include/xapian/expanddecider.h
-include/xapian/output.h
 include/xapian/positioniterator.h
 include/xapian/postingiterator.h
 include/xapian/query.h
 include/xapian/queryparser.h
 include/xapian/stem.h
+include/xapian/termgenerator.h
 include/xapian/termiterator.h
 include/xapian/types.h
+include/xapian/unicode.h
 include/xapian/valueiterator.h
 include/xapian/version.h
+include/xapian/visibility.h
 lib/libxapian.a
 lib/libxapian.la
 lib/libxapian.so
-lib/libxapian.so.13
+lib/libxapian.so.14
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/annotated.html
@@ -59,13 +61,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocIDWrapper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocIDWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator-members.html
@@ -73,16 +70,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator__coll__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator__coll__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Error.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ErrorHandler.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider-members.html
@@ -106,19 +95,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntBase__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Internal_1_1RefCntPtr__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator-members.html
@@ -126,44 +102,17 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator__coll__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator__coll__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSet__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParser__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query_1_1Internal__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Query__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RSet__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper__coll__graph.map
@@ -174,23 +123,15 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stem__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermGenerator-members.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermGenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermIterator__coll__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermNameWrapper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermNameWrapper.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermPosWrapper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TermPosWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__coll__graph.map
@@ -199,6 +140,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Utf8Iterator-members.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Utf8Iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator__coll__graph.map
@@ -254,14 +197,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__dep__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__dep__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__dep__incl.map
@@ -270,11 +205,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h__dep__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h__dep__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errortypes_8h__dep__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h__dep__incl.map
@@ -303,9 +233,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_rela.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_type.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_defs.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_type.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/globals_vars.html
@@ -359,18 +287,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.png
@@ -396,13 +312,9 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_func.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_type.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/output_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
@@ -448,6 +360,14 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__dep__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__dep__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h__dep__incl.map
@@ -461,6 +381,14 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h__dep__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h__dep__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__dep__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__dep__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__dep__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__incl.map
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__incl.md5
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__dep__incl.map
@@ -469,6 +397,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__incl.map
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__incl.md5
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h__incl.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/visibility_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/xapian_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/bm25.html
 %%PORTDOCS%%%%DOCSDIR%%/code_structure.html