9 files changed, 20 insertions, 22 deletions
diff --git a/shells/antibody/Makefile b/shells/antibody/Makefile
index cf2ccd5f6243..e73b4411f7a0 100644
--- a/shells/antibody/Makefile
+++ b/shells/antibody/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	antibody
 PORTVERSION=	6.1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	shells
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/shells/carapace/Makefile b/shells/carapace/Makefile
index 0fdd537ea581..4efafc49961d 100644
--- a/shells/carapace/Makefile
+++ b/shells/carapace/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	carapace
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.1
-PORTREVISION=	1
+DISTVERSION=	1.5.0
 CATEGORIES=	shells
 
 MAINTAINER=	tagattie@FreeBSD.org
diff --git a/shells/carapace/distinfo b/shells/carapace/distinfo
index 8d67bfc7c2fc..05b51ebaee3c 100644
--- a/shells/carapace/distinfo
+++ b/shells/carapace/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1753581015
-SHA256 (go/shells_carapace/carapace-v1.4.1/v1.4.1.mod) = 0059b397499a9b57a503a220c26c030767a1e420f56518d10924f239dc1b7c25
-SIZE (go/shells_carapace/carapace-v1.4.1/v1.4.1.mod) = 670
-SHA256 (go/shells_carapace/carapace-v1.4.1/v1.4.1.zip) = 1185f97a93fe318323ae23075c70177c78c3f1476c638fa96d1ea124a25fdcba
-SIZE (go/shells_carapace/carapace-v1.4.1/v1.4.1.zip) = 21683245
+TIMESTAMP = 1757473287
+SHA256 (go/shells_carapace/carapace-v1.5.0/v1.5.0.mod) = f6b957a438b5cee5b6aea463bdc86416a93be33deb823341cbad7b36941b15ad
+SIZE (go/shells_carapace/carapace-v1.5.0/v1.5.0.mod) = 670
+SHA256 (go/shells_carapace/carapace-v1.5.0/v1.5.0.zip) = 148877b09bd68e62b61936a36091e6b984e4ffd36cf40a69c10c6b165959dc18
+SIZE (go/shells_carapace/carapace-v1.5.0/v1.5.0.zip) = 22259726
diff --git a/shells/elvish/Makefile b/shells/elvish/Makefile
index 28c2e3a332fb..8c80e13198a4 100644
--- a/shells/elvish/Makefile
+++ b/shells/elvish/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	elvish
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.21.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	shells
 
 MAINTAINER=	vendion@gmail.com
diff --git a/shells/envy/Makefile b/shells/envy/Makefile
index 2e988dcf7f5f..08ea612b77bd 100644
--- a/shells/envy/Makefile
+++ b/shells/envy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	envy
 DISTVERSIONPREFIX=v
 DISTVERSION=	0.1.0
-PORTREVISION=	29
+PORTREVISION=	30
 CATEGORIES=	shells
 
 MAINTAINER=	krion@FreeBSD.org
diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index cacee4df796f..42035832bc06 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,13 +1,8 @@
 PORTNAME=	fish
-DISTVERSION=	4.0.2
-PORTREVISION=	3
+DISTVERSION=	4.0.6
 CATEGORIES=	shells
 MASTER_SITES=	https://github.com/fish-shell/fish-shell/releases/download/${PORTVERSION}/
 
-PATCH_SITES=	https://github.com/fish-shell/fish-shell/pull/
-# https://github.com/fish-shell/fish-shell/pull/11486
-PATCHFILES+=	11486.patch:-p1
-
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	User friendly command line shell
 WWW=		https://fishshell.com/
diff --git a/shells/fish/Makefile.crates b/shells/fish/Makefile.crates
index edf2c9b1a2ac..32fbba054465 100644
--- a/shells/fish/Makefile.crates
+++ b/shells/fish/Makefile.crates
@@ -58,6 +58,8 @@ CARGO_CRATES=	allocator-api2-0.2.18 \
 		terminfo-0.9.0 \
 		typenum-1.17.0 \
 		unicode-ident-1.0.13 \
+		unicode-segmentation-1.12.0 \
+		unicode-width-0.2.0 \
 		version_check-0.9.5 \
 		walkdir-2.5.0 \
 		widestring-1.1.0 \
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index 795c2ff3d1f4..12b30b655637 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1747413660
-SHA256 (fish-4.0.2.tar.xz) = 6e1ecdb164285fc057b2f35acbdc20815c1623099e7bb47bbfc011120adf7e83
-SIZE (fish-4.0.2.tar.xz) = 3055064
+TIMESTAMP = 1757691125
+SHA256 (fish-4.0.6.tar.xz) = 125d9ce0dd8a3704dc0782925df34f0208bffc42af5f34914449d14c34b5dae1
+SIZE (fish-4.0.6.tar.xz) = 3057300
 SHA256 (rust/crates/allocator-api2-0.2.18.crate) = 5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f
 SIZE (rust/crates/allocator-api2-0.2.18.crate) = 62504
 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
@@ -121,6 +121,10 @@ SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e
 SIZE (rust/crates/typenum-1.17.0.crate) = 42849
 SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe
 SIZE (rust/crates/unicode-ident-1.0.13.crate) = 43279
+SHA256 (rust/crates/unicode-segmentation-1.12.0.crate) = f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493
+SIZE (rust/crates/unicode-segmentation-1.12.0.crate) = 106323
+SHA256 (rust/crates/unicode-width-0.2.0.crate) = 1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd
+SIZE (rust/crates/unicode-width-0.2.0.crate) = 271509
 SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a
 SIZE (rust/crates/version_check-0.9.5.crate) = 15554
 SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
@@ -153,5 +157,3 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270
 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564
 SHA256 (fish-shell-rust-pcre2-0.2.9-utf32_GH0.tar.gz) = e5af06d7b737b66f7476a223e8a6cd1e2b1ca834b38b3de58901d4dbcf0a054d
 SIZE (fish-shell-rust-pcre2-0.2.9-utf32_GH0.tar.gz) = 742431
-SHA256 (11486.patch) = 4033a9c91b740ff83ea7e9b011aaff8fd59c77a093559c44d510bc1295fd2a78
-SIZE (11486.patch) = 597
diff --git a/shells/murex/Makefile b/shells/murex/Makefile
index 63ceed06f13b..2b6699c792fe 100644
--- a/shells/murex/Makefile
+++ b/shells/murex/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	murex
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.0.1000
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	shells
 
 MAINTAINER=	lcook@FreeBSD.org