git: 575dbc535692 - main - lang/rizin: Update to 0.7.0

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Sun, 25 Feb 2024 17:10:35 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=575dbc53569206fb4f34ef539080bced5c15529f

commit 575dbc53569206fb4f34ef539080bced5c15529f
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-02-25 17:05:09 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-02-25 17:05:27 +0000

    lang/rizin: Update to 0.7.0
    
    Reported by:    portscout!
---
 lang/rizin/Makefile                                |  14 +--
 lang/rizin/distinfo                                |  10 +-
 lang/rizin/files/patch-meson.build                 |  20 ++++
 ...tch-subprojects_rizin-shell-parser_src_parser.c |   8 --
 ...ch-subprojects_rizin-shell-parser_src_scanner.c |  11 --
 lang/rizin/pkg-plist                               | 126 +++++++++++----------
 6 files changed, 96 insertions(+), 93 deletions(-)

diff --git a/lang/rizin/Makefile b/lang/rizin/Makefile
index 46053595cc6a..d23608a32689 100644
--- a/lang/rizin/Makefile
+++ b/lang/rizin/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	rizin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.3
-PORTREVISION=	2
+DISTVERSION=	0.7.0
 CATEGORIES=	lang security shells
 
 MAINTAINER=	arrowd@FreeBSD.org
@@ -18,11 +17,12 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libcapstone.so:devel/capstone \
 		libmspack.so:archivers/libmspack \
 		libxxhash.so:devel/xxhash \
+		libpcre2-8.so:devel/pcre2 \
 		libtree-sitter.so:devel/tree-sitter \
 		liblz4.so:archivers/liblz4 \
 		libzip.so:archivers/libzip
 
-USES=		localbase meson pkgconfig python:build ssl
+USES=		localbase meson pkgconfig python:build
 
 MESON_ARGS=	-D use_sys_capstone=enabled \
 		-D use_sys_magic=enabled \
@@ -31,15 +31,15 @@ MESON_ARGS=	-D use_sys_capstone=enabled \
 		-D use_sys_lz4=enabled \
 		-D use_sys_lzma=enabled \
 		-D use_sys_xxhash=enabled \
-		-D use_sys_openssl=enabled \
+		-D use_sys_pcre2=enabled \
 		-D use_sys_libmspack=enabled \
 		-D use_sys_tree_sitter=enabled \
-		-D enable_rz_test=false
-		# -D use_sys_libzstd=enabled \
+		-D enable_rz_test=false \
+		-D use_sys_libzstd=enabled \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rizinorg
-GH_TUPLE=	rizinorg:rz-libdemangle:3eb0ef8:libdemangle/subprojects/libdemangle \
+GH_TUPLE=	rizinorg:rz-libdemangle:8b8f7f3:libdemangle/subprojects/libdemangle \
 		rizinorg:tree-sitter-c:81d96d8:tree_sitter_c/subprojects/tree-sitter-c \
 		BLAKE3-team:BLAKE3:3f396d2:blake3/subprojects/blake3
 
diff --git a/lang/rizin/distinfo b/lang/rizin/distinfo
index 733298fa1d55..bb1ea0a9da3a 100644
--- a/lang/rizin/distinfo
+++ b/lang/rizin/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1697617223
-SHA256 (rizinorg-rizin-v0.6.3_GH0.tar.gz) = 5f78a5ca71d3029664447f341d48b2ec7767929aa2dc51ac2d3597ab7f3f2a32
-SIZE (rizinorg-rizin-v0.6.3_GH0.tar.gz) = 7511365
-SHA256 (rizinorg-rz-libdemangle-3eb0ef8_GH0.tar.gz) = 218f5040b6b66b5b4255537f4ed25eb17a5877f6d926bd61db305bab5c63bcce
-SIZE (rizinorg-rz-libdemangle-3eb0ef8_GH0.tar.gz) = 172821
+TIMESTAMP = 1708876910
+SHA256 (rizinorg-rizin-v0.7.0_GH0.tar.gz) = 61c937ce0579994dcd3c9f09fed6a78b4a200f76560fff365f116add860d63d3
+SIZE (rizinorg-rizin-v0.7.0_GH0.tar.gz) = 7738844
+SHA256 (rizinorg-rz-libdemangle-8b8f7f3_GH0.tar.gz) = 5f0148136c2972d0751d6480cbe080773f5216648219fe88c9e7cad185e10571
+SIZE (rizinorg-rz-libdemangle-8b8f7f3_GH0.tar.gz) = 172920
 SHA256 (rizinorg-tree-sitter-c-81d96d8_GH0.tar.gz) = a9b50dd46ced6ca35d7013c6d3effcc5e33cc663b7a1ee17e3d0d2c662e52823
 SIZE (rizinorg-tree-sitter-c-81d96d8_GH0.tar.gz) = 358307
 SHA256 (BLAKE3-team-BLAKE3-3f396d2_GH0.tar.gz) = 2fe7680b591b4d93aa62f830b620f652b3edae8ff63a66ff3283557ecf82f4b1
