Update BitTornado and BitTornado-gui to 0.3.18.

- Fix MASTER_SITES and HOMEPAGE.

0.3.18
 This new release of BitTornado includes the ability to make encrypted
 connections. I've also finally stopped BitComet from being abusive to
 clients running in super-seed mode.

 The encryption standard followed, developed by Azureus, is available
 at http://www.azureuswiki.com/index.php/Message_Stream_Encryption
 BitTornado supports both header-only and full-stream encryption,
 though header-only is only supported in one of BitTornado's four
 encryption modes.

0.3.17
 Few very minor changes, a new stable release.

0.3.16
 This version is basically a maintenance release; Super-Seed mode is now
 working properly again, a minor long-standing bug has been repaired, and
 it looks like the new version of wxPython (or Python) has finally solved
 the client-crashing problem.

4 files changed, 14 insertions, 13 deletions

diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile
index bed68fa1308..a00c9b512e9 100644
--- a/net/bittornado-gui/Makefile
+++ b/net/bittornado-gui/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:42 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/09/21 18:52:07 veego Exp $
 #
 
 .include "../../net/bittornado/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/Tornado/Tornado-gui/}
-PKGREVISION=	1
 
 COMMENT+=	(wxGTK GUI)
 
 CONFLICTS=	bittorrent-gui-[0-9]*
 
-DEPENDS+=	BitTornado>=0.3.15:../../net/bittornado
+DEPENDS+=	BitTornado>=0.3.18:../../net/bittornado
 
 NO_BUILD=	yes
 
diff --git a/net/bittornado/Makefile.common b/net/bittornado/Makefile.common
index 96cf85291e0..ad4a69c3f8d 100644
--- a/net/bittornado/Makefile.common
+++ b/net/bittornado/Makefile.common
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile.common,v 1.10 2006/03/10 20:46:28 veego Exp $
+# $NetBSD: Makefile.common,v 1.11 2007/09/21 18:52:06 veego Exp $
 #
 
-DISTNAME=		BitTornado-0.3.15
+DISTNAME=		BitTornado-0.3.18
 CATEGORIES=		net
-MASTER_SITES=		http://www.bittornado.com/download/
+MASTER_SITES=		http://download2.bittornado.com/download/
 
 MAINTAINER=		veego@NetBSD.org
-HOMEPAGE=		http://bittornado.com/
+HOMEPAGE=		http://www.bittornado.com/
 COMMENT=		Experimental bittorrent client
 
 DISTINFO_FILE=		${.CURDIR}/../../net/bittornado/distinfo
-FILESDIR=		${.CURDIR}/../../net/bittornado/files
 PATCHDIR=		${.CURDIR}/../../net/bittornado/patches
 
 WRKSRC=			${WRKDIR}/BitTornado-CVS
diff --git a/net/bittornado/PLIST b/net/bittornado/PLIST
index b8b478d7273..904a1cd63d9 100644
--- a/net/bittornado/PLIST
+++ b/net/bittornado/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/01/28 16:19:17 veego Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/09/21 18:52:06 veego Exp $
 bin/bt-t-make.py
 bin/btcompletedir.py
 bin/btcopyannounce.py
@@ -78,6 +78,9 @@ ${PYSITELIB}/BitTornado/BT1/makemetafile.pyo
 ${PYSITELIB}/BitTornado/BT1/track.py
 ${PYSITELIB}/BitTornado/BT1/track.pyc
 ${PYSITELIB}/BitTornado/BT1/track.pyo
+${PYSITELIB}/BitTornado/BTcrypto.py
+${PYSITELIB}/BitTornado/BTcrypto.pyc
+${PYSITELIB}/BitTornado/BTcrypto.pyo
 ${PYSITELIB}/BitTornado/ConfigDir.py
 ${PYSITELIB}/BitTornado/ConfigDir.pyc
 ${PYSITELIB}/BitTornado/ConfigDir.pyo
diff --git a/net/bittornado/distinfo b/net/bittornado/distinfo
index 870b9911e9f..bcb8e972c5f 100644
--- a/net/bittornado/distinfo
+++ b/net/bittornado/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2006/03/10 20:46:28 veego Exp $
+$NetBSD: distinfo,v 1.10 2007/09/21 18:52:06 veego Exp $
 
-SHA1 (BitTornado-0.3.15.tar.gz) = a9a40ada7227aab0b495afafa9c9a76e47740942
-RMD160 (BitTornado-0.3.15.tar.gz) = 1967e1ec545f1c1dfa11d7525acb0abbdc2cedd2
-Size (BitTornado-0.3.15.tar.gz) = 189992 bytes
+SHA1 (BitTornado-0.3.18.tar.gz) = 64c65b69d112f76ba8a024ff5b8671058130b71a
+RMD160 (BitTornado-0.3.18.tar.gz) = 77e61f01101c2878d4e993e0581365a71c375892
+Size (BitTornado-0.3.18.tar.gz) = 189227 bytes
 SHA1 (patch-aa) = a88096122a34776b72dfc18f1d95a1736c71b54b