Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Apr 2017 09:36:44 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r437721 - in head/databases: . py-xapian py-xapian/files
Message-ID:  <201704040936.v349aibd093140@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Apr  4 09:36:43 2017
New Revision: 437721
URL: https://svnweb.freebsd.org/changeset/ports/437721

Log:
  Add py-xapian 1.4.3 (copied from xapian-bindings)
  
  - Update to 1.4.3
  - Add BUILD_DEPENDS
  - Update WWW
  
  Changes:	https://trac.xapian.org/wiki/ReleaseOverview/1.4.3
  		https://trac.xapian.org/wiki/ReleaseOverview/1.4.2
  		https://trac.xapian.org/wiki/ReleaseOverview/1.4.1
  		https://trac.xapian.org/wiki/ReleaseOverview/1.4.0

Added:
  head/databases/py-xapian/
     - copied from r437680, head/databases/xapian-bindings/
  head/databases/py-xapian/files/
  head/databases/py-xapian/files/patch-configure   (contents, props changed)
Modified:
  head/databases/Makefile
  head/databases/py-xapian/Makefile
  head/databases/py-xapian/distinfo
  head/databases/py-xapian/pkg-descr
  head/databases/py-xapian/pkg-plist

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Tue Apr  4 09:35:49 2017	(r437720)
+++ head/databases/Makefile	Tue Apr  4 09:36:43 2017	(r437721)
@@ -806,6 +806,7 @@
     SUBDIR += py-umemcache
     SUBDIR += py-unqlite
     SUBDIR += py-whisper
+    SUBDIR += py-xapian
     SUBDIR += py3-bsddb3
     SUBDIR += py3-mysqlclient
     SUBDIR += py3-psycopg2

Modified: head/databases/py-xapian/Makefile
==============================================================================
--- head/databases/xapian-bindings/Makefile	Tue Apr  4 05:19:52 2017	(r437680)
+++ head/databases/py-xapian/Makefile	Tue Apr  4 09:36:43 2017	(r437721)
@@ -1,49 +1,55 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	xapian-bindings
-PORTVERSION=	1.2.24
+PORTNAME=	xapian
+PORTVERSION=	1.4.3
+DISTVERSIONPREFIX=	bindings-
 CATEGORIES=	databases
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Bindings allowing Xapian to be used from various programming languages
+COMMENT=	Python binding for Xapian
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	xapian-core>=${PORTVERSION}:databases/xapian-core
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
-OPTIONS_DEFINE=	DOCS LUA PHP PYTHON RUBY
-OPTIONS_DEFAULT=PHP PYTHON RUBY
-OPTIONS_SUB=	yes
+CONFLICTS_INSTALL=	xapian-bindings12-
+
+OPTIONS_DEFINE=	DOCS
 
 PORTSCOUT=	limitw:1,even
 
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
-		--without-csharp --without-java --without-perl --without-tcl
+		--enable-static \
+		--without-csharp --without-java --without-lua --without-perl \
+		--without-php --without-ruby --without-tcl
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool tar:xz
+USES=		libtool python tar:xz
 
 PORTDOCS=	*
 
-LUA_CONFIGURE_ENV=	LUA="${LUA_CMD}" LUA_INC="${LUA_INCDIR}" LUA_LIB="${LUA_MODLIBDIR}" LUA_SO=.so
-LUA_CONFIGURE_WITH=	lua
-LUA_USES=		lua
-PHP_CONFIGURE_ENV=	PHP_CONFIG=${LOCALBASE}/bin/php-config
-PHP_CONFIGURE_WITH=	php
-PHP_USES=		php:build
-PYTHON_CONFIGURE_ENV=	PYTHON_LIB=${PYTHON_SITELIBDIR}
-PYTHON_CONFIGURE_WITH=	python
-PYTHON_USES=		python:2
-RUBY_CONFIGURE_WITH=	ruby
-RUBY_USE=		RUBY=yes
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-# do not install rdoc
-	@${REINPLACE_CMD} -e '/^install-data-am:/ s|install-data-local||' ${WRKSRC}/ruby/Makefile.in
 
-.include <bsd.port.mk>
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} -e 's| all-local||; s| install-data-local install-dist_exampledataDATA||' ${WRKSRC}/python/Makefile.in ${WRKSRC}/python3/Makefile.in
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} > 3000
+CONFIGURE_ARGS+=--with-python3 --without-python
+CONFIGURE_ENV+=	PYTHON3=${PYTHON_CMD}
+.else
+CONFIGURE_ARGS+=--with-python --without-python3
+CONFIGURE_ENV+=	PYTHON2=${PYTHON_CMD}
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/databases/py-xapian/distinfo
==============================================================================
--- head/databases/xapian-bindings/distinfo	Tue Apr  4 05:19:52 2017	(r437680)
+++ head/databases/py-xapian/distinfo	Tue Apr  4 09:36:43 2017	(r437721)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475134758
-SHA256 (xapian-bindings-1.2.24.tar.xz) = 0c2a0df0a4616e2bd8e578d372c9bb4684780573abebbd1ac515502177229965
-SIZE (xapian-bindings-1.2.24.tar.xz) = 886148
+TIMESTAMP = 1485562319
+SHA256 (xapian-bindings-1.4.3.tar.xz) = 65b5455bf81e4f39fda49a6ad99353b05889d11d7c4c2cae001a0a1e0dac0d87
+SIZE (xapian-bindings-1.4.3.tar.xz) = 1114408

Added: head/databases/py-xapian/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/py-xapian/files/patch-configure	Tue Apr  4 09:36:43 2017	(r437721)
@@ -0,0 +1,24 @@
+--- configure.orig	2017-01-25 00:42:31 UTC
++++ configure
+@@ -17105,10 +17105,6 @@ $as_echo "yes" >&6; }
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-      if test yes = "$with_python2" ; then
+-	as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx" "$LINENO" 5
+-      fi
+-      PYTHON2=
+     fi
+     if test -n "$PYTHON2" ; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON2_INC/Python.h" >&5
+@@ -17292,10 +17288,6 @@ $as_echo "yes" >&6; }
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-      if test yes = "$with_python3" ; then
+-	as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python3 - try package python3-sphinx" "$LINENO" 5
+-      fi
+-      PYTHON3=
+     fi
+     if test -n "$PYTHON3" ; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5

Modified: head/databases/py-xapian/pkg-descr
==============================================================================
--- head/databases/xapian-bindings/pkg-descr	Tue Apr  4 05:19:52 2017	(r437680)
+++ head/databases/py-xapian/pkg-descr	Tue Apr  4 09:36:43 2017	(r437721)
@@ -1,4 +1,3 @@
-SWIG and JNI bindings allowing Xapian to be used from various other programming
-languages.
+Python binding for Xapian
 
-WWW: http://www.xapian.org/
+WWW: https://xapian.org/

Modified: head/databases/py-xapian/pkg-plist
==============================================================================
--- head/databases/xapian-bindings/pkg-plist	Tue Apr  4 05:19:52 2017	(r437680)
+++ head/databases/py-xapian/pkg-plist	Tue Apr  4 09:36:43 2017	(r437721)
@@ -1,9 +1,7 @@
-%%LUA%%%%LUA_MODLIBDIR%%/xapian.so
-%%PHP%%lib/php/%%PHP_EXT_DIR%%/xapian.so
-%%PHP%%%%DATADIR%%/php5/xapian.php
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/xapian/_xapian.so
-%%RUBY%%%%RUBY_SITELIBDIR%%/xapian.rb
-%%RUBY%%%%RUBY_SITEARCHLIBDIR%%/_xapian.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xapian/__init__.py
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
+%%PYTHON_SITELIBDIR%%/xapian/_xapian.a
+%%PYTHON_SITELIBDIR%%/xapian/_xapian.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704040936.v349aibd093140>