Pullup ticket 2754 - requested by tron

Build fix for Solaris

Revisions pulled up:
- pkgsrc/net/libtorrent/Makefile		1.30
- pkgsrc/net/libtorrent/distinfo		1.22
- pkgsrc/net/libtorrent/patches/patch-aa	1.8
- pkgsrc/net/rtorrent/Makefile			1.30
- pkgsrc/net/rtorrent/distinfo			1.21
- pkgsrc/net/rtorrent/patches/patch-aa		1.7

   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Apr 10 09:06:21 UTC 2009

   Modified Files:
   	pkgsrc/net/libtorrent: Makefile distinfo
   	pkgsrc/net/rtorrent: Makefile distinfo
   Added Files:
   	pkgsrc/net/libtorrent/patches: patch-aa
   	pkgsrc/net/rtorrent/patches: patch-aa

   Log Message:
   Add two patches taken from "xnet.fi" to fix the build under SunOS 5.11
   (and eventually older versions). Problem reported by Tom Hensel in
   private e-mail.


   To generate a diff of this commit:
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/libtorrent/Makefile
   cvs rdiff -u -r1.21 -r1.22 pkgsrc/net/libtorrent/distinfo
   cvs rdiff -u -r0 -r1.8 pkgsrc/net/libtorrent/patches/patch-aa
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/rtorrent/Makefile
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/rtorrent/distinfo
   cvs rdiff -u -r0 -r1.7 pkgsrc/net/rtorrent/patches/patch-aa

6 files changed, 42 insertions, 4 deletions

diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index 4d20919aafe..ce474ba6fba 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/12/03 12:57:40 tron Exp $
+# $NetBSD: Makefile,v 1.29.4.1 2009/05/03 12:29:52 spz Exp $
 
 DISTNAME=	libtorrent-0.12.2
 CATEGORIES=	net
@@ -8,6 +8,8 @@ OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	BitTorrent library written in C++ for *nix
 
+LICENSE=	gnu-gpl-v2
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 6de783f1f7f..7da658bb7b4 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.21 2008/12/03 12:57:40 tron Exp $
+$NetBSD: distinfo,v 1.21.4.1 2009/05/03 12:29:52 spz Exp $
 
 SHA1 (libtorrent-0.12.2.tar.gz) = a53d2c671e9f2dd971d0622d5b3672da91c46ef9
 RMD160 (libtorrent-0.12.2.tar.gz) = 88cdc415f98afd8b87fa6d7330906737c3e434fa
 Size (libtorrent-0.12.2.tar.gz) = 585374 bytes
+SHA1 (patch-aa) = d864808b9e9524b3a7f72bcc1b465d4e6b2d4f4a
diff --git a/net/libtorrent/patches/patch-aa b/net/libtorrent/patches/patch-aa
new file mode 100644
index 00000000000..1c6a5f60801
--- /dev/null
+++ b/net/libtorrent/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.8.2.2 2009/05/03 12:29:53 spz Exp $
+
+--- src/data/memory_chunk.cc.orig	2008-05-07 13:19:13.000000000 +0100
++++ src/data/memory_chunk.cc	2009-04-10 09:37:20.000000000 +0100
+@@ -46,6 +46,10 @@
+ #include "torrent/exceptions.h"
+ #include "memory_chunk.h"
+ 
++#if defined(sun) || defined(__sun) 
++extern "C" int madvise(void *addr, size_t len, int behav);
++#endif /* sun || __sun  */
++
+ namespace torrent {
+ 
+ uint32_t MemoryChunk::m_pagesize = getpagesize();
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index a0f80bd0f10..874923ac81c 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2008/12/03 12:57:40 tron Exp $
+# $NetBSD: Makefile,v 1.29.4.1 2009/05/03 12:29:53 spz Exp $
 
 DISTNAME=	rtorrent-0.8.2
 CATEGORIES=	net
@@ -8,6 +8,8 @@ OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	Ncurses based torrent client with support for sessions
 
+LICENSE=	gnu-gpl-v2
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=		c c++
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index 483249a1d14..b5096477f39 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.20 2008/12/16 16:49:52 tron Exp $
+$NetBSD: distinfo,v 1.20.4.1 2009/05/03 12:29:53 spz Exp $
 
 SHA1 (rtorrent-0.8.2.tar.gz) = 891093c5d600c2e3853eadbbec369a12dfe6ec11
 RMD160 (rtorrent-0.8.2.tar.gz) = e86b0082d1788e4e7cd8fcf631f7f857d642c799
 Size (rtorrent-0.8.2.tar.gz) = 506015 bytes
+SHA1 (patch-aa) = ef8edceb33f28e022e3d48706c30733ac3a730a3
 SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914
 SHA1 (patch-ac) = b62de9ce834aa0422ec173e694d07e88aa1e2f47
 SHA1 (patch-ad) = 04fafec083c7cb27eb2f5ef7fbc5f6ab2e4e4a55
diff --git a/net/rtorrent/patches/patch-aa b/net/rtorrent/patches/patch-aa
new file mode 100644
index 00000000000..1f45af3c00d
--- /dev/null
+++ b/net/rtorrent/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.7.2.2 2009/05/03 12:29:53 spz Exp $
+
+--- src/rpc/scgi.cc.orig	2008-05-07 13:19:10.000000000 +0100
++++ src/rpc/scgi.cc	2009-04-10 09:45:10.000000000 +0100
+@@ -88,7 +88,12 @@
+   char buffer[sizeof(sockaddr_un) + filename.size()];
+   sockaddr_un* sa = reinterpret_cast<sockaddr_un*>(buffer);
+ 
++#if defined(sun) || defined(__sun) 
++  sa->sun_family = AF_UNIX;
++#else
+   sa->sun_family = AF_LOCAL;
++#endif
++
+   std::memcpy(sa->sun_path, filename.c_str(), filename.size() + 1);
+ 
+   if (!get_fd().open_local())