svn commit: r332456 - in head/net-p2p: libtorrent libtorrent/files rtorrent

[Andrej Zverev]

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