diff --git deskutils/kalarm/pkg-plist deskutils/kalarm/pkg-plist index 65d35c93c0a1..4c11f9069116 100644 --- deskutils/kalarm/pkg-plist +++ deskutils/kalarm/pkg-plist @@ -86,4 +86,3 @@ share/locale/wa/LC_MESSAGES/kalarm.mo share/locale/zh_CN/LC_MESSAGES/kalarm.mo share/locale/zh_TW/LC_MESSAGES/kalarm.mo share/metainfo/org.kde.kalarm.appdata.xml -share/polkit-1/actions/org.kde.kalarm.rtcwake.policy diff --git deskutils/plasma5-sddm-kcm/pkg-plist deskutils/plasma5-sddm-kcm/pkg-plist index ff4e8dce31bf..051e1822945b 100644 --- deskutils/plasma5-sddm-kcm/pkg-plist +++ deskutils/plasma5-sddm-kcm/pkg-plist @@ -51,5 +51,4 @@ share/locale/tr/LC_MESSAGES/kcm_sddm.mo share/locale/uk/LC_MESSAGES/kcm_sddm.mo share/locale/zh_CN/LC_MESSAGES/kcm_sddm.mo share/locale/zh_TW/LC_MESSAGES/kcm_sddm.mo -share/polkit-1/actions/org.kde.kcontrol.kcmsddm.policy %%DATADIR%%/main.qml diff --git devel/kf5-kauth/Makefile devel/kf5-kauth/Makefile index 031b68f5e99f..f16c52be1318 100644 --- devel/kf5-kauth/Makefile +++ devel/kf5-kauth/Makefile @@ -7,7 +7,12 @@ 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 +OPTIONS_DEFINE= POLKIT +#OPTIONS_DEFAULT=POLKIT +POLKIT_DESC= Build with Polkit support + +POLKIT_LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt +OPTIONS_SUB= yes USES= cmake compiler:c++11-lib kde:5 qt:5 tar:xz USE_KDE= coreaddons ecm diff --git devel/kf5-kauth/pkg-plist devel/kf5-kauth/pkg-plist index 2d081954d64f..99f971c5f109 100644 --- devel/kf5-kauth/pkg-plist +++ devel/kf5-kauth/pkg-plist @@ -18,16 +18,16 @@ lib/cmake/KF5Auth/KF5AuthConfigVersion.cmake lib/cmake/KF5Auth/KF5AuthMacros.cmake lib/cmake/KF5Auth/KF5AuthTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/KF5Auth/KF5AuthTargets.cmake -lib/cmake/KF5Auth/KF5AuthToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KF5Auth/KF5AuthToolsTargets.cmake +%%POLKIT%%lib/cmake/KF5Auth/KF5AuthToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake +%%POLKIT%%lib/cmake/KF5Auth/KF5AuthToolsTargets.cmake lib/libKF5Auth.so lib/libKF5Auth.so.5 lib/libKF5Auth.so.%%KDE_FRAMEWORKS_VERSION%% lib/libKF5AuthCore.so lib/libKF5AuthCore.so.5 lib/libKF5AuthCore.so.%%KDE_FRAMEWORKS_VERSION%% -lib/libexec/kauth/kauth-policy-gen -%%QT_PLUGINDIR%%/kauth/backend/kauth_backend_plugin.so +%%POLKIT%%lib/libexec/kauth/kauth-policy-gen +%%POLKIT%%%%QT_PLUGINDIR%%/kauth/backend/kauth_backend_plugin.so %%QT_PLUGINDIR%%/kauth/helper/kauth_helper_plugin.so %%QT_MKSPECDIR%%/modules/qt_KAuth.pri %%QT_MKSPECDIR%%/modules/qt_KAuthCore.pri diff --git devel/kf5-ktexteditor/pkg-plist devel/kf5-ktexteditor/pkg-plist index 6c70557abeb9..8041fb9426c8 100644 --- devel/kf5-ktexteditor/pkg-plist +++ devel/kf5-ktexteditor/pkg-plist @@ -163,6 +163,5 @@ share/locale/wa/LC_MESSAGES/ktexteditor5.mo share/locale/xh/LC_MESSAGES/ktexteditor5.mo share/locale/zh_CN/LC_MESSAGES/ktexteditor5.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor5.mo -share/polkit-1/actions/org.kde.ktexteditor.katetextbuffer.policy share/qlogging-categories5/ktexteditor.categories share/qlogging-categories5/ktexteditor.renamecategories diff --git devel/qt5-core/Makefile devel/qt5-core/Makefile index a07717f694cd..7feabff42ad1 100644 --- devel/qt5-core/Makefile +++ devel/qt5-core/Makefile @@ -2,7 +2,7 @@ PORTNAME= core DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel PKGNAMEPREFIX= qt5- @@ -15,7 +15,6 @@ LIB_DEPENDS= libdouble-conversion.so:devel/double-conversion \ libzstd.so:archivers/zstd USES= compiler:c++11-lang gnome qmake:no_env qt-dist:5,base -USE_GNOME= glib20 USE_QT= qmake_build buildtools_build HAS_CONFIGURE= yes # Disable (almost) everything to install minimal qconfig.h. @@ -25,7 +24,7 @@ CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ -no-openssl -no-gui -no-widgets -no-cups \ -no-iconv -no-dbus -no-opengl \ -no-egl -no-evdev \ - -no-fontconfig -no-freetype -no-gtk -no-harfbuzz \ + -no-fontconfig -no-freetype -no-glib -no-gtk -no-harfbuzz \ -no-libudev -no-xcb -no-xcb-xlib \ -no-xkbcommon -no-libinput @@ -35,8 +34,8 @@ BUILD_WRKSRC= ${WRKSRC}/src/corelib INSTALL_WRKSRC= ${BUILD_WRKSRC} QT_BINARIES= yes -QT_DEFINES= GLIB -QT_CONFIG= glib icu +QT_DEFINES= NO_GLIB +QT_CONFIG= icu MORE_WRKSRCS= src/tools/bootstrap src/corelib src/tools/qlalr diff --git graphics/colord/Makefile graphics/colord/Makefile index cf0db17a155d..4638eff8cfce 100644 --- graphics/colord/Makefile +++ graphics/colord/Makefile @@ -13,8 +13,7 @@ COMMENT= Manage color profiles to accurately color input/output devices LICENSE= GPLv2 BUILD_DEPENDS= spotread:graphics/argyllcms -LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ - libdbus-1.so:devel/dbus \ +LIB_DEPENDS= libdbus-1.so:devel/dbus \ liblcms2.so:graphics/lcms2 RUN_DEPENDS= spotread:graphics/argyllcms @@ -41,12 +40,16 @@ INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml OPTIONS_SUB= yes -OPTIONS_DEFINE= MANPAGES PPROFILES VALA -OPTIONS_DEFAULT=VALA +OPTIONS_DEFINE= POLKIT MANPAGES PPROFILES VALA +OPTIONS_DEFAULT=POLKIT VALA PPROFILES_DESC= Build extra print profiles (long build time) +POLKIT_DESC= Build with Polkit support VALA_DESC= Build Vala language bindings +POLKIT_LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit +POLKIT_CONFIGURE_ENABLE= polkit + MANPAGES_BUILD_DEPENDS= docbook2html:textproc/docbook-utils \ docbook-sgml>0:textproc/docbook-sgml PPROFILES_CONFIGURE_ENABLE= print-profiles diff --git security/kwalletmanager/pkg-plist security/kwalletmanager/pkg-plist index 02d14426182b..f5334c4052af 100644 --- security/kwalletmanager/pkg-plist +++ security/kwalletmanager/pkg-plist @@ -127,4 +127,3 @@ share/locale/zh_CN/LC_MESSAGES/kwalletmanager.mo share/locale/zh_TW/LC_MESSAGES/kcmkwallet.mo share/locale/zh_TW/LC_MESSAGES/kwalletmanager.mo share/metainfo/org.kde.kwalletmanager5.appdata.xml -share/polkit-1/actions/org.kde.kcontrol.kcmkwallet5.policy diff --git sysutils/consolekit2/Makefile sysutils/consolekit2/Makefile index 5dcf0f7a437d..bc69718188d0 100644 --- sysutils/consolekit2/Makefile +++ sysutils/consolekit2/Makefile @@ -15,8 +15,16 @@ COMMENT= Framework for defining and tracking users LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libpolkit-gobject-1.so:sysutils/polkit +LIB_DEPENDS= libdbus-1.so:devel/dbus + +OPTIONS_DEFINE= POLKIT +OPTIONS_DEFAULT=POLKIT +OPTIONS_SUB= yes + +POLKIT_DESC= Build with Polkit support + +POLKIT_LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit +POLKIT_CONFIGURE_ENABLE= polkit WRKSRC= ${WRKDIR}/ConsoleKit2-${PORTVERSION} USES= gettext gmake gnome libtool localbase pathfix pkgconfig \ @@ -30,7 +38,6 @@ CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid \ --enable-pam-module \ --with-pam-module-dir=${PREFIX}/lib \ --localstatedir=/var \ - --enable-polkit \ --enable-introspection \ --without-html-dir \ --disable-udev-acl \ diff --git sysutils/consolekit2/pkg-plist sysutils/consolekit2/pkg-plist index 110873b5fd6d..af1bd2de3999 100644 --- sysutils/consolekit2/pkg-plist +++ sysutils/consolekit2/pkg-plist @@ -46,7 +46,7 @@ share/locale/bg/LC_MESSAGES/ConsoleKit2.mo share/locale/es/LC_MESSAGES/ConsoleKit2.mo share/locale/es_419/LC_MESSAGES/ConsoleKit2.mo share/locale/ru/LC_MESSAGES/ConsoleKit2.mo -share/polkit-1/actions/org.freedesktop.consolekit.policy +%%POLKIT%%share/polkit-1/actions/org.freedesktop.consolekit.policy @dir etc/ConsoleKit/run-seat.d @dir etc/ConsoleKit/run-session.d @dir lib/ConsoleKit/run-seat.d diff --git sysutils/plasma5-libksysguard/pkg-plist sysutils/plasma5-libksysguard/pkg-plist index 254e33ef14bc..ddb4ae14a87d 100644 --- sysutils/plasma5-libksysguard/pkg-plist +++ sysutils/plasma5-libksysguard/pkg-plist @@ -499,5 +499,4 @@ share/locale/zh_TW/LC_MESSAGES/ksgrd.mo share/locale/zh_TW/LC_MESSAGES/ksysguardlsofwidgets.mo share/locale/zh_TW/LC_MESSAGES/processcore.mo share/locale/zh_TW/LC_MESSAGES/processui.mo -share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy share/qlogging-categories5/libksysguard.categories diff --git sysutils/plasma5-plasma-disks/pkg-plist sysutils/plasma5-plasma-disks/pkg-plist index ed8ff04016ea..2cea690dea14 100644 --- sysutils/plasma5-plasma-disks/pkg-plist +++ sysutils/plasma5-plasma-disks/pkg-plist @@ -32,4 +32,3 @@ share/locale/sl/LC_MESSAGES/plasma_disks.mo share/locale/sv/LC_MESSAGES/plasma_disks.mo share/locale/uk/LC_MESSAGES/plasma_disks.mo share/metainfo/org.kde.plasma.disks.metainfo.xml -share/polkit-1/actions/org.kde.kded.smart.policy diff --git sysutils/plasma5-powerdevil/pkg-plist sysutils/plasma5-powerdevil/pkg-plist index 42fa3ab38856..5ba1e145043d 100644 --- sysutils/plasma5-powerdevil/pkg-plist +++ sysutils/plasma5-powerdevil/pkg-plist @@ -360,7 +360,4 @@ share/locale/zh_TW/LC_MESSAGES/powerdevil.mo share/locale/zh_TW/LC_MESSAGES/powerdevilactivitiesconfig.mo share/locale/zh_TW/LC_MESSAGES/powerdevilglobalconfig.mo share/locale/zh_TW/LC_MESSAGES/powerdevilprofilesconfig.mo -share/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy -share/polkit-1/actions/org.kde.powerdevil.chargethresholdhelper.policy -share/polkit-1/actions/org.kde.powerdevil.discretegpuhelper.policy share/qlogging-categories5/powerdevil.categories diff --git sysutils/upower/Makefile sysutils/upower/Makefile index 46918fb663c1..ee2013510b64 100644 --- sysutils/upower/Makefile +++ sysutils/upower/Makefile @@ -3,6 +3,7 @@ PORTNAME= upower PORTVERSION= 0.99.11 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://upower.freedesktop.org/releases/ @@ -12,8 +13,7 @@ COMMENT= D-Bus daemon for simplifying power management tasks LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ - libdbus-glib-1.so:devel/dbus-glib +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib USES= compiler:c11 gettext gmake gnome libtool localbase \ pathfix pkgconfig tar:xz @@ -30,7 +30,7 @@ OPTIONS_DEFINE= MANPAGES OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes MANPAGES_CONFIGURE_ENABLE= man-pages -MANPAGES_BUILD_DEPENDS= \ +MANPAGES_BUILD_DEPENDS= \ docbook-sgml>0:textproc/docbook-sgml \ docbook-xml>0:textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl diff --git x11/plasma5-plasma-desktop/Makefile x11/plasma5-plasma-desktop/Makefile index e65e7e67efd1..d9f97de809ba 100644 --- x11/plasma5-plasma-desktop/Makefile +++ x11/plasma5-plasma-desktop/Makefile @@ -39,8 +39,7 @@ USE_KDE= activities activities-stats archive attica auth baloo \ sonnet textwidgets unitconversion wallet \ widgetsaddons windowsystem xmlgui USE_KDE+= drkonqi_run infocenter_run kde-cli-tools_run kmenuedit_run \ - ksysguard_run \ - polkit-kde-agent-1_run systemsettings_run + ksysguard_run systemsettings_run USE_QT= concurrent core dbus declarative gui network phonon4 printsupport \ sql svg widgets x11extras xml \ buildtools_build qmake_build diff --git x11/plasma5-plasma-desktop/pkg-plist x11/plasma5-plasma-desktop/pkg-plist index e88fb959a2c9..a112ec2e571a 100644 --- x11/plasma5-plasma-desktop/pkg-plist +++ x11/plasma5-plasma-desktop/pkg-plist @@ -3966,7 +3966,6 @@ share/plasma/shells/org.kde.plasma.desktop/contents/views/Desktop.qml share/plasma/shells/org.kde.plasma.desktop/contents/views/Panel.qml share/plasma/shells/org.kde.plasma.desktop/metadata.desktop share/plasma/shells/org.kde.plasma.desktop/metadata.json -share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy share/qlogging-categories5/kcmkeys.categories share/qlogging-categories5/kcmusers.categories share/solid/devices/solid-device-Battery.desktop diff --git x11/plasma5-plasma-workspace/pkg-plist x11/plasma5-plasma-workspace/pkg-plist index 0eb9c823ce27..05c19ed315f1 100644 --- x11/plasma5-plasma-workspace/pkg-plist +++ x11/plasma5-plasma-workspace/pkg-plist @@ -5663,7 +5663,6 @@ share/plasma/wallpapers/org.kde.slideshow/contents/ui/config.qml share/plasma/wallpapers/org.kde.slideshow/contents/ui/main.qml share/plasma/wallpapers/org.kde.slideshow/metadata.desktop share/plasma/wallpapers/org.kde.slideshow/metadata.json -share/polkit-1/actions/org.kde.fontinst.policy share/qlogging-categories5/klipper.categories share/qlogging-categories5/libnotificationmanager.categories share/qlogging-categories5/plasma-workspace.categories diff --git x11/plasma5-plasma/Makefile x11/plasma5-plasma/Makefile index 2beb2b500628..d656acadf5df 100644 --- x11/plasma5-plasma/Makefile +++ x11/plasma5-plasma/Makefile @@ -15,7 +15,7 @@ USES= kde:5 metaport qt:5 # * bluedevil as we do have bluez # * plasma-pa don't depend on plamsa-pa by default # * breeze-kde4 don't pull in qt4 bits -USE_KDE= ${_USE_PLASMA_ALL:Nplasma-pa:Nbreeze-kde4} +USE_KDE= ${_USE_PLASMA_ALL:Nplasma-pa:Nbreeze-kde4:Npolkit-kde-agent-1} OPTIONS_DEFINE= PHONON PULSEAUDIO OPTIONS_DEFAULT= PHONON