diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/aria2/Makefile | 9 | ||||
| -rw-r--r-- | net/aria2/distinfo | 12 | ||||
| -rw-r--r-- | net/aria2/patches/patch-configure | 26 | ||||
| -rw-r--r-- | net/aria2/patches/patch-configure.ac | 24 | ||||
| -rw-r--r-- | net/aria2/patches/patch-src_IndexedList.h | 13 |
5 files changed, 51 insertions, 33 deletions
diff --git a/net/aria2/Makefile b/net/aria2/Makefile index 8268fa195d7..ad19b2703bb 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.46 2013/10/19 09:07:09 adam Exp $ +# $NetBSD: Makefile,v 1.47 2014/01/08 16:32:30 ryoon Exp $ # -DISTNAME= aria2-1.17.1 -PKGREVISION= 2 +DISTNAME= aria2-1.18.2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=aria2/} EXTRACT_SUFX= .tar.bz2 @@ -12,6 +11,10 @@ HOMEPAGE= http://aria2.sourceforge.net/ COMMENT= Multi-threaded, multi-protocol, flexible download accelerator LICENSE= gnu-gpl-v2 +# Minimum requirement is 4.6.4, but lang/gcc46 is 4.6.3, then use 4.7 +# See https://github.com/tatsuhiro-t/aria2/issues/144 +GCC_REQD= 4.7 + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ diff --git a/net/aria2/distinfo b/net/aria2/distinfo index 612a20cf7c9..357216b95ed 100644 --- a/net/aria2/distinfo +++ b/net/aria2/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.33 2013/06/09 02:11:34 ryoon Exp $ +$NetBSD: distinfo,v 1.34 2014/01/08 16:32:30 ryoon Exp $ -SHA1 (aria2-1.17.1.tar.bz2) = a40730013501554cdb0ce2b56a919f3ee971c06e -RMD160 (aria2-1.17.1.tar.bz2) = bab446a216fb450c8048587ab3bad24a1c383e73 -Size (aria2-1.17.1.tar.bz2) = 2228357 bytes -SHA1 (patch-configure) = 9e962d552653eb221d7377a0789ac4675a5d5893 -SHA1 (patch-configure.ac) = 64e3dfe642dde9b7cd78314dd18b421b41676f08 -SHA1 (patch-src_IndexedList.h) = 098aa2110ff666255826110b3272a714128eb0e7 +SHA1 (aria2-1.18.2.tar.bz2) = 2f04a17567e6b793420a517b3fb0511f12c76289 +RMD160 (aria2-1.18.2.tar.bz2) = 9abeeecf7327211fce63f1a1fb49fe895fa39923 +Size (aria2-1.18.2.tar.bz2) = 2099416 bytes +SHA1 (patch-configure) = 2c65fb587d9c52518104f3f1c1ad9102a6e107be diff --git a/net/aria2/patches/patch-configure b/net/aria2/patches/patch-configure index 6d92f3c9fcd..0ed64ae0d27 100644 --- a/net/aria2/patches/patch-configure +++ b/net/aria2/patches/patch-configure @@ -1,13 +1,29 @@ -$NetBSD: patch-configure,v 1.1 2013/06/09 02:11:34 ryoon Exp $ +$NetBSD: patch-configure,v 1.2 2014/01/08 16:32:30 ryoon Exp $ ---- configure.orig 2013-05-26 07:24:31.000000000 +0000 +--- configure.orig 2013-12-26 15:44:21.000000000 +0000 +++ configure -@@ -19195,7 +19195,7 @@ See \`config.log' for more details" "$LI +@@ -19872,13 +19872,13 @@ See \`config.log' for more details" "$LI fi use_md="" --if test "x$have_osx" == "xyes"; then -+if test "x$have_osx" = "xyes"; then +-if test "x$have_appletls" == "xyes"; then ++if test "x$have_appletls" = "xyes"; then use_md="apple" $as_echo "#define USE_APPLE_MD 1" >>confdefs.h + + else +- if test "x$have_wintls" == "xyes"; then ++ if test "x$have_wintls" = "xyes"; then + use_md="windows" + + $as_echo "#define USE_WINDOWS_MD 1" >>confdefs.h +@@ -19913,7 +19913,7 @@ $as_echo "#define USE_INTERNAL_MD 1" >>c + fi + + # Define variables based on the result of the checks for libraries. +-if test "x$have_appletls" = "xyes" || test "x$have_wintls" == "xyes" || test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then ++if test "x$have_appletls" = "xyes" || test "x$have_wintls" = "xyes" || test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then + have_ssl="yes" + + $as_echo "#define ENABLE_SSL 1" >>confdefs.h diff --git a/net/aria2/patches/patch-configure.ac b/net/aria2/patches/patch-configure.ac index 24278c38991..bb0ebc3c44e 100644 --- a/net/aria2/patches/patch-configure.ac +++ b/net/aria2/patches/patch-configure.ac @@ -1,13 +1,27 @@ -$NetBSD: patch-configure.ac,v 1.1 2013/06/09 02:11:34 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.2 2014/01/08 16:32:30 ryoon Exp $ ---- configure.ac.orig 2013-05-26 07:23:55.000000000 +0000 +--- configure.ac.orig 2013-12-26 15:43:58.000000000 +0000 +++ configure.ac -@@ -350,7 +350,7 @@ if test "x$with_libcares" = "xyes"; then +@@ -462,11 +462,11 @@ if test "x$with_libcares" = "xyes"; then fi use_md="" --if test "x$have_osx" == "xyes"; then -+if test "x$have_osx" = "xyes"; then +-if test "x$have_appletls" == "xyes"; then ++if test "x$have_appletls" = "xyes"; then use_md="apple" AC_DEFINE([USE_APPLE_MD], [1], [What message digest implementation to use]) else +- if test "x$have_wintls" == "xyes"; then ++ if test "x$have_wintls" = "xyes"; then + use_md="windows" + AC_DEFINE([USE_WINDOWS_MD], [1], [What message digest implementation to use]) + else +@@ -491,7 +491,7 @@ else + fi + + # Define variables based on the result of the checks for libraries. +-if test "x$have_appletls" = "xyes" || test "x$have_wintls" == "xyes" || test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then ++if test "x$have_appletls" = "xyes" || test "x$have_wintls" = "xyes" || test "x$have_libgnutls" = "xyes" || test "x$have_openssl" = "xyes"; then + have_ssl="yes" + AC_DEFINE([ENABLE_SSL], [1], [Define to 1 if ssl support is enabled.]) + AM_CONDITIONAL([ENABLE_SSL], true) diff --git a/net/aria2/patches/patch-src_IndexedList.h b/net/aria2/patches/patch-src_IndexedList.h deleted file mode 100644 index 9713aaace02..00000000000 --- a/net/aria2/patches/patch-src_IndexedList.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_IndexedList.h,v 1.2 2013/06/09 02:11:34 ryoon Exp $ - ---- src/IndexedList.h.orig 2013-05-26 07:23:55.000000000 +0000 -+++ src/IndexedList.h -@@ -64,7 +64,7 @@ struct IndexedListIterator { - typedef ValueType value_type; - typedef PointerType pointer; - typedef ReferenceType reference; -- typedef typename SeqIteratorType::size_type size_type; -+ typedef typename SeqType::size_type size_type; - typedef typename SeqIteratorType::difference_type difference_type; - typedef IndexedListIterator SelfType; - |