svn commit: r463019 - in head/www/py-cssselect: . files

[Jason E. Hale]

Author: jhale
Date: Mon Feb 26 13:35:00 2018
New Revision: 463019
URL: https://svnweb.freebsd.org/changeset/ports/463019

Log:
  Fix stage-qa errors when building a non-default Python flavor when DOCS option
  is enabled. For example, if py27 is default and try to build the py36 flavor,
  it was using the py27 flavor of sphinx for the docs build and leaving behind
  python 2.7 bytecode in STAGEDIR:
  
  ====> Running Q/A tests (stage-qa)
  Error: 'lib/python3.6/site-packages/cssselect/parser.pyc' is referring to /wrkdirs/usr/ports/www/py-cssselect/work-py36/stage
  Error: 'lib/python3.6/site-packages/cssselect/xpath.pyc' is referring to /wrkdirs/usr/ports/www/py-cssselect/work-py36/stage
  Error: 'lib/python3.6/site-packages/cssselect/__init__.pyc' is referring to /wrkdirs/usr/ports/www/py-cssselect/work-py36/stage
  *** Error code 1
  
  While here:
  Add LICENSE_FILE
  Add NO_ARCH
  Pet portlint
  
  Approved by:	portmgr (blanket)

Modified:
  head/www/py-cssselect/Makefile
  head/www/py-cssselect/files/patch-docs__conf.py

Modified: head/www/py-cssselect/Makefile
==============================================================================
--- head/www/py-cssselect/Makefile	Mon Feb 26 13:22:45 2018	(r463018)
+++ head/www/py-cssselect/Makefile	Mon Feb 26 13:35:00 2018	(r463019)
@@ -12,18 +12,21 @@ MAINTAINER=	nivit at FreeBSD.org
 COMMENT=	Cssselect parses CSS3 Selectors and translates them to XPath 1.0
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	DOCS
-
 USES=		python
 USE_PYTHON=	distutils autoplist
 
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-SPHINX_BUILD=	sphinx-build
+SPHINX_BUILD=	sphinx-build-${PYTHON_VER}
 
 post-install::
 	${SETENV} PYTHONPATH="${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}" \

Modified: head/www/py-cssselect/files/patch-docs__conf.py
==============================================================================
--- head/www/py-cssselect/files/patch-docs__conf.py	Mon Feb 26 13:22:45 2018	(r463018)
+++ head/www/py-cssselect/files/patch-docs__conf.py	Mon Feb 26 13:35:00 2018	(r463019)
@@ -1,6 +1,6 @@
---- ./docs/conf.py.orig	2014-04-01 22:42:52.000000000 +0200
-+++ ./docs/conf.py	2014-04-01 22:43:15.000000000 +0200
-@@ -244,7 +244,3 @@
+--- docs/conf.py.orig	2013-09-15 08:25:25 UTC
++++ docs/conf.py
+@@ -244,7 +244,3 @@ texinfo_documents = [
  
  # How to display URL addresses: 'footnote', 'no', or 'inline'.
  #texinfo_show_urls = 'footnote'