CVS commit: pkgsrc/x11/slim

["David Brownlee" <abs%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   abs
Date:           Fri Jun 11 10:37:12 UTC 2021

Modified Files:
        pkgsrc/x11/slim: Makefile
Added Files:
        pkgsrc/x11/slim: options.mk

Log Message:
Add option to build slim without consolekit (default unchanged)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/slim/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/slim/Makefile
diff -u pkgsrc/x11/slim/Makefile:1.10 pkgsrc/x11/slim/Makefile:1.11
--- pkgsrc/x11/slim/Makefile:1.10       Fri Dec  4 04:56:20 2020
+++ pkgsrc/x11/slim/Makefile    Fri Jun 11 10:37:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/12/04 04:56:20 riastradh Exp $
+# $NetBSD: Makefile,v 1.11 2021/06/11 10:37:12 abs Exp $
 
 DISTNAME=      slim-1.3.6
 PKGREVISION=   6
@@ -14,7 +14,6 @@ USE_TOOLS+=   pkg-config
 USE_LANGUAGES= c c++
 
 USE_CMAKE=     yes
-CMAKE_ARGS=    -DUSE_CONSOLEKIT:Bool=Yes
 
 AUTO_MKDIRS=   yes
 RCD_SCRIPTS+=  slim
@@ -31,6 +30,7 @@ SUBST_VARS.paths+=    X11BASE
 CONF_FILES+=   share/examples/slim/slim.conf \
                ${PKG_SYSCONFDIR}/slim.conf
 
+.include "options.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
@@ -40,6 +40,5 @@ CONF_FILES+=  share/examples/slim/slim.co
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../sysutils/consolekit/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/x11/slim/options.mk
diff -u /dev/null pkgsrc/x11/slim/options.mk:1.1
--- /dev/null   Fri Jun 11 10:37:12 2021
+++ pkgsrc/x11/slim/options.mk  Fri Jun 11 10:37:12 2021
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.1 2021/06/11 10:37:12 abs Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.slim
+PKG_SUPPORTED_OPTIONS= consolekit
+PKG_SUGGESTED_OPTIONS= consolekit
+
+.include "../../mk/bsd.options.mk"
+
+#
+# Consolekit support
+#
+.if !empty(PKG_OPTIONS:Mconsolekit)
+.include "../../sysutils/consolekit/buildlink3.mk"
+CMAKE_ARGS=    -DUSE_CONSOLEKIT:Bool=Yes
+.else
+CMAKE_ARGS=    -DUSE_CONSOLEKIT:Bool=No
+.endif