[Midnightbsd-cvs] mports [21054] trunk/net-p2p/libtorrent: librtorrent 0.13.6

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Mar 6 21:12:21 EST 2016 

Revision: 21054
          http://svnweb.midnightbsd.org/mports/?rev=21054
Author:   laffer1
Date:     2016-03-06 21:12:20 -0500 (Sun, 06 Mar 2016)
Log Message:
-----------
librtorrent 0.13.6

Modified Paths:
--------------
    trunk/net-p2p/libtorrent/Makefile
    trunk/net-p2p/libtorrent/distinfo
    trunk/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc
    trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h
    trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
    trunk/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc
    trunk/net-p2p/libtorrent/pkg-descr
    trunk/net-p2p/libtorrent/pkg-plist

Modified: trunk/net-p2p/libtorrent/Makefile
===================================================================
--- trunk/net-p2p/libtorrent/Makefile	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/Makefile	2016-03-07 02:12:20 UTC (rev 21054)
@@ -1,43 +1,59 @@
 # $MidnightBSD$
 
 PORTNAME=	libtorrent
-PORTVERSION=	0.13.4
-PORTREVISION=	3
+PORTVERSION=	0.13.6
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
+MASTER_SITES=	http://rtorrent.net/downloads/
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	BitTorrent Library written in C++
+COMMENT=	BitTorrent Library
 
-LICENSE=	gpl2
+LICENSE=	gpl2 gpl3
+LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		libtool pathfix pkgconfig
-USE_OPENSSL=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
+CONFLICTS_INSTALL=	rblibtorrent-[0-9]* rblibtorrent-devel-[0-9]*
+
+OPTIONS_DEFINE=	IPV6 KQUEUE
+OPTIONS_DEFAULT=KQUEUE
+KQUEUE_DESC=	Use kqueue(2) support
+
 CONFIGURE_ARGS=	--disable-debug
 CONFIGURE_ENV=	OPENSSL_LIBS="-L${OPENSSLBASE}/lib -ssl -crypto" OPENSSL_CFLAGS="-I${OPENSSLBASE}/include"
+GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
+USE_OPENSSL=	yes
+USES=		compiler:c++11-lang libtool pathfix pkgconfig
 
-OPTIONS_DEFINE=	KQUEUE IPV6
-OPTIONS_DEFAULT=	KQUEUE
-KQUEUE_DESC=	Use kqueue(2) support
-KQUEUE_CONFIGURE_ON=	--with-kqueue
-IPV6_CONFIGURE_ON=	--enable-ipv6
+IPV6_CONFIGURE_ENABLE=	ipv6
+KQUEUE_CONFIGURE_WITH=	kqueue
 
 .include <bsd.port.pre.mk>
 
-USES+=	compiler:c++11-lang
-
 # Disable amd64 atomic ops on i386 when using gcc
 # undefined reference to __sync_add_and_fetch_8
 # undefined reference to __sync_fetch_and_and_8
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == "gcc"
-CONFIGURE_ARGS+=	--disable-instrumentation
+CONFIGURE_ARGS+=--disable-instrumentation
 .endif
 
+.if ${OSVERSION} >= 8000
+USE_CXXSTD=	c++11
+EXTRA_PATCHES+=	${FILESDIR}/extra-clang
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
+.if ${OSVERSION} >= 8000
+	@${FIND} ${WRKSRC} \( -name '*.h' -o -name '*.cc' \) -type f \
+		-exec ${REINPLACE_CMD} -e 's/tr1::/std::/g' {} \; \
+		-exec ${REINPLACE_CMD} -e 's/std::std::/std::/g' {} \; \
+		-exec ${REINPLACE_CMD} -e '/namespace tr1/d' {} \; \
+		-exec ${REINPLACE_CMD} -e '/include/s,tr1/,,' {} \;
+	@${REINPLACE_CMD} -e 's/\.assign/.fill/' \
+		${WRKSRC}/src/torrent/utils/extents.h \
+		${WRKSRC}/src/torrent/utils/log.cc
+.endif
 
 .include <bsd.port.post.mk>

Modified: trunk/net-p2p/libtorrent/distinfo
===================================================================
--- trunk/net-p2p/libtorrent/distinfo	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/distinfo	2016-03-07 02:12:20 UTC (rev 21054)
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-0.13.4.tar.gz) = 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955
-SIZE (libtorrent-0.13.4.tar.gz) = 768382
+SHA256 (libtorrent-0.13.6.tar.gz) = 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04
+SIZE (libtorrent-0.13.6.tar.gz) = 781253

