On Mon, Oct 30, 2017 at 01:51:17PM +0000, Landry Breuil wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: [email protected] 2017/10/30 07:51:17
>
> Modified files:
> editors/py-qscintilla: Makefile distinfo
> editors/py-qscintilla/pkg: PLIST
>
> Log message:
> Update to py-qscintilla 2.10.1.
>
> Add a python3/qt5 FLAVOR, required by QGIS3.
It unconditionally RUN_DEPENDS on devel/py-sip and x11/dbus-python even with
the qt5 FLAVOR (python3 IIUC). Also hardcoding the python3 version is not
something we usually want to do.
Shouldn't it be:
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 30 Oct 2017 13:51:17 -0000 1.13
+++ Makefile 30 Oct 2017 14:06:48 -0000
@@ -6,6 +6,7 @@ VERSION = 2.10.1
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
+REVISION = 0
HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
@@ -18,8 +19,8 @@ MODULES = lang/python
FLAVORS = qt5
FLAVOR?=
-RUN_DEPENDS = devel/py-sip \
- x11/dbus-python
+RUN_DEPENDS = devel/py-sip${MODPY_FLAVOR} \
+ x11/dbus-python${MODPY_FLAVOR}
WANTLIB = ${COMPILER_LIBCXX} m
@@ -36,8 +37,8 @@ FULLPKGNAME = py3-qscintilla-qt5-${VERSI
QTVER = qt5
PYQTVER = PyQt5
SIPDIR= share/sip/PyQt5-3
-MODPY_VERSION = 3.6
-RUN_DEPENDS += x11/py-qt5,python3
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+RUN_DEPENDS += x11/py-qt5${MODPY_FLAVOR}
MODULES += x11/qt5
LIB_DEPENDS = editors/qscintilla,qt5
CONFIGURE_ARGS = --qmake=${LOCALBASE}/bin/qmake-qt5
$ make show=RUN_DEPENDS
devel/py-sip x11/dbus-python x11/py-qt4 lang/python/2.7
$ env FLAVOR=qt5 make show=RUN_DEPENDS
devel/py-sip,python3 x11/dbus-python,python3 x11/py-qt5,python3 lang/python/3.6
--
Antoine
