svn commit: r361124 - in head: . net-p2p net-p2p/libtorrent net-p2p/libtorrent-devel net-p2p/libtorrent/files net-p2p/rtorrent net-p2p/rtorrent-devel

Guido Falsi madpilot at FreeBSD.org
Mon Jul 7 19:33:02 UTC 2014 

Author: madpilot
Date: Mon Jul  7 19:33:00 2014
New Revision: 361124
URL: http://svnweb.freebsd.org/changeset/ports/361124
QAT: https://qat.redports.org/buildarchive/r361124/

Log:
  - Update libtorrent to 0.13.4
  - Update rtorrent to 0.9.4
  - Convert to new LIB_DEPENDS format
  - Remove uneeded ?=
  - Remove libtorrent-devel and rtorrent-devel ports since the non
    devel port has a newer version and no development release is available
    anymore
  
  PR:		191621
  Submitted by:	Colin <anonymous.bug.report at gmail.com>

Added:
  head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h
     - copied, changed from r361122, head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h
Deleted:
  head/net-p2p/libtorrent-devel/
  head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h
  head/net-p2p/libtorrent/files/patch-src_torrent_utils_log.cc
  head/net-p2p/libtorrent/files/patch-src_torrent_utils_log.h
  head/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc
  head/net-p2p/rtorrent-devel/
Modified:
  head/MOVED
  head/net-p2p/Makefile
  head/net-p2p/libtorrent/Makefile
  head/net-p2p/libtorrent/distinfo
  head/net-p2p/libtorrent/files/extra-clang
  head/net-p2p/libtorrent/pkg-plist
  head/net-p2p/rtorrent/Makefile
  head/net-p2p/rtorrent/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/MOVED	Mon Jul  7 19:33:00 2014	(r361124)
@@ -6241,3 +6241,5 @@ print/texinfo-lite|print/indexinfo|2014-
 audio/linnya||2014-07-07|Deprecated upstream
 databases/slony1|databases/slony1v2|2014-07-07|Unsupported: consider using slony1 v2 instead
 lang/see-devel|lang/see|2014-07-07|lang/see is up to date no need for see-devel
+net-p2p/libtorrent-devel||2014-07-07|libtorrent port has newer version, use that instead
+net-p2p/rtorrent-devel||2014-07-07|rtorrent port has newer version, use that instead

Modified: head/net-p2p/Makefile
==============================================================================
--- head/net-p2p/Makefile	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/Makefile	Mon Jul  7 19:33:00 2014	(r361124)
@@ -46,7 +46,6 @@
     SUBDIR += libktorrent
     SUBDIR += libpdtp
     SUBDIR += libtorrent
-    SUBDIR += libtorrent-devel
     SUBDIR += libtorrent-rasterbar
     SUBDIR += libtorrent-rasterbar-python
     SUBDIR += linux-jigdo
@@ -84,7 +83,6 @@
     SUBDIR += retroshare
     SUBDIR += rtgui
     SUBDIR += rtorrent
-    SUBDIR += rtorrent-devel
     SUBDIR += shx
     SUBDIR += solidcoin
     SUBDIR += squall

Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/libtorrent/Makefile	Mon Jul  7 19:33:00 2014	(r361124)
@@ -1,24 +1,19 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent
-PORTVERSION=	0.13.2
-PORTREVISION=	3
+PORTVERSION=	0.13.4
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/ \
-		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	flz/libtorrent
+MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
-MAINTAINER?=	ports at FreeBSD.org
-COMMENT?=	BitTorrent Library written in C++
+MAINTAINER=	ports at FreeBSD.org
+COMMENT=	BitTorrent Library written in C++
 
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
 
-CONFLICTS?=	libtorrent-devel-[0-9]* \
-		rblibtorrent-[0-9]* \
+CONFLICTS=	rblibtorrent-[0-9]* \
 		rblibtorrent-devel-[0-9]*
 
-USE_AUTOTOOLS=	libtool
-USES=	pathfix pkgconfig
+USES=		compiler:c++11-lang libtool pathfix pkgconfig
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
@@ -38,6 +33,13 @@ CONFIGURE_ENV=	OPENSSL_LIBS="-L/usr/lib 
 
 CONFIGURE_ARGS+=	--disable-debug
 
+# 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
+.endif
+
 # Workaround to build on >= 10.x
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 CXXFLAGS+=	-std=c++11

Modified: head/net-p2p/libtorrent/distinfo
==============================================================================
--- head/net-p2p/libtorrent/distinfo	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/libtorrent/distinfo	Mon Jul  7 19:33:00 2014	(r361124)
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-0.13.2.tar.gz) = ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f
-SIZE (libtorrent-0.13.2.tar.gz) = 725088
+SHA256 (libtorrent-0.13.4.tar.gz) = 704e097119dc89e2ee4630396b25de1cd64b0549841347ea75b9ef9217084955
+SIZE (libtorrent-0.13.4.tar.gz) = 768382

