From dc5a84a3ccce32b7fc26135b552f113369283bdc Mon Sep 17 00:00:00 2001
From: miqlas <miqlas@gmail.com>
Date: Sun, 18 Oct 2015 08:48:47 +0000
Subject: [PATCH] Reorganized recipe, IPV6 patch.

---
 app-shells/fish/fish-2.2.0.recipe        | 17 +++++++-------
 app-shells/fish/patches/fish-2.2.0.patch | 30 +++++++++++++++++++-----
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/app-shells/fish/fish-2.2.0.recipe b/app-shells/fish/fish-2.2.0.recipe
index e7bca3fd1..15d6a3519 100644
--- a/app-shells/fish/fish-2.2.0.recipe
+++ b/app-shells/fish/fish-2.2.0.recipe
@@ -1,15 +1,14 @@
 SUMMARY="The friendly interactive shell"
-DESCRIPTION="
-Fish is a shell geared towards interactive use. Its features are \
+DESCRIPTION="Fish is a shell geared towards interactive use. Its features are \
 focused on user friendliness and discoverability. The language syntax \
-is simple but incompatible with other shell languages.
-"
+is simple but incompatible with other shell languages."
 HOMEPAGE="http://ridiculousfish.com/shell/"
+COPYRIGHT="2005-2015 Axel Liljencrantz"
+LICENSE="GNU GPL v2"
+REVISION="1"
 SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/2.2.0/fish-2.2.0.tar.gz"
 CHECKSUM_SHA256="a76339fd14ce2ec229283c53e805faac48c3e99d9e3ede9d82c0554acfc7b77a"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2015 Axel Liljencrantz"
+PATCHES="fish-2.2.0.patch"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -26,7 +25,9 @@ REQUIRES="
 	lib:libncurses$secondaryArchSuffix
 	lib:libgettextlib_0.18.1$secondaryArchSuffix >= 0.18.1.1
 	lib:libintl$secondaryArchSuffix
+	cmd:python
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv$secondaryArchSuffix
@@ -45,8 +46,6 @@ BUILD_PREREQUIRES="
 	#cmd:doxygen >= 1.6.3
 	"
 
-PATCHES="fish-2.2.0.patch"
-
 GLOBAL_WRITABLE_FILES="
 	settings/fish/config.fish keep-old
 "
diff --git a/app-shells/fish/patches/fish-2.2.0.patch b/app-shells/fish/patches/fish-2.2.0.patch
index f4ae729e9..d2c27dc67 100644
--- a/app-shells/fish/patches/fish-2.2.0.patch
+++ b/app-shells/fish/patches/fish-2.2.0.patch
@@ -1,11 +1,11 @@
 diff --git a/configure.ac b/configure.ac
-index 49ff391..7d22bf9 100644
+index 49ff391..20d17fb 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -100,6 +100,18 @@ echo "CXXFLAGS: $CXXFLAGS"
- #
+@@ -101,6 +101,20 @@ echo "CXXFLAGS: $CXXFLAGS"
  AC_CONFIG_HEADERS(config.h)
  
+ 
 +dnl ----------------------------------------------
 +dnl CHECK FOR MACHINE/VENDOR/OPERATING SYSTEM TYPE
 +dnl ----------------------------------------------
@@ -18,10 +18,12 @@ index 49ff391..7d22bf9 100644
 +[Define to be a string corresponding the vendor of the machine.])
 +AC_DEFINE_UNQUOTED(OSTYPE,   "$host_os",
 +[Define to be the name of the operating system.])
- 
++
++
  #
  # This adds markup to the code that results in a few extra compile
-@@ -210,9 +222,16 @@ CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
+ # time checks on recent GCC versions. It helps stop a few common bugs.
+@@ -210,9 +224,16 @@ CXXFLAGS="$CXXFLAGS -Wall -Wno-sign-compare"
  # This is needed in order to get the really cool backtraces on Linux
  #
  
@@ -41,7 +43,7 @@ index 49ff391..7d22bf9 100644
  
  #
  # On Cygwin, we need to add some flags for ncurses.
-@@ -349,7 +368,7 @@ AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict w
+@@ -349,7 +370,7 @@ AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict w
  #
  
  # Check for os dependant libraries for all binaries.
@@ -65,3 +67,19 @@ index b493de2..8e8046b 100644
      private:
      long long last_change_time;
      uint32_t last_seed;
+diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
+index 359946a..3c65ac2 100755
+--- a/share/tools/web_config/webconfig.py
++++ b/share/tools/web_config/webconfig.py
+@@ -20,7 +20,10 @@ else:
+     from urllib.parse import parse_qs
+ 
+ # Check to see if IPv6 is enabled in the kernel
+-HAS_IPV6 = True
++# HAIKU BUGFIX. FIXME! Something wrong with the IPV6 support
++#HAS_IPV6 = True
++HAS_IPV6 = False
++# HAIKU BUGFIX.
+ try:
+     s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
+     s.close()