From 552ed27ec1fc5372218265de0d303b49c6c8f302 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Fri, 1 Mar 2024 23:53:54 +0100 Subject: [PATCH] sysutils/polkit-qt,sysutils/polkit-qt-1-devel: unify and flavorize This updates sysutils/polkit-qt to the 0.200 release and removes the development version port polkit-qt-1-devel. The new version is now flavorized to support both Qt5 and Qt6. --- MOVED | 2 + benchmarks/kdiskmark/Makefile | 2 +- devel/kf5-kauth/Makefile | 2 +- devel/liblxqt/Makefile | 2 +- sysutils/Makefile | 3 +- sysutils/bsdisks/Makefile | 2 +- sysutils/kpmcore/Makefile | 2 +- sysutils/lxqt-policykit/Makefile | 2 +- sysutils/plasma5-polkit-kde-agent-1/Makefile | 2 +- sysutils/plasma6-polkit-kde-agent-1/Makefile | 2 +- sysutils/polkit-qt-1-devel/distinfo | 3 -- .../Makefile | 4 +- sysutils/polkit-qt-1/distinfo | 3 ++ .../pkg-descr | 0 .../pkg-plist | 6 +-- sysutils/polkit-qt/Makefile | 26 ----------- sysutils/polkit-qt/distinfo | 3 -- sysutils/polkit-qt/pkg-descr | 4 -- sysutils/polkit-qt/pkg-plist | 43 ------------------- 19 files changed, 19 insertions(+), 94 deletions(-) delete mode 100644 sysutils/polkit-qt-1-devel/distinfo rename sysutils/{polkit-qt-1-devel => polkit-qt-1}/Makefile (92%) create mode 100644 sysutils/polkit-qt-1/distinfo rename sysutils/{polkit-qt-1-devel => polkit-qt-1}/pkg-descr (100%) rename sysutils/{polkit-qt-1-devel => polkit-qt-1}/pkg-plist (94%) delete mode 100644 sysutils/polkit-qt/Makefile delete mode 100644 sysutils/polkit-qt/distinfo delete mode 100644 sysutils/polkit-qt/pkg-descr delete mode 100644 sysutils/polkit-qt/pkg-plist diff --git a/MOVED b/MOVED index 9f126b84109e..63912ef15f83 100644 --- a/MOVED +++ b/MOVED @@ -3033,3 +3033,5 @@ www/nibbleblog||2024-02-29|Has expired: Upstream WWW redirects to a different CM chinese/phpbb-tw||2024-02-29|Has expired: Last upstream was released in 2008 use chinese/phpbb3 www/phpbb||2024-02-29|Has expired: Last upstream was released in 2008 use www/phpbb3 devel/pcre++||2024-02-29|Unused in the ports tree depends on pcre which is EOLed since 2021 +sysutils/polkit-qt|sysutils/polkit-qt-1|2024-03-01|Renamed to move upstreams name and flavorized +sysutils/polkit-qt-1-devel|sysutils/polkit-qt-1|2024-03-01|Renamed to move upstreams name and flavorized diff --git a/benchmarks/kdiskmark/Makefile b/benchmarks/kdiskmark/Makefile index 2da49ab13d0a..4927035d1129 100644 --- a/benchmarks/kdiskmark/Makefile +++ b/benchmarks/kdiskmark/Makefile @@ -8,7 +8,7 @@ WWW= https://github.com/JonMagon/KDiskMark LICENSE= GPLv3 -LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt +LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt-1@qt5 RUN_DEPENDS= fio:benchmarks/fio USE_GITHUB= yes diff --git a/devel/kf5-kauth/Makefile b/devel/kf5-kauth/Makefile index 9a232a264601..890ec028730b 100644 --- a/devel/kf5-kauth/Makefile +++ b/devel/kf5-kauth/Makefile @@ -5,7 +5,7 @@ CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 abstraction to system policy and authentication features -LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt +LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt-1@qt5 USES= cmake compiler:c++11-lib cpe kde:5 qt:5 tar:xz CPE_VENDOR= kde diff --git a/devel/liblxqt/Makefile b/devel/liblxqt/Makefile index 9ab201231058..d17558ecd0ff 100644 --- a/devel/liblxqt/Makefile +++ b/devel/liblxqt/Makefile @@ -9,7 +9,7 @@ WWW= https://github.com/lxqt/liblxqt LICENSE= LGPL21+ -LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt \ +LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt-1@qt5 USES= cmake compiler:c++14-lang gettext gnome kde:5 lxqt \ pkgconfig qt:5 tar:xz xorg diff --git a/sysutils/Makefile b/sysutils/Makefile index 52ea4b94f7db..8b05e55ae001 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1048,8 +1048,7 @@ SUBDIR += podman-suite SUBDIR += polkit SUBDIR += polkit-gnome - SUBDIR += polkit-qt - SUBDIR += polkit-qt-1-devel + SUBDIR += polkit-qt-1 SUBDIR += pot SUBDIR += potnet SUBDIR += poweralertd diff --git a/sysutils/bsdisks/Makefile b/sysutils/bsdisks/Makefile index 7fc8a5ade2b1..5425be18ec15 100644 --- a/sysutils/bsdisks/Makefile +++ b/sysutils/bsdisks/Makefile @@ -8,7 +8,7 @@ WWW= https://foss.heptapod.net/bsdutils/bsdisks LICENSE= BSD3CLAUSE -LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt +LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt-1@qt5 USES= cmake compiler:c++11-lang qt:5 diff --git a/sysutils/kpmcore/Makefile b/sysutils/kpmcore/Makefile index f7442bf1a9d0..500b7537c22f 100644 --- a/sysutils/kpmcore/Makefile +++ b/sysutils/kpmcore/Makefile @@ -6,7 +6,7 @@ MAINTAINER= adridg@FreeBSD.org COMMENT= KDE Partition Manager core library WWW= https://invent.kde.org/system/kpmcore -LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt +LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt-1@qt5 USES= cmake compiler:c++17-lang gettext kde:5 qt:5 tar:xz USE_KDE= auth coreaddons i18n widgetsaddons \ diff --git a/sysutils/lxqt-policykit/Makefile b/sysutils/lxqt-policykit/Makefile index 05f049d9333d..4e8187695734 100644 --- a/sysutils/lxqt-policykit/Makefile +++ b/sysutils/lxqt-policykit/Makefile @@ -9,7 +9,7 @@ WWW= https://lxqt-project.org LICENSE= LGPL21+ -LIB_DEPENDS= libpolkit-qt5-agent-1.so:sysutils/polkit-qt \ +LIB_DEPENDS= libpolkit-qt5-agent-1.so:sysutils/polkit-qt-1@qt5 \ libpolkit-agent-1.so:sysutils/polkit USES= cmake compiler:c++14-lang gettext-runtime kde:5 qt:5 gnome \ diff --git a/sysutils/plasma5-polkit-kde-agent-1/Makefile b/sysutils/plasma5-polkit-kde-agent-1/Makefile index 5ff3017ff386..0434b50a10a9 100644 --- a/sysutils/plasma5-polkit-kde-agent-1/Makefile +++ b/sysutils/plasma5-polkit-kde-agent-1/Makefile @@ -6,7 +6,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 daemon providing a polkit authentication UI WWW= https://www.kde.org/plasma-desktop -LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt +LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt-1@qt5 USES= cmake compiler:c++11-lib gettext kde:5 qt:5 tar:xz xorg USE_KDE= config coreaddons crash dbusaddons i18n iconthemes \ diff --git a/sysutils/plasma6-polkit-kde-agent-1/Makefile b/sysutils/plasma6-polkit-kde-agent-1/Makefile index c01697483dbd..4f63fe84c970 100644 --- a/sysutils/plasma6-polkit-kde-agent-1/Makefile +++ b/sysutils/plasma6-polkit-kde-agent-1/Makefile @@ -5,7 +5,7 @@ CATEGORIES= sysutils kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Manages the power consumption settings of a Plasma shell -LIB_DEPENDS= libpolkit-qt6-agent-1.so:sysutils/polkit-qt-1-devel@qt6 +LIB_DEPENDS= libpolkit-qt6-agent-1.so:sysutils/polkit-qt-1@qt6 USES= cmake gettext gl kde:6 qt:6 tar:xz xorg USE_GL= gl opengl diff --git a/sysutils/polkit-qt-1-devel/distinfo b/sysutils/polkit-qt-1-devel/distinfo deleted file mode 100644 index b60ed705f05b..000000000000 --- a/sysutils/polkit-qt-1-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1701502649 -SHA256 (polkit-qt-1-0.175.0.tar.xz) = 73a32d1a1819684145e0ef8a1f2ea804f9ec10ad78d62aa03bad4dbdb39c4c99 -SIZE (polkit-qt-1-0.175.0.tar.xz) = 58208 diff --git a/sysutils/polkit-qt-1-devel/Makefile b/sysutils/polkit-qt-1/Makefile similarity index 92% rename from sysutils/polkit-qt-1-devel/Makefile rename to sysutils/polkit-qt-1/Makefile index 5dd6a5db1c44..e7305e58c074 100644 --- a/sysutils/polkit-qt-1-devel/Makefile +++ b/sysutils/polkit-qt-1/Makefile @@ -1,7 +1,7 @@ PORTNAME= polkit-qt-1 -DISTVERSION= 0.175.0 +DISTVERSION= 0.200.0 CATEGORIES= sysutils -MASTER_SITES= KDE/unstable/${PORTNAME}/ +MASTER_SITES= KDE/stable/${PORTNAME}/ PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= kde@FreeBSD.org diff --git a/sysutils/polkit-qt-1/distinfo b/sysutils/polkit-qt-1/distinfo new file mode 100644 index 000000000000..a65dcec87109 --- /dev/null +++ b/sysutils/polkit-qt-1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1709230056 +SHA256 (polkit-qt-1-0.200.0.tar.xz) = 5d3b611c062d2b76a93750bb10c907bfd21d1ff08d0a15dc2cf63e278e1677fb +SIZE (polkit-qt-1-0.200.0.tar.xz) = 58216 diff --git a/sysutils/polkit-qt-1-devel/pkg-descr b/sysutils/polkit-qt-1/pkg-descr similarity index 100% rename from sysutils/polkit-qt-1-devel/pkg-descr rename to sysutils/polkit-qt-1/pkg-descr diff --git a/sysutils/polkit-qt-1-devel/pkg-plist b/sysutils/polkit-qt-1/pkg-plist similarity index 94% rename from sysutils/polkit-qt-1-devel/pkg-plist rename to sysutils/polkit-qt-1/pkg-plist index 76440a7cb017..9372acf176ba 100644 --- a/sysutils/polkit-qt-1-devel/pkg-plist +++ b/sysutils/polkit-qt-1/pkg-plist @@ -30,13 +30,13 @@ lib/cmake/PolkitQt%%QT_VER%%-1/PolkitQt%%QT_VER%%-1Targets-%%CMAKE_BUILD_TYPE%%. lib/cmake/PolkitQt%%QT_VER%%-1/PolkitQt%%QT_VER%%-1Targets.cmake lib/libpolkit-qt%%QT_VER%%-agent-1.so lib/libpolkit-qt%%QT_VER%%-agent-1.so.1 -lib/libpolkit-qt%%QT_VER%%-agent-1.so.1.175.0 +lib/libpolkit-qt%%QT_VER%%-agent-1.so.1.200.0 lib/libpolkit-qt%%QT_VER%%-core-1.so lib/libpolkit-qt%%QT_VER%%-core-1.so.1 -lib/libpolkit-qt%%QT_VER%%-core-1.so.1.175.0 +lib/libpolkit-qt%%QT_VER%%-core-1.so.1.200.0 lib/libpolkit-qt%%QT_VER%%-gui-1.so lib/libpolkit-qt%%QT_VER%%-gui-1.so.1 -lib/libpolkit-qt%%QT_VER%%-gui-1.so.1.175.0 +lib/libpolkit-qt%%QT_VER%%-gui-1.so.1.200.0 libdata/pkgconfig/polkit-qt%%QT_VER%%-1.pc libdata/pkgconfig/polkit-qt%%QT_VER%%-agent-1.pc libdata/pkgconfig/polkit-qt%%QT_VER%%-core-1.pc diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile deleted file mode 100644 index db634bcbd048..000000000000 --- a/sysutils/polkit-qt/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -PORTNAME= polkit-qt-1 -DISTVERSION= 0.114.0 -CATEGORIES= sysutils -MASTER_SITES= KDE/stable/${PORTNAME}/ - -MAINTAINER= kde@FreeBSD.org -COMMENT= Qt5 wrapper around Polkit libraries -WWW= https://projects.kde.org/projects/kdesupport/polkit-qt-1 - -LICENSE= LGPL21 - -LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit - -USES= cmake compiler:c++11-lang gnome pkgconfig qt:5 tar:xz -USE_GNOME= glib20 -USE_QT= core dbus gui widgets buildtools:build qmake:build -CMAKE_OFF= BUILD_EXAMPLES \ - BUILD_TEST - -USE_LDCONFIG= yes - -post-patch: - ${REINPLACE_CMD} -e 's|$${LIB_DESTINATION}/pkgconfig|libdata/pkgconfig|' \ - ${WRKSRC}/CMakeLists.txt - -.include diff --git a/sysutils/polkit-qt/distinfo b/sysutils/polkit-qt/distinfo deleted file mode 100644 index 2e0bfb67dd04..000000000000 --- a/sysutils/polkit-qt/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1624741407 -SHA256 (polkit-qt-1-0.114.0.tar.xz) = 2eb0f22445888295ffa2bfbc0c3693847a0f973bb6b0c3e4cce0218be7e3907e -SIZE (polkit-qt-1-0.114.0.tar.xz) = 58384 diff --git a/sysutils/polkit-qt/pkg-descr b/sysutils/polkit-qt/pkg-descr deleted file mode 100644 index ce0027a2091b..000000000000 --- a/sysutils/polkit-qt/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Polkit-Qt is a library that lets developers use the Polkit API through -a nice Qt-styled API. It is mainly a wrapper around QAction and -QAbstractButton that lets you integrate those two component easily -with Polkit. diff --git a/sysutils/polkit-qt/pkg-plist b/sysutils/polkit-qt/pkg-plist deleted file mode 100644 index b0c6e3c7ec9e..000000000000 --- a/sysutils/polkit-qt/pkg-plist +++ /dev/null @@ -1,43 +0,0 @@ -include/polkit-qt5-1/PolkitQt1/ActionDescription -include/polkit-qt5-1/PolkitQt1/Agent/Listener -include/polkit-qt5-1/PolkitQt1/Agent/Session -include/polkit-qt5-1/PolkitQt1/Authority -include/polkit-qt5-1/PolkitQt1/Details -include/polkit-qt5-1/PolkitQt1/Gui/Action -include/polkit-qt5-1/PolkitQt1/Gui/ActionButton -include/polkit-qt5-1/PolkitQt1/Gui/ActionButtons -include/polkit-qt5-1/PolkitQt1/Identity -include/polkit-qt5-1/PolkitQt1/Subject -include/polkit-qt5-1/PolkitQt1/TemporaryAuthorization -include/polkit-qt5-1/polkitqt1-actiondescription.h -include/polkit-qt5-1/polkitqt1-agent-export.h -include/polkit-qt5-1/polkitqt1-agent-listener.h -include/polkit-qt5-1/polkitqt1-agent-session.h -include/polkit-qt5-1/polkitqt1-authority.h -include/polkit-qt5-1/polkitqt1-core-export.h -include/polkit-qt5-1/polkitqt1-details.h -include/polkit-qt5-1/polkitqt1-gui-action.h -include/polkit-qt5-1/polkitqt1-gui-actionbutton.h -include/polkit-qt5-1/polkitqt1-gui-actionbuttons.h -include/polkit-qt5-1/polkitqt1-gui-export.h -include/polkit-qt5-1/polkitqt1-identity.h -include/polkit-qt5-1/polkitqt1-subject.h -include/polkit-qt5-1/polkitqt1-temporaryauthorization.h -include/polkit-qt5-1/polkitqt1-version.h -lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake -lib/cmake/PolkitQt5-1/PolkitQt5-1ConfigVersion.cmake -lib/cmake/PolkitQt5-1/PolkitQt5-1Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/PolkitQt5-1/PolkitQt5-1Targets.cmake -lib/libpolkit-qt5-agent-1.so -lib/libpolkit-qt5-agent-1.so.1 -lib/libpolkit-qt5-agent-1.so.1.114.0 -lib/libpolkit-qt5-core-1.so -lib/libpolkit-qt5-core-1.so.1 -lib/libpolkit-qt5-core-1.so.1.114.0 -lib/libpolkit-qt5-gui-1.so -lib/libpolkit-qt5-gui-1.so.1 -lib/libpolkit-qt5-gui-1.so.1.114.0 -libdata/pkgconfig/polkit-qt5-1.pc -libdata/pkgconfig/polkit-qt5-agent-1.pc -libdata/pkgconfig/polkit-qt5-core-1.pc -libdata/pkgconfig/polkit-qt5-gui-1.pc