Sun Jun 2 22:52:15 2013 UTC ()

Back out all of the C++11 related patches. They don't only break the
build under Mac OS X but also under NetBSD/amd64 6.1 with the default
G++ compiler.

This fixes PR pkg/47873 by myself.


(tron)

--- pkgsrc/net/libtorrent/Makefile 2013/05/09 14:26:41 1.48
+++ pkgsrc/net/libtorrent/Makefile 2013/06/02 22:52:14 1.49

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.48 2013/05/09 14:26:41 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2013/06/02 22:52:14 tron Exp $
 DISTNAME=	libtorrent-0.13.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	${HOMEPAGE:=downloads/}
 OWNER=		tron@NetBSD.org
 HOMEPAGE=	http://libtorrent.rakshasa.no/
 COMMENT=	BitTorrent library written in C++ for *nix
 LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-debug

--- pkgsrc/net/libtorrent/distinfo 2013/05/12 11:30:13 1.31
+++ pkgsrc/net/libtorrent/distinfo 2013/06/02 22:52:14 1.32

 @@ -1,48 +1,6 @@
-$NetBSD: distinfo,v 1.31 2013/05/12 11:30:13 tron Exp $
+$NetBSD: distinfo,v 1.32 2013/06/02 22:52:14 tron Exp $
 SHA1 (libtorrent-0.13.2.tar.gz) = 4f34a744fbe10c54aaf53d34681fabc1a49d7257
 RMD160 (libtorrent-0.13.2.tar.gz) = 090e6af9b4318a6176064159f6a8f70ab708c7fe
 Size (libtorrent-0.13.2.tar.gz) = 725088 bytes
 SHA1 (patch-rak_priority__queue__default.h) = 2eee25447516efd1ac13d1a35232c29a7457c0df
 SHA1 (patch-src_Makefile.am) = e69dd1da8a9736fa45af71cfc167c8b89a7fe648
 SHA1 (patch-src_Makefile.in) = 522fbdb8da913d351fd86aface86aa2d1d86b5cc
 SHA1 (patch-src_data_chunk__list.cpp) = 4b09b093ca5f2abdb7e4d3c1c0bdb9fdfcd4f981
 SHA1 (patch-src_data_chunk__list.h) = 124832de1fd5ccaa1f89ba8b6d26fd74373e619e
 SHA1 (patch-src_data_hash__check__queue.h) = a0f2118ca92309472e402e441fa6f37706a4e1b8
 SHA1 (patch-src_data_hash__queue.cc) = c0a7395f76df2db73315e4cae5b8729c4af29d67
 SHA1 (patch-src_data_hash__queue.h) = 273cdd39bf3f0a33f0f29fd38e11c43861a5fc35
 SHA1 (patch-src_data_hash__queue__node.h) = 9a08d707b264fd1a766dfb2838754aeccb9cce78
 SHA1 (patch-src_data_memory__chunk.h) = 56d8abd0ccb45a1ede73d419fbf719acf9032064
 SHA1 (patch-src_dht_dht__router.cc) = c93ca74a9ce0c967c0787729699ed7e83b869a1d
 SHA1 (patch-src_dht_dht__server.cc) = c68de65ab4fe70dfb9774b68a49481afd766bea0
 SHA1 (patch-src_download_download__main.cc) = 8db4a0cf50b9cf1653ebc4712f22089cad60da67
 SHA1 (patch-src_download_download__wrapper.cc) = 1b31c8a081bcd89cb2c808f94812e6a121a993ae
 SHA1 (patch-src_manager.cc) = 045b6400168f5b75e18a11385d9d2aa84e28b266
 SHA1 (patch-src_net_socket__set.h) = d605091efa57560177a647d18f29edd375b18663
 SHA1 (patch-src_net_throttle__internal.cc) = fc7517ec4e54298003d7bd6d07f3e6cc7a4e6e17
 SHA1 (patch-src_protocol_handshake.cc) = 55ae0d5e14b87a32de6acfc8c414efa8e2f65ce9
 SHA1 (patch-src_torrent_data_download__data.h) = 78146905e0e2c9889bab242364c6b9896c3bf6f5
 SHA1 (patch-src_torrent_data_file.h) = 905dde7e6319db95f378668180b7f34083dc0e85
 SHA1 (patch-src_torrent_download__info.h) = e8c2a4b4e473340f938526870abb32a6a0a3a002
 SHA1 (patch-src_torrent_download_choke__group.cc) = 53e0928681faaea968a6f7bb995d5a05b27cc8d8
 SHA1 (patch-src_torrent_download_choke__queue.cc) = 23c4ad6ae1fb69ff864e115a1b062df96ba0aedb
 SHA1 (patch-src_torrent_download_choke__queue.h) = b8c0aea053129e155cf789ab3822cd4911150ca1
 SHA1 (patch-src_torrent_download_group__entry.h) = b21eb5ac05f84131a73443cfee86bbf9414b8642
 SHA1 (patch-src_torrent_download_resource__manager.cc) = 9c89fba82dfc47c6f9c1fbc29b97a4bd74fc7331
 SHA1 (patch-src_torrent_http.h) = 576af4dd1c966f5292d0623bf258a7990c525e65
 SHA1 (patch-src_torrent_peer_client__list.cc) = c36735fff0e8f56c2b0b45652707250551e6fd4b
 SHA1 (patch-src_torrent_peer_connection__list.h) = f7e5a568476bbc9668757ffd1929773048d07c4e
 SHA1 (patch-src_torrent_poll.h) = cbe839e43820eb5af0e47c4231d79c6852d8b54c
 SHA1 (patch-src_torrent_tracker__controller.cc) = f0a3805da9c8639269c3e777e48b112849625280
 SHA1 (patch-src_torrent_tracker__controller.h) = 549006debffac8431567bae01b59f0c30fda54c9
 SHA1 (patch-src_torrent_tracker__list.cc) = 3c66814bf6bd4764b9c48bfc50571f94741e6662
 SHA1 (patch-src_torrent_tracker__list.h) = 5365b610fcebe333a9c71a088db950dd4148756f
 SHA1 (patch-src_torrent_utils_extents.h) = 37e69944bdb63e831ecf07a7a6316bf7d1bd7e24
 SHA1 (patch-src_torrent_utils_log.cc) = 80006a0bcd010d2870f6a3c90d35fa52d812a841
 SHA1 (patch-src_torrent_utils_log.h) = 6bf8633d1470a9577c320333051aa80bb6713cbf
 SHA1 (patch-src_torrent_utils_log__buffer.cc) = 091ad4d5dd054eff06f26a872478cedf5450c77d
 SHA1 (patch-src_torrent_utils_log__buffer.h) = b91d080d4be115bd957a7697cc9321c830796a87
 SHA1 (patch-src_torrent_utils_signal__bitfield.h) = f595be6dd9c5026cc895a40656f94dfe1976bfa5
 SHA1 (patch-src_torrent_utils_thread__base.h) = 01e3d26607bf14c27c56769ba7ed5b3fa2ff2da9
 SHA1 (patch-src_tracker_tracker__http.cc) = 913dc141d0a472dc1aa7b5bbceab6f60263b18fa
 SHA1 (patch-src_tracker_tracker__udp.cc) = 073dd75f224a23869b2fd33e513e8e12931814c0