Modified: head/net-p2p/libtorrent/files/extra-clang
==============================================================================
--- head/net-p2p/libtorrent/files/extra-clang	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/libtorrent/files/extra-clang	Mon Jul  7 19:33:00 2014	(r361124)
@@ -1,9 +1,6 @@
-You guys are doing it wrong. And clang is strict about it.
-This makes rtorrent link again.
-
---- src/data/memory_chunk.cc	2013-12-07 17:21:35.803392000 +0100
-+++ old/data/memory_chunk.cc	2013-12-07 17:47:23.430285373 +0100
-@@ -54,6 +54,29 @@ extern "C" int madvise(void *, size_t, i
+--- src/data/memory_chunk.cc
++++ src/data/memory_chunk.cc
+@@ -54,6 +54,22 @@
  
  namespace torrent {
  
@@ -13,19 +10,12 @@ This makes rtorrent link again.
 +const int MemoryChunk::prot_none;
 +const int MemoryChunk::map_shared;
 +
-+#ifdef USE_MADVISE
 +const int MemoryChunk::advice_normal;
 +const int MemoryChunk::advice_random;
 +const int MemoryChunk::advice_sequential;
 +const int MemoryChunk::advice_willneed;
 +const int MemoryChunk::advice_dontneed;
-+#else
-+const int MemoryChunk::advice_normal;
-+const int MemoryChunk::advice_random;
-+const int MemoryChunk::advice_sequential;
-+const int MemoryChunk::advice_willneed;
-+const int MemoryChunk::advice_dontneed;
-+#endif
++
 +const int MemoryChunk::sync_sync;
 +const int MemoryChunk::sync_async;
 +const int MemoryChunk::sync_invalidate;
@@ -33,8 +23,19 @@ This makes rtorrent link again.
  uint32_t MemoryChunk::m_pagesize = getpagesize();
  
  inline void
---- src/torrent/data/file.cc	2013-12-07 17:21:35.590392000 +0100
-+++ old/torrent/data/file.cc	2013-12-07 17:45:59.975290599 +0100
+--- src/protocol/request_list.cc
++++ src/protocol/request_list.cc
+@@ -52,6 +52,8 @@
+ 
+ namespace torrent {
+ 
++const int request_list_constants::bucket_count;
++
+ const instrumentation_enum request_list_constants::instrumentation_added[bucket_count] = {
+   INSTRUMENTATION_TRANSFER_REQUESTS_QUEUED_ADDED,
+   INSTRUMENTATION_TRANSFER_REQUESTS_UNORDERED_ADDED,
+--- src/torrent/data/file.cc
++++ src/torrent/data/file.cc
 @@ -50,6 +50,15 @@
  
  namespace torrent {
@@ -51,8 +52,8 @@ This makes rtorrent link again.
  File::File() :
    m_fd(-1),
    m_protection(0),
---- src/torrent/download.cc	2013-12-07 17:21:35.721391000 +0100
-+++ old/torrent/download.cc	2013-12-07 17:44:19.498298036 +0100
+--- src/torrent/download.cc
++++ src/torrent/download.cc
 @@ -72,6 +72,20 @@
  
  namespace torrent {
@@ -74,8 +75,8 @@ This makes rtorrent link again.
  const DownloadInfo* Download::info() const { return m_ptr->info(); }
  const download_data* Download::data() const { return m_ptr->data(); }
  
---- src/torrent/peer/connection_list.cc	2013-12-07 17:21:35.676392000 +0100
-+++ old/torrent/peer/connection_list.cc	2013-12-07 17:44:32.385410379 +0100
+--- src/torrent/peer/connection_list.cc
++++ src/torrent/peer/connection_list.cc
 @@ -60,6 +60,11 @@
  
  namespace torrent {
@@ -88,3 +89,56 @@ This makes rtorrent link again.
  ConnectionList::ConnectionList(DownloadMain* download) :
    m_download(download), m_minSize(50), m_maxSize(100) {
  }
+--- src/torrent/utils/log.cc
++++ src/torrent/utils/log.cc
+@@ -189,7 +189,7 @@
+   pthread_mutex_lock(&log_mutex);
+   std::for_each(m_first, m_last, std::tr1::bind(&log_slot::operator(),
+                                                 std::tr1::placeholders::_1,
+-                                                buffer,
++                                                (const char*)buffer,
+                                                 std::distance(buffer, first),
+                                                 std::distance(log_groups.begin(), this)));
+   if (dump_data != NULL)
+--- src/utils/instrumentation.h
++++ src/utils/instrumentation.h
+@@ -39,6 +39,8 @@
+ 
+ #include <tr1/array>
+ 
++#include <algorithm>
++
+ #include "torrent/common.h"
+ #include "torrent/utils/log.h"
+ 
+@@ -118,7 +120,7 @@
+ 
+ inline void
+ instrumentation_initialize() {
+-  instrumentation_values.assign(int64_t());
++  std::fill(instrumentation_values.begin(), instrumentation_values.end(), int64_t());
+ }
+ 
+ inline void
+--- src/utils/queue_buckets.h
++++ src/utils/queue_buckets.h
+@@ -251,7 +251,7 @@
+   instrumentation_update(constants::instrumentation_total[idx], -difference);
+ 
+   // Consider moving these to a temporary dequeue before releasing:
+-  std::for_each(begin, end, std::tr1::function<void (value_type)>(&constants::template destroy<value_type>));
++  std::for_each(begin, end, std::tr1::function<void (value_type&)>(&constants::template destroy<value_type>));
+   queue_at(idx).erase(begin, end);
+ }
+ 
+--- src/torrent/download_info.h
++++ src/torrent/download_info.h
+@@ -52,7 +52,7 @@
+ 
+ // This will become a Download 'handle' of kinds.
+ 
+-class DownloadInfo {
++class LIBTORRENT_EXPORT DownloadInfo {
+ public:
+   typedef std::tr1::function<uint64_t ()>                              slot_stat_type;
+ 

Copied and modified: head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h (from r361122, head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h)
==============================================================================
--- head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h	Mon Jul  7 19:19:09 2014	(r361122, copy source)
+++ head/net-p2p/libtorrent/files/patch-src_torrent_connection__manager.h	Mon Jul  7 19:33:00 2014	(r361124)
@@ -1,10 +1,10 @@
---- ./src/torrent/connection_manager.h.orig	2013-10-25 09:26:00.379999391 +0100
-+++ ./src/torrent/connection_manager.h	2013-10-25 09:26:18.486351796 +0100
-@@ -40,6 +40,7 @@
- #define LIBTORRENT_CONNECTION_MANAGER_H
+--- src/torrent/connection_manager.h
++++ src/torrent/connection_manager.h
+@@ -42,6 +42,7 @@
  
- #include <sys/socket.h>
-+#include <sys/types.h>
+ #include <list>
  #include <arpa/inet.h>
++#include <sys/types.h>
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
+ #include <netinet/ip.h>

Modified: head/net-p2p/libtorrent/pkg-plist
==============================================================================
--- head/net-p2p/libtorrent/pkg-plist	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/libtorrent/pkg-plist	Mon Jul  7 19:33:00 2014	(r361124)
@@ -52,16 +52,16 @@ include/torrent/tracker_list.h
 include/torrent/utils/extents.h
 include/torrent/utils/log.h
 include/torrent/utils/log_buffer.h
-include/torrent/utils/log_files.h
+include/torrent/utils/net.h
 include/torrent/utils/option_strings.h
 include/torrent/utils/ranges.h
 include/torrent/utils/resume.h
 include/torrent/utils/signal_bitfield.h
 include/torrent/utils/thread_base.h
-lib/libtorrent.a
-lib/libtorrent.la
+include/torrent/utils/thread_interrupt.h
 lib/libtorrent.so
-lib/libtorrent.so.14
+lib/libtorrent.so.18
+lib/libtorrent.so.18.0.0
 libdata/pkgconfig/libtorrent.pc
 @dirrmtry include/torrent/utils
 @dirrmtry include/torrent/peer

Modified: head/net-p2p/rtorrent/Makefile
==============================================================================
--- head/net-p2p/rtorrent/Makefile	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/rtorrent/Makefile	Mon Jul  7 19:33:00 2014	(r361124)
@@ -1,20 +1,17 @@
 # $FreeBSD$
 
-PORTNAME?=	rtorrent
-PORTVERSION=	0.9.2
-PORTREVISION=	5
+PORTNAME=	rtorrent
+PORTVERSION=	0.9.4
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	BitTorrent Client written in C++
 
-BUILD_DEPENDS=	libtorrent=0.13.2_3:${PORTSDIR}/net-p2p/libtorrent
-RUN_DEPENDS=	libtorrent=0.13.2_3:${PORTSDIR}/net-p2p/libtorrent
+BUILD_DEPENDS=	libtorrent=0.13.4:${PORTSDIR}/net-p2p/libtorrent
+RUN_DEPENDS=	libtorrent=0.13.4:${PORTSDIR}/net-p2p/libtorrent
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-CONFLICTS=	rtorrent-devel-[0-9]*
-
 GNU_CONFIGURE=	yes
 USES=		pkgconfig
 LDFLAGS+=	-pthread

Modified: head/net-p2p/rtorrent/distinfo
==============================================================================
--- head/net-p2p/rtorrent/distinfo	Mon Jul  7 19:27:06 2014	(r361123)
+++ head/net-p2p/rtorrent/distinfo	Mon Jul  7 19:33:00 2014	(r361124)
@@ -1,2 +1,2 @@
-SHA256 (rtorrent-0.9.2.tar.gz) = 5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d
-SIZE (rtorrent-0.9.2.tar.gz) = 591837
+SHA256 (rtorrent-0.9.4.tar.gz) = bc0a2c1ee613b68f37021beaf4e64a9252f91ed06f998c1e897897c354ce7e84
+SIZE (rtorrent-0.9.4.tar.gz) = 601913

More information about the svn-ports-all mailing list