Index: head/sysutils/consolekit2/Makefile
===================================================================
--- head/sysutils/consolekit2/Makefile	(revision 558299)
+++ head/sysutils/consolekit2/Makefile	(revision 558300)
@@ -1,51 +1,58 @@
 # Created by: FreeBSD GNOME Team <gnome@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	consolekit
 PORTVERSION=	1.2.1
 PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${PORTVERSION}/
 PKGNAMESUFFIX=	2
 DISTNAME=	ConsoleKit2-${PORTVERSION}
 
 MAINTAINER=	desktop@FreeBSD.org
 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 \
 		tar:bzip2 xorg
 USE_CSTD=	gnu99
 USE_XORG=	x11
 USE_GNOME=	glib20 libxslt introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 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 \
 		--disable-libcgmanager \
 		--disable-libdrm \
 		--disable-libevdev \
 		--disable-libudev \
 		--without-systemdsystemunitdir
 INSTALL_TARGET=	install-strip
 
 post-install:
 .for script in ck-system-hibernate ck-system-hybridsleep \
 	ck-system-restart ck-system-stop ck-system-suspend
 	cd ${STAGEDIR}${PREFIX}/lib/ConsoleKit/scripts && \
 		${MV} ${script} ${script}.sample
 .endfor
 
 .include <bsd.port.mk>
Index: head/sysutils/consolekit2/pkg-plist
===================================================================
--- head/sysutils/consolekit2/pkg-plist	(revision 558299)
+++ head/sysutils/consolekit2/pkg-plist	(revision 558300)
@@ -1,57 +1,57 @@
 bin/ck-history
 bin/ck-launch-session
 bin/ck-list-sessions
 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
 @sample lib/ConsoleKit/scripts/ck-system-hibernate.sample
 @sample lib/ConsoleKit/scripts/ck-system-hybridsleep.sample
 @sample lib/ConsoleKit/scripts/ck-system-restart.sample
 @sample lib/ConsoleKit/scripts/ck-system-stop.sample
 @sample lib/ConsoleKit/scripts/ck-system-suspend.sample
 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
 @(,,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
+%%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
 @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