svn commit: r334739 - in head/net-p2p: libtorrent-devel rtorrent-devel

[Andrej Zverev]

Author: az
Date: Sun Nov 24 15:48:16 2013
New Revision: 334739
URL: http://svnweb.freebsd.org/changeset/ports/334739

Log:
  Try to unbreak for freebsd > 10.x

Modified:
  head/net-p2p/libtorrent-devel/Makefile
  head/net-p2p/rtorrent-devel/Makefile

Modified: head/net-p2p/libtorrent-devel/Makefile
==============================================================================
--- head/net-p2p/libtorrent-devel/Makefile	Sun Nov 24 15:48:04 2013	(r334738)
+++ head/net-p2p/libtorrent-devel/Makefile	Sun Nov 24 15:48:16 2013	(r334739)
@@ -38,8 +38,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

Modified: head/net-p2p/rtorrent-devel/Makefile
==============================================================================
--- head/net-p2p/rtorrent-devel/Makefile	Sun Nov 24 15:48:04 2013	(r334738)
+++ head/net-p2p/rtorrent-devel/Makefile	Sun Nov 24 15:48:16 2013	(r334739)
@@ -36,6 +36,12 @@ NO_STAGE=	yes
 BROKEN=		Does not configure on arm
 .endif
 
+# Workaround to build and segfault on > 10.x
+.if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000000
+USE_GCC=	yes
+LDFLAGS+=	-lc++
+.endif
+
 .if ${PORT_OPTIONS:MXMLRPC}
 CONFIGURE_ARGS+=	--with-xmlrpc-c
 LIB_DEPENDS+=	xmlrpc:${PORTSDIR}/net/xmlrpc-c-devel