Modified: trunk/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc	2016-03-07 02:12:20 UTC (rev 21054)
@@ -1,20 +1,12 @@
-*** src/data/memory_chunk.cc.orig	Wed Feb 10 09:55:42 2010
---- src/data/memory_chunk.cc	Wed Feb 10 09:56:26 2010
-***************
-*** 78,87 ****
---- 78,90 ----
-  void
-  MemoryChunk::unmap() {
-    if (!is_valid())
-      throw internal_error("MemoryChunk::unmap() called on an invalid object");
-  
-+    if (msync(m_ptr, m_end - m_ptr,MS_INVALIDATE) != 0)
-+        throw internal_error("MemoryChunk::unmap() - msync() system call failed");
-+ 
-    if (munmap(m_ptr, m_end - m_ptr) != 0)
-      throw internal_error("MemoryChunk::unmap() system call failed: " + std::string(rak::error_number::current().c_str()));
-  }  
-  
-  void
-
-
+--- src/data/memory_chunk.cc.orig	2010-02-10 09:55:42 UTC
++++ src/data/memory_chunk.cc
+@@ -86,6 +86,9 @@
+   if (!is_valid())
+     throw internal_error("MemoryChunk::unmap() called on an invalid object");
+ 
++  if (msync(m_ptr, m_end - m_ptr,MS_INVALIDATE) != 0)
++    throw internal_error("MemoryChunk::unmap() - msync() system call failed");
++
+   if (munmap(m_ptr, m_end - m_ptr) != 0)
+     throw internal_error("MemoryChunk::unmap() system call failed: " + std::string(rak::error_number::current().c_str()));
+ }  

Modified: trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/files/patch-src_net_socket__set.h	2016-03-07 02:12:20 UTC (rev 21054)
@@ -1,5 +1,5 @@
---- src/net/socket_set.h.orig	2012-01-19 11:19:26.000000000 +0100
-+++ src/net/socket_set.h	2014-02-02 19:05:15.000000000 +0100
+--- src/net/socket_set.h.orig	2012-01-19 10:19:26 UTC
++++ src/net/socket_set.h
 @@ -53,12 +53,12 @@
  
  // Propably should rename to EventSet...

Modified: trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h	2016-03-07 02:12:20 UTC (rev 21054)
@@ -1,4 +1,4 @@
---- src/torrent/connection_manager.h
+--- src/torrent/connection_manager.h.orig	2012-04-20 06:42:32 UTC
 +++ src/torrent/connection_manager.h
 @@ -42,6 +42,7 @@
  

Modified: trunk/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc
===================================================================
--- trunk/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc	2016-03-07 02:12:20 UTC (rev 21054)
@@ -1,5 +1,5 @@
---- src/torrent/poll_kqueue.cc.orig	2008-12-09 10:47:34.000000000 +0000
-+++ src/torrent/poll_kqueue.cc	2008-12-09 10:48:10.000000000 +0000
+--- src/torrent/poll_kqueue.cc.orig	2008-12-09 10:47:34 UTC
++++ src/torrent/poll_kqueue.cc
 @@ -52,6 +52,8 @@
  #include <sys/event.h>
  #include <sys/select.h>

Modified: trunk/net-p2p/libtorrent/pkg-descr
===================================================================
--- trunk/net-p2p/libtorrent/pkg-descr	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/pkg-descr	2016-03-07 02:12:20 UTC (rev 21054)
@@ -2,4 +2,4 @@
 designed to avoid redundant copying and storing of data that other
 clients and libraries suffer from. Licensed under the GPL.
 
-WWW: http://libtorrent.rakshasa.no/
+WWW: https://github.com/rakshasa/libtorrent

Modified: trunk/net-p2p/libtorrent/pkg-plist
===================================================================
--- trunk/net-p2p/libtorrent/pkg-plist	2016-03-07 02:08:17 UTC (rev 21053)
+++ trunk/net-p2p/libtorrent/pkg-plist	2016-03-07 02:12:20 UTC (rev 21054)
@@ -60,6 +60,6 @@
 include/torrent/utils/thread_base.h
 include/torrent/utils/thread_interrupt.h
 lib/libtorrent.so
-lib/libtorrent.so.18
-lib/libtorrent.so.18.0.0
+lib/libtorrent.so.19
+lib/libtorrent.so.19.0.0
 libdata/pkgconfig/libtorrent.pc

More information about the Midnightbsd-cvs mailing list