From c4b22f2b306ff78f2d07ca2dbe621e167fa05441 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 4 Jun 2018 03:16:57 +0200
Subject: [PATCH] axel, bump version, add support for x86 secondary arch
 (#2636)

---
 .../{axel-2.15.recipe => axel-2.16.1.recipe}  | 40 ++++++++++---------
 ...xel-2.15.patchset => axel-2.16.1.patchset} | 15 ++++---
 2 files changed, 29 insertions(+), 26 deletions(-)
 rename net-misc/axel/{axel-2.15.recipe => axel-2.16.1.recipe} (52%)
 rename net-misc/axel/patches/{axel-2.15.patchset => axel-2.16.1.patchset} (85%)

diff --git a/net-misc/axel/axel-2.15.recipe b/net-misc/axel/axel-2.16.1.recipe
similarity index 52%
rename from net-misc/axel/axel-2.15.recipe
rename to net-misc/axel/axel-2.16.1.recipe
index be4fc3029..75fc5cde3 100644
--- a/net-misc/axel/axel-2.15.recipe
+++ b/net-misc/axel/axel-2.16.1.recipe
@@ -7,33 +7,37 @@ HOMEPAGE="https://github.com/axel-download-accelerator/axel/"
 COPYRIGHT="2001-2007 Wilmer van der Gaast,
 	2007-2009 Giridhar Appaji Nag,
 	2008-2010 Philipp Hagemeister,
-	2015-2016 Joao Eriberto Mota Filho,
-	2016 Stephen Thirlwall, and others."
+	2015-2017 Joao Eriberto Mota Filho,
+	2016-2017 Stephen Thirlwall,
+	2017 Ismael Luceno,
+	2017 Antonio Quartulli, and others."
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/axel-download-accelerator/axel/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="0e223f18954e4c6c34b882a474c526b9c7d107168220c2f3892598248236a172"
+CHECKSUM_SHA256="64529add74df3db828f704b42d4ec3fcdacb8142c84f051f9213637c337e706c"
+SOURCE_FILENAME="axel-$portVersion.tar.gz"
 PATCHES="axel-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	axel = $portVersion
-	cmd:axel = $portVersion
+	axel$secondaryArchSuffix = $portVersion
+	cmd:axel$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libcrypto
-	lib:libintl
-	lib:libssl
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libcrypto
-	devel:libiconv
-	devel:libgettextlib
-	devel:libssl
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libgettextlib$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
 
 	"
 BUILD_PREREQUIRES="
@@ -41,10 +45,10 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:awk
 	cmd:find
-	cmd:gcc
-	cmd:gettext
+	cmd:gcc$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
 	cmd:make
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
 BUILD()
diff --git a/net-misc/axel/patches/axel-2.15.patchset b/net-misc/axel/patches/axel-2.16.1.patchset
similarity index 85%
rename from net-misc/axel/patches/axel-2.15.patchset
rename to net-misc/axel/patches/axel-2.16.1.patchset
index 69623ac0b..4d7f56671 100644
--- a/net-misc/axel/patches/axel-2.15.patchset
+++ b/net-misc/axel/patches/axel-2.16.1.patchset
@@ -5,20 +5,19 @@ Subject: Fix for Haiku
 
 
 diff --git a/src/tcp.c b/src/tcp.c
-index 0fa13b3..c41993a 100644
+index 6be557b..1c3f4b4 100644
 --- a/src/tcp.c
 +++ b/src/tcp.c
-@@ -40,6 +40,10 @@
- 
- #include "axel.h"
+@@ -47,6 +47,9 @@
+ #include <netdb.h>
+ #include <sys/ioctl.h>
  
 +#ifdef __HAIKU__
 +#include <sys/sockio.h>
 +#endif
-+
+ 
  static void
  tcp_error(char *buffer, char *hostname, int port, const char *reason)
- {
 -- 
 2.14.2
 
@@ -30,10 +29,10 @@ Subject: Haiku specific lib
 
 
 diff --git a/configure.ac b/configure.ac
-index 2c2d592..3d97469 100644
+index 9a311db..5c1cdad 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -80,6 +80,9 @@ HP-UX )
+@@ -117,6 +117,9 @@ HP-UX )
      fi
      LDFLAGS="$LDFLAGS $AXEL_EXTRA_FLAGS -lpthread"
  ;;