CVS commit: pkgsrc/finance/bitcoin

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jul 17 11:22:59 UTC 2025

Modified Files:
        pkgsrc/finance/bitcoin: Makefile PLIST distinfo options.mk

Log Message:
bitcoin: updated to 29.0

29.0
https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-29.0.md


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/finance/bitcoin/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/finance/bitcoin/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/finance/bitcoin/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/finance/bitcoin/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/finance/bitcoin/Makefile
diff -u pkgsrc/finance/bitcoin/Makefile:1.92 pkgsrc/finance/bitcoin/Makefile:1.93
--- pkgsrc/finance/bitcoin/Makefile:1.92        Thu Jul  3 06:28:31 2025
+++ pkgsrc/finance/bitcoin/Makefile     Thu Jul 17 11:22:59 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2025/07/03 06:28:31 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2025/07/17 11:22:59 adam Exp $
 
-DISTNAME=      bitcoin-28.1
-PKGREVISION=   5
+DISTNAME=      bitcoin-29.0
 CATEGORIES=    finance
 MASTER_SITES=  https://bitcoincore.org/bin/bitcoin-core-${PKGVERSION_NOREV}/
 
@@ -15,15 +14,18 @@ RCD_SCRIPTS=        bitcoind
 USE_CXX_FEATURES+=     c++20 filesystem
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            autoconf automake gmake pkg-config
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --disable-ccache
-CONFIGURE_ARGS+=       --disable-hardening # uses -fPIE which is problemtic
-CONFIGURE_ARGS+=       --with-boost=${BUILDLINK_PREFIX.boost-libs}
+USE_TOOLS+=            pkg-config
+CMAKE_CONFIGURE_ARGS+= -DBUILD_BENCH=ON
+CMAKE_CONFIGURE_ARGS+= -DBUILD_UTIL=ON
 # Tests take a lot of time to compile.
-CONFIGURE_ARGS+=       --disable-tests
-PKGCONFIG_OVERRIDE=    libbitcoinconsensus.pc.in
-TEST_TARGET=           check
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_TX=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_WALLET_TOOL=ON
+CMAKE_CONFIGURE_ARGS+= -DENABLE_HARDENING=OFF # uses -fPIE which is problemtic
+CMAKE_CONFIGURE_ARGS+= -DWITH_BDB=ON
+CMAKE_CONFIGURE_ARGS+= -DWITH_CCACHE=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_ZMQ=ON
+PKGCONFIG_OVERRIDE=    libbitcoinkernel.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -45,11 +47,10 @@ INSTALL_DIRS=       ${BUILD_DIRS} src/secp256k
 
 .include "options.mk"
 
-pre-configure:
-       cd ${WRKSRC} && autoreconf -fiv
-
 .include "../../databases/db4/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=2.0.21
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../net/zeromq/buildlink3.mk"

Index: pkgsrc/finance/bitcoin/PLIST
diff -u pkgsrc/finance/bitcoin/PLIST:1.9 pkgsrc/finance/bitcoin/PLIST:1.10
--- pkgsrc/finance/bitcoin/PLIST:1.9    Fri Feb  7 17:36:10 2025
+++ pkgsrc/finance/bitcoin/PLIST        Thu Jul 17 11:22:59 2025
@@ -1,22 +1,12 @@
-@comment $NetBSD: PLIST,v 1.9 2025/02/07 17:36:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2025/07/17 11:22:59 adam Exp $
 bin/bench_bitcoin
 bin/bitcoin-cli
 ${PLIST.qt}bin/bitcoin-qt
-bin/bitcoin-tx
 bin/bitcoin-util
 bin/bitcoin-wallet
 bin/bitcoind
-include/secp256k1.h
-include/secp256k1_ellswift.h
-include/secp256k1_extrakeys.h
-include/secp256k1_preallocated.h
-include/secp256k1_recovery.h
-include/secp256k1_schnorrsig.h
-lib/libsecp256k1.la
-lib/pkgconfig/libsecp256k1.pc
 man/man1/bitcoin-cli.1
 ${PLIST.qt}man/man1/bitcoin-qt.1
-man/man1/bitcoin-tx.1
 man/man1/bitcoin-util.1
 man/man1/bitcoin-wallet.1
 man/man1/bitcoind.1

Index: pkgsrc/finance/bitcoin/distinfo
diff -u pkgsrc/finance/bitcoin/distinfo:1.22 pkgsrc/finance/bitcoin/distinfo:1.23
--- pkgsrc/finance/bitcoin/distinfo:1.22        Fri Feb  7 17:36:10 2025
+++ pkgsrc/finance/bitcoin/distinfo     Thu Jul 17 11:22:59 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2025/02/07 17:36:10 adam Exp $
+$NetBSD: distinfo,v 1.23 2025/07/17 11:22:59 adam Exp $
 
-BLAKE2s (bitcoin-28.1.tar.gz) = e035d6e6e0e7f11f3fbab0a16c92a3525adf0dae8fecbc08c394178697fb04d0
-SHA512 (bitcoin-28.1.tar.gz) = 9ed01409e11140cdb5c00bbbe17f909bcb3d067e0a4ef335aa18faa1585a43cdcd71d384eec79d613244ed569b096276b1c1ae879dad27410fb098bc456f9b86
-Size (bitcoin-28.1.tar.gz) = 12596371 bytes
+BLAKE2s (bitcoin-29.0.tar.gz) = 2a3d53e72681c64c183f339ad182819a19804e333de5b0aac1e4943ba83d1951
+SHA512 (bitcoin-29.0.tar.gz) = 3f5906a437592c55bfbdcec1b1457fdfbe52e9cf6ddc18e6bc153b526846f842283de88f9bf6aa43c3ac624b041d68ea8fc34090a8590bdabdac5a52650cc7dd
+Size (bitcoin-29.0.tar.gz) = 12935061 bytes
 SHA1 (patch-src_netbase.cpp) = d160078c9a7aedc5b569a89ebf9afa98b0d2022b

Index: pkgsrc/finance/bitcoin/options.mk
diff -u pkgsrc/finance/bitcoin/options.mk:1.3 pkgsrc/finance/bitcoin/options.mk:1.4
--- pkgsrc/finance/bitcoin/options.mk:1.3       Fri Sep 20 16:57:28 2019
+++ pkgsrc/finance/bitcoin/options.mk   Thu Jul 17 11:22:59 2025
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2019/09/20 16:57:28 adam Exp $
+# $NetBSD: options.mk,v 1.4 2025/07/17 11:22:59 adam Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.bitcoin
-PKG_SUPPORTED_OPTIONS+=                qt5 upnp
+PKG_OPTIONS_VAR=       PKG_OPTIONS.bitcoin
+PKG_SUPPORTED_OPTIONS+=        qt5
 # qt5 is off because it doubles the footprint of the package.
 # Please do not enable it by default; instead, create a split
 # package.
@@ -11,19 +11,9 @@ PKG_SUPPORTED_OPTIONS+=              qt5 upnp
 PLIST_VARS+=   qt
 
 .if !empty(PKG_OPTIONS:Mqt5)
-CONFIGURE_ARGS+=       --with-gui=qt5
-CONFIGURE_ARGS+=       --with-qt-bindir=${QTDIR}/bin
+CMAKE_CONFIGURE_ARGS+= -DBUILD_GUI=ON
 PLIST.qt=      yes
 .include "../../converters/qrencode/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --with-gui=no
-.endif
-
-.if !empty(PKG_OPTIONS:Mupnp)
-CONFIGURE_ARGS+=       --with-miniupnpc
-.include "../../net/miniupnpc/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-miniupnpc
 .endif