Date: Wed, 19 Jan 2005 18:05:45 +0100 (CET) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76465: Update port: net/libtorrent - update to version 0.4.7. Message-ID: <20050119170545.B50721198A@gate.xbsd.org> Resent-Message-ID: <200501191710.j0JHAa4W040440@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76465
>Category: ports
>Synopsis: Update port: net/libtorrent - update to version 0.4.7.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 19 17:10:34 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Florent Thoumie
>Release: FreeBSD 5.3-RELEASE i386
>Organization:
Xbsd.org
>Environment:
System: FreeBSD gate.xbsd.org 5.3-RELEASE FreeBSD 5.3-RELEASE #2: Wed Nov 24 16:35:34 CET 2004 root@gate.xbsd.org:/usr/src/sys/i386/compile/GATE i386
>Description:
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.
The patch added lately by krion can be removed (sorry).
>How-To-Repeat:
N/A
>Fix:
--- libtorrent.diff begins here ---
diff -ruN libtorrent.orig/Makefile libtorrent/Makefile
--- libtorrent.orig/Makefile Wed Jan 12 11:19:49 2005
+++ libtorrent/Makefile Wed Jan 19 17:55:49 2005
@@ -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 @@
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 @@
.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 @@
.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 -ruN libtorrent.orig/distinfo libtorrent/distinfo
--- libtorrent.orig/distinfo Wed Jan 12 11:19:49 2005
+++ libtorrent/distinfo Wed Jan 19 17:55:49 2005
@@ -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 -ruN libtorrent.orig/files/patch-ltmain.sh libtorrent/files/patch-ltmain.sh
--- libtorrent.orig/files/patch-ltmain.sh Thu Jan 1 01:00:00 1970
+++ libtorrent/files/patch-ltmain.sh Wed Jan 19 17:55:49 2005
@@ -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 -ruN libtorrent.orig/files/patch-src::data::file_chunk.cc libtorrent/files/patch-src::data::file_chunk.cc
--- libtorrent.orig/files/patch-src::data::file_chunk.cc Wed Jan 19 14:36:52 2005
+++ libtorrent/files/patch-src::data::file_chunk.cc Thu Jan 1 01:00:00 1970
@@ -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 -ruN libtorrent.orig/pkg-plist libtorrent/pkg-plist
--- libtorrent.orig/pkg-plist Wed Jan 12 11:19:49 2005
+++ libtorrent/pkg-plist Wed Jan 19 17:55:49 2005
@@ -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/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
--- libtorrent.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050119170545.B50721198A>