CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu May  1 12:37:08 UTC 2025

Modified Files:
        pkgsrc/devel/cpu_features: Makefile
        pkgsrc/devel/doxygen: Makefile
        pkgsrc/devel/hdf5-c++: Makefile
        pkgsrc/devel/re2c: Makefile
        pkgsrc/graphics/opencv-contrib-face: Makefile
        pkgsrc/mail/rspamd: Makefile
        pkgsrc/math/qhull: Makefile
        pkgsrc/print/poppler: Makefile.common
        pkgsrc/shells/fish: Makefile

Log Message:
*: use CMAKE_GENERATORS_INCOMPATIBLE


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/cpu_features/Makefile
cvs rdiff -u -r1.196 -r1.197 pkgsrc/devel/doxygen/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/hdf5-c++/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/re2c/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/opencv-contrib-face/Makefile
cvs rdiff -u -r1.122 -r1.123 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/qhull/Makefile
cvs rdiff -u -r1.161 -r1.162 pkgsrc/print/poppler/Makefile.common
cvs rdiff -u -r1.53 -r1.54 pkgsrc/shells/fish/Makefile

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

Modified files:

Index: pkgsrc/devel/cpu_features/Makefile
diff -u pkgsrc/devel/cpu_features/Makefile:1.9 pkgsrc/devel/cpu_features/Makefile:1.10
--- pkgsrc/devel/cpu_features/Makefile:1.9      Sun Aug 25 06:18:32 2024
+++ pkgsrc/devel/cpu_features/Makefile  Thu May  1 12:37:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2024/08/25 06:18:32 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2025/05/01 12:37:07 wiz Exp $
 
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      cpu_features-0.7.0
@@ -33,7 +33,7 @@ PKG_FAIL_REASON+=     "${MACHINE_ARCH} unsup
 # wiz 20231231:
 # as of 0.7.0, the ninja generator has problems in some environments:
 # ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/doxygen/Makefile
