pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/slim Add option to build slim without consolekit (...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbc05b689293
branches:  trunk
changeset: 454424:cbc05b689293
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Jun 11 10:37:12 2021 +0000

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

diffstat:

 x11/slim/Makefile   |   5 ++---
 x11/slim/options.mk |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 8ce33d51466a -r cbc05b689293 x11/slim/Makefile
--- a/x11/slim/Makefile Fri Jun 11 07:11:27 2021 +0000
+++ b/x11/slim/Makefile Fri Jun 11 10:37:12 2021 +0000
@@ -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_LANGUAGES= c c++
 
 USE_CMAKE=     yes
-CMAKE_ARGS=    -DUSE_CONSOLEKIT:Bool=Yes
 
 AUTO_MKDIRS=   yes
 RCD_SCRIPTS+=  slim
@@ -31,6 +30,7 @@
 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 @@
 .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"
diff -r 8ce33d51466a -r cbc05b689293 x11/slim/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/slim/options.mk       Fri Jun 11 10:37:12 2021 +0000
@@ -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



Home | Main Index | Thread Index | Old Index