update to 0.13.6/0.9.6. HOMEPAGE seems to have vanished, so the closest
thing is the github page. distfiles are at rtorrent.net, but the
index.html is just the default apache page.
some patches were upstreamed.
builds fine on amd64/powerpc, tested lightly on powerpc
Index: libtorrent/Makefile
===================================================================
RCS file: /cvs/ports/net/libtorrent/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- libtorrent/Makefile 1 Aug 2015 08:13:01 -0000 1.42
+++ libtorrent/Makefile 10 Sep 2015 18:35:55 -0000
@@ -9,19 +9,18 @@ BROKEN-sh = undefined references to __s
# requires C++ tr1 headers
NOT_FOR_ARCHS= ${GCC3_ARCHS}
-DISTNAME= libtorrent-0.13.4
+DISTNAME= libtorrent-0.13.6
EPOCH= 0
-REVISION= 1
-SHARED_LIBS += torrent 21.0 # .18.0
+SHARED_LIBS += torrent 22.0 # .18.0
CATEGORIES= net devel
-HOMEPAGE= http://libtorrent.rakshasa.no/
+HOMEPAGE= https://rakshasa.github.io/rtorrent/
MAINTAINER= David Coppa <[email protected]>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}downloads/
+MASTER_SITES= http://rtorrent.net/downloads/
WANTLIB= crypto m pthread stdc++ z
BUILD_DEPENDS= devel/cppunit
Index: libtorrent/distinfo
===================================================================
RCS file: /cvs/ports/net/libtorrent/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- libtorrent/distinfo 24 Mar 2015 13:35:09 -0000 1.19
+++ libtorrent/distinfo 10 Sep 2015 18:35:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-0.13.4.tar.gz) =
cE4JcRncieLuRjA5ayXeHNZLBUmEE0fqdbnvkhcISVU=
-SIZE (libtorrent-0.13.4.tar.gz) = 768382
+SHA256 (libtorrent-0.13.6.tar.gz) =
KDigjJbt/ZNq/4+/mey7kwwr/KMzfdFILrX8zbgNWgQ=
+SIZE (libtorrent-0.13.6.tar.gz) = 781253
Index: libtorrent/patches/patch-configure
===================================================================
RCS file: libtorrent/patches/patch-configure
diff -N libtorrent/patches/patch-configure
--- libtorrent/patches/patch-configure 24 Mar 2015 13:35:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,162 +0,0 @@
-$OpenBSD: patch-configure,v 1.1 2015/03/24 13:35:09 dcoppa Exp $
-
-Add missing check for libz.
-
---- configure.orig Wed May 14 09:31:44 2014
-+++ configure Tue Mar 24 06:58:24 2015
-@@ -800,6 +800,7 @@ with_posix_fallocate
- with_address_space
- with_statvfs
- with_statfs
-+with_zlib
- enable_openssl
- enable_cyrus_rc4
- enable_mincore
-@@ -1489,6 +1490,9 @@ Optional Packages:
- [[default=1024mb]]
- --without-statvfs don't try to use statvfs to find free diskspace
- --without-statfs don't try to use statfs to find free diskspace
-+ --with-zlib=DIR root directory path of zlib installation [defaults
to
-+ /usr/local or /usr if not found in /usr/local]
-+ --without-zlib to disable zlib usage completely
-
- Some influential environment variables:
- CC C compiler command
-@@ -17652,6 +17656,137 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS
conftest.$ac_ext
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if zlib is wanted" >&5
-+$as_echo_n "checking if zlib is wanted... " >&6; }
-+zlib_places="/usr/local /usr /opt/local /sw"
-+
-+# Check whether --with-zlib was given.
-+if test "${with_zlib+set}" = set; then :
-+ withval=$with_zlib; if test "$withval" != no ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ if test -d "$withval"
-+ then
-+ zlib_places="$withval $zlib_places"
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, $withval does
not exist, checking usual places" >&5
-+$as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual
places" >&2;}
-+ fi
-+else
-+ zlib_places=
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+fi
-+
-+
-+#
-+# Locate zlib, if wanted
-+#
-+if test -n "${zlib_places}"
-+then
-+ # check the user supplied or any other more or less 'standard' place:
-+ # Most UNIX systems : /usr/local and /usr
-+ # MacPorts / Fink on OSX : /opt/local respectively /sw
-+ for ZLIB_HOME in ${zlib_places} ; do
-+ if test -f "${ZLIB_HOME}/include/zlib.h"; then break; fi
-+ ZLIB_HOME=""
-+ done
-+
-+ ZLIB_OLD_LDFLAGS=$LDFLAGS
-+ ZLIB_OLD_CPPFLAGS=$CPPFLAGS
-+ if test -n "${ZLIB_HOME}"; then
-+ LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-+ fi
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateEnd in -lz" >&5
-+$as_echo_n "checking for inflateEnd in -lz... " >&6; }
-+if ${ac_cv_lib_z_inflateEnd+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char inflateEnd ();
-+int
-+main ()
-+{
-+return inflateEnd ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_z_inflateEnd=yes
-+else
-+ ac_cv_lib_z_inflateEnd=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflateEnd" >&5
-+$as_echo "$ac_cv_lib_z_inflateEnd" >&6; }
-+if test "x$ac_cv_lib_z_inflateEnd" = xyes; then :
-+ zlib_cv_libz=yes
-+else
-+ zlib_cv_libz=no
-+fi
-+
-+ ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h"
"$ac_includes_default"
-+if test "x$ac_cv_header_zlib_h" = xyes; then :
-+ zlib_cv_zlib_h=yes
-+else
-+ zlib_cv_zlib_h=no
-+fi
-+
-+
-+ ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+ if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes"
-+ then
-+ #
-+ # If both library and header were found, action-if-found
-+ #
-+
-+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
-+ LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
-+ LIBS="-lz $LIBS"
-+
-+$as_echo "#define HAVE_LIBZ 1" >>confdefs.h
-+
-+
-+ else
-+ #
-+ # If either header or library was not found, action-if-not-found
-+ #
-+
-+ as_fn_error $? "either specify a valid zlib installation with
--with-zlib=DIR or disable zlib usage with --without-zlib" "$LINENO" 5
-+
-+ fi
-+fi
-
-
- CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
Index: libtorrent/patches/patch-test_Makefile_in
===================================================================
RCS file: /cvs/ports/net/libtorrent/patches/patch-test_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-test_Makefile_in
--- libtorrent/patches/patch-test_Makefile_in 24 Mar 2015 13:35:09 -0000
1.5
+++ libtorrent/patches/patch-test_Makefile_in 10 Sep 2015 18:35:55 -0000
@@ -1,37 +1,12 @@
-$OpenBSD: patch-test_Makefile_in,v 1.5 2015/03/24 13:35:09 dcoppa Exp $
-
-Correct library dependencies for tests.
-
---- test/Makefile.in.orig Tue Jun 21 09:06:06 2011
-+++ test/Makefile.in Mon Dec 10 15:34:39 2012
-@@ -137,8 +137,8 @@ LibTorrentTest_DEPENDENCIES = ../src/libtorrent.la \
- ../src/torrent/download/libsub_torrentdownload.la \
- ../src/torrent/peer/libsub_torrentpeer.la \
- ../src/data/libsub_data.la ../src/dht/libsub_dht.la \
-- ../src/download/libsub_download.la ../src/net/libsub_net.la \
-- ../src/protocol/libsub_protocol.la \
-+ ../src/net/libsub_net.la ../src/protocol/libsub_protocol.la \
-+ ../src/download/libsub_download.la \
- ../src/tracker/libsub_tracker.la ../src/utils/libsub_utils.la \
- ../src/torrent/utils/libsub_torrentutils.la
- AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -577,9 +577,9 @@ LibTorrentTest_LDADD = \
- ../src/torrent/peer/libsub_torrentpeer.la \
- ../src/data/libsub_data.la \
- ../src/dht/libsub_dht.la \
-- ../src/download/libsub_download.la \
- ../src/net/libsub_net.la \
- ../src/protocol/libsub_protocol.la \
-+ ../src/download/libsub_download.la \
- ../src/tracker/libsub_tracker.la \
- ../src/utils/libsub_utils.la \
- ../src/torrent/utils/libsub_torrentutils.la
-@@ -643,7 +643,7 @@ LibTorrentTest_SOURCES = \
+$OpenBSD$
+--- test/Makefile.in.orig Thu Sep 10 20:12:55 2015
++++ test/Makefile.in Thu Sep 10 20:13:00 2015
+@@ -644,7 +644,7 @@ LibTorrentTest_SOURCES = \
main.cc
LibTorrentTest_CXXFLAGS = $(CPPUNIT_CFLAGS)
-LibTorrentTest_LDFLAGS = $(CPPUNIT_LIBS) -ldl
-+LibTorrentTest_LDFLAGS = $(CPPUNIT_LIBS) -lpthread
++LibTorrentTest_LDFLAGS = $(CPPUNIT_LIBS)
AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src
all: all-am
Index: rtorrent/Makefile
===================================================================
RCS file: /cvs/ports/net/rtorrent/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- rtorrent/Makefile 31 Jul 2015 16:09:23 -0000 1.49
+++ rtorrent/Makefile 10 Sep 2015 18:35:55 -0000
@@ -2,22 +2,21 @@
COMMENT= ncurses BitTorrent client based on libTorrent
-DISTNAME= rtorrent-0.9.4
+DISTNAME= rtorrent-0.9.6
EPOCH= 0
CATEGORIES= net
-REVISION= 0
-HOMEPAGE= http://libtorrent.rakshasa.no/
+HOMEPAGE= https://rakshasa.github.io/rtorrent/
MAINTAINER= David Coppa <[email protected]>
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c crypto curl>=14 idn m ncursesw \
pthread ssl stdc++ torrent>=21 z
-MASTER_SITES= ${HOMEPAGE}downloads/
+MASTER_SITES= http://rtorrent.net/downloads/
MODULES= gcc4 devel/gettext
Index: rtorrent/distinfo
===================================================================
RCS file: /cvs/ports/net/rtorrent/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- rtorrent/distinfo 24 Mar 2015 13:36:20 -0000 1.19
+++ rtorrent/distinfo 10 Sep 2015 18:35:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (rtorrent-0.9.4.tar.gz) = vAosHuYTto83Ahvq9OZKklL5HtBvmYweiXiXw1TOfoQ=
-SIZE (rtorrent-0.9.4.tar.gz) = 601913
+SHA256 (rtorrent-0.9.6.tar.gz) = HmnCTx8m+PB9WNZzSA3Dkr/EMXgYwRFSZbCKeBP/Ww4=
+SIZE (rtorrent-0.9.6.tar.gz) = 610845
Index: rtorrent/patches/patch-test_Makefile_in
===================================================================
RCS file: /cvs/ports/net/rtorrent/patches/patch-test_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-test_Makefile_in
--- rtorrent/patches/patch-test_Makefile_in 24 Mar 2015 13:36:20 -0000
1.4
+++ rtorrent/patches/patch-test_Makefile_in 10 Sep 2015 18:35:55 -0000
@@ -1,9 +1,9 @@
-$OpenBSD: patch-test_Makefile_in,v 1.4 2015/03/24 13:36:20 dcoppa Exp $
+$OpenBSD$
Unbreak build.
---- test/Makefile.in.orig Wed May 14 09:34:50 2014
-+++ test/Makefile.in Tue Mar 24 08:06:24 2015
+--- test/Makefile.in.orig Thu Sep 10 20:20:28 2015
++++ test/Makefile.in Thu Sep 10 20:20:33 2015
@@ -561,7 +561,7 @@ rtorrentTest_SOURCES = \
main.cc
