Update port: net/libtorrent - update to version 0.4.7.

	Update port to version 0.4.7.
	The port now installs libtorrent.pc in the proper directory and
	doesn't attempt to remove ${PREFIX}/libdata/pkgconfig anymore.

PR:		ports/76465
Submitted by:	Florent Thoumie <flz@xbsd.org>

5 files changed, 31 insertions, 37 deletions

diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile
index 71c238f82794..18feee634983 100644
--- a/net-p2p/libtorrent/Makefile
+++ b/net-p2p/libtorrent/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libtorrent
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.7
 CATEGORIES=	net
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=	15
+USE_INC_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .include <bsd.port.pre.mk>
@@ -35,7 +35,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s#\(pkgconfigdir =\).*#\1 ${PREFIX}/libexec/pkgconfig#" \
+	@${REINPLACE_CMD} -e "s#\(pkgconfigdir =\).*#\1 ${PREFIX}/libdata/pkgconfig#" \
 			${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s#-Wall -O3 -g#${CFLAGS} -fpermissive#" \
 			${WRKSRC}/client/Makefile2
@@ -47,7 +47,7 @@ post-patch:
 
 .if defined(WITH_CLIENT)
 .if ${OSVERSION} < 500000
-BROKEN=		"Client doesn't compile on 4.x"
+BROKEN=	"Client doesn't compile on 4.x"
 .endif
 
 PLIST_FILES=	bin/rtorrent
diff --git a/net-p2p/libtorrent/distinfo b/net-p2p/libtorrent/distinfo
index b567a2ff7b7e..8c39ad1595cb 100644
--- a/net-p2p/libtorrent/distinfo
+++ b/net-p2p/libtorrent/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtorrent-0.4.5.tar.gz) = 86c38d9036e083c9c2b21b88f7d847fa
-SIZE (libtorrent-0.4.5.tar.gz) = 401624
+MD5 (libtorrent-0.4.7.tar.gz) = 098d9e2b0cf1eac6a1004ce563af08be
+SIZE (libtorrent-0.4.7.tar.gz) = 297912
diff --git a/net-p2p/libtorrent/files/patch-ltmain.sh b/net-p2p/libtorrent/files/patch-ltmain.sh
new file mode 100644
index 000000000000..49b342d2555c
--- /dev/null
+++ b/net-p2p/libtorrent/files/patch-ltmain.sh
@@ -0,0 +1,23 @@
+--- ltmain.sh.orig	Wed Jan 19 14:56:06 2005
++++ ltmain.sh	Wed Jan 19 15:34:55 2005
+@@ -976,6 +976,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -4330,10 +4331,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net-p2p/libtorrent/files/patch-src::data::file_chunk.cc b/net-p2p/libtorrent/files/patch-src::data::file_chunk.cc
deleted file mode 100644
index 2589ee5d7a66..000000000000
--- a/net-p2p/libtorrent/files/patch-src::data::file_chunk.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/data/file_chunk.cc.orig	Mon Jan 17 21:31:30 2005
-+++ src/data/file_chunk.cc	Mon Jan 17 21:32:21 2005
-@@ -6,6 +6,7 @@
- #include <sstream>
- #include <unistd.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
- 
- namespace torrent {
- 
-@@ -32,7 +33,7 @@
-     std::stringstream s;
- 
-     s << "Tried to check incore status in FileChunk with out of range parameters or a NULL buffer ("
--      << std::hex << '(' << (unsigned int)m_begin << ',' << (unsigned int)m_end << ')';
-+      << std::hex << '(' << m_begin << ',' << m_end << ')';
- 
-     throw internal_error(s.str());
-   }
-@@ -63,7 +64,7 @@
-     std::stringstream s;
- 
-     s << "Tried to advise FileChunk with out of range parameters"
--      << std::hex << '(' << (unsigned int)m_begin << ',' << (unsigned int)m_end << ',' << offset << ',' << len << ')';
-+      << std::hex << '(' << m_begin << ',' << m_end << ',' << offset << ',' << len << ')';
- 
-     throw internal_error(s.str());
-   }
diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist
index 4913b88c876e..5703eca87e2e 100644
--- a/net-p2p/libtorrent/pkg-plist
+++ b/net-p2p/libtorrent/pkg-plist
@@ -1,3 +1,4 @@
+include/torrent/bencode.h
 include/torrent/common.h
 include/torrent/download.h
 include/torrent/exceptions.h
@@ -5,9 +6,7 @@ include/torrent/entry.h
 include/torrent/http.h
 include/torrent/peer.h
 include/torrent/torrent.h
-lib/libtorrent.a
 lib/libtorrent.so
 lib/libtorrent.so.2
-libexec/pkgconfig/libtorrent.pc
+libdata/pkgconfig/libtorrent.pc
 @dirrm include/torrent
-@unexec rmdir %D/libexec/pkgconfig 2> /dev/null || true