svn commit: r475215 - in head/net-p2p/libtorrent: . files

[Danilo G. Baio]

Author: dbaio
Date: Tue Jul 24 00:33:28 2018
New Revision: 475215
URL: https://svnweb.freebsd.org/changeset/ports/475215

Log:
  net-p2p/libtorrent: Update to 0.13.7
  
  - IPv6 is not a configure option anymore.
  - Remove outdated patches.
  - Remove CONFLICTS, rblibtorrent moved to libtorrent-rasterbar and libtorrent
    does not conflict with it.
  - Reset maintainer, three timeouts.
  
  PR:		229553
  Reported by:	tj at mrsk.me (email)
  Approved by:	maintainer timeout (pipfstarrd at openmailbox.org, > 2 weeks)

Added:
  head/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h   (contents, props changed)
Deleted:
  head/net-p2p/libtorrent/files/extra-clang
  head/net-p2p/libtorrent/files/patch-fix-build-bencoders-callers-crash
  head/net-p2p/libtorrent/files/patch-src_net_socket__set.h
Modified:
  head/net-p2p/libtorrent/Makefile
  head/net-p2p/libtorrent/distinfo
  head/net-p2p/libtorrent/pkg-plist

Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile	Tue Jul 24 00:27:09 2018	(r475214)
+++ head/net-p2p/libtorrent/Makefile	Tue Jul 24 00:33:28 2018	(r475215)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent
-PORTVERSION=	0.13.6
-PORTREVISION=	5
+PORTVERSION=	0.13.7
 CATEGORIES=	net-p2p
-MASTER_SITES=	http://rtorrent.net/downloads/
+MASTER_SITES=	https://rtorrent.net/downloads/
 
 MAINTAINER=	pipfstarrd at openmailbox.org
 COMMENT=	BitTorrent Library written in C++
@@ -14,17 +13,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_SSL=	openssl-devel
 
-CONFLICTS_INSTALL=	rblibtorrent-[0-9]* rblibtorrent-devel-[0-9]*
-
-USES=		compiler:c++11-lang libtool pathfix pkgconfig ssl
+USES=		autoreconf:build compiler:c++11-lang libtool pathfix pkgconfig ssl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug
 CONFIGURE_ENV=	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CFLAGS="-I\
 								${OPENSSLINC}"
-INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	IPV6 KQUEUE
+OPTIONS_DEFINE=	KQUEUE
 OPTIONS_DEFAULT=KQUEUE
 KQUEUE_DESC=	Use kqueue(2) support
 
@@ -32,7 +28,6 @@ KQUEUE_DESC=	Use kqueue(2) support
 # linking libtorrent to avoid linking with base's libcrypto.
 MAKE_ARGS=	LDFLAGS="${LDFLAGS}"
 
-IPV6_CONFIGURE_ENABLE=	ipv6
 KQUEUE_CONFIGURE_WITH=	kqueue
 
 .include <bsd.port.pre.mk>
@@ -45,12 +40,6 @@ KQUEUE_CONFIGURE_WITH=	kqueue
 CONFIGURE_ARGS+=--disable-instrumentation
 .endif
 
-# Workaround to build on >= 10.x
-.if ${OPSYS} == FreeBSD
-USE_CXXSTD=	c++11
-EXTRA_PATCHES+=	${FILESDIR}/extra-clang
-.endif
-
 post-patch:
 .if ${OPSYS} == FreeBSD
 	@${FIND} ${WRKSRC} \( -name '*.h' -o -name '*.cc' \) -type f \
@@ -62,5 +51,8 @@ post-patch:
 		${WRKSRC}/src/torrent/utils/extents.h \
 		${WRKSRC}/src/torrent/utils/log.cc
 .endif
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtorrent.so.20.0.0
 
 .include <bsd.port.post.mk>

Modified: head/net-p2p/libtorrent/distinfo
==============================================================================
--- head/net-p2p/libtorrent/distinfo	Tue Jul 24 00:27:09 2018	(r475214)
+++ head/net-p2p/libtorrent/distinfo	Tue Jul 24 00:33:28 2018	(r475215)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518295243
-SHA256 (libtorrent-0.13.6.tar.gz) = 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04
-SIZE (libtorrent-0.13.6.tar.gz) = 781253
+TIMESTAMP = 1529447240
+SHA256 (libtorrent-0.13.7.tar.gz) = c738f60f4d7b6879cd2745fb4310bf24c9287219c1fd619706a9d5499ca7ecc1
+SIZE (libtorrent-0.13.7.tar.gz) = 782854

Added: head/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/libtorrent/files/patch-src_torrent_net_socket__address__key.h	Tue Jul 24 00:33:28 2018	(r475215)
@@ -0,0 +1,10 @@
+--- src/torrent/net/socket_address_key.h.orig	2018-07-03 23:50:04 UTC
++++ src/torrent/net/socket_address_key.h
+@@ -7,6 +7,7 @@
+ #include <cstring>
+ #include <inttypes.h>
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ 
+ // Unique key for the socket address, excluding port numbers, etc.
+ 

Modified: head/net-p2p/libtorrent/pkg-plist
==============================================================================
--- head/net-p2p/libtorrent/pkg-plist	Tue Jul 24 00:27:09 2018	(r475214)
+++ head/net-p2p/libtorrent/pkg-plist	Tue Jul 24 00:33:28 2018	(r475215)
@@ -27,6 +27,7 @@ include/torrent/event.h
 include/torrent/exceptions.h
 include/torrent/hash_string.h
 include/torrent/http.h
+include/torrent/net/socket_address_key.h
 include/torrent/object.h
 include/torrent/object_raw_bencode.h
 include/torrent/object_static_map.h
@@ -49,6 +50,7 @@ include/torrent/torrent.h
 include/torrent/tracker.h
 include/torrent/tracker_controller.h
 include/torrent/tracker_list.h
+include/torrent/utils/directory_events.h
 include/torrent/utils/extents.h
 include/torrent/utils/log.h
 include/torrent/utils/log_buffer.h
@@ -59,7 +61,7 @@ include/torrent/utils/resume.h
 include/torrent/utils/signal_bitfield.h
 include/torrent/utils/thread_base.h
 include/torrent/utils/thread_interrupt.h
+include/torrent/utils/uri_parser.h
 lib/libtorrent.so
-lib/libtorrent.so.19
-lib/libtorrent.so.19.0.0
+lib/libtorrent.so.20.0.0
 libdata/pkgconfig/libtorrent.pc