3 files changed, 6 insertions, 42 deletions

diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile
index 75311891e8ee..1d9c9acf9288 100644
--- a/databases/xapian-bindings/Makefile
+++ b/databases/xapian-bindings/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xapian-bindings
-PORTVERSION=	1.2.16
+PORTVERSION=	1.2.17
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
@@ -26,6 +26,8 @@ GNU_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 USE_XZ=		yes
 
+PORTDOCS=	*
+
 LUA_CONFIGURE_ENV=	LUA="${LUA_CMD}" LUA_INC="${LUA_INCDIR}" LUA_LIB="${LUA_MODLIBDIR}" LUA_SO=.so
 LUA_CONFIGURE_WITH=	lua
 LUA_USE=		LUA=5.1+
@@ -37,7 +39,7 @@ PHP_CONFIGURE_WITH=	php
 PHP_USE=		PHP=yes PHP_BUILD=yes
 PYTHON_CONFIGURE_ENV=	PYTHON_LIB=${PYTHON_SITELIBDIR}
 PYTHON_CONFIGURE_WITH=	python
-PYTHON_USE=		PYTHON=-2.7
+PYTHON_USE=		PYTHON=2
 RUBY_CONFIGURE_WITH=	ruby
 RUBY_USE=		RUBY=yes RUBY_RDOC=no
 
diff --git a/databases/xapian-bindings/distinfo b/databases/xapian-bindings/distinfo
index 353b05ee7788..6e013062ae34 100644
--- a/databases/xapian-bindings/distinfo
+++ b/databases/xapian-bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xapian-bindings-1.2.16.tar.xz) = e87ddcd70a5044565e631fb334155f7d66a3b7b491a94a22aa1db2aa0d26af6c
-SIZE (xapian-bindings-1.2.16.tar.xz) = 825868
+SHA256 (xapian-bindings-1.2.17.tar.xz) = 54ad5d818fa7d6558acbf517a04c78db9fb4c90103eda0a0f9fe9a864683f80a
+SIZE (xapian-bindings-1.2.17.tar.xz) = 827160
diff --git a/databases/xapian-bindings/pkg-plist b/databases/xapian-bindings/pkg-plist
index 6c2c4c180fbe..2dd5d29bc051 100644
--- a/databases/xapian-bindings/pkg-plist
+++ b/databases/xapian-bindings/pkg-plist
@@ -1,11 +1,4 @@
 %%LUA%%%%LUA_MODLIBDIR%%/xapian.so
-%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simpleexpand.lua
-%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simpleindex.lua
-%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simplematchdecider.lua
-%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/examples/simplesearch.lua
-%%LUA%%%%PORTDOCS%%%%DOCSDIR%%/lua/index.html
-%%LUA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/lua/examples
-%%LUA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/lua
 %%PERL%%%%SITE_PERL%%/Search/Xapian.pm
 %%PERL%%%%SITE_PERL%%/Search/Xapian/AssertionError.pm
 %%PERL%%%%SITE_PERL%%/Search/Xapian/BM25Weight.pm
@@ -54,28 +47,12 @@
 %%PERL%%%%SITE_PERL%%/Search/Xapian/Weight.pm
 %%PERL%%%%SITE_PERL%%/Search/Xapian/WritableDatabase.pm
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian/Xapian.so
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-indexer.pl
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-searcher.pl
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleexpand.pl
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleindex.pl
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplematchdecider.pl
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplesearch.pl
-%%PERL%%%%PORTDOCS%%%%DOCSDIR%%/perl/index.html
-%%PERL%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/perl/examples
-%%PERL%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/perl
 %%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search/Xapian
 %%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Search
 %%PERL%%@dirrm %%SITE_PERL%%/Search/Xapian
 %%PERL%%@dirrm %%SITE_PERL%%/Search
 %%PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so
 %%PHP%%%%DATADIR%%/php5/xapian.php
-%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php5
-%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php5
-%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php5
-%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php5
-%%PHP%%%%PORTDOCS%%%%DOCSDIR%%/php/index.html
-%%PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php/examples
-%%PHP%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/php
 %%PHP%%@dirrmtry %%DATADIR%%/php5
 %%PHP%%@dirrmtry %%DATADIR%%
 %%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
@@ -83,22 +60,7 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/_xapian.so
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleexpand.py
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simpleindex.py
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplematchdecider.py
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/examples/simplesearch.py
-%%PYTHON%%%%PORTDOCS%%%%DOCSDIR%%/python/index.html
-%%PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python/examples
-%%PYTHON%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/python
 %%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%/xapian
 %%RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleexpand.rb
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleindex.rb
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplematchdecider.rb
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplesearch.rb
-%%RUBY%%%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html
-%%RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby/examples
-%%RUBY%%%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/ruby
 %%RUBY%%@dirrmtry %%RUBY_SITELIBDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%