- Revert to 1.0.x series

  We will eventuall be dual lifing 1.2.x and 1.0.x

Requested by:       brix
Discussed with:     brix, erwin

8 files changed, 126 insertions, 364 deletions

diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index a2aea5b6434d..98301ea315de 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -6,30 +6,24 @@
 #
 
 PORTNAME=	xapian-core
-PORTVERSION=	1.2.3
+PORTVERSION=	1.0.17
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/
 
-MAINTAINER=	jf@dockes.org
+MAINTAINER=	jean-francois.dockes@wanadoo.fr
 COMMENT=	A probabilistic text search database engine
 
-LIB_DEPENDS=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
 USE_LDCONFIG=	yes
 
-MAN1=		xapian-check.1 xapian-chert-update.1 xapian-compact.1 \
-		xapian-config.1 xapian-inspect.1 xapian-metadata.1 \
-		xapian-progsrv.1 xapian-replicate-server.1 xapian-tcpsrv.1 \
-		xapian-replicate.1
+MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 \
+		xapian-check.1 xapian-compact.1 xapian-config.1 \
+		xapian-progsrv.1 xapian-tcpsrv.1 xapian-inspect.1
 
 post-install:
+.for file in delve quest copydatabase
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${PREFIX}/bin/xapian-${file}
+.endfor
 .ifdef(NOPORTDOCS)
 	${RM} -rf ${DOCSDIR}
 .endif
diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo
index c46f086130f0..d22552b77b45 100644
--- a/databases/xapian-core/distinfo
+++ b/databases/xapian-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (xapian-core-1.2.3.tar.gz) = 999c1bb3a6226ed13c9cd05face89041
-SHA256 (xapian-core-1.2.3.tar.gz) = a0dc3a14d26a0ffbaa7aacd7ec85d26640e0edfb4ea7267138d729d3a59d5a62
-SIZE (xapian-core-1.2.3.tar.gz) = 3855690
+MD5 (xapian-core-1.0.17.tar.gz) = 455b50c24fc65ae51c38ae67167903c5
+SHA256 (xapian-core-1.0.17.tar.gz) = c5a7b7c277536ffc8c28b750871e655e2908c227363adce04302a227dba5fe2b
+SIZE (xapian-core-1.0.17.tar.gz) = 2915371
diff --git a/databases/xapian-core/files/patch-Makefile.in b/databases/xapian-core/files/patch-Makefile.in
index 38e87bedb73e..1b04a2d5c972 100644
--- a/databases/xapian-core/files/patch-Makefile.in
+++ b/databases/xapian-core/files/patch-Makefile.in
@@ -1,26 +1,32 @@
---- Makefile.in.orig	2010-08-24 09:57:14.000000000 +0200
-+++ Makefile.in	2010-08-30 19:37:33.000000000 +0200
-@@ -48,11 +48,11 @@
+--- 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) \
-+	examples/xapian-metadata$(EXEEXT)
-+EXTRA_PROGRAMS = \
+-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) \
--	examples/xapian-metadata$(EXEEXT)
--EXTRA_PROGRAMS =
-+	examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT)
- DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
- 	$(dist_m4data_DATA) $(dist_man_MANS) $(inc_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -1314,8 +1314,6 @@
+ 	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@	$(am__append_7) \
 -@MAINTAINER_NO_DOCS_FALSE@	examples/copydatabase.1 \
--@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1 \
- @MAINTAINER_NO_DOCS_FALSE@	examples/xapian-metadata.1
- bin_xapian_check_CPPFLAGS = \
- 	-I$(top_srcdir)/backends/brass\
+-@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1
++@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7)
+ bin_quartzcheck_CPPFLAGS = -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/pkg-plist b/databases/xapian-core/pkg-plist
index 0862b9c1ee7e..4e4161601506 100644
--- a/databases/xapian-core/pkg-plist
+++ b/databases/xapian-core/pkg-plist
@@ -1,56 +1,47 @@
 @comment $FreeBSD$
+bin/quartzcheck
+bin/quartzcompact
+bin/quartzdump
 bin/xapian-check
-bin/xapian-chert-update
 bin/xapian-compact
 bin/xapian-config
+bin/xapian-copydatabase
+bin/xapian-delve
 bin/xapian-inspect
-bin/xapian-metadata
 bin/xapian-progsrv
-bin/xapian-replicate
-bin/xapian-replicate-server
+bin/xapian-quest
 bin/xapian-tcpsrv
-include/xapian.h
 include/xapian/base.h
 include/xapian/database.h
 include/xapian/dbfactory.h
 include/xapian/deprecated.h
