Axel: update to an maintained source (#1279)

This commit is contained in:
miqlas
2017-04-16 21:32:17 +02:00
committed by waddlesplash
parent 4d843c5170
commit 788cb1455c
4 changed files with 108 additions and 90 deletions

View File

@@ -0,0 +1,61 @@
SUMMARY="Light Unix download accelerator"
DESCRIPTION="Axel tries to accelerate HTTP/FTP downloading process by using \
multiple connections for one file. It can use multiple mirrors for a download. \
Axel has no dependencies and is lightweight, so it might be useful as a wget \
clone on byte-critical systems."
HOMEPAGE="https://github.com/eribertomota/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."
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://github.com/eribertomota/axel/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="28e7bb26b7be3f56a61b60ef07e15e05ea9a41850b0ed45a0c56d6d2202f4a8b"
PATCHES="axel-2.12.patchset"
ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
PROVIDES="
axel = $portVersion
cmd:axel = $portVersion
"
REQUIRES="
haiku
lib:libcrypto
lib:libintl
lib:libssl
"
BUILD_REQUIRES="
haiku_devel
devel:libcrypto
devel:libiconv
devel:libgettextlib
devel:libssl
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:awk
cmd:find
cmd:gcc
cmd:gettext
cmd:make
cmd:pkg_config
"
BUILD()
{
autoreconf -i
runConfigure ./configure
make $jobArgs
}
INSTALL()
{
make install
}

View File

@@ -1,49 +0,0 @@
SUMMARY="Light Unix download accelerator"
DESCRIPTION="Axel tries to accelerate HTTP/FTP downloading process by using \
multiple connections for one file. It can use multiple mirrors for a download. \
Axel has no dependencies and is lightweight, so it might be useful as a wget \
clone on byte-critical systems."
HOMEPAGE="http://axel.alioth.debian.org/"
COPYRIGHT="2001 Wilmer van der Gaast."
LICENSE="GNU GPL v2"
REVISION="2"
SOURCE_URI="http://pkgs.fedoraproject.org/repo/pkgs/axel/axel-2.4.tar.gz/a2a762fce0c96781965c8f9786a3d09d/axel-2.4.tar.gz"
CHECKSUM_SHA256="359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036"
PATCHES="axel-2.4.patchset"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
PROVIDES="
axel = $portVersion
cmd:axel = $portVersion
"
REQUIRES="
haiku
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc
cmd:make
"
GLOBAL_WRITABLE_FILES="
settings/axel/axelrc keep-old
"
BUILD()
{
./configure \
--bindir=$binDir \
--etcdir=$settingsDir/axel \
--mandir=$manDir
make $jobArgs
}
INSTALL()
{
make install
}

View File

@@ -0,0 +1,47 @@
From 72baa8b5f0194657cb7d16a11d1048bc44d65b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 16 Apr 2017 19:44:33 +0200
Subject: Fix for Haiku
diff --git a/src/tcp.c b/src/tcp.c
index bf4e128..0843889 100644
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -38,6 +38,10 @@
#include "axel.h"
+#ifdef __HAIKU__
+#include <sys/sockio.h>
+#endif
+
static void tcp_error( char *buffer, char *hostname, int port, const char *reason )
{
sprintf( buffer, _("Unable to connect to server %s:%i: %s\n"),
--
2.12.2
From e15fadfefe3708ea2e03440827abf7166a22c046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 16 Apr 2017 19:54:03 +0200
Subject: Haiku specific lib
diff --git a/configure.ac b/configure.ac
index 663640f..a6eced5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,9 @@ HP-UX )
fi
LDFLAGS="$LDFLAGS $AXEL_EXTRA_FLAGS -lintl -lpthread"
;;
+Haiku )
+ LDFLAGS="$LDFLAGS -lnetwork -lintl"
+;;
* )
LDFLAGS="$LDFLAGS -lintl -pthread"
;;
--
2.12.2

View File

@@ -1,41 +0,0 @@
From f86df22189a39918521e4b3470376e5bb6d77f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 16 Apr 2017 18:58:10 +0200
Subject: Haiku supporting patchset
diff --git a/configure b/configure
index 81ecb99..3e1e838 100755
--- a/configure
+++ b/configure
@@ -200,6 +200,12 @@ SunOS )
echo 'Please keep in mind that you need GNU make to make Axel!'
echo ''
;;
+Haiku* )
+ echo 'LFLAGS+=-lnetwork' >> Makefile.settings
+ if [ "$i18n" = "1" ]; then
+ echo 'LFLAGS+=-lintl' >> Makefile.settings;
+ fi
+;;
CYGWIN_* )
echo 'LFLAGS+=-lpthread' >> Makefile.settings
if [ "$i18n" = "1" ]; then
diff --git a/tcp.c b/tcp.c
index 1551c23..7366c20 100644
--- a/tcp.c
+++ b/tcp.c
@@ -25,6 +25,10 @@
#include "axel.h"
+#ifdef __HAIKU__
+#include <sys/sockio.h>
+#endif
+
/* Get a TCP connection */
int tcp_connect( char *hostname, int port, char *local_if )
{
--
2.12.2