diff --git a/net-misc/axel/axel-2.16.1.recipe b/net-misc/axel/axel-2.17.11.recipe similarity index 86% rename from net-misc/axel/axel-2.16.1.recipe rename to net-misc/axel/axel-2.17.11.recipe index 81db48141..11be464e6 100644 --- a/net-misc/axel/axel-2.16.1.recipe +++ b/net-misc/axel/axel-2.17.11.recipe @@ -12,9 +12,9 @@ COPYRIGHT="2001-2007 Wilmer van der Gaast, 2017 Ismael Luceno, 2017 Antonio Quartulli, and others." LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/axel-download-accelerator/axel/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="64529add74df3db828f704b42d4ec3fcdacb8142c84f051f9213637c337e706c" +CHECKSUM_SHA256="584ab6eed53315ff817eabd73bed0468ce27a0582d076ab2d169d6430a13b252" SOURCE_FILENAME="axel-$portVersion.tar.gz" PATCHES="axel-$portVersion.patchset" @@ -43,11 +43,12 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libcrypto$secondaryArchSuffix devel:libiconv$secondaryArchSuffix - devel:libgettextlib$secondaryArchSuffix + devel:libintl$secondaryArchSuffix devel:libssl$secondaryArchSuffix " BUILD_PREREQUIRES=" + autoconf_archive cmd:aclocal cmd:autoconf cmd:awk @@ -56,14 +57,14 @@ BUILD_PREREQUIRES=" cmd:gettext$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix + cmd:txt2man " BUILD() { - touch man/axel.1 - autoreconf -i - runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" - + autoreconf -fi + CFLAGS=-Wno-error runConfigure --omit-dirs binDir \ + ./configure --bindir="$commandBinDir" make $jobArgs } diff --git a/net-misc/axel/patches/axel-2.16.1.patchset b/net-misc/axel/patches/axel-2.16.1.patchset deleted file mode 100644 index 4d7f56671..000000000 --- a/net-misc/axel/patches/axel-2.16.1.patchset +++ /dev/null @@ -1,47 +0,0 @@ -From c59fbaf00a62fdf8c9a16cb84d3ec7b9575c01f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 16 Apr 2017 19:44:33 +0200 -Subject: Fix for Haiku - - -diff --git a/src/tcp.c b/src/tcp.c -index 6be557b..1c3f4b4 100644 ---- a/src/tcp.c -+++ b/src/tcp.c -@@ -47,6 +47,9 @@ - #include - #include - -+#ifdef __HAIKU__ -+#include -+#endif - - static void - tcp_error(char *buffer, char *hostname, int port, const char *reason) --- -2.14.2 - - -From c43511cc739554eed9b2146547614b6ca77aa557 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Sun, 16 Apr 2017 19:54:03 +0200 -Subject: Haiku specific lib - - -diff --git a/configure.ac b/configure.ac -index 9a311db..5c1cdad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -117,6 +117,9 @@ HP-UX ) - fi - LDFLAGS="$LDFLAGS $AXEL_EXTRA_FLAGS -lpthread" - ;; -+Haiku ) -+ LDFLAGS="$LDFLAGS -lnetwork" -+;; - * ) - LDFLAGS="$LDFLAGS -pthread" - ;; --- -2.14.2 - diff --git a/net-misc/axel/patches/axel-2.17.11.patchset b/net-misc/axel/patches/axel-2.17.11.patchset new file mode 100644 index 000000000..abcc4a1a0 --- /dev/null +++ b/net-misc/axel/patches/axel-2.17.11.patchset @@ -0,0 +1,48 @@ +From ae0f1d7bd30ab226e6cc7b43f0b32d075e9c6d5b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 16 Apr 2017 19:54:03 +0200 +Subject: Haiku specific lib + + +diff --git a/configure.ac b/configure.ac +index e05f95b..dd0a9db 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,6 +52,9 @@ AS_CASE(["$host_os"], + LDFLAGS="$LDFLAGS -L/usr/local/lib/hpux32" + ]) + ], ++ [haiku*], [ ++ LIBS="$LIBS -lnetwork" ++ ], + [*mingw32], [ + AC_DEFINE([_WIN32_WINNT], [0x0600], + [Request NT 6 API to expose AI_ADDRCONFIG in WinSock2]) +-- +2.37.3 + + +From 5f3c6f08aacae84742287bb10d49c698abc3e639 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sun, 16 Apr 2017 19:44:33 +0200 +Subject: Fix for Haik + + +diff --git a/src/tcp.c b/src/tcp.c +index edc1fb3..79d5e36 100644 +--- a/src/tcp.c ++++ b/src/tcp.c +@@ -52,6 +52,10 @@ + #include + #include "axel.h" + ++#ifdef __HAIKU__ ++#include ++#endif ++ + #ifndef TCP_FASTOPEN_CONNECT + #ifdef __linux__ + #define TCP_FASTOPEN_CONNECT 30 +-- +2.37.3 +