From owner-svn-ports-head@freebsd.org Mon Feb 26 13:35:02 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C8715F250C0; Mon, 26 Feb 2018 13:35:01 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 771167578A; Mon, 26 Feb 2018 13:35:01 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 53C081C109; Mon, 26 Feb 2018 13:35:01 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1QDZ1DI050080; Mon, 26 Feb 2018 13:35:01 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QDZ0wX050078; Mon, 26 Feb 2018 13:35:00 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201802261335.w1QDZ0wX050078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Mon, 26 Feb 2018 13:35:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463019 - in head/www/py-cssselect: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: in head/www/py-cssselect: . files X-SVN-Commit-Revision: 463019 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 13:35:02 -0000 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@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 .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'