mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
axel: fix build, recipe cleanup, reduced patchset (#1278)
This commit is contained in:
miqlas
waddlesplash
@@ -1,20 +1,17 @@
|
||||
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."
|
||||
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="1"
|
||||
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.patch
|
||||
"
|
||||
PATCHES="axel-2.4.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
|
||||
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
|
||||
|
||||
PROVIDES="
|
||||
axel = $portVersion
|
||||
@@ -32,13 +29,21 @@ BUILD_PREREQUIRES="
|
||||
cmd:make
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/axel/axelrc keep-old
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
./configure --i18n=0
|
||||
make
|
||||
./configure \
|
||||
--bindir=$binDir \
|
||||
--etcdir=$settingsDir/axel \
|
||||
--mandir=$manDir
|
||||
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install DESTDIR="${DESTDIR}"
|
||||
make install
|
||||
}
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
diff -urN axel-2.4/configure axel-2.4-haiku/configure
|
||||
--- axel-2.4/configure 2009-06-12 09:21:27.000000000 +0000
|
||||
+++ axel-2.4-haiku/configure 2009-06-12 09:16:10.000000000 +0000
|
||||
@@ -200,6 +200,26 @@
|
||||
echo 'Please keep in mind that you need GNU make to make Axel!'
|
||||
echo ''
|
||||
;;
|
||||
+Haiku* )
|
||||
+ echo 'LFLAGS+=-lnetwork' >> Makefile.settings
|
||||
+ echo '#define NOGETOPTLONG' >> config.h
|
||||
+# intl not yet working on Haiku
|
||||
+# if [ "$i18n" = "1" ]; then
|
||||
+# echo 'LFLAGS+=-lintl' >> Makefile.settings;
|
||||
+# fi
|
||||
+ echo '#define _IO(x,y) (IOC_VOID|((x)<<8)|y)' >> config.h
|
||||
+ echo '#define _IOR(x,y,t) (IOC_OUT|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)' >> config.h
|
||||
+ echo '#define _IOW(x,y,t) (IOC_IN|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)' >> config.h
|
||||
+# echo '/* this should be _IORW, but stdio got there first */' >> config.h
|
||||
+ echo '#define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)' >> config.h
|
||||
+ echo "#define SIOCGIFADDR _IOWR('i',13, struct ifreq) /* get ifnet address */" >> config.h
|
||||
+ echo '#define IOCPARM_MASK 0x7f /* parameters must be < 128 bytes */' >> config.h
|
||||
+ echo '#define IOC_VOID 0x20000000 /* no parameters */' >> config.h
|
||||
+ echo '#define IOC_OUT 0x40000000 /* copy out parameters */' >> config.h
|
||||
+ echo '#define IOC_IN 0x80000000 /* copy in parameters */' >> config.h
|
||||
+ echo '#define IOC_INOUT (IOC_IN|IOC_OUT)' >> config.h
|
||||
+# echo '/* the 0x20000000 is so we can distinguish new ioctl's from old */' >> config.h
|
||||
+;;
|
||||
CYGWIN_* )
|
||||
echo 'LFLAGS+=-lpthread' >> Makefile.settings
|
||||
if [ "$i18n" = "1" ]; then
|
||||
Binary files axel-2.4/conn.o and axel-2.4-haiku/conn.o differ
|
||||
Binary files axel-2.4/ftp.o and axel-2.4-haiku/ftp.o differ
|
||||
Binary files axel-2.4/http.o and axel-2.4-haiku/http.o differ
|
||||
Binary files axel-2.4/search.o and axel-2.4-haiku/search.o differ
|
||||
Binary files axel-2.4/tcp.o and axel-2.4-haiku/tcp.o differ
|
||||
Binary files axel-2.4/text.o and axel-2.4-haiku/text.o differ
|
||||
41
net-misc/axel/patches/axel-2.4.patchset
Normal file
41
net-misc/axel/patches/axel-2.4.patchset
Normal file
@@ -0,0 +1,41 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user