svn commit: r524758 - in head/net-p2p: . deluge-cli libtorrent-rasterbar11 libtorrent-rasterbar11/files py-libtorrent-rasterbar py-libtorrent-rasterbar11 py-libtorrent-rasterbar11/files

Yuri Victorovich yuri at FreeBSD.org
Sat Feb 1 07:12:03 UTC 2020 

Author: yuri
Date: Sat Feb  1 07:12:01 2020
New Revision: 524758
URL: https://svnweb.freebsd.org/changeset/ports/524758

Log:
  Create forks of ports net-p2p/libtorrent-rasterbar and net-p2p/py-libtorrent-rasterbar to unbreak net-p2p/deluge-cli
  
  net-p2p/deluge-cli is broken with the latest version of libtorrent-rasterbar.
  
  MFH:		2020Q1

Added:
  head/net-p2p/libtorrent-rasterbar11/
     - copied from r519824, head/net-p2p/libtorrent-rasterbar/
  head/net-p2p/py-libtorrent-rasterbar11/
     - copied from r519824, head/net-p2p/py-libtorrent-rasterbar/
Deleted:
  head/net-p2p/libtorrent-rasterbar11/files/patch-CMakeLists.txt
  head/net-p2p/libtorrent-rasterbar11/files/patch-boost-1.69
  head/net-p2p/libtorrent-rasterbar11/files/patch-boost-1.70
  head/net-p2p/libtorrent-rasterbar11/files/patch-boost-1.72
  head/net-p2p/py-libtorrent-rasterbar11/files/
Modified:
  head/net-p2p/Makefile
  head/net-p2p/deluge-cli/Makefile
  head/net-p2p/libtorrent-rasterbar11/Makefile
  head/net-p2p/libtorrent-rasterbar11/distinfo
  head/net-p2p/libtorrent-rasterbar11/pkg-plist
  head/net-p2p/py-libtorrent-rasterbar/Makefile
  head/net-p2p/py-libtorrent-rasterbar11/Makefile
  head/net-p2p/py-libtorrent-rasterbar11/distinfo

Modified: head/net-p2p/Makefile
==============================================================================
--- head/net-p2p/Makefile	Sat Feb  1 04:58:38 2020	(r524757)
+++ head/net-p2p/Makefile	Sat Feb  1 07:12:01 2020	(r524758)
@@ -45,6 +45,7 @@
     SUBDIR += libswift
     SUBDIR += libtorrent
     SUBDIR += libtorrent-rasterbar
+    SUBDIR += libtorrent-rasterbar11
     SUBDIR += lidarr
     SUBDIR += linuxdcpp
     SUBDIR += litecoin
@@ -70,6 +71,7 @@
     SUBDIR += parity-ethereum
     SUBDIR += phex
     SUBDIR += py-libtorrent-rasterbar
+    SUBDIR += py-libtorrent-rasterbar11
     SUBDIR += py-py2play
     SUBDIR += py-transmissionrpc
     SUBDIR += py-tremc

Modified: head/net-p2p/deluge-cli/Makefile
==============================================================================
--- head/net-p2p/deluge-cli/Makefile	Sat Feb  1 04:58:38 2020	(r524757)
+++ head/net-p2p/deluge-cli/Makefile	Sat Feb  1 07:12:01 2020	(r524758)
@@ -3,7 +3,7 @@
 PORTNAME=	deluge
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.3.15
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	net-p2p python
 PKGNAMESUFFIX=	-cli
 
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	intltool-merge:textproc/intltool
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/py-libtorrent-rasterbar@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar11>=0:net-p2p/py-libtorrent-rasterbar11@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${PY_FLAVOR} \

Modified: head/net-p2p/libtorrent-rasterbar11/Makefile
==============================================================================
--- head/net-p2p/libtorrent-rasterbar/Makefile	Wed Dec 11 17:53:48 2019	(r519824)
+++ head/net-p2p/libtorrent-rasterbar11/Makefile	Sat Feb  1 07:12:01 2020	(r524758)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-DISTVERSION=	1.1.10
-PORTREVISION=	6
+DISTVERSION=	1.1.14
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
+PKGNAMESUFFIX=	11 # exists to support net-p2p/deluge-cli that is broken with the latest libtorrent-rasterbar
 
 MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	C++ library implementing a BitTorrent client
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libboost_chrono.so:devel/boost-libs \
 		libboost_random.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs
+
+CONFLICTS_INSTALL=	libtorrent-rasterbar
 
 USES=		cmake compiler:c++14-lang iconv:wchar_t libtool pathfix pkgconfig ssl
 USE_LDCONFIG=	yes

