[pkgsrc/trunk]: pkgsrc/net/aria2 Update to aria2-1.2.0. Many, many changes (...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfb83e152787
branches:  trunk
changeset: 555783:bfb83e152787
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Sun Mar 08 23:41:33 2009 +0000

description:
Update to aria2-1.2.0.  Many, many changes (too verbose to list here);
please see ChangeLog.  NOTE: libares is no longer supported; libcares
is used by default.

diffstat:

 net/aria2/Makefile         |   7 ++--
 net/aria2/PLIST            |  66 +++++++++++++++++++++++-----------------------
 net/aria2/distinfo         |   9 ++---
 net/aria2/options.mk       |  18 ++----------
 net/aria2/patches/patch-aa |  17 -----------
 5 files changed, 43 insertions(+), 74 deletions(-)

diffs (168 lines):

diff -r 27c51ad73c8f -r bfb83e152787 net/aria2/Makefile
--- a/net/aria2/Makefile        Sun Mar 08 23:39:54 2009 +0000
+++ b/net/aria2/Makefile        Sun Mar 08 23:41:33 2009 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2009/01/25 07:05:14 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2009/03/08 23:41:33 bjs Exp $
 #
 
-DISTNAME=      aria2c-0.16.2
-PKGNAME=       ${DISTNAME:S/+/./:S/2c-/2-/}
-PKGREVISION=   2
+DISTNAME=      aria2-1.2.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=aria2/}
 EXTRACT_SUFX=  .tar.bz2
@@ -42,6 +40,7 @@
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../net/libcares/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 27c51ad73c8f -r bfb83e152787 net/aria2/PLIST
--- a/net/aria2/PLIST   Sun Mar 08 23:39:54 2009 +0000
+++ b/net/aria2/PLIST   Sun Mar 08 23:41:33 2009 +0000
@@ -1,35 +1,35 @@
-@comment $NetBSD: PLIST,v 1.8 2008/10/29 01:04:06 bjs Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/03/08 23:41:33 bjs Exp $
 bin/aria2c
 man/man1/aria2c.1
-share/doc/aria2c/README
-share/doc/aria2c/README.html
-share/doc/aria2c/aria2c.1.html
-share/locale/bg/LC_MESSAGES/aria2c.mo
-share/locale/ca/LC_MESSAGES/aria2c.mo
-share/locale/da/LC_MESSAGES/aria2c.mo
-share/locale/de/LC_MESSAGES/aria2c.mo
-share/locale/el/LC_MESSAGES/aria2c.mo
-share/locale/en@boldquot/LC_MESSAGES/aria2c.mo
-share/locale/en@quot/LC_MESSAGES/aria2c.mo
-share/locale/es/LC_MESSAGES/aria2c.mo
-share/locale/fi/LC_MESSAGES/aria2c.mo
-share/locale/fr/LC_MESSAGES/aria2c.mo
-share/locale/he/LC_MESSAGES/aria2c.mo
-share/locale/hu/LC_MESSAGES/aria2c.mo
-share/locale/id/LC_MESSAGES/aria2c.mo
-share/locale/it/LC_MESSAGES/aria2c.mo
-share/locale/ja/LC_MESSAGES/aria2c.mo
-share/locale/nl/LC_MESSAGES/aria2c.mo
-share/locale/nn/LC_MESSAGES/aria2c.mo
-share/locale/pl/LC_MESSAGES/aria2c.mo
-share/locale/pt_BR/LC_MESSAGES/aria2c.mo
-share/locale/ru/LC_MESSAGES/aria2c.mo
-share/locale/sr/LC_MESSAGES/aria2c.mo
-share/locale/sv/LC_MESSAGES/aria2c.mo
-share/locale/th/LC_MESSAGES/aria2c.mo
-share/locale/tr/LC_MESSAGES/aria2c.mo
-share/locale/uk/LC_MESSAGES/aria2c.mo
-share/locale/vi/LC_MESSAGES/aria2c.mo
-share/locale/zh_CN/LC_MESSAGES/aria2c.mo
-share/locale/zh_TW/LC_MESSAGES/aria2c.mo
-@dirrm share/doc/aria2c
+share/doc/aria2/README
+share/doc/aria2/README.html
+share/doc/aria2/aria2c.1.html
+share/locale/bg/LC_MESSAGES/aria2.mo
+share/locale/ca/LC_MESSAGES/aria2.mo
+share/locale/da/LC_MESSAGES/aria2.mo
+share/locale/de/LC_MESSAGES/aria2.mo
+share/locale/el/LC_MESSAGES/aria2.mo
+share/locale/en@boldquot/LC_MESSAGES/aria2.mo
+share/locale/en@quot/LC_MESSAGES/aria2.mo
+share/locale/es/LC_MESSAGES/aria2.mo
+share/locale/fi/LC_MESSAGES/aria2.mo
+share/locale/fr/LC_MESSAGES/aria2.mo
+share/locale/he/LC_MESSAGES/aria2.mo
+share/locale/hu/LC_MESSAGES/aria2.mo
+share/locale/id/LC_MESSAGES/aria2.mo
+share/locale/it/LC_MESSAGES/aria2.mo
+share/locale/ja/LC_MESSAGES/aria2.mo
+share/locale/nl/LC_MESSAGES/aria2.mo
+share/locale/nn/LC_MESSAGES/aria2.mo
+share/locale/pl/LC_MESSAGES/aria2.mo
+share/locale/pt_BR/LC_MESSAGES/aria2.mo
+share/locale/ru/LC_MESSAGES/aria2.mo
+share/locale/sr/LC_MESSAGES/aria2.mo
+share/locale/sv/LC_MESSAGES/aria2.mo
+share/locale/th/LC_MESSAGES/aria2.mo
+share/locale/tr/LC_MESSAGES/aria2.mo
+share/locale/uk/LC_MESSAGES/aria2.mo
+share/locale/vi/LC_MESSAGES/aria2.mo
+share/locale/zh_CN/LC_MESSAGES/aria2.mo
+share/locale/zh_TW/LC_MESSAGES/aria2.mo
+@dirrm share/doc/aria2
diff -r 27c51ad73c8f -r bfb83e152787 net/aria2/distinfo
--- a/net/aria2/distinfo        Sun Mar 08 23:39:54 2009 +0000
+++ b/net/aria2/distinfo        Sun Mar 08 23:41:33 2009 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2009/01/03 23:11:47 dholland Exp $
+$NetBSD: distinfo,v 1.16 2009/03/08 23:41:33 bjs Exp $
 
