diff --git a/math/kalker/Makefile b/math/kalker/Makefile index 5e93c7b7b833..1b9b27aa92e2 100644 --- a/math/kalker/Makefile +++ b/math/kalker/Makefile @@ -1,27 +1,27 @@ PORTNAME= kalker DISTVERSIONPREFIX= v -DISTVERSION= 2.0.4 -PORTREVISION= 6 +DISTVERSION= 2.1.0 CATEGORIES= math MAINTAINER= ashish@FreeBSD.org COMMENT= Scientific calculator that supports math-like syntax WWW= https://kalker.xyz/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgmp.so:math/gmp \ - libmpc.so:math/mpc + libmpc.so:math/mpc \ + libmpfr.so:math/mpfr USES= cargo USE_GITHUB= yes GH_ACCOUNT= PaddiM8 CARGO_CARGOTOML= ${WRKSRC}/cli/Cargo.toml CARGO_INSTALL_PATH= ./cli PLIST_FILES= bin/kalker post-patch: ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC_crate_gmp-mpfr-sys}/build.rs .include diff --git a/math/kalker/distinfo b/math/kalker/distinfo index 1e1b4be9a156..413bc825904d 100644 --- a/math/kalker/distinfo +++ b/math/kalker/distinfo @@ -1,139 +1,139 @@ -TIMESTAMP = 1689882974 +TIMESTAMP = 1711314800 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 SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 SIZE (rust/crates/atty-0.2.14.crate) = 5470 SHA256 (rust/crates/az-1.2.1.crate) = 7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973 SIZE (rust/crates/az-1.2.1.crate) = 27842 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a SIZE (rust/crates/bitflags-1.3.2.crate) = 23021 SHA256 (rust/crates/bumpalo-3.12.0.crate) = 0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535 SIZE (rust/crates/bumpalo-3.12.0.crate) = 81604 SHA256 (rust/crates/cc-1.0.78.crate) = a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d SIZE (rust/crates/cc-1.0.78.crate) = 61375 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 SHA256 (rust/crates/console_error_panic_hook-0.1.7.crate) = a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc SIZE (rust/crates/console_error_panic_hook-0.1.7.crate) = 507196 SHA256 (rust/crates/dirs-3.0.2.crate) = 30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309 SIZE (rust/crates/dirs-3.0.2.crate) = 12184 SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1 SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689 SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6 SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597 SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681 SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213 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/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 SIZE (rust/crates/js-sys-0.3.60.crate) = 79257 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 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/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e SIZE (rust/crates/log-0.4.17.crate) = 38028 SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d SIZE (rust/crates/memchr-2.5.0.crate) = 65812 SHA256 (rust/crates/nix-0.19.1.crate) = b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2 SIZE (rust/crates/nix-0.19.1.crate) = 213462 SHA256 (rust/crates/once_cell-1.17.0.crate) = 6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66 SIZE (rust/crates/once_cell-1.17.0.crate) = 32736 SHA256 (rust/crates/proc-macro2-1.0.50.crate) = 6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2 SIZE (rust/crates/proc-macro2-1.0.50.crate) = 41667 SHA256 (rust/crates/quote-1.0.23.crate) = 8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b SIZE (rust/crates/quote-1.0.23.crate) = 28058 SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012 SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b SIZE (rust/crates/redox_users-0.4.3.crate) = 15353 SHA256 (rust/crates/regex-1.7.1.crate) = 48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733 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/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 SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202 SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470 SHA256 (rust/crates/seahorse-1.1.2.crate) = 8bee1fe454786f1d236a07cb3d3adcbaca96e9ba42d23bc58de059937bb059bd SIZE (rust/crates/seahorse-1.1.2.crate) = 13536 SHA256 (rust/crates/serde-1.0.152.crate) = bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb SIZE (rust/crates/serde-1.0.152.crate) = 77091 SHA256 (rust/crates/syn-1.0.107.crate) = 1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5 SIZE (rust/crates/syn-1.0.107.crate) = 237539 SHA256 (rust/crates/test-case-1.2.3.crate) = e9e5f048404b43e8ae66dce036163515b6057024cf58c6377be501f250bd3c6a SIZE (rust/crates/test-case-1.2.3.crate) = 14323 SHA256 (rust/crates/thiserror-1.0.38.crate) = 6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0 SIZE (rust/crates/thiserror-1.0.38.crate) = 18947 SHA256 (rust/crates/thiserror-impl-1.0.38.crate) = 1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f SIZE (rust/crates/thiserror-impl-1.0.38.crate) = 15429 SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234 SIZE (rust/crates/toml-0.5.11.crate) = 54910 SHA256 (rust/crates/unicode-ident-1.0.6.crate) = 84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc SIZE (rust/crates/unicode-ident-1.0.6.crate) = 42158 SHA256 (rust/crates/unicode-segmentation-1.10.0.crate) = 0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a SIZE (rust/crates/unicode-segmentation-1.10.0.crate) = 93893 SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968 SHA256 (rust/crates/utf8parse-0.2.0.crate) = 936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372 SIZE (rust/crates/utf8parse-0.2.0.crate) = 13392 SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f SIZE (rust/crates/version_check-0.9.4.crate) = 14895 SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423 SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131 SHA256 (rust/crates/wasm-bindgen-0.2.83.crate) = eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268 SIZE (rust/crates/wasm-bindgen-0.2.83.crate) = 169618 SHA256 (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142 SIZE (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 25620 SHA256 (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d SIZE (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 15216 SHA256 (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810 SIZE (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 12075 SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530 SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194 SHA256 (rust/crates/wasm-bindgen-test-0.3.33.crate) = 09d2fff962180c3fadf677438054b1db62bee4aa32af26a45388af07d1287e1d SIZE (rust/crates/wasm-bindgen-test-0.3.33.crate) = 15718 SHA256 (rust/crates/wasm-bindgen-test-macro-0.3.33.crate) = 4683da3dfc016f704c9f82cf401520c4f1cb3ee440f7f52b3d6ac29506a49ca7 SIZE (rust/crates/wasm-bindgen-test-macro-0.3.33.crate) = 6331 SHA256 (rust/crates/web-sys-0.3.60.crate) = bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f SIZE (rust/crates/web-sys-0.3.60.crate) = 700485 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 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/winres-0.1.12.crate) = b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c SIZE (rust/crates/winres-0.1.12.crate) = 19772 -SHA256 (PaddiM8-kalker-v2.0.4_GH0.tar.gz) = f9ea40521f8e435adfc5db7f811c63bab7276407c6c0a95a40673f777f57c3bd -SIZE (PaddiM8-kalker-v2.0.4_GH0.tar.gz) = 1331308 +SHA256 (PaddiM8-kalker-v2.1.0_GH0.tar.gz) = ada68589b916ce535cb49a37370b11c2bc9145e444f6e9036a3d74f301de2189 +SIZE (PaddiM8-kalker-v2.1.0_GH0.tar.gz) = 1332364 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 index f9c1c4472789..81b49a421edc 100644 --- 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 @@ -1,45 +1,47 @@ --- 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 -@@ -42,7 +42,7 @@ const MPFR_DIR: &str = "mpfr-4.2.0-c"; +@@ -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 MPC_VER: (i32, i32, i32) = (1, 3, 1); -+const MPC_VER: (i32, i32, i32) = (1, 2, 1); +-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)] - enum Target { @@ -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 {