Update "libtorrent" package to version 0.11.4 and "rtorrent" package

to version 0.7.4. Changes since versions 0.11.1 and 0.7.1 respectively:
- Added "max_open_http" option that limits the max number of simultaneous
  http connections. By default set to 32.
- Directory structured view of the file list. The '/' key collapses
  directories, while the right arrow or ^F enters the selected directory.
  Changing the priority for a directory changes all contained files.
- Added "create_link" and "delete_link" options which apply to a download.
  These must be used with the new "on_*" options, so as to allow you to
  create symbolic links when starting, stopping, finishing, etc, a torrent.
- The "tos" option was parsing the hex value with unit == 0, which caused
  it to always zero it.
- Forgot to check if there were any torrents hashing before starting new
  non-fast-resume checks, which would cause multiple torrents to be hashed
  at once.
- File progress is now updated when hash_check is called, and no longer
  cleared on close. This fixes a bug with >100% file progress being reported
  and optimizes file progress updating for completed torrents.
- Disabled IPv6 http requests so the trackers won't think we support it,
  and enabled curl's support for gzip encodings.
- Added 'seeding' view on key 8.
- Added "max_{up,down}loads_{div,global}" options. See the man page for
  more information.
- Added support for dvorak keyboard layout. Patch by matled at gmx.net.
- The STOPPED request was being canceled when a download was closed with
  f.ex ^K, moved it so it only happens when the download is removed.
