fish: recipe cleanups. (#11504)

Fixes #11300

Still not fully functional, though (tends to hang quite easily).

Added a `ReleaseType` option/variable, so one can switch between
"Release" (disabling the building of a debuginfo package)
or "RelWithDebInfo" (and including the debuginfo package).

Now that HaikuPorter includes a check for that, seems like a good
option.

app-shells/fish/fish-3.7.1.recipe

@@ -5,7 +5,7 @@ is simple but incompatible with other shell languages."
 HOMEPAGE="https://ridiculousfish.com/shell/"
 COPYRIGHT="2005-2024 Axel Liljencrantz"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/$portVersion/fish-$portVersion.tar.xz"
 CHECKSUM_SHA256="614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250"
 PATCHES="fish-$portVersion.patchset"
@@ -19,9 +19,9 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	fish$secondaryArchSuffix = $portVersion
-	cmd:fish$secondaryArchSuffix = $portVersion
-	cmd:fish_indent$secondaryArchSuffix = $portVersion
-	cmd:fish_key_reader$secondaryArchSuffix = $portVersion
+	cmd:fish = $portVersion
+	cmd:fish_indent = $portVersion
+	cmd:fish_key_reader = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -51,19 +51,24 @@ BUILD_PREREQUIRES="
 	cmd:xgettext$secondaryArchSuffix
 	"
 
-defineDebugInfoPackage fish$secondaryArchSuffix \
-	"$binDir"/fish \
-	"$binDir"/fish_indent \
-	"$binDir"/fish_key_reader
+# For easier swithcing:
+ReleaseType="RelWithDebInfo"
+
+if [ $ReleaseType == "RelWithDebInfo" ]; then
+	defineDebugInfoPackage fish$secondaryArchSuffix \
+		$prefix/bin/fish \
+		$prefix/bin/fish_indent \
+		$prefix/bin/fish_key_reader
+fi
 
 BUILD()
 {
-	mkdir -p build && cd build
-	cmake .. \
+	cmake -B build -S . \
 		$cmakeDirArgs \
-		-DCMAKE_BUILD_TYPE=RelWithDebInfo
+		-DCMAKE_BUILD_TYPE=$ReleaseType \
+		-DCMAKE_INSTALL_BINDIR=bin
 
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
@@ -71,8 +76,10 @@ INSTALL()
 	make install
 }
 
+# For reference:
+# 247/247 Test  #74: topics
+# 31% tests passed, 170 tests failed out of 247
 TEST()
 {
-	cd build
-	make test
+	make -C build test
 }

app-shells/fish/patches/fish-3.7.1.patchset

@@ -1,4 +1,4 @@
-From bb8f751b7ef40a63f7b2eb2f6df9d5c257532f92 Mon Sep 17 00:00:00 2001
+From 5db084a60c7fa027c4644541ac6bae8c56fa047e Mon Sep 17 00:00:00 2001
 From: Ken mays <kmays2000@gmail.com>
 Date: Tue, 22 Oct 2024 05:12:03 +0000
 Subject: Fix for std::{wcstoumax|wcstoimax} issue on Haiku R1b5
@@ -34,3 +34,26 @@ index 7a09438..fb136af 100644
 -- 
 2.45.2
 
+
+From 7decd8ed4f699f1e487dddc0de89211ce57c3bd9 Mon Sep 17 00:00:00 2001
+From: Oscar Lesta <oscar.lesta@gmail.com>
+Date: Sun, 3 Nov 2024 11:26:31 -0300
+Subject: Do not install Linux stuff on Haiku.
+
+
+diff --git a/cmake/Install.cmake b/cmake/Install.cmake
+index 6615e17..c85de39 100644
+--- a/cmake/Install.cmake
++++ b/cmake/Install.cmake
+@@ -168,7 +168,7 @@ if(GETTEXT_FOUND)
+   endforeach()
+ endif()
+ 
+-if (NOT APPLE)
++if (NOT APPLE AND NOT HAIKU)
+     install(FILES fish.desktop DESTINATION ${rel_datadir}/applications)
+     install(FILES ${SPHINX_SRC_DIR}/python_docs_theme/static/fish.png DESTINATION ${rel_datadir}/pixmaps)
+ endif()
+-- 
+2.45.2
+