-SHA1 (aria2c-0.16.2.tar.bz2) = 244d51c91771bf440009bb33c360f258913812ac
-RMD160 (aria2c-0.16.2.tar.bz2) = e3c124ac20501163792fe5ceb820da3d801ffc83
-Size (aria2c-0.16.2.tar.bz2) = 1153881 bytes
-SHA1 (patch-aa) = ef972e61740c7b95ca2441e6899ddadab45f51de
+SHA1 (aria2-1.2.0.tar.bz2) = a71a0c5b713728891b98cb66b6a3d6b4fa1df79f
+RMD160 (aria2-1.2.0.tar.bz2) = e97d21bb6c492921fb11aa39489cf8712b37c5a3
+Size (aria2-1.2.0.tar.bz2) = 1243730 bytes
diff -r 27c51ad73c8f -r bfb83e152787 net/aria2/options.mk
--- a/net/aria2/options.mk      Sun Mar 08 23:39:54 2009 +0000
+++ b/net/aria2/options.mk      Sun Mar 08 23:41:33 2009 +0000
@@ -1,13 +1,12 @@
-# $NetBSD: options.mk,v 1.6 2008/10/10 01:56:38 bjs Exp $
+# $NetBSD: options.mk,v 1.7 2009/03/08 23:41:33 bjs Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.aria2
 
 PKG_OPTIONS_GROUP.ssl=         gnutls ssl
-PKG_OPTIONS_GROUP.asyncns=     ares cares
-PKG_OPTIONS_REQUIRED_GROUPS=   ssl asyncns
+PKG_OPTIONS_REQUIRED_GROUPS=   ssl
 
 PKG_SUPPORTED_OPTIONS=         sqlite firefox3
-PKG_SUGGESTED_OPTIONS=         ssl cares
+PKG_SUGGESTED_OPTIONS=         ssl
 ###
 ### XXX Remove this in the future [2008-04-15 bjs]
 ###
@@ -32,17 +31,6 @@
 .  include "../../security/gnutls/buildlink3.mk"
 .endif
 ###
-###    asynchronous resolver library.
-###
-.if !empty(PKG_OPTIONS:Mcares)
-CONFIGURE_ARGS+=       --with-libares=no
-CONFIGURE_ARGS+=       --with-libcares-prefix=${BUILDLINK_PREFIX.libcares:Q}
-.  include "../../net/libcares/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mares)
-CONFIGURE_ARGS+=       --with-libcares=no
-CONFIGURE_ARGS+=       --with-libares-prefix=${BUILDLINK_PREFIX.libares:Q}
-.endif
-###
 ###    firefox3 cookie support via sqlite3
 ###
 .if !empty(PKG_OPTIONS:Mfirefox3) || !empty(PKG_OPTIONS:Msqlite)
diff -r 27c51ad73c8f -r bfb83e152787 net/aria2/patches/patch-aa
--- a/net/aria2/patches/patch-aa        Sun Mar 08 23:39:54 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/01/03 23:11:47 dholland Exp $
-
---- src/SimpleLogger.cc~       2008-10-19 11:16:24.000000000 -0400
-+++ src/SimpleLogger.cc        2009-01-03 17:46:14.000000000 -0500
-@@ -147,7 +147,12 @@ void SimpleLogger::writeLog(std::ostream
-   gettimeofday(&tv, 0);
-   char datestr[27]; // 'YYYY-MM-DD hh:mm:ss.uuuuuu'+'\0' = 27 bytes
-   struct tm tm;
-+#ifdef __NetBSD__ /* work around API bug on 64-bit platforms in netbsd<6.0 */
-+  time_t tmp = tv.tv_sec;
-+  localtime_r(&tmp, &tm);
-+#else
-   localtime_r(&tv.tv_sec, &tm);
-+#endif
-   size_t dateLength =
-     strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm);
-   assert(dateLength <= (size_t)20);