From 70ddcdd69b47b5eb435430eeec328110bc1c3e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 14 Dec 2013 15:58:24 +0100
Subject: [PATCH] fish: Fix recipe

It builds but doesn't like being suffixed -x86...
however there are too many C99 lines to use gcc2.
---
 app-shells/fish/fish-1.23.1_git.recipe | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-shells/fish/fish-1.23.1_git.recipe b/app-shells/fish/fish-1.23.1_git.recipe
index 9a9a2b1c7..7729c9a4f 100644
--- a/app-shells/fish/fish-1.23.1_git.recipe
+++ b/app-shells/fish/fish-1.23.1_git.recipe
@@ -7,7 +7,7 @@ REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="2005-2009 Axel Liljencrantz"
 
-ARCHITECTURES="?x86 ?x86_64"
+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.
@@ -15,7 +15,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 else
 	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	fish$secondaryArchSuffix = $portVersion
@@ -32,7 +32,6 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libncurses$secondaryArchSuffix >= 5.9
 	devel:libgettextlib$secondaryArchSuffix
-	doxygen >= 1.6.3
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
@@ -40,20 +39,22 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:which
+	cmd:doxygen >= 1.6.3
 	"
 
+PATCHES="fish-1.23.1_git.patch"
 
 BUILD()
 {
 	libtoolize --force --copy --install
     autoconf
-    ./configure --without-xsel --prefix=$prefix
+    runConfigure ./configure --without-xsel
     make
 }
 
 INSTALL()
 {
-    make install DESTDIR=${DESTDIR}
+    make install
 }
 
 TEST()