diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-12-06 21:09:00 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2015-12-06 21:09:00 +0000 |
| commit | 3678aafc54ffc4ca84951d2dd93d8301a81dbe80 (patch) | |
| tree | bc837b2fc574453df02e8996dda2577def6cd699 | |
| parent | f396b5498b4005a126dc405b8c801867f9d3302a (diff) | |
| download | freebsd-ports-3678aafc54ffc4ca84951d2dd93d8301a81dbe80.zip | |
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
| -rw-r--r-- | devel/py-sip/Makefile | 17 | ||||
| -rw-r--r-- | devel/py-sip/pkg-plist | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index 913ec80a1c71..7006ba7299f8 100644 --- a/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -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 <bsd.port.mk> diff --git a/devel/py-sip/pkg-plist b/devel/py-sip/pkg-plist index ac1e54df8526..0a560907a499 100644 --- a/devel/py-sip/pkg-plist +++ b/devel/py-sip/pkg-plist @@ -7,4 +7,3 @@ bin/sip %%PYTHON_SITELIBDIR%%/sipdistutils.py %%PYTHON_SITELIBDIR%%/sipdistutils.pyc %%PYTHON_SITELIBDIR%%/sipdistutils.pyo -@dir %%DATADIR%% |