Modified: head/net-p2p/libtorrent-rasterbar11/distinfo
==============================================================================
--- head/net-p2p/libtorrent-rasterbar/distinfo	Wed Dec 11 17:53:48 2019	(r519824)
+++ head/net-p2p/libtorrent-rasterbar11/distinfo	Sat Feb  1 07:12:01 2020	(r524758)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538843172
-SHA256 (libtorrent-rasterbar-1.1.10.tar.gz) = 07b2b391e0d16bc693d793e352338488a0e41f3130b70884bb2e0270ea00b8c2
-SIZE (libtorrent-rasterbar-1.1.10.tar.gz) = 3902542
+TIMESTAMP = 1580528446
+SHA256 (libtorrent-rasterbar-1.1.14.tar.gz) = 4c1fe55da9361c9d98e725ece7d88f183c09797b2e2667ca4d9386599f8dc36a
+SIZE (libtorrent-rasterbar-1.1.14.tar.gz) = 4040571

Modified: head/net-p2p/libtorrent-rasterbar11/pkg-plist
==============================================================================
--- head/net-p2p/libtorrent-rasterbar/pkg-plist	Wed Dec 11 17:53:48 2019	(r519824)
+++ head/net-p2p/libtorrent-rasterbar11/pkg-plist	Sat Feb  1 07:12:01 2020	(r524758)
@@ -5,7 +5,6 @@ include/libtorrent/alert.hpp
 include/libtorrent/alert_manager.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/alloca.hpp
-include/libtorrent/allocator.hpp
 include/libtorrent/announce_entry.hpp
 include/libtorrent/assert.hpp
 include/libtorrent/aux_/alert_manager_variadic_emplace.hpp
@@ -195,6 +194,12 @@ include/libtorrent/version.hpp
 include/libtorrent/web_connection_base.hpp
 include/libtorrent/web_peer_connection.hpp
 include/libtorrent/xml_parse.hpp
+lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake
+lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake
+lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake
 lib/libtorrent-rasterbar.so
+lib/libtorrent-rasterbar.so.1.1.14
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
 libdata/pkgconfig/libtorrent-rasterbar.pc
+share/cmake/Modules/FindLibtorrentRasterbar.cmake

Modified: head/net-p2p/py-libtorrent-rasterbar/Makefile
==============================================================================
--- head/net-p2p/py-libtorrent-rasterbar/Makefile	Sat Feb  1 04:58:38 2020	(r524757)
+++ head/net-p2p/py-libtorrent-rasterbar/Makefile	Sat Feb  1 07:12:01 2020	(r524758)
@@ -18,6 +18,8 @@ BROKEN=		Doesn't install anything since the last major
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}-libtorrent-rasterbar11
+
 USES=		compiler:c11 iconv localbase python
 USE_PYTHON=	distutils autoplist
 

Modified: head/net-p2p/py-libtorrent-rasterbar11/Makefile
==============================================================================
--- head/net-p2p/py-libtorrent-rasterbar/Makefile	Wed Dec 11 17:53:48 2019	(r519824)
+++ head/net-p2p/py-libtorrent-rasterbar11/Makefile	Sat Feb  1 07:12:01 2020	(r524758)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-DISTVERSION=	1.1.10
-PORTREVISION=	6
+DISTVERSION=	1.1.14
 CATEGORIES=	net-p2p python
 MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	11
 
 MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	Python bindings for libtorrent-rasterbar
@@ -16,6 +16,8 @@ LICENSE_FILE=	${WRKSRC}/../../COPYING
 
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}-libtorrent-rasterbar
 
 USES=		compiler:c11 iconv localbase python
 USE_PYTHON=	distutils autoplist

Modified: head/net-p2p/py-libtorrent-rasterbar11/distinfo
==============================================================================
--- head/net-p2p/py-libtorrent-rasterbar/distinfo	Wed Dec 11 17:53:48 2019	(r519824)
+++ head/net-p2p/py-libtorrent-rasterbar11/distinfo	Sat Feb  1 07:12:01 2020	(r524758)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538852302
-SHA256 (libtorrent-rasterbar-1.1.10.tar.gz) = 07b2b391e0d16bc693d793e352338488a0e41f3130b70884bb2e0270ea00b8c2
-SIZE (libtorrent-rasterbar-1.1.10.tar.gz) = 3902542
+TIMESTAMP = 1580540445
+SHA256 (libtorrent-rasterbar-1.1.14.tar.gz) = 4c1fe55da9361c9d98e725ece7d88f183c09797b2e2667ca4d9386599f8dc36a
+SIZE (libtorrent-rasterbar-1.1.14.tar.gz) = 4040571

More information about the svn-ports-all mailing list