svn commit: r344155 - in head/net-p2p/libtorrent-rasterbar: . files

[Rusmir Dusko]

Author: nemysis
Date: Thu Feb 13 22:58:14 2014
New Revision: 344155
URL: http://svnweb.freebsd.org/changeset/ports/344155
QAT: https://qat.redports.org/buildarchive/r344155/

Log:
  - Update to 0.16.14
  - Don't silence warnings
  - Remove PORTSCOUT, with 0.16.14 works now
    qBittorrent all Versions
  - Add DEBUG Option
  - Add patches from Upstrem, fix bad C++ code

Added:
  head/net-p2p/libtorrent-rasterbar/files/patch-src__disk_io_thread.cpp   (contents, props changed)
  head/net-p2p/libtorrent-rasterbar/files/patch-src__storage.cpp   (contents, props changed)
Modified:
  head/net-p2p/libtorrent-rasterbar/Makefile
  head/net-p2p/libtorrent-rasterbar/distinfo

Modified: head/net-p2p/libtorrent-rasterbar/Makefile
==============================================================================
--- head/net-p2p/libtorrent-rasterbar/Makefile	Thu Feb 13 22:44:03 2014	(r344154)
+++ head/net-p2p/libtorrent-rasterbar/Makefile	Thu Feb 13 22:58:14 2014	(r344155)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	0.16.13
-PORTREVISION=	3
+PORTVERSION=	0.16.14
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME:S/-rasterbar//}/${PORTNAME:S/-rasterbar//}/
 
@@ -18,14 +17,9 @@ LIB_DEPENDS?=	libboost_date_time.so:${PO
 USES=		compiler:c++11-lang pathfix pkgconfig iconv
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CFLAGS+=	-w
 USE_LDCONFIG=	yes
 
-# Wrong versioning upstream
-PORTSCOUT=	skipv:0.16.14
-
-CONFIGURE_ARGS=	--disable-debug \
-		--disable-static \
+CONFIGURE_ARGS=	--disable-static \
 		--enable-dht \
 		--enable-encryption \
 		--enable-pool-allocators \
@@ -53,9 +47,11 @@ DOC_FILES2=	*.png *.jpg *.gif *.html *.r
 
 PORTEXAMPLES=	*.cpp
 
-OPTIONS_DEFINE=	DOCS EXAMPLES STRIP
+OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES STRIP
 OPTIONS_DEFAULT=	STRIP
 
+DEBUG_CONFIGURE_ENABLE=	debug
+
 .include <bsd.port.options.mk>
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "yes" && defined(USE_PYTHON)

Modified: head/net-p2p/libtorrent-rasterbar/distinfo
==============================================================================
--- head/net-p2p/libtorrent-rasterbar/distinfo	Thu Feb 13 22:44:03 2014	(r344154)
+++ head/net-p2p/libtorrent-rasterbar/distinfo	Thu Feb 13 22:58:14 2014	(r344155)
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-rasterbar-0.16.13.tar.gz) = 75573af1f112d4ebff2e3669f177600d4333a805210882967bd7dc08214227eb
-SIZE (libtorrent-rasterbar-0.16.13.tar.gz) = 3017425
+SHA256 (libtorrent-rasterbar-0.16.14.tar.gz) = 4c54207850c32c0a65c7b5bb089731e50285024e0992fe6e29f831249c198e68
+SIZE (libtorrent-rasterbar-0.16.14.tar.gz) = 3012772

Added: head/net-p2p/libtorrent-rasterbar/files/patch-src__disk_io_thread.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/libtorrent-rasterbar/files/patch-src__disk_io_thread.cpp	Thu Feb 13 22:58:14 2014	(r344155)
@@ -0,0 +1,11 @@
+--- ./src/disk_io_thread.cpp.orig	2013-09-26 03:30:20.000000000 +0200
++++ ./src/disk_io_thread.cpp	2014-02-13 21:36:20.000000000 +0100
+@@ -1765,7 +1765,7 @@
+ #endif
+ 					TORRENT_ASSERT(j.buffer);
+ 					session_settings const* s = ((session_settings*)j.buffer);
+-					TORRENT_ASSERT(s->cache_size >= 0);
++					TORRENT_ASSERT(s->cache_size >= -1);
+ 					TORRENT_ASSERT(s->cache_expiry > 0);
+ 
+ #if defined TORRENT_WINDOWS

Added: head/net-p2p/libtorrent-rasterbar/files/patch-src__storage.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/libtorrent-rasterbar/files/patch-src__storage.cpp	Thu Feb 13 22:58:14 2014	(r344155)
@@ -0,0 +1,11 @@
+--- ./src/storage.cpp.orig	2014-01-24 11:05:39.000000000 +0100
++++ ./src/storage.cpp	2014-02-13 21:33:49.000000000 +0100
+@@ -1223,7 +1223,7 @@
+ 			// if the file has priority 0, don't allocate it
+ 			int file_index = files().file_index(*file_iter);
+ 			if (m_allocate_files && (op.mode & file::rw_mask) != file::read_only
+-				&& (m_file_priority.size() < file_index || m_file_priority[file_index] > 0))
++				&& (m_file_priority.size() <= file_index || m_file_priority[file_index] > 0))
+ 			{
+ 				TORRENT_ASSERT(m_file_created.size() == files().num_files());
+ 				if (m_file_created[file_index] == false)