Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Feb 2019 21:26:29 +0000 (UTC)
From:      Christoph Moench-Tegeder <cmt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492651 - in head/devel: pyside2 pyside2-tools shiboken2
Message-ID:  <201902102126.x1ALQTeR058205@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cmt
Date: Sun Feb 10 21:26:29 2019
New Revision: 492651
URL: https://svnweb.freebsd.org/changeset/ports/492651

Log:
  pyside2 etc al: fix Python flavors
  
  shared library (and other files, too) naming is very different between
  python 2 and python 3 variants, this makes things harder than I would
  like them to be.
  
  Reported by:	pkg-fallout

Modified:
  head/devel/pyside2-tools/Makefile
  head/devel/pyside2/Makefile
  head/devel/pyside2/pkg-plist
  head/devel/shiboken2/Makefile
  head/devel/shiboken2/pkg-plist

Modified: head/devel/pyside2-tools/Makefile
==============================================================================
--- head/devel/pyside2-tools/Makefile	Sun Feb 10 21:21:21 2019	(r492650)
+++ head/devel/pyside2-tools/Makefile	Sun Feb 10 21:26:29 2019	(r492651)
@@ -16,8 +16,7 @@ LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
-LIB_DEPENDS=	libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR} \
-		libpyside2-${PYTHON_VERSION}.so:devel/pyside2@${PY_FLAVOR}
+LIB_DEPENDS=	# more later
 
 USES=		cmake gl python qt:5 shebangfix tar:xz
 USE_GL=		gl
@@ -31,6 +30,18 @@ USE_QT=		3d buildtools_build charts core datavis3d dec
 SHEBANG_FILES=	pyside_tool.py pyside2-uic
 python_OLD_COMMAND=	"/usr/bin/env python"
 
+CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} >= 3
+LIB_DEPENDS+=	libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \
+		libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR}
+.else
+LIB_DEPENDS+=	libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR} \
+		libpyside2-${PYTHON_VERSION}.so:devel/pyside2@${PY_FLAVOR}
+.endif
+
 WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${DISTVERSION}/sources/pyside2-tools
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/pyside2/Makefile
==============================================================================
--- head/devel/pyside2/Makefile	Sun Feb 10 21:21:21 2019	(r492650)
+++ head/devel/pyside2/Makefile	Sun Feb 10 21:26:29 2019	(r492651)
@@ -5,8 +5,8 @@ DISTVERSION=	5.12.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 MASTER_SITE_SUBDIR=	official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
-DISTNAME=	pyside-setup-everywhere-src-${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	pyside-setup-everywhere-src-${DISTVERSION}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Python Qt bindings for Qt 5.12+
@@ -15,7 +15,7 @@ LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
-LIB_DEPENDS=	libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR}
+LIB_DEPENDS=	# more later
 
 USES=		cmake gl python qt:5 tar:xz
 USE_GL=		gl
@@ -27,9 +27,20 @@ USE_QT=		3d buildtools_build charts core datavis3d dec
 		speech sql svg testlib uitools webchannel webengine \
 		websockets widgets x11extras xml xmlpatterns
 
-PLIST_SUB=	DISTVERSION=${DISTVERSION} \
-		PYTHON_VERSION=${PYTHON_VERSION}
+CMAKE_ARGS+=	"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} >= 3
+LIB_DEPENDS+=	libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR}
+PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
+.else
+LIB_DEPENDS+=	libshiboken2-${PYTHON_VERSION}.so:devel/shiboken2@${PY_FLAVOR}
+PLIST_SUB+=	PYVERSTR=-${PYTHON_VERSION}
+.endif
+
+PLIST_SUB+=	DISTVERSION=${DISTVERSION}
+
 WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${DISTVERSION}/sources/pyside2
 
 post-stage:
@@ -80,4 +91,4 @@ post-stage:
 		${STAGEDIR}/${PYTHON_SITELIBDIR}/libpyside \
 		${STAGEDIR}/${PYTHON_SITELIBDIR}/plugins
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/pyside2/pkg-plist
==============================================================================
--- head/devel/pyside2/pkg-plist	Sun Feb 10 21:21:21 2019	(r492650)
+++ head/devel/pyside2/pkg-plist	Sun Feb 10 21:26:29 2019	(r492651)
@@ -51,52 +51,92 @@ include/PySide2/pysideqflags.h
 include/PySide2/pysidesignal.h
 include/PySide2/pysideweakref.h
 include/PySide2/signalmanager.h
-lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config-%%PYTHON_VERSION%%.cmake
+lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config%%PYVERSTR%%.cmake
 lib/cmake/PySide2-%%DISTVERSION%%/PySide2Config.cmake
 lib/cmake/PySide2-%%DISTVERSION%%/PySide2ConfigVersion.cmake