diff --git a/lang/rizin/files/patch-meson.build b/lang/rizin/files/patch-meson.build
new file mode 100644
index 000000000000..15b3dc80a3ab
--- /dev/null
+++ b/lang/rizin/files/patch-meson.build
@@ -0,0 +1,20 @@
+--- meson.build.orig	2024-02-23 16:00:12 UTC
++++ meson.build
+@@ -205,7 +205,7 @@ if (pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()) a
+ pcre2_dep_opt = get_option('use_sys_pcre2')
+ pcre2_dep = disabler()
+ if (pcre2_dep_opt.enabled() or pcre2_dep_opt.auto()) and not meson.is_cross_build()
+-  pcre2_dep = dependency('libpcre2-8', required: false, static: true)
++  pcre2_dep = dependency('libpcre2-8', required: false, static: false)
+   if not pcre2_dep.found()
+     pcre2_dep = cc.find_library('pcre2', required: true, static: true)
+   endif
+@@ -285,7 +285,7 @@ blake3_dep = blake3_proj.get_variable('blake3_dep')
+ blake3_dep = blake3_proj.get_variable('blake3_dep')
+ 
+ # handle openssl library
+-sys_openssl = dependency('openssl', required: get_option('use_sys_openssl'), static: is_static_build)
++sys_openssl = disabler()
+ 
+ # handle tree-sitter
+ r = run_command(py3_exe, check_meson_subproject_py, 'tree-sitter', check: false)
diff --git a/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_parser.c b/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_parser.c
deleted file mode 100644
index 487cbf26a0d6..000000000000
--- a/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_parser.c
+++ /dev/null
@@ -1,8 +0,0 @@
---- subprojects/rizin-shell-parser/src/parser.c.orig	2023-10-17 10:11:38 UTC
-+++ subprojects/rizin-shell-parser/src/parser.c
-@@ -1,4 +1,4 @@
--#include <tree_sitter/parser.h>
-+#include "tree_sitter/parser.h"
- 
- #if defined(__GNUC__) || defined(__clang__)
- #pragma GCC diagnostic push
diff --git a/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_scanner.c b/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_scanner.c
deleted file mode 100644
index 27c0caed234d..000000000000
--- a/lang/rizin/files/patch-subprojects_rizin-shell-parser_src_scanner.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- subprojects/rizin-shell-parser/src/scanner.c.orig	2023-10-17 10:11:38 UTC
-+++ subprojects/rizin-shell-parser/src/scanner.c
-@@ -1,7 +1,7 @@
- // SPDX-FileCopyrightText: 2020 ret2libc <sirmy15@gmail.com>
- // SPDX-License-Identifier: LGPL-3.0-only
- 
--#include <tree_sitter/parser.h>
-+#include "tree_sitter/parser.h"
- #include <ctype.h>
- #include <wctype.h>
- #include <stdio.h>
diff --git a/lang/rizin/pkg-plist b/lang/rizin/pkg-plist
index 493858d76621..3a6cccccc4df 100644
--- a/lang/rizin/pkg-plist
+++ b/lang/rizin/pkg-plist
@@ -14,6 +14,7 @@ include/librz/rz_asm.h
 include/librz/rz_basefind.h
 include/librz/rz_bin.h
 include/librz/rz_bin_dwarf.h
+include/librz/rz_bin_source_line.h
 include/librz/rz_bind.h
 include/librz/rz_bp.h
 include/librz/rz_build_version.h
@@ -63,7 +64,6 @@ include/librz/rz_pdb.h
 include/librz/rz_platform.h
 include/librz/rz_project.h
 include/librz/rz_reg.h
-include/librz/rz_regex.h
 include/librz/rz_search.h
 include/librz/rz_sign.h
 include/librz/rz_skiplist.h
@@ -77,6 +77,11 @@ include/librz/rz_types_base.h
 include/librz/rz_types_overflow.h
 include/librz/rz_userconf.h
 include/librz/rz_util.h
