git: 3773dbe7e189 - main - net-p2p/{,py-}libtorrent-rasterbar: update to 1.2.18

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3773dbe7e18982a764e45c8bb0d8a4551be2febc

commit 3773dbe7e18982a764e45c8bb0d8a4551be2febc
Author:     Joakim Bergman <jocke@gipset.se>
AuthorDate: 2023-06-18 17:11:30 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2023-06-21 14:29:47 +0000

    net-p2p/{,py-}libtorrent-rasterbar: update to 1.2.18
    
    And fix python bindings in preparation for update of net-p2p/deluge-cli.
    
    PR:             264970
    Reported by:    jocke@gipset.se
    Approved by:    yuri@ (maintainer)
---
 net-p2p/libtorrent-rasterbar/Makefile    |  3 +++
 net-p2p/libtorrent-rasterbar/pkg-plist   |  1 +
 net-p2p/py-libtorrent-rasterbar/Makefile | 14 ++++++++------
 net-p2p/py-libtorrent-rasterbar/distinfo |  6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index bd415e47300d..1692742f4ad2 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -47,6 +47,9 @@ post-patch:
 		${WRKSRC}/test/setup_transfer.cpp
 
 post-install:
+	# py-bindings seems to link this exact name after v1.2.14
+	# TODO: figure out how to make symlinks in Jamfile
+	/bin/ln -s libtorrent-rasterbar.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.10.0.0
 	@${RM} ${STAGEDIR}${PREFIX}/include/libtorrent/Makefile*
 
 post-install-DOCS-on:
diff --git a/net-p2p/libtorrent-rasterbar/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 4f8d8ff4b883..84471c859fe8 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -252,5 +252,6 @@ lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake
 lib/libtorrent-rasterbar.so
 lib/libtorrent-rasterbar.so.%%SO_VER%%
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
+lib/libtorrent-rasterbar.so.10.0.0
 libdata/pkgconfig/libtorrent-rasterbar.pc
 share/cmake/Modules/FindLibtorrentRasterbar.cmake
diff --git a/net-p2p/py-libtorrent-rasterbar/Makefile b/net-p2p/py-libtorrent-rasterbar/Makefile
index 548a83e953d7..9ac5f8a6d6a2 100644
--- a/net-p2p/py-libtorrent-rasterbar/Makefile
+++ b/net-p2p/py-libtorrent-rasterbar/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libtorrent-rasterbar
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.2.16
-PORTREVISION=	1
+DISTVERSION=	1.2.18
+PORTREVISION=	0
 PORTEPOCH=	2
 CATEGORIES=	net-p2p python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,8 +13,6 @@ WWW=		https://libtorrent.org/
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../COPYING
 
-BROKEN=		can't create dynamic relocation R_X86_64_32 against local symbol in readonly segment, see https://github.com/arvidn/libtorrent/issues/6890
-
 BUILD_DEPENDS=	b2:devel/boost_build
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		${PY_BOOST}
@@ -23,7 +21,10 @@ USES=		compiler:c11 iconv localbase:ldflags python:3.6+
 USE_GITHUB=	yes
 GH_ACCOUNT=	arvidn
 GH_PROJECT=	libtorrent
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils
+PYDISTUTILS_PKGNAME=	libtorrent
+PYDISTUTILS_BUILD_TARGET=	build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared"
+PYDISTUTILS_INSTALL_TARGET=	build_ext --b2-args="fpic=on libtorrent-link=shared boost-link=shared" install
 
 BINARY_ALIAS=	b2=${FILESDIR}/b2
 
@@ -38,7 +39,8 @@ CONFIGURE_ENV=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 
 PORTSCOUT=	limit:^1.* # 2.x is WIP and we don't accept it before qBittorrent does
 
+PLIST_FILES+=	${PYTHON_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/libtorrent*.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PYDISTUTILS_PKGNAME}/__init__${PYTHON_EXT_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/net-p2p/py-libtorrent-rasterbar/distinfo b/net-p2p/py-libtorrent-rasterbar/distinfo
index 8f090fecfde8..3ff41462afa4 100644
--- a/net-p2p/py-libtorrent-rasterbar/distinfo
+++ b/net-p2p/py-libtorrent-rasterbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1654714860
-SHA256 (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 2ee435c3e2e6dd8825903230b41fbaf0741b7aed57094f2ca0e6214d89fef9d4
-SIZE (arvidn-libtorrent-v1.2.16_GH0.tar.gz) = 3624920
+TIMESTAMP = 1667577329
+SHA256 (arvidn-libtorrent-v1.2.18_GH0.tar.gz) = c4213bfb695db3e3b266be71865a7942f9007200aa4021946818fdc5e5e4a3d3
+SIZE (arvidn-libtorrent-v1.2.18_GH0.tar.gz) = 3633926