4 files changed, 6 insertions, 41 deletions

diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index 429940cdebf8..57f9238968c9 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xapian-core
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/
 
diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo
index 2da64769b707..fddee0207e17 100644
--- a/databases/xapian-core/distinfo
+++ b/databases/xapian-core/distinfo
@@ -1,3 +1,3 @@
-MD5 (xapian-core-1.0.6.tar.gz) = a9cde41303f047523cec5c65cd91a0e6
-SHA256 (xapian-core-1.0.6.tar.gz) = b85048a6e63fadc015dfcb53f31040d730eeed44f3a0004fcbbb0b1b6f451bb7
-SIZE (xapian-core-1.0.6.tar.gz) = 3466668
+MD5 (xapian-core-1.0.7.tar.gz) = b4acff50028120852d4a8d943065f6d2
+SHA256 (xapian-core-1.0.7.tar.gz) = 75f2e805399ce61c423d7945f7f0d14aac53943538345425f6a1033b9fe59631
+SIZE (xapian-core-1.0.7.tar.gz) = 3071683
diff --git a/databases/xapian-core/files/patch-Makefile.in b/databases/xapian-core/files/patch-Makefile.in
index c667f3896a0f..1b04a2d5c972 100644
--- a/databases/xapian-core/files/patch-Makefile.in
+++ b/databases/xapian-core/files/patch-Makefile.in
@@ -27,6 +27,6 @@
 -@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_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 9dcd9b397702..bef197d33ad5 100644
--- a/databases/xapian-core/pkg-plist
+++ b/databases/xapian-core/pkg-plist
@@ -37,7 +37,7 @@ include/xapian.h
 lib/libxapian.a
 lib/libxapian.la
 lib/libxapian.so
-lib/libxapian.so.19
+lib/libxapian.so.20
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/admin_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc.pdf
@@ -166,32 +166,20 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/database_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/enquire_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.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/errorhandler_8h__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.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/files.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_0.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/form_1.png
@@ -295,7 +283,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherits.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/matchspy_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/matchspy_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/matchspy_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaceXapian.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_func.html
@@ -305,28 +292,16 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/postingiterator_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/query_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sorter_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sorter_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sorter_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sorter_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h__dep__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StringAndFrequency-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1StringAndFrequency.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1ValueRangeProcessor-members.html
@@ -338,27 +313,17 @@ share/aclocal/xapian.m4
 %%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.png
-%%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.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/types_8h.html
-%%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.png
-%%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.png
-%%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%%/apidoc/html/xapian_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/xapian_8h__incl.png
 %%PORTDOCS%%%%DOCSDIR%%/bm25.html
 %%PORTDOCS%%%%DOCSDIR%%/code_structure.html
 %%PORTDOCS%%%%DOCSDIR%%/deprecation.html