+include/librz/rz_util/ht_inc.h
+include/librz/rz_util/ht_pp.h
+include/librz/rz_util/ht_pu.h
+include/librz/rz_util/ht_up.h
+include/librz/rz_util/ht_uu.h
 include/librz/rz_util/rz_alloc.h
 include/librz/rz_util/rz_annotated_code.h
 include/librz/rz_util/rz_ascii_table.h
@@ -86,6 +91,7 @@ include/librz/rz_util/rz_axml.h
 include/librz/rz_util/rz_base64.h
 include/librz/rz_util/rz_base91.h
 include/librz/rz_util/rz_big.h
+include/librz/rz_util/rz_bits.h
 include/librz/rz_util/rz_bitvector.h
 include/librz/rz_util/rz_buf.h
 include/librz/rz_util/rz_debruijn.h
@@ -97,6 +103,7 @@ include/librz/rz_util/rz_graph_drawable.h
 include/librz/rz_util/rz_hex.h
 include/librz/rz_util/rz_idpool.h
 include/librz/rz_util/rz_intervaltree.h
+include/librz/rz_util/rz_iterator.h
 include/librz/rz_util/rz_itv.h
 include/librz/rz_util/rz_json.h
 include/librz/rz_util/rz_lang_byte_array.h
@@ -114,6 +121,7 @@ include/librz/rz_util/rz_protobuf.h
 include/librz/rz_util/rz_punycode.h
 include/librz/rz_util/rz_range.h
 include/librz/rz_util/rz_rbtree.h
+include/librz/rz_util/rz_regex.h
 include/librz/rz_util/rz_serialize.h
 include/librz/rz_util/rz_signal.h
 include/librz/rz_util/rz_spaces.h
@@ -136,21 +144,16 @@ include/librz/rz_util/rz_utf32.h
 include/librz/rz_util/rz_utf8.h
 include/librz/rz_util/rz_version.h
 include/librz/rz_util/rz_x509.h
+include/librz/rz_util/set.h
 include/librz/rz_vector.h
 include/librz/rz_windows.h
 include/librz/rz_windows_heap.h
 include/librz/sdb/buffer.h
 include/librz/sdb/cdb.h
 include/librz/sdb/cdb_make.h
-include/librz/sdb/ht_inc.h
-include/librz/sdb/ht_pp.h
-include/librz/sdb/ht_pu.h
-include/librz/sdb/ht_up.h
-include/librz/sdb/ht_uu.h
 include/librz/sdb/ls.h
 include/librz/sdb/sdb.h
 include/librz/sdb/sdbht.h
-include/librz/sdb/set.h
 include/librz/sflib/common/sfsocketcall.h
 include/librz/sflib/common/sftypes.h
 include/librz/sflib/darwin-arm-64/sflib.h
@@ -203,86 +206,86 @@ lib/cmake/rz_syscall/rz_syscallConfig.cmake
 lib/cmake/rz_type/rz_typeConfig.cmake
 lib/cmake/rz_util/rz_utilConfig.cmake
 lib/librz_analysis.so
-lib/librz_analysis.so.0.6
-lib/librz_analysis.so.0.6.3
+lib/librz_analysis.so.0.7
+lib/librz_analysis.so.0.7.0
 lib/librz_asm.so
-lib/librz_asm.so.0.6
-lib/librz_asm.so.0.6.3
+lib/librz_asm.so.0.7
+lib/librz_asm.so.0.7.0
 lib/librz_bin.so
-lib/librz_bin.so.0.6
-lib/librz_bin.so.0.6.3
+lib/librz_bin.so.0.7
+lib/librz_bin.so.0.7.0
 lib/librz_bp.so
-lib/librz_bp.so.0.6
-lib/librz_bp.so.0.6.3
+lib/librz_bp.so.0.7
+lib/librz_bp.so.0.7.0
 lib/librz_config.so
-lib/librz_config.so.0.6
-lib/librz_config.so.0.6.3
+lib/librz_config.so.0.7
+lib/librz_config.so.0.7.0
 lib/librz_cons.so
-lib/librz_cons.so.0.6
-lib/librz_cons.so.0.6.3
+lib/librz_cons.so.0.7
+lib/librz_cons.so.0.7.0
 lib/librz_core.so
-lib/librz_core.so.0.6
-lib/librz_core.so.0.6.3
+lib/librz_core.so.0.7
+lib/librz_core.so.0.7.0
 lib/librz_crypto.so
