Update to version 0.13.1+2. This update includes myriad bug fixes

and feature enhancements--way too many for this commit message.
While here, deprecate aria2-metalink option. Aria2 now supports
building with libexpat, so we do that by default now.

Some of the more significant changes:
-------------------------------------

* Fixed compile error without gnutls/libgcrypt/libgpg-error and openSSL
  installed.  Fixed compilation on: x84-64 platform, Mac OSX, g++-4.3,
  and without c-ares/ares.

* Added Simplified Chinese translation. Also updated the following
  translations: Polish, Dutch, German, Thai, Indonesian,
  Norwegian Nynorsk, Hungarian, Finnish, Hebrew.

* Changed inactive connection timeout to 120.
  To accept more mulually interested peers, disconnect peer when there
  is no interest between us after certain time passed.
  Lengthened DNS timeout to 30. I think old value '10' will be a
  little bit short when some DNS servers are offline and several
  DNS servers are tried. It should be configured by
  command-line option.

* Fixed the bug that prevents aria2 from stopping other than by pressing
  Ctrl-C in BitTorrent download. It is reproducible using --seed-time
  option. aria2 doesn't stop even after --seed-time is satisfied and
  continues to output blank lines in the console.

* Added Message Stream Encryption(MSE) support.
  Currently, aria2 accepts incoming connections with Obfuscation Header
  and legacy BitTorrent Header and establishes connections with
  Obfuscation Header first and if failed then retry with legacy
  BitTorrent header. If plain text and ARC4 is provided, aria2 always
  choose ARC4. The new option to change the default behavior is planned.
  For tracker extension, "supportcrypto=1" is added statically.

* Added the ability to load nodes from torrent file. These nodes are
  added to the routing table when downloading that torrent.

* Added the ability to stop aria2 itself when given time has passed
  from start. Use --stop option to specify time in minutes.
  When 0 is given, this feature is disabled.
  before calling RequestGroupMan::fillRequestGroupFromReserver().
  Without this modification, the result list shows "ERR" when aria2 is
  stopped by --stop option. It should be "INPR".
  Bootstrap through node added by port message.
  Currently bootstrap is executed if the number of buckets in routing
  table is 1.

* Added DHT functionality, compatible with mainline.
  DHT is disabled by default. To enable it, give --enable-dht to aria2c.
  You may need to specify entry point to DHT network using
  --dht-entry-point. DHT uses UDP port to listen incoming message.
  Use --dht-listen-port to specify port number. Make sure that your
  firewall configuration can pass through UDP traffic to the port.
  The routing table is saved in $HOME/.aria2/dht.dat.  Request peers though
  DHT only when download hasn't finished.

4 files changed, 46 insertions, 51 deletions

diff --git a/net/aria2/Makefile b/net/aria2/Makefile
index ef34305b7fc..ad6c3fc2c6c 100644
--- a/net/aria2/Makefile
+++ b/net/aria2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2008/02/18 00:00:18 bjs Exp $
+# $NetBSD: Makefile,v 1.10 2008/04/16 00:09:39 bjs Exp $
 #
 
-DISTNAME=	aria2-0.12.1+1
-PKGNAME=	${DISTNAME:S/+/./}
+DISTNAME=	aria2c-0.13.1+2
+PKGNAME=	${DISTNAME:S/+/./:S/2c-/2-/}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aria2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,30 +14,31 @@ COMMENT=	Multithreaded download accelerator
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
+USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--enable-bittorrent
+CONFIGURE_ARGS+=	--enable-metalink
 CONFIGURE_ARGS+=	--with-included-gettext=no
+CONFIGURE_ARGS+=	--with-libexpat
+CONFIGURE_ARGS+=	--without-libxml2
 
 GCC_REQD+=		3.4
-
 TEST_TARGET=		check
-
 USE_FEATURES=		getopt_long snprintf
 
-.include "options.mk"
-
 .include "../../mk/compiler.mk"
 
 .if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
 BUILDLINK_DEPMETHOD.cppunit?=	build
+BUILDLINK_API_DEPENDS.cppunit+=	cppunit>=10.1.2
 .  include "../../devel/cppunit/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xmltest
 .endif
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "options.mk"
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/aria2/PLIST b/net/aria2/PLIST
index 2c615a59c47..9b444700aa8 100644
--- a/net/aria2/PLIST
+++ b/net/aria2/PLIST
@@ -1,15 +1,25 @@
-@comment $NetBSD: PLIST,v 1.4 2008/02/18 00:00:18 bjs Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/16 00:09:39 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/ca/LC_MESSAGES/aria2c.mo
 share/locale/de/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/sv/LC_MESSAGES/aria2c.mo
