- Update to 1.0.2

PR:		ports/114426
Submitted by:	maintainer (Gea-Suan Lin)

3 files changed, 25 insertions, 19 deletions

diff --git a/databases/xapian-bindings10/Makefile b/databases/xapian-bindings10/Makefile
index 9f1a3c8e3050..ca5add9f46cf 100644
--- a/databases/xapian-bindings10/Makefile
+++ b/databases/xapian-bindings10/Makefile
@@ -6,40 +6,39 @@
 #
 
 PORTNAME=	xapian-bindings
-PORTVERSION=	1.0.0
-CATEGORIES=	databases java
+PORTVERSION=	1.0.2
+CATEGORIES=	databases
 MASTER_SITES=	http://www.oligarchy.co.uk/xapian/${PORTVERSION}/
 
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Bindings allowing Xapian to be used from various programming languages
 
-RUN_DEPENDS=	xapian-core>=1.0.0:${PORTSDIR}/databases/xapian-core
-BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	xapian-core>=1.0.2:${PORTSDIR}/databases/xapian-core
+BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-CONFIGURE_ARGS=	--without-csharp --without-java --without-ruby --without-tcl
+CONFIGURE_ARGS+=	--datarootdir="${DATADIR}" --docdir="${DOCSDIR}" \
+		--without-csharp --without-java --without-ruby --without-tcl
 GNU_CONFIGURE=	yes
 
-OPTIONS=	PHP "Enable PHP binding" on \
-		PYTHON "Enable Python binding" off
-
-.include <bsd.port.pre.mk>
-
 .ifdef(WITHOUT_PHP)
 CONFIGURE_ARGS+=	--without-php
 PLIST_SUB+=	BINDING_PHP="@comment "
 .else
 CONFIGURE_ARGS+=	--with-php
+CONFIGURE_ENV+=	PHP_CONFIG="${LOCALBASE}/bin/php-config"
 PLIST_SUB+=	BINDING_PHP=""
 USE_PHP=	yes
+USE_PHP_BUILD=	yes
 .endif
 
-.ifdef(WITH_PYTHON)
+.ifdef(WITHOUT_PYTHON)
+CONFIGURE_ARGS+=	--without-python
+PLIST_SUB+=	BINDING_PYTHON="@comment "
+.else
 CONFIGURE_ARGS+=	--with-python
+CONFIGURE_ENV+=	PYTHON_LIB="${PYTHON_SITELIBDIR}"
 PLIST_SUB+=	BINDING_PYTHON=""
 USE_PYTHON=	yes
-.else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=	BINDING_PYTHON="@comment "
 .endif
 
 post-install:
@@ -47,4 +46,4 @@ post-install:
 	${RM} -fr ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/xapian-bindings10/distinfo b/databases/xapian-bindings10/distinfo
index 45c26675faad..783cc93cc2fb 100644
--- a/databases/xapian-bindings10/distinfo
+++ b/databases/xapian-bindings10/distinfo
@@ -1,3 +1,3 @@
-MD5 (xapian-bindings-1.0.0.tar.gz) = 422b65976fd33374d66b688c1bc657fa
-SHA256 (xapian-bindings-1.0.0.tar.gz) = 627df294f4e025ed3352fe0213f0eb0b07f779c7a624564c00a0105924e4cf83
-SIZE (xapian-bindings-1.0.0.tar.gz) = 926449
+MD5 (xapian-bindings-1.0.2.tar.gz) = 98d335ded1a509d24646df82ee1ad463
+SHA256 (xapian-bindings-1.0.2.tar.gz) = fbbbd52dfba46cd77f13074cdbea67b3053d027d12e8a446730f0507c5e98006
+SIZE (xapian-bindings-1.0.2.tar.gz) = 984769
diff --git a/databases/xapian-bindings10/pkg-plist b/databases/xapian-bindings10/pkg-plist
index ddd35266c492..1329a0343853 100644
--- a/databases/xapian-bindings10/pkg-plist
+++ b/databases/xapian-bindings10/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+%%BINDING_PHP%%%%DATADIR%%/php5/xapian.php
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/bindings.html
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php4
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php5
@@ -7,16 +8,22 @@
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php4
 %%BINDING_PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php5
 %%BINDING_PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so
-%%BINDING_PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/bindings.html
 %%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%%%%PYTHON_SITELIBDIR%%/_xapian.so
 %%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.py
 %%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyc
+%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyo
+%%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
 %%PORTDOCS%%@dirrm %%DOCSDIR%%