diff options
author | bjs <bjs@pkgsrc.org> | 2007-11-07 08:08:18 +0000 |
---|---|---|
committer | bjs <bjs@pkgsrc.org> | 2007-11-07 08:08:18 +0000 |
commit | a774c57ff41eaf6d5693d49f6c620011b6bb2837 (patch) | |
tree | ccd344bec17457c8d149a09c3f8304560caa9744 /net/aria2 | |
parent | 9d29af555e77b2742455f14d68d4613cdb5de117 (diff) | |
download | pkgsrc-a774c57ff41eaf6d5693d49f6c620011b6bb2837.tar.gz |
Employ USE_FEATURES for getopt_long and snpritnf. Remove devel/libgetopt dependency. Bump rev.
Diffstat (limited to 'net/aria2')
-rw-r--r-- | net/aria2/Makefile | 8 | ||||
-rw-r--r-- | net/aria2/distinfo | 8 | ||||
-rw-r--r-- | net/aria2/patches/patch-aa | 17 | ||||
-rw-r--r-- | net/aria2/patches/patch-ab | 17 | ||||
-rw-r--r-- | net/aria2/patches/patch-ac | 17 | ||||
-rw-r--r-- | net/aria2/patches/patch-ad | 18 | ||||
-rw-r--r-- | net/aria2/patches/patch-ae | 18 | ||||
-rw-r--r-- | net/aria2/patches/patch-af | 17 |
8 files changed, 117 insertions, 3 deletions
diff --git a/net/aria2/Makefile b/net/aria2/Makefile index b5d607529dd..b88fb5463b9 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2007/11/02 18:27:59 bjs Exp $ +# $NetBSD: Makefile,v 1.4 2007/11/07 08:08:18 bjs Exp $ # DISTNAME= aria2-0.11.4 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aria2/} EXTRACT_SUFX= .tar.bz2 @@ -19,8 +20,12 @@ USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --enable-bittorrent CONFIGURE_ARGS+= --with-included-gettext=no +GCC_REQD+= 3.4 + TEST_TARGET= check +USE_FEATURES= getopt_long snprintf + .include "options.mk" .include "../../mk/compiler.mk" @@ -34,6 +39,5 @@ CONFIGURE_ARGS+= --disable-xmltest .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/libgetopt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/aria2/distinfo b/net/aria2/distinfo index b4293618a67..9813302b89c 100644 --- a/net/aria2/distinfo +++ b/net/aria2/distinfo @@ -1,5 +1,11 @@ -$NetBSD: distinfo,v 1.2 2007/11/02 18:28:00 bjs Exp $ +$NetBSD: distinfo,v 1.3 2007/11/07 08:08:19 bjs Exp $ SHA1 (aria2-0.11.4.tar.bz2) = 76144a9525c005ea39ceda82da8f61883ab4ac6f RMD160 (aria2-0.11.4.tar.bz2) = 1a9807ed2b24448062e78818a59e51eccdb822cc Size (aria2-0.11.4.tar.bz2) = 540252 bytes +SHA1 (patch-aa) = 166fd5b7737424762d0cf36dea68951894ead244 +SHA1 (patch-ab) = 47f90f558e4ac0ba0fba6f3cbaad5d2d10de8041 +SHA1 (patch-ac) = 64b43e0b75d82c0602d1c53764ab8e2896a35c69 +SHA1 (patch-ad) = 037d1cc28a45fc636487dcddc5e014ca43df66c4 +SHA1 (patch-ae) = 80a2c165130282b893c39ed6428689c14f7b08bc +SHA1 (patch-af) = 5a045331fc27ced85571ff59e03ed562ad3901fe diff --git a/net/aria2/patches/patch-aa b/net/aria2/patches/patch-aa new file mode 100644 index 00000000000..b1bbef67d27 --- /dev/null +++ b/net/aria2/patches/patch-aa @@ -0,0 +1,17 @@ +$NetBSD: patch-aa,v 1.3 2007/11/07 08:08:19 bjs Exp $ + +--- src/Exception.h.orig 2007-08-28 12:36:33.000000000 -0400 ++++ src/Exception.h +@@ -37,7 +37,12 @@ + + #include "common.h" + #include <string> ++#if defined(HAVE_NBCOMPAT_H) ++#include <nbcompat/cdefs.h> ++#include <nbcompat/stdio.h> ++#else + #include <stdio.h> ++#endif + #include <stdarg.h> + + using namespace std; diff --git a/net/aria2/patches/patch-ab b/net/aria2/patches/patch-ab new file mode 100644 index 00000000000..07d59abdb02 --- /dev/null +++ b/net/aria2/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.3 2007/11/07 08:08:19 bjs Exp $ + +--- src/common.h.orig 2007-08-28 12:36:33.000000000 -0400 ++++ src/common.h +@@ -49,7 +49,12 @@ + #endif + #endif // __MINGW32__ + ++#if defined(HAVE_NBCOMPAT_H) ++#include <nbcompat/cdefs.h> ++#include <nbcompat/stdio.h> ++#else + #include <stdio.h> ++#endif + #include <stdint.h> + #include <iostream> + #include <assert.h> diff --git a/net/aria2/patches/patch-ac b/net/aria2/patches/patch-ac new file mode 100644 index 00000000000..c0727b11649 --- /dev/null +++ b/net/aria2/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.3 2007/11/07 08:08:19 bjs Exp $ + +--- src/getaddrinfo.c.orig 2007-08-28 12:36:33.000000000 -0400 ++++ src/getaddrinfo.c +@@ -99,7 +99,12 @@ + #endif + + #include <sys/types.h> ++#if defined(HAVE_NBCOMPAT_H) ++#include <nbcompat/cdefs.h> ++#include <nbcompat/stdio.h> ++#else + #include <stdio.h> ++#endif + + #if defined(STDC_HEADERS) || defined(HAVE_STRING_H) + #include <string.h> diff --git a/net/aria2/patches/patch-ad b/net/aria2/patches/patch-ad new file mode 100644 index 00000000000..f88e8b23884 --- /dev/null +++ b/net/aria2/patches/patch-ad @@ -0,0 +1,18 @@ +$NetBSD: patch-ad,v 1.3 2007/11/07 08:08:19 bjs Exp $ + +--- src/libgen.c.orig 2007-08-28 12:36:33.000000000 -0400 ++++ src/libgen.c +@@ -33,7 +33,13 @@ + */ + /* copyright --> */ + ++#if defined(HAVE_NBCOMPAT_H) ++#include <nbcompat/cdefs.h> ++#include <nbcompat/stdio.h> ++#else + #include <stdio.h> ++#endif ++ + #include <string.h> + #include <libgen.h> + diff --git a/net/aria2/patches/patch-ae b/net/aria2/patches/patch-ae new file mode 100644 index 00000000000..83a652a8f26 --- /dev/null +++ b/net/aria2/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.3 2007/11/07 08:08:19 bjs Exp $ + +--- src/main.cc.orig 2007-10-27 01:20:58.000000000 -0400 ++++ src/main.cc +@@ -69,7 +69,13 @@ + #include <sstream> + extern char* optarg; + extern int optind, opterr, optopt; ++ ++#if defined(HAVE_NBCOMPAT_H) ++#include <nbcompat/cdefs.h> ++#include <nbcompat/getopt.h> ++#else + #include <getopt.h> ++#endif + + #ifdef ENABLE_METALINK + #include "MetalinkRequestInfo.h" diff --git a/net/aria2/patches/patch-af b/net/aria2/patches/patch-af new file mode 100644 index 00000000000..3aab85774bc --- /dev/null +++ b/net/aria2/patches/patch-af @@ -0,0 +1,17 @@ +$NetBSD: patch-af,v 1.3 2007/11/07 08:08:20 bjs Exp $ + +--- src/strptime.c.orig 2007-08-28 12:36:33.000000000 -0400 ++++ src/strptime.c +@@ -43,7 +43,12 @@ + #endif // HAVE_TIMEGM + + #include <stddef.h> ++#if defined(HAVE_NBCOMPAT_H) ++#include <nbcompat/cdefs.h> ++#include <nbcompat/stdio.h> ++#else + #include <stdio.h> ++#endif + #include <time.h> + #include <string.h> + #include <ctype.h> |