-include/xapian/derefwrapper.h
 include/xapian/document.h
 include/xapian/enquire.h
 include/xapian/error.h
 include/xapian/errorhandler.h
 include/xapian/expanddecider.h
-include/xapian/keymaker.h
-include/xapian/matchspy.h
 include/xapian/positioniterator.h
 include/xapian/postingiterator.h
-include/xapian/postingsource.h
 include/xapian/query.h
 include/xapian/queryparser.h
-include/xapian/registry.h
+include/xapian/sorter.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/valuesetmatchdecider.h
 include/xapian/version.h
 include/xapian/visibility.h
-include/xapian/weight.h
+include/xapian.h
 lib/libxapian.a
-lib/cmake/xapian/xapian-config.cmake
-lib/cmake/xapian/xapian-config-version.cmake
 lib/libxapian.la
 lib/libxapian.so
-lib/libxapian.so.23
+lib/libxapian.so.21
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/admin_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
@@ -59,37 +50,10 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet-members.html
@@ -98,11 +62,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire.html
-%%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_1Error__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd-members.html
@@ -112,49 +73,15 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError__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
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueSorter-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueSorter.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueSorter__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor__inherit__graph.png
@@ -162,29 +89,12 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource__inherit__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_1QueryParserError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError__inherit__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_1RangeError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Registry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Registry.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError__inherit__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__inherit__graph.png
@@ -206,28 +116,10 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError__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_1ValueCountMatchSpy-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight__inherit__graph.png
@@ -235,7 +127,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/closed.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated.html
@@ -243,10 +134,21 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_0.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_1.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_10.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_11.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_2.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_3.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_4.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_5.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_6.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_7.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_8.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_9.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x63.html
@@ -270,7 +172,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x62.html
@@ -295,11 +196,12 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x7e.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
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/hierarchy.html
@@ -321,11 +223,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__26.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__27.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__28.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__4.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__5.png
@@ -334,33 +231,25 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__8.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__9.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherits.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/keymaker_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/matchspy_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Auto.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Brass.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Chert.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Flint.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1InMemory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Quartz.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Remote.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Unicode.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_enum.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/open.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingsource_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/registry_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sorter_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StemImplementation-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StemImplementation.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor__inherit__graph.png
@@ -373,12 +262,9 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valuesetmatchdecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/version_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/weight_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/xapian_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/bm25.html
-%%PORTDOCS%%%%DOCSDIR%%/categorisation.html
 %%PORTDOCS%%%%DOCSDIR%%/code_structure.html
 %%PORTDOCS%%%%DOCSDIR%%/deprecation.html
 %%PORTDOCS%%%%DOCSDIR%%/glossary.html
@@ -388,7 +274,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/intro_ir.html
 %%PORTDOCS%%%%DOCSDIR%%/matcherdesign.html
 %%PORTDOCS%%%%DOCSDIR%%/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/postingsource.html
+%%PORTDOCS%%%%DOCSDIR%%/quartzdesign.html
 %%PORTDOCS%%%%DOCSDIR%%/queryparser.html
 %%PORTDOCS%%%%DOCSDIR%%/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/quickstartexpand.cc.html
@@ -396,10 +282,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/quickstartsearch.cc.html
 %%PORTDOCS%%%%DOCSDIR%%/remote.html
 %%PORTDOCS%%%%DOCSDIR%%/remote_protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/replication.html
-%%PORTDOCS%%%%DOCSDIR%%/replication_protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/scalability.html
-%%PORTDOCS%%%%DOCSDIR%%/serialisation.html
 %%PORTDOCS%%%%DOCSDIR%%/sorting.html
 %%PORTDOCS%%%%DOCSDIR%%/spelling.html
 %%PORTDOCS%%%%DOCSDIR%%/stemming.html
@@ -411,5 +294,3 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/apidoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/xapian
-@dirrm lib/cmake/xapian
-@dirrmtry lib/cmake
diff --git a/databases/xapian-core10/Makefile b/databases/xapian-core10/Makefile
index a2aea5b6434d..98301ea315de 100644
--- a/databases/xapian-core10/Makefile
+++ b/databases/xapian-core10/Makefile
@@ -6,30 +6,24 @@
 #
 
 PORTNAME=	xapian-core
-PORTVERSION=	1.2.3
+PORTVERSION=	1.0.17
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/
 
-MAINTAINER=	jf@dockes.org
+MAINTAINER=	jean-francois.dockes@wanadoo.fr
 COMMENT=	A probabilistic text search database engine
 
-LIB_DEPENDS=	uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
 USE_LDCONFIG=	yes
 
-MAN1=		xapian-check.1 xapian-chert-update.1 xapian-compact.1 \
-		xapian-config.1 xapian-inspect.1 xapian-metadata.1 \
-		xapian-progsrv.1 xapian-replicate-server.1 xapian-tcpsrv.1 \
-		xapian-replicate.1
+MAN1=		quartzcheck.1 quartzcompact.1 quartzdump.1 \
+		xapian-check.1 xapian-compact.1 xapian-config.1 \
+		xapian-progsrv.1 xapian-tcpsrv.1 xapian-inspect.1
 
 post-install:
+.for file in delve quest copydatabase
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${PREFIX}/bin/xapian-${file}
+.endfor
 .ifdef(NOPORTDOCS)
 	${RM} -rf ${DOCSDIR}
 .endif
diff --git a/databases/xapian-core10/distinfo b/databases/xapian-core10/distinfo
index c46f086130f0..d22552b77b45 100644
--- a/databases/xapian-core10/distinfo
+++ b/databases/xapian-core10/distinfo
@@ -1,3 +1,3 @@
-MD5 (xapian-core-1.2.3.tar.gz) = 999c1bb3a6226ed13c9cd05face89041
-SHA256 (xapian-core-1.2.3.tar.gz) = a0dc3a14d26a0ffbaa7aacd7ec85d26640e0edfb4ea7267138d729d3a59d5a62
-SIZE (xapian-core-1.2.3.tar.gz) = 3855690
+MD5 (xapian-core-1.0.17.tar.gz) = 455b50c24fc65ae51c38ae67167903c5
+SHA256 (xapian-core-1.0.17.tar.gz) = c5a7b7c277536ffc8c28b750871e655e2908c227363adce04302a227dba5fe2b
+SIZE (xapian-core-1.0.17.tar.gz) = 2915371
diff --git a/databases/xapian-core10/files/patch-Makefile.in b/databases/xapian-core10/files/patch-Makefile.in
index 38e87bedb73e..1b04a2d5c972 100644
--- a/databases/xapian-core10/files/patch-Makefile.in
+++ b/databases/xapian-core10/files/patch-Makefile.in
@@ -1,26 +1,32 @@
---- Makefile.in.orig	2010-08-24 09:57:14.000000000 +0200
-+++ Makefile.in	2010-08-30 19:37:33.000000000 +0200
-@@ -48,11 +48,11 @@
+--- 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) \
-+	examples/xapian-metadata$(EXEEXT)
-+EXTRA_PROGRAMS = \
+-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) \
--	examples/xapian-metadata$(EXEEXT)
--EXTRA_PROGRAMS =
-+	examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT)
- DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
- 	$(dist_m4data_DATA) $(dist_man_MANS) $(inc_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -1314,8 +1314,6 @@
+ 	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@	$(am__append_7) \
 -@MAINTAINER_NO_DOCS_FALSE@	examples/copydatabase.1 \
--@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1 \
- @MAINTAINER_NO_DOCS_FALSE@	examples/xapian-metadata.1
- bin_xapian_check_CPPFLAGS = \
- 	-I$(top_srcdir)/backends/brass\
+-@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1
++@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7)
+ bin_quartzcheck_CPPFLAGS = -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/pkg-plist b/databases/xapian-core10/pkg-plist
index 0862b9c1ee7e..4e4161601506 100644
--- a/databases/xapian-core10/pkg-plist
+++ b/databases/xapian-core10/pkg-plist
@@ -1,56 +1,47 @@
 @comment $FreeBSD$
+bin/quartzcheck
+bin/quartzcompact
+bin/quartzdump
 bin/xapian-check
-bin/xapian-chert-update
 bin/xapian-compact
 bin/xapian-config
+bin/xapian-copydatabase
+bin/xapian-delve
 bin/xapian-inspect
-bin/xapian-metadata
 bin/xapian-progsrv
-bin/xapian-replicate
-bin/xapian-replicate-server
+bin/xapian-quest
 bin/xapian-tcpsrv
-include/xapian.h
 include/xapian/base.h
 include/xapian/database.h
 include/xapian/dbfactory.h
 include/xapian/deprecated.h
-include/xapian/derefwrapper.h
 include/xapian/document.h
 include/xapian/enquire.h
 include/xapian/error.h
 include/xapian/errorhandler.h
 include/xapian/expanddecider.h
-include/xapian/keymaker.h
-include/xapian/matchspy.h
 include/xapian/positioniterator.h
 include/xapian/postingiterator.h
