pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/shells/fish



Module Name:    pkgsrc
Committed By:   ktnb
Date:           Wed Dec 31 00:47:59 UTC 2025

Modified Files:
        pkgsrc/shells/fish: Makefile PLIST cargo-depends.mk distinfo
        pkgsrc/shells/fish/patches: patch-build.rs patch-cmake_Install.cmake
            patch-src_wutil_dir__iter.rs
Removed Files:
        pkgsrc/shells/fish/patches: patch-CMakeLists.txt patch-cmake_Rust.cmake

Log Message:
fish: update to 4.3.2

Packaging update:
- requires py-sphinx to make man pages now
- upstream fixed two patches!

4.3.2:
Some other bugs

4.3.1:
Fixes possible crash after expanding an abbreviation

4.3.0:
Deprecations and removed features
  - fish no longer sets universal variables by default, which
    simplifies configuration. Specifically, the fish_color_*,
    fish_pager_color_* and fish_key_bindings variables are now set in
    the global scope by default.
  - fish_config theme choose now clears only color variables that
    were set by earlier invocations of a fish_config theme choose
    command (which is how fish’s default theme is set).

Scripting improvements
  - New status language command allows showing and modifying
    language settings for fish messages without having to modify
    environment variables.

Interactive improvements
  - When typing immediately after starting fish, the first prompt is
    now rendered correctly.
  - Completion accuracy was improved for file paths containing = or :
  - Prefix-matching completions are now shown even if they don’t
    match the case typed by the user
  - Autosuggestions now also show soft-wrapped portions

New or improved bindings
  - ctrl-w (backward-kill-path-component) also deletes escaped spaces
  - New special input functions backward-path-component,
    forward-path-component and kill-path-component

Improved terminal support
  - Themes can now be made color-theme-aware by including both [light]
    and [dark] sections in the theme file
  - The working directory is now reported on every fresh prompt (via
    OSC 7), fixing scenarios where a child process (like ssh) left
    behind a stale working directory
  - OSC 133 prompt markers now also mark the prompt end, which
    improves shell integration with terminals like iTerm2
  - Operating-system-specific key bindings are now decided based on
    the terminal’s host OS.
  - Focus reporting is enabled unconditionally, not just inside tmux


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/shells/fish/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/shells/fish/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/fish/cargo-depends.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/shells/fish/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/shells/fish/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 pkgsrc/shells/fish/patches/patch-build.rs \
    pkgsrc/shells/fish/patches/patch-src_wutil_dir__iter.rs
cvs rdiff -u -r1.3 -r1.4 pkgsrc/shells/fish/patches/patch-cmake_Install.cmake
cvs rdiff -u -r1.1 -r0 pkgsrc/shells/fish/patches/patch-cmake_Rust.cmake

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

Modified files:

Index: pkgsrc/shells/fish/Makefile
diff -u pkgsrc/shells/fish/Makefile:1.60 pkgsrc/shells/fish/Makefile:1.61
--- pkgsrc/shells/fish/Makefile:1.60    Thu Dec 18 19:31:11 2025
+++ pkgsrc/shells/fish/Makefile Wed Dec 31 00:47:58 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2025/12/18 19:31:11 vins Exp $
+# $NetBSD: Makefile,v 1.61 2025/12/31 00:47:58 ktnb Exp $
 
-DISTNAME=      fish-4.2.1
-PKGREVISION=   3
+DISTNAME=      fish-4.3.2
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=fish-shell/}
 GITHUB_PROJECT=        fish-shell
@@ -20,9 +19,11 @@ LICENSE=     gnu-gpl-v2
 VENDORSRC=     ${WRKDIR}/vendor
 VENDORPATCH=   patch-libc.rs patch-nix.rs
 
-USE_TOOLS+=            msgfmt patch pkg-config
+USE_TOOLS+=            msgfmt patch pkg-config pax
 USE_PKGLOCALEDIR=      yes
 
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+
 PKGCONFIG_OVERRIDE+=   fish.pc.in
 
 EGDIR=         ${PREFIX}/share/examples/fish