+share/locale/th/LC_MESSAGES/aria2c.mo
+share/locale/zh_CN/LC_MESSAGES/aria2c.mo
+@dirrm share/doc/aria2c
diff --git a/net/aria2/distinfo b/net/aria2/distinfo
index efa9809b846..15f0df44b8e 100644
--- a/net/aria2/distinfo
+++ b/net/aria2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2008/02/18 00:00:18 bjs Exp $
+$NetBSD: distinfo,v 1.8 2008/04/16 00:09:39 bjs Exp $
 
-SHA1 (aria2-0.12.1+1.tar.bz2) = f8a6acc1f720aaee1d55a46aa99ddd5341d28679
-RMD160 (aria2-0.12.1+1.tar.bz2) = 4eeddc52c51461d0c162ec33acfc144962ae6c6a
-Size (aria2-0.12.1+1.tar.bz2) = 720951 bytes
+SHA1 (aria2c-0.13.1+2.tar.bz2) = b3fc62b842a54fb3e0d8d7e923fc069d55c1fec0
+RMD160 (aria2c-0.13.1+2.tar.bz2) = 5dbfba62f2b226574002839f545375efa6df65b7
+Size (aria2c-0.13.1+2.tar.bz2) = 841811 bytes
diff --git a/net/aria2/options.mk b/net/aria2/options.mk
index a9735d03cc1..ad1d455b50d 100644
--- a/net/aria2/options.mk
+++ b/net/aria2/options.mk
@@ -1,51 +1,35 @@
-# $NetBSD: options.mk,v 1.4 2007/11/23 07:46:35 bjs Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/16 00:09:39 bjs Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.aria2
 
-PKG_OPTIONS_GROUP.tls=	gnutls ssl
+PKG_OPTIONS_GROUP.ssl=		gnutls ssl
 PKG_OPTIONS_GROUP.asyncns=	ares cares
-
-PKG_OPTIONS_REQUIRED_GROUPS=	tls asyncns
-
-PKG_SUPPORTED_OPTIONS+=		aria2-metalink
-PKG_SUGGESTED_OPTIONS+=		ssl cares aria2-metalink
+PKG_OPTIONS_REQUIRED_GROUPS=	ssl asyncns
+PKG_SUGGESTED_OPTIONS=		ssl cares
+###
+### XXX Remove this in the future [2008-04-15 bjs]
+###
+.if !empty(PKG_OPTIONS.aria2:U:Maria2-metalink) || \
+	!empty(PKG_DEFAULT_OPTIONS:U:Maria2-metalink)
+PKG_OPTIONS_DEPRECATED_WARNINGS+=\
+	"NOTE:	The aria2-metalink option is deprecated; this package"\
+"	now supports the metalink protocol by default."
+.endif
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=		--with-openssl
-CONFIGURE_ARGS+=		--without-gnutls
-
-.include "../../security/openssl/buildlink3.mk"
-
+CONFIGURE_ARGS+=	--with-openssl
+CONFIGURE_ARGS+=	--without-gnutls
+.  include "../../security/openssl/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=		--with-gnutls
-CONFIGURE_ARGS+=		--without-openssl
-
-.include "../../security/gnutls/buildlink3.mk"
-
+CONFIGURE_ARGS+=	--with-gnutls
+CONFIGURE_ARGS+=	--without-openssl
+.  include "../../security/gnutls/buildlink3.mk"
 .endif
-
 .if !empty(PKG_OPTIONS:Mcares)
 CONFIGURE_ARGS+=	--with-libcares-prefix=${BUILDLINK_PREFIX.libcares:Q}
-
-.include "../../net/libcares/buildlink3.mk"
-
+.  include "../../net/libcares/buildlink3.mk"
 .elif !empty(PKG_OPTIONS:Mares)
 CONFIGURE_ARGS+=	--with-libares-prefix=${BUILDLINK_PREFIX.libares:Q}
-
-.endif
-
-
-.if !empty(PKG_OPTIONS:Maria2-metalink)
-CONFIGURE_ARGS+=	--with-libxml2
-CONFIGURE_ARGS+=	--enable-metalink
-CONFIGURE_ARGS+=	--with-xml-prefix=${BULDLINK_PREFIX.libxml2:Q}
-
-.include "../../textproc/libxml2/buildlink3.mk"
-
-.else
-CONFIGURE_ARGS+=	--without-libxml2
-CONFIGURE_ARGS+=	--disable-metalink
-
 .endif