From owner-svn-ports-all@freebsd.org Mon Feb 26 15:27:35 2018 Return-Path: Delivered-To: svn-ports-all@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 59F65F2CFCE; Mon, 26 Feb 2018 15:27:35 +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 052AB7A2F2; Mon, 26 Feb 2018 15:27:35 +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 EF7D91D322; Mon, 26 Feb 2018 15:27:34 +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 w1QFRYrv008930; Mon, 26 Feb 2018 15:27:34 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1QFRYLP008929; Mon, 26 Feb 2018 15:27:34 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201802261527.w1QFRYLP008929@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 15:27:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463026 - head/audio/py-pyaudio X-SVN-Group: ports-head X-SVN-Commit-Author: jhale X-SVN-Commit-Paths: head/audio/py-pyaudio X-SVN-Commit-Revision: 463026 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2018 15:27:35 -0000 Author: jhale Date: Mon Feb 26 15:27:34 2018 New Revision: 463026 URL: https://svnweb.freebsd.org/changeset/ports/463026 Log: Fix stage-qa errors when building a non-default Python flavor when DOCS option is enabled. (e.g. py27 default, try to build py36) ===> Checking for items in STAGEDIR missing from pkg-plist Error: Orphaned: %%PYTHON_SITELIBDIR%%/pyaudio.pyc ===> Checking for items in pkg-plist which are not in STAGEDIR ===> Error: Plist issues found. textproc/py-sphinx is only needed for DOCS here and should be the same flavor as the port being built to avoid bytecode leftovers. Do DOCS build in the build stage and simplify DOCS installation Approved by: portmgr (blanket) Modified: head/audio/py-pyaudio/Makefile Modified: head/audio/py-pyaudio/Makefile ============================================================================== --- head/audio/py-pyaudio/Makefile Mon Feb 26 15:06:56 2018 (r463025) +++ head/audio/py-pyaudio/Makefile Mon Feb 26 15:27:34 2018 (r463026) @@ -3,6 +3,7 @@ PORTNAME= pyaudio PORTVERSION= 0.2.11 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,30 +15,30 @@ COMMENT= Portaudio toolkit bindings for Python LICENSE= MIT LIB_DEPENDS= libportaudio.so:audio/portaudio -BUILD_DEPENDS= sphinx-build:textproc/py-sphinx USES= python gmake USE_PYTHON= distutils autoplist +MAKE_ENV= PYTHON=${PYTHON_CMD} \ + SPHINX=sphinx-build-${PYTHON_VER} +PORTDOCS= * WRKSRC= ${WRKDIR}/PyAudio-${PORTVERSION} OPTIONS_DEFINE= DOCS -PORTDOCS= * +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} + post-patch: @${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/setup.py -pre-install: - (cd ${BUILD_WRKSRC} && ${MAKE_CMD} PYTHON=${PYTHON_CMD} docs) +post-build-DOCS-on: + (cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} docs) +post-install-DOCS-on: + (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -path *doctrees*") + post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.js ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/*.inv ${STAGEDIR}${DOCSDIR} - @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} _static ${STAGEDIR}${DOCSDIR}/ - @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} _sources ${STAGEDIR}${DOCSDIR}/ @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_portaudio.so .include