summaryrefslogtreecommitdiff
path: root/textproc/xapian
diff options
context:
space:
mode:
Diffstat (limited to 'textproc/xapian')
-rw-r--r--textproc/xapian/Makefile4
-rw-r--r--textproc/xapian/PLIST249
-rw-r--r--textproc/xapian/buildlink3.mk3
-rw-r--r--textproc/xapian/distinfo12
-rw-r--r--textproc/xapian/patches/patch-common_safesyssocket.h14
-rw-r--r--textproc/xapian/patches/patch-common_socket_utils.cc14
6 files changed, 183 insertions, 113 deletions
diff --git a/textproc/xapian/Makefile b/textproc/xapian/Makefile
index 134df807395..5b2451b5936 100644
--- a/textproc/xapian/Makefile
+++ b/textproc/xapian/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2016/04/30 14:14:07 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2016/11/07 13:02:17 schmonz Exp $
#
DISTNAME= xapian-core-${VERSION}
-VERSION= 1.2.23
+VERSION= 1.4.1
PKGNAME= xapian-${VERSION}
CATEGORIES= textproc
MASTER_SITES= http://oligarchy.co.uk/xapian/${VERSION}/
diff --git a/textproc/xapian/PLIST b/textproc/xapian/PLIST
index 194a3611e68..925329e0ded 100644
--- a/textproc/xapian/PLIST
+++ b/textproc/xapian/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.11 2016/01/13 20:59:15 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/11/07 13:02:17 schmonz Exp $
bin/copydatabase
-bin/delve
bin/quest
bin/simpleexpand
bin/simpleindex
bin/simplesearch
bin/xapian-check
bin/xapian-compact
-bin/xapian-chert-update
bin/xapian-config
-bin/xapian-inspect
+bin/xapian-delve
bin/xapian-metadata
bin/xapian-progsrv
bin/xapian-replicate
bin/xapian-replicate-server
bin/xapian-tcpsrv
include/xapian.h
-include/xapian/base.h
+include/xapian/attributes.h
include/xapian/compactor.h
+include/xapian/constants.h
+include/xapian/constinfo.h
include/xapian/database.h
include/xapian/dbfactory.h
include/xapian/deprecated.h
@@ -26,9 +26,14 @@ include/xapian/document.h
include/xapian/enquire.h
include/xapian/error.h
include/xapian/errorhandler.h
+include/xapian/eset.h
include/xapian/expanddecider.h
+include/xapian/geospatial.h
+include/xapian/intrusive_ptr.h
+include/xapian/iterator.h
include/xapian/keymaker.h
include/xapian/matchspy.h
+include/xapian/mset.h
include/xapian/positioniterator.h
include/xapian/postingiterator.h
include/xapian/postingsource.h
@@ -50,13 +55,11 @@ lib/cmake/xapian/xapian-config.cmake
lib/libxapian.la
lib/pkgconfig/xapian-core.pc
man/man1/copydatabase.1
-man/man1/delve.1
man/man1/quest.1
man/man1/xapian-check.1
man/man1/xapian-compact.1
-man/man1/xapian-chert-update.1
man/man1/xapian-config.1
-man/man1/xapian-inspect.1
+man/man1/xapian-delve.1
man/man1/xapian-metadata.1
man/man1/xapian-progsrv.1
man/man1/xapian-replicate-server.1
@@ -64,11 +67,18 @@ man/man1/xapian-replicate.1
man/man1/xapian-tcpsrv.1
share/aclocal/xapian.m4
share/doc/xapian-core/admin_notes.html
-share/doc/xapian-core/apidoc.pdf
share/doc/xapian-core/apidoc/html/annotated.html
+share/doc/xapian-core/apidoc/html/bc_s.png
+share/doc/xapian-core/apidoc/html/bdwn.png
share/doc/xapian-core/apidoc/html/classXapian_1_1AssertionError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1AssertionError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1AssertionError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1BB2Weight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1BB2Weight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1BB2Weight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1BM25PlusWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1BM25PlusWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1BM25PlusWeight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight.html
share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
@@ -77,6 +87,15 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight.html
share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Compactor-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Compactor.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1CoordWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1CoordWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1CoordWeight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DLHWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DLHWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DLHWeight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DPHWeight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Database-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Database.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
@@ -101,6 +120,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseVersionError-members.ht
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseVersionError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseVersionError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Database__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DateRangeProcessor-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DateRangeProcessor.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DateRangeProcessor__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1DateValueRangeProcessor-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DateValueRangeProcessor.html
share/doc/xapian-core/apidoc/html/classXapian_1_1DateValueRangeProcessor__inherit__graph.png
@@ -122,12 +144,16 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1Error-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Error.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ErrorHandler-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ErrorHandler.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1ErrorHandler__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Error__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDecider-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDecider.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderAnd-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderAnd.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderAnd__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterPrefix-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterPrefix.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterPrefix__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms__inherit__graph.png
@@ -135,9 +161,24 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.p
share/doc/xapian-core/apidoc/html/classXapian_1_1FeatureUnavailableError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1FeatureUnavailableError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1FeatureUnavailableError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1FieldProcessor-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1FieldProcessor.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1FieldProcessor__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1FixedWeightPostingSource-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1FixedWeightPostingSource.html
share/doc/xapian-core/apidoc/html/classXapian_1_1FixedWeightPostingSource__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1GreatCircleMetric-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1GreatCircleMetric.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1GreatCircleMetric__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1IfB2Weight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1IfB2Weight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1IfB2Weight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1InL2Weight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InL2Weight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InL2Weight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1IneB2Weight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1IneB2Weight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1IneB2Weight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1InternalError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1InternalError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1InternalError__inherit__graph.png
@@ -150,6 +191,22 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidOperationError__inherit_
share/doc/xapian-core/apidoc/html/classXapian_1_1KeyMaker-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1KeyMaker.html
share/doc/xapian-core/apidoc/html/classXapian_1_1KeyMaker__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1LMWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LMWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LMWeight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongCoords-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongCoords.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongCoordsIterator-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongCoordsIterator.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongDistanceKeyMaker-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongDistanceKeyMaker.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongDistanceKeyMaker__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongDistancePostingSource-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongDistancePostingSource.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongDistancePostingSource__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongMetric-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongMetric.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LatLongMetric__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1LogicError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1LogicError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1LogicError__inherit__graph.png
@@ -166,18 +223,24 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1MatchSpy__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueKeyMaker-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueKeyMaker.html
share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueKeyMaker__inherit__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkTimeoutError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkTimeoutError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkTimeoutError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1NumberRangeProcessor-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1NumberRangeProcessor.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1NumberRangeProcessor__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor.html
share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1PL2PlusWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1PL2PlusWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1PL2PlusWeight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1PL2Weight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1PL2Weight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1PL2Weight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1PositionIterator-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1PositionIterator.html
share/doc/xapian-core/apidoc/html/classXapian_1_1PostingIterator-members.html
@@ -197,6 +260,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1RSet.html
share/doc/xapian-core/apidoc/html/classXapian_1_1RangeError-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1RangeError.html
share/doc/xapian-core/apidoc/html/classXapian_1_1RangeError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1RangeProcessor-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RangeProcessor.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RangeProcessor__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Registry-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Registry.html
share/doc/xapian-core/apidoc/html/classXapian_1_1RuntimeError-members.html
@@ -208,11 +274,11 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1SerialisationError__inherit__gr
share/doc/xapian-core/apidoc/html/classXapian_1_1SimpleStopper-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1SimpleStopper.html
share/doc/xapian-core/apidoc/html/classXapian_1_1SimpleStopper__inherit__graph.png
-share/doc/xapian-core/apidoc/html/classXapian_1_1Sorter-members.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1Sorter.html
-share/doc/xapian-core/apidoc/html/classXapian_1_1Sorter__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Stem-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Stem.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1StemImplementation-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1StemImplementation.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1StemImplementation__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1Stopper-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Stopper.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Stopper__inherit__graph.png
@@ -223,6 +289,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1TermGenerator-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1TermGenerator.html
share/doc/xapian-core/apidoc/html/classXapian_1_1TermIterator-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1TermIterator.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1TfIdfWeight-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1TfIdfWeight.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1TfIdfWeight__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight.html
share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
@@ -242,6 +311,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1ValueMapPostingSource__inherit_
share/doc/xapian-core/apidoc/html/classXapian_1_1ValuePostingSource-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ValuePostingSource.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ValuePostingSource__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1ValueRangeProcessor-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1ValueRangeProcessor.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1ValueRangeProcessor__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1ValueSetMatchDecider-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ValueSetMatchDecider.html
share/doc/xapian-core/apidoc/html/classXapian_1_1ValueSetMatchDecider__inherit__graph.png
@@ -251,94 +323,84 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1ValueWeightPostingSource__inher
share/doc/xapian-core/apidoc/html/classXapian_1_1Weight-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Weight.html
share/doc/xapian-core/apidoc/html/classXapian_1_1Weight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1WildcardError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1WildcardError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1WildcardError__inherit__graph.png
share/doc/xapian-core/apidoc/html/classXapian_1_1WritableDatabase-members.html
share/doc/xapian-core/apidoc/html/classXapian_1_1WritableDatabase.html
share/doc/xapian-core/apidoc/html/classXapian_1_1WritableDatabase__inherit__graph.png
share/doc/xapian-core/apidoc/html/classes.html
-share/doc/xapian-core/apidoc/html/bc_s.png
-share/doc/xapian-core/apidoc/html/bdwn.png
share/doc/xapian-core/apidoc/html/closed.png
share/doc/xapian-core/apidoc/html/compactor_8h.html
+share/doc/xapian-core/apidoc/html/constants_8h.html
+share/doc/xapian-core/apidoc/html/constinfo_8h.html
share/doc/xapian-core/apidoc/html/database_8h.html
share/doc/xapian-core/apidoc/html/dbfactory_8h.html
share/doc/xapian-core/apidoc/html/deprecated.html
-share/doc/xapian-core/apidoc/html/dir_168225033f613bf58e19d0630bef5c8b.html
-share/doc/xapian-core/apidoc/html/dir_3c504f51550cb9fcc49223adf2dc9606.html
+share/doc/xapian-core/apidoc/html/dir_f63502d618711192f85ccb772536c6ae.html
+share/doc/xapian-core/apidoc/html/doc.png
share/doc/xapian-core/apidoc/html/document_8h.html
share/doc/xapian-core/apidoc/html/doxygen.css
share/doc/xapian-core/apidoc/html/doxygen.png
share/doc/xapian-core/apidoc/html/enquire_8h.html
share/doc/xapian-core/apidoc/html/error_8h.html
share/doc/xapian-core/apidoc/html/errorhandler_8h.html
+share/doc/xapian-core/apidoc/html/eset_8h.html
share/doc/xapian-core/apidoc/html/expanddecider_8h.html
share/doc/xapian-core/apidoc/html/files.html
-share/doc/xapian-core/apidoc/html/ftv2blank.png
-share/doc/xapian-core/apidoc/html/ftv2cl.png
-share/doc/xapian-core/apidoc/html/ftv2doc.png
-share/doc/xapian-core/apidoc/html/ftv2folderclosed.png
-share/doc/xapian-core/apidoc/html/ftv2folderopen.png
-share/doc/xapian-core/apidoc/html/ftv2lastnode.png
-share/doc/xapian-core/apidoc/html/ftv2link.png
-share/doc/xapian-core/apidoc/html/ftv2mlastnode.png
-share/doc/xapian-core/apidoc/html/ftv2mnode.png
-share/doc/xapian-core/apidoc/html/ftv2mo.png
-share/doc/xapian-core/apidoc/html/ftv2node.png
-share/doc/xapian-core/apidoc/html/ftv2ns.png
-share/doc/xapian-core/apidoc/html/ftv2plastnode.png
-share/doc/xapian-core/apidoc/html/ftv2pnode.png
-share/doc/xapian-core/apidoc/html/ftv2splitbar.png
-share/doc/xapian-core/apidoc/html/ftv2vertline.png
+share/doc/xapian-core/apidoc/html/folderclosed.png
+share/doc/xapian-core/apidoc/html/folderopen.png
share/doc/xapian-core/apidoc/html/functions.html
-share/doc/xapian-core/apidoc/html/functions_0x62.html
-share/doc/xapian-core/apidoc/html/functions_0x63.html
-share/doc/xapian-core/apidoc/html/functions_0x64.html
-share/doc/xapian-core/apidoc/html/functions_0x65.html
-share/doc/xapian-core/apidoc/html/functions_0x66.html
-share/doc/xapian-core/apidoc/html/functions_0x67.html
-share/doc/xapian-core/apidoc/html/functions_0x68.html
-share/doc/xapian-core/apidoc/html/functions_0x69.html
-share/doc/xapian-core/apidoc/html/functions_0x6b.html
-share/doc/xapian-core/apidoc/html/functions_0x6c.html
-share/doc/xapian-core/apidoc/html/functions_0x6d.html
-share/doc/xapian-core/apidoc/html/functions_0x6e.html
-share/doc/xapian-core/apidoc/html/functions_0x6f.html
-share/doc/xapian-core/apidoc/html/functions_0x70.html
-share/doc/xapian-core/apidoc/html/functions_0x71.html
-share/doc/xapian-core/apidoc/html/functions_0x72.html
-share/doc/xapian-core/apidoc/html/functions_0x73.html
-share/doc/xapian-core/apidoc/html/functions_0x74.html
-share/doc/xapian-core/apidoc/html/functions_0x75.html
-share/doc/xapian-core/apidoc/html/functions_0x76.html
-share/doc/xapian-core/apidoc/html/functions_0x77.html
share/doc/xapian-core/apidoc/html/functions_0x7e.html
+share/doc/xapian-core/apidoc/html/functions_b.html
+share/doc/xapian-core/apidoc/html/functions_c.html
+share/doc/xapian-core/apidoc/html/functions_d.html
+share/doc/xapian-core/apidoc/html/functions_e.html
share/doc/xapian-core/apidoc/html/functions_enum.html
share/doc/xapian-core/apidoc/html/functions_eval.html
+share/doc/xapian-core/apidoc/html/functions_f.html
share/doc/xapian-core/apidoc/html/functions_func.html
-share/doc/xapian-core/apidoc/html/functions_func_0x62.html
-share/doc/xapian-core/apidoc/html/functions_func_0x63.html
-share/doc/xapian-core/apidoc/html/functions_func_0x64.html
-share/doc/xapian-core/apidoc/html/functions_func_0x65.html
-share/doc/xapian-core/apidoc/html/functions_func_0x66.html
-share/doc/xapian-core/apidoc/html/functions_func_0x67.html
-share/doc/xapian-core/apidoc/html/functions_func_0x68.html
-share/doc/xapian-core/apidoc/html/functions_func_0x69.html
-share/doc/xapian-core/apidoc/html/functions_func_0x6b.html
-share/doc/xapian-core/apidoc/html/functions_func_0x6c.html
-share/doc/xapian-core/apidoc/html/functions_func_0x6d.html
-share/doc/xapian-core/apidoc/html/functions_func_0x6e.html
-share/doc/xapian-core/apidoc/html/functions_func_0x6f.html
-share/doc/xapian-core/apidoc/html/functions_func_0x70.html
-share/doc/xapian-core/apidoc/html/functions_func_0x71.html
-share/doc/xapian-core/apidoc/html/functions_func_0x72.html
-share/doc/xapian-core/apidoc/html/functions_func_0x73.html
-share/doc/xapian-core/apidoc/html/functions_func_0x74.html
-share/doc/xapian-core/apidoc/html/functions_func_0x75.html
-share/doc/xapian-core/apidoc/html/functions_func_0x76.html
-share/doc/xapian-core/apidoc/html/functions_func_0x77.html
share/doc/xapian-core/apidoc/html/functions_func_0x7e.html
-share/doc/xapian-core/apidoc/html/functions_rela.html
+share/doc/xapian-core/apidoc/html/functions_func_b.html
+share/doc/xapian-core/apidoc/html/functions_func_c.html
+share/doc/xapian-core/apidoc/html/functions_func_d.html
+share/doc/xapian-core/apidoc/html/functions_func_e.html
+share/doc/xapian-core/apidoc/html/functions_func_f.html
+share/doc/xapian-core/apidoc/html/functions_func_g.html
+share/doc/xapian-core/apidoc/html/functions_func_h.html
+share/doc/xapian-core/apidoc/html/functions_func_i.html
+share/doc/xapian-core/apidoc/html/functions_func_k.html
+share/doc/xapian-core/apidoc/html/functions_func_l.html
+share/doc/xapian-core/apidoc/html/functions_func_m.html
+share/doc/xapian-core/apidoc/html/functions_func_n.html
+share/doc/xapian-core/apidoc/html/functions_func_o.html
+share/doc/xapian-core/apidoc/html/functions_func_p.html
+share/doc/xapian-core/apidoc/html/functions_func_q.html
+share/doc/xapian-core/apidoc/html/functions_func_r.html
+share/doc/xapian-core/apidoc/html/functions_func_s.html
+share/doc/xapian-core/apidoc/html/functions_func_t.html
+share/doc/xapian-core/apidoc/html/functions_func_u.html
+share/doc/xapian-core/apidoc/html/functions_func_v.html
+share/doc/xapian-core/apidoc/html/functions_func_w.html
+share/doc/xapian-core/apidoc/html/functions_g.html
+share/doc/xapian-core/apidoc/html/functions_h.html
+share/doc/xapian-core/apidoc/html/functions_i.html
+share/doc/xapian-core/apidoc/html/functions_k.html
+share/doc/xapian-core/apidoc/html/functions_l.html
+share/doc/xapian-core/apidoc/html/functions_m.html
+share/doc/xapian-core/apidoc/html/functions_n.html
+share/doc/xapian-core/apidoc/html/functions_o.html
+share/doc/xapian-core/apidoc/html/functions_p.html
+share/doc/xapian-core/apidoc/html/functions_q.html
+share/doc/xapian-core/apidoc/html/functions_r.html
+share/doc/xapian-core/apidoc/html/functions_s.html
+share/doc/xapian-core/apidoc/html/functions_t.html
share/doc/xapian-core/apidoc/html/functions_type.html
+share/doc/xapian-core/apidoc/html/functions_u.html
+share/doc/xapian-core/apidoc/html/functions_v.html
share/doc/xapian-core/apidoc/html/functions_vars.html
+share/doc/xapian-core/apidoc/html/functions_w.html
+share/doc/xapian-core/apidoc/html/geospatial_8h.html
share/doc/xapian-core/apidoc/html/globals.html
share/doc/xapian-core/apidoc/html/globals_defs.html
share/doc/xapian-core/apidoc/html/graph_legend.html
@@ -366,8 +428,6 @@ share/doc/xapian-core/apidoc/html/inherit_graph_24.png
share/doc/xapian-core/apidoc/html/inherit_graph_25.png
share/doc/xapian-core/apidoc/html/inherit_graph_26.png
share/doc/xapian-core/apidoc/html/inherit_graph_27.png
-share/doc/xapian-core/apidoc/html/inherit_graph_28.png
-share/doc/xapian-core/apidoc/html/inherit_graph_29.png
share/doc/xapian-core/apidoc/html/inherit_graph_3.png
share/doc/xapian-core/apidoc/html/inherit_graph_4.png
share/doc/xapian-core/apidoc/html/inherit_graph_5.png
@@ -378,11 +438,10 @@ share/doc/xapian-core/apidoc/html/inherit_graph_9.png
share/doc/xapian-core/apidoc/html/inherits.html
share/doc/xapian-core/apidoc/html/keymaker_8h.html
share/doc/xapian-core/apidoc/html/matchspy_8h.html
+share/doc/xapian-core/apidoc/html/mset_8h.html
share/doc/xapian-core/apidoc/html/namespaceXapian.html
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Auto.html
-share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Brass.html
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Chert.html
-share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Flint.html
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1InMemory.html
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Remote.html
share/doc/xapian-core/apidoc/html/namespaceXapian_1_1Unicode.html
@@ -403,12 +462,10 @@ share/doc/xapian-core/apidoc/html/postingsource_8h.html
share/doc/xapian-core/apidoc/html/query_8h.html
share/doc/xapian-core/apidoc/html/queryparser_8h.html
share/doc/xapian-core/apidoc/html/registry_8h.html
+share/doc/xapian-core/apidoc/html/splitbar.png
share/doc/xapian-core/apidoc/html/stem_8h.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1StemImplementation-members.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1StemImplementation.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1ValueRangeProcessor-members.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1ValueRangeProcessor.html
-share/doc/xapian-core/apidoc/html/structXapian_1_1ValueRangeProcessor__inherit__graph.png
+share/doc/xapian-core/apidoc/html/structXapian_1_1LatLongCoord-members.html
+share/doc/xapian-core/apidoc/html/structXapian_1_1LatLongCoord.html
share/doc/xapian-core/apidoc/html/sync_off.png
share/doc/xapian-core/apidoc/html/sync_on.png
share/doc/xapian-core/apidoc/html/tab_a.png
@@ -426,10 +483,10 @@ share/doc/xapian-core/apidoc/html/version_8h.html
share/doc/xapian-core/apidoc/html/weight_8h.html
share/doc/xapian-core/apidoc/html/xapian_8h.html
share/doc/xapian-core/bm25.html
-share/doc/xapian-core/code_structure.html
share/doc/xapian-core/collapsing.html
share/doc/xapian-core/deprecation.html
share/doc/xapian-core/facets.html
+share/doc/xapian-core/geospatial.html
share/doc/xapian-core/glossary.html
share/doc/xapian-core/index.html
share/doc/xapian-core/install.html
@@ -440,9 +497,7 @@ share/doc/xapian-core/overview.html
share/doc/xapian-core/postingsource.html
share/doc/xapian-core/queryparser.html
share/doc/xapian-core/remote.html
-share/doc/xapian-core/remote_protocol.html
share/doc/xapian-core/replication.html
-share/doc/xapian-core/replication_protocol.html
share/doc/xapian-core/scalability.html
share/doc/xapian-core/serialisation.html
share/doc/xapian-core/sorting.html
@@ -452,3 +507,17 @@ share/doc/xapian-core/synonyms.html
share/doc/xapian-core/termgenerator.html
share/doc/xapian-core/tests.html
share/doc/xapian-core/valueranges.html
+share/xapian-core/stopwords/arabic.list
+share/xapian-core/stopwords/danish.list
+share/xapian-core/stopwords/dutch.list
+share/xapian-core/stopwords/english.list
+share/xapian-core/stopwords/finnish.list
+share/xapian-core/stopwords/french.list
+share/xapian-core/stopwords/german.list
+share/xapian-core/stopwords/hungarian.list
+share/xapian-core/stopwords/italian.list
+share/xapian-core/stopwords/norwegian.list
+share/xapian-core/stopwords/portuguese.list
+share/xapian-core/stopwords/russian.list
+share/xapian-core/stopwords/spanish.list
+share/xapian-core/stopwords/swedish.list
diff --git a/textproc/xapian/buildlink3.mk b/textproc/xapian/buildlink3.mk
index 38a622e9056..6da5d01b674 100644
--- a/textproc/xapian/buildlink3.mk
+++ b/textproc/xapian/buildlink3.mk
@@ -1,10 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.5 2012/05/07 01:54:03 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2016/11/07 13:02:17 schmonz Exp $
BUILDLINK_TREE+= xapian
.if !defined(XAPIAN_BUILDLINK3_MK)
XAPIAN_BUILDLINK3_MK:=
+# XXX do these depends change?
BUILDLINK_API_DEPENDS.xapian+= xapian>=1.0.7
BUILDLINK_ABI_DEPENDS.xapian+= xapian>=1.2.2nb1
BUILDLINK_PKGSRCDIR.xapian?= ../../textproc/xapian
diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index 6f57e266dcf..5ea5586bf40 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.22 2016/04/30 14:14:07 schmonz Exp $
+$NetBSD: distinfo,v 1.23 2016/11/07 13:02:17 schmonz Exp $
-SHA1 (xapian-core-1.2.23.tar.xz) = ccb6884ea90d80b0859aba876e01b38950f03a43
-RMD160 (xapian-core-1.2.23.tar.xz) = 167296dd8a5019e84cab66d2d74e1534ea6871da
-SHA512 (xapian-core-1.2.23.tar.xz) = df3fa71150575faf982d6b90f2364962d61012dd45ed7ef4945a0623ed7056c32ea3cbc423f2016415a80779251ecb5080b6a34c5b66b823cf8d92fe6b5b3d30
-Size (xapian-core-1.2.23.tar.xz) = 3206452 bytes
-SHA1 (patch-common_socket_utils.cc) = 8d58ed55f6badcbc2c6f6093e0f109682ef99c08
+SHA1 (xapian-core-1.4.1.tar.xz) = 23eeb1f2883882c7c25e6d36221e3f33a40b4205
+RMD160 (xapian-core-1.4.1.tar.xz) = 6dd5dd3db4b4cc33385f7cbcb6d2f89151e27f8e
+SHA512 (xapian-core-1.4.1.tar.xz) = b1bb28e78609565a2690ef147231237dcfdd3b7f6108964962260a2678ab6483a4e1f2a795d2a3595e9d0a1567d6223b0cbe6ed9d95a455437f7f5c40e49389d
+Size (xapian-core-1.4.1.tar.xz) = 2793644 bytes
+SHA1 (patch-common_safesyssocket.h) = 032d441853914d510bc285bb682a98c4ee264d52
diff --git a/textproc/xapian/patches/patch-common_safesyssocket.h b/textproc/xapian/patches/patch-common_safesyssocket.h
new file mode 100644
index 00000000000..2be7a8009c0
--- /dev/null
+++ b/textproc/xapian/patches/patch-common_safesyssocket.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-common_safesyssocket.h,v 1.1 2016/11/07 13:02:17 schmonz Exp $
+
+Fix compilation error on NetBSD-current (as of 2015-05-26).
+
+--- common/safesyssocket.h.orig 2016-10-21 04:54:32.000000000 +0000
++++ common/safesyssocket.h
+@@ -25,6 +25,7 @@
+ // Some older BSDs require sys/types.h to be included first.
+ # include <sys/types.h>
+ # include <sys/socket.h>
++# include <sys/time.h>
+ #else
+ # include "safewinsock2.h"
+ #endif
diff --git a/textproc/xapian/patches/patch-common_socket_utils.cc b/textproc/xapian/patches/patch-common_socket_utils.cc
deleted file mode 100644
index e6fcf9bc3a8..00000000000
--- a/textproc/xapian/patches/patch-common_socket_utils.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-common_socket_utils.cc,v 1.2 2016/04/30 14:14:07 schmonz Exp $
-
-Fix compilation error on NetBSD-current (as of 2015-05-26).
-
---- common/socket_utils.cc.orig 2015-05-21 05:57:01.000000000 +0000
-+++ common/socket_utils.cc
-@@ -28,6 +28,7 @@ using namespace std;
-
- #ifndef __WIN32__
- # include <sys/socket.h>
-+# include <sys/time.h>
- #else
- # include "safeerrno.h"
-