CVS commit: pkgsrc/misc/projectable

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Jul 22 11:30:40 UTC 2025

Modified Files:
        pkgsrc/misc/projectable: Makefile cargo-depends.mk distinfo
        pkgsrc/misc/projectable/patches:
            patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs
Added Files:
        pkgsrc/misc/projectable/patches:
            patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf
            patch-.._vendor_tui-textarea-0.2.0_Cargo.toml
            patch-.._vendor_tui-textarea-0.2.0_src_widget.rs patch-Cargo.lock
            patch-Cargo.toml

Log Message:
misc/projectable: make this build on NetBSD/macppc.

Two issues fixed:
 * More of the openssl-src patch pulled over from rust itself;
   adding use of -latomic on ilp32 NetBSD targets.
 * Convert tui-textarea to use portable-atomics, since
   some targets do not have native AtomicU64 support.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/projectable/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/projectable/cargo-depends.mk \
    pkgsrc/misc/projectable/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf \
    pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_Cargo.toml \
    pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_src_widget.rs \
    pkgsrc/misc/projectable/patches/patch-Cargo.lock \
    pkgsrc/misc/projectable/patches/patch-Cargo.toml
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs

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

Modified files:

Index: pkgsrc/misc/projectable/Makefile
diff -u pkgsrc/misc/projectable/Makefile:1.2 pkgsrc/misc/projectable/Makefile:1.3
--- pkgsrc/misc/projectable/Makefile:1.2        Tue Oct 24 22:10:03 2023
+++ pkgsrc/misc/projectable/Makefile    Tue Jul 22 11:30:40 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/10/24 22:10:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2025/07/22 11:30:40 he Exp $
 
 DISTNAME=      projectable-1.3.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dzfrias/}
 
