From nobody Thu Nov 10 14:09:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N7NxR5WCfz4dZpL; Thu, 10 Nov 2022 14:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N7NxR4fJgz4Gbt; Thu, 10 Nov 2022 14:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668089355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7EsHOQwfeT05qtpK+MJyG2vAXIVpIXIKOIv4k8FHPug=; b=lC/6Hxv/nzhwoS1+yP3M1c136T6FFBlLEfZlU+mVsSNMH5jNLe4X6xdtulH89eU+ANUNoW X8mk3UozWx1bn6RecDNgvzmcBVLRneGcU3K8PlnGl5NQ885fTZ96W6Tte8Tq6vGYGNnBwu DPB755ElWjeBPgn6LoeWvMlPz6L6cp3PoWggxapHwWEgFETLzlzomPmOpx8KBAorBB8w60 aDPAAsXw+V34VeQ8hSzVWRmAzXJA3H88JjKVF7q12G7hal3R0I0+gbE2o+ac63yoN2fvz5 OqsDO1SqEjxmxAZnr26t9a4f4DXkNjPk8nXw61519UVeQNm7ZXJxPrR2ncXyxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668089355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7EsHOQwfeT05qtpK+MJyG2vAXIVpIXIKOIv4k8FHPug=; b=gvSvgWL7eQzSM8i2R3SqyvrkLJO1m9bRz3drk4lbko6ysfU9h7FIMBROT1fpvQjA+mDS+3 1cdCD7lBXjdR+uvmTZKcvnKlZyBuJTbVYRRcEvBNWqcFelLKErgSi+1fs+g0VIFe4G2JQQ 4fl+JCOfaB3Pp6yi0M+oxpD7zWsBHckIIkTAaovQUWHes7e4mqUiq8Wm6Pa37mYAXP+bc1 C/F3h+mdDuH49T+uUbPjFKQRJdfJk7BaGAMGUtsTHg3GgND0KLjZPGyHpImfUu+gOhHTWN zDPBhEiHdAbgV/TuNafYQUMax/zGtRb8xYUvvRz2xHBbL5Azv8NyX65nFwqiYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668089355; a=rsa-sha256; cv=none; b=Fv+80AwwW3fLeLsnXNYDTShPn4NaNioJPrFyJh3nvwlSas+KSJwYVNLGPWZvt7tap/hjJ2 wl4eEsUN7+NbinEHP1fteyWabi+BbtNdUaYbXBlMfpYetHrM6L1qx9VsqUOurLvxaMDouY 2jVozJHyt6eWTIK/IH0FLblQWZT+7Hs4aHmQgtZjqxNreb84d4rPhRZGbhfncXcda6iSDe utEDMGQyl2HGmxPQZ47Vr8bZWxvFCNZmEexCNdLkRlV2xD6F6qikppp22UHa5gM2sI6MtQ DO/4e8Xd8+Ct0VswVNugMw63PvjOvwmxqQpYBgjXEf7Y8JzA/ruLYPLrCHS27Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N7NxR3gdKz13nl; Thu, 10 Nov 2022 14:09:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AAE9FJj060576; Thu, 10 Nov 2022 14:09:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AAE9FpS060575; Thu, 10 Nov 2022 14:09:15 GMT (envelope-from git) Date: Thu, 10 Nov 2022 14:09:15 GMT Message-Id: <202211101409.2AAE9FpS060575@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: 4a1f66bd4f87 - main - math/kalker: Update to 2.0.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a1f66bd4f87140458c9b33f7eb7e71de6077a38 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a1f66bd4f87140458c9b33f7eb7e71de6077a38 commit 4a1f66bd4f87140458c9b33f7eb7e71de6077a38 Author: Ashish SHUKLA AuthorDate: 2022-11-10 13:42:27 +0000 Commit: Ashish SHUKLA CommitDate: 2022-11-10 14:08:24 +0000 math/kalker: Update to 2.0.1 --- math/kalker/Makefile | 11 +++++----- math/kalker/distinfo | 18 ++++++++-------- ...atch-cargo-crates_gmp-mpfr-sys-1.4.10_build.rs} | 24 +++++++++++----------- ...ml => patch-cargo-crates_rug-1.17.0_Cargo.toml} | 6 +++--- math/kalker/files/patch-powerpc | 6 +++--- 5 files changed, 32 insertions(+), 33 deletions(-) diff --git a/math/kalker/Makefile b/math/kalker/Makefile index 2c464ae25542..9aea207539b8 100644 --- a/math/kalker/Makefile +++ b/math/kalker/Makefile @@ -1,7 +1,6 @@ PORTNAME= kalker DISTVERSIONPREFIX= v -DISTVERSION= 2.0.0 -PORTREVISION= 3 +DISTVERSION= 2.0.1 CATEGORIES= math MAINTAINER= ashish@FreeBSD.org @@ -20,7 +19,7 @@ GH_ACCOUNT= PaddiM8 CARGO_CRATES= aho-corasick-0.7.15 \ ansi_term-0.12.1 \ atty-0.2.14 \ - az-1.0.0 \ + az-1.2.0 \ bitflags-1.2.1 \ bumpalo-3.4.0 \ cc-1.0.66 \ @@ -34,6 +33,7 @@ CARGO_CRATES= aho-corasick-0.7.15 \ fs2-0.4.3 \ getrandom-0.1.15 \ getrandom-0.2.3 \ + gmp-mpfr-sys-1.4.10 \ hermit-abi-0.1.18 \ js-sys-0.3.46 \ lazy_static-1.4.0 \ @@ -49,7 +49,7 @@ CARGO_CRATES= aho-corasick-0.7.15 \ redox_users-0.4.0 \ regex-1.4.2 \ regex-syntax-0.6.21 \ - rug-1.11.0 \ + rug-1.17.0 \ rustyline-7.1.0 \ scoped-tls-1.0.0 \ scopeguard-1.1.0 \ @@ -78,8 +78,7 @@ CARGO_CRATES= aho-corasick-0.7.15 \ winapi-0.3.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ - winres-0.1.11 \ - gmp-mpfr-sys@git+https://gitlab.com/tspiteri/gmp-mpfr-sys.git\#21966f4bfb56c87d407eb14c72e92ef4e55856aa + winres-0.1.11 CARGO_CARGOTOML= ${WRKSRC}/cli/Cargo.toml CARGO_INSTALL_PATH= ./cli PLIST_FILES= bin/kalker diff --git a/math/kalker/distinfo b/math/kalker/distinfo index 4542a26fa40c..c2ff6552038a 100644 --- a/math/kalker/distinfo +++ b/math/kalker/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1654247314 +TIMESTAMP = 1668087094 SHA256 (rust/crates/aho-corasick-0.7.15.crate) = 7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5 SIZE (rust/crates/aho-corasick-0.7.15.crate) = 113071 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.0.0.crate) = e9bcd47d94aa4eb8c076b50fc61a75020789394ffb9bd74a180b3379130f6569 -SIZE (rust/crates/az-1.0.0.crate) = 23069 +SHA256 (rust/crates/az-1.2.0.crate) = f771a5d1f5503f7f4279a30f3643d3421ba149848b89ecaaec0ea2acf04a5ac4 +SIZE (rust/crates/az-1.2.0.crate) = 28045 SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693 SIZE (rust/crates/bitflags-1.2.1.crate) = 16745 SHA256 (rust/crates/bumpalo-3.4.0.crate) = 2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820 @@ -33,6 +33,8 @@ SHA256 (rust/crates/getrandom-0.1.15.crate) = fc587bc0ec293155d5bfa6b9891ec18a1e SIZE (rust/crates/getrandom-0.1.15.crate) = 24786 SHA256 (rust/crates/getrandom-0.2.3.crate) = 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753 SIZE (rust/crates/getrandom-0.2.3.crate) = 26261 +SHA256 (rust/crates/gmp-mpfr-sys-1.4.10.crate) = ea3f42dadb6c75f122e9aa87e757ef11d4282f664c9f2e6476a9c2c8970f9d19 +SIZE (rust/crates/gmp-mpfr-sys-1.4.10.crate) = 5411589 SHA256 (rust/crates/hermit-abi-0.1.18.crate) = 322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c SIZE (rust/crates/hermit-abi-0.1.18.crate) = 9936 SHA256 (rust/crates/js-sys-0.3.46.crate) = cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175 @@ -63,8 +65,8 @@ SHA256 (rust/crates/regex-1.4.2.crate) = 38cf2c13ed4745de91a5eb834e11c00bcc3709e SIZE (rust/crates/regex-1.4.2.crate) = 236931 SHA256 (rust/crates/regex-syntax-0.6.21.crate) = 3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189 SIZE (rust/crates/regex-syntax-0.6.21.crate) = 293572 -SHA256 (rust/crates/rug-1.11.0.crate) = e538d00da450a8e48aac7e6322e67b2dc86ec71a1feeac0e3954c4f07f01bc45 -SIZE (rust/crates/rug-1.11.0.crate) = 254044 +SHA256 (rust/crates/rug-1.17.0.crate) = 203180f444c95eac53586ed04793ecf6454c5d28f9eca8eead815fc19e136c47 +SIZE (rust/crates/rug-1.17.0.crate) = 310660 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.0.crate) = ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2 @@ -123,7 +125,5 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998 SHA256 (rust/crates/winres-0.1.11.crate) = ff4fb510bbfe5b8992ff15f77a2e6fe6cf062878f0eda00c0f44963a807ca5dc SIZE (rust/crates/winres-0.1.11.crate) = 18369 -SHA256 (tspiteri-gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa_GL0.tar.gz) = 2c396680d3f749c2213f2cdc9dd4d9316f394b7076ba32abd5cf0de7090a8b2e -SIZE (tspiteri-gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa_GL0.tar.gz) = 5448468 -SHA256 (PaddiM8-kalker-v2.0.0_GH0.tar.gz) = 092ab13726515125ec3664c15e61fa7b8eec09ad590f0c5ef00df6e33b3b3da7 -SIZE (PaddiM8-kalker-v2.0.0_GH0.tar.gz) = 751313 +SHA256 (PaddiM8-kalker-v2.0.1_GH0.tar.gz) = 9e504b9d0aadac98247dcb6b499d6a5d761eb404c2ea74b1ee02784a1b4aef0c +SIZE (PaddiM8-kalker-v2.0.1_GH0.tar.gz) = 751330 diff --git a/math/kalker/files/patch-.._gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa_build.rs b/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.4.10_build.rs similarity index 63% rename from math/kalker/files/patch-.._gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa_build.rs rename to math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.4.10_build.rs index 5e8c1fbc4a1a..d4dbb7d54440 100644 --- a/math/kalker/files/patch-.._gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa_build.rs +++ b/math/kalker/files/patch-cargo-crates_gmp-mpfr-sys-1.4.10_build.rs @@ -1,23 +1,23 @@ ---- ../gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa/build.rs.orig 2021-10-03 17:55:55 UTC -+++ ../gmp-mpfr-sys-21966f4bfb56c87d407eb14c72e92ef4e55856aa/build.rs -@@ -179,7 +179,7 @@ +--- cargo-crates/gmp-mpfr-sys-1.4.10/build.rs.orig 2022-11-10 13:33:20 UTC ++++ cargo-crates/gmp-mpfr-sys-1.4.10/build.rs +@@ -212,7 +212,7 @@ fn check_system_libs(env: &Environment) { - cmd = Command::new(&env.c_compiler); + 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")); -@@ -202,6 +202,7 @@ - cmd = Command::new(&env.c_compiler); +@@ -236,6 +236,7 @@ fn check_system_libs(env: &Environment) { cmd.current_dir(&try_dir).args(&[ "-fPIC", -+ "-L%%LOCALBASE%%/lib", "-I%%LOCALBASE%%/include", "system_mpfr.c", ++ "-L%%LOCALBASE%%/lib", "-I%%LOCALBASE%%/include", "-lmpfr", "-lgmp", -@@ -228,6 +229,7 @@ + "-o", +@@ -261,6 +262,7 @@ fn check_system_libs(env: &Environment) { cmd = Command::new(&env.c_compiler); cmd.current_dir(&try_dir).args(&[ "-fPIC", @@ -25,12 +25,12 @@ "system_mpc.c", "-lmpc", "-lgmp", -@@ -974,7 +976,7 @@ +@@ -1013,7 +1015,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 maybe_static = if env.use_system_libs { "" } else { "static=" }; - if feature_mpc { - println!("cargo:rustc-link-lib={}mpc", maybe_static); + + 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.11.0_Cargo.toml b/math/kalker/files/patch-cargo-crates_rug-1.17.0_Cargo.toml similarity index 50% rename from math/kalker/files/patch-cargo-crates_rug-1.11.0_Cargo.toml rename to math/kalker/files/patch-cargo-crates_rug-1.17.0_Cargo.toml index edbe82733afa..0aae69e65965 100644 --- a/math/kalker/files/patch-cargo-crates_rug-1.11.0_Cargo.toml +++ b/math/kalker/files/patch-cargo-crates_rug-1.17.0_Cargo.toml @@ -1,6 +1,6 @@ ---- cargo-crates/rug-1.11.0/Cargo.toml.orig 2021-10-03 17:55:55 UTC -+++ cargo-crates/rug-1.11.0/Cargo.toml -@@ -31,6 +31,7 @@ version = "1" +--- cargo-crates/rug-1.17.0/Cargo.toml.orig 2022-11-10 13:39:30 UTC ++++ cargo-crates/rug-1.17.0/Cargo.toml +@@ -42,6 +42,7 @@ version = "1.1" version = "~1.4" optional = true default-features = false diff --git a/math/kalker/files/patch-powerpc b/math/kalker/files/patch-powerpc index 15718f32a5ab..3736ac8fe14e 100644 --- a/math/kalker/files/patch-powerpc +++ b/math/kalker/files/patch-powerpc @@ -1,6 +1,6 @@ ---- cargo-crates/libc-0.2.81/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC +--- cargo-crates/libc-0.2.81/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 1970-01-01 00:00:00 UTC +++ cargo-crates/libc-0.2.81/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -1486,6 +1486,9 @@ cfg_if! { +@@ -1550,6 +1550,9 @@ cfg_if! { } else if #[cfg(target_arch = "powerpc64")] { mod powerpc64; pub use self::powerpc64::*; @@ -10,7 +10,7 @@ } else { // Unknown target_arch } ---- cargo-crates/libc-0.2.81/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC +--- cargo-crates/libc-0.2.81/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2022-11-10 13:40:30 UTC +++ cargo-crates/libc-0.2.81/src/unix/bsd/freebsdlike/freebsd/powerpc.rs @@ -0,0 +1,47 @@ +pub type c_char = u8;