math/kalker: Update to 2.2.0

7 files changed, 97 insertions, 91 deletions

diff --git a/math/kalker/Makefile b/math/kalker/Makefile
index 1b9b27aa92e2..b4124d89c424 100644
--- a/math/kalker/Makefile
+++ b/math/kalker/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kalker
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.0
+DISTVERSION=	2.2.0
 CATEGORIES=	math
 
 MAINTAINER=	ashish@FreeBSD.org
diff --git a/math/kalker/Makefile.crates b/math/kalker/Makefile.crates
index 9b227df5afc8..2996f93e1e9e 100644
--- a/math/kalker/Makefile.crates
+++ b/math/kalker/Makefile.crates
@@ -13,11 +13,12 @@ CARGO_CRATES=	aho-corasick-0.7.20 \
 		dirs-sys-next-0.1.2 \
 		fs2-0.4.3 \
 		getrandom-0.2.8 \
-		gmp-mpfr-sys-1.5.0 \
+		gmp-mpfr-sys-1.6.2 \
 		hermit-abi-0.1.19 \
 		js-sys-0.3.60 \
 		lazy_static-1.4.0 \
 		libc-0.2.139 \
+		libm-0.2.8 \
 		log-0.4.17 \
 		memchr-2.5.0 \
 		nix-0.19.1 \
@@ -28,7 +29,7 @@ CARGO_CRATES=	aho-corasick-0.7.20 \
 		redox_users-0.4.3 \
 		regex-1.7.1 \
 		regex-syntax-0.6.28 \
-		rug-1.19.0 \
+		rug-1.24.0 \
 		rustyline-7.1.0 \
 		scoped-tls-1.0.1 \
 		scopeguard-1.1.0 \
@@ -57,12 +58,13 @@ CARGO_CRATES=	aho-corasick-0.7.20 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		windows-sys-0.42.0 \
-		windows_aarch64_gnullvm-0.42.1 \
-		windows_aarch64_msvc-0.42.1 \
-		windows_i686_gnu-0.42.1 \
-		windows_i686_msvc-0.42.1 \
-		windows_x86_64_gnu-0.42.1 \
-		windows_x86_64_gnullvm-0.42.1 \
-		windows_x86_64_msvc-0.42.1 \
+		windows-sys-0.52.0 \
+		windows-targets-0.52.4 \
+		windows_aarch64_gnullvm-0.52.4 \
+		windows_aarch64_msvc-0.52.4 \
+		windows_i686_gnu-0.52.4 \
+		windows_i686_msvc-0.52.4 \
+		windows_x86_64_gnu-0.52.4 \
+		windows_x86_64_gnullvm-0.52.4 \
+		windows_x86_64_msvc-0.52.4 \
 		winres-0.1.12
diff --git a/math/kalker/distinfo b/math/kalker/distinfo
index 413bc825904d..80bbd67ceda6 100644
--- a/math/kalker/distinfo
+++ b/math/kalker/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1711314800
+TIMESTAMP = 1712233597
 SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
 SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440
 SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2
@@ -29,8 +29,8 @@ SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1a
 SIZE (rust/crates/fs2-0.4.3.crate) = 13138
 SHA256 (rust/crates/getrandom-0.2.8.crate) = c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31
 SIZE (rust/crates/getrandom-0.2.8.crate) = 30553
-SHA256 (rust/crates/gmp-mpfr-sys-1.5.0.crate) = 751710e4e568a3057987c7dc5bf85aab59b9a306a014a1900e52bbe427bc0cf6
-SIZE (rust/crates/gmp-mpfr-sys-1.5.0.crate) = 5392510
+SHA256 (rust/crates/gmp-mpfr-sys-1.6.2.crate) = 362a6cc3cbe9f41aebe49c03b91aee8fa8fc69d32fb90533f6ed965a882e08e3
+SIZE (rust/crates/gmp-mpfr-sys-1.6.2.crate) = 5553197
 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
 SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47
@@ -39,6 +39,8 @@ SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832a
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
 SHA256 (rust/crates/libc-0.2.139.crate) = 201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79
 SIZE (rust/crates/libc-0.2.139.crate) = 638983
+SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
+SIZE (rust/crates/libm-0.2.8.crate) = 113450
 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
 SIZE (rust/crates/log-0.4.17.crate) = 38028
 SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
@@ -59,8 +61,8 @@ SHA256 (rust/crates/regex-1.7.1.crate) = 48aaa5748ba571fb95cd2c85c09f629215d3a6e
 SIZE (rust/crates/regex-1.7.1.crate) = 239648
 SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848
 SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288
-SHA256 (rust/crates/rug-1.19.0.crate) = 4e9e1fec4bdeb9ccd6231306eb6eb2a99380a1f5021ddd399b1bb69eb2aca308
-SIZE (rust/crates/rug-1.19.0.crate) = 330637
+SHA256 (rust/crates/rug-1.24.0.crate) = 76a82fd85950d103ad075f104d10c77d71640830c6a959a418380be380eaf7cd
+SIZE (rust/crates/rug-1.24.0.crate) = 353283
 SHA256 (rust/crates/rustyline-7.1.0.crate) = 8227301bfc717136f0ecbd3d064ba8199e44497a0bdd46bb01ede4387cfd2cec
 SIZE (rust/crates/rustyline-7.1.0.crate) = 88494
 SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