@@ -20,4 +20,5 @@ RUSTFLAGS+=   -C link-arg=${COMPILER_RPATH
 
 .include "../../lang/rust/cargo.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/atomic64.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/projectable/cargo-depends.mk
diff -u pkgsrc/misc/projectable/cargo-depends.mk:1.1 pkgsrc/misc/projectable/cargo-depends.mk:1.2
--- pkgsrc/misc/projectable/cargo-depends.mk:1.1        Mon Jul 10 19:51:05 2023
+++ pkgsrc/misc/projectable/cargo-depends.mk    Tue Jul 22 11:30:40 2025
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.1 2023/07/10 19:51:05 pin Exp $
+# $NetBSD: cargo-depends.mk,v 1.2 2025/07/22 11:30:40 he Exp $
 
 CARGO_CRATE_DEPENDS+=  addr2line-0.19.0
 CARGO_CRATE_DEPENDS+=  adler-1.0.2
@@ -152,6 +152,7 @@ CARGO_CRATE_DEPENDS+=       pkg-config-0.3.26
 CARGO_CRATE_DEPENDS+=  plotters-0.3.5
 CARGO_CRATE_DEPENDS+=  plotters-backend-0.3.5
 CARGO_CRATE_DEPENDS+=  plotters-svg-0.3.5
+CARGO_CRATE_DEPENDS+=  portable-atomic-1.11.1
 CARGO_CRATE_DEPENDS+=  predicates-2.1.5
 CARGO_CRATE_DEPENDS+=  predicates-core-1.0.5
 CARGO_CRATE_DEPENDS+=  predicates-tree-1.0.7
Index: pkgsrc/misc/projectable/distinfo
diff -u pkgsrc/misc/projectable/distinfo:1.1 pkgsrc/misc/projectable/distinfo:1.2
--- pkgsrc/misc/projectable/distinfo:1.1        Mon Jul 10 19:51:05 2023
+++ pkgsrc/misc/projectable/distinfo    Tue Jul 22 11:30:40 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2023/07/10 19:51:05 pin Exp $
+$NetBSD: distinfo,v 1.2 2025/07/22 11:30:40 he Exp $
 
 BLAKE2s (addr2line-0.19.0.crate) = c0485ba9fdf036b53d78b606222e7ce9d647d27f582d7df92948b8dbd686a8bb
 SHA512 (addr2line-0.19.0.crate) = 18da72e412bb89028e2ccb838192330535e45300f6fd8edc7d1d64397792a3db12418aa24a3312730c5414e2a1b1d65e6b9d5691ba234c9142b5d885523a5e94
@@ -456,6 +456,9 @@ Size (plotters-backend-0.3.5.crate) = 13
 BLAKE2s (plotters-svg-0.3.5.crate) = e2cbad4d4eb14740d2ab2cb475757f5a00741c8a0d34fd499d6c9e8678173922
 SHA512 (plotters-svg-0.3.5.crate) = 91c4955f62dbb8d80e01e5cbdc7ad5f1869be6025de1d2baeeb9198fb108ad8f01916cdc0728b7123ed9217abe92cdd8ad30116dd454312c8f63bf9cec98644a
 Size (plotters-svg-0.3.5.crate) = 6948 bytes
+BLAKE2s (portable-atomic-1.11.1.crate) = 3758e723fa680cf28dc6cc870b7f521f37f8a3abf788e07b7178f9c875a53d29
+SHA512 (portable-atomic-1.11.1.crate) = 4c037ae0b4aef43077bdbf803389bc078d963f20d023e2e1d339a54f67fa9b27c174e7c1b6eca8881ecf301e30c431632d2c0dcedfb5b19552892fac0f81e2e1
+Size (portable-atomic-1.11.1.crate) = 185506 bytes
 BLAKE2s (predicates-2.1.5.crate) = ab4853e824938707842d1f03db9a52689e5b08ae2fc22df3b3e84378cc1e378d
 SHA512 (predicates-2.1.5.crate) = d4b555d7f57ccec5788a957d4a3e130f5549a9333a47654baaef098bb284c64bd5c662677ba7e659b4563b3d0146914f1235e0caa2274af8787d9777141f4dd4
 Size (predicates-2.1.5.crate) = 24165 bytes
@@ -762,4 +765,9 @@ Size (winnow-0.3.6.crate) = 176641 bytes
 BLAKE2s (wyz-0.5.1.crate) = dc39cd7a740b1e5bc6799cf3f502684350913a83f457249d2c868ede49ad0849
 SHA512 (wyz-0.5.1.crate) = 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9
 Size (wyz-0.5.1.crate) = 18790 bytes
-SHA1 (patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs) = 614576904a7c4d88f814130badc24e1dd1865789
+SHA1 (patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf) = 1e73f48187cf51da4c642a4deabdeec74aac11a3
+SHA1 (patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs) = e13c3c75165ef3730967bdd396b079ceea716c14
+SHA1 (patch-.._vendor_tui-textarea-0.2.0_Cargo.toml) = 15e1308ab50e3699fb230e5aeeaf41bb4bbe2085
+SHA1 (patch-.._vendor_tui-textarea-0.2.0_src_widget.rs) = eb0579e4b19c2853018101ef7636c17ac04e3780
+SHA1 (patch-Cargo.lock) = 66f652d1c94c1e46c546145c61c79991b52ada26
+SHA1 (patch-Cargo.toml) = d9ec3b9ae33e9ce6039ac824d296ccbb35cbb7c8

Index: pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs
diff -u pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs:1.1 pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs:1.2
--- pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs:1.1  Mon Jul 10 19:51:06 2023
+++ pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs      Tue Jul 22 11:30:40 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs,v 1.1 2023/07/10 19:51:06 pin Exp $
+$NetBSD: patch-.._vendor_openssl-src_111.26.0+1.1.1u_src_lib.rs,v 1.2 2025/07/22 11:30:40 he Exp $
 
 Provide defaults for the various NetBSD targets.
 
@@ -17,13 +17,13 @@ Provide defaults for the various NetBSD 
              "armv5te-unknown-linux-gnueabi" => "linux-armv4",
              "armv5te-unknown-linux-musleabi" => "linux-armv4",
              "armv6-unknown-freebsd" => "BSD-generic32",
-+            "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
++            "armv6-unknown-netbsd-eabihf" => "NetBSD-generic32",
              "armv7-unknown-freebsd" => "BSD-generic32",
              "armv7-unknown-linux-gnueabi" => "linux-armv4",
              "armv7-unknown-linux-musleabi" => "linux-armv4",
              "armv7-unknown-linux-gnueabihf" => "linux-armv4",
              "armv7-unknown-linux-musleabihf" => "linux-armv4",
-+            "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
++            "armv7-unknown-netbsd-eabihf" => "NetBSD-generic32",
              "asmjs-unknown-emscripten" => "gcc",
              "i586-unknown-linux-gnu" => "linux-elf",
              "i586-unknown-linux-musl" => "linux-elf",
@@ -36,7 +36,7 @@ Provide defaults for the various NetBSD 
              "loongarch64-unknown-linux-gnu" => "linux64-loongarch64",
              "mips-unknown-linux-gnu" => "linux-mips32",
              "mips-unknown-linux-musl" => "linux-mips32",
-@@ -273,18 +279,21 @@ impl Build {
+@@ -273,18 +279,22 @@ impl Build {
              "mips64el-unknown-linux-muslabi64" => "linux64-mips64",
              "mipsel-unknown-linux-gnu" => "linux-mips32",
              "mipsel-unknown-linux-musl" => "linux-mips32",
@@ -45,6 +45,7 @@ Provide defaults for the various NetBSD 
              "powerpc-unknown-linux-gnu" => "linux-ppc",
              "powerpc-unknown-linux-gnuspe" => "linux-ppc",
              "powerpc64-unknown-freebsd" => "BSD-generic64",
++          "powerpc-unknown-netbsd" => "NetBSD-generic32",
              "powerpc64-unknown-linux-gnu" => "linux-ppc64",
              "powerpc64-unknown-linux-musl" => "linux-ppc64",
 +            "powerpc64-unknown-freebsd" => "BSD-generic64",

Added files:

Index: pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf
diff -u /dev/null pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf:1.1
--- /dev/null   Tue Jul 22 11:30:40 2025
+++ pkgsrc/misc/projectable/patches/patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf     Tue Jul 22 11:30:40 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._vendor_openssl-src_111.26.0+1.1.1u_openssl_Configurations_10-main.conf,v 1.1 2025/07/22 11:30:40 he Exp $
+
+--- ../vendor/openssl-src-111.26.0+1.1.1u/openssl/Configurations/10-main.conf.orig     2025-07-21 22:14:17.343636469 +0000
++++ ../vendor/openssl-src-111.26.0+1.1.1u/openssl/Configurations/10-main.conf
+@@ -950,6 +950,10 @@ my %targets = (
+         shared_cflag     => "-fPIC",
+         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
+     },
++    "NetBSD-generic32" => {
++      inherit_from    => [ "BSD-generic32" ],
++      ex_libs         => add(threads("-latomic")),
++    },
+     "BSD-generic64" => {
+         inherit_from     => [ "BSD-generic32" ],
+         bn_ops           => "SIXTY_FOUR_BIT_LONG",
Index: pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_Cargo.toml
diff -u /dev/null pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_Cargo.toml:1.1
--- /dev/null   Tue Jul 22 11:30:40 2025
+++ pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_Cargo.toml       Tue Jul 22 11:30:40 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-.._vendor_tui-textarea-0.2.0_Cargo.toml,v 1.1 2025/07/22 11:30:40 he Exp $
+
+Add use of portable-atomic.
+
+--- ../vendor/tui-textarea-0.2.0/Cargo.toml.orig       2025-07-22 10:43:45.353315368 +0000
++++ ../vendor/tui-textarea-0.2.0/Cargo.toml
+@@ -78,6 +78,9 @@ required-features = ["crossterm"]
+ name = "variable"
+ required-features = ["crossterm"]
+ 
++[dependencies]
++portable-atomic = "1.11.1"
++
+ [dependencies.arbitrary]
+ version = "1"
+ features = ["derive"]
Index: pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_src_widget.rs
diff -u /dev/null pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_src_widget.rs:1.1
--- /dev/null   Tue Jul 22 11:30:40 2025
+++ pkgsrc/misc/projectable/patches/patch-.._vendor_tui-textarea-0.2.0_src_widget.rs    Tue Jul 22 11:30:40 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-.._vendor_tui-textarea-0.2.0_src_widget.rs,v 1.1 2025/07/22 11:30:40 he Exp $
+
+Use portable_atomic.
+
+--- ../vendor/tui-textarea-0.2.0/src/widget.rs.orig    2025-07-22 09:29:29.756730488 +0000
++++ ../vendor/tui-textarea-0.2.0/src/widget.rs
+@@ -1,7 +1,7 @@
+ use crate::textarea::TextArea;
+ use crate::util::num_digits;
+ use std::cmp;
+-use std::sync::atomic::{AtomicU64, Ordering};
++use portable_atomic::{AtomicU64, Ordering};
+ use tui::buffer::Buffer;
+ use tui::layout::Rect;
+ use tui::text::Text;
Index: pkgsrc/misc/projectable/patches/patch-Cargo.lock
diff -u /dev/null pkgsrc/misc/projectable/patches/patch-Cargo.lock:1.1
--- /dev/null   Tue Jul 22 11:30:40 2025
+++ pkgsrc/misc/projectable/patches/patch-Cargo.lock    Tue Jul 22 11:30:40 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-Cargo.lock,v 1.1 2025/07/22 11:30:40 he Exp $
+
+Add portable-atomic.
+
+--- Cargo.lock.orig    2025-07-22 06:55:07.614134588 +0000
++++ Cargo.lock
+@@ -1459,6 +1459,12 @@ dependencies = [
+ ]
+ 
+ [[package]]
++name = "portable-atomic"
++version = "1.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index";
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
++
++[[package]]
+ name = "predicates"
+ version = "2.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+@@ -1523,6 +1529,7 @@ dependencies = [
+  "log",
+  "nom",
+  "notify-debouncer-full",
++ "portable-atomic",
+  "rust_search",
+  "scopeguard",
+  "serde",
Index: pkgsrc/misc/projectable/patches/patch-Cargo.toml
diff -u /dev/null pkgsrc/misc/projectable/patches/patch-Cargo.toml:1.1
--- /dev/null   Tue Jul 22 11:30:40 2025
+++ pkgsrc/misc/projectable/patches/patch-Cargo.toml    Tue Jul 22 11:30:40 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-Cargo.toml,v 1.1 2025/07/22 11:30:40 he Exp $
+
+Add use of portable_atomic.
+
+--- Cargo.toml.orig    2025-07-22 05:36:03.499677600 +0000
++++ Cargo.toml
+@@ -47,6 +47,7 @@ itertools = "0.10.5"
+ log = { version = "0.4.17", features = ["serde"] }
+ nom = "7.1.3"
+ notify-debouncer-full = "0.2.0"
++portable-atomic = "1.11.1"
+ rust_search = "2.1.0"
+ scopeguard = "1.1.0"
+ serde = { version = "1.0.158", features = ["derive"] }