radare2: Re-import from devel/radare2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: radare2: Re-import from devel/radare2
From: Leonardo Taccari (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 18 Jan 2026 18:39:41 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun Jan 18 19:16:48 2026 +0100
Changeset:	44a099412653431ea1616008bc2fb69f9ac1ccf3

Modified Files:
	radare2/Makefile
	radare2/PLIST
	radare2/buildlink3.mk
	radare2/distinfo
Added Files:
	radare2/patches/patch-shlr_sdb_include_sdb_cwisstable.h
Removed Files:
	radare2/COMMIT_MSG
	radare2/TODO

Log Message:
radare2: Re-import from devel/radare2

Some patches were added and buildlink3.mk modified too.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=44a099412653431ea1616008bc2fb69f9ac1ccf3

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

diffstat:
 radare2/COMMIT_MSG                                 |  3 ---
 radare2/Makefile                                   |  7 +++---
 radare2/PLIST                                      | 24 +--------------------
 radare2/TODO                                       |  7 ------
 radare2/buildlink3.mk                              |  4 ++--
 radare2/distinfo                                   |  9 ++++----
 .../patch-shlr_sdb_include_sdb_cwisstable.h        | 25 ++++++++++++++++++++++
 7 files changed, 36 insertions(+), 43 deletions(-)

diffs:
diff --git a/radare2/COMMIT_MSG b/radare2/COMMIT_MSG
deleted file mode 100644
index 4166a58fbf..0000000000
--- a/radare2/COMMIT_MSG
+++ /dev/null
@@ -1,3 +0,0 @@
-(devel/radare2) Updated 5.9.6 to 5.9.8
-
-ChangeLog unknown
diff --git a/radare2/Makefile b/radare2/Makefile
index 23f945d14e..c54cb1a050 100644
--- a/radare2/Makefile
+++ b/radare2/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2024/11/14 22:19:36 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2026/01/07 08:46:45 wiz Exp $
 
-DISTNAME=	radare2-5.9.8
+DISTNAME=	radare2-5.9.6
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=radareorg/}
 DISTFILES=	${DEFAULT_DISTFILES}