diff -u pkgsrc/devel/doxygen/Makefile:1.196 pkgsrc/devel/doxygen/Makefile:1.197
--- pkgsrc/devel/doxygen/Makefile:1.196 Thu Apr 24 14:13:28 2025
+++ pkgsrc/devel/doxygen/Makefile       Thu May  1 12:37:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2025/04/24 14:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.197 2025/05/01 12:37:07 wiz Exp $
 
 DISTNAME=      doxygen-1.13.2.src
 PKGNAME=       ${DISTNAME:S/.src//}
@@ -72,11 +72,10 @@ post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/doxywizard.1
 .endif
 
-.include "../../mk/bsd.prefs.mk"
 # wiz 20231103:
 # as of doxygen 1.9.8, the ninja generator has problems in some environments:
 # ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../devel/cmake/build.mk"
 .include "../../converters/libiconv/buildlink3.mk"

Index: pkgsrc/devel/hdf5-c++/Makefile
diff -u pkgsrc/devel/hdf5-c++/Makefile:1.13 pkgsrc/devel/hdf5-c++/Makefile:1.14
--- pkgsrc/devel/hdf5-c++/Makefile:1.13 Wed Mar 19 09:18:14 2025
+++ pkgsrc/devel/hdf5-c++/Makefile      Thu May  1 12:37:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2025/03/19 09:18:14 adam Exp $
+# $NetBSD: Makefile,v 1.14 2025/05/01 12:37:07 wiz Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-c++-/}
 COMMENT=       Hierarchical Data Format (new generation) - C++ wrappers
@@ -10,15 +10,8 @@ USE_LANGUAGES=               c c++
 
 CMAKE_CONFIGURE_ARGS+= -DHDF5_BUILD_CPP_LIB=ON
 
-# BUILD_DIRS (at least for hdf5) is not compatible with ninja.  pkgsrc
-# does not support CMAKE_GENERATORS_ACCEPTED=make as a
-# package-settable variable to indicate that only make works, so we
-# have to abuse CMAKE_GENERATOR (a user-settable variable).  That
-# might be set with = in mk.conf, and if so we want to just override
-# it, as being more helpful than erroring.  We therefore force reading
-# prefs first so that our assignment will prevail.
-.include "../../mk/bsd.prefs.mk"
-CMAKE_GENERATOR=       make
+# BUILD_DIRS is not compatible with ninja.
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../devel/hdf5/Makefile.common"
 .include "../../devel/hdf5/buildlink3.mk"

Index: pkgsrc/devel/re2c/Makefile
diff -u pkgsrc/devel/re2c/Makefile:1.35 pkgsrc/devel/re2c/Makefile:1.36
--- pkgsrc/devel/re2c/Makefile:1.35     Wed Apr 23 15:05:44 2025
+++ pkgsrc/devel/re2c/Makefile  Thu May  1 12:37:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/04/23 15:05:44 adam Exp $
+# $NetBSD: Makefile,v 1.36 2025/05/01 12:37:07 wiz Exp $
 
 DISTNAME=      re2c-4.2
 CATEGORIES=    devel
@@ -27,7 +27,7 @@ SUBST_STAGE.man=      pre-configure
 SUBST_MESSAGE.man=     Fixing man page path.
 
 # can't use ninja, since ninja tool-depends on this
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../devel/cmake/build.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/graphics/opencv-contrib-face/Makefile
diff -u pkgsrc/graphics/opencv-contrib-face/Makefile:1.46 pkgsrc/graphics/opencv-contrib-face/Makefile:1.47
--- pkgsrc/graphics/opencv-contrib-face/Makefile:1.46   Thu Apr 24 14:14:33 2025
+++ pkgsrc/graphics/opencv-contrib-face/Makefile        Thu May  1 12:37:07 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2025/04/24 14:14:33 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2025/05/01 12:37:07 wiz Exp $
 
 # can't use ninja because we only want to install parts of it
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 INSTALL_DIRS=          modules/face modules/plot modules/tracking
 
 PKGREVISION= 2

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.122 pkgsrc/mail/rspamd/Makefile:1.123
--- pkgsrc/mail/rspamd/Makefile:1.122   Thu Apr 17 21:51:30 2025
+++ pkgsrc/mail/rspamd/Makefile Thu May  1 12:37:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2025/04/17 21:51:30 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2025/05/01 12:37:08 wiz Exp $
 #
 # When updating this, run 'make cfgfiles'.
 
@@ -113,7 +113,7 @@ post-install:
 # wiz 20231103:
 # as of rspamd-3.7.1, the ninja generator has problems in some environments:
 # ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../archivers/libarchive/buildlink3.mk"
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/math/qhull/Makefile
diff -u pkgsrc/math/qhull/Makefile:1.14 pkgsrc/math/qhull/Makefile:1.15
--- pkgsrc/math/qhull/Makefile:1.14     Thu Jan 16 23:04:22 2025
+++ pkgsrc/math/qhull/Makefile  Thu May  1 12:37:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2025/01/16 23:04:22 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2025/05/01 12:37:08 wiz Exp $
 
 DISTNAME=      qhull-2020-src-${LIBVERSION}
 PKGNAME=       qhull-2020.2
@@ -33,7 +33,7 @@ post-extract:
 
 # libqhull is deprecated
 post-build:
-.if ${CMAKE_GENERATOR} == "make"
+.if ${_CMAKE_GENERATOR} == "make"
        cd ${WRKSRC}/${CMAKE_BUILD_DIR} && make libqhull
 .else
        cd ${WRKSRC}/${CMAKE_BUILD_DIR} && ninja libqhull

Index: pkgsrc/print/poppler/Makefile.common
diff -u pkgsrc/print/poppler/Makefile.common:1.161 pkgsrc/print/poppler/Makefile.common:1.162
--- pkgsrc/print/poppler/Makefile.common:1.161  Thu Apr 17 22:03:48 2025
+++ pkgsrc/print/poppler/Makefile.common        Thu May  1 12:37:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.161 2025/04/17 22:03:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.162 2025/05/01 12:37:08 wiz Exp $
 #
 # used by print/poppler/Makefile
 # used by print/poppler-cpp/Makefile
@@ -35,7 +35,7 @@ BUILDLINK_TRANSFORM+=   rm:-fno-check-ne
 
 # poppler's build infrastructure and our split packages
 # do not work with ninja
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.53 pkgsrc/shells/fish/Makefile:1.54
--- pkgsrc/shells/fish/Makefile:1.53    Sun Aug 25 06:19:14 2024
+++ pkgsrc/shells/fish/Makefile Thu May  1 12:37:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2024/08/25 06:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2025/05/01 12:37:08 wiz Exp $
 
 DISTNAME=              fish-3.7.1
 CATEGORIES=            shells
@@ -52,7 +52,7 @@ post-extract:
 # wiz 20231109:
 # as of fish-3.6.2, the ninja generator has problems in some environments:
 # ninja: error: manifest 'build.ninja' still dirty after 100 tries, perhaps system time is not set
-CMAKE_GENERATOR=       make
+CMAKE_GENERATORS_INCOMPATIBLE= ninja
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../devel/cmake/build.mk"