From owner-svn-ports-head@FreeBSD.ORG  Sun Mar  1 22:06:51 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 87A5D81E;
 Sun,  1 Mar 2015 22:06:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 72473BE6;
 Sun,  1 Mar 2015 22:06:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t21M6pgX005354;
 Sun, 1 Mar 2015 22:06:51 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t21M6p07005353;
 Sun, 1 Mar 2015 22:06:51 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201503012206.t21M6p07005353@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sun, 1 Mar 2015 22:06:51 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r380229 - head/x11/slim
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2015 22:06:51 -0000

Author: marino
Date: Sun Mar  1 22:06:50 2015
New Revision: 380229
URL: https://svnweb.freebsd.org/changeset/ports/380229
QAT: https://qat.redports.org/buildarchive/r380229/

Log:
  x11/slim: make consolekit support optional
  
  PR:		197585
  Submitted by:	Stefan (ott.net)
  Approved by:	maintainer (Henry Hu)

Modified:
  head/x11/slim/Makefile

Modified: head/x11/slim/Makefile
==============================================================================
--- head/x11/slim/Makefile	Sun Mar  1 21:24:40 2015	(r380228)
+++ head/x11/slim/Makefile	Sun Mar  1 22:06:50 2015	(r380229)
@@ -3,7 +3,7 @@
 
 PORTNAME=	slim
 PORTVERSION=	1.3.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.berlios.de/pub/slim/ \
 		SF/slim.berlios
@@ -18,7 +18,6 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/de
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libck-connector.so:${PORTSDIR}/sysutils/consolekit \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 USES=		cmake pkgconfig
@@ -32,10 +31,11 @@ CMAKE_ARGS=	-DUSE_CONSOLEKIT=yes \
 	-DBUILD_SLIMLOCK=no \
 	-DBUILD_SHARED_LIBS=yes
 
-OPTIONS_DEFINE=		PAM UTF8
-OPTIONS_DEFAULT=	PAM
+OPTIONS_DEFINE=		PAM UTF8 CONSOLEKIT
+OPTIONS_DEFAULT=	PAM CONSOLEKIT
 
 UTF8_DESC=	Support UTF-8 characters
+CONSOLEKIT_DESC=Enable support for consolekit
 
 PLIST_SUB+=	VERSION="${PORTVERSION}"
 
@@ -54,6 +54,13 @@ PLIST_SUB+=	PAM="@comment "
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-utf8
 .endif
 
+.if ${PORT_OPTIONS:MCONSOLEKIT}
+CMAKE_ARGS+=	-DUSE_CONSOLEKIT=yes
+LIB_DEPENDS+=	libck-connector.so:${PORTSDIR}/sysutils/consolekit
+.else
+CMAKE_ARGS+=	-DUSE_CONSOLEKIT=no
+.endif
+
 post-patch:
 	@${CP} ${WRKSRC}/slim.conf ${WRKSRC}/slim.conf.sample
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \