- Update to 1.2.16

- Use PORTDOCS
- Convert to new options helper
- Simplify Makefile

Changes:	http://trac.xapian.org/wiki/ReleaseOverview/1.2.16

4 files changed, 15 insertions, 391 deletions

diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index 5544339b00fd..cfe9f6a4d42f 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xapian-core
-PORTVERSION=	1.2.15
+PORTVERSION=	1.2.16
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -21,17 +21,11 @@ PORTSCOUT=	limitw:1,even
 GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 USE_LDCONFIG=	yes
+USE_XZ=		yes
 
-.include <bsd.port.options.mk>
+PORTDOCS=	*
 
-.if !${PORT_OPTIONS:MSSE2}
-CONFIGURE_ARGS+=--disable-sse
-.endif
-
-post-patch:
-.if !${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| docs||' ${WRKSRC}/Makefile.in
-.endif
+SSE2_CONFIGURE_ENABLE=	sse
 
 post-install:
 .for file in copydatabase delve quest
diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo
index cc9b02f97358..08b056786357 100644
--- a/databases/xapian-core/distinfo
+++ b/databases/xapian-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xapian-core-1.2.15.tar.gz) = cde4f5d1b111b66643fa41c11b9e5962bff7ce7244ca34cbbcbd2d2caa0c4df0
-SIZE (xapian-core-1.2.15.tar.gz) = 4158987
+SHA256 (xapian-core-1.2.16.tar.xz) = f4ecef14297136e498f55670df9b80800244bc21abb8e01d5f9dab65a1fae9b9
+SIZE (xapian-core-1.2.16.tar.xz) = 3039524
diff --git a/databases/xapian-core/files/patch-clang b/databases/xapian-core/files/patch-clang
index e1dce8843216..f9d529872fed 100644
--- a/databases/xapian-core/files/patch-clang
+++ b/databases/xapian-core/files/patch-clang
@@ -1,10 +1,10 @@
---- common/safeuuid.h.orig	2013-04-17 02:03:07.000000000 +0200
-+++ common/safeuuid.h	2013-09-05 11:38:33.778061038 +0200
-@@ -54,6 +54,7 @@
- #else
+--- common/safeuuid.h.orig	2013-12-04 08:13:34.000000000 +0800
++++ common/safeuuid.h	2013-12-06 00:04:28.067689030 +0800
+@@ -55,6 +55,7 @@
+ 
+ // UUID API on FreeBSD, NetBSD and AIX.
  
- // FreeBSD/NetBSD UUID API.
 +# include <stdlib.h>
- # include <uuid.h>
- # include <cstring>
- # include <exception>
+ # ifdef _AIX
+ /* AIX uses a byte typedef in its <uuid.h> which collides with ours, so use a
+  * macro to rename theirs out of the way.
diff --git a/databases/xapian-core/pkg-plist b/databases/xapian-core/pkg-plist
index 669e0a0d8a02..753408d478bb 100644
--- a/databases/xapian-core/pkg-plist
+++ b/databases/xapian-core/pkg-plist
@@ -46,374 +46,6 @@ lib/libxapian.a
 lib/libxapian.la
 lib/libxapian.so
 lib/libxapian.so.28
-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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Compactor-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Compactor.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESet.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ESetIterator-members.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderAnd__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms-members.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1PositionIterator-members.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Sorter-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Sorter.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Sorter__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_1Stopper-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1Stopper__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StringValueRangeProcessor-members.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StringValueRangeProcessor.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1StringValueRangeProcessor__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_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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1WritableDatabase-members.html
-%%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/compactor_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h.html
-%%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/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x62.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x71.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_0x75.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x6b.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x6c.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x71.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_func_0x75.html
-%%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/graph_legend.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/graph_legend.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__0.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__1.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__10.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__11.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__12.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__13.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__14.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__15.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__16.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__17.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__18.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__19.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__2.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__20.png
-%%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__29.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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__6.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__7.png
-%%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_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/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
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_b.gif
-%%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.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h.html
-%%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%%/code_structure.html
-%%PORTDOCS%%%%DOCSDIR%%/collapsing.html
-%%PORTDOCS%%%%DOCSDIR%%/deprecation.html
-%%PORTDOCS%%%%DOCSDIR%%/facets.html
-%%PORTDOCS%%%%DOCSDIR%%/glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/internals.html
-%%PORTDOCS%%%%DOCSDIR%%/intro_ir.html
-%%PORTDOCS%%%%DOCSDIR%%/matcherdesign.html
-%%PORTDOCS%%%%DOCSDIR%%/overview.html
-%%PORTDOCS%%%%DOCSDIR%%/postingsource.html
-%%PORTDOCS%%%%DOCSDIR%%/queryparser.html
-%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
-%%PORTDOCS%%%%DOCSDIR%%/quickstartexpand.cc.html
-%%PORTDOCS%%%%DOCSDIR%%/quickstartindex.cc.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/synonyms.html
-%%PORTDOCS%%%%DOCSDIR%%/termgenerator.html
-%%PORTDOCS%%%%DOCSDIR%%/tests.html
-%%PORTDOCS%%%%DOCSDIR%%/valueranges.html
 man/man1/xapian-check.1.gz
 man/man1/xapian-chert-update.1.gz
 man/man1/xapian-compact.1.gz
@@ -423,9 +55,7 @@ man/man1/xapian-progsrv.1.gz
 man/man1/xapian-replicate.1.gz
 man/man1/xapian-replicate-server.1.gz
 man/man1/xapian-tcpsrv.1.gz
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidoc/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/apidoc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/aclocal/xapian.m4
 @dirrmtry lib/cmake/xapian
 @dirrmtry lib/cmake
 @dirrm include/xapian