CVS commit: pkgsrc/net/libtorrent

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Tue Dec 26 23:14:42 UTC 2017

Modified Files:
        pkgsrc/net/libtorrent: Makefile distinfo
        pkgsrc/net/libtorrent/patches: patch-src_Makefile.am
            patch-src_Makefile.in patch-src_data_chunk__list.cpp
Added Files:
        pkgsrc/net/libtorrent/patches: patch-src_torrent_poll__kqueue.cc

Log Message:
Add a now-required cast to the last arg of EV_SET(), and add comments
to patch files missing them.  Now builds on 8.0.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/net/libtorrent/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/libtorrent/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/libtorrent/patches/patch-src_Makefile.am \
    pkgsrc/net/libtorrent/patches/patch-src_Makefile.in \
    pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/libtorrent/Makefile
diff -u pkgsrc/net/libtorrent/Makefile:1.57 pkgsrc/net/libtorrent/Makefile:1.58
--- pkgsrc/net/libtorrent/Makefile:1.57 Wed May  3 08:38:44 2017
+++ pkgsrc/net/libtorrent/Makefile      Tue Dec 26 23:14:42 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.57 2017/05/03 08:38:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.58 2017/12/26 23:14:42 he Exp $
 
 DISTNAME=      libtorrent-0.13.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  http://rtorrent.net/downloads/
 

Index: pkgsrc/net/libtorrent/distinfo
diff -u pkgsrc/net/libtorrent/distinfo:1.36 pkgsrc/net/libtorrent/distinfo:1.37
--- pkgsrc/net/libtorrent/distinfo:1.36 Wed Nov  4 00:35:10 2015
+++ pkgsrc/net/libtorrent/distinfo      Tue Dec 26 23:14:42 2017
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.36 2015/11/04 00:35:10 agc Exp $
+$NetBSD: distinfo,v 1.37 2017/12/26 23:14:42 he Exp $
 
 SHA1 (libtorrent-0.13.6.tar.gz) = 493691929b701f4402f13c725840addf95231ad2
 RMD160 (libtorrent-0.13.6.tar.gz) = a143a0ef9e86cf989c2c7dff6c86a41d23ddc244
 SHA512 (libtorrent-0.13.6.tar.gz) = b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050
 Size (libtorrent-0.13.6.tar.gz) = 781253 bytes
-SHA1 (patch-src_Makefile.am) = e69dd1da8a9736fa45af71cfc167c8b89a7fe648
-SHA1 (patch-src_Makefile.in) = 522fbdb8da913d351fd86aface86aa2d1d86b5cc
-SHA1 (patch-src_data_chunk__list.cpp) = 4b09b093ca5f2abdb7e4d3c1c0bdb9fdfcd4f981
+SHA1 (patch-src_Makefile.am) = d965bdfd967a71d14ebcad6b32564a1c0908739d
+SHA1 (patch-src_Makefile.in) = 05f55223073fb57cc11fbb307708ba262899d85f
+SHA1 (patch-src_data_chunk__list.cpp) = 92a5f36d7ae993667123051b39e6033c73169f4e
+SHA1 (patch-src_torrent_poll__kqueue.cc) = b6158ea858f4a12db8c763ac77eb09d62c65f804

Index: pkgsrc/net/libtorrent/patches/patch-src_Makefile.am
diff -u pkgsrc/net/libtorrent/patches/patch-src_Makefile.am:1.3 pkgsrc/net/libtorrent/patches/patch-src_Makefile.am:1.4
--- pkgsrc/net/libtorrent/patches/patch-src_Makefile.am:1.3     Wed Sep 18 16:32:05 2013
+++ pkgsrc/net/libtorrent/patches/patch-src_Makefile.am Tue Dec 26 23:14:42 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_Makefile.am,v 1.3 2013/09/18 16:32:05 joerg Exp $
+$NetBSD: patch-src_Makefile.am,v 1.4 2017/12/26 23:14:42 he Exp $
+
+Add -lcrypto and -no-undefined to LDFLAGS.
 
 --- src/Makefile.am.orig       2012-02-14 03:39:45.000000000 +0000
 +++ src/Makefile.am
Index: pkgsrc/net/libtorrent/patches/patch-src_Makefile.in
diff -u pkgsrc/net/libtorrent/patches/patch-src_Makefile.in:1.3 pkgsrc/net/libtorrent/patches/patch-src_Makefile.in:1.4
--- pkgsrc/net/libtorrent/patches/patch-src_Makefile.in:1.3     Wed Sep 18 16:32:05 2013
+++ pkgsrc/net/libtorrent/patches/patch-src_Makefile.in Tue Dec 26 23:14:42 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2013/09/18 16:32:05 joerg Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2017/12/26 23:14:42 he Exp $
+
+Add -lcrypto and -no-undefined to LDFLAGS.
 
 --- src/Makefile.in.orig       2012-04-20 06:56:14.000000000 +0000
 +++ src/Makefile.in
Index: pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp
diff -u pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp:1.3 pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp:1.4
--- pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp:1.3    Wed Sep 18 16:32:05 2013
+++ pkgsrc/net/libtorrent/patches/patch-src_data_chunk__list.cpp        Tue Dec 26 23:14:42 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_data_chunk__list.cpp,v 1.3 2013/09/18 16:32:05 joerg Exp $
+$NetBSD: patch-src_data_chunk__list.cpp,v 1.4 2017/12/26 23:14:42 he Exp $
+
+Add some casts now required.
 
 --- src/data/chunk_list.cc.orig        2012-02-22 07:50:27.000000000 +0000
 +++ src/data/chunk_list.cc     2013-05-12 12:25:45.000000000 +0100

Added files:

Index: pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc
diff -u /dev/null pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc:1.1
--- /dev/null   Tue Dec 26 23:14:42 2017
+++ pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc     Tue Dec 26 23:14:42 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_torrent_poll__kqueue.cc,v 1.1 2017/12/26 23:14:42 he Exp $
+
+Add a cast so that this builds with the c++ in 8.0.
+
+--- ./src/torrent/poll_kqueue.cc.orig  2015-08-08 15:01:32.000000000 +0000
++++ ./src/torrent/poll_kqueue.cc
+@@ -111,7 +111,7 @@ PollKQueue::modify(Event* event, unsigne
+   struct kevent* itr = m_changes + (m_changedEvents++);
+ 
+   assert(event == m_table[event->file_descriptor()].second);
+-  EV_SET(itr, event->file_descriptor(), mask, op, 0, 0, event);
++  EV_SET(itr, event->file_descriptor(), mask, op, 0, 0, (intptr_t)event);
+ }
+ 
+ PollKQueue*