svn commit: r402121 - in head/net-p2p/libtorrent: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Sat Nov 21 02:10:06 UTC 2015
Author: sunpoet
Date: Sat Nov 21 02:10:04 2015
New Revision: 402121
URL: https://svnweb.freebsd.org/changeset/ports/402121
Log:
- Update LICENSE
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Use USE_CXXSTD
- Cosmetic change
- Pet portlint: fix diff header of patch files
Modified:
head/net-p2p/libtorrent/Makefile
head/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc
head/net-p2p/libtorrent/files/patch-src_net_socket__set.h
head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
head/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc
Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile Sat Nov 21 02:10:00 2015 (r402120)
+++ head/net-p2p/libtorrent/Makefile Sat Nov 21 02:10:04 2015 (r402121)
@@ -8,22 +8,26 @@ MASTER_SITES= http://rtorrent.net/downlo
MAINTAINER= ports at FreeBSD.org
COMMENT= BitTorrent Library written in C++
-LICENSE= GPLv2 # or later
-LICENSE_FILE= ${WRKSRC}/COPYING
+LICENSE= GPLv2 GPLv3
+LICENSE_COMB= dual
+LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
+
+CONFLICTS_INSTALL= rblibtorrent-[0-9]* rblibtorrent-devel-[0-9]*
+
+OPTIONS_DEFINE= IPV6 KQUEUE
+OPTIONS_DEFAULT=KQUEUE
+KQUEUE_DESC= Use kqueue(2) support
-USES= compiler:c++11-lang libtool pathfix pkgconfig
-USE_OPENSSL= yes
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
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>
@@ -31,12 +35,12 @@ IPV6_CONFIGURE_ON= --enable-ipv6
# 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
# Workaround to build on >= 10.x
.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
-CXXFLAGS+= -std=c++11
+USE_CXXSTD= c++11
EXTRA_PATCHES+= ${FILESDIR}/extra-clang
.endif
Modified: head/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc
==============================================================================
--- head/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc Sat Nov 21 02:10:00 2015 (r402120)
+++ head/net-p2p/libtorrent/files/patch-src_data_memory__chunk.cc Sat Nov 21 02:10:04 2015 (r402121)
@@ -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: head/net-p2p/libtorrent/files/patch-src_net_socket__set.h
==============================================================================
--- head/net-p2p/libtorrent/files/patch-src_net_socket__set.h Sat Nov 21 02:10:00 2015 (r402120)
+++ head/net-p2p/libtorrent/files/patch-src_net_socket__set.h Sat Nov 21 02:10:04 2015 (r402121)
@@ -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: head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
==============================================================================
--- head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h Sat Nov 21 02:10:00 2015 (r402120)
+++ head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h Sat Nov 21 02:10:04 2015 (r402121)
@@ -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: head/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc
==============================================================================
--- head/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc Sat Nov 21 02:10:00 2015 (r402120)
+++ head/net-p2p/libtorrent/files/patch-src_torrent_poll__kqueue.cc Sat Nov 21 02:10:04 2015 (r402121)
@@ -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>
More information about the svn-ports-all
mailing list