From owner-svn-ports-all@FreeBSD.ORG  Sat Nov  2 08:32:29 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AE97A6E1;
 Sat,  2 Nov 2013 08:32:29 +0000 (UTC) (envelope-from az@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8229728DA;
 Sat,  2 Nov 2013 08:32:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA28WTIO087808;
 Sat, 2 Nov 2013 08:32:29 GMT (envelope-from az@svn.freebsd.org)
Received: (from az@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA28WS9j087805;
 Sat, 2 Nov 2013 08:32:28 GMT (envelope-from az@svn.freebsd.org)
Message-Id: <201311020832.rA28WS9j087805@svn.freebsd.org>
From: Andrej Zverev <az@FreeBSD.org>
Date: Sat, 2 Nov 2013 08:32:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332456 - in head/net-p2p: libtorrent libtorrent/files
 rtorrent
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Nov 2013 08:32:29 -0000

Author: az
Date: Sat Nov  2 08:32:28 2013
New Revision: 332456
URL: http://svnweb.freebsd.org/changeset/ports/332456

Log:
  - Try to fix build on 10.x and fix segfault while running rtorrent

Added:
  head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h   (contents, props changed)
Modified:
  head/net-p2p/libtorrent/Makefile
  head/net-p2p/rtorrent/Makefile

Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile	Sat Nov  2 04:20:32 2013	(r332455)
+++ head/net-p2p/libtorrent/Makefile	Sat Nov  2 08:32:28 2013	(r332456)
@@ -39,8 +39,13 @@ CONFIGURE_ENV=	OPENSSL_LIBS="-L/usr/lib 
 
 CONFIGURE_ARGS+=	--disable-debug
 
+# Workaround to build on > 10.x
+.if ${OSVERSION} >= 1000000
+USE_GCC=	yes
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=	--with-kqueue

Added: head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/libtorrent/files/patch-src__torrent__connection_manager.h	Sat Nov  2 08:32:28 2013	(r332456)
@@ -0,0 +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
+ 
+ #include <sys/socket.h>
++#include <sys/types.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <netinet/in_systm.h>

Modified: head/net-p2p/rtorrent/Makefile
==============================================================================
--- head/net-p2p/rtorrent/Makefile	Sat Nov  2 04:20:32 2013	(r332455)
+++ head/net-p2p/rtorrent/Makefile	Sat Nov  2 08:32:28 2013	(r332456)
@@ -35,6 +35,12 @@ NO_STAGE=	yes
 BROKEN=		Does not configure on arm
 .endif
 
+# Workaround to build and segfault on > 10.x
+.if ${OSVERSION} >= 1000000
+USE_GCC=        yes
+LDFLAGS+=	-lc++
+.endif
+
 .if ${PORT_OPTIONS:MXMLRPC}
 CONFIGURE_ARGS+=	--with-xmlrpc-c
 LIB_DEPENDS+=	xmlrpc.3:${PORTSDIR}/net/xmlrpc-c-devel