Fix build under Solaris. Patch provided by Peter Schuller in PR pkg/35356.

5 files changed, 97 insertions, 4 deletions

diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 207f0fa4280..9dbd71915b7 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.13 2006/11/08 09:19:40 tron Exp $
+$NetBSD: distinfo,v 1.14 2007/01/04 12:45:41 tron Exp $
 
 SHA1 (libtorrent-0.10.4.tar.gz) = f809a013469be9a933c1032f8e4ebe08d4150e5a
 RMD160 (libtorrent-0.10.4.tar.gz) = 43fdfe827e6f56c7caed2406f5c0c6df28dcf007
 Size (libtorrent-0.10.4.tar.gz) = 485174 bytes
-SHA1 (patch-aa) = 98a4a23beb017c03005bcc42aa1d6cfefdfcfded
+SHA1 (patch-aa) = b1b0246f757e382e3c9110a3462d9f3bd69f1fc8
+SHA1 (patch-ab) = 46a29703e33c1920b43708ba2e6b51a4a3a48412
+SHA1 (patch-ac) = c7ee6cbac8959e611f11d0855e9bdd711423382e
+SHA1 (patch-ad) = 6bc04779e06ec55a9cd7540955ccf27546e2d87a
diff --git a/net/libtorrent/patches/patch-aa b/net/libtorrent/patches/patch-aa
index b4c6586b77e..de3443d08de 100644
--- a/net/libtorrent/patches/patch-aa
+++ b/net/libtorrent/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2006/09/18 22:04:52 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2007/01/04 12:45:41 tron Exp $
 
---- src/torrent/chunk_manager.cc.orig	2006-09-18 21:54:17.000000000 +0000
+--- 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"
diff --git a/net/libtorrent/patches/patch-ab b/net/libtorrent/patches/patch-ab
new file mode 100644
index 00000000000..d67f0a12e87
--- /dev/null
+++ b/net/libtorrent/patches/patch-ab
@@ -0,0 +1,55 @@
+$NetBSD: patch-ab,v 1.6 2007/01/04 12:45:41 tron Exp $
+
+--- configure.orig	2006-10-27 15:52:04.000000000 +0200
++++ configure
+@@ -22826,6 +22826,9 @@ echo $ECHO_N "checking signedness of min
+   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
+@@ -22873,6 +22876,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
+       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, (char*)0); }
+ 
+ _ACEOF
+@@ -22956,6 +22962,9 @@ echo $ECHO_N "checking signedness of min
+   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
+@@ -23003,6 +23012,9 @@ sed 's/^/| /' conftest.$ac_ext >&5
+       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, (char*)0); }
+ 
+ _ACEOF
+@@ -23704,6 +23716,10 @@ do
+ _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
new file mode 100644
index 00000000000..49ffecc3d2c
--- /dev/null
+++ b/net/libtorrent/patches/patch-ac
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 00000000000..d5050a07587
--- /dev/null
+++ b/net/libtorrent/patches/patch-ad
@@ -0,0 +1,19 @@
+$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"