- Allow properly quoted and escaped arguments to options. F.ex "schedule
  = wd,10,10,load_start=~/Foo\ Bar/*.torrent" and "schedule =
  wd,10,10,load_start="~/Foo Bar/*.torrent"" now works.
- Added unlimited setting for max unchoked in ChokeManager and made it
  the default. Set with 0 as a temporary hack.
- Don't resize empty files used for creating directories.

10 files changed, 26 insertions, 135 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index afa4ce4f898..09702d1b577 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/01/26 18:48:52 tron Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/20 13:37:57 tron Exp $
 
-DISTNAME=	libtorrent-0.11.1
+DISTNAME=	libtorrent-0.11.4
 CATEGORIES=	net
-MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
+MASTER_SITES=	${HOMEPAGE:=downloads/}
 
 MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
@@ -15,7 +15,6 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-debug
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 GCC_REQD+=		3.3
 
 .include "../../mk/compiler.mk"
@@ -26,6 +25,15 @@ CXXFLAGS+=	-fpermissive -fno-strength-reduce -fno-thread-jumps \
 		-fno-inline -fforce-addr
 .endif
 
-.include "../../devel/libsigc++2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.if !exists(${BUILDLINK_PREFIX.openssl}/lib/pkgconfig/openssl.pc)
+OPENSSL_CFLAGS=	-I${BUILDLINK_PREFIX.openssl}/include
+OPENSSL_LIBS=	-L${BUILDLINK_PREFIX.openssl}/lib \
+		-W,-lR${BUILDLINK_PREFIX.openssl}/lib
+
+CONFIGURE_ENV+=	OPENSSL_CFLAGS=${OPENSSL_CFLAGS:Q}
+CONFIGURE_ENV+=	OPENSSL_LIBS=${OPENSSL_LIBS:Q}
+.endif
+
+.include "../../devel/libsigc++2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libtorrent/PLIST b/net/libtorrent/PLIST
index c55fd9a2310..4059aa253e5 100644
--- a/net/libtorrent/PLIST
+++ b/net/libtorrent/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/01/26 18:48:52 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/04/20 13:37:57 tron Exp $
 include/torrent/bitfield.h
 include/torrent/chunk_manager.h
 include/torrent/common.h
@@ -9,6 +9,7 @@ include/torrent/data/block_transfer.h
 include/torrent/data/file.h
 include/torrent/data/file_list.h
 include/torrent/data/file_list_iterator.h
+include/torrent/data/file_manager.h
 include/torrent/data/file_utils.h
 include/torrent/data/piece.h
 include/torrent/data/transfer_list.h
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 7858a7063c9..ade64841c3f 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.15 2007/01/26 18:48:52 tron Exp $
+$NetBSD: distinfo,v 1.16 2007/04/20 13:37:57 tron Exp $
 
-SHA1 (libtorrent-0.11.1.tar.gz) = 870f63f9a7eda597dbdb4be791ad0d29ea4902e2
-RMD160 (libtorrent-0.11.1.tar.gz) = f28327d0ebb2a608e3fa3f6f3414db150cc2d000
-Size (libtorrent-0.11.1.tar.gz) = 477557 bytes
-SHA1 (patch-aa) = b1b0246f757e382e3c9110a3462d9f3bd69f1fc8
-SHA1 (patch-ab) = 2faa87c46c9cdded0892b110bc704dbc833c231e
-SHA1 (patch-ac) = c7ee6cbac8959e611f11d0855e9bdd711423382e
-SHA1 (patch-ad) = 6bc04779e06ec55a9cd7540955ccf27546e2d87a
+SHA1 (libtorrent-0.11.4.tar.gz) = 6d997974b445858dfc11f88425ca422be610a296
+RMD160 (libtorrent-0.11.4.tar.gz) = 76fe310ee04205f432d1d55e8d4f131aef5a2d8e
+Size (libtorrent-0.11.4.tar.gz) = 513360 bytes
diff --git a/net/libtorrent/patches/patch-aa b/net/libtorrent/patches/patch-aa
deleted file mode 100644
index de3443d08de..00000000000
--- a/net/libtorrent/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2007/01/04 12:45:41 tron Exp $
-
---- src/torrent/chunk_manager.cc.orig	2006-10-27 15:48:45.000000000 +0200
-+++ src/torrent/chunk_manager.cc
-@@ -37,6 +37,7 @@
- #include "config.h"
- 
- #include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/resource.h>
- 
- #include "data/chunk_list.h"
diff --git a/net/libtorrent/patches/patch-ab b/net/libtorrent/patches/patch-ab
deleted file mode 100644
index 483bb2b3dbc..00000000000
--- a/net/libtorrent/patches/patch-ab
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2007/01/26 18:48:52 tron Exp $
-
---- configure.orig	2006-12-24 12:54:00.000000000 +0000
-+++ configure	2007-01-26 15:15:13.000000000 +0000
-@@ -15823,6 +15823,10 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #include <sys/types.h>
-       #include <sys/mman.h>
-+#if defined(__sun) && defined(__SVR4)
-+      #include <unistd.h>
-+#endif
-+
-       void f() { mincore((char*)0, 0, (unsigned char*)0); }
- 
- _ACEOF
-@@ -15953,6 +15957,9 @@
-   cat >conftest.$ac_ext <<_ACEOF
- #include <sys/types.h>
-       #include <sys/mman.h>
-+#if defined(__sun) && defined(__SVR4)
-+      #include <unistd.h>
-+#endif
-       void f() { mincore((char*)0, 0, (unsigned char*)0); }
- 
- _ACEOF
-@@ -16000,6 +16007,12 @@
-       cat >conftest.$ac_ext <<_ACEOF
- #include <sys/types.h>
-           #include <sys/mman.h>
-+#if defined(__sun) && defined(__SVR4)
-+          #include <unistd.h>
-+#endif
-+#if defined(__sun) && defined(__SVR4)
-+          #include <unistd.h>
-+#endif
-           void f() { mincore((char*)0, 0, (char*)0); }
- 
- _ACEOF
-@@ -16701,6 +16714,10 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     ac_cs_recheck=: ;;
-   --version | --vers* | -V )
-     echo "$ac_cs_version"; exit 0 ;;
diff --git a/net/libtorrent/patches/patch-ac b/net/libtorrent/patches/patch-ac
deleted file mode 100644
index 49ffecc3d2c..00000000000
--- a/net/libtorrent/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/04 12:45:41 tron Exp $
-
---- rak/socket_address.h.orig	2006-10-27 15:48:46.000000000 +0200
-+++ rak/socket_address.h
-@@ -62,7 +62,11 @@ class socket_address_inet6;
- 
- class socket_address {
- public:
-+#if defined(__sun) && defined(__SVR4)
-+  static const sa_family_t af_local  = AF_UNIX;
-+#else
-   static const sa_family_t af_local  = AF_LOCAL;
-+#endif
-   static const sa_family_t af_unix   = AF_UNIX;
-   //  static const sa_family_t af_file   = AF_FILE;
-   static const sa_family_t af_inet   = AF_INET;
diff --git a/net/libtorrent/patches/patch-ad b/net/libtorrent/patches/patch-ad
deleted file mode 100644
index d5050a07587..00000000000
--- a/net/libtorrent/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/01/04 12:45:41 tron Exp $
-
---- src/data/memory_chunk.cc.orig	2006-10-27 15:48:42.000000000 +0200
-+++ src/data/memory_chunk.cc
-@@ -37,6 +37,14 @@
- #include "config.h"
- 
- #include <unistd.h>
-+#if defined(__sun) && defined(__SVR4)
-+/* Ugly hack to make this compile on Solaris. See
-+ * http://www.opensolaris.org/jive/thread.jspa?threadID=21035&tstart=0
-+ */
-+extern "C" {
-+  extern int madvise(caddr_t, size_t, int);
-+}
-+#endif
- #include <rak/error_number.h>
- 
- #include "torrent/exceptions.h"
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index 0e0378faff7..f215fd3b815 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/01/30 14:22:36 tron Exp $
+# $NetBSD: Makefile,v 1.20 2007/04/20 13:37:58 tron Exp $
 