-lib/librz_crypto.so.0.6
-lib/librz_crypto.so.0.6.3
+lib/librz_crypto.so.0.7
+lib/librz_crypto.so.0.7.0
 lib/librz_debug.so
-lib/librz_debug.so.0.6
-lib/librz_debug.so.0.6.3
+lib/librz_debug.so.0.7
+lib/librz_debug.so.0.7.0
 lib/librz_demangler.so
-lib/librz_demangler.so.0.6
-lib/librz_demangler.so.0.6.3
+lib/librz_demangler.so.0.7
+lib/librz_demangler.so.0.7.0
 lib/librz_diff.so
-lib/librz_diff.so.0.6
-lib/librz_diff.so.0.6.3
+lib/librz_diff.so.0.7
+lib/librz_diff.so.0.7.0
 lib/librz_egg.so
-lib/librz_egg.so.0.6
-lib/librz_egg.so.0.6.3
+lib/librz_egg.so.0.7
+lib/librz_egg.so.0.7.0
 lib/librz_flag.so
-lib/librz_flag.so.0.6
-lib/librz_flag.so.0.6.3
+lib/librz_flag.so.0.7
+lib/librz_flag.so.0.7.0
 lib/librz_hash.so
-lib/librz_hash.so.0.6
-lib/librz_hash.so.0.6.3
+lib/librz_hash.so.0.7
+lib/librz_hash.so.0.7.0
 lib/librz_il.so
-lib/librz_il.so.0.6
-lib/librz_il.so.0.6.3
+lib/librz_il.so.0.7
+lib/librz_il.so.0.7.0
 lib/librz_io.so
-lib/librz_io.so.0.6
-lib/librz_io.so.0.6.3
+lib/librz_io.so.0.7
+lib/librz_io.so.0.7.0
 lib/librz_lang.so
-lib/librz_lang.so.0.6
-lib/librz_lang.so.0.6.3
+lib/librz_lang.so.0.7
+lib/librz_lang.so.0.7.0
 lib/librz_magic.so
-lib/librz_magic.so.0.6
-lib/librz_magic.so.0.6.3
+lib/librz_magic.so.0.7
+lib/librz_magic.so.0.7.0
 lib/librz_main.so
-lib/librz_main.so.0.6
-lib/librz_main.so.0.6.3
+lib/librz_main.so.0.7
+lib/librz_main.so.0.7.0
 lib/librz_parse.so
-lib/librz_parse.so.0.6
-lib/librz_parse.so.0.6.3
+lib/librz_parse.so.0.7
+lib/librz_parse.so.0.7.0
 lib/librz_reg.so
-lib/librz_reg.so.0.6
-lib/librz_reg.so.0.6.3
+lib/librz_reg.so.0.7
+lib/librz_reg.so.0.7.0
 lib/librz_search.so
-lib/librz_search.so.0.6
-lib/librz_search.so.0.6.3
+lib/librz_search.so.0.7
+lib/librz_search.so.0.7.0
 lib/librz_sign.so
-lib/librz_sign.so.0.6
-lib/librz_sign.so.0.6.3
+lib/librz_sign.so.0.7
+lib/librz_sign.so.0.7.0
 lib/librz_socket.so
-lib/librz_socket.so.0.6
-lib/librz_socket.so.0.6.3
+lib/librz_socket.so.0.7
+lib/librz_socket.so.0.7.0
 lib/librz_syscall.so
-lib/librz_syscall.so.0.6
-lib/librz_syscall.so.0.6.3
+lib/librz_syscall.so.0.7
+lib/librz_syscall.so.0.7.0
 lib/librz_type.so
-lib/librz_type.so.0.6
-lib/librz_type.so.0.6.3
+lib/librz_type.so.0.7
+lib/librz_type.so.0.7.0
 lib/librz_util.so
-lib/librz_util.so.0.6
-lib/librz_util.so.0.6.3
+lib/librz_util.so.0.7
+lib/librz_util.so.0.7.0
 libdata/pkgconfig/rz_analysis.pc
 libdata/pkgconfig/rz_asm.pc
 libdata/pkgconfig/rz_bin.pc
@@ -526,7 +529,6 @@ share/man/man7/rz-esil.7.gz
 %%DATADIR%%/format/elf_enums
 %%DATADIR%%/format/mz
 %%DATADIR%%/format/pe32
-%%DATADIR%%/format/trx
 %%DATADIR%%/format/zip
 %%DATADIR%%/fortunes/fortunes.fun
 %%DATADIR%%/fortunes/fortunes.tips