CVS commit: pkgsrc/devel/cvise

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Apr 16 06:35:04 UTC 2026

Modified Files:
        pkgsrc/devel/cvise: Makefile PLIST distinfo
        pkgsrc/devel/cvise/patches: patch-CMakeLists.txt

Log Message:
cvise: update to 2.12.0nb1.

Update to git head to fix build with llvm 21.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/cvise/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/cvise/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/cvise/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/cvise/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/devel/cvise/Makefile
diff -u pkgsrc/devel/cvise/Makefile:1.28 pkgsrc/devel/cvise/Makefile:1.29
--- pkgsrc/devel/cvise/Makefile:1.28    Wed Mar 25 22:58:42 2026
+++ pkgsrc/devel/cvise/Makefile Thu Apr 16 06:35:04 2026
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.28 2026/03/25 22:58:42 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2026/04/16 06:35:04 wiz Exp $
 
 DISTNAME=      cvise-2.12.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=marxin/}
-GITHUB_TAG=    v${PKGVERSION_NOREV}
+#GITHUB_TAG=   v${PKGVERSION_NOREV}
+# git head as of 2026-04-10 supports llvm 21, so use that
+GITHUB_TAG=    599de68b03d2a873687a25cb00df2ba894355016
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/marxin/cvise
 COMMENT=       Super-parallel Python port of the C-Reduce
 LICENSE=       modified-bsd
 
+TOOL_DEPENDS+= tree-sitter-cli-[0-9]*:../../textproc/tree-sitter-cli
 DEPENDS+=      ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=      ${PYPKGPREFIX}-pebble-[0-9]*:../../devel/py-pebble
 DEPENDS+=      ${PYPKGPREFIX}-psutil-[0-9]*:../../sysutils/py-psutil
@@ -27,7 +31,7 @@ USE_CXX_FEATURES+=    c++17
 DEPENDS+=      unifdef-[0-9]*:../../devel/unifdef
 .endif
 
-REPLACE_PYTHON+=       cvise.py
+REPLACE_PYTHON+=       cvise-cli.py
 REPLACE_PYTHON+=       cvise-delta.py
 
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/devel/cvise/PLIST
diff -u pkgsrc/devel/cvise/PLIST:1.3 pkgsrc/devel/cvise/PLIST:1.4
--- pkgsrc/devel/cvise/PLIST:1.3        Wed Mar 25 22:58:42 2026
+++ pkgsrc/devel/cvise/PLIST    Thu Apr 16 06:35:04 2026
@@ -1,15 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2026/03/25 22:58:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2026/04/16 06:35:04 wiz Exp $
 bin/cvise
 bin/cvise-delta
 libexec/cvise/clang_delta
+libexec/cvise/clang_include_graph
 libexec/cvise/clex
 libexec/cvise/strlex
-libexec/cvise/topformflat
+libexec/cvise/topformflat_hints
+libexec/cvise/treesitter_delta
 share/cvise/__init__.py
 share/cvise/cvise.py
 share/cvise/pass_groups/all.json
 share/cvise/pass_groups/binary.json
 share/cvise/pass_groups/delta.json
+share/cvise/pass_groups/no-interleaving.json
 share/cvise/pass_groups/opencl-120.json
 share/cvise/passes/__init__.py
 share/cvise/passes/abstract.py
@@ -17,38 +20,72 @@ share/cvise/passes/balanced.py
 share/cvise/passes/blank.py
 share/cvise/passes/clang.py
 share/cvise/passes/clangbinarysearch.py
+share/cvise/passes/clanghints.py
+share/cvise/passes/clangincludegraph.py
+share/cvise/passes/clangmodulemap.py
 share/cvise/passes/clex.py
+share/cvise/passes/clexhints.py
 share/cvise/passes/comments.py
 share/cvise/passes/gcdabinary.py
+share/cvise/passes/hint_based.py
 share/cvise/passes/ifs.py
 share/cvise/passes/includeincludes.py
 share/cvise/passes/includes.py
 share/cvise/passes/indent.py
+share/cvise/passes/inlineincludes.py
 share/cvise/passes/ints.py
 share/cvise/passes/line_markers.py
 share/cvise/passes/lines.py
+share/cvise/passes/makefile.py
 share/cvise/passes/peep.py
+share/cvise/passes/rmunusedfiles.py
 share/cvise/passes/special.py
 share/cvise/passes/ternary.py
+share/cvise/passes/treesitter.py
 share/cvise/passes/unifdef.py
 share/cvise/tests/__init__.py
 share/cvise/tests/test_balanced.py
+share/cvise/tests/test_blank.py
+share/cvise/tests/test_cache.py
+share/cvise/tests/test_clanghints.py
+share/cvise/tests/test_clangincludegraph.py
+share/cvise/tests/test_clangmodulemap.py
+share/cvise/tests/test_clexhints.py
 share/cvise/tests/test_comments.py
+share/cvise/tests/test_fileutil.py
+share/cvise/tests/test_folding.py
+share/cvise/tests/test_hint.py
+share/cvise/tests/test_hint_based.py
 share/cvise/tests/test_ifs.py
+share/cvise/tests/test_inlineincludes.py
 share/cvise/tests/test_ints.py
 share/cvise/tests/test_line_markers.py
 share/cvise/tests/test_lines.py
+share/cvise/tests/test_makefile.py
 share/cvise/tests/test_nestedmatcher.py
 share/cvise/tests/test_peep.py
+share/cvise/tests/test_process.py
+share/cvise/tests/test_rmunusedfiles.py
+share/cvise/tests/test_sigmonitor.py
 share/cvise/tests/test_special.py
 share/cvise/tests/test_ternary.py
 share/cvise/tests/test_test_manager.py
+share/cvise/tests/test_treesitter.py
 share/cvise/tests/testabstract.py
 share/cvise/utils/__init__.py
+share/cvise/utils/cache.py
 share/cvise/utils/error.py
 share/cvise/utils/externalprograms.py
-share/cvise/utils/misc.py
+share/cvise/utils/fileutil.py
+share/cvise/utils/folding.py
+share/cvise/utils/hint.py
+share/cvise/utils/makefileparser.py
+share/cvise/utils/mplogging.py
 share/cvise/utils/nestedmatcher.py
+share/cvise/utils/process.py
 share/cvise/utils/readkey.py
+share/cvise/utils/readkey_posix.py
+share/cvise/utils/readkey_windows.py
+share/cvise/utils/sigmonitor.py
 share/cvise/utils/statistics.py
 share/cvise/utils/testing.py

Index: pkgsrc/devel/cvise/distinfo
diff -u pkgsrc/devel/cvise/distinfo:1.13 pkgsrc/devel/cvise/distinfo:1.14
--- pkgsrc/devel/cvise/distinfo:1.13    Wed Mar 25 22:58:42 2026
+++ pkgsrc/devel/cvise/distinfo Thu Apr 16 06:35:04 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2026/03/25 22:58:42 wiz Exp $
+$NetBSD: distinfo,v 1.14 2026/04/16 06:35:04 wiz Exp $
 
-BLAKE2s (cvise-2.12.0.tar.gz) = 8cf712b7b60a21b82cd651f86cb65a07ebdde858d83af65d71bc19dcaad7a254
-SHA512 (cvise-2.12.0.tar.gz) = 1561e8e7c96cfb4d24be4ffb3b8ee3c9148a715a636252a52d79f02e10ea61db285979c53ad51c797b39bc750e74682942af858187fdbf3d96d9978f8f8301b2
-Size (cvise-2.12.0.tar.gz) = 274457 bytes
-SHA1 (patch-CMakeLists.txt) = 7627887db048a1191ab615640ba8223a71a37656
+BLAKE2s (cvise-2.12.0-599de68b03d2a873687a25cb00df2ba894355016.tar.gz) = 3be6e6464ce0c66e8556590d396707f359f107c23bea0256b3330c4e080b3688
+SHA512 (cvise-2.12.0-599de68b03d2a873687a25cb00df2ba894355016.tar.gz) = 
ffe74fec3c2bc7ae3941219cb96aade61207841e791b29cf89a0d3f494083eabb7821a8806825be68a9a3b3719d240e42370b2ef3b6cc6f97ee51fd531f32a9f
+Size (cvise-2.12.0-599de68b03d2a873687a25cb00df2ba894355016.tar.gz) = 2825969 bytes
+SHA1 (patch-CMakeLists.txt) = db16056cd691410691991803975b16407ca2074c

Index: pkgsrc/devel/cvise/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/cvise/patches/patch-CMakeLists.txt:1.7 pkgsrc/devel/cvise/patches/patch-CMakeLists.txt:1.8
--- pkgsrc/devel/cvise/patches/patch-CMakeLists.txt:1.7 Fri Jan 24 09:40:40 2025
+++ pkgsrc/devel/cvise/patches/patch-CMakeLists.txt     Thu Apr 16 06:35:04 2026
@@ -1,20 +1,20 @@
-$NetBSD: patch-CMakeLists.txt,v 1.7 2025/01/24 09:40:40 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.8 2026/04/16 06:35:04 wiz Exp $
 
 Do not force -Werror.
 Do not set -O3 optimization flags.
 
---- CMakeLists.txt.orig        2024-11-10 09:58:12.000000000 +0000
+--- CMakeLists.txt.orig        2026-04-10 12:50:48.000000000 +0000
 +++ CMakeLists.txt
-@@ -171,7 +171,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+@@ -173,7 +173,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
      OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    # XXX figure out how to get "-std=c++17 -fno-rtti" from LLVM.  That's how we
    # get those options in the Automake path...
--  set(COMMON_FLAGS "-Wall -Wextra -Werror -pedantic -Wno-unused-parameter")
-+  set(COMMON_FLAGS "-Wall -Wextra -pedantic -Wno-unused-parameter")
+-  set(COMMON_FLAGS "-Wall -Wextra -Werror -Wno-unused-parameter")
++  set(COMMON_FLAGS "-Wall -Wextra -Wno-unused-parameter")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS} -std=c++17 -fno-rtti -fno-strict-aliasing")
    if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)
-@@ -197,8 +197,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+@@ -199,8 +199,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations")
    endif()