-DISTNAME=	rtorrent-0.7.1
-PKGREVISION=	1
+DISTNAME=	rtorrent-0.7.4
 CATEGORIES=	net
-MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
+MASTER_SITES=	${HOMEPAGE:=downloads/}
 
 MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index 32bbe890b12..7c1fe6cdb4e 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.12 2007/01/26 18:48:53 tron Exp $
+$NetBSD: distinfo,v 1.13 2007/04/20 13:37:58 tron Exp $
 
-SHA1 (rtorrent-0.7.1.tar.gz) = cb41c013f82f12dec4962f68a7677eb0b00785cd
-RMD160 (rtorrent-0.7.1.tar.gz) = 01b42bc520abe7a6cae0b31e9b72dd65d4ae6a90
-Size (rtorrent-0.7.1.tar.gz) = 414447 bytes
-SHA1 (patch-aa) = b64756f960036fcb50e4648aecd31fe004e3ad04
+SHA1 (rtorrent-0.7.4.tar.gz) = 4060913d19204c0978d6378a71f4898714ac20e4
+RMD160 (rtorrent-0.7.4.tar.gz) = 17c72af77b3184db0488147c4ae80d4019bea6f0
+Size (rtorrent-0.7.4.tar.gz) = 451415 bytes
 SHA1 (patch-ab) = 87d7741906f6d7c8572b80d2a3f42910175e182f
diff --git a/net/rtorrent/patches/patch-aa b/net/rtorrent/patches/patch-aa
deleted file mode 100644
index b4cf3298884..00000000000
--- a/net/rtorrent/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/01/04 12:46:38 tron Exp $
-
---- rak/socket_address.h.orig	2007-01-04 01:55:46.851086425 +0100
-+++ rak/socket_address.h
-@@ -62,7 +62,11 @@ class socket_address_inet6;
- 
- class socket_address {
- public:
-+#if defined(__sun) && defined(__SVR4)
-+  static const sa_family_t af_local  = AF_UNIX;
-+#else
-   static const sa_family_t af_local  = AF_LOCAL;
-+#endif
-   static const sa_family_t af_unix   = AF_UNIX;
-   //  static const sa_family_t af_file   = AF_FILE;
-   static const sa_family_t af_inet   = AF_INET;