From 9ab2b7d78c0e99b043edce421a594e293c74d6be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 10 Dec 2013 03:49:10 +0100
Subject: [PATCH] fish: Update recipe

Doesn't work yet though, needs patching
---
 app-shells/fish/fish-1.23.1_git.recipe | 51 +++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe
index d79dff6f6..fb9dcb511 100644
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/app-shells/fish/fish-1.23.1_git.recipe
@@ -1,32 +1,63 @@
+SUMMARY="The friendly interactive shell" 
 DESCRIPTION="The friendly interactive shell" 
 HOMEPAGE="http://ridiculousfish.com/shell/" 
 SRC_URI="git://git.gitorious.org/fish-shell/fish-shell.git"
 #CHECKSUM_MD5=""
 REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="app-doc/doxygen >= 1.7.4
-	sys-libs/ncurses >= 5.9"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2005-2009 Axel Liljencrantz"
+
+ARCHITECTURES="x86 x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	fish$secondaryArchSuffix = $portVersion
+	cmd:fish = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix >= 5.9
+	devel:libgettextlib$secondaryArchSuffix
+	doxygen >= 1.6.3
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:libtoolize
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:which
+	"
+
+
 BUILD()
 {
-    cd fish-1.23.1-git
 	libtoolize --force --copy --install
     autoconf
-    ./configure --without-xsel --prefix=`finddir B_COMMON_DIRECTORY`
+    ./configure --without-xsel --prefix=$prefix
     make
 }
 
 INSTALL()
 {
-    cd fish-1.23.1-git
     make install DESTDIR=${DESTDIR}
 }
 
 TEST()
 {
-	cd fish-1.23.1-git
 	make test
 }
 
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2009 Axel Liljencrantz"