@@ -37,11 +38,12 @@ REPLACE_PYTHON+=    share/tools/*.py
 
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_SYSCONFDIR=${PKG_SYSCONFDIR}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/${PKGMANDIR}
 # Disable dynamic linking with pcre2 to prevent missing dshare objects.
 # See https://mail-index.netbsd.org/tech-pkg/2025/12/15/msg031761.html
 CMAKE_CONFIGURE_ARGS+= -DFISH_USE_SYSTEM_PCRE2=OFF
 CMAKE_CONFIGURE_ARGS+= -DWITH_GETTEXT=ON
-CMAKE_CONFIGURE_ARGS+= -DBUILD_DOCS=OFF
+CMAKE_CONFIGURE_ARGS+= -DWITH_DOCS=ON
 
 RUSTFLAGS+=            -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pcre2}/lib
 RUSTFLAGS+=            -C link-arg=-L${BUILDLINK_PREFIX.pcre2}/lib
@@ -61,6 +63,10 @@ post-patch:
                ${PATCH} -b -p0 < ${VENDORSRC}/${i}
 .endfor
 
+post-install:
+       cd ${WRKSRC}/share/themes && ${PAX} -wr * ${DESTDIR}/${PREFIX}/share/themes
+       cd ${WRKSRC}/share/prompts && ${PAX} -wr * ${DESTDIR}/${PREFIX}/share/prompts
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/cmake/build.mk"

Index: pkgsrc/shells/fish/PLIST
diff -u pkgsrc/shells/fish/PLIST:1.21 pkgsrc/shells/fish/PLIST:1.22
--- pkgsrc/shells/fish/PLIST:1.21       Sat Dec 13 17:47:21 2025
+++ pkgsrc/shells/fish/PLIST    Wed Dec 31 00:47:58 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2025/12/13 17:47:21 vins Exp $
+@comment $NetBSD: PLIST,v 1.22 2025/12/31 00:47:58 ktnb Exp $
 bin/fish
 bin/fish_indent
 bin/fish_key_reader
@@ -17,11 +17,13 @@ man/man1/fish_indent.1
 man/man1/fish_key_reader.1
 share/doc/fish/.buildinfo
 share/doc/fish/CHANGELOG.rst
+share/doc/fish/_static/base-stemmer.js
 share/doc/fish/_static/basic.css
 share/doc/fish/_static/classic.css
 share/doc/fish/_static/default.css
 share/doc/fish/_static/doctools.js
 share/doc/fish/_static/documentation_options.js
+share/doc/fish/_static/english-stemmer.js
 share/doc/fish/_static/file.png
 share/doc/fish/_static/fish.png
 share/doc/fish/_static/language_data.js
@@ -90,7 +92,6 @@ share/doc/fish/cmds/fish_status_to_signa
 share/doc/fish/cmds/fish_svn_prompt.html
 share/doc/fish/cmds/fish_tab_title.html
 share/doc/fish/cmds/fish_title.html
-share/doc/fish/cmds/fish_title.inc.html
 share/doc/fish/cmds/fish_update_completions.html
 share/doc/fish/cmds/fish_vcs_prompt.html
 share/doc/fish/cmds/fish_vi_key_bindings.html
@@ -247,6 +248,7 @@ share/fish/completions/apt-zip-inst.fish
 share/fish/completions/apt-zip-list.fish
 share/fish/completions/apt.fish
 share/fish/completions/aptitude.fish
+share/fish/completions/aqua.fish
 share/fish/completions/ar.fish
 share/fish/completions/arc.fish
 share/fish/completions/archlinux-java.fish
@@ -254,6 +256,7 @@ share/fish/completions/arepack.fish
 share/fish/completions/argocd.fish
 share/fish/completions/argparse.fish
 share/fish/completions/ark.fish
+share/fish/completions/arp-scan.fish
 share/fish/completions/arp.fish
 share/fish/completions/arping.fish
 share/fish/completions/as.fish
@@ -1124,6 +1127,7 @@ share/fish/completions/wajig.fish
 share/fish/completions/warp-cli.fish
 share/fish/completions/watch.fish
 share/fish/completions/watchexec.fish
+share/fish/completions/waydroid.fish
 share/fish/completions/wc.fish
 share/fish/completions/web-ext.fish
 share/fish/completions/wesnoth.fish
@@ -1235,6 +1239,7 @@ share/fish/functions/__fish_anypython.fi
 share/fish/functions/__fish_append.fish
 share/fish/functions/__fish_apropos.fish
 share/fish/functions/__fish_argcomplete_complete.fish
+share/fish/functions/__fish_backup_config_files.fish
 share/fish/functions/__fish_cache_put.fish
 share/fish/functions/__fish_cache_sourced_completions.fish
 share/fish/functions/__fish_cached.fish
@@ -1288,14 +1293,14 @@ share/fish/functions/__fish_complete_zfs
 share/fish/functions/__fish_complete_zfs_rw_properties.fish
 share/fish/functions/__fish_complete_zfs_write_once_properties.fish
 share/fish/functions/__fish_concat_completions.fish
+share/fish/functions/__fish_config_files.fish
 share/fish/functions/__fish_config_interactive.fish
+share/fish/functions/__fish_config_with_file.fish
 share/fish/functions/__fish_contains_opt.fish
 share/fish/functions/__fish_crux_packages.fish
 share/fish/functions/__fish_cursor_konsole.fish
 share/fish/functions/__fish_cursor_xterm.fish
-share/fish/functions/__fish_data_list_files.fish
 share/fish/functions/__fish_data_with_directory.fish
-share/fish/functions/__fish_data_with_file.fish
 share/fish/functions/__fish_describe_command.fish
 share/fish/functions/__fish_echo.fish
 share/fish/functions/__fish_edit_command_if_at_cursor.fish
@@ -1308,7 +1313,6 @@ share/fish/functions/__fish_is_first_arg
 share/fish/functions/__fish_is_first_token.fish
 share/fish/functions/__fish_is_git_repository.fish
 share/fish/functions/__fish_is_nth_token.fish
-share/fish/functions/__fish_is_standalone.fish
 share/fish/functions/__fish_is_switch.fish
 share/fish/functions/__fish_is_token_n.fish
 share/fish/functions/__fish_is_zfs_feature_enabled.fish
@@ -1317,8 +1321,10 @@ share/fish/functions/__fish_locale_vars.
 share/fish/functions/__fish_macos_set_env.fish
 share/fish/functions/__fish_make_cache_dir.fish
 share/fish/functions/__fish_make_completion_signals.fish
+share/fish/functions/__fish_man1_pages.fish
 share/fish/functions/__fish_man_page.fish
 share/fish/functions/__fish_md5.fish
+share/fish/functions/__fish_migrate.fish
 share/fish/functions/__fish_mktemp_relative.fish
 share/fish/functions/__fish_move_last.fish
 share/fish/functions/__fish_no_arguments.fish
@@ -1329,6 +1335,9 @@ share/fish/functions/__fish_number_of_cm
 share/fish/functions/__fish_paginate.fish
 share/fish/functions/__fish_parent_directories.fish
 share/fish/functions/__fish_paste.fish
+share/fish/functions/__fish_per_os_bind.fish
+share/fish/functions/__fish_posix_quote.fish
+share/fish/functions/__fish_posix_shell.fish
 share/fish/functions/__fish_prepend_sudo.fish
 share/fish/functions/__fish_prev_arg_in.fish
 share/fish/functions/__fish_preview_current_file.fish
@@ -1390,14 +1399,27 @@ share/fish/functions/__fish_systemctl.fi
 share/fish/functions/__fish_systemctl_services.fish
 share/fish/functions/__fish_systemd_machine_images.fish
 share/fish/functions/__fish_systemd_machines.fish
+share/fish/functions/__fish_theme_cat.fish
+share/fish/functions/__fish_theme_dir.fish
+share/fish/functions/__fish_theme_export_for_webconfig.fish
+share/fish/functions/__fish_theme_for_each.fish
+share/fish/functions/__fish_theme_freeze.fish
+share/fish/functions/__fish_theme_names.fish
+share/fish/functions/__fish_theme_paths.fish
+share/fish/functions/__fish_theme_variable_filter.fish
+share/fish/functions/__fish_theme_variables.fish
 share/fish/functions/__fish_toggle_comment_commandline.fish
 share/fish/functions/__fish_tokenizer_state.fish
+share/fish/functions/__fish_tried_to_embed_manpages.fish
 share/fish/functions/__fish_uname.fish
+share/fish/functions/__fish_unexpand_tilde.fish
 share/fish/functions/__fish_use_subcommand.fish
 share/fish/functions/__fish_vcs_prompt.fish
+share/fish/functions/__fish_webconfig_update_color_hook.fish
 share/fish/functions/__fish_whatis.fish
 share/fish/functions/__fish_whatis_current_token.fish
 share/fish/functions/__fish_with_status.fish
+share/fish/functions/__fish_without_manpager.fish
 share/fish/functions/__ssh_history_completions.fish
 share/fish/functions/__terlar_git_prompt.fish
 share/fish/functions/_validate_int.fish
@@ -1428,6 +1450,7 @@ share/fish/functions/fish_git_prompt.fis
 share/fish/functions/fish_greeting.fish
 share/fish/functions/fish_hg_prompt.fish
 share/fish/functions/fish_hybrid_key_bindings.fish
+share/fish/functions/fish_in_macos_terminal.fish
 share/fish/functions/fish_is_root_user.fish
 share/fish/functions/fish_jj_prompt.fish
 share/fish/functions/fish_job_summary.fish
@@ -1472,7 +1495,6 @@ share/fish/functions/trap.fish
 share/fish/functions/umask.fish
 share/fish/functions/up-or-search.fish
 share/fish/functions/vared.fish
-share/fish/groff/fish.tmac
 share/fish/man/man1/_.1
 share/fish/man/man1/abbr.1
 share/fish/man/man1/alias.1
@@ -1614,48 +1636,47 @@ share/fish/tools/web_config/index.html
 share/fish/tools/web_config/js/alpine.js
 share/fish/tools/web_config/js/colorutils.js
 share/fish/tools/web_config/js/main.js
-share/fish/tools/web_config/sample_prompts/acidhub.fish
-share/fish/tools/web_config/sample_prompts/arrow.fish
-share/fish/tools/web_config/sample_prompts/astronaut.fish
-share/fish/tools/web_config/sample_prompts/default.fish
-share/fish/tools/web_config/sample_prompts/disco.fish
-share/fish/tools/web_config/sample_prompts/informative.fish
-share/fish/tools/web_config/sample_prompts/informative_vcs.fish
-share/fish/tools/web_config/sample_prompts/minimalist.fish
-share/fish/tools/web_config/sample_prompts/nim.fish
-share/fish/tools/web_config/sample_prompts/pythonista.fish
-share/fish/tools/web_config/sample_prompts/scales.fish
-share/fish/tools/web_config/sample_prompts/simple.fish
-share/fish/tools/web_config/sample_prompts/terlar.fish
-share/fish/tools/web_config/themes/Base16 Default Dark.theme
-share/fish/tools/web_config/themes/Base16 Default Light.theme
-share/fish/tools/web_config/themes/Base16 Eighties.theme
-share/fish/tools/web_config/themes/Bay Cruise.theme
-share/fish/tools/web_config/themes/Dracula.theme
-share/fish/tools/web_config/themes/Fairground.theme
-share/fish/tools/web_config/themes/Just a Touch.theme
-share/fish/tools/web_config/themes/Lava.theme
-share/fish/tools/web_config/themes/Mono Lace.theme
-share/fish/tools/web_config/themes/Mono Smoke.theme
-share/fish/tools/web_config/themes/None.theme
-share/fish/tools/web_config/themes/Nord.theme
-share/fish/tools/web_config/themes/Old School.theme
-share/fish/tools/web_config/themes/Seaweed.theme
-share/fish/tools/web_config/themes/Snow Day.theme
-share/fish/tools/web_config/themes/Solarized Dark.theme
-share/fish/tools/web_config/themes/Solarized Light.theme
-share/fish/tools/web_config/themes/Tomorrow Night Bright.theme
-share/fish/tools/web_config/themes/Tomorrow Night.theme
-share/fish/tools/web_config/themes/Tomorrow.theme
-share/fish/tools/web_config/themes/ayu Dark.theme
-share/fish/tools/web_config/themes/ayu Light.theme
-share/fish/tools/web_config/themes/ayu Mirage.theme
-share/fish/tools/web_config/themes/coolbeans.theme
-share/fish/tools/web_config/themes/fish default.theme
 share/fish/tools/web_config/webconfig.py
+share/prompts/acidhub.fish
+share/prompts/arrow.fish
+share/prompts/astronaut.fish
+share/prompts/default.fish
+share/prompts/disco.fish
+share/prompts/informative.fish
+share/prompts/informative_vcs.fish
+share/prompts/minimalist.fish
+share/prompts/nim.fish
+share/prompts/pythonista.fish
+share/prompts/scales.fish
+share/prompts/simple.fish
+share/prompts/terlar.fish
+share/themes/ayu-mirage.theme
+share/themes/ayu.theme
+share/themes/base16-default.theme
+share/themes/base16-eighties.theme
+share/themes/bay-cruise.theme
+share/themes/coolbeans.theme
+share/themes/default-rgb.theme
+share/themes/default.theme
+share/themes/dracula.theme
+share/themes/fairground.theme
+share/themes/just-a-touch.theme
+share/themes/lava.theme
+share/themes/mono-lace.theme
+share/themes/mono-smoke.theme
+share/themes/none.theme
+share/themes/nord.theme
+share/themes/old-school.theme
+share/themes/seaweed.theme
+share/themes/snow-day.theme
+share/themes/solarized.theme
+share/themes/tomorrow-night-bright.theme
+share/themes/tomorrow.theme
 @pkgdir share/fish/vendor_functions.d
 @pkgdir share/fish/vendor_conf.d
 @pkgdir share/fish/vendor_completions.d
+@pkgdir share/fish/themes
+@pkgdir share/fish/prompts
 @pkgdir share/doc/fish/_sources
 @pkgdir etc/fish/functions
 @pkgdir etc/fish/conf.d

Index: pkgsrc/shells/fish/cargo-depends.mk
diff -u pkgsrc/shells/fish/cargo-depends.mk:1.1 pkgsrc/shells/fish/cargo-depends.mk:1.2
--- pkgsrc/shells/fish/cargo-depends.mk:1.1     Sat Dec 13 17:47:21 2025
+++ pkgsrc/shells/fish/cargo-depends.mk Wed Dec 31 00:47:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: cargo-depends.mk,v 1.1 2025/12/13 17:47:21 vins Exp $
+# $NetBSD: cargo-depends.mk,v 1.2 2025/12/31 00:47:58 ktnb Exp $
 
 CARGO_CRATE_DEPENDS+=  aho-corasick-1.1.3
 CARGO_CRATE_DEPENDS+=  allocator-api2-0.2.21
@@ -55,19 +55,23 @@ CARGO_CRATE_DEPENDS+=       phf_shared-0.11.3
 CARGO_CRATE_DEPENDS+=  phf_shared-0.12.1
 CARGO_CRATE_DEPENDS+=  pkg-config-0.3.32
 CARGO_CRATE_DEPENDS+=  portable-atomic-1.11.1
+CARGO_CRATE_DEPENDS+=  ppv-lite86-0.2.21
 CARGO_CRATE_DEPENDS+=  proc-macro2-1.0.101
 CARGO_CRATE_DEPENDS+=  quote-1.0.41
 CARGO_CRATE_DEPENDS+=  r-efi-5.3.0
 CARGO_CRATE_DEPENDS+=  rand-0.8.5
+CARGO_CRATE_DEPENDS+=  rand-0.9.2
+CARGO_CRATE_DEPENDS+=  rand_chacha-0.9.0
 CARGO_CRATE_DEPENDS+=  rand_core-0.6.4
+CARGO_CRATE_DEPENDS+=  rand_core-0.9.3
 CARGO_CRATE_DEPENDS+=  redox_syscall-0.5.18
 CARGO_CRATE_DEPENDS+=  redox_users-0.5.2
 CARGO_CRATE_DEPENDS+=  regex-automata-0.4.13
 CARGO_CRATE_DEPENDS+=  regex-syntax-0.8.8
 CARGO_CRATE_DEPENDS+=  rsconf-0.2.2
-CARGO_CRATE_DEPENDS+=  rust-embed-8.8.0
-CARGO_CRATE_DEPENDS+=  rust-embed-impl-8.8.0
-CARGO_CRATE_DEPENDS+=  rust-embed-utils-8.8.0
+CARGO_CRATE_DEPENDS+=  rust-embed-8.9.0
+CARGO_CRATE_DEPENDS+=  rust-embed-impl-8.9.0
+CARGO_CRATE_DEPENDS+=  rust-embed-utils-8.9.0
 CARGO_CRATE_DEPENDS+=  same-file-1.0.6
 CARGO_CRATE_DEPENDS+=  scc-2.4.0
 CARGO_CRATE_DEPENDS+=  scopeguard-1.2.0
@@ -101,3 +105,6 @@ CARGO_CRATE_DEPENDS+=       winapi-util-0.1.11
 CARGO_CRATE_DEPENDS+=  windows-link-0.2.1
 CARGO_CRATE_DEPENDS+=  windows-sys-0.61.2
 CARGO_CRATE_DEPENDS+=  wit-bindgen-0.46.0
+CARGO_CRATE_DEPENDS+=  xterm-color-1.0.1
+CARGO_CRATE_DEPENDS+=  zerocopy-0.8.27
+CARGO_CRATE_DEPENDS+=  zerocopy-derive-0.8.27

Index: pkgsrc/shells/fish/distinfo
diff -u pkgsrc/shells/fish/distinfo:1.41 pkgsrc/shells/fish/distinfo:1.42
--- pkgsrc/shells/fish/distinfo:1.41    Wed Dec 17 19:05:30 2025
+++ pkgsrc/shells/fish/distinfo Wed Dec 31 00:47:58 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2025/12/17 19:05:30 vins Exp $
+$NetBSD: distinfo,v 1.42 2025/12/31 00:47:58 ktnb Exp $
 
 BLAKE2s (0.2.9-utf32.tar.gz) = 52de08088cc288e5fd826066d3105a3826b524b4acfbd1a2afb45e2b8cdd2c12
 SHA512 (0.2.9-utf32.tar.gz) = d00577beee02edf3f35c4371e9a7fb35a2ed9225cd5bc4e539b6a2cd1f31f2a3c55a91832f3310afdeb004e4c59f24aa06c72c2e31ce1827d349b058a7a91a3c
@@ -57,9 +57,9 @@ Size (fastrand-2.3.0.crate) = 15076 byte
 BLAKE2s (find-msvc-tools-0.1.4.crate) = 2478d3b9cdce4920246f73b6a4cc60f1f5b2a003ee636805bf17b79f2429c7a5
 SHA512 (find-msvc-tools-0.1.4.crate) = 91dceb15d6d6367f229f9902daad8c57ddc9b28c463266785236d34f84732bf931ac653196980306488b81c66df00f8bb241a95d2b06590d41dd0703f8a941b5
 Size (find-msvc-tools-0.1.4.crate) = 30817 bytes
-BLAKE2s (fish-4.2.1.tar.xz) = 5af7d784855f3801fc733c84552ca4f3d43e10951bcc1d28ade3ae515f4defae
-SHA512 (fish-4.2.1.tar.xz) = 7273e43f714ae4919b555feb644183d0019ce5343ffc75a65914da7aeed7d8c3e4b96c0890cdde7a50d3f47a8070e02e3203acdfd29cc003702a2896c1a4c78e
-Size (fish-4.2.1.tar.xz) = 3012808 bytes
+BLAKE2s (fish-4.3.2.tar.xz) = ed8ceebe6ebfe8557e1a6b698e2c06d987065b5e5b1cf9d49019bc0b4a84cd8d
+SHA512 (fish-4.3.2.tar.xz) = a50c09996af84544a089673746d5d2848d70765a3cbd2896be24ab9b4efb28ec1c990c715d1dc5f20b0a0a550e243e17931aee930d2fcce19dc9e7a12e0f02b3
+Size (fish-4.3.2.tar.xz) = 2535720 bytes
 BLAKE2s (fnv-1.0.7.crate) = ffa8e3e3e120c65486f2575822704aa79aac381f375d7295875475e36775ff09
 SHA512 (fnv-1.0.7.crate) = 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 Size (fnv-1.0.7.crate) = 11266 bytes
@@ -171,6 +171,9 @@ Size (pkg-config-0.3.32.crate) = 21370 b
 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 (ppv-lite86-0.2.21.crate) = dcc7e79ae37986b5b66ff98fc97f05a07909fde17b5509ba1132169e8c5e5544
+SHA512 (ppv-lite86-0.2.21.crate) = 94710d5b25b67539cfa828476367849e1ecaca744f2e0429b48c05b47ec48cd57f950fb9845a361fbfd96f361ac00fd2d47cc27c584b79ce3d9d8fc133f5b7bc
+Size (ppv-lite86-0.2.21.crate) = 22522 bytes
 BLAKE2s (proc-macro2-1.0.101.crate) = 8f2ba4dda3b86e68eb6519c642f48e3b6deb9f0cdd10b0505f77970a6deed577
 SHA512 (proc-macro2-1.0.101.crate) = 3171c807d24371da2931f9c706fb3129bb9bf3ac40418e5d14cfc372baf96e5fee9ede72091163858e3ba0b4f88594efa1031b0bb7128ca68e7b847dead6856c
 Size (proc-macro2-1.0.101.crate) = 53886 bytes
@@ -183,9 +186,18 @@ Size (r-efi-5.3.0.crate) = 64532 bytes
 BLAKE2s (rand-0.8.5.crate) = 12fbacd2e6f4743eb56bf132865ad6d2c58d567f1c689fd646b488b863b9eb38
 SHA512 (rand-0.8.5.crate) = 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 Size (rand-0.8.5.crate) = 87113 bytes
+BLAKE2s (rand-0.9.2.crate) = c6ae5dc8b1882d610a563161e6e97f269a6bc0fa5efc4eec2f3ce71bb321ed57
+SHA512 (rand-0.9.2.crate) = 91faee823d9a3b109135182b9566e6327881736359c9d68358ad7dc78eac1e845c553820e2450ca481cae1e0969ec6566e72f7f9233251b1f9133449306f2965
+Size (rand-0.9.2.crate) = 99930 bytes
+BLAKE2s (rand_chacha-0.9.0.crate) = 92c607c07408ba75e10597aba27370fc46ceece6bf2e3d836de2eeb55af6dd72
+SHA512 (rand_chacha-0.9.0.crate) = f62a7bb067ff984049c96cddccc841cd9931daeb5b25bb69f056bfe577f62b1b35c08f2bb5028590eefa04a9369beead4e6b03607eec97256e0383b20542af96
+Size (rand_chacha-0.9.0.crate) = 18258 bytes
 BLAKE2s (rand_core-0.6.4.crate) = 0d23245a02d2c434b28af3a0ef8fe79b824ac79a8fb84f1c90a68a5bf5bfb6a6
 SHA512 (rand_core-0.6.4.crate) = 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79
 Size (rand_core-0.6.4.crate) = 22666 bytes
+BLAKE2s (rand_core-0.9.3.crate) = 811ce2c4640344414822eb04189933dfb3bda3fdbd4deda645fe69616a489b72
+SHA512 (rand_core-0.9.3.crate) = 6e8e4067dbf5853c55b0ed38293b6bc6bdecbdd31bb9d624609b0222f706f5b29281ffd5fffd5c316367ba5b22c29e5282c61de3738344798ce0f9cf9cf2ce19
+Size (rand_core-0.9.3.crate) = 24543 bytes
 BLAKE2s (redox_syscall-0.5.18.crate) = 15142008cfcffdfe12059e4c1415d354d0a1f60e4fd392dcf9ac888821a0988b
 SHA512 (redox_syscall-0.5.18.crate) = 69f1cfb215666f1243616366711dbd8cadd6bb411121f48f6e4ffd7b25479efa6f900dd072d7cc6e6fb8130d95cdb42f4c0cb4ba9e05b09b1fa676ca32932101
 Size (redox_syscall-0.5.18.crate) = 30747 bytes
@@ -201,15 +213,15 @@ Size (regex-syntax-0.8.8.crate) = 359141
 BLAKE2s (rsconf-0.2.2.crate) = e27dfd98c1915ad3389856d7e3030ddec82906658ceaecb6f0c5bd969abc8ea9
 SHA512 (rsconf-0.2.2.crate) = b66a1f5278118d7fa7bf025111dd657d725ba7567fd78f80f86adc7695c3e76076c36019a6f304155c1ad6fd034cd99ac977d28da5e040d905e3126265cd31df
 Size (rsconf-0.2.2.crate) = 16338 bytes
-BLAKE2s (rust-embed-8.8.0.crate) = a2a9ba18de80db758f347944ffb83419f0fdc567fc09dbd626d249168227dd8b
-SHA512 (rust-embed-8.8.0.crate) = 01cc087397201a877f85075400358fa262eea562245c259e8a868be7d883997d4a1284c2cc17f5d96176925566cb149f59c852b0eebb7c2e78e25e9a039ed2b4
-Size (rust-embed-8.8.0.crate) = 900773 bytes
-BLAKE2s (rust-embed-impl-8.8.0.crate) = 445f785d0c66b2a8b54fa2f1bf0117986b78659fb3d5497208b61fee166c9d04
-SHA512 (rust-embed-impl-8.8.0.crate) = cab9bd2b991a135040c2820dad2bb8454954864ac3fd9e8ec2e3f9139c3dc220623ab665a9a000fa1fd507de73dfce7e5883b02057572142c3169bb64d53a4a2
-Size (rust-embed-impl-8.8.0.crate) = 9281 bytes
-BLAKE2s (rust-embed-utils-8.8.0.crate) = e70838342920c54846f0f3c4b80f4e6917f03cb46dd1a30fb305f75d72d935a8
-SHA512 (rust-embed-utils-8.8.0.crate) = dca86b71ea9052e06c1f79a8e8568f0b3587fcb4800ba51612a0186c95336a6215afcd405a2c89fb8dd854b76db86823c137dcd97792385ac7f400558b047c37
-Size (rust-embed-utils-8.8.0.crate) = 5735 bytes
+BLAKE2s (rust-embed-8.9.0.crate) = 054b52d6dfd12e91b9028f2cd6a97e31db3eb4fc8269eee1e5be60a593332691
+SHA512 (rust-embed-8.9.0.crate) = b0fbc4e0f9cdceebc71b541cd35a63317b3cf96f77005e81806c3c316f4d4aeb861b6e8c7c3a28f750968d51ed072788368d48689917feb5dfd94f8c12c53239
+Size (rust-embed-8.9.0.crate) = 900777 bytes
+BLAKE2s (rust-embed-impl-8.9.0.crate) = 748db4759d77ef02b101c6b82e138d8a6b9dbeea086804185b8bf6e04f51eb2b
+SHA512 (rust-embed-impl-8.9.0.crate) = 6669d7b355e2959fc9cc911fa6566dabfa850b80a0c95c98b7e0e238ee6c2c1ed54d48874ba321475267633c7d379b0e4d82a4728cd4363633b8555d0169dd47
+Size (rust-embed-impl-8.9.0.crate) = 9279 bytes
+BLAKE2s (rust-embed-utils-8.9.0.crate) = 4631b648473b1879e4f49ca2b9c7d948aa82f96b327507799bc148ed03d50539
+SHA512 (rust-embed-utils-8.9.0.crate) = aa87782914232ec2abf61de54e94c4d4c6450beab14b9bef5478026549d2a9734ab155763b43ff777162b2413fd524709da61829dae7db95e6c2211d9c855587
+Size (rust-embed-utils-8.9.0.crate) = 5730 bytes
 BLAKE2s (same-file-1.0.6.crate) = 1a9b3bb2a767c4e3a7537b2fd8daaa2afc113e6bdaa27a25d2eefff59e7600d6
 SHA512 (same-file-1.0.6.crate) = 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 Size (same-file-1.0.6.crate) = 10183 bytes
@@ -309,12 +321,19 @@ Size (windows-sys-0.61.2.crate) = 251718
 BLAKE2s (wit-bindgen-0.46.0.crate) = a4e3802e4182ff90b146fa8f8cfda0955eb91f42c0e5c58e1e8eaef3c755c75b
 SHA512 (wit-bindgen-0.46.0.crate) = 5d37ac5855797cfb906c983a70780d7cd29d70c4e5b6e54328fc18297feeb89ceda0aa732123280a12610015fbdb42bcd76aae12b1debb281b0a848016134548
 Size (wit-bindgen-0.46.0.crate) = 60508 bytes
-SHA1 (patch-CMakeLists.txt) = 1dbda3cd615afa10b42c16a0ab756830b1a251e8
+BLAKE2s (xterm-color-1.0.1.crate) = c173c8dd959cdebffa4c134d49217bb907651387535560f080ad4b3bf8693434
+SHA512 (xterm-color-1.0.1.crate) = 55656d01ed11724e860e3711032febe7c5f51be54b1bbeba08ff89f171deac34c86041b8babaafb6e68e4fc5144c5cc2f5c4f07e8ba26879b02c5ab34ec2a764
+Size (xterm-color-1.0.1.crate) = 9185 bytes
+BLAKE2s (zerocopy-0.8.27.crate) = 7b5d949b794b2afa8988dfb5f51deb7c67fd2fcbd7500426c79ae9999a45b544
+SHA512 (zerocopy-0.8.27.crate) = f3f8d298b3a56d0eb3061207d069f34302e1dfb61e6b3ab2a9c8d0656b5da807ebd70310ddf818fbb40547597183e09be77c07c4b665690af66f27a9cf96a1df
+Size (zerocopy-0.8.27.crate) = 252663 bytes
+BLAKE2s (zerocopy-derive-0.8.27.crate) = 0fffa0ca637a0ab654943d44e56f8ebc970ec706a7e375bb6e2ac72cf04a8537
+SHA512 (zerocopy-derive-0.8.27.crate) = 9fd0b4f900e6ea7c92998b7297deafa84870e7e57d09225ae3910894358da9f405925fed88d2528f52caf5a1f6e32dd75bfa18ed3a7f9fee75bfa88c0f23e451
+Size (zerocopy-derive-0.8.27.crate) = 89827 bytes
 SHA1 (patch-Cargo.toml) = da9c54ccad77851725b6d0121252efc115d1653f
-SHA1 (patch-build.rs) = 875746d4569a62e6252bc6a79e72bc08d6a40a1e
-SHA1 (patch-cmake_Install.cmake) = 36f3074f7aa5ded118a2fe0182c35bfb013b58f2
-SHA1 (patch-cmake_Rust.cmake) = ee255662ffd36e1c5bc91093aba47b778d713b36
+SHA1 (patch-build.rs) = 36fcf46b1b42af164ab515cc31c11843d0753ce4
+SHA1 (patch-cmake_Install.cmake) = cf953eb393868f632ca7486109af8dff4037cf45
 SHA1 (patch-src_builtins_ulimit.rs) = 67fc3122f4c0e8b6a7c46185c41ca97dc6049a11
 SHA1 (patch-src_fork__exec_spawn.rs) = 1f71fe537f00bfb7dd646389ce0f66c3d752cf30
 SHA1 (patch-src_path.rs) = cbe8c4666dcbe5e0b54d5053902b6de8b88ab67f
-SHA1 (patch-src_wutil_dir__iter.rs) = 699f8d8b082ab4a00f185817afd208706ccdb600
+SHA1 (patch-src_wutil_dir__iter.rs) = 1b28a274bdb9baf6cb47740812984e9046637bf5

Index: pkgsrc/shells/fish/patches/patch-build.rs
diff -u pkgsrc/shells/fish/patches/patch-build.rs:1.1 pkgsrc/shells/fish/patches/patch-build.rs:1.2
--- pkgsrc/shells/fish/patches/patch-build.rs:1.1       Sat Dec 13 17:47:21 2025
+++ pkgsrc/shells/fish/patches/patch-build.rs   Wed Dec 31 00:47:58 2025
@@ -1,14 +1,14 @@
-$NetBSD: patch-build.rs,v 1.1 2025/12/13 17:47:21 vins Exp $
+$NetBSD: patch-build.rs,v 1.2 2025/12/31 00:47:58 ktnb Exp $
 
 Introduce illumos support. 
 
---- build.rs.orig      2025-11-13 12:09:28.000000000 +0000
+--- build.rs.orig      2025-12-28 15:54:44.000000000 +0000
 +++ build.rs
-@@ -84,6 +84,7 @@ fn detect_cfgs(target: &mut Target) {
-         ("using_cmake", &|_| option_env!("FISH_CMAKE_BINARY_DIR").is_some()),
-         ("use_prebuilt_docs", &|_| env_var("FISH_USE_PREBUILT_DOCS").is_some_and(|v| v == "TRUE") ),
-         ("cygwin", &detect_cygwin),
+@@ -76,6 +76,7 @@ fn detect_cfgs(target: &mut Target) {
+         ("apple", &(|_| target_os_is_apple())),
+         ("bsd", &(|_| target_os_is_bsd())),
+         ("cygwin", &(|_| target_os_is_cygwin())),
 +        ("illumos", &|_| env::var("CARGO_CFG_TARGET_OS").unwrap() == "illumos"),
-         ("small_main_stack", &has_small_stack),
-         // See if libc supports the thread-safe localeconv_l(3) alternative to localeconv(3).
-         ("localeconv_l", &|target| {
+         ("have_eventfd", &|target| {
+             // FIXME: NetBSD 10 has eventfd, but the libc crate does not expose it.
+             if target_os() == "netbsd" {
Index: pkgsrc/shells/fish/patches/patch-src_wutil_dir__iter.rs
diff -u pkgsrc/shells/fish/patches/patch-src_wutil_dir__iter.rs:1.1 pkgsrc/shells/fish/patches/patch-src_wutil_dir__iter.rs:1.2
--- pkgsrc/shells/fish/patches/patch-src_wutil_dir__iter.rs:1.1 Sat Dec 13 17:47:21 2025
+++ pkgsrc/shells/fish/patches/patch-src_wutil_dir__iter.rs     Wed Dec 31 00:47:59 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_wutil_dir__iter.rs,v 1.1 2025/12/13 17:47:21 vins Exp $
+$NetBSD: patch-src_wutil_dir__iter.rs,v 1.2 2025/12/31 00:47:59 ktnb Exp $
 
 Struct dirent lacks d_type on SunOS.
 
---- src/wutil/dir_iter.rs.orig 2025-11-13 12:09:28.000000000 +0000
+--- src/wutil/dir_iter.rs.orig 2025-12-28 15:54:44.000000000 +0000
 +++ src/wutil/dir_iter.rs
-@@ -293,6 +293,8 @@ impl DirIter {
+@@ -292,6 +292,8 @@ impl DirIter {
                  self.entry.inode = dent.d_ino;
              }
          );
@@ -12,12 +12,13 @@ Struct dirent lacks d_type on SunOS.
 +        {
          let typ = dirent_type_to_entry_type(dent.d_type);
          // Do not store symlinks as we will need to resolve them.
-         if typ != Some(DirEntryType::lnk) {
-@@ -300,6 +302,7 @@ impl DirIter {
+         if typ != Some(DirEntryType::Lnk) {
+@@ -299,7 +301,7 @@ impl DirIter {
          }
          // This entry could be a link if it is a link or unknown.
-         self.entry.possible_link = typ.map(|t| t == DirEntryType::lnk);
+         self.entry.possible_link = typ.map(|t| t == DirEntryType::Lnk);
+-
 +        }
- 
          Some(Ok(&self.entry))
      }
+ }

Index: pkgsrc/shells/fish/patches/patch-cmake_Install.cmake
diff -u pkgsrc/shells/fish/patches/patch-cmake_Install.cmake:1.3 pkgsrc/shells/fish/patches/patch-cmake_Install.cmake:1.4
--- pkgsrc/shells/fish/patches/patch-cmake_Install.cmake:1.3    Sat Dec 13 17:47:21 2025
+++ pkgsrc/shells/fish/patches/patch-cmake_Install.cmake        Wed Dec 31 00:47:58 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_Install.cmake,v 1.3 2025/12/13 17:47:21 vins Exp $
+$NetBSD: patch-cmake_Install.cmake,v 1.4 2025/12/31 00:47:58 ktnb Exp $
 
 Use pkgsrc defaults. 
 
---- cmake/Install.cmake.orig   2025-11-01 23:44:37.984452608 +0000
+--- cmake/Install.cmake.orig   2025-12-28 15:54:44.000000000 +0000
 +++ cmake/Install.cmake
-@@ -6,11 +6,14 @@ set(prefix ${CMAKE_INSTALL_PREFIX})
+@@ -4,11 +4,14 @@ set(prefix ${CMAKE_INSTALL_PREFIX})
  set(bindir ${CMAKE_INSTALL_BINDIR})
  set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR})
  set(mandir ${CMAKE_INSTALL_MANDIR})
@@ -19,7 +19,7 @@ Use pkgsrc defaults. 
  
  set(rel_completionsdir "fish/vendor_completions.d")
  set(rel_functionsdir "fish/vendor_functions.d")
-@@ -82,7 +85,7 @@ install(PROGRAMS ${PROGRAMS}
+@@ -88,7 +91,7 @@ install(CODE "file(CREATE_LINK ${abs_bin
  
  fish_create_dirs(${sysconfdir}/fish/conf.d ${sysconfdir}/fish/completions
      ${sysconfdir}/fish/functions)
@@ -27,8 +27,8 @@ Use pkgsrc defaults. 
 +install(FILES etc/config.fish DESTINATION ${egdir}/fish/)
  
  fish_create_dirs(${rel_datadir}/fish ${rel_datadir}/fish/completions
-                  ${rel_datadir}/fish/functions ${rel_datadir}/fish/groff
-@@ -102,7 +105,7 @@ install(FILES share/config.fish
+                  ${rel_datadir}/fish/functions
+@@ -108,7 +111,7 @@ install(FILES share/config.fish
  fish_create_dirs(${rel_datadir}/fish/vendor_completions.d ${rel_datadir}/fish/vendor_functions.d
      ${rel_datadir}/fish/vendor_conf.d)
  
@@ -37,7 +37,7 @@ Use pkgsrc defaults. 
  configure_file(fish.pc.in fish.pc.noversion @ONLY)
  
  add_custom_command(OUTPUT fish.pc
-@@ -115,7 +118,7 @@ add_custom_command(OUTPUT fish.pc
+@@ -121,7 +124,7 @@ add_custom_command(OUTPUT fish.pc
  add_custom_target(build_fish_pc ALL DEPENDS fish.pc)
  
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fish.pc



Home | Main Index | Thread Index | Old Index