pkgsrc-Changes archive

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

CVS commit: pkgsrc/x11/slim



Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 18 06:33:12 UTC 2025

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

Log Message:
slim: fix build with cmake 4

Convert to cmake/build.mk while here.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/slim/Makefile
cvs rdiff -u -r1.3 -r1.4 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.24 pkgsrc/x11/slim/Makefile:1.25
--- pkgsrc/x11/slim/Makefile:1.24       Thu May 29 14:35:59 2025
+++ pkgsrc/x11/slim/Makefile    Mon Aug 18 06:33:12 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2025/05/29 14:35:59 khorben Exp $
+# $NetBSD: Makefile,v 1.25 2025/08/18 06:33:12 wiz Exp $
 
 DISTNAME=      slim-1.4.0
 PKGREVISION=   6
@@ -13,7 +13,7 @@ LICENSE=      gnu-gpl-v2
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
-USE_CMAKE=     yes
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 
 AUTO_MKDIRS=   yes
 RCD_SCRIPTS+=  slim
@@ -31,6 +31,8 @@ SUBST_VARS.paths+=    PKG_SYSCONFDIR
 SUBST_VARS.paths+=     VARBASE
 SUBST_VARS.paths+=     X11BASE
 
+.include "../../devel/cmake/build.mk"
+
 .include "../../mk/bsd.prefs.mk"
 
 # Possible todos

Index: pkgsrc/x11/slim/options.mk
diff -u pkgsrc/x11/slim/options.mk:1.3 pkgsrc/x11/slim/options.mk:1.4
--- pkgsrc/x11/slim/options.mk:1.3      Sun Aug 25 06:19:20 2024
+++ pkgsrc/x11/slim/options.mk  Mon Aug 18 06:33:12 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2024/08/25 06:19:20 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2025/08/18 06:33:12 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.slim
 PKG_SUPPORTED_OPTIONS= consolekit
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS=
 #
 .if !empty(PKG_OPTIONS:Mconsolekit)
 .include "../../sysutils/consolekit/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS=  -DUSE_CONSOLEKIT:Bool=Yes
+CMAKE_CONFIGURE_ARGS+= -DUSE_CONSOLEKIT:Bool=Yes
 .else
-CMAKE_CONFIGURE_ARGS=  -DUSE_CONSOLEKIT:Bool=No
+CMAKE_CONFIGURE_ARGS+= -DUSE_CONSOLEKIT:Bool=No
 .endif



Home | Main Index | Thread Index | Old Index