diff options
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/libtorrent-devel/Makefile | 4 | ||||
| -rw-r--r-- | net-p2p/libtorrent/Makefile | 10 | ||||
| -rw-r--r-- | net-p2p/libtorrent/distinfo | 6 | ||||
| -rw-r--r-- | net-p2p/libtorrent/files/stable-ltmain.sh | 24 | ||||
| -rw-r--r-- | net-p2p/libtorrent/files/stable-src_torrent_chunk__manager.cc | 10 | ||||
| -rw-r--r-- | net-p2p/libtorrent/pkg-plist | 11 |
6 files changed, 43 insertions, 22 deletions
diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile index e5b5618e1f8a..ab53855761c2 100644 --- a/net-p2p/libtorrent-devel/Makefile +++ b/net-p2p/libtorrent-devel/Makefile @@ -22,8 +22,4 @@ CONFLICTS= libtorrent-[0-9]* EXTRA_PATCHES= ${.CURDIR}/files/devel-* -.if defined(WITH_KQUEUE) -CONFIGURE_ARGS=--with-kqueue -.endif - .include "${MASTERDIR}/Makefile" diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index b7efdaf93c15..c3d75b8d4dea 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= libtorrent -PORTVERSION?= 0.9.3 +PORTVERSION?= 0.10.3 PORTREVISION?= 0 CATEGORIES= net-p2p MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ @@ -21,12 +21,14 @@ CONFLICTS?= libtorrent-devel-[0-9]* USE_GCC= 3.4 USE_GNOME= pkgconfig gnomehack USE_OPENSSL= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} EXTRA_PATCHES?= ${.CURDIR}/files/stable-* +OPTIONS= KQUEUE "Use kqueue(2) support" on + .include <bsd.port.pre.mk> CONFIGURE_ARGS+= --disable-debug --with-openssl=${OPENSSLBASE} @@ -34,4 +36,8 @@ CONFIGURE_ARGS+= --disable-debug --with-openssl=${OPENSSLBASE} post-patch: @${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/configure +.if !defined(WITHOUT_KQUEUE) +CONFIGURE_ARGS=--with-kqueue +.endif + .include <bsd.port.post.mk> diff --git a/net-p2p/libtorrent/distinfo b/net-p2p/libtorrent/distinfo index 11da99ede06a..56ffbd3ab769 100644 --- a/net-p2p/libtorrent/distinfo +++ b/net-p2p/libtorrent/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.3.tar.gz) = 8697a637db74f42fa23acbee03fa1734 +SHA256 (libtorrent-0.10.3.tar.gz) = 3f850d167d91895462b801069e562ddfc9c886299216b6fde9596795418d975a +SIZE (libtorrent-0.10.3.tar.gz) = 449091 diff --git a/net-p2p/libtorrent/files/stable-ltmain.sh b/net-p2p/libtorrent/files/stable-ltmain.sh index 718b8c0aa1fa..affc5f0af5ef 100644 --- a/net-p2p/libtorrent/files/stable-ltmain.sh +++ b/net-p2p/libtorrent/files/stable-ltmain.sh @@ -1,19 +1,11 @@ ---- ltmain.sh.orig -+++ ltmain.sh -@@ -976,6 +976,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -4330,10 +4331,12 @@ +--- 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%^.*/%%'` + 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 $? @@ -21,3 +13,11 @@ # 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/files/stable-src_torrent_chunk__manager.cc b/net-p2p/libtorrent/files/stable-src_torrent_chunk__manager.cc new file mode 100644 index 000000000000..7188247b184c --- /dev/null +++ b/net-p2p/libtorrent/files/stable-src_torrent_chunk__manager.cc @@ -0,0 +1,10 @@ +--- src/torrent/chunk_manager.cc.orig Fri Oct 6 18:59:46 2006 ++++ src/torrent/chunk_manager.cc Fri Oct 6 19:00:09 2006 +@@ -37,6 +37,7 @@ + #include "config.h" + + #include <sys/types.h> ++#include <sys/time.h> + #include <sys/resource.h> + + #include "data/chunk_list.h" diff --git a/net-p2p/libtorrent/pkg-plist b/net-p2p/libtorrent/pkg-plist index 8ebd31e2b59a..bf40ab973a40 100644 --- a/net-p2p/libtorrent/pkg-plist +++ b/net-p2p/libtorrent/pkg-plist @@ -1,4 +1,9 @@ include/torrent/bitfield.h +include/torrent/block.h +include/torrent/block_list.h +include/torrent/block_transfer.h +include/torrent/chunk_manager.h +include/torrent/common.h include/torrent/connection_manager.h include/torrent/download.h include/torrent/event.h @@ -10,16 +15,20 @@ include/torrent/object.h include/torrent/object_stream.h include/torrent/path.h include/torrent/peer.h +include/torrent/peer_info.h +include/torrent/peer_list.h include/torrent/piece.h include/torrent/poll.h 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.9 libdata/pkgconfig/libtorrent.pc @dirrm include/torrent |