Date: Sat, 16 Mar 2019 21:31:13 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495960 - in head: . devel/eric6 Message-ID: <201903162131.x2GLVDQR056575@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Mar 16 21:31:12 2019 New Revision: 495960 URL: https://svnweb.freebsd.org/changeset/ports/495960 Log: devel/eric6: remove qt4 flavors (Qt4 deprecation) - note: * this port should be converted to USES=pyqt, * and could use the normal PY_FLAVORS now. Approved by: portmgr (implicit) Modified: head/MOVED head/devel/eric6/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Mar 16 21:28:17 2019 (r495959) +++ head/MOVED Sat Mar 16 21:31:12 2019 (r495960) @@ -11683,3 +11683,7 @@ multimedia/gstreamer1-qt@qt4||2019-03-16|Qt4 deprecati multimedia/gstreamer1-qt@qt5|multimedia/gstreamer1-qt|2019-03-16|Flavor has been removed x11-toolkits/qwt6@qt4||2019-03-16|Qt4 deprecation x11-toolkits/qwt6@qt5|x11-toolkits/qwt6|2019-03-16|Flavor has been removed +devel/eric6@qt4_py27||2019-03-16|Qt4 deprecation +devel/eric6@qt4_py35||2019-03-16|Qt4 deprecation +devel/eric6@qt4_py36||2019-03-16|Qt4 deprecation +devel/eric6@qt4_py37||2019-03-16|Qt4 deprecation Modified: head/devel/eric6/Makefile ============================================================================== --- head/devel/eric6/Makefile Sat Mar 16 21:28:17 2019 (r495959) +++ head/devel/eric6/Makefile Sat Mar 16 21:31:12 2019 (r495960) @@ -1,29 +1,30 @@ # Created by: Boris Samorodov <bsam@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -${FLAVOR:U:S/_/-/} DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} CATEGORIES= devel python BROKEN_powerpc64= fails to link: libstdc++.so.6: version GLIBCXX_3.4.14 required by /usr/local/lib/qt4/libqscintilla2_qt4.so.13 not found -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtGui.so:x11-toolkits/py-qt${PYQTVER}-gui@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/Qsci.so:devel/py-qt${PYQTVER}-qscintilla2@${PY_FLAVOR} +# Note to MAINTAINER: this should be converted to USES=pyqt, USE_PYQT=[...] +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt5/QtGui.so:x11-toolkits/py-qt5-gui@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/Qsci.so:devel/py-qt5-qscintilla2@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtNetwork.so:net/py-qt${PYQTVER}-network@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSvg.so:graphics/py-qt${PYQTVER}-svg@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtSql.so:databases/py-qt${PYQTVER}-sql@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtWebKit.so:www/py-qt${PYQTVER}-webkit@${PY_FLAVOR} \ - ${PYTHON_SITELIBDIR}/PyQt${PYQTVER}/QtHelp.so:devel/py-qt${PYQTVER}-help@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/QtNetwork.so:net/py-qt5-network@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/QtSvg.so:graphics/py-qt5-svg@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/QtSql.so:databases/py-qt5-sql@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/QtWebKit.so:www/py-qt5-webkit@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/QtHelp.so:devel/py-qt5-help@${PY_FLAVOR} \ + ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR} \ ${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py-sqlite3@${PY_FLAVOR} CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C/^/${PKGNAMEPREFIX}${PORTNAME}-/:C/$/-[0-9]*/} USES= desktop-file-utils python:${FLAVOR:C/.*_py([0-9])/\1./} -INSTALL_CMD= install.py -c -f eric6config.freebsd -i ${STAGEDIR} --pyqt=${PYQTVER} +INSTALL_CMD= install.py -c -f eric6config.freebsd -i ${STAGEDIR} --pyqt=5 SUB_FILES= eric6.desktop -PYQTVER= ${FLAVOR:C/qt([45])_py[0-9]+/\1/} MASTERPORT= yes PORTDATA= * @@ -37,16 +38,12 @@ OPTIONS_DEFINE= DOCS EXAMPLES PY_FLAVORS= py${PYTHON_DEFAULT:S/.//} py${PYTHON2_DEFAULT:S/.//} py${PYTHON3_DEFAULT:S/.//} .for flavor in ${PY_FLAVORS} -. if empty(FLAVORS:Mqt4_${flavor}) -FLAVORS:= ${FLAVORS} qt5_${flavor} qt4_${flavor} +. if empty(FLAVORS:Mqt5_${flavor}) +FLAVORS:= ${FLAVORS} qt5_${flavor} . endif .endfor .if empty(FLAVOR) FLAVOR= ${FLAVORS:[1]} -.endif - -.if ${PYQTVER} == 5 -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR} .endif post-patch:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903162131.x2GLVDQR056575>