Date: Sat, 5 Aug 2017 10:58:48 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447399 - in head: . audio/pulseaudio sysutils/consolekit sysutils/consolekit2 sysutils/consolekit2/files sysutils/hal www/gnome-user-share x11-wm/lxsession x11-wm/xfce4-session x11/cin... Message-ID: <201708051058.v75AwmRw076073@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sat Aug 5 10:58:48 2017 New Revision: 447399 URL: https://svnweb.freebsd.org/changeset/ports/447399 Log: Update consolekit to 1.2.0. * Rename consolekit to consolekit2 to reflect that consolekit2 is a new project, even if it the continuation of the old consolekit project. * Expand pkg-descr with some background info. * Add license * ConsoleKit2 has been ported to GDbus, so dbus-glib is not anymore required * Add GObject introspection support for desktops environment such Pantheon or Deepin. * Thanks to Jesper Schmitz Mouridsen, Ben Woods and Olivier Duchateau for assisting with there versions of the port, suggesting changes and testing. PR: 202269 Added: head/sysutils/consolekit2/ - copied from r447398, head/sysutils/consolekit/ Deleted: head/sysutils/consolekit/ head/sysutils/consolekit2/files/ Modified: head/MOVED head/audio/pulseaudio/Makefile head/sysutils/consolekit2/Makefile head/sysutils/consolekit2/distinfo head/sysutils/consolekit2/pkg-descr head/sysutils/consolekit2/pkg-plist head/sysutils/hal/Makefile head/www/gnome-user-share/Makefile head/x11-wm/lxsession/Makefile head/x11-wm/xfce4-session/Makefile head/x11/cinnamon-session/Makefile head/x11/gdm/Makefile head/x11/gnome-session/Makefile head/x11/kde4-workspace/Makefile head/x11/lightdm/Makefile head/x11/mate-session-manager/Makefile head/x11/slim/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Aug 5 10:56:37 2017 (r447398) +++ head/MOVED Sat Aug 5 10:58:48 2017 (r447399) @@ -9498,3 +9498,4 @@ security/openvas-cli|security/openvas8-cli|2017-08-03| security/openvas-manager|security/openvas8-manager|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name security/openvas-scanner|security/openvas8-scanner|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name security/greenbone-security-assistant|security/greenbone-security-assistant8|2017-08-03|Renamed to include openvas 9 ports. It reflects a better name +sysutils/consolekit|sysutils/consolekit2|2017-08-05|Continuation of the consolekit project Modified: head/audio/pulseaudio/Makefile ============================================================================== --- head/audio/pulseaudio/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/audio/pulseaudio/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -6,7 +6,7 @@ PORTNAME= pulseaudio PORTVERSION= 10.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ @@ -21,7 +21,7 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \ libfftw3f.so:math/fftw3-float \ libdbus-1.so:devel/dbus \ libltdl.so:devel/libltdl \ - libck-connector.so:sysutils/consolekit + libck-connector.so:sysutils/consolekit2 USE_GNOME= glib20 intltool USE_XORG= ice sm x11 xcb xtst Modified: head/sysutils/consolekit2/Makefile ============================================================================== --- head/sysutils/consolekit/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/sysutils/consolekit2/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -2,36 +2,40 @@ # $FreeBSD$ PORTNAME= consolekit -PORTVERSION= 0.4.5 -PORTREVISION= 4 +PORTVERSION= 1.2.0 CATEGORIES= sysutils gnome -MASTER_SITES= http://www.freedesktop.org/software/ConsoleKit/dist/ -DISTFILES= ConsoleKit-${PORTVERSION}${EXTRACT_SUFX} +MASTER_SITES= https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${PORTVERSION}/ +DISTNAME= ConsoleKit2-${PORTVERSION} +PKGNAMESUFFIX= 2 MAINTAINER= gnome@FreeBSD.org COMMENT= Framework for defining and tracking users -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libdbus-1.so:devel/dbus \ libpolkit-gobject-1.so:sysutils/polkit -WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION} -USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 +WRKSRC= ${WRKDIR}/ConsoleKit2-${PORTVERSION} +USES= gettext gmake libtool localbase pathfix pkgconfig tar:bzip2 USE_XORG= x11 +USE_GNOME= glib20 libxslt introspection:build GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid \ --enable-pam-module \ --with-pam-module-dir=${PREFIX}/lib \ - --localstatedir=/var + --localstatedir=/var \ + --enable-polkit \ + --enable-introspection \ + --without-html-dir \ + --disable-udev-acl \ + --disable-libcgmanager \ + --disable-libdrm \ + --disable-libevdev \ + --disable-libudev \ + --without-systemdsystemunitdir INSTALL_TARGET= install-strip - -post-install: - ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device \ - ${STAGEDIR}${PREFIX}/libexec/ck-get-x11-display-device - ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid \ - ${STAGEDIR}${PREFIX}/libexec/ck-get-x11-server-pid - @${MKDIR} ${STAGEDIR}/var/log/ConsoleKit .include <bsd.port.mk> Modified: head/sysutils/consolekit2/distinfo ============================================================================== --- head/sysutils/consolekit/distinfo Sat Aug 5 10:56:37 2017 (r447398) +++ head/sysutils/consolekit2/distinfo Sat Aug 5 10:58:48 2017 (r447399) @@ -1,2 +1,3 @@ -SHA256 (ConsoleKit-0.4.5.tar.bz2) = 43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b223686b9c38 -SIZE (ConsoleKit-0.4.5.tar.bz2) = 425423 +TIMESTAMP = 1501417547 +SHA256 (ConsoleKit2-1.2.0.tar.bz2) = d6ea13b306557a76519388de39bf7f1a1ea9010af147fad4fb3131ce634bd8b3 +SIZE (ConsoleKit2-1.2.0.tar.bz2) = 1125402 Modified: head/sysutils/consolekit2/pkg-descr ============================================================================== --- head/sysutils/consolekit/pkg-descr Sat Aug 5 10:56:37 2017 (r447398) +++ head/sysutils/consolekit2/pkg-descr Sat Aug 5 10:58:48 2017 (r447399) @@ -1,6 +1,20 @@ -ConsoleKit is a framework for defining and tracking users, login -sessions, and seats. The primary motivations for this framework are to -facilitate fast-user-switching and multi-seat capabilities, and to -enable more sophisticated policy decisions for desktop sessions. +ConsoleKit2 is a framework for defining and tracking users, login +sessions, and seats. It allows multiple users to be logged in at the +same time and share hardware for their graphical session. ConsoleKit2 +will keep track of those resources and whichever session is active +will have use of the hardware at that time. + +What is a seat? +=============== +A seat is a collection of sessions and a set of hardware (usually at +least a keyboard and mouse). Only one session may be active on a +seat at a time. -WWW: http://www.freedesktop.org/wiki/Software/ConsoleKit +What is a session? +================== +A session is a collection of all processes that originate from a single +common ancestor and retain knowledge of a secret. As an implementation +detail, this secret may be stored in the process environment by the +login manager under the name XDG_SESSION_COOKIE. + +WWW: https://github.com/ConsoleKit2/ConsoleKit2 Modified: head/sysutils/consolekit2/pkg-plist ============================================================================== --- head/sysutils/consolekit/pkg-plist Sat Aug 5 10:56:37 2017 (r447398) +++ head/sysutils/consolekit2/pkg-plist Sat Aug 5 10:58:48 2017 (r447399) @@ -1,35 +1,57 @@ bin/ck-history bin/ck-launch-session bin/ck-list-sessions -sbin/ck-log-system-restart -sbin/ck-log-system-start -sbin/ck-log-system-stop etc/ConsoleKit/seats.d/00-primary.seat +etc/X11/xinit/xinitrc.d/90-consolekit etc/dbus-1/system.d/ConsoleKit.conf +etc/logrotate.d/consolekit include/ConsoleKit/ck-connector/ck-connector.h +include/ConsoleKit/libconsolekit.h +lib/ConsoleKit/scripts/ck-get-x11-display-device +lib/ConsoleKit/scripts/ck-get-x11-server-pid +lib/ConsoleKit/scripts/ck-system-hibernate +lib/ConsoleKit/scripts/ck-system-hybridsleep lib/ConsoleKit/scripts/ck-system-restart lib/ConsoleKit/scripts/ck-system-stop +lib/ConsoleKit/scripts/ck-system-suspend +lib/girepository-1.0/libconsolekit-1.0.typelib lib/libck-connector.so lib/libck-connector.so.0 lib/libck-connector.so.0.0.0 +lib/libconsolekit.so +lib/libconsolekit.so.1 +lib/libconsolekit.so.1.0.0 lib/pam_ck_connector.so libdata/pkgconfig/ck-connector.pc +libdata/pkgconfig/libconsolekit.pc libexec/ck-collect-session-info -libexec/ck-get-x11-display-device +@(,,4755) libexec/ck-get-x11-display-device libexec/ck-get-x11-server-pid +libexec/ck-remove-directory +man/man1/ck-history.1.gz +man/man1/ck-launch-session.1.gz +man/man1/ck-list-sessions.1.gz +man/man1/console-kit-daemon.1m.gz man/man8/pam_ck_connector.8.gz +sbin/ck-log-system-restart +sbin/ck-log-system-start +sbin/ck-log-system-stop sbin/console-kit-daemon share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml share/dbus-1/system-services/org.freedesktop.ConsoleKit.service +share/gir-1.0/libconsolekit-1.0.gir +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 -@dir /var/run/ConsoleKit -@dir /var/log/ConsoleKit -@postexec /usr/bin/touch /var/log/ConsoleKit/history -@rmtry /var/log/ConsoleKit/history @dir etc/ConsoleKit/run-seat.d @dir etc/ConsoleKit/run-session.d @dir lib/ConsoleKit/run-seat.d @dir lib/ConsoleKit/run-session.d - +@dir /var/log/ConsoleKit +@postexec /usr/bin/touch /var/log/ConsoleKit/history +@rmtry /var/log/ConsoleKit/history +@dir /var/run/ConsoleKit Modified: head/sysutils/hal/Makefile ============================================================================== --- head/sysutils/hal/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/sysutils/hal/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -4,7 +4,7 @@ PORTNAME= hal DISTVERSION= 0.5.14 -PORTREVISION= 31 +PORTREVISION= 32 CATEGORIES= sysutils MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -15,7 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h: # keep shlib version, to prevent confusion with polkit-* from sysutils/polkit LIB_DEPENDS= libpolkit.so.2:sysutils/policykit \ libvolume_id.so:devel/libvolume_id \ - libck-connector.so:sysutils/consolekit + libck-connector.so:sysutils/consolekit2 RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids USES= gettext gmake libtool:keepla pathfix pkgconfig python shebangfix Modified: head/www/gnome-user-share/Makefile ============================================================================== --- head/www/gnome-user-share/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/www/gnome-user-share/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -4,7 +4,7 @@ PORTNAME= gnome-user-share PORTVERSION= 3.14.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ LIB_DEPENDS= libavahi-client.so:net/avahi-app \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libunique-1.0.so:x11-toolkits/unique RUN_DEPENDS= ap*-mod_dnssd>=0:www/mod_dnssd \ - console-kit-daemon:sysutils/consolekit + console-kit-daemon:sysutils/consolekit2 USES= gettext gmake libtool pkgconfig tar:xz USE_APACHE= 22+ Modified: head/x11-wm/lxsession/Makefile ============================================================================== --- head/x11-wm/lxsession/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11-wm/lxsession/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,6 +3,7 @@ PORTNAME= lxsession PORTVERSION= 0.5.3 +PORTREVISION= 1 CATEGORIES= x11-wm MASTER_SITES= SF/lxde/LXSession%20%28session%20manager%29/LXSession%200.5.x/ @@ -18,7 +19,7 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libfreetype.so:print/freetype2 \ libunique-1.0.so:x11-toolkits/unique \ libpolkit-agent-1.so:sysutils/polkit \ - libck-connector.so:sysutils/consolekit + libck-connector.so:sysutils/consolekit2 USES= autoreconf gmake localbase pkgconfig tar:xz USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2 libxslt Modified: head/x11-wm/xfce4-session/Makefile ============================================================================== --- head/x11-wm/xfce4-session/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11-wm/xfce4-session/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,7 +3,7 @@ PORTNAME= xfce4-session PORTVERSION= 4.12.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -15,7 +15,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= iceauth:x11/iceauth RUN_DEPENDS= iceauth:x11/iceauth \ - console-kit-daemon:sysutils/consolekit + console-kit-daemon:sysutils/consolekit2 LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libupower-glib.so:sysutils/upower \ libpolkit-gobject-1.so:sysutils/polkit Modified: head/x11/cinnamon-session/Makefile ============================================================================== --- head/x11/cinnamon-session/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/cinnamon-session/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,7 +3,7 @@ PORTNAME= cinnamon-session PORTVERSION= 2.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome DIST_SUBDIR= gnome3 @@ -15,7 +15,7 @@ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libjson-glib-1.0.so:devel/json-glib \ libupower-glib.so:sysutils/upower \ libcanberra.so:audio/libcanberra -RUN_DEPENDS= console-kit-daemon:sysutils/consolekit \ +RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2 \ xdpyinfo:x11/xdpyinfo USES= autoreconf:build execinfo gettext gmake libtool \ Modified: head/x11/gdm/Makefile ============================================================================== --- head/x11/gdm/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/gdm/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,7 +3,7 @@ PORTNAME= gdm PORTVERSION= 3.16.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,7 +14,7 @@ COMMENT= GNOME 3 version of xdm display manager BUILD_DEPENDS= zenity>=3.0.0:x11/zenity \ itstool:textproc/itstool \ iso-codes>=0:misc/iso-codes -LIB_DEPENDS= libck-connector.so:sysutils/consolekit \ +LIB_DEPENDS= libck-connector.so:sysutils/consolekit2 \ libdbus-glib-1.so:devel/dbus-glib \ libupower-glib.so:sysutils/upower \ libnss3.so:security/nss \ @@ -92,6 +92,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message GNOME_LOCALSTATEDIR= /var OPTIONS_DEFINE= IPV6 +KEYRING_RUN_DEPENDS= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring + IPV6_CONFIGURE_ENABLE= ipv6 .include <bsd.port.options.mk> Modified: head/x11/gnome-session/Makefile ============================================================================== --- head/x11/gnome-session/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/gnome-session/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,7 +3,7 @@ PORTNAME= gnome-session PORTVERSION= 3.18.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -14,7 +14,7 @@ COMMENT= Session component for the GNOME 3 desktop LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libjson-glib-1.0.so:devel/json-glib \ libupower-glib.so:sysutils/upower -RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit \ +RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \ ${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo PORTSCOUT= limitw:1,even Modified: head/x11/kde4-workspace/Makefile ============================================================================== --- head/x11/kde4-workspace/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/kde4-workspace/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -2,14 +2,14 @@ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libck-connector.so:sysutils/consolekit \ + libck-connector.so:sysutils/consolekit2 \ libpci.so:devel/libpci \ libhal.so:sysutils/hal \ libqjson.so:devel/qjson \ Modified: head/x11/lightdm/Makefile ============================================================================== --- head/x11/lightdm/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/lightdm/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,6 +3,7 @@ PORTNAME= lightdm PORTVERSION= 1.22.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ @@ -18,7 +19,7 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPL3 BUILD_DEPENDS= itstool:textproc/itstool LIB_DEPENDS= libaccountsservice.so:sysutils/accountsservice \ - libck-connector.so:sysutils/consolekit \ + libck-connector.so:sysutils/consolekit2 \ libgcrypt.so:security/libgcrypt \ libxklavier.so:x11/libxklavier Modified: head/x11/mate-session-manager/Makefile ============================================================================== --- head/x11/mate-session-manager/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/mate-session-manager/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,6 +3,7 @@ PORTNAME= mate-session-manager PORTVERSION= 1.18.0 +PORTREVISION= 1 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate @@ -13,7 +14,7 @@ COMMENT= Session component for the MATE desktop LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libupower-glib.so:sysutils/upower -RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit \ +RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \ ${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo PORTSCOUT= limitw:1,even Modified: head/x11/slim/Makefile ============================================================================== --- head/x11/slim/Makefile Sat Aug 5 10:56:37 2017 (r447398) +++ head/x11/slim/Makefile Sat Aug 5 10:58:48 2017 (r447399) @@ -3,7 +3,7 @@ PORTNAME= slim PORTVERSION= 1.3.6 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios @@ -45,7 +45,7 @@ PAM_CMAKE_OFF= -DUSE_PAM=no UTF8_EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-utf8 CONSOLEKIT_CMAKE_ON= -DUSE_CONSOLEKIT=yes -CONSOLEKIT_LIB_DEPENDS= libck-connector.so:sysutils/consolekit +CONSOLEKIT_LIB_DEPENDS= libck-connector.so:sysutils/consolekit2 CONSOLEKIT_CMAKE_OFF= -DUSE_CONSOLEKIT=no post-patch:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708051058.v75AwmRw076073>