--- pkgsrc/net/rtorrent/distinfo 2013/05/09 14:28:25 1.31
+++ pkgsrc/net/rtorrent/distinfo 2013/06/02 22:52:14 1.32

 @@ -1,54 +1,12 @@
-$NetBSD: distinfo,v 1.31 2013/05/09 14:28:25 joerg Exp $
+$NetBSD: distinfo,v 1.32 2013/06/02 22:52:14 tron Exp $
 SHA1 (rtorrent-0.9.2.tar.gz) = 2a642d722745091265037ed8929a23c237a3b99f
 RMD160 (rtorrent-0.9.2.tar.gz) = 130a4c7f3bd018f7247d4561170d6878ab7a120f
 Size (rtorrent-0.9.2.tar.gz) = 591837 bytes
 SHA1 (patch-ab) = 87873bb32166d00398ab0ef6421a6fe85a55c914
 SHA1 (patch-ad) = f993340975dca61d5f7d7014b6959ee50b12a7b4
 SHA1 (patch-ae) = a370881bfdd8534eb25fcbcff8d258b19797941f
 SHA1 (patch-af) = 842a01cbc75e61092b4d33fe9155a728e7c502e6
-SHA1 (patch-ag) = 30b3613f009a68266d82215ce0aea5ab370389ab
+SHA1 (patch-ag) = b7e5fe242b19f994f013acc9ec54a65fed729c29
 SHA1 (patch-rak_functional__fun.h) = b495de4d2a3c2ef0ba3caaf8dd8dede7f322de91
 SHA1 (patch-rak_priority__queue__default.h) = 551bebdce83b2d84c31bafdb9f02217ea0df3a86
 SHA1 (patch-src_command__download.cc) = 95df3310ebf9e1aae4d46527bf7231d14824f2cf
 SHA1 (patch-src_command__dynamic.cc) = 1008ace9f654deea91be1ed6f9d2b9fef837de57
 SHA1 (patch-src_command__events.cc) = 680648dddb15f65e6a572aed24343b1f4cba816d
 SHA1 (patch-src_command__file.cc) = 1ceef7bdc5ccaec7d88ec8d1fc16e2ad613110f7
 SHA1 (patch-src_command__groups.cc) = 1c2c8cd2450281e1953bf21f1e431e8313aac9b0
 SHA1 (patch-src_command__helpers.h) = 95532bf8d42dc1779a50014bcc3a82126ca51e4f
 SHA1 (patch-src_command__ip.cc) = 370e91d7659514a4a0f431dea76718264ceec540
 SHA1 (patch-src_command__local.cc) = cb8f647e1964682bc4dbdb6816d39afe6548e206
 SHA1 (patch-src_command__network.cc) = f068eee63fe4a21402da52cb8d7b8bd1987b3dcf
 SHA1 (patch-src_command__peer.cc) = d47190cf3cde5da21066b440cc368f21ddddd3cd
 SHA1 (patch-src_command__scheduler.cc) = 87496e0ec21d398db6560870866881b901e5c398
 SHA1 (patch-src_command__throttle.cc) = 39f47456ad9be5336d68009066b3a9592e7c4a45
 SHA1 (patch-src_command__tracker.cc) = 404981b7920c70b5d7dd72d18cdbd015e7b8d43f
 SHA1 (patch-src_command__ui.cc) = 437a8ee38a1a4ff3c279b0d1228d6f4b44fdf0b9
 SHA1 (patch-src_control.cc) = 57a12b53d874bf452ba3fe015867f407ac1b2548
 SHA1 (patch-src_core_curl__get.cc) = e4d3c43c2ad25405e2cd4cfd79f13f41afa74afe
 SHA1 (patch-src_core_curl__stack.cc) = b171cd66d2b97e447a2dcb8c251e0a0f2665148d
 SHA1 (patch-src_core_dht__manager.cc) = 13d88e128b3e95871f0df2005d635c3d32f1ffc6
 SHA1 (patch-src_core_download.cc) = 07095401885edcaef27ee98ab61a414ea51ca18d
 SHA1 (patch-src_core_download__factory.cc) = 8db74e2d8a45c6b4575414df3aa030d3890cf140
 SHA1 (patch-src_core_download__list.cc) = 6b3e104e514ec86a5d3622b3719aae7d9617d7b0
 SHA1 (patch-src_core_http__queue.cc) = 2d74ce666e0dc415ac89d08ccc747c258541b504
 SHA1 (patch-src_core_manager.cc) = 767880f4d6d2183fbc3f9914926db11c57b72281
 SHA1 (patch-src_core_manager.h) = 256c12d550d7834892b7d6c2623b4219da6e79b5
 SHA1 (patch-src_core_view.cc) = 0ef92b1fe3b9fcb341327046251997b58ebcf050
 SHA1 (patch-src_display_frame.cc) = 2003fbb6679fca5e7d241375650e60a73fb6cd53
 SHA1 (patch-src_display_manager.cc) = 12a21935186ad3a2eb3287d9999c03b795fd6549
 SHA1 (patch-src_display_window.cc) = 73ddd33a509e95f3f276a58e0bd2ecc4d660409c
 SHA1 (patch-src_display_window__file__list.cc) = fe996ced6a519e8e84ef149a167f688ab2517a83
 SHA1 (patch-src_display_window__log.cc) = b916f37534c53867f9c8ffb2116ef42ef60e5cd7
 SHA1 (patch-src_rpc_command.h) = 87289f32efa98bd2fdd0093f5ffcb1d98ba11422
 SHA1 (patch-src_rpc_command__scheduler.cc) = 01be783401c822fb59201215b5596eecfce3cc3c
 SHA1 (patch-src_rpc_command__scheduler__item.h) = 727443c2601cbaf2037a933ea6dbfb1b0ff83c77
 SHA1 (patch-src_rpc_exec__file.cc) = 22bbbfabf60761196258ddefec90f9f53d9738e8
 SHA1 (patch-src_rpc_exec__file.h) = 39dd7648d2192bb228f641abfeb2b67fd0a6bf91
 SHA1 (patch-src_rpc_object__storage.cc) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-src_rpc_object__storage.h) = e338ddc4c918aac11ee0367b951e6946e6157430
 SHA1 (patch-src_rpc_xmlrpc.h) = d50426a6b1337005084b9b1fcb5eb52ae2c407d8
 SHA1 (patch-src_signal__handler.cc) = 9d83800266a8d11d6fb605b45dc431ee3adda7b2
 SHA1 (patch-src_thread__base.cc) = cf685d201d57ffe368fcdd348ae6bcb8655ccfb7
 SHA1 (patch-src_ui_element__log__complete.cc) = a8f72b8d16259224163bdcd51ce506c67c141272
 SHA1 (patch-src_ui_element__peer__list.cc) = 3e32fb4139062274252e799b8c5f4110075923d9

