From owner-svn-ports-all@freebsd.org Sun Dec 6 21:09:02 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AEF69A0799; Sun, 6 Dec 2015 21:09:02 +0000 (UTC) (envelope-from rakuco@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 mx1.freebsd.org (Postfix) with ESMTPS id 014191791; Sun, 6 Dec 2015 21:09:01 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB6L91tf055867; Sun, 6 Dec 2015 21:09:01 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB6L904V055865; Sun, 6 Dec 2015 21:09:00 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512062109.tB6L904V055865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 6 Dec 2015 21:09:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403164 - head/devel/py-sip X-SVN-Group: ports-head 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.20 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: Sun, 06 Dec 2015 21:09:02 -0000 Author: rakuco Date: Sun Dec 6 21:09:00 2015 New Revision: 403164 URL: https://svnweb.freebsd.org/changeset/ports/403164 Log: py-sip: Allow concurrent Python installations. Add USE_PYTHON=concurrent and make the necessary adjustments: - Stop setting DATADIR and DOCSDIR, they are taken care of by USE_PYTHON=concurrent. - Use Python's compileall module instead of py_compile so that Python 3 byte-code does not contain ${STAGEDIR}. - Remove %%DATADIR%% from the plist, which was generated by py_compile. PR: 203734 Modified: head/devel/py-sip/Makefile head/devel/py-sip/pkg-plist Modified: head/devel/py-sip/Makefile ============================================================================== --- head/devel/py-sip/Makefile Sun Dec 6 20:59:53 2015 (r403163) +++ head/devel/py-sip/Makefile Sun Dec 6 21:09:00 2015 (r403164) @@ -3,6 +3,7 @@ PORTNAME= sip PORTVERSION= ${SIP_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_SIP} @@ -13,10 +14,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Python to C and C++ bindings generator USES= python -USE_PYTHON= py3kplist +USE_PYTHON= concurrent py3kplist -DATADIR= ${PREFIX}/share/py-${PORTNAME} -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ -e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ @@ -36,11 +35,11 @@ do-configure: post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ ${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${DATADIR} &&\ - cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} &&\ - ${PYTHON_CMD} -c "import sipconfig" &&\ - ${PYTHON_CMD} -O -c "import sipconfig" &&\ - ${PYTHON_CMD} -c "import sipdistutils" &&\ - ${PYTHON_CMD} -O -c "import sipdistutils" + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR} \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include Modified: head/devel/py-sip/pkg-plist ============================================================================== --- head/devel/py-sip/pkg-plist Sun Dec 6 20:59:53 2015 (r403163) +++ head/devel/py-sip/pkg-plist Sun Dec 6 21:09:00 2015 (r403164) @@ -7,4 +7,3 @@ bin/sip %%PYTHON_SITELIBDIR%%/sipdistutils.py %%PYTHON_SITELIBDIR%%/sipdistutils.pyc %%PYTHON_SITELIBDIR%%/sipdistutils.pyo -@dir %%DATADIR%%