aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2024-12-08 06:04:36 +0000
committerJason E. Hale <jhale@FreeBSD.org>2024-12-08 06:31:15 +0000
commit9b61d832f9815cd98571fa514bf911028957edce (patch)
tree27d80859b72ad74bf176b659e1ba93bdd648cfe3
parent6bad14ef0b39ea13cd0d9fe766d5505cf8e44a44 (diff)
x11-toolkits/py-qt[56]-chart: Rename to *-charts
Move x11-toolkits/py-qt[56]-chart to x11-toolkits/py-qt[56]-charts to be consistent with the names of their C++ counterparts. Qt has always pluralized the Charts module, but PyQt didn't pluralize it until Qt6. With the upcomming addition of the PyQt Graphs module, keeping this singular would be even more awkwark. While here: Add all pyqt5 components except webengine to the devel/py-qt5 metaport to be consistent with the devel/py-qt6 metaport.
Diffstat
-rw-r--r--MOVED2
-rw-r--r--Mk/Uses/pyqt.mk24
-rw-r--r--devel/py-qt5/Makefile3
-rw-r--r--devel/py-qt6/Makefile3
-rw-r--r--x11-toolkits/Makefile4
-rw-r--r--x11-toolkits/py-qt5-charts/Makefile (renamed from x11-toolkits/py-qt5-chart/Makefile)12
-rw-r--r--x11-toolkits/py-qt5-charts/distinfo (renamed from x11-toolkits/py-qt5-chart/distinfo)0
-rw-r--r--x11-toolkits/py-qt5-charts/pkg-descr (renamed from x11-toolkits/py-qt5-chart/pkg-descr)2
-rw-r--r--x11-toolkits/py-qt5-charts/pkg-plist (renamed from x11-toolkits/py-qt5-chart/pkg-plist)6
-rw-r--r--x11-toolkits/py-qt6-charts/Makefile (renamed from x11-toolkits/py-qt6-chart/Makefile)13
-rw-r--r--x11-toolkits/py-qt6-charts/distinfo (renamed from x11-toolkits/py-qt6-chart/distinfo)0
-rw-r--r--x11-toolkits/py-qt6-charts/pkg-descr (renamed from x11-toolkits/py-qt6-chart/pkg-descr)0
-rw-r--r--x11-toolkits/py-qt6-charts/pkg-plist (renamed from x11-toolkits/py-qt6-chart/pkg-plist)6
13 files changed, 39 insertions, 36 deletions
diff --git a/MOVED b/MOVED
index 72aa5ec8d99f..4809e3d3cfc4 100644
--- a/MOVED
+++ b/MOVED
@@ -3750,3 +3750,5 @@ devel/py-simple-term-menu|devel/py-simple_term_menu|2024-12-02|Upstream renamed
emulators/duckstation|emulators/fbsd-duckstation|2024-12-03|Developer asked to emphasize the port includes local patches
www/py-httpx-gssapi|www/py-httpx_gssapi|2024-12-04|Upstream renamed
audio/openspc||2024-12-05|Has expired: Unmaintained upstream. Use audio/libgme or audio/ocp instead
+x11-toolkits/py-qt5-chart|x11-toolkits/py-qt5-charts|2024-12-08|Renamed to be consistent with the Qt module name
+x11-toolkits/py-qt6-chart|x11-toolkits/py-qt6-charts|2024-12-08|Renamed to be consistent with the Qt module name
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
index cc733d94d6a6..3de466731e13 100644
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -67,7 +67,7 @@ MASTER_SITES_SIP= PYPI/source/s/sip
MASTER_SITES_PYQT5SIP= PYPI/source/P/PyQt5-sip
MASTER_SITES_PYQT5= PYPI/source/P/PyQt5
MASTER_SITES_PYQT53D= PYPI/source/P/PyQt3D
-MASTER_SITES_PYQT5CHART= PYPI/source/P/PyQtChart
+MASTER_SITES_PYQT5CHARTS= PYPI/source/P/PyQtChart
MASTER_SITES_PYQT5DATAVIS3D= PYPI/source/P/PyQtDataVisualization
MASTER_SITES_PYQT5NETWORKAUTH= PYPI/source/P/PyQtNetworkAuth
MASTER_SITES_PYQT5WEBENGINE= PYPI/source/P/PyQtWebEngine
@@ -78,7 +78,7 @@ MASTER_SITES_PYQT6= PYPI/source/P/PyQt6 \
RBDEV/PyQt6
MASTER_SITES_PYQT63D= PYPI/source/P/PyQt6-3D \
RBDEV/PyQt6-3D
-MASTER_SITES_PYQT6CHART= PYPI/source/P/PyQt6-Charts \
+MASTER_SITES_PYQT6CHARTS= PYPI/source/P/PyQt6-Charts \
RBDEV/PyQt6-Charts
MASTER_SITES_PYQT6DATAVIS3D= PYPI/source/P/PyQt6-DataVisualization \
RBDEV/PyQt6-DataVisualization
@@ -91,7 +91,7 @@ MASTER_SITES_PYQT6WEBENGINE= PYPI/source/P/PyQt6-WebEngine \
MASTER_SITES_PYQT= ${MASTER_SITES_PYQT${_PYQT_VERSION}}
MASTER_SITES_PYQTSIP= ${MASTER_SITES_PYQT${_PYQT_VERSION}SIP}
MASTER_SITES_PYQT3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}3D}
-MASTER_SITES_PYQTCHART= ${MASTER_SITES_PYQT${_PYQT_VERSION}CHART}
+MASTER_SITES_PYQTCHARTS= ${MASTER_SITES_PYQT${_PYQT_VERSION}CHARTS}
MASTER_SITES_PYQTDATAVIS3D= ${MASTER_SITES_PYQT${_PYQT_VERSION}DATAVIS3D}
MASTER_SITES_PYQTNETWORKAUTH= ${MASTER_SITES_PYQT${_PYQT_VERSION}NETWORKAUTH}
MASTER_SITES_PYQTWEBENGINE= ${MASTER_SITES_PYQT${_PYQT_VERSION}WEBENGINE}
@@ -114,7 +114,7 @@ SIP_VERSION= 6.8.6 # ,1
PYQT5SIP_VERSION= 12.15.0
PYQT5_VERSION= 5.15.11
PYQT53D_VERSION= 5.15.7
-PYQT5CHART_VERSION= 5.15.7
+PYQT5CHARTS_VERSION= 5.15.7
PYQT5DATAVIS3D_VERSION= 5.15.6
PYQT5NETWORKAUTH_VERSION= 5.15.6
PYQT5WEBENGINE_VERSION= 5.15.7
@@ -123,7 +123,7 @@ PYQT5WEBENGINE_VERSION= 5.15.7
PYQT6SIP_VERSION= 13.8.0
PYQT6_VERSION= 6.7.1
PYQT63D_VERSION= 6.7.0
-PYQT6CHART_VERSION= 6.7.0
+PYQT6CHARTS_VERSION= 6.7.0
PYQT6DATAVIS3D_VERSION= 6.7.0
PYQT6NETWORKAUTH_VERSION= 6.7.0
PYQT6WEBENGINE_VERSION= 6.7.0
@@ -136,7 +136,7 @@ QSCI2_DISTNAME= QScintilla_src-${QSCI2_VERSION}
PYQT5SIP_DISTNAME= PyQt5_sip-${PYQT5SIP_VERSION}
PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION}
PYQT53D_DISTNAME= PyQt3D-${PYQT53D_VERSION}
-PYQT5CHART_DISTNAME= PyQtChart-${PYQT5CHART_VERSION}
+PYQT5CHARTS_DISTNAME= PyQtChart-${PYQT5CHARTS_VERSION}
PYQT5DATAVIS3D_DISTNAME= PyQtDataVisualization-${PYQT5DATAVIS3D_VERSION}
PYQT5NETWORKAUTH_DISTNAME= PyQtNetworkAuth-${PYQT5NETWORKAUTH_VERSION}
PYQT5WEBENGINE_DISTNAME= PyQtWebEngine-${PYQT5WEBENGINE_VERSION}
@@ -145,7 +145,7 @@ PYQT5WEBENGINE_DISTNAME= PyQtWebEngine-${PYQT5WEBENGINE_VERSION}
PYQT6SIP_DISTNAME= PyQt6_sip-${PYQT6SIP_VERSION}
PYQT6_DISTNAME= PyQt6-${PYQT6_VERSION}
PYQT63D_DISTNAME= PyQt6_3D-${PYQT63D_VERSION}
-PYQT6CHART_DISTNAME= PyQt6_Charts-${PYQT6CHART_VERSION}
+PYQT6CHARTS_DISTNAME= PyQt6_Charts-${PYQT6CHARTS_VERSION}
PYQT6DATAVIS3D_DISTNAME= PyQt6_DataVisualization-${PYQT6DATAVIS3D_VERSION}
PYQT6NETWORKAUTH_DISTNAME= PyQt6_NetworkAuth-${PYQT6NETWORKAUTH_VERSION}
PYQT6WEBENGINE_DISTNAME= PyQt6_WebEngine-${PYQT6WEBENGINE_VERSION}
@@ -156,7 +156,7 @@ PYQT6_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo
PYQT5_LICENSE= GPLv3
PYQT6_LICENSE= GPLv3
-_USE_PYQT_ALL= pyqt5 pyqt6 3d chart datavis3d networkauth webengine
+_USE_PYQT_ALL= pyqt5 pyqt6 3d charts datavis3d networkauth webengine
_USE_SIP_ALL= pysip sip
_USE_QSCINTILLA= qscintilla2
_USE_PYQTBUILDER= qtbuilder
@@ -165,7 +165,7 @@ _USE_PYQTBUILDER= qtbuilder
PYQTSIP_VERSION= ${PYQT${_PYQT_VERSION}SIP_VERSION}
PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION}
PYQT3D_VERSION= ${PYQT${_PYQT_VERSION}3D_VERSION}
-PYQTCHART_VERSION= ${PYQT${_PYQT_VERSION}CHART_VERSION}
+PYQTCHARTS_VERSION= ${PYQT${_PYQT_VERSION}CHARTS_VERSION}
PYQTDATAVIS3D_VERSION= ${PYQT${_PYQT_VERSION}DATAVIS3D_VERSION}
PYQTNETWORKAUTH_VERSION= ${PYQT${_PYQT_VERSION}NETWORKAUTH_VERSION}
PYQTWEBENGINE_VERSION= ${PYQT${_PYQT_VERSION}WEBENGINE_VERSION}
@@ -173,7 +173,7 @@ PYQTWEBENGINE_VERSION= ${PYQT${_PYQT_VERSION}WEBENGINE_VERSION}
PYQTSIP_DISTNAME= ${PYQT${_PYQT_VERSION}SIP_DISTNAME}
PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME}
PYQT3D_DISTNAME= ${PYQT${_PYQT_VERSION}3D_DISTNAME}
-PYQTCHART_DISTNAME= ${PYQT${_PYQT_VERSION}CHART_DISTNAME}
+PYQTCHARTS_DISTNAME= ${PYQT${_PYQT_VERSION}CHARTS_DISTNAME}
PYQTDATAVIS3D_DISTNAME= ${PYQT${_PYQT_VERSION}DATAVIS3D_DISTNAME}
PYQTNETWORKAUTH_DISTNAME= ${PYQT${_PYQT_VERSION}NETWORKAUTH_DISTNAME}
PYQTWEBENGINE_DISTNAME= ${PYQT${_PYQT_VERSION}WEBENGINE_DISTNAME}
@@ -192,7 +192,7 @@ py-qtbuilder_PATH= ${PYTHON_PKGNAMEPREFIX}PyQt-builder>=${PYQTBUILDER_VERSION}
py-pyqt5_PATH= ${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
py-pyqt6_PATH= ${PYQT_PY_RELNAME}-pyqt>=${PYQT_VERSION}
py-3d_PATH= ${PYQT_PY_RELNAME}-3d>=${PYQT3D_VERSION}
-py-chart_PATH= ${PYQT_PY_RELNAME}-chart>=${PYQTCHART_VERSION}
+py-charts_PATH= ${PYQT_PY_RELNAME}-charts>=${PYQTCHARTS_VERSION}
py-datavis3d_PATH= ${PYQT_PY_RELNAME}-datavis3d>=${PYQTDATAVIS3D_VERSION}
py-networkauth_PATH= ${PYQT_PY_RELNAME}-networkauth>=${PYQTNETWORKAUTH_VERSION}
py-webengine_PATH= ${PYQT_PY_RELNAME}-webengine>=${PYQTWEBENGINE_VERSION}
@@ -205,7 +205,7 @@ py-qtbuilder_PORT= devel/py-qtbuilder
py-pyqt5_PORT= devel/${PYQT_RELNAME}-pyqt
py-pyqt6_PORT= devel/${PYQT_RELNAME}-pyqt
py-3d_PORT= graphics/${PYQT_RELNAME}-3d
-py-chart_PORT= x11-toolkits/${PYQT_RELNAME}-chart
+py-charts_PORT= x11-toolkits/${PYQT_RELNAME}-charts
py-datavis3d_PORT= x11-toolkits/${PYQT_RELNAME}-datavis3d
py-networkauth_PORT= net/${PYQT_RELNAME}-networkauth
py-webengine_PORT= www/${PYQT_RELNAME}-webengine
diff --git a/devel/py-qt5/Makefile b/devel/py-qt5/Makefile
index 556c6f022161..403f0bba8add 100644
--- a/devel/py-qt5/Makefile
+++ b/devel/py-qt5/Makefile
@@ -1,5 +1,6 @@
PORTNAME= qt5
PORTVERSION= ${PYQT_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -9,6 +10,6 @@ WWW= https://riverbankcomputing.com/software/pyqt
USES= metaport python pyqt:5
USE_PYTHON= concurrent flavors py3kplist
-USE_PYQT= pyqt5 chart networkauth
+USE_PYQT= pyqt5 3d charts datavis3d networkauth
.include <bsd.port.mk>
diff --git a/devel/py-qt6/Makefile b/devel/py-qt6/Makefile
index 618c6d98248f..5f468cd282c4 100644
--- a/devel/py-qt6/Makefile
+++ b/devel/py-qt6/Makefile
@@ -1,5 +1,6 @@
PORTNAME= qt6
PORTVERSION= ${PYQT_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -9,6 +10,6 @@ WWW= https://riverbankcomputing.com/software/pyqt
USES= metaport python pyqt:6
USE_PYTHON= concurrent flavors py3kplist
-USE_PYQT= pyqt6 3d chart datavis3d networkauth
+USE_PYQT= pyqt6 3d charts datavis3d networkauth
.include <bsd.port.mk>
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 248e2741e606..0b61ae191844 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -180,9 +180,9 @@
SUBDIR += py-kivy
SUBDIR += py-pangocffi
SUBDIR += py-python-xlib
- SUBDIR += py-qt5-chart
+ SUBDIR += py-qt5-charts
SUBDIR += py-qt5-datavis3d
- SUBDIR += py-qt6-chart
+ SUBDIR += py-qt6-charts
SUBDIR += py-qt6-datavis3d
SUBDIR += py-superqt
SUBDIR += py-tkinter
diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-charts/Makefile
index 1cecf7448dc1..79d086526c99 100644
--- a/x11-toolkits/py-qt5-chart/Makefile
+++ b/x11-toolkits/py-qt5-charts/Makefile
@@ -1,12 +1,12 @@
-PORTNAME= chart
-DISTVERSION= ${PYQTCHART_VERSION}
+PORTNAME= charts
+DISTVERSION= ${PYQTCHARTS_VERSION}
CATEGORIES= x11-toolkits devel python
-MASTER_SITES= ${MASTER_SITES_PYQTCHART}
+MASTER_SITES= ${MASTER_SITES_PYQTCHARTS}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
-DISTNAME= ${PYQTCHART_DISTNAME}
+DISTNAME= ${PYQTCHARTS_DISTNAME}
MAINTAINER= kde@FreeBSD.org
-COMMENT= Python bindings for the Qt5 toolkit, QtChart module
+COMMENT= Python bindings for the Qt5 toolkit, QtCharts module
WWW= https://riverbankcomputing.com/software/pyqtchart
LICENSE= ${PYQT5_LICENSE}
@@ -17,7 +17,7 @@ USE_PYQT= pyqt5 qtbuilder:build sip:build
USE_PYTHON= concurrent flavors
USE_QT= charts core declarative gui qmake:build widgets
-PLIST_SUB= PYQT_CHART_VERSION=${DISTVERSION}
+PLIST_SUB= PYQTCHARTS_VERSION=${DISTVERSION}
post-install:
@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 \
diff --git a/x11-toolkits/py-qt5-chart/distinfo b/x11-toolkits/py-qt5-charts/distinfo
index d30185943ab5..d30185943ab5 100644
--- a/x11-toolkits/py-qt5-chart/distinfo
+++ b/x11-toolkits/py-qt5-charts/distinfo
diff --git a/x11-toolkits/py-qt5-chart/pkg-descr b/x11-toolkits/py-qt5-charts/pkg-descr
index f36711292c38..76c45f7eac4b 100644
--- a/x11-toolkits/py-qt5-chart/pkg-descr
+++ b/x11-toolkits/py-qt5-charts/pkg-descr
@@ -1,2 +1,2 @@
PyQt5 is a set of Python bindings for Qt5 application framework.
-This package provides the extra QtChart module.
+This package provides the extra QtCharts module.
diff --git a/x11-toolkits/py-qt5-chart/pkg-plist b/x11-toolkits/py-qt5-charts/pkg-plist
index a2a4168c2e40..090798ba46f5 100644
--- a/x11-toolkits/py-qt5-chart/pkg-plist
+++ b/x11-toolkits/py-qt5-charts/pkg-plist
@@ -53,6 +53,6 @@
%%PYQT_SIPDIR%%/QtChart/qxyseries.sip
%%PYTHON_SITELIBDIR%%/PyQt5/QtChart.abi%%PYTHON_MAJOR_VER%%.so
%%PYTHON_SITELIBDIR%%/PyQt5/bindings/QtChart/QtChart.toml
-%%PYTHON_SITELIBDIR%%/PyQtChart-%%PYQT_CHART_VERSION%%.dist-info/INSTALLER
-%%PYTHON_SITELIBDIR%%/PyQtChart-%%PYQT_CHART_VERSION%%.dist-info/METADATA
-%%PYTHON_SITELIBDIR%%/PyQtChart-%%PYQT_CHART_VERSION%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/PyQtChart-%%PYQTCHARTS_VERSION%%.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/PyQtChart-%%PYQTCHARTS_VERSION%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/PyQtChart-%%PYQTCHARTS_VERSION%%.dist-info/RECORD
diff --git a/x11-toolkits/py-qt6-chart/Makefile b/x11-toolkits/py-qt6-charts/Makefile
index 0d500d5e765e..3af57b5772c8 100644
--- a/x11-toolkits/py-qt6-chart/Makefile
+++ b/x11-toolkits/py-qt6-charts/Makefile
@@ -1,13 +1,12 @@
-PORTNAME= chart
-DISTVERSION= ${PYQTCHART_VERSION}
-PORTREVISION= 1
+PORTNAME= charts
+DISTVERSION= ${PYQTCHARTS_VERSION}
CATEGORIES= x11-toolkits devel python
-MASTER_SITES= ${MASTER_SITES_PYQTCHART}
+MASTER_SITES= ${MASTER_SITES_PYQTCHARTS}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
-DISTNAME= ${PYQTCHART_DISTNAME}
+DISTNAME= ${PYQTCHARTS_DISTNAME}
MAINTAINER= kde@FreeBSD.org
-COMMENT= Python bindings for the Qt6 toolkit, QtChart module
+COMMENT= Python bindings for the Qt6 toolkit, QtCharts module
WWW= https://riverbankcomputing.com/software/pyqtchart
LICENSE= ${PYQT6_LICENSE}
@@ -18,7 +17,7 @@ USE_PYQT= pyqt6 qtbuilder:build sip:build
USE_PYTHON= concurrent flavors
USE_QT= base charts
-PLIST_SUB= PYQTCHART_VERSION=${DISTVERSION}
+PLIST_SUB= PYQTCHARTS_VERSION=${DISTVERSION}
post-install:
@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt6 \
diff --git a/x11-toolkits/py-qt6-chart/distinfo b/x11-toolkits/py-qt6-charts/distinfo
index 7b736cb07cd8..7b736cb07cd8 100644
--- a/x11-toolkits/py-qt6-chart/distinfo
+++ b/x11-toolkits/py-qt6-charts/distinfo
diff --git a/x11-toolkits/py-qt6-chart/pkg-descr b/x11-toolkits/py-qt6-charts/pkg-descr
index 751a1513d9d4..751a1513d9d4 100644
--- a/x11-toolkits/py-qt6-chart/pkg-descr
+++ b/x11-toolkits/py-qt6-charts/pkg-descr
diff --git a/x11-toolkits/py-qt6-chart/pkg-plist b/x11-toolkits/py-qt6-charts/pkg-plist
index 350f429823ac..88580d377013 100644
--- a/x11-toolkits/py-qt6-chart/pkg-plist
+++ b/x11-toolkits/py-qt6-charts/pkg-plist
@@ -52,6 +52,6 @@
%%PYQT_SIPDIR%%/QtCharts/qxylegendmarker.sip
%%PYQT_SIPDIR%%/QtCharts/qxyseries.sip
%%PYTHON_SITELIBDIR%%/PyQt6/QtCharts.abi%%PYTHON_MAJOR_VER%%.so
-%%PYTHON_SITELIBDIR%%/PyQt6_Charts-%%PYQTCHART_VERSION%%.dist-info/INSTALLER
-%%PYTHON_SITELIBDIR%%/PyQt6_Charts-%%PYQTCHART_VERSION%%.dist-info/METADATA
-%%PYTHON_SITELIBDIR%%/PyQt6_Charts-%%PYQTCHART_VERSION%%.dist-info/RECORD
+%%PYTHON_SITELIBDIR%%/PyQt6_Charts-%%PYQTCHARTS_VERSION%%.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/PyQt6_Charts-%%PYQTCHARTS_VERSION%%.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/PyQt6_Charts-%%PYQTCHARTS_VERSION%%.dist-info/RECORD
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-07 17:00:17 +0000