-lib/libpyside2-%%PYTHON_VERSION%%.so
-lib/libpyside2-%%PYTHON_VERSION%%.so.5.12
-lib/libpyside2-%%PYTHON_VERSION%%.so.%%DISTVERSION%%
-%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation.so
-%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore.so
-%%PYTHON_SITELIBDIR%%/PySide2/Qt3DExtras.so
-%%PYTHON_SITELIBDIR%%/PySide2/Qt3DInput.so
-%%PYTHON_SITELIBDIR%%/PySide2/Qt3DLogic.so
-%%PYTHON_SITELIBDIR%%/PySide2/Qt3DRender.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtCharts.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtConcurrent.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtCore.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtDataVisualization.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtGui.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtHelp.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtLocation.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtMultimedia.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtQml.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtQuick.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtQuickWidgets.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtScript.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtScxml.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtSensors.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtSql.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtSvg.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtTest.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtTextToSpeech.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtUiTools.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebChannel.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWebSockets.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtWidgets.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtX11Extras.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtXml.so
-%%PYTHON_SITELIBDIR%%/PySide2/QtXmlPatterns.so
+lib/libpyside2%%PYVERSTR%%.so
+lib/libpyside2%%PYVERSTR%%.so.5.12
+lib/libpyside2%%PYVERSTR%%.so.%%DISTVERSION%%
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DExtras.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DInput.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DLogic.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DRender.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtCharts.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtConcurrent.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtCore.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtDataVisualization.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtGui.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtHelp.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtLocation.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimedia.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuick.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuickWidgets.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScript.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtScxml.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtSensors.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtSql.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtSvg.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtTest.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtTextToSpeech.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtUiTools.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebChannel.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebSockets.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtWidgets.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtX11Extras.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtXml.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/PySide2/QtXmlPatterns.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DAnimation%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DCore%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DExtras%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DInput%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DLogic%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/Qt3DRender%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtCharts%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtConcurrent%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtCore%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtDataVisualization%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtGui%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtHelp%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtLocation%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimedia%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtMultimediaWidgets%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtNetwork%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtOpenGL%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtPositioning%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtPrintSupport%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQml%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuick%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtQuickWidgets%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScript%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScriptTools%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtScxml%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtSensors%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtSql%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtSvg%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtTest%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtTextToSpeech%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtUiTools%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebChannel%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngine%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineCore%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebEngineWidgets%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWebSockets%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtWidgets%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtX11Extras%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtXml%%PYVERSTR%%.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PySide2/QtXmlPatterns%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/PySide2/__init__.py
 %%PYTHON_SITELIBDIR%%/PySide2/_config.py
 %%PYTHON_SITELIBDIR%%/PySide2/_git_pyside_version.py

Modified: head/devel/shiboken2/Makefile
==============================================================================
--- head/devel/shiboken2/Makefile	Sun Feb 10 21:21:21 2019	(r492650)
+++ head/devel/shiboken2/Makefile	Sun Feb 10 21:26:29 2019	(r492651)
@@ -31,11 +31,19 @@ python_OLD_COMMAND=	"/usr/bin/env python"
 CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT}
 CMAKE_ARGS+=	"-DCMAKE_CXX_FLAGS=-lexecinfo" \
 		"-DCMAKE_STANDARD_LIBRARIES=-lexecinfo" \
-		"-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+		"-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" \
+		"-DUSE_PYTHON_VERSION=${PYTHON_VER}"
 
-PLIST_SUB=	DISTVERSION=${DISTVERSION} \
-		PYTHON_VERSION=${PYTHON_VERSION}
+.include <bsd.port.pre.mk>
 
+PLIST_SUB+=	DISTVERSION=${DISTVERSION}
+
+.if ${PYTHON_MAJOR_VER} >= 3
+PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
+.else
+PLIST_SUB+=	PYVERSTR=-${PYTHON_VERSION}
+.endif
+
 WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${DISTVERSION}/sources/shiboken2
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/shiboken2/pkg-plist
==============================================================================
--- head/devel/shiboken2/pkg-plist	Sun Feb 10 21:21:21 2019	(r492650)
+++ head/devel/shiboken2/pkg-plist	Sun Feb 10 21:26:29 2019	(r492651)
@@ -24,19 +24,20 @@ include/shiboken2/signature.h
 include/shiboken2/threadstatesaver.h
 include/shiboken2/typespec.h
 include/shiboken2/voidptr.h
-lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config-%%PYTHON_VERSION%%.cmake
+lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config%%PYVERSTR%%.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2ConfigVersion.cmake
-lib/libshiboken2-%%PYTHON_VERSION%%.so
-lib/libshiboken2-%%PYTHON_VERSION%%.so.5.12
-lib/libshiboken2-%%PYTHON_VERSION%%.so.%%DISTVERSION%%
+lib/libshiboken2%%PYVERSTR%%.so
+lib/libshiboken2%%PYVERSTR%%.so.5.12
+lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/shiboken2/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py
-%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2.so
+%%PYTHON3%%%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2%%PYVERSTR%%.so
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/shiboken2/shiboken2.so
 %%PYTHON_SITELIBDIR%%/shiboken2/support/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/__init__.py
-%%PYTHON_SITELIBDIR%%/shiboken2/support/signature/backport_inspect.py
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/shiboken2/support/signature/backport_inspect.py
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/errorhandler.py
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/layout.py
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/lib/__init__.py
@@ -44,7 +45,7 @@ lib/libshiboken2-%%PYTHON_VERSION%%.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/loader.py
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/mapping.py
 %%PYTHON_SITELIBDIR%%/shiboken2/support/signature/parser.py
-%%PYTHON_SITELIBDIR%%/shiboken2/support/signature/typing27.py
+%%PYTHON2%%%%PYTHON_SITELIBDIR%%/shiboken2/support/signature/typing27.py
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902102126.x1ALQTeR058205>