Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Jan 2018 13:06:23 +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: r459929 - in head/databases/py-xapian: . files
Message-ID:  <201801251306.w0PD6NTQ041800@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Jan 25 13:06:23 2018
New Revision: 459929
URL: https://svnweb.freebsd.org/changeset/ports/459929

Log:
  Update BUILD_DEPENDS: restrict py-sphinx to DOCS option
  
  PR:		219249
  Reported by:	Gerrit Beine <mail+freebsd@gerritbeine.de>

Added:
  head/databases/py-xapian/files/
  head/databases/py-xapian/files/patch-configure   (contents, props changed)
Modified:
  head/databases/py-xapian/Makefile

Modified: head/databases/py-xapian/Makefile
==============================================================================
--- head/databases/py-xapian/Makefile	Thu Jan 25 13:06:18 2018	(r459928)
+++ head/databases/py-xapian/Makefile	Thu Jan 25 13:06:23 2018	(r459929)
@@ -17,8 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	fails to build: Fatal Python error: swig_pythreadstate set in XapianSWIG_Python_Thread_Allow ctor
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${FLAVOR} \
-		xapian-core>=${PORTVERSION}:databases/xapian-core
+BUILD_DEPENDS=	xapian-core>=${PORTVERSION}:databases/xapian-core
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
 CONFLICTS_INSTALL=	xapian-bindings12
@@ -37,6 +36,8 @@ USES=		libtool python tar:xz
 USE_PYTHON=	flavors
 
 PORTDOCS=	*
+
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.4.8:textproc/py-sphinx@${FLAVOR}
 
 .include <bsd.port.pre.mk>
 

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	Thu Jan 25 13:06:23 2018	(r459929)
@@ -0,0 +1,24 @@
+--- configure.orig	2017-10-16 02:32:59 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_python" ; 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



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