7 files changed, 99 insertions, 24 deletions

diff --git a/databases/p5-Search-Xapian10/Makefile b/databases/p5-Search-Xapian10/Makefile
index c9dd56fa0722..2cb2b2b29051 100644
--- a/databases/p5-Search-Xapian10/Makefile
+++ b/databases/p5-Search-Xapian10/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	Search-Xapian
-PORTVERSION=	1.0.20.0
-PORTREVISION=	1
+PORTVERSION=	1.0.22.0
 CATEGORIES=	databases perl5
-MASTER_SITES=	CPAN
+MASTER_SITES=	http://oligarchy.co.uk/xapian/1.0.22/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl XS frontend to the Xapian C++ search library
 
-BUILD_DEPENDS=	xapian-core10>=1.0.10:${PORTSDIR}/databases/xapian-core10
-RUN_DEPENDS=	${BUILD_DEPENDS}
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+BUILD_DEPENDS=	xapian-core>=1.0.22:${PORTSDIR}/databases/xapian-core
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 CC=		${CXX}
diff --git a/databases/p5-Search-Xapian10/distinfo b/databases/p5-Search-Xapian10/distinfo
index 858aeb4ad746..d9f635459048 100644
--- a/databases/p5-Search-Xapian10/distinfo
+++ b/databases/p5-Search-Xapian10/distinfo
@@ -1,3 +1,2 @@
-MD5 (Search-Xapian-1.0.20.0.tar.gz) = 8fca4619975eddb6fdf297450730d1f7
-SHA256 (Search-Xapian-1.0.20.0.tar.gz) = 127f539525c326c39e0a83ddf3455b284415261621f3e4d2f418b94137b2d07b
-SIZE (Search-Xapian-1.0.20.0.tar.gz) = 52427
+SHA256 (Search-Xapian-1.0.22.0.tar.gz) = a74da17bce03e294d9046857cd8b6beade805f2ebc5310305e5b8a17537e21a5
+SIZE (Search-Xapian-1.0.22.0.tar.gz) = 52663
diff --git a/databases/xapian-bindings10/Makefile b/databases/xapian-bindings10/Makefile
index 6ea1e7ea462e..31b7bf3a43b7 100644
--- a/databases/xapian-bindings10/Makefile
+++ b/databases/xapian-bindings10/Makefile
@@ -1,22 +1,22 @@
-# New ports collection makefile for:	xapian-bindings10
+# New ports collection makefile for:	xapian-bindings
 # Date created:		2007-05-26
 # Whom:			Gea-Suan Lin <gslin@gslin.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	xapian-bindings10
-PORTVERSION=	1.0.18
-PORTREVISION=	1
+PORTNAME=	xapian-bindings
+PORTVERSION=	1.0.22
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/
 
-MAINTAINER=	gslin@gslin.org
+MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Bindings allowing Xapian to be used from various programming languages
 
-RUN_DEPENDS=	xapian-core10>=1.0.18:${PORTSDIR}/databases/xapian-core10
+RUN_DEPENDS=	xapian-core>=1.0.22:${PORTSDIR}/databases/xapian-core
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
+LICENSE=	GPLv2
 CONFIGURE_ARGS+=	--datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \
 		--without-csharp --without-java --without-tcl
 GNU_CONFIGURE=	yes
diff --git a/databases/xapian-bindings10/distinfo b/databases/xapian-bindings10/distinfo
index 6cce8e0e6b56..306e9af46e18 100644
--- a/databases/xapian-bindings10/distinfo
+++ b/databases/xapian-bindings10/distinfo
@@ -1,3 +1,2 @@
-MD5 (xapian-bindings-1.0.18.tar.gz) = a82b3cc1402eed22ce1d76e61d32d0fa
-SHA256 (xapian-bindings-1.0.18.tar.gz) = 172d5f9faaa09c274b9ee429a579c6ac28d980176796b29b4c63222b2f20d12d
-SIZE (xapian-bindings-1.0.18.tar.gz) = 1068245
+SHA256 (xapian-bindings-1.0.22.tar.gz) = 9790f6df53e952e95f0b343fb297540ea1785e08d06125e32975ec35919b42a2
+SIZE (xapian-bindings-1.0.22.tar.gz) = 1071588
diff --git a/databases/xapian-core10/Makefile b/databases/xapian-core10/Makefile
index f945ef71d8df..724116b5acf1 100644
--- a/databases/xapian-core10/Makefile
+++ b/databases/xapian-core10/Makefile
@@ -1,26 +1,33 @@
-# New ports collection makefile for:	xapian-core10
+# New ports collection makefile for:	xapian-core
 # Date created:				5 November 2005
 # Whom:					J.F. Dockes
 #
 # $FreeBSD$
 #
 
-PORTNAME=	xapian-core10
-PORTVERSION=	1.0.17
+PORTNAME=	xapian-core
+PORTVERSION=	1.0.22
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/
 
-MAINTAINER=	jean-francois.dockes@wanadoo.fr
+MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	A probabilistic text search database engine
 
+LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+OPTIONS=	SSE2 "Use SSE2 for floating point" Off
+
 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
 
+.if defined(WITHOUT_SSE2)
+CONFIGURE_ARGS+=	--disable-sse
+.endif
+
 post-install:
 .for file in delve quest copydatabase
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${PREFIX}/bin/xapian-${file}
diff --git a/databases/xapian-core10/distinfo b/databases/xapian-core10/distinfo
index d22552b77b45..48f8b3859d21 100644
--- a/databases/xapian-core10/distinfo
+++ b/databases/xapian-core10/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xapian-core-1.0.22.tar.gz) = 39fc7ec7a233c2a5b3cea4954dd35c1f891841274d35bf746d23b1feac6fe511
+SIZE (xapian-core-1.0.22.tar.gz) = 3342736
diff --git a/databases/xapian-core10/pkg-plist b/databases/xapian-core10/pkg-plist
index 4e4161601506..3c6877e27d57 100644
--- a/databases/xapian-core10/pkg-plist
+++ b/databases/xapian-core10/pkg-plist
@@ -38,10 +38,15 @@ lib/libxapian.a
 lib/libxapian.la
 lib/libxapian.so
 lib/libxapian.so.21
+lib/cmake/xapian/xapian-config.cmake
+lib/cmake/xapian/xapian-config-version.cmake
 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
@@ -50,10 +55,34 @@ 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_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
@@ -62,8 +91,11 @@ 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
@@ -73,6 +105,21 @@ 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_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_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
@@ -82,6 +129,12 @@ share/aclocal/xapian.m4
 %%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
@@ -93,8 +146,17 @@ share/aclocal/xapian.m4
 %%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_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_1SimpleStopper-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1SimpleStopper__inherit__graph.png
@@ -116,6 +178,9 @@ 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_1ValueIterator-members.html
@@ -134,6 +199,7 @@ 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
@@ -223,6 +289,7 @@ 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__3.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__4.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/inherit__graph__5.png
@@ -294,3 +361,5 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/apidoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/xapian
+@dirrmtry lib/cmake/xapian
+@dirrmtry lib/cmake