From 2e691285597d0aa8ee6b2a45aa5707d1aa3e8248 Mon Sep 17 00:00:00 2001 From: Florent Thoumie Date: Wed, 12 Jul 2006 19:09:46 +0000 Subject: Update libtorrent to 0.10.0. Noticed by: Charles Clark --- net-p2p/libtorrent-devel/Makefile | 4 +++- net-p2p/libtorrent-devel/distinfo | 6 +++--- net-p2p/libtorrent-devel/files/devel-ltmain.sh | 23 ++++++++++++++++++++++ .../libtorrent-devel/files/devel-src_utils_sha1.h | 11 +++++++++++ net-p2p/libtorrent-devel/pkg-plist | 8 +++++++- net-p2p/libtorrent/Makefile | 2 ++ net-p2p/libtorrent/files/patch-ltmain.sh | 23 ---------------------- net-p2p/libtorrent/files/stable-ltmain.sh | 23 ++++++++++++++++++++++ 8 files changed, 72 insertions(+), 28 deletions(-) create mode 100644 net-p2p/libtorrent-devel/files/devel-ltmain.sh create mode 100644 net-p2p/libtorrent-devel/files/devel-src_utils_sha1.h delete mode 100644 net-p2p/libtorrent/files/patch-ltmain.sh create mode 100644 net-p2p/libtorrent/files/stable-ltmain.sh (limited to 'net-p2p') diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile index dd5ba5c73124..7517e83e744c 100644 --- a/net-p2p/libtorrent-devel/Makefile +++ b/net-p2p/libtorrent-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libtorrent-devel -PORTVERSION= 0.9.3 +PORTVERSION= 0.10.0 PORTREVISION= 0 DISTNAME= ${PORTNAME:S/-devel//}-${PORTVERSION} @@ -20,4 +20,6 @@ DESCR= ${MASTERDIR}/pkg-descr CONFLICTS= libtorrent-[0-9]* +EXTRA_PATCHES= ${.CURDIR}/files/devel-* + .include "${MASTERDIR}/Makefile" diff --git a/net-p2p/libtorrent-devel/distinfo b/net-p2p/libtorrent-devel/distinfo index 11da99ede06a..339cb643a8a1 100644 --- a/net-p2p/libtorrent-devel/distinfo +++ b/net-p2p/libtorrent-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (libtorrent-0.9.3.tar.gz) = 438192530048c5ba67bbc2f9852c695c -SHA256 (libtorrent-0.9.3.tar.gz) = 1bbc9c417c1595b4ddd06b40af0e15f2ac7e146e7e148ec47af28121a7a90799 -SIZE (libtorrent-0.9.3.tar.gz) = 463674 +MD5 (libtorrent-0.10.0.tar.gz) = 240e90818c4c9c34474b2e1873d09910 +SHA256 (libtorrent-0.10.0.tar.gz) = 47645632fee222609c139bddf50872949bd3359214976a25a92bbc1d277c70de +SIZE (libtorrent-0.10.0.tar.gz) = 447795 diff --git a/net-p2p/libtorrent-devel/files/devel-ltmain.sh b/net-p2p/libtorrent-devel/files/devel-ltmain.sh new file mode 100644 index 000000000000..affc5f0af5ef --- /dev/null +++ b/net-p2p/libtorrent-devel/files/devel-ltmain.sh @@ -0,0 +1,23 @@ +--- ltmain.sh.orig Wed Jul 12 10:35:32 2006 ++++ ltmain.sh Wed Jul 12 10:36:46 2006 +@@ -2279,10 +2279,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" +@@ -2896,6 +2898,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; diff --git a/net-p2p/libtorrent-devel/files/devel-src_utils_sha1.h b/net-p2p/libtorrent-devel/files/devel-src_utils_sha1.h new file mode 100644 index 000000000000..261105e06c7f --- /dev/null +++ b/net-p2p/libtorrent-devel/files/devel-src_utils_sha1.h @@ -0,0 +1,11 @@ +--- src/utils/sha1.h.orig Wed Jul 12 11:35:43 2006 ++++ src/utils/sha1.h Wed Jul 12 11:36:04 2006 +@@ -87,7 +87,7 @@ + Sha1::final_c(char* buffer) { + unsigned int len; + +- SHA1_End(&m_ctx, buffer, &len, 20); ++ SHA1_End(&m_ctx, (unsigned char*)buffer, &len, 20); + } + + #elif defined USE_OPENSSL_SHA diff --git a/net-p2p/libtorrent-devel/pkg-plist b/net-p2p/libtorrent-devel/pkg-plist index 8ebd31e2b59a..8f5f246d3d04 100644 --- a/net-p2p/libtorrent-devel/pkg-plist +++ b/net-p2p/libtorrent-devel/pkg-plist @@ -1,4 +1,8 @@ include/torrent/bitfield.h +include/torrent/block.h +include/torrent/block_list.h +include/torrent/block_transfer.h +include/torrent/common.h include/torrent/connection_manager.h include/torrent/download.h include/torrent/event.h @@ -16,10 +20,12 @@ include/torrent/poll_epoll.h include/torrent/poll_kqueue.h include/torrent/poll_select.h include/torrent/rate.h +include/torrent/resume.h include/torrent/torrent.h include/torrent/tracker.h include/torrent/tracker_list.h +include/torrent/transfer_list.h lib/libtorrent.so -lib/libtorrent.so.7 +lib/libtorrent.so.8 libdata/pkgconfig/libtorrent.pc @dirrm include/torrent diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 1e210f07e0d6..31bc571fcdee 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -25,6 +25,8 @@ INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +EXTRA_PATCHES?= ${.CURDIR}/files/stable-* + .include CONFIGURE_ARGS= --disable-debug --with-openssl=${OPENSSLBASE} diff --git a/net-p2p/libtorrent/files/patch-ltmain.sh b/net-p2p/libtorrent/files/patch-ltmain.sh deleted file mode 100644 index 718b8c0aa1fa..000000000000 --- a/net-p2p/libtorrent/files/patch-ltmain.sh +++ /dev/null @@ -1,23 +0,0 @@ ---- ltmain.sh.orig -+++ ltmain.sh -@@ -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/stable-ltmain.sh b/net-p2p/libtorrent/files/stable-ltmain.sh new file mode 100644 index 000000000000..718b8c0aa1fa --- /dev/null +++ b/net-p2p/libtorrent/files/stable-ltmain.sh @@ -0,0 +1,23 @@ +--- ltmain.sh.orig ++++ ltmain.sh +@@ -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" -- cgit v1.2.3