- Update xapian to 1.2.7.0

PR:             ports/164460

4 files changed, 36 insertions, 47 deletions

diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile
index 31b7bf3a43b7..b5a789470991 100644
--- a/databases/xapian-bindings/Makefile
+++ b/databases/xapian-bindings/Makefile
@@ -6,22 +6,26 @@
 #
 
 PORTNAME=	xapian-bindings
-PORTVERSION=	1.0.22
+PORTVERSION=	1.2.7
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Bindings allowing Xapian to be used from various programming languages
 
-RUN_DEPENDS=	xapian-core>=1.0.22:${PORTSDIR}/databases/xapian-core
-BUILD_DEPENDS:=	${RUN_DEPENDS}
+LIB_DEPENDS=	xapian.26:${PORTSDIR}/databases/xapian-core
 
 LICENSE=	GPLv2
-CONFIGURE_ARGS+=	--datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \
+
+OPTIONS=	PHP     "Build PHP binding" on \
+		PYTHON  "Build Python binding" on \
+		RUBY    "Build Ruby binding" on
+
+CONFIGURE_ARGS=	--datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \
 		--without-csharp --without-java --without-tcl
 GNU_CONFIGURE=	yes
 
-.ifdef(WITHOUT_PHP)
+.if defined(WITHOUT_PHP)
 CONFIGURE_ARGS+=	--without-php
 PLIST_SUB+=	BINDING_PHP="@comment "
 .else
@@ -32,7 +36,7 @@ USE_PHP=	yes
 USE_PHP_BUILD=	yes
 .endif
 
-.ifdef(WITHOUT_PYTHON)
+.if defined(WITHOUT_PYTHON)
 CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=	BINDING_PYTHON="@comment "
 .else
@@ -42,7 +46,7 @@ PLIST_SUB+=	BINDING_PYTHON=""
 USE_PYTHON=	yes
 .endif
 
-.ifdef(WITHOUT_RUBY)
+.if defined(WITHOUT_RUBY)
 CONFIGURE_ARGS+=	--without-ruby
 PLIST_SUB+=	BINDING_RUBY="@comment "
 .else
@@ -52,12 +56,12 @@ PLIST_SUB+=	BINDING_RUBY=""
 USE_RUBY=	yes
 .endif
 
-post-install:
-.ifdef(NOPORTDOCS)
-	${RM} -fr ${DOCSDIR}
-.endif
-.ifndef(WITHOUT_RUBY)
-	${RM} -fr ${DOCSDIR}/ruby/rdocs
+post-patch:
+# do not install rdoc
+	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' ${WRKSRC}/ruby/Makefile.in
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docdataDATA install-dist_exampledataDATA ||' ${WRKSRC}/php/Makefile.in ${WRKSRC}/python/Makefile.in
+	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-dist_docdataDATA||; 759 s|install-dist_exampledataDATA ||' ${WRKSRC}/ruby/Makefile.in
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/xapian-bindings/distinfo b/databases/xapian-bindings/distinfo
index 306e9af46e18..61fd1fb56412 100644
--- a/databases/xapian-bindings/distinfo
+++ b/databases/xapian-bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.0.22.tar.gz) = 9790f6df53e952e95f0b343fb297540ea1785e08d06125e32975ec35919b42a2
-SIZE (xapian-bindings-1.0.22.tar.gz) = 1071588
+SHA256 (xapian-bindings-1.2.7.tar.gz) = c9f63ad7a032c260f0617e029327d7b05dd986d91af401032268a9f7b2eabde8
+SIZE (xapian-bindings-1.2.7.tar.gz) = 1447683
diff --git a/databases/xapian-bindings/files/patch-configure b/databases/xapian-bindings/files/patch-configure
deleted file mode 100644
index bbc09d340e2b..000000000000
--- a/databases/xapian-bindings/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2010-10-28 16:54:25.000000000 +0000
-+++ configure	2010-10-28 16:54:39.000000000 +0000
-@@ -15156,7 +15156,7 @@ $as_echo_n "checking for python librarie
- 	mingw* | pw32*)
- 	  PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.prefix,"libs").replace(os.sep,"/")+" -lpython"+sys.version[:3].replace(".",""))'` ;;
- 	cygwin*)
--	  PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.path[3],"config")+" -lpython"+sys.version[:3]')` ;;
-+	  PYTHON_LIBS=`$PYTHON -c 'import os,sys;print("-L"+os.path.join(sys.path[3],"config")+" -lpython"+sys.version[:3])'` ;;
- 	*)
- 	  PYTHON_LIBS= ;;
- 	esac
diff --git a/databases/xapian-bindings/pkg-plist b/databases/xapian-bindings/pkg-plist
index e15476c85df0..79eaeb0ff62d 100644
--- a/databases/xapian-bindings/pkg-plist
+++ b/databases/xapian-bindings/pkg-plist
@@ -1,39 +1,35 @@
-@comment $FreeBSD$
+%%BINDING_PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so
 %%BINDING_PHP%%%%DATADIR%%/php5/xapian.php
-%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php4
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php5
-%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php4
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php5
-%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php4
+%%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php5
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php5
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/index.html
-%%BINDING_PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so
+%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php/examples
+%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php
+%%BINDING_PHP%%@dirrmtry %%DATADIR%%/php5
+%%BINDING_PHP%%@dirrmtry %%DATADIR%%
+%%BINDING_PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
+%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.py
+%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
+%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
+%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/_xapian.so
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleexpand.py
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleindex.py
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplematchdecider.py
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplesearch.py
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/index.html
-%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/_xapian.so
-%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.py
-%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyc
-%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyo
+%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python/examples
+%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python
+%%BINDING_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/xapian
+%%BINDING_RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb
+%%BINDING_RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so
 %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleexpand.rb
 %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleindex.rb
 %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplematchdecider.rb
 %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplesearch.rb
 %%BINDING_RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html
-%%BINDING_RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb
-%%BINDING_RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so
-%%BINDING_RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%
 %%BINDING_RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby/examples
 %%BINDING_RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby
-%%BINDING_PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
-%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python/examples
-%%BINDING_PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python
-%%BINDING_PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
-%%BINDING_PHP%%@dirrmtry lib/php
-%%BINDING_PHP%%@dirrmtry %%DATADIR%%/php5
-%%BINDING_PHP%%@dirrmtry %%DATADIR%%
-%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php/examples
-%%BINDING_PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php
+%%BINDING_RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%