diff options
Diffstat (limited to 'textproc/difftastic')
| -rw-r--r-- | textproc/difftastic/Makefile | 13 | ||||
| -rw-r--r-- | textproc/difftastic/distinfo | 26 | ||||
| -rw-r--r-- | textproc/difftastic/files/patch-jemalloc | 29 |
3 files changed, 54 insertions, 14 deletions
diff --git a/textproc/difftastic/Makefile b/textproc/difftastic/Makefile index 00535f9b8b96..d00abc69d3a1 100644 --- a/textproc/difftastic/Makefile +++ b/textproc/difftastic/Makefile @@ -1,6 +1,5 @@ PORTNAME= difftastic -DISTVERSION= 0.63.0 -PORTREVISION= 3 +DISTVERSION= 0.64.0 CATEGORIES= textproc MAINTAINER= amdmi3@FreeBSD.org @@ -65,18 +64,15 @@ CARGO_CRATES= ahash-0.8.11 \ is-terminal-0.4.12 \ is_terminal_polyfill-1.70.1 \ itertools-0.10.5 \ - itertools-0.11.0 \ itoa-1.0.10 \ lazy_static-1.4.0 \ libc-0.2.169 \ libm-0.2.8 \ - libmimalloc-sys-0.1.24 \ line-numbers-0.3.0 \ linux-raw-sys-0.4.14 \ lock_api-0.4.11 \ log-0.4.21 \ memchr-2.7.1 \ - mimalloc-0.1.28 \ minimal-lexical-0.2.1 \ mio-1.0.3 \ nom-7.1.3 \ @@ -124,6 +120,8 @@ CARGO_CRATES= ahash-0.8.11 \ termcolor-1.4.1 \ terminal_size-0.4.1 \ termtree-0.4.1 \ + tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7 \ + tikv-jemallocator-0.6.0 \ tree-sitter-0.24.5 \ tree-sitter-bash-0.23.3 \ tree-sitter-c-0.23.4 \ @@ -131,6 +129,8 @@ CARGO_CRATES= ahash-0.8.11 \ tree-sitter-cpp-0.23.4 \ tree-sitter-css-0.23.1 \ tree-sitter-elixir-0.3.4 \ + tree-sitter-erlang-0.13.0 \ + tree-sitter-fsharp-0.1.0 \ tree-sitter-go-0.23.4 \ tree-sitter-haskell-0.23.1 \ tree-sitter-html-0.23.2 \ @@ -144,13 +144,16 @@ CARGO_CRATES= ahash-0.8.11 \ tree-sitter-nix-0.0.2 \ tree-sitter-objc-3.0.2 \ tree-sitter-ocaml-0.23.2 \ + tree-sitter-pascal-0.10.0 \ tree-sitter-php-0.23.11 \ tree-sitter-python-0.23.5 \ tree-sitter-ruby-0.23.1 \ tree-sitter-rust-0.23.2 \ tree-sitter-scala-0.23.3 \ + tree-sitter-swift-0.7.0 \ tree-sitter-toml-ng-0.7.0 \ tree-sitter-typescript-0.23.2 \ + tree-sitter-verilog-1.0.3 \ tree-sitter-xml-0.7.0 \ tree-sitter-yaml-0.7.0 \ tree_magic_mini-3.1.6 \ diff --git a/textproc/difftastic/distinfo b/textproc/difftastic/distinfo index 0e16d74dafab..314bc3aed507 100644 --- a/textproc/difftastic/distinfo +++ b/textproc/difftastic/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1739364639 +TIMESTAMP = 1750086248 SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011 SIZE (rust/crates/ahash-0.8.11.crate) = 43607 SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916 @@ -95,8 +95,6 @@ SHA256 (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7943c866cc5cd64cbc25b2e SIZE (rust/crates/is_terminal_polyfill-1.70.1.crate) = 7492 SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473 SIZE (rust/crates/itertools-0.10.5.crate) = 115354 -SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57 -SIZE (rust/crates/itertools-0.11.0.crate) = 125074 SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c SIZE (rust/crates/itoa-1.0.10.crate) = 10534 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 @@ -105,8 +103,6 @@ SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c SIZE (rust/crates/libc-0.2.169.crate) = 757901 SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058 SIZE (rust/crates/libm-0.2.8.crate) = 113450 -SHA256 (rust/crates/libmimalloc-sys-0.1.24.crate) = 7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69 -SIZE (rust/crates/libmimalloc-sys-0.1.24.crate) = 1119801 SHA256 (rust/crates/line-numbers-0.3.0.crate) = 7b25f5068853805faa3c19f44d0c401446e4eb3f47cc808fa331eec30f0ba35c SIZE (rust/crates/line-numbers-0.3.0.crate) = 5185 SHA256 (rust/crates/linux-raw-sys-0.4.14.crate) = 78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89 @@ -117,8 +113,6 @@ SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b70 SIZE (rust/crates/log-0.4.21.crate) = 43442 SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149 SIZE (rust/crates/memchr-2.7.1.crate) = 96307 -SHA256 (rust/crates/mimalloc-0.1.28.crate) = b0dfa131390c2f6bdb3242f65ff271fcdaca5ff7b6c08f28398be7f2280e3926 -SIZE (rust/crates/mimalloc-0.1.28.crate) = 4987 SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841 SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd @@ -213,6 +207,10 @@ SHA256 (rust/crates/terminal_size-0.4.1.crate) = 5352447f921fda68cf61b4101566c0b SIZE (rust/crates/terminal_size-0.4.1.crate) = 10037 SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76 SIZE (rust/crates/termtree-0.4.1.crate) = 4557 +SHA256 (rust/crates/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate) = cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d +SIZE (rust/crates/tikv-jemalloc-sys-0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7.crate) = 897133 +SHA256 (rust/crates/tikv-jemallocator-0.6.0.crate) = 4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865 +SIZE (rust/crates/tikv-jemallocator-0.6.0.crate) = 13700 SHA256 (rust/crates/tree-sitter-0.24.5.crate) = 8ac95b18f0f727aaaa012bd5179a1916706ee3ed071920fdbda738750b0c0bf5 SIZE (rust/crates/tree-sitter-0.24.5.crate) = 176800 SHA256 (rust/crates/tree-sitter-bash-0.23.3.crate) = 329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e @@ -227,6 +225,10 @@ SHA256 (rust/crates/tree-sitter-css-0.23.1.crate) = 25435a275adb3226b6fddab891bb SIZE (rust/crates/tree-sitter-css-0.23.1.crate) = 44324 SHA256 (rust/crates/tree-sitter-elixir-0.3.4.crate) = e45d444647b4fd53d8fd32474c1b8bedc1baa22669ce3a78d083e365fa9a2d3f SIZE (rust/crates/tree-sitter-elixir-0.3.4.crate) = 460085 +SHA256 (rust/crates/tree-sitter-erlang-0.13.0.crate) = eb9265a444b04975b2ecc2e1a64114a03e009737e7fae19ce9078b962b8be1af +SIZE (rust/crates/tree-sitter-erlang-0.13.0.crate) = 123418 +SHA256 (rust/crates/tree-sitter-fsharp-0.1.0.crate) = f2db500a0948bf37c43febe2c3d67bfb9ad690b06aaa20780a5106da6f620b41 +SIZE (rust/crates/tree-sitter-fsharp-0.1.0.crate) = 2510055 SHA256 (rust/crates/tree-sitter-go-0.23.4.crate) = b13d476345220dbe600147dd444165c5791bf85ef53e28acbedd46112ee18431 SIZE (rust/crates/tree-sitter-go-0.23.4.crate) = 105624 SHA256 (rust/crates/tree-sitter-haskell-0.23.1.crate) = 977c51e504548cba13fc27cb5a2edab2124cf6716a1934915d07ab99523b05a4 @@ -253,6 +255,8 @@ SHA256 (rust/crates/tree-sitter-objc-3.0.2.crate) = 9ca8bb556423fc176f0535e79d52 SIZE (rust/crates/tree-sitter-objc-3.0.2.crate) = 1532961 SHA256 (rust/crates/tree-sitter-ocaml-0.23.2.crate) = 93c104a23d175906dd0cf1f872745d2b4ec10f29a75194a3556501b2f66ce377 SIZE (rust/crates/tree-sitter-ocaml-0.23.2.crate) = 3536008 +SHA256 (rust/crates/tree-sitter-pascal-0.10.0.crate) = ca037a9d7fd7441903e8946bfd223831b03d6bc979a50c8a5d4b9b6bdce91aaf +SIZE (rust/crates/tree-sitter-pascal-0.10.0.crate) = 236236 SHA256 (rust/crates/tree-sitter-php-0.23.11.crate) = f066e94e9272cfe4f1dcb07a1c50c66097eca648f2d7233d299c8ae9ed8c130c SIZE (rust/crates/tree-sitter-php-0.23.11.crate) = 475556 SHA256 (rust/crates/tree-sitter-python-0.23.5.crate) = 70beaa47e19e1529e8787fc0a80ebbae5a9fdaefc5fcc8972c885c9abf6ab0f0 @@ -263,10 +267,14 @@ SHA256 (rust/crates/tree-sitter-rust-0.23.2.crate) = a4d64d449ca63e683c562c77439 SIZE (rust/crates/tree-sitter-rust-0.23.2.crate) = 343880 SHA256 (rust/crates/tree-sitter-scala-0.23.3.crate) = ab837c0df7ffb6c315fd1cd792164375b3ec0c282ea35f639231f138044f8d0c SIZE (rust/crates/tree-sitter-scala-0.23.3.crate) = 1035228 +SHA256 (rust/crates/tree-sitter-swift-0.7.0.crate) = bdc72ea9c62a6d188c9f7d64109a9b14b09231852b87229c68c44e8738b9e6b9 +SIZE (rust/crates/tree-sitter-swift-0.7.0.crate) = 890957 SHA256 (rust/crates/tree-sitter-toml-ng-0.7.0.crate) = e9adc2c898ae49730e857d75be403da3f92bb81d8e37a2f918a08dd10de5ebb1 SIZE (rust/crates/tree-sitter-toml-ng-0.7.0.crate) = 22919 SHA256 (rust/crates/tree-sitter-typescript-0.23.2.crate) = 6c5f76ed8d947a75cc446d5fccd8b602ebf0cde64ccf2ffa434d873d7a575eff SIZE (rust/crates/tree-sitter-typescript-0.23.2.crate) = 829457 +SHA256 (rust/crates/tree-sitter-verilog-1.0.3.crate) = d4e7e0360395852f1f6ff5b7b82c72dc6557d181073188df1d60ec469ea69c66 +SIZE (rust/crates/tree-sitter-verilog-1.0.3.crate) = 2375813 SHA256 (rust/crates/tree-sitter-xml-0.7.0.crate) = e670041f591d994f54d597ddcd8f4ebc930e282c4c76a42268743b71f0c8b6b3 SIZE (rust/crates/tree-sitter-xml-0.7.0.crate) = 75507 SHA256 (rust/crates/tree-sitter-yaml-0.7.0.crate) = d0c99f2b92b677f1a18b6b232fa9329afb5758118238a7d0b29cae324ef50d5e @@ -343,5 +351,5 @@ SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf259 SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096 SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6 SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623 -SHA256 (Wilfred-difftastic-0.63.0_GH0.tar.gz) = f96bcf4fc961921d52cd9fe5aa94017924abde3d5a3b5a4727b103e9c2d4b416 -SIZE (Wilfred-difftastic-0.63.0_GH0.tar.gz) = 28395434 +SHA256 (Wilfred-difftastic-0.64.0_GH0.tar.gz) = 54c7c93309ff9a2cbe87153ac1d16e80bacac4042c80f6b7206e9b71a6f10d0b +SIZE (Wilfred-difftastic-0.64.0_GH0.tar.gz) = 25362833 diff --git a/textproc/difftastic/files/patch-jemalloc b/textproc/difftastic/files/patch-jemalloc new file mode 100644 index 000000000000..d4b2d2c034cf --- /dev/null +++ b/textproc/difftastic/files/patch-jemalloc @@ -0,0 +1,29 @@ +Upstream has switched from mimalloc to jemalloc in 0.64.0, but +tikv-jemallocator does not currently build on FreeBSD, so just +switch it to system allocator which is jemalloc anyway. +--- Cargo.toml.orig 2025-06-15 21:48:50 UTC ++++ Cargo.toml +@@ -106,7 +106,7 @@ tree-sitter-yaml = "0.7.0" + tree-sitter-xml = "0.7.0" + tree-sitter-yaml = "0.7.0" + +-[target.'cfg(not(target_env = "msvc"))'.dependencies] ++[target.'cfg(not(any(target_env = "msvc", target_os = "freebsd")))'.dependencies] + tikv-jemallocator = "0.6" + + [dev-dependencies] +--- src/main.rs.orig 2025-06-15 21:48:50 UTC ++++ src/main.rs +@@ -86,10 +86,10 @@ use crate::parse::syntax; + /// + /// For reference, Jemalloc uses 10-20% more time (although up to 33% + /// more instructions) when testing on sample files. +-#[cfg(not(target_env = "msvc"))] ++#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))] + use tikv_jemallocator::Jemalloc; + +-#[cfg(not(target_env = "msvc"))] ++#[cfg(not(any(target_env = "msvc", target_os = "freebsd")))] + #[global_allocator] + static GLOBAL: Jemalloc = Jemalloc; + |