@@ -24,8 +25,6 @@ CONFIGURE_ARGS+=	--with-syszip
 PKGCONFIG_OVERRIDE+=	pkgcfg/*.pc*
 USE_TOOLS+=		gmake patch pkg-config perl
 
-REPLACE_SH+=		scripts/licenses.r2.js
-
 # node
 CHECK_INTERPRETER_SKIP+=	share/radare2/${PKGVERSION_NOREV}/www/m/fonts/iconjar-map.js
 
diff --git a/radare2/PLIST b/radare2/PLIST
index 41cea27529..dcc26e931f 100644
--- a/radare2/PLIST
+++ b/radare2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.13 2024/11/10 17:58:56 leot Exp $
 bin/r2
 bin/r2agent
 bin/r2p
@@ -363,24 +363,11 @@ share/doc/radare2/vlang-example.v
 share/doc/radare2/windbg.md
 share/doc/radare2/windows.md
 share/doc/radare2/yara.md
-share/radare2/${R2VERSION}/charsets/arabic_iso.sdb
-share/radare2/${R2VERSION}/charsets/arabic_windows.sdb
 share/radare2/${R2VERSION}/charsets/ascii.sdb
-share/radare2/${R2VERSION}/charsets/ascii_ansi.sdb
-share/radare2/${R2VERSION}/charsets/ascii_oem.sdb
-share/radare2/${R2VERSION}/charsets/big5.sdb
-share/radare2/${R2VERSION}/charsets/cyrillic_iso.sdb
-share/radare2/${R2VERSION}/charsets/cyrillic_windows.sdb
 share/radare2/${R2VERSION}/charsets/ebcdic37.sdb
-share/radare2/${R2VERSION}/charsets/greek_iso.sdb
-share/radare2/${R2VERSION}/charsets/greek_windows.sdb
-share/radare2/${R2VERSION}/charsets/hebrew_iso.sdb
-share/radare2/${R2VERSION}/charsets/hebrew_windows.sdb
 share/radare2/${R2VERSION}/charsets/hiragana.sdb
 share/radare2/${R2VERSION}/charsets/iso8859_1.sdb
-share/radare2/${R2VERSION}/charsets/iso_646.sdb
 share/radare2/${R2VERSION}/charsets/katakana.sdb
-share/radare2/${R2VERSION}/charsets/macintosh.sdb
 share/radare2/${R2VERSION}/charsets/pokered.sdb
 share/radare2/${R2VERSION}/cons/ayu
 share/radare2/${R2VERSION}/cons/basic
@@ -430,7 +417,6 @@ share/radare2/${R2VERSION}/fcnsign/cc-ppc-64.sdb
 share/radare2/${R2VERSION}/fcnsign/cc-riscv-64.sdb
 share/radare2/${R2VERSION}/fcnsign/cc-s390-64.sdb
 share/radare2/${R2VERSION}/fcnsign/cc-sparc-32.sdb
-share/radare2/${R2VERSION}/fcnsign/cc-stm8-16.sdb
 share/radare2/${R2VERSION}/fcnsign/cc-v850-32.sdb
 share/radare2/${R2VERSION}/fcnsign/cc-x86-16.sdb
 share/radare2/${R2VERSION}/fcnsign/cc-x86-32.sdb
@@ -695,14 +681,6 @@ share/radare2/${R2VERSION}/platform/nes-fini.r2
 share/radare2/${R2VERSION}/platform/nes-init.r2
 share/radare2/${R2VERSION}/platform/stm8-fini.r2
 share/radare2/${R2VERSION}/platform/stm8-init.r2
-share/radare2/${R2VERSION}/scripts/il2cpp.r2.js
-share/radare2/${R2VERSION}/scripts/ipsw-kernel-symbolicate.r2.js
-share/radare2/${R2VERSION}/scripts/licenses.r2.js
-share/radare2/${R2VERSION}/scripts/parseplug.r2.js
-share/radare2/${R2VERSION}/scripts/r2sptrace.py
-share/radare2/${R2VERSION}/scripts/tags.r2.js
-share/radare2/${R2VERSION}/scripts/unzip.r2.js
-share/radare2/${R2VERSION}/scripts/vsmap.r2.js
 share/radare2/${R2VERSION}/syscall/darwin-arm-32.sdb
 share/radare2/${R2VERSION}/syscall/darwin-arm-64.sdb
 share/radare2/${R2VERSION}/syscall/darwin-x86-32.sdb
diff --git a/radare2/TODO b/radare2/TODO
deleted file mode 100644
index 2e41c801d3..0000000000
--- a/radare2/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-current problem:
-
-=> Checking file-check results for radare2-5.9.8
-=> Checking for non-existent script interpreters in radare2-5.9.8
-ERROR: [check-interpreter.mk] The interpreter "/usr/bin/env" of "/tmp/wip/radare2/work/.destdir/usr/pkg/share/radare2/5.9.8/scripts/licenses
-.r2.js" is not allowed.
-*** Error code 1
diff --git a/radare2/buildlink3.mk b/radare2/buildlink3.mk
index b93f21995b..bb7a5a661b 100644
--- a/radare2/buildlink3.mk
+++ b/radare2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2024/11/14 22:19:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2026/01/07 08:46:45 wiz Exp $
 
 BUILDLINK_TREE+=	radare2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	radare2
 RADARE2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.radare2+=	radare2>=5.7.8
-BUILDLINK_ABI_DEPENDS.radare2?=	radare2>=5.9.6nb1
+BUILDLINK_ABI_DEPENDS.radare2?=	radare2>=5.9.6nb3
 BUILDLINK_PKGSRCDIR.radare2?=	../../devel/radare2
 
 .include "../../devel/capstone/buildlink3.mk"
diff --git a/radare2/distinfo b/radare2/distinfo
index fb7da24190..96cb7c473f 100644
--- a/radare2/distinfo
+++ b/radare2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2024/11/10 17:58:56 leot Exp $
+$NetBSD: distinfo,v 1.22 2025/03/24 09:55:40 nia Exp $
 
-BLAKE2s (radare2-5.9.8.tar.gz) = 8fdafd8d3fb34a7879a5556644e13c5f82df51c7f6a946f812d6f53b3c9cfd60
-SHA512 (radare2-5.9.8.tar.gz) = d1338bcbd437c7f376a07a9d6870fa56bdab883cc5371ce506bc7f667780e19ce777c2839926d4bedf0578ec9338567b402a678643f36ac84404be55eeadb2da
-Size (radare2-5.9.8.tar.gz) = 12159137 bytes
+BLAKE2s (radare2-5.9.6.tar.gz) = bf441b1a630621209c0d46ed7892fc0052f9a2673f42a356c9c348ac98e504e1
+SHA512 (radare2-5.9.6.tar.gz) = ae7211b560b0949f55d385846df3f477c46596e42d2076ab6cc6314adf77ec595f6f98800fb5d8999b82ec1150b9924e301976a18218858dd5f9399278ac9a59
+Size (radare2-5.9.6.tar.gz) = 11665346 bytes
 BLAKE2s (vector35-arch-arm64-55d73c6bbb94448a5c615933179e73ac618cf876.tar.gz) = fa95147e11a20b404021d618f52f81151aeedb9eeebabd1702eb0f6ed86cf362
 SHA512 (vector35-arch-arm64-55d73c6bbb94448a5c615933179e73ac618cf876.tar.gz) = 433a9e972ee13269a495e94aba335b97892eb2614de1460e055e30d60976989f986ef253b352ba918786d4056e3a4d948a66ea90d25aa5ddf52a276152279c92
 Size (vector35-arch-arm64-55d73c6bbb94448a5c615933179e73ac618cf876.tar.gz) = 1050988 bytes
@@ -11,4 +11,5 @@ SHA512 (vector35-arch-armv7-f270a6cc99644cb8e76055b6fa632b25abd26024.tar.gz) = 4
 Size (vector35-arch-armv7-f270a6cc99644cb8e76055b6fa632b25abd26024.tar.gz) = 255278 bytes
 SHA1 (patch-libr_io_p_shm.mk) = e5778f859039228e5eaa42fe613f57f55d38fd57
 SHA1 (patch-shlr-sdb-src-Makefile) = 414260d6010873f04ca8e614438fd674af0543d2
+SHA1 (patch-shlr_sdb_include_sdb_cwisstable.h) = a001a44e1c91da7db973628844c64e6801f27510
 SHA1 (patch-sys_ios-sdk.sh) = 3f50b49e75dea1ac02f6d2ce8c556c77276e51d6
diff --git a/radare2/patches/patch-shlr_sdb_include_sdb_cwisstable.h b/radare2/patches/patch-shlr_sdb_include_sdb_cwisstable.h
new file mode 100644
index 0000000000..6657204a6b
--- /dev/null
+++ b/radare2/patches/patch-shlr_sdb_include_sdb_cwisstable.h
@@ -0,0 +1,25 @@
+$NetBSD: patch-shlr_sdb_include_sdb_cwisstable.h,v 1.1 2025/03/24 09:55:40 nia Exp $
+
+Use built-in bswap64 on NetBSD.
+
+--- shlr/sdb/include/sdb/cwisstable.h.orig	2025-03-24 09:42:08.245685371 +0000
++++ shlr/sdb/include/sdb/cwisstable.h
+@@ -41,6 +41,9 @@
+ #if !CWISS_IS_MACPPC
+ #include <stdalign.h>
+ #endif
++#ifdef __NetBSD__
++#include <sys/types.h>
++#endif
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdint.h>
+@@ -890,7 +893,7 @@ typedef uint64_t CWISS_Group;
+ 
+ #if CWISS_HAVE_CLANG_BUILTIN(__builtin_bswap64)
+ # define bswap64 __builtin_bswap64
+-#else
++#elif !defined(__NetBSD__)
+ static inline uint64_t bswap64(uint64_t v) {
+ 	return ((v & ((uint64_t)0xff << (7 * 8))) >> (7 * 8)) |
+ 		((v & ((uint64_t)0xff << (6 * 8))) >> (5 * 8)) |
Prev by Date: radare2: Bump version to 6.0.8
Next by Date: radare2: file no longer present
Previous by Thread: radare2: Bump version to 6.0.8
Next by Thread: radare2: file no longer present
Indexes:
Home | Main Index | Thread Index | Old Index