@@ -117,23 +119,25 @@ SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
-SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
-SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.1.crate) = 8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608
-SIZE (rust/crates/windows_aarch64_gnullvm-0.42.1.crate) = 362795
-SHA256 (rust/crates/windows_aarch64_msvc-0.42.1.crate) = 4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7
-SIZE (rust/crates/windows_aarch64_msvc-0.42.1.crate) = 664655
-SHA256 (rust/crates/windows_i686_gnu-0.42.1.crate) = de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640
-SIZE (rust/crates/windows_i686_gnu-0.42.1.crate) = 733428
-SHA256 (rust/crates/windows_i686_msvc-0.42.1.crate) = bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605
-SIZE (rust/crates/windows_i686_msvc-0.42.1.crate) = 722583
-SHA256 (rust/crates/windows_x86_64_gnu-0.42.1.crate) = c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45
-SIZE (rust/crates/windows_x86_64_gnu-0.42.1.crate) = 697614
-SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.1.crate) = 628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463
-SIZE (rust/crates/windows_x86_64_gnullvm-0.42.1.crate) = 362788
-SHA256 (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd
-SIZE (rust/crates/windows_x86_64_msvc-0.42.1.crate) = 664606
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.52.4.crate) = 7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b
+SIZE (rust/crates/windows-targets-0.52.4.crate) = 6310
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = 433373
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.4.crate) = da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675
+SIZE (rust/crates/windows_aarch64_msvc-0.52.4.crate) = 828055
+SHA256 (rust/crates/windows_i686_gnu-0.52.4.crate) = b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3
+SIZE (rust/crates/windows_i686_gnu-0.52.4.crate) = 875736
+SHA256 (rust/crates/windows_i686_msvc-0.52.4.crate) = 1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02
+SIZE (rust/crates/windows_i686_msvc-0.52.4.crate) = 895530
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03
+SIZE (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 831627
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 433358
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8
+SIZE (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 828019
 SHA256 (rust/crates/winres-0.1.12.crate) = b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c
 SIZE (rust/crates/winres-0.1.12.crate) = 19772
-SHA256 (PaddiM8-kalker-v2.1.0_GH0.tar.gz) = ada68589b916ce535cb49a37370b11c2bc9145e444f6e9036a3d74f301de2189
-SIZE (PaddiM8-kalker-v2.1.0_GH0.tar.gz) = 1332364
+SHA256 (PaddiM8-kalker-v2.2.0_GH0.tar.gz) = 4f34d34e922308e586fd9f7077e1cba126f3e75d269f4859d0472bb565ce1d4d
+SIZE (PaddiM8-kalker-v2.2.0_GH0.tar.gz) = 1333752
diff --git a/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.5.0_build.rs b/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.5.0_build.rs
deleted file mode 100644
index 81b49a421edc..000000000000
--- a/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.5.0_build.rs
+++ /dev/null
@@ -1,47 +0,0 @@
---- cargo-crates/gmp-mpfr-sys-1.5.0/build.rs.orig	2006-07-24 01:21:28 UTC
-+++ cargo-crates/gmp-mpfr-sys-1.5.0/build.rs
-@@ -40,8 +40,8 @@ const MPC_DIR: &str = "mpc-1.3.1-c";
- const GMP_DIR: &str = "gmp-6.2.1-c";
- const MPFR_DIR: &str = "mpfr-4.2.0-c";
- const MPC_DIR: &str = "mpc-1.3.1-c";
--const GMP_VER: (i32, i32, i32) = (6, 2, 1);
--const MPFR_VER: (i32, i32, i32) = (4, 2, 0);
-+const GMP_VER: (i32, i32, i32) = (6, 3, 0);
-+const MPFR_VER: (i32, i32, i32) = (4, 2, 1);
- const MPC_VER: (i32, i32, i32) = (1, 3, 1);
- 
- #[derive(Clone, Copy, PartialEq)]
-@@ -194,7 +194,7 @@ fn check_system_libs(env: &Environment) {
- 
-     let mut cmd = Command::new(&env.c_compiler);
-     cmd.current_dir(&try_dir)
--        .args(["-fPIC", "system_gmp.c", "-lgmp", "-o", "system_gmp.exe"]);
-+        .args(["-fPIC", "-L%%LOCALBASE%%/lib", "-I%%LOCALBASE%%/include", "system_gmp.c", "-lgmp", "-o", "system_gmp.exe"]);
-     execute(cmd);
- 
-     cmd = Command::new(try_dir.join("system_gmp.exe"));
-@@ -218,6 +218,7 @@ fn check_system_libs(env: &Environment) {
-         cmd.current_dir(&try_dir).args([
-             "-fPIC",
-             "system_mpfr.c",
-+            "-L%%LOCALBASE%%/lib", "-I%%LOCALBASE%%/include",
-             "-lmpfr",
-             "-lgmp",
-             "-o",
-@@ -243,6 +244,7 @@ fn check_system_libs(env: &Environment) {
-         cmd = Command::new(&env.c_compiler);
-         cmd.current_dir(&try_dir).args([
-             "-fPIC",
-+            "-L%%LOCALBASE%%/lib", "-I%%LOCALBASE%%/include",
-             "system_mpc.c",
-             "-lmpc",
-             "-lgmp",
-@@ -975,7 +977,7 @@ fn write_link_info(env: &Environment, feature_mpfr: bo
-     println!("cargo:out_dir={out_str}");
-     println!("cargo:lib_dir={lib_str}");
-     println!("cargo:include_dir={include_str}");
--    println!("cargo:rustc-link-search=native={lib_str}");
-+    println!("cargo:rustc-link-search=native={}/lib", "%%LOCALBASE%%");
- 
-     let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
-     if target_env == "musl" && env.use_system_libs {
diff --git a/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.6.2_build.rs b/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.6.2_build.rs
new file mode 100644
index 000000000000..db4a9c9231f1
--- /dev/null
+++ b/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.6.2_build.rs
@@ -0,0 +1,47 @@
+--- cargo-crates/gmp-mpfr-sys-1.6.2/build.rs.orig
++++ cargo-crates/gmp-mpfr-sys-1.6.2/build.rs
+@@ -195,8 +195,15 @@
+     create_file_or_panic(&try_dir.join("system_gmp.c"), SYSTEM_GMP_C);
+ 
+     let mut cmd = Command::new(&env.c_compiler);
+-    cmd.current_dir(&try_dir)
+-        .args(["-fPIC", "system_gmp.c", "-lgmp", "-o", "system_gmp.exe"]);
++    cmd.current_dir(&try_dir).args([
++        "-fPIC",
++        "-L%%LOCALBASE%%/lib",
++        "-I%%LOCALBASE%%/include",
++        "system_gmp.c",
++        "-lgmp",
++        "-o",
++        "system_gmp.exe",
++    ]);
+     execute(cmd);
+ 
+     cmd = Command::new(try_dir.join("system_gmp.exe"));
+@@ -220,6 +227,8 @@
+         cmd.current_dir(&try_dir).args([
+             "-fPIC",
+             "system_mpfr.c",
++            "-L%%LOCALBASE%%/lib",
++            "-I%%LOCALBASE%%/include",
+             "-lmpfr",
+             "-lgmp",
+             "-o",
+@@ -245,6 +254,8 @@
+         cmd = Command::new(&env.c_compiler);
+         cmd.current_dir(&try_dir).args([
+             "-fPIC",
++            "-L%%LOCALBASE%%/lib",
++            "-I%%LOCALBASE%%/include",
+             "system_mpc.c",
+             "-lmpc",
+             "-lgmp",
+@@ -989,7 +1000,7 @@
+     println!("cargo:out_dir={out_str}");
+     println!("cargo:lib_dir={lib_str}");
+     println!("cargo:include_dir={include_str}");
+-    println!("cargo:rustc-link-search=native={lib_str}");
++    println!("cargo:rustc-link-search=native={}/lib", "%%LOCALBASE%%");
+ 
+     let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
+     if target_env == "musl" && env.use_system_libs {
diff --git a/math/kalker/files/patch-cargo-crates_rug-1.19.0_Cargo.toml b/math/kalker/files/patch-cargo-crates_rug-1.19.0_Cargo.toml
deleted file mode 100644
index 5bf3faf27a88..000000000000
--- a/math/kalker/files/patch-cargo-crates_rug-1.19.0_Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
---- cargo-crates/rug-1.19.0/Cargo.toml.orig	1970-01-01 00:00:01 UTC
-+++ cargo-crates/rug-1.19.0/Cargo.toml
-@@ -43,6 +43,7 @@ version = "1.1"
- version = "~1.5"
- optional = true
- default-features = false
-+features = [ "use-system-libs" ]
- 
- [dependencies.libc]
- version = "0.2.44"
diff --git a/math/kalker/files/patch-cargo-crates_rug-1.24.0_Cargo.toml b/math/kalker/files/patch-cargo-crates_rug-1.24.0_Cargo.toml
new file mode 100644
index 000000000000..4bc48471d437
--- /dev/null
+++ b/math/kalker/files/patch-cargo-crates_rug-1.24.0_Cargo.toml
@@ -0,0 +1,10 @@
+--- cargo-crates/rug-1.24.0/Cargo.toml.orig
++++ cargo-crates/rug-1.24.0/Cargo.toml
+@@ -43,6 +43,7 @@
+ version = "~1.6"
+ optional = true
+ default-features = false
++features = [ "use-system-libs" ]
+ 
+ [dependencies.libc]
+ version = "0.2.44"