--- pkgsrc/net/rtorrent/patches/Attic/patch-ag 2013/05/09 14:28:25 1.3
+++ pkgsrc/net/rtorrent/patches/Attic/patch-ag 2013/06/02 22:52:14 1.4

 @@ -1,52 +1,22 @@
-$NetBSD: patch-ag,v 1.3 2013/05/09 14:28:25 joerg Exp $
+$NetBSD: patch-ag,v 1.4 2013/06/02 22:52:14 tron Exp $
 Fix handling of command line options. Please look here for details:
 http://libtorrent.rakshasa.no/ticket/2657
 --- src/main.cc.orig	2012-03-20 15:09:58.000000000 +0000
-+++ src/main.cc
++++ src/main.cc	2012-05-14 23:44:41.000000000 +0100
-@@ -79,6 +79,14 @@
+@@ -843,14 +843,14 @@
  #include "thread_worker.h"
 +#if __cplusplus >= 201103L
 +#include <functional>
 +using std::bind;
 +#else
 +#include <tr1/functional>
 +using std::tr1::bind;
 +#endif
  void handle_sigbus(int signum, siginfo_t* sa, void* ptr);
  void do_panic(int signum);
  void print_help();
@@ -208,11 +216,11 @@ main(int argc, char** argv) {
      torrent::log_add_group_output(torrent::LOG_NOTICE, "important");
      torrent::log_add_group_output(torrent::LOG_INFO, "complete");
 -    torrent::Poll::slot_create_poll() = std::tr1::bind(&core::create_poll);
 +    torrent::Poll::slot_create_poll() = std::bind(&core::create_poll);
      torrent::initialize();
 -    torrent::main_thread()->slot_do_work() = tr1::bind(&client_perform);
 -    torrent::main_thread()->slot_next_timeout() = tr1::bind(&client_next_timeout, control);
 +    torrent::main_thread()->slot_do_work() = bind(&client_perform);
 +    torrent::main_thread()->slot_next_timeout() = bind(&client_next_timeout, control);
      worker_thread = new ThreadWorker();
      worker_thread->init_thread();
@@ -843,14 +851,14 @@ main(int argc, char** argv) {
+     }
  #endif
 -    int firstArg = parse_options(control, argc, argv);
+-
      if (OptionParser::has_flag('n', argc, argv)) {
        lt_log_print(torrent::LOG_WARN, "Ignoring ~/.rtorrent.rc.");
      } else {
        rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
+     }
 +    int firstArg = parse_options(control, argc, argv);
++