-include/xapian/postingsource.h
 include/xapian/query.h
 include/xapian/queryparser.h
-include/xapian/registry.h
+include/xapian/sorter.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/valuesetmatchdecider.h
 include/xapian/version.h
 include/xapian/visibility.h
-include/xapian/weight.h
+include/xapian.h
 lib/libxapian.a
-lib/cmake/xapian/xapian-config.cmake
-lib/cmake/xapian/xapian-config-version.cmake
 lib/libxapian.la
 lib/libxapian.so
-lib/libxapian.so.23
+lib/libxapian.so.21
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/admin_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc.pdf
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
@@ -59,37 +50,10 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseCreateError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseLockError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DatabaseVersionError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Database__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DateValueRangeProcessor__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DecreasingValueWeightPostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1DocNotFoundError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Document.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet-members.html
@@ -98,11 +62,8 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Enquire.html
-%%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_1Error__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd-members.html
@@ -112,49 +73,15 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FeatureUnavailableError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1FixedWeightPostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InternalError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidArgumentError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1InvalidOperationError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1KeyMaker__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1LogicError__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
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MSetIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MatchSpy__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueKeyMaker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueSorter-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueSorter.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1MultiValueSorter__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NetworkTimeoutError__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1NumberValueRangeProcessor__inherit__graph.png
@@ -162,29 +89,12 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PostingSource__inherit__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_1QueryParserError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1QueryParserError__inherit__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_1RangeError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RangeError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Registry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Registry.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1RuntimeError__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SerialisationError__inherit__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__inherit__graph.png
@@ -206,28 +116,10 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1UnimplementedError__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_1ValueCountMatchSpy-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueCountMatchSpy__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueMapPostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValuePostingSource__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueSetMatchDecider__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ValueWeightPostingSource__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Weight__inherit__graph.png
@@ -235,7 +127,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/closed.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated.html
@@ -243,10 +134,21 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/error_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/files.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_0.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_1.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_10.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_11.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_2.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_3.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_4.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_5.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_6.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_7.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_8.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_9.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x63.html
@@ -270,7 +172,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_eval.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x62.html
@@ -295,11 +196,12 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x76.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x77.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x7e.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
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/hierarchy.html
@@ -321,11 +223,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__21.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__22.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__23.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__24.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__25.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__26.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__27.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__28.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__3.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__4.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__5.png
@@ -334,33 +231,25 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__8.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__9.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherits.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/keymaker_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/matchspy_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Auto.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Brass.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Chert.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Flint.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1InMemory.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Quartz.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Remote.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian_1_1Unicode.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_enum.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/open.gif
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingsource_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/registry_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sorter_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StemImplementation-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StemImplementation.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor__inherit__graph.png
@@ -373,12 +262,9 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/unicode_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valueiterator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/valuesetmatchdecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/version_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/weight_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/xapian_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/bm25.html
-%%PORTDOCS%%%%DOCSDIR%%/categorisation.html
 %%PORTDOCS%%%%DOCSDIR%%/code_structure.html
 %%PORTDOCS%%%%DOCSDIR%%/deprecation.html
 %%PORTDOCS%%%%DOCSDIR%%/glossary.html
@@ -388,7 +274,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/intro_ir.html
 %%PORTDOCS%%%%DOCSDIR%%/matcherdesign.html
 %%PORTDOCS%%%%DOCSDIR%%/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/postingsource.html
+%%PORTDOCS%%%%DOCSDIR%%/quartzdesign.html
 %%PORTDOCS%%%%DOCSDIR%%/queryparser.html
 %%PORTDOCS%%%%DOCSDIR%%/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/quickstartexpand.cc.html
@@ -396,10 +282,7 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/quickstartsearch.cc.html
 %%PORTDOCS%%%%DOCSDIR%%/remote.html
 %%PORTDOCS%%%%DOCSDIR%%/remote_protocol.html
-%%PORTDOCS%%%%DOCSDIR%%/replication.html
-%%PORTDOCS%%%%DOCSDIR%%/replication_protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/scalability.html
-%%PORTDOCS%%%%DOCSDIR%%/serialisation.html
 %%PORTDOCS%%%%DOCSDIR%%/sorting.html
 %%PORTDOCS%%%%DOCSDIR%%/spelling.html
 %%PORTDOCS%%%%DOCSDIR%%/stemming.html
@@ -411,5 +294,3 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/apidoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/xapian
-@dirrm lib/cmake/xapian
-@dirrmtry lib/cmake