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

7 files changed, 16 insertions, 12 deletions

diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile
index b64275259788..edb16ed64478 100644
--- a/x11/cinnamon-session/Makefile
+++ b/x11/cinnamon-session/Makefile
@@ -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 \
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 2d7a02e784dd..83d9dc655aad 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -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>
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 1333db5e525d..e4740cb97693 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -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
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 64a90ae19f8e..b17a7ca9a117 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -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 \
diff --git a/x11/lightdm/Makefile b/x11/lightdm/Makefile
index 79a5d29c40b2..ac27f3d1e8c9 100644
--- a/x11/lightdm/Makefile
+++ b/x11/lightdm/Makefile
@@ -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
 
diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile
index b48bbe9009b1..8d92229b4938 100644
--- a/x11/mate-session-manager/Makefile
+++ b/x11/mate-session-manager/Makefile
@@ -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
diff --git a/x11/slim/Makefile b/x11/slim/Makefile
index dd86ceb64e73..1a0a95719133 100644
--- a/x11/slim/Makefile
+++ b/x11/slim/Makefile
@@ -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: