--- b/devel/py-sip/Makefile +++ b/devel/py-sip/Makefile @@ -15,11 +15,9 @@ COMMENT= Python to C and C++ bindings generator USES= python pyqt:sip USE_PYTHON= concurrent py3kplist flavors -USE_PYQT= # CONFIGURE_ARGS= -b ${PREFIX}/bin -d ${PYTHONPREFIX_SITELIBDIR} \ - -e ${PYTHONPREFIX_INCLUDEDIR} -v ${DATADIR} \ - --sipdir ${PYQT_SIPDIR} \ + -e ${PYTHONPREFIX_INCLUDEDIR} \ CC="${CC}" CXX="${CXX}" LINK="${CXX}" LINK_SHLIB="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INCDIR="${LOCALBASE}/include" LIBDIR="${LOCALBASE}/lib" @@ -38,22 +36,33 @@ CONFIGURE_WRKSRC= ${WRKSRC}/default BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} +# pyqt.mk does not know whether we uses Qt 4 or 5 in this port. +# Therefore the following line is not well-defined: +# _VERSION_SUBDIR_REL=├→→→PyQt${_PYQT_VERSION}/${PYTHON_VER} +.for version in 4 5 +_VERSION_SUBDIR_REL${version}= share/PyQt${version}/${PYTHON_VER}/sip +SIPDIR${version}= ${PREFIX}/${_VERSION_SUBDIR_REL${version}} +.endfor + do-configure: # The default sip 'flavor' ${MKDIR} ${CONFIGURE_WRKSRC} && \ cd ${CONFIGURE_WRKSRC} && \ - ${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} && \ + ${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR4} && \ ${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' ${CONFIGURE_WRKSRC}/sipconfig.py # The now needed version for 5.11 (which will be the default from 2019-03-16). ${MKDIR} ${WRKSRC}/sip_qt5 && \ cd ${WRKSRC}/sip_qt5 && \ - ${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sip-module PyQt5.sip --no-tools && \ + ${PYTHON_CMD} ${WRKSRC}/configure.py ${CONFIGURE_ARGS} --sipdir ${SIPDIR5} --sip-module PyQt5.sip --no-tools && \ ${REINPLACE_CMD} -e '/sip_bin.:/s|'\'',$$|-${PYTHON_VER}'\'',|' ${WRKSRC}/sip_qt5/sipconfig.py post-build: cd ${WRKSRC}/sip_qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} post-install: + # The default version is PyQt4, but we need PyQt5 by default + ${REINPLACE_CMD} -e 's/PyQt4/PyQt5/g' ${STAGEDIR}${PYTHON_SITELIBDIR}/sipconfig.py + ${MKDIR} ${STAGEDIR}${DOCSDIR} && cd ${WRKSRC}/doc/html && \ ${COPYTREE_SHARE} \. ${STAGEDIR}${DOCSDIR} ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \