From aacdb2b25d5fd453bbc42abe52925ef86da511dd Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Fri, 10 Apr 2020 23:45:15 +0200 Subject: [PATCH] Framework: partially sync with upstream Taken from: HardenedBSD --- MOVED | 2 +- Mk/Scripts/do-depends.sh | 2 +- Mk/Uses/pyqt.mk | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MOVED b/MOVED index 59877f5a5fa..fb46f10d171 100644 --- a/MOVED +++ b/MOVED @@ -9766,7 +9766,6 @@ audio/hydrogen-devel|audio/hydrogen|2018-01-17|Out of date: use audio/hydrogen f graphics/py-rabbyt||2018-01-19|Has expired: Development ceased, no longer used in the ports deskutils/py-spice-gtk|deskutils/spice-gtk|2018-01-20|Old style Python bindings dropped, no difference from the master port lang/py-clojure|lang/py-clojure_py|2018-01-26|Rename to match PyPI naming -www/tomcat-devel|www/tomcat9|2018-01-26|Apache Tomcat 9.0.4 is the first stable release of the 9.0.x series devel/rubygem-toml|textproc/rubygem-toml|2018-01-27|Move to a better category emulators/raine||2018-01-28|Has expired: Broken for more than 6 months mail/libmapi||2018-01-28|Has expired: Broken for more than 6 months @@ -14523,3 +14522,4 @@ lang/beignet|lang/intel-compute-runtime|2020-04-02|Has expired: Deprecated upstr devel/rubygem-cucumber-tag_expressions|devel/rubygem-cucumber-tag-expressions|2020-04-04|Renamed by upstream devel/p5-Glib2|devel/p5-Glib|2020-04-07|Rename to match our p5- port naming devel/jucipp|editors/jucipp|2020-04-07|Remove duplicate +www/py-django_polymorphic|www/py-django-polymorphic|2020-04-11|Match canonical/registered (PyPI/CHEESESHOP) name diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh index af93ec646a7..c0ef748ce81 100644 --- a/Mk/Scripts/do-depends.sh +++ b/Mk/Scripts/do-depends.sh @@ -205,7 +205,7 @@ if [ $err -eq 1 ]; then fi if [ -n "${dp_STRICT_DEPENDS}" -a ${anynotfound} -eq 1 ]; then \ - echo "===> dp_STRICT_DEPENDS set - Not installing missing dependencies." + echo "===> STRICT_DEPENDS set - Not installing missing dependencies." echo " This means a dependency is wrong since it was not satisfied in the ${dp_DEPTYPE} phase." exit 1 fi diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index ec721dab656..0e3fe61eb5d 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -50,7 +50,7 @@ _PYQT_VERSION= 0 PYQT_MAINTAINER= kde@FreeBSD.org -MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/ +MASTER_SITE_RIVERBANK= https://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/ # https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/sip-4.19.15.tar.gz MASTER_SITES_SIP= RIVERBANK/sip/${PORTVERSION} \ @@ -59,19 +59,19 @@ MASTER_SITES_SIP= RIVERBANK/sip/${PORTVERSION} \ MASTER_SITES_PYQT5= RIVERBANK/PyQt5/${PORTVERSION} \ SF/pyqt/PyQt5/PyQt-${PORTVERSION} \ GENTOO -#https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-2.11.tar.gz +#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO -SIP_VERSION= 4.19.19 -QSCI2_VERSION= 2.11.2 +SIP_VERSION= 4.19.21 +QSCI2_VERSION= 2.11.4 PYQT5_VERSION= 5.13.1 SIP_DISTNAME= sip-${SIP_VERSION} PYQT5_DISTNAME= PyQt5_gpl-${PYQT5_VERSION} PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo -QSCI2_DISTNAME= QScintilla_gpl-${QSCI2_VERSION} +QSCI2_DISTNAME= QScintilla-${QSCI2_VERSION} PYQT5_LICENSE= GPLv3 # Keep these synchronized with OPTIONS_DEFINE in devel/py-qt5