diff -ruN --exclude=CVS /usr/ports/databases/xapian-bindings/Makefile /home/staff/gslin/work/ports/xapian-bindings/Makefile
--- /usr/ports/databases/xapian-bindings/Makefile	Wed May 30 16:45:32 2007
+++ /home/staff/gslin/work/ports/xapian-bindings/Makefile	Mon Jul  9 11:56:12 2007
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	xapian-bindings
-PORTVERSION=	1.0.0
+PORTVERSION=	1.0.2
 CATEGORIES=	databases java
 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 \
@@ -29,12 +30,14 @@
 PLIST_SUB+=	BINDING_PHP="@comment "
 .else
 CONFIGURE_ARGS+=	--with-php
+CONFIGURE_ENV+=	PHP_EXTENSION_DIR="${PREFIX}/lib/php/${PHP_EXT_DIR}"
 PLIST_SUB+=	BINDING_PHP=""
 USE_PHP=	yes
 .endif
 
 .ifdef(WITH_PYTHON)
 CONFIGURE_ARGS+=	--with-python
+CONFIGURE_ENV+=	PYTHON_LIB="${PYTHON_LIBDIR}"
 PLIST_SUB+=	BINDING_PYTHON=""
 USE_PYTHON=	yes
 .else
diff -ruN --exclude=CVS /usr/ports/databases/xapian-bindings/distinfo /home/staff/gslin/work/ports/xapian-bindings/distinfo
--- /usr/ports/databases/xapian-bindings/distinfo	Wed May 30 16:45:32 2007
+++ /home/staff/gslin/work/ports/xapian-bindings/distinfo	Mon Jul  9 08:07:13 2007
@@ -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 -ruN --exclude=CVS /usr/ports/databases/xapian-bindings/pkg-plist /home/staff/gslin/work/ports/xapian-bindings/pkg-plist
--- /usr/ports/databases/xapian-bindings/pkg-plist	Wed May 30 16:45:32 2007
+++ /home/staff/gslin/work/ports/xapian-bindings/pkg-plist	Mon Jul  9 12:52:00 2007
@@ -1,4 +1,5 @@
 @comment $FreeBSD: ports/databases/xapian-bindings/pkg-plist,v 1.1 2007/05/30 08:45:32 clsung Exp $
+%%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,7 +8,6 @@
 %%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
@@ -15,8 +15,13 @@
 %%BINDING_PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplesearch.py
 %%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.py
 %%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyc
+%%BINDING_PYTHON%%%%PYTHON_SITELIBDIR%%/xapian.pyo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%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%%