On 2025-01-12 23:37, Theo Buehler wrote:
I played around for a bit and found some rough edges. For example fish
had PATH issues and did not find python3 for 'fish_config'.
This is a current_exe() issue. You can find various ways of dealing with
this in the ports tree, e.g. in lang/deno.
Yeah, fortunately fish only uses it in one place ... the attached patch makes
fish_config work.
Index: Makefile
===================================================================
RCS file: /cvs/ports/shells/fish/Makefile,v
diff -u -p -r1.48 Makefile
--- Makefile 21 Dec 2024 11:38:48 -0000 1.48
+++ Makefile 13 Jan 2025 15:54:33 -0000
@@ -1,9 +1,12 @@
COMMENT = friendly interactive shell
-V = 3.7.1
+V = 4.0b1
-DISTNAME = fish-$V
-REVISION = 2
+DISTNAME = fish-${V}
+PKGNAME = fish-${V:S/b/beta/}
+
+SITES =
https://github.com/fish-shell/fish-shell/releases/download/${V}/
+DIST_TUPLE += github fish-shell rust-pcre2 0.2.9-utf32 .
CATEGORIES = shells
@@ -16,16 +19,18 @@ PERMIT_PACKAGE = Yes
EXTRACT_SUFX = .tar.xz
-WANTLIB += ${COMPILER_LIBCXX} c curses intl m pcre2-32
-
-SITES =
https://github.com/fish-shell/fish-shell/releases/download/${V}/
+WANTLIB += ${MODCARGO_WANTLIB} intl m pcre2-32 pcre2-8
-# C++11
-COMPILER = base-clang ports-gcc base-gcc
+# C
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS = c
+# order matters: use default cmake targets.
MODULES = devel/cmake \
+ devel/cargo \
lang/python
+MODCARGO_CRATES += fish-printf 0.2.1
BUILD_DEPENDS = devel/gettext,-tools \
textproc/py-sphinx
@@ -42,7 +47,10 @@ MODPY_ADJ_FILES = share/tools/create_man
MAKE_FLAGS = V=1
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ -DFISH_USE_SYSTEM_PCRE2=ON
+
+CONFIGURE_STYLE = cmake
PORTHOME = ${WRKDIR}
@@ -50,16 +58,25 @@ PORTHOME = ${WRKDIR}
# driver loaded.
TEST_DEPENDS = sysutils/coreutils \
- ${PKGPATH}=${V}
+ ${PKGPATH}=${V:S/b/beta/}
-do-test:
- ln -fs ${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head
- ${MODCMAKE_BUILD_TARGET} -t ${TEST_TARGET}
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/src/common.rs
+
+pre-configure:
+ @${MODCARGO_configure}
post-install:
${MODPY_COMPILEALL} ${PREFIX}/share/fish/tools
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/fish
- mv ${PREFIX}/etc/fish/config.fish ${PREFIX}/share/examples/fish/
- rm -Rf ${PREFIX}/etc/
+ ${INSTALL_DATA} ${WRKSRC}/etc/config.fish ${PREFIX}/share/examples/fish/
+
+pre-test:
+ ln -fs ${LOCALBASE}/bin/ghead ${WRKDIR}/bin/head
+
+do-test:
+ ${MODCMAKE_BUILD_TARGET} -t ${TEST_TARGET}
+
+.include "crates.inc"
.include <bsd.port.mk>
Index: crates.inc
===================================================================
RCS file: crates.inc
diff -N crates.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ crates.inc 13 Jan 2025 15:54:33 -0000
@@ -0,0 +1,76 @@
+MODCARGO_CRATES += widestring 1.0.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += allocator-api2 0.2.18 # MIT OR Apache-2.0
+MODCARGO_CRATES += autocfg 1.4.0 # Apache-2.0 OR MIT
+MODCARGO_CRATES += bitflags 2.6.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += block-buffer 0.10.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += cc 1.1.30 # MIT OR Apache-2.0
+MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
+MODCARGO_CRATES += cfg_aliases 0.2.1 # MIT
+MODCARGO_CRATES += cpufeatures 0.2.14 # MIT OR Apache-2.0
+MODCARGO_CRATES += crypto-common 0.1.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += dashmap 5.5.3 # MIT
+MODCARGO_CRATES += digest 0.10.7 # MIT OR Apache-2.0
+MODCARGO_CRATES += equivalent 1.0.1 # Apache-2.0 OR MIT
+MODCARGO_CRATES += errno 0.3.9 # MIT OR Apache-2.0
+MODCARGO_CRATES += fnv 1.0.7 # Apache-2.0 / MIT
+MODCARGO_CRATES += foldhash 0.1.3 # Zlib
+MODCARGO_CRATES += generic-array 0.14.7 # MIT
+MODCARGO_CRATES += hashbrown 0.14.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += hashbrown 0.15.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += jobserver 0.1.32 # MIT OR Apache-2.0
+MODCARGO_CRATES += lazy_static 1.5.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += libc 0.2.159 # MIT OR Apache-2.0
+MODCARGO_CRATES += lock_api 0.4.12 # MIT OR Apache-2.0
+MODCARGO_CRATES += log 0.4.22 # MIT OR Apache-2.0
+MODCARGO_CRATES += lru 0.12.5 # MIT
+MODCARGO_CRATES += memchr 2.7.4 # Unlicense OR MIT
+MODCARGO_CRATES += minimal-lexical 0.2.1 # MIT/Apache-2.0
+MODCARGO_CRATES += nix 0.29.0 # MIT
+MODCARGO_CRATES += nom 7.1.3 # MIT
+MODCARGO_CRATES += num-traits 0.2.19 # MIT OR Apache-2.0
+MODCARGO_CRATES += once_cell 1.20.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += parking_lot 0.12.3 # MIT OR Apache-2.0
+MODCARGO_CRATES += parking_lot_core 0.9.10 # MIT OR Apache-2.0
+MODCARGO_CRATES += phf 0.11.2 # MIT
+MODCARGO_CRATES += phf_codegen 0.11.2 # MIT
+MODCARGO_CRATES += phf_generator 0.11.2 # MIT
+MODCARGO_CRATES += phf_shared 0.11.2 # MIT
+MODCARGO_CRATES += pkg-config 0.3.31 # MIT OR Apache-2.0
+MODCARGO_CRATES += portable-atomic 1.9.0 # Apache-2.0 OR MIT
+MODCARGO_CRATES += proc-macro2 1.0.87 # MIT OR Apache-2.0
+MODCARGO_CRATES += quote 1.0.37 # MIT OR Apache-2.0
+MODCARGO_CRATES += rand 0.8.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += rand_core 0.6.4 # MIT OR Apache-2.0
+MODCARGO_CRATES += redox_syscall 0.5.7 # MIT
+MODCARGO_CRATES += rsconf 0.2.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += rust-embed 8.5.0 # MIT
+MODCARGO_CRATES += rust-embed-impl 8.5.0 # MIT
+MODCARGO_CRATES += rust-embed-utils 8.5.0 # MIT
+MODCARGO_CRATES += same-file 1.0.6 # Unlicense/MIT
+MODCARGO_CRATES += scopeguard 1.2.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += serial_test 1.0.0 # MIT
+MODCARGO_CRATES += serial_test_derive 1.0.0 # MIT
+MODCARGO_CRATES += sha2 0.10.8 # MIT OR Apache-2.0
+MODCARGO_CRATES += shlex 1.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += siphasher 0.3.11 # MIT/Apache-2.0
+MODCARGO_CRATES += smallvec 1.13.2 # MIT OR Apache-2.0
+MODCARGO_CRATES += syn 1.0.109 # MIT OR Apache-2.0
+MODCARGO_CRATES += syn 2.0.79 # MIT OR Apache-2.0
+MODCARGO_CRATES += terminfo 0.9.0 # WTFPL
+MODCARGO_CRATES += typenum 1.17.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += unicode-ident 1.0.13 # (MIT OR Apache-2.0) AND
Unicode-DFS-2016
+MODCARGO_CRATES += version_check 0.9.5 # MIT/Apache-2.0
+MODCARGO_CRATES += walkdir 2.5.0 # Unlicense/MIT
+MODCARGO_CRATES += widestring 1.1.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += winapi-util 0.1.9 # Unlicense OR MIT
+MODCARGO_CRATES += windows-sys 0.52.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows-sys 0.59.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows-targets 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_aarch64_gnullvm 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_aarch64_msvc 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_i686_gnu 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_i686_gnullvm 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_i686_msvc 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_x86_64_gnu 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_x86_64_gnullvm 0.52.6 # MIT OR Apache-2.0
+MODCARGO_CRATES += windows_x86_64_msvc 0.52.6 # MIT OR Apache-2.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/shells/fish/distinfo,v
diff -u -p -r1.18 distinfo
--- distinfo 22 Mar 2024 12:28:39 -0000 1.18
+++ distinfo 13 Jan 2025 15:54:33 -0000
@@ -1,2 +1,158 @@
-SHA256 (fish-3.7.1.tar.xz) = YUyfVkPNB5nfOROV+mu8NklCe7g5cizjsRTTu8GjslA=
-SIZE (fish-3.7.1.tar.xz) = 2965756
+SHA256 (cargo/allocator-api2-0.2.18.tar.gz) =
XGy1egQknGSAdm9/fO9UZ0Eq8UkPjR4kMUHa3a2jJk8=
+SHA256 (cargo/autocfg-1.4.0.tar.gz) =
rOULrejmI0qhQNmi9VK77h2001P2m4IXvFA0kPwanyY=
+SHA256 (cargo/bitflags-2.6.0.tar.gz) =
sEj7Y/2LWSP8WqezQNjhVq7H7ALwx4+opt3CYT9vcd4=
+SHA256 (cargo/block-buffer-0.10.4.tar.gz) =
MHjHYpti0/BDlRf6OUmWrKzFy8kcWiDYxljner1QOnE=
+SHA256 (cargo/cc-1.1.30.tar.gz) = sWgDphuB2eq7fq4liHdsTB5YS3OO3kX9u0yXLOwemUU=
+SHA256 (cargo/cfg-if-1.0.0.tar.gz) =
uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0=
+SHA256 (cargo/cfg_aliases-0.2.1.tar.gz) =
YTr+R/zV+sfM8duTurywgsWZTZlvILixWfKtFljrVyQ=
+SHA256 (cargo/cpufeatures-0.2.14.tar.gz) =
YIaX33JQVv6sz6Qs/9ru7D/MxP/Dg1js0ZskPnFqeOA=
+SHA256 (cargo/crypto-common-0.1.6.tar.gz) =
G/sSUC8/xGzKG7Uawo351hjYE83D0vJbn+d1o0rya7M=
+SHA256 (cargo/dashmap-5.5.3.tar.gz) =
l4dHwdhJp9LuXorcAVmWHEj7fl2y8Gr2cjuAEju1OFY=
+SHA256 (cargo/digest-0.10.7.tar.gz) =
ntmigfe8m3V25hRoumFaZqXIz9/0JCCnCqgnAaOx4pI=
+SHA256 (cargo/equivalent-1.0.1.tar.gz) =
VEOAfW3/aTc9Qzq571N4rY31DKYpjK8V3m5S4kqvVNU=
+SHA256 (cargo/errno-0.3.9.tar.gz) =
U0xc9hlN+rPbMkJ2XAO74lfPkvIrOPa8DFjVkQioILo=
+SHA256 (cargo/fish-printf-0.2.1.tar.gz) =
4/4FCAwjKg09qU0eazQfwhB4Ger4Ay/SoUjCTfmu+Vo=
+SHA256 (cargo/fnv-1.0.7.tar.gz) = P57skY0/JAad7LmvFVTK18iA4tokqa/YisoABTGrgsE=
+SHA256 (cargo/foldhash-0.1.3.tar.gz) =
+B7GNpxUWn1A5FibVZdYH6HEQf4czpbdHeQxWZEKNqI=
+SHA256 (cargo/generic-array-0.14.7.tar.gz) =
hWScpR/XInLXghra8nStkcKIJ3cT2cGIINhJmn/2npo=
+SHA256 (cargo/hashbrown-0.14.5.tar.gz) =
5SdEI+F7fJ/CC25+IIUy+bGYJdgt/WFXCLcO3YPfQfE=
+SHA256 (cargo/hashbrown-0.15.0.tar.gz) =
Hgh/hNT4a/SyGLknEphiN0tyGZrn2GV4NfHokADupPs=
+SHA256 (cargo/jobserver-0.1.32.tar.gz) =
SNHby762p/7H4FmECqU4vWKqzPlyxzRsTZ0gWTEoU9A=
+SHA256 (cargo/lazy_static-1.5.0.tar.gz) =
u9K8tMlj8t2uBqLvx+nzWRMSRzxQxmheHymAaDFuZv4=
+SHA256 (cargo/libc-0.2.159.tar.gz) =
Vh2XpTmjbiappfrR6hGjA5pncUaUqqN5Qz5YCFS8PcU=
+SHA256 (cargo/lock_api-0.4.12.tar.gz) =
B6+LnN0oG3kV9BP6c/KevV1V0NPwFVWE2t4f8YzqGxc=
+SHA256 (cargo/log-0.4.22.tar.gz) = p6cLoCS53ATCfqLwwFSP60dOxcVLujOn9y+HOjnQeyQ=
+SHA256 (cargo/lru-0.12.5.tar.gz) = I0z09KBNwfV+JLlswM1gDPKvRg1BYaxezdCvjh87Kjg=
+SHA256 (cargo/memchr-2.7.4.tar.gz) =
eMqasaC6ux59VpXjUwiGKJwYzy+H7BmldaCr3OES46M=
+SHA256 (cargo/minimal-lexical-0.2.1.tar.gz) =
aDVMXGvTbXP/P+zrBe+lm2rLdiZhf0livjIqgl5h95o=
+SHA256 (cargo/nix-0.29.0.tar.gz) = ceJ0bcOiTdeLPPy3vpM2jG3plj0w9Dpqc5mKnPSxe0Y=
+SHA256 (cargo/nom-7.1.3.tar.gz) = 0nOYPFplenCj6PKgEymCLzuMgXK3OCZBGlV1HkBKCko=
+SHA256 (cargo/num-traits-0.2.19.tar.gz) =
Bx38BiaQ6QtzTAsic85yrQ/6lfDHRZa8JQ3P2WAmKEE=
+SHA256 (cargo/once_cell-1.20.2.tar.gz) =
EmH+fjPHOzVOq0OxJzpXyPln0DkegDU+UfdkrALPZ3U=
+SHA256 (cargo/parking_lot-0.12.3.tar.gz) =
8b8YGDz1To1gWWR/wwY2RqGAHPMIlpM+wjEWIsxLmic=
+SHA256 (cargo/parking_lot_core-0.9.10.tar.gz) =
HkAfl3qzhcnk46swYn1vJtAOLHPu8xdJPE7G1GhybPg=
+SHA256 (cargo/phf-0.11.2.tar.gz) = reLYuPM8czO1G88EKNN+IX6fMhkq5HchVvZQY7jOA9w=
+SHA256 (cargo/phf_codegen-0.11.2.tar.gz) =
6NOWiNNZ5rNGVNMo4mIjRmLRbMD2Dsjcvl5xhwk0Klo=
+SHA256 (cargo/phf_generator-0.11.2.tar.gz) =
SOTMZMKtnr5nDLj9ad1QrjAWUDkugcBfm/yy1b28JLA=
+SHA256 (cargo/phf_shared-0.11.2.tar.gz) =
kPy5Xu94TCrHkRnR3YGeFitdqHLObzw6vh6MocCC9ys=
+SHA256 (cargo/pkg-config-0.3.31.tar.gz) =
lT7IYTmNzM4QxnDf6vPsSRHKR56cAhVLOiFReMX1ZvI=
+SHA256 (cargo/portable-atomic-1.9.0.tar.gz) =
zJxoo/baBnU+kzXWPif2uXVN0ZINlBE1t+qCJPFBrbI=
+SHA256 (cargo/proc-macro2-1.0.87.tar.gz) =
s+TaoNz2/rom+YVFfN8QTUtCVvxaCVRxQPNjG7B2sZo=
+SHA256 (cargo/quote-1.0.37.tar.gz) =
tbnTS4mR0Z2YCBtG6s3Y61jG8rIBE598X2Q8wVWmM68=
+SHA256 (cargo/rand-0.8.5.tar.gz) = NK+NGg4lkkvFt8Q8B5yUIznY8Ki1fDkEm+9YG0YydAQ=
+SHA256 (cargo/rand_core-0.6.4.tar.gz) =
7AvkeV4vaigGm+wLX/PirJuvyZ5qmn3DVHmWxcgWkiw=
+SHA256 (cargo/redox_syscall-0.5.7.tar.gz) =
m23+zyx0vOJGbKv5P2Zk1pmKaesh459CB5MAZbJ7dx8=
+SHA256 (cargo/rsconf-0.2.2.tar.gz) =
vSr4WfGvBAHn/HV3c5yHsNI52KXaQA1xcYO8qSM2vNw=
+SHA256 (cargo/rust-embed-8.5.0.tar.gz) =
+mavSk/dXn68J28RXolWEaNHOanBwBAoOD1hLVUJU8A=
+SHA256 (cargo/rust-embed-impl-8.5.0.tar.gz) =
YSXbyIZ5URJe7IcpQTf06cLJZWbmG/csRQlafHd2FHg=
+SHA256 (cargo/rust-embed-utils-8.5.0.tar.gz) =
LlNHd36arLVgObDh8oeFkpqKO3Ceh0gudELHLnwSUp0=
+SHA256 (cargo/same-file-1.0.6.tar.gz) =
k/wdw6qpv+2V4C5urau0uvfjB4sL0bTXtrC2g3iQBQI=
+SHA256 (cargo/scopeguard-1.2.0.tar.gz) =
lBQ/N3JRCfksJi7Sz15ZvOdJjAG8wVAte5r+Q5pOn0k=
+SHA256 (cargo/serial_test-1.0.0.tar.gz) =
U4wwdHroYNb7iDMK3bvT4N2+RtZi0DKFVZbYqMomBhE=
+SHA256 (cargo/serial_test_derive-1.0.0.tar.gz) =
B5qD3xX4XYmmjWSuEjjxQvFysfqRXQ12smp8uhtlmmk=
+SHA256 (cargo/sha2-0.10.8.tar.gz) =
eT23WtK8r8P/p8aLIV/uJo9TeYLNkB0TL4nGND86Pcg=
+SHA256 (cargo/shlex-1.3.0.tar.gz) =
D9ov8NCEAZuk18bzccldj9dc41JMPLj7ZTowI/YyPmQ=
+SHA256 (cargo/siphasher-0.3.11.tar.gz) =
OLWIJ/RGTYfTd9F16Qv1jrAP2HFv8KYvgDVrXmFVXQ0=
+SHA256 (cargo/smallvec-1.13.2.tar.gz) =
PF4ammRtNsNZnNFzpBKC2vR8RFg602e45oNyVZUuXGc=
+SHA256 (cargo/syn-1.0.109.tar.gz) =
crZBkbJ1tm/+JGnorywc/juvpntSnq15Km0BYIiLQjc=
+SHA256 (cargo/syn-2.0.79.tar.gz) = iRMs0L8FCGTh043Du8B6DrjnUwryY0TT0ru++DSZ9ZA=
+SHA256 (cargo/terminfo-0.9.0.tar.gz) =
1OqBDwaS+fUbOC//WJOIe7RYD1+iRv3lRuCxPn/O5mI=
+SHA256 (cargo/typenum-1.17.0.tar.gz) =
Qv8L8MZrgjjG87V43zfQt4SOVd+Fd7P3T5KmmszuuCU=
+SHA256 (cargo/unicode-ident-1.0.13.tar.gz) =
6RtWzUytrrebvxpWRfa0+Nxb3og0rViUqNs1/anvof4=
+SHA256 (cargo/version_check-0.9.5.tar.gz) =
C5KPM9l1/GrZ+GyPKDhTrSa91bELfxVCqi+hXiKJEFo=
+SHA256 (cargo/walkdir-2.5.0.tar.gz) =
KXkJRkBPkdnF0G+YdO/d6h3AbF7+lFQafWhjEI46Xks=
+SHA256 (cargo/widestring-1.0.2.tar.gz) =
ZT8UHznsFrujxavkAKDGDadGgmHMLL82gFAih2vHIag=
+SHA256 (cargo/widestring-1.1.0.tar.gz) =
chnTa26siT+oHoTr4GSF59y7YWF3RpsULfFPH03rExE=
+SHA256 (cargo/winapi-util-0.1.9.tar.gz) =
zyIck+E6MNeT92RaDndixV0WnbsKSWcZGKIxnSibELs=
+SHA256 (cargo/windows-sys-0.52.0.tar.gz) =
KCvl82qM54H62MiuGPo/m+/1fsG1LLPeB4kgFCXZoz0=
+SHA256 (cargo/windows-sys-0.59.0.tar.gz) =
Hji8TXntZ/0HW8wlGhw5syoXdrvpLlvvHwvx+MUxhTs=
+SHA256 (cargo/windows-targets-0.52.6.tar.gz) =
m3JPcnluA2q5DBAh1HgNTT1kispZ5JHmuY5yW4TpmXM=
+SHA256 (cargo/windows_aarch64_gnullvm-0.52.6.tar.gz) =
MqRiIYDnoOwES7VVQEyAC8n9nsJi7BR+3VmJzNDALNM=
+SHA256 (cargo/windows_aarch64_msvc-0.52.6.tar.gz) =
Cewqe7FS4iUrU/p4AxUAB4eVSLxwnAOd92J8q70F1Gk=
+SHA256 (cargo/windows_i686_gnu-0.52.6.tar.gz) =
jpta1auALpfrjilaxnIOUJ7kwkP2nXgTlAFOv+i7+gs=
+SHA256 (cargo/windows_i686_gnullvm-0.52.6.tar.gz) =
Du5S04wJCzyqdsVjuGw6S9ce8agZKHwZ1YbXM0ro7WY=
+SHA256 (cargo/windows_i686_msvc-0.52.6.tar.gz) =
JAlIvAXF58bau6KL+J2J/84+MDAigJ5z3q7+T27FbGY=
+SHA256 (cargo/windows_x86_64_gnu-0.52.6.tar.gz) =
FHpcgKq/vwx9kBy1iV0d4w7ykH6yH7urKcqUxbCLGng=
+SHA256 (cargo/windows_x86_64_gnullvm-0.52.6.tar.gz) =
JNWyPcQXQSZ5aBOW8rSfPejBRz3rUWvTRBCHLv9R7Q0=
+SHA256 (cargo/windows_x86_64_msvc-0.52.6.tar.gz) =
WJ9tqExkYgR0fRJwoqVmHqZu0cztJjHVRv37FVlZ+ew=
+SHA256 (fish-4.0b1.tar.xz) = U0M04Q+FciIU6dr/gqV8w1ASNVI/FvjxMcI0Tk7Jjac=
+SHA256 (fish-shell-rust-pcre2-0.2.9-utf32.tar.gz) =
5a8G17c3tm90dqIj6KbNHiscqDSziz3liQHU288KBU0=
+SIZE (cargo/allocator-api2-0.2.18.tar.gz) = 62504
+SIZE (cargo/autocfg-1.4.0.tar.gz) = 17712
+SIZE (cargo/bitflags-2.6.0.tar.gz) = 45357
+SIZE (cargo/block-buffer-0.10.4.tar.gz) = 10538
+SIZE (cargo/cc-1.1.30.tar.gz) = 84509
+SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934
+SIZE (cargo/cfg_aliases-0.2.1.tar.gz) = 6355
+SIZE (cargo/cpufeatures-0.2.14.tar.gz) = 13165
+SIZE (cargo/crypto-common-0.1.6.tar.gz) = 8760
+SIZE (cargo/dashmap-5.5.3.tar.gz) = 24061
+SIZE (cargo/digest-0.10.7.tar.gz) = 19557
+SIZE (cargo/equivalent-1.0.1.tar.gz) = 6615
+SIZE (cargo/errno-0.3.9.tar.gz) = 10690
+SIZE (cargo/fish-printf-0.2.1.tar.gz) = 27351
+SIZE (cargo/fnv-1.0.7.tar.gz) = 11266
+SIZE (cargo/foldhash-0.1.3.tar.gz) = 13712
+SIZE (cargo/generic-array-0.14.7.tar.gz) = 15950
+SIZE (cargo/hashbrown-0.14.5.tar.gz) = 141498
+SIZE (cargo/hashbrown-0.15.0.tar.gz) = 136460
+SIZE (cargo/jobserver-0.1.32.tar.gz) = 27549
+SIZE (cargo/lazy_static-1.5.0.tar.gz) = 14025
+SIZE (cargo/libc-0.2.159.tar.gz) = 755366
+SIZE (cargo/lock_api-0.4.12.tar.gz) = 27591
+SIZE (cargo/log-0.4.22.tar.gz) = 44027
+SIZE (cargo/lru-0.12.5.tar.gz) = 16047
+SIZE (cargo/memchr-2.7.4.tar.gz) = 96670
+SIZE (cargo/minimal-lexical-0.2.1.tar.gz) = 94841
+SIZE (cargo/nix-0.29.0.tar.gz) = 318248
+SIZE (cargo/nom-7.1.3.tar.gz) = 117570
+SIZE (cargo/num-traits-0.2.19.tar.gz) = 51631
+SIZE (cargo/once_cell-1.20.2.tar.gz) = 33394
+SIZE (cargo/parking_lot-0.12.3.tar.gz) = 41860
+SIZE (cargo/parking_lot_core-0.9.10.tar.gz) = 32406
+SIZE (cargo/phf-0.11.2.tar.gz) = 21569
+SIZE (cargo/phf_codegen-0.11.2.tar.gz) = 12977
+SIZE (cargo/phf_generator-0.11.2.tar.gz) = 14190
+SIZE (cargo/phf_shared-0.11.2.tar.gz) = 14284
+SIZE (cargo/pkg-config-0.3.31.tar.gz) = 20880
+SIZE (cargo/portable-atomic-1.9.0.tar.gz) = 166365
+SIZE (cargo/proc-macro2-1.0.87.tar.gz) = 49121
+SIZE (cargo/quote-1.0.37.tar.gz) = 28558
+SIZE (cargo/rand-0.8.5.tar.gz) = 87113
+SIZE (cargo/rand_core-0.6.4.tar.gz) = 22666
+SIZE (cargo/redox_syscall-0.5.7.tar.gz) = 26249
+SIZE (cargo/rsconf-0.2.2.tar.gz) = 16338
+SIZE (cargo/rust-embed-8.5.0.tar.gz) = 904054
+SIZE (cargo/rust-embed-impl-8.5.0.tar.gz) = 6004
+SIZE (cargo/rust-embed-utils-8.5.0.tar.gz) = 3445
+SIZE (cargo/same-file-1.0.6.tar.gz) = 10183
+SIZE (cargo/scopeguard-1.2.0.tar.gz) = 11619
+SIZE (cargo/serial_test-1.0.0.tar.gz) = 7912
+SIZE (cargo/serial_test_derive-1.0.0.tar.gz) = 5715
+SIZE (cargo/sha2-0.10.8.tar.gz) = 26357
+SIZE (cargo/shlex-1.3.0.tar.gz) = 18713
+SIZE (cargo/siphasher-0.3.11.tar.gz) = 10442
+SIZE (cargo/smallvec-1.13.2.tar.gz) = 35216
+SIZE (cargo/syn-1.0.109.tar.gz) = 237611
+SIZE (cargo/syn-2.0.79.tar.gz) = 268981
+SIZE (cargo/terminfo-0.9.0.tar.gz) = 45420
+SIZE (cargo/typenum-1.17.0.tar.gz) = 42849
+SIZE (cargo/unicode-ident-1.0.13.tar.gz) = 43279
+SIZE (cargo/version_check-0.9.5.tar.gz) = 15554
+SIZE (cargo/walkdir-2.5.0.tar.gz) = 23951
+SIZE (cargo/widestring-1.0.2.tar.gz) = 79706
+SIZE (cargo/widestring-1.1.0.tar.gz) = 85046
+SIZE (cargo/winapi-util-0.1.9.tar.gz) = 12464
+SIZE (cargo/windows-sys-0.52.0.tar.gz) = 2576877
+SIZE (cargo/windows-sys-0.59.0.tar.gz) = 2387323
+SIZE (cargo/windows-targets-0.52.6.tar.gz) = 6403
+SIZE (cargo/windows_aarch64_gnullvm-0.52.6.tar.gz) = 435718
+SIZE (cargo/windows_aarch64_msvc-0.52.6.tar.gz) = 832615
+SIZE (cargo/windows_i686_gnu-0.52.6.tar.gz) = 880402
+SIZE (cargo/windows_i686_gnullvm-0.52.6.tar.gz) = 475940
+SIZE (cargo/windows_i686_msvc-0.52.6.tar.gz) = 901163
+SIZE (cargo/windows_x86_64_gnu-0.52.6.tar.gz) = 836363
+SIZE (cargo/windows_x86_64_gnullvm-0.52.6.tar.gz) = 435707
+SIZE (cargo/windows_x86_64_msvc-0.52.6.tar.gz) = 832564
+SIZE (fish-4.0b1.tar.xz) = 3037344
+SIZE (fish-shell-rust-pcre2-0.2.9-utf32.tar.gz) = 742431
Index: patches/patch-Cargo_toml
===================================================================
RCS file: patches/patch-Cargo_toml
diff -N patches/patch-Cargo_toml
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Cargo_toml 13 Jan 2025 15:54:33 -0000
@@ -0,0 +1,28 @@
+Index: Cargo.toml
+--- Cargo.toml.orig
++++ Cargo.toml
+@@ -1,6 +1,5 @@
+ [workspace]
+ resolver = "2"
+-members = ["printf"]
+
+ [workspace.package]
+ rust-version = "1.70"
+@@ -24,7 +23,7 @@ homepage = "https://fishshell.com";
+ readme = "README.rst"
+
+ [dependencies]
+-pcre2 = { git = "https://github.com/fish-shell/rust-pcre2";, tag =
"0.2.9-utf32", default-features = false, features = [
++pcre2 = { path = "../rust-pcre2-0.2.9-utf32", default-features = false,
features = [
+ "utf32",
+ ] }
+
+@@ -44,7 +43,7 @@ nix = { version = "0.29.0", default-features = false,
+ ] }
+ num-traits = "0.2.19"
+ once_cell = "1.19.0"
+-fish-printf = { path = "./printf", features = ["widestring"] }
++fish-printf = { version = "0.2.1", features = ["widestring"] }
+
+ # Don't use the "getrandom" feature as it requires "getentropy" which was not
+ # available on macOS < 10.12. We can enable "getrandom" when we raise the
Index: patches/patch-src_common_rs
===================================================================
RCS file: patches/patch-src_common_rs
diff -N patches/patch-src_common_rs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_rs 13 Jan 2025 15:54:33 -0000
@@ -0,0 +1,12 @@
+Index: src/common.rs
+--- src/common.rs.orig
++++ src/common.rs
+@@ -1685,7 +1685,7 @@ pub fn get_executable_path(argv0: impl AsRef<Path>) ->
+ }
+ return path;
+ }
+- argv0.as_ref().to_owned()
++ PathBuf::from("${PREFIX}/bin/fish")
+ }
+
+ /// A RAII cleanup object. Unlike in C++ where there is no borrow checker, we
can't just provide a
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/shells/fish/pkg/PLIST,v
diff -u -p -r1.23 PLIST
--- pkg/PLIST 28 May 2024 16:48:41 -0000 1.23
+++ pkg/PLIST 13 Jan 2025 15:54:33 -0000
@@ -1,6 +1,14 @@
@shell bin/fish
@bin bin/fish_indent
@bin bin/fish_key_reader
+@man man/man1/fish-completions.1
+@man man/man1/fish-doc.1
+@man man/man1/fish-faq.1
+@man man/man1/fish-for-bash-users.1
+@man man/man1/fish-interactive.1
+@man man/man1/fish-language.1
+@man man/man1/fish-prompt-tutorial.1
+@man man/man1/fish-tutorial.1
@man man/man1/fish.1
@man man/man1/fish_indent.1
@man man/man1/fish_key_reader.1
@@ -56,6 +64,7 @@ share/doc/fish/cmds/end.html
share/doc/fish/cmds/eval.html
share/doc/fish/cmds/exec.html
share/doc/fish/cmds/exit.html
+share/doc/fish/cmds/export.html
share/doc/fish/cmds/false.html
share/doc/fish/cmds/fg.html
share/doc/fish/cmds/fish.html
@@ -77,6 +86,7 @@ share/doc/fish/cmds/fish_mode_prompt.htm
share/doc/fish/cmds/fish_opt.html
share/doc/fish/cmds/fish_prompt.html
share/doc/fish/cmds/fish_right_prompt.html
+share/doc/fish/cmds/fish_should_add_to_history.html
share/doc/fish/cmds/fish_status_to_signal.html
share/doc/fish/cmds/fish_svn_prompt.html
share/doc/fish/cmds/fish_title.html
@@ -148,6 +158,7 @@ share/doc/fish/cmds/wait.html
share/doc/fish/cmds/while.html
share/doc/fish/commands.html
share/doc/fish/completions.html
+share/doc/fish/contributing.html
share/doc/fish/design.html
share/doc/fish/faq.html
share/doc/fish/fish_for_bash_users.html
@@ -185,6 +196,7 @@ share/fish/completions/acat.fish
share/fish/completions/accept.fish
share/fish/completions/ack.fish
share/fish/completions/acpi.fish
+share/fish/completions/actionlint.fish
share/fish/completions/adb.fish
share/fish/completions/adduser.fish
share/fish/completions/adiff.fish
@@ -241,6 +253,7 @@ share/fish/completions/arepack.fish
share/fish/completions/argparse.fish
share/fish/completions/ark.fish
share/fish/completions/arp.fish
+share/fish/completions/arping.fish
share/fish/completions/as.fish
share/fish/completions/asciidoctor.fish
share/fish/completions/asciinema.fish
@@ -281,6 +294,7 @@ share/fish/completions/bower.fish
share/fish/completions/break.fish
share/fish/completions/brew.fish
share/fish/completions/brightnessctl.fish
+share/fish/completions/bru.fish
share/fish/completions/btdownloadcurses.py.fish
share/fish/completions/btdownloadheadless.py.fish
share/fish/completions/btrfs.fish
@@ -302,6 +316,7 @@ share/fish/completions/camcontrol.fish
share/fish/completions/cancel.fish
share/fish/completions/canto.fish
share/fish/completions/cargo.fish
+share/fish/completions/cascadia.fish
share/fish/completions/castnow.fish
share/fish/completions/cat.fish
share/fish/completions/cd.fish
@@ -329,6 +344,8 @@ share/fish/completions/cmark.fish
share/fish/completions/cmd.fish
share/fish/completions/cmdkey.fish
share/fish/completions/cobra-cli.fish
+share/fish/completions/code-exploration.fish
+share/fish/completions/code-insiders.fish
share/fish/completions/code.fish
share/fish/completions/color.fish
share/fish/completions/colordiff.fish
@@ -362,6 +379,7 @@ share/fish/completions/csc.fish
share/fish/completions/csh.fish
share/fish/completions/csharp.fish
share/fish/completions/csi.fish
+share/fish/completions/csvlens.fish
share/fish/completions/cupsaccept.fish
share/fish/completions/cupsdisable.fish
share/fish/completions/cupsenable.fish
@@ -379,7 +397,9 @@ share/fish/completions/date.fish
share/fish/completions/dconf.fish
share/fish/completions/dd.fish
share/fish/completions/defaults.fish
+@comment share/fish/completions/delta.fish
share/fish/completions/deno.fish
+share/fish/completions/devspace.fish
share/fish/completions/df.fish
share/fish/completions/dhclient.fish
share/fish/completions/dhcpcd.fish
@@ -410,8 +430,10 @@ share/fish/completions/dropdb.fish
share/fish/completions/dscacheutil.fish
share/fish/completions/du.fish
share/fish/completions/dua.fish
+share/fish/completions/duf.fish
share/fish/completions/dumpcap.fish
share/fish/completions/duply.fish
+share/fish/completions/dust.fish
share/fish/completions/dvipdf.fish
share/fish/completions/dvipdfm.fish
share/fish/completions/ebuild.fish
@@ -463,6 +485,7 @@ share/fish/completions/find.fish
share/fish/completions/findstr.fish
share/fish/completions/firefox-developer-edition.fish
share/fish/completions/firefox.fish
+share/fish/completions/firejail.fish
share/fish/completions/firewall-cmd.fish
share/fish/completions/fish.fish
share/fish/completions/fish_add_path.fish
@@ -473,6 +496,7 @@ share/fish/completions/fish_key_reader.f
share/fish/completions/fish_opt.fish
share/fish/completions/flac.fish
share/fish/completions/flatpak.fish
+share/fish/completions/flux.fish
share/fish/completions/fluxbox-remote.fish
share/fish/completions/for.fish
share/fish/completions/forfiles.fish
@@ -493,12 +517,14 @@ share/fish/completions/gacutil.fish
share/fish/completions/gapplication.fish
share/fish/completions/gcc.fish
share/fish/completions/gdb.fish
+share/fish/completions/gdbserver.fish
share/fish/completions/gdbus.fish
share/fish/completions/gem.fish
share/fish/completions/gendarme.fish
share/fish/completions/gh.fish
share/fish/completions/gimp.fish
share/fish/completions/gio.fish
+share/fish/completions/git-lfs.fish
share/fish/completions/git-sizer.fish
share/fish/completions/git.fish
share/fish/completions/gitk.fish
@@ -528,6 +554,8 @@ share/fish/completions/grub-install.fish
share/fish/completions/grub-mkrescue.fish
share/fish/completions/grunt.fish
share/fish/completions/gsettings.fish
+share/fish/completions/guild.fish
+share/fish/completions/guile.fish
share/fish/completions/gunzip.fish
share/fish/completions/gv.fish
share/fish/completions/gvim.fish
@@ -552,6 +580,7 @@ share/fish/completions/hugo.fish
share/fish/completions/hwinfo.fish
share/fish/completions/i3-msg.fish
share/fish/completions/ibmcloud.fish
+share/fish/completions/ibus.fish
share/fish/completions/icdiff.fish
share/fish/completions/iconv.fish
share/fish/completions/id.fish
@@ -561,6 +590,7 @@ share/fish/completions/if.fish
share/fish/completions/ifconfig.fish
share/fish/completions/ifdata.fish
share/fish/completions/ifdown.fish
+share/fish/completions/iftop.fish
share/fish/completions/ifup.fish
share/fish/completions/ikdasm.fish
share/fish/completions/ilasm.fish
@@ -580,11 +610,15 @@ share/fish/completions/java_home.fish
share/fish/completions/jbake.fish
share/fish/completions/jest.fish
share/fish/completions/jhipster.fish
+share/fish/completions/jj.fish
+share/fish/completions/jnv.fish
share/fish/completions/jobs.fish
share/fish/completions/john.fish
share/fish/completions/journalctl.fish
share/fish/completions/jq.fish
share/fish/completions/julia.fish
+share/fish/completions/just.fish
+share/fish/completions/jv.fish
share/fish/completions/k3d.fish
share/fish/completions/kak.fish
share/fish/completions/kb.fish
@@ -600,9 +634,11 @@ share/fish/completions/kldload.fish
share/fish/completions/kldunload.fish
share/fish/completions/kmutil.fish
share/fish/completions/konsole.fish
+share/fish/completions/kops.fish
share/fish/completions/krita.fish
share/fish/completions/ksh.fish
share/fish/completions/kubectl.fish
+share/fish/completions/kustomize.fish
share/fish/completions/latex.fish
share/fish/completions/latexmk.fish
share/fish/completions/launchctl.fish
@@ -611,6 +647,7 @@ share/fish/completions/lein.fish
share/fish/completions/less.fish
share/fish/completions/light.fish
share/fish/completions/lightdm.fish
+share/fish/completions/llm.fish
share/fish/completions/ln.fish
share/fish/completions/loadkeys.fish
share/fish/completions/localectl.fish
@@ -629,6 +666,7 @@ share/fish/completions/lpr.fish
share/fish/completions/lprm.fish
share/fish/completions/lpstat.fish
share/fish/completions/ls.fish
+share/fish/completions/lsb_release.fish
share/fish/completions/lsblk.fish
share/fish/completions/lscpu.fish
share/fish/completions/lsof.fish
@@ -644,6 +682,7 @@ share/fish/completions/lz4cat.fish
share/fish/completions/m4.fish
share/fish/completions/machinectl.fish
share/fish/completions/magento.fish
+share/fish/completions/magick.fish
share/fish/completions/make.fish
share/fish/completions/makedepend.fish
share/fish/completions/makensis.fish
@@ -727,6 +766,7 @@ share/fish/completions/nmcli.fish
share/fish/completions/node.fish
share/fish/completions/nodeenv.fish
share/fish/completions/not.fish
+share/fish/completions/notify-send.fish
share/fish/completions/npm.fish
share/fish/completions/nu.fish
share/fish/completions/nvim.fish
@@ -768,6 +808,7 @@ share/fish/completions/patch.fish
share/fish/completions/path.fish
share/fish/completions/patool.fish
share/fish/completions/pbget.fish
+share/fish/completions/pbpaste.fish
share/fish/completions/pdfelatex.fish
share/fish/completions/pdfetex.fish
share/fish/completions/pdflatex.fish
@@ -864,6 +905,7 @@ share/fish/completions/rename.fish
share/fish/completions/renice.fish
share/fish/completions/resolvectl.fish
share/fish/completions/return.fish
+share/fish/completions/reuse.fish
share/fish/completions/rfkill.fish
share/fish/completions/rgrep.fish
share/fish/completions/rm.fish
@@ -887,6 +929,8 @@ share/fish/completions/rstpep2html.fish
share/fish/completions/rsync.fish
share/fish/completions/ruby-build.fish
share/fish/completions/ruby.fish
+share/fish/completions/ruff.fish
+share/fish/completions/run0.fish
share/fish/completions/rustc.fish
share/fish/completions/rustup.fish
share/fish/completions/s3cmd.fish
@@ -937,6 +981,7 @@ share/fish/completions/sphinx-quickstart
share/fish/completions/sqlsharp.fish
share/fish/completions/src.fish
share/fish/completions/ssh-copy-id.fish
+share/fish/completions/ssh-keygen.fish
share/fish/completions/ssh.fish
share/fish/completions/sshfs.fish
share/fish/completions/stack.fish
@@ -961,6 +1006,7 @@ share/fish/completions/systemd-analyze.f
share/fish/completions/systemd-cryptenroll.fish
share/fish/completions/systemd-nspawn.fish
share/fish/completions/tail.fish
+share/fish/completions/tailscale.fish
share/fish/completions/tar.fish
share/fish/completions/tcpdump.fish
share/fish/completions/tcsh.fish
@@ -968,6 +1014,7 @@ share/fish/completions/tee.fish
share/fish/completions/telnet.fish
share/fish/completions/termite.fish
share/fish/completions/terraform.fish
+share/fish/completions/test-spice.fish
share/fish/completions/test.fish
share/fish/completions/tex.fish
share/fish/completions/tig.fish
@@ -977,6 +1024,7 @@ share/fish/completions/timeout.fish
share/fish/completions/tmutil.fish
share/fish/completions/tmux.fish
share/fish/completions/tmuxinator.fish
+share/fish/completions/tofu.fish
share/fish/completions/tokei.fish
share/fish/completions/toot.fish
share/fish/completions/top.fish
@@ -1001,6 +1049,7 @@ share/fish/completions/tshark.fish
share/fish/completions/ttx.fish
share/fish/completions/tuned-adm.fish
share/fish/completions/type.fish
+share/fish/completions/typst.fish
share/fish/completions/udevadm.fish
share/fish/completions/udisksctl.fish
share/fish/completions/ulimit.fish
@@ -1022,6 +1071,7 @@ share/fish/completions/userdel.fish
share/fish/completions/usermod.fish
share/fish/completions/vagrant.fish
share/fish/completions/valgrind.fish
+share/fish/completions/validate-spice.fish
share/fish/completions/vared.fish
share/fish/completions/vbc.fish
share/fish/completions/vi.fish
@@ -1034,11 +1084,14 @@ share/fish/completions/vmctl.fish
share/fish/completions/w.fish
share/fish/completions/wait.fish
share/fish/completions/wajig.fish
+share/fish/completions/warp-cli.fish
share/fish/completions/watch.fish
share/fish/completions/watchexec.fish
share/fish/completions/wc.fish
+share/fish/completions/web-ext.fish
share/fish/completions/wesnoth.fish
share/fish/completions/wg-quick.fish
+share/fish/completions/wg.fish
share/fish/completions/wget.fish
share/fish/completions/whatis.fish
share/fish/completions/which.fish
@@ -1051,6 +1104,7 @@ share/fish/completions/windscribe.fish
share/fish/completions/wine.fish
share/fish/completions/wineboot.fish
share/fish/completions/winemaker.fish
+share/fish/completions/winetricks.fish
share/fish/completions/wireshark.fish
share/fish/completions/wish.fish
share/fish/completions/wpa_cli.fish
@@ -1074,6 +1128,7 @@ share/fish/completions/xbps-rindex.fish
share/fish/completions/xbps-uchroot.fish
share/fish/completions/xbps-uhelper.fish
share/fish/completions/xclip.fish
+share/fish/completions/xcodes.fish
share/fish/completions/xdg-mime.fish
share/fish/completions/xdvi.fish
share/fish/completions/xed.fish
@@ -1100,11 +1155,13 @@ share/fish/completions/xxh64sum.fish
share/fish/completions/xxhsum.fish
share/fish/completions/xz.fish
share/fish/completions/yadm.fish
+share/fish/completions/yajsv.fish
share/fish/completions/yaourt.fish
share/fish/completions/yarn.fish
share/fish/completions/yash.fish
share/fish/completions/yast2.fish
share/fish/completions/ykman.fish
+share/fish/completions/yo.fish
share/fish/completions/yum.fish
share/fish/completions/zabbix_agent2.fish
share/fish/completions/zabbix_agentd.fish
@@ -1115,6 +1172,8 @@ share/fish/completions/zabbix_sender.fis
share/fish/completions/zabbix_server.fish
share/fish/completions/zabbix_web_service.fish
share/fish/completions/zcat.fish
+share/fish/completions/zed-preview.fish
+share/fish/completions/zed.fish
share/fish/completions/zef.fish
share/fish/completions/zfs.fish
share/fish/completions/zig.fish
@@ -1133,12 +1192,16 @@ share/fish/config.fish
share/fish/functions/
share/fish/functions/N_.fish
share/fish/functions/__fish_any_arg_in.fish
+share/fish/functions/__fish_anyeditor.fish
share/fish/functions/__fish_anypager.fish
share/fish/functions/__fish_anypython.fish
share/fish/functions/__fish_append.fish
share/fish/functions/__fish_apropos.fish
share/fish/functions/__fish_argcomplete_complete.fish
+share/fish/functions/__fish_cache_sourced_completions.fish
share/fish/functions/__fish_cancel_commandline.fish
+share/fish/functions/__fish_change_key_bindings.fish
+share/fish/functions/__fish_cmd__complete_args.fish
share/fish/functions/__fish_commandline_is_singlequoted.fish
share/fish/functions/__fish_complete_atool_archive_contents.fish
share/fish/functions/__fish_complete_bittorrent.fish
@@ -1149,6 +1212,7 @@ share/fish/functions/__fish_complete_com
share/fish/functions/__fish_complete_convert_options.fish
share/fish/functions/__fish_complete_directories.fish
share/fish/functions/__fish_complete_docutils.fish
+share/fish/functions/__fish_complete_freedesktop_icons.fish
share/fish/functions/__fish_complete_ftp.fish
share/fish/functions/__fish_complete_gpg.fish
share/fish/functions/__fish_complete_gpg_key_id.fish
@@ -1159,6 +1223,7 @@ share/fish/functions/__fish_complete_job
share/fish/functions/__fish_complete_list.fish
share/fish/functions/__fish_complete_lpr.fish
share/fish/functions/__fish_complete_lpr_option.fish
+share/fish/functions/__fish_complete_magick.fish
share/fish/functions/__fish_complete_man.fish
share/fish/functions/__fish_complete_mount_opts.fish
share/fish/functions/__fish_complete_mysql.fish
@@ -1182,16 +1247,20 @@ share/fish/functions/__fish_complete_zfs
share/fish/functions/__fish_complete_zfs_ro_properties.fish
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_interactive.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_describe_command.fish
+share/fish/functions/__fish_echo.fish
+share/fish/functions/__fish_edit_command_if_at_cursor.fish
share/fish/functions/__fish_first_token.fish
share/fish/functions/__fish_git_prompt.fish
share/fish/functions/__fish_gnu_complete.fish
share/fish/functions/__fish_hg_prompt.fish
+share/fish/functions/__fish_indent.fish
share/fish/functions/__fish_is_first_arg.fish
share/fish/functions/__fish_is_first_token.fish
share/fish/functions/__fish_is_git_repository.fish
@@ -1212,6 +1281,7 @@ share/fish/functions/__fish_nth_token.fi
share/fish/functions/__fish_number_of_cmd_args_wo_opts.fish
share/fish/functions/__fish_paginate.fish
share/fish/functions/__fish_parent_directories.fish
+share/fish/functions/__fish_paste.fish
share/fish/functions/__fish_prepend_sudo.fish
share/fish/functions/__fish_prev_arg_in.fish
share/fish/functions/__fish_preview_current_file.fish
@@ -1261,6 +1331,7 @@ share/fish/functions/__fish_print_xwindo
share/fish/functions/__fish_print_zfs_snapshots.fish
share/fish/functions/__fish_ps.fish
share/fish/functions/__fish_pwd.fish
+share/fish/functions/__fish_reg__complete_keys.fish
share/fish/functions/__fish_seen_argument.fish
share/fish/functions/__fish_seen_subcommand_from.fish
share/fish/functions/__fish_set_locale.fish
@@ -1331,9 +1402,11 @@ share/fish/functions/la.fish
share/fish/functions/ll.fish
share/fish/functions/ls.fish
share/fish/functions/man.fish
+share/fish/functions/nextd-or-forward-token.fish
share/fish/functions/nextd.fish
share/fish/functions/open.fish
share/fish/functions/popd.fish
+share/fish/functions/prevd-or-backward-token.fish
share/fish/functions/prevd.fish
share/fish/functions/prompt_hostname.fish
share/fish/functions/prompt_login.fish
@@ -1383,6 +1456,7 @@ share/fish/man/man1/
@man share/fish/man/man1/eval.1
@man share/fish/man/man1/exec.1
@man share/fish/man/man1/exit.1
+@man share/fish/man/man1/export.1
@man share/fish/man/man1/false.1
@man share/fish/man/man1/fg.1
@man share/fish/man/man1/fish-completions.1
@@ -1413,6 +1487,7 @@ share/fish/man/man1/
@man share/fish/man/man1/fish_opt.1
@man share/fish/man/man1/fish_prompt.1
@man share/fish/man/man1/fish_right_prompt.1
+@man share/fish/man/man1/fish_should_add_to_history.1
@man share/fish/man/man1/fish_status_to_signal.1
@man share/fish/man/man1/fish_svn_prompt.1
@man share/fish/man/man1/fish_title.1
@@ -1493,26 +1568,14 @@ share/fish/tools/web_config/
${MODPY_COMMENT}share/fish/tools/web_config/${MODPY_PYCACHE}/
share/fish/tools/web_config/${MODPY_PYCACHE}webconfig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
share/fish/tools/web_config/${MODPY_PYCACHE}webconfig.${MODPY_PYC_MAGIC_TAG}pyc
-share/fish/tools/web_config/delete.png
share/fish/tools/web_config/favicon.png
share/fish/tools/web_config/fishconfig.css
share/fish/tools/web_config/fishconfig_print.css
share/fish/tools/web_config/index.html
share/fish/tools/web_config/js/
-share/fish/tools/web_config/js/angular-route.js
-share/fish/tools/web_config/js/angular-sanitize.js
-share/fish/tools/web_config/js/angular.js
-share/fish/tools/web_config/js/app.js
+share/fish/tools/web_config/js/alpine.js
share/fish/tools/web_config/js/colorutils.js
-share/fish/tools/web_config/js/controllers.js
-share/fish/tools/web_config/js/filters.js
-share/fish/tools/web_config/partials/
-share/fish/tools/web_config/partials/bindings.html
-share/fish/tools/web_config/partials/colors.html
-share/fish/tools/web_config/partials/functions.html
-share/fish/tools/web_config/partials/history.html
-share/fish/tools/web_config/partials/prompt.html
-share/fish/tools/web_config/partials/variables.html
+share/fish/tools/web_config/js/main.js
share/fish/tools/web_config/sample_prompts/
share/fish/tools/web_config/sample_prompts/acidhub.fish
share/fish/tools/web_config/sample_prompts/arrow.fish
