Update the net/transmission port to 2.33. This is still a work in
progress.
It requires the devel/libevent2 port I posted yesterday.
Mostly untested, and between me currently being at a place where
I'm told not to abuse the network and generally using BitTorrent
less than I used to, it will take a week or two for me to properly
test it.
For the moment, I have disabled uTP support. It doesn't build out
of the box, and on first glance the code seems to rely on IPv4
mapped addresses. I'll need to take a closer look later.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile 16 Sep 2011 11:13:41 -0000 1.67
+++ Makefile 20 Sep 2011 08:47:13 -0000
@@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.67 2011/09/16 11:13:41 espie Exp $
+ONLY_FOR_ARCHS-qt= ${GCC4_ARCHS}
+
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gtk= lightweight BitTorrent client with GTK+ interface
COMMENT-qt= lightweight BitTorrent client with Qt interface
-VER= 2.13
+VER= 2.33
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gtk= transmission-gtk-${VER}
PKGNAME-qt= transmission-qt-${VER}
CATEGORIES= net
HOMEPAGE= http://www.transmissionbt.com/
-REVISION-main = 0
-REVISION-gtk = 0
-REVISION-qt = 0
MAINTAINER= Christian Weisgerber <na...@openbsd.org>
@@ -31,12 +30,15 @@ FLAVOR?=
MULTI_PACKAGES= -main
-WANTLIB= c crypto curl event eventextra idn m pthread ssl z
+WANTLIB= c crypto curl event_core event_extra idn m pthread ssl z
WANTLIB-main= ${WANTLIB}
MODULES= devel/gettext textproc/intltool
LIB_DEPENDS= net/curl \
- devel/libeventextra
+ devel/libevent2
+
+BUILD_DEPENDS= archivers/gtar
+TAR= ${LOCALBASE}/bin/gtar
USE_GMAKE= Yes
USE_LIBTOOL= Yes
@@ -44,14 +46,11 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-shared \
--disable-libnotify \
--disable-libappindicator \
- --disable-libcanberra \
- --disable-gconf2
+ --disable-libcanberra
+# XXX
+CONFIGURE_ARGS+=--disable-utp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- LIBEVENT_LIBS="-leventextra -levent" \
- OPENSSL_CFLAGS="-I/usr/include" \
- OPENSSL_LIBS="-lcrypto"
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}
+ LDFLAGS="-L${LOCALBASE}/lib"
.if ${FLAVOR:L:Mno_gtk}
CONFIGURE_ARGS+=--disable-gtk
@@ -80,11 +79,10 @@ RUN_DEPENDS-gtk=${PKGNAME-main}:net/tran
MULTI_PACKAGES+=-qt
.endif
-ONLY_FOR_ARCHS-qt = ${GCC4_ARCHS}
.if ${COMPILER_VERSION:L:Mgcc4*} && !${FLAVOR:L:Mno_qt}
LIB_DEPENDS+= x11/qt4
WANTLIB-qt= ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
- dbus-1 expat fontconfig freetype stdc++
+ expat fontconfig freetype stdc++
RUN_DEPENDS-qt= ${PKGNAME-main}:net/transmission,-main \
devel/desktop-file-utils
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.33
diff -u -p -r1.33 distinfo
--- distinfo 12 Dec 2010 20:42:38 -0000 1.33
+++ distinfo 20 Sep 2011 08:47:13 -0000
@@ -1,5 +1,5 @@
-MD5 (transmission-2.13.tar.bz2) = 6xJq6IuASH8oQIlpOQGUIQ==
-RMD160 (transmission-2.13.tar.bz2) = vLke+GuADyu3InWS6JVdKrGIXFw=
-SHA1 (transmission-2.13.tar.bz2) = Ky+nPR0C2WF+yfWJBTkB0J1NC6Q=
-SHA256 (transmission-2.13.tar.bz2) =
c0Zsv9EtyhaxadOstc9xd/dAz/plc6g3oGyZQkXut6I=
-SIZE (transmission-2.13.tar.bz2) = 4268363
+MD5 (transmission-2.33.tar.bz2) = CCIXplcTrIeUEMYiy+brJg==
+RMD160 (transmission-2.33.tar.bz2) = 3TDHz3MvoKYhSdqL4mYxLeZbWqY=
+SHA1 (transmission-2.33.tar.bz2) = 690L3qk35LkOzt38uzy78Hnz5wE=
+SHA256 (transmission-2.33.tar.bz2) =
AlxIW1FbQeo5ivAyZAzsCHbRU5Mv+1728hYe+O43DHA=
+SIZE (transmission-2.33.tar.bz2) = 3858044
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure
--- patches/patch-configure 12 Dec 2010 20:42:39 -0000 1.24
+++ patches/patch-configure 20 Sep 2011 08:47:13 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.24 2010/12/12 20:42:39 naddy Exp $
---- configure.orig Thu Dec 9 20:53:57 2010
-+++ configure Fri Dec 10 21:55:05 2010
-@@ -10870,8 +10870,8 @@ if test 0 = "0"; then
+--- configure.orig Thu Jul 21 01:39:42 2011
++++ configure Tue Sep 20 01:42:31 2011
+@@ -10895,8 +10895,8 @@ if test 0 = "0"; then
else
supported_build=no
if test "x$GCC" = "xyes" ; then
@@ -12,16 +12,16 @@ $OpenBSD: patch-configure,v 1.24 2010/12
fi
fi
if test "x$supported_build" = "xno"; then
-@@ -15387,7 +15387,7 @@ esac
+@@ -15421,7 +15421,7 @@ esac
if test "x$GCC" = "xyes" ; then
-- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls
-Wnested-externs -Wunused-parameter -Wwrite-strings -Waggregate-return -Winline
-Wfloat-equal"
-+ : CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls
-Wnested-externs -Wunused-parameter -Wwrite-strings -Waggregate-return -Winline
-Wfloat-equal"
+- CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls
-Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal"
++ : CFLAGS="$CFLAGS -std=gnu99 -ggdb3 -Wall -W -Wpointer-arith
-Wformat-security -Wcast-align -Wundef -Wcast-align -Wstrict-prototypes
-Wmissing-declarations -Wmissing-format-attribute -Wredundant-decls
-Wnested-externs -Wunused-parameter -Wwrite-strings -Winline -Wfloat-equal"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
$as_echo_n "checking gcc version... " >&6; }
-@@ -15399,10 +15399,10 @@ $as_echo_n "checking gcc version... " >&6; }
+@@ -15433,10 +15433,10 @@ $as_echo_n "checking gcc version... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_VERSION" >&5
$as_echo "$GCC_VERSION" >&6; }
if test $GCC_VERSION_NUM -ge 304; then
@@ -34,3 +34,12 @@ $OpenBSD: patch-configure,v 1.24 2010/12
fi
fi
+@@ -18382,7 +18382,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+ as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
++ IT_PERL_VERSION=`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
Index: patches/patch-libtransmission_peer-io_c
===================================================================
RCS file: patches/patch-libtransmission_peer-io_c
diff -N patches/patch-libtransmission_peer-io_c
--- patches/patch-libtransmission_peer-io_c 21 Oct 2010 21:52:51 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-libtransmission_peer-io_c,v 1.1 2010/10/21 21:52:51 naddy Exp $
---- libtransmission/peer-io.c.orig Sat Oct 16 19:36:24 2010
-+++ libtransmission/peer-io.c Sat Oct 16 19:36:55 2010
-@@ -20,6 +20,9 @@
- #ifdef WIN32
- #include <winsock2.h>
- #else
-+ #include <sys/types.h>
-+ #include <sys/socket.h>
-+ #include <netinet/in.h>
- #include <arpa/inet.h> /* inet_ntoa */
- #endif
-
Index: patches/patch-libtransmission_peer-msgs_c
===================================================================
RCS file: patches/patch-libtransmission_peer-msgs_c
diff -N patches/patch-libtransmission_peer-msgs_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-libtransmission_peer-msgs_c 20 Sep 2011 08:47:13 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libtransmission/peer-msgs.c.orig Thu Jul 21 01:38:56 2011
++++ libtransmission/peer-msgs.c Mon Sep 19 15:32:25 2011
+@@ -16,8 +16,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+
+-#include <alloca.h>
+-
+ #include <event2/buffer.h>
+ #include <event2/bufferevent.h>
+ #include <event2/event.h>
Index: patches/patch-qt_qtr_pro
===================================================================
RCS file: /cvs/ports/net/transmission/patches/patch-qt_qtr_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-qt_qtr_pro
--- patches/patch-qt_qtr_pro 23 Nov 2010 18:52:40 -0000 1.2
+++ patches/patch-qt_qtr_pro 20 Sep 2011 08:47:13 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-qt_qtr_pro,v 1.2 2010/11/23 18:52:40 naddy Exp $
---- qt/qtr.pro.orig Sun Nov 14 17:07:13 2010
-+++ qt/qtr.pro Fri Nov 19 19:13:55 2010
+--- qt/qtr.pro.orig Thu Jul 21 01:38:56 2011
++++ qt/qtr.pro Mon Sep 19 15:32:25 2011
@@ -8,7 +8,7 @@ target.path = /bin
INSTALLS += target
@@ -10,12 +10,12 @@ $OpenBSD: patch-qt_qtr_pro,v 1.2 2010/11
man.files = transmission-qt.1
CONFIG += qt qdbus thread debug link_pkgconfig
-@@ -21,7 +21,7 @@ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransm
+@@ -25,7 +25,7 @@ exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp
LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
--unix: LIBS += -levent -lz
-+unix: LIBS += -leventextra -levent -lz
+-unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
++unix: LIBS += -L$${EVENT_TOP}/lib -lz -levent_core -levent_extra
win32:DEFINES += QT_DBUS
- win32:LIBS += -levent -lws2_32 -lintl
+ win32:LIBS += -levent-2.0 -lws2_32 -lintl
win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi
Index: patches/patch-third-party_miniupnp_miniwget_c
===================================================================
RCS file:
/cvs/ports/net/transmission/patches/patch-third-party_miniupnp_miniwget_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-third-party_miniupnp_miniwget_c
--- patches/patch-third-party_miniupnp_miniwget_c 21 Oct 2010 21:52:51
-0000 1.1
+++ patches/patch-third-party_miniupnp_miniwget_c 20 Sep 2011 08:47:13
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-third-party_miniupnp_miniwget_c,v 1.1 2010/10/21 21:52:51
naddy Exp $
---- third-party/miniupnp/miniwget.c.orig Sat Oct 16 19:34:07 2010
-+++ third-party/miniupnp/miniwget.c Sat Oct 16 19:37:47 2010
-@@ -26,6 +26,7 @@
+--- third-party/miniupnp/miniwget.c.orig Thu Jul 21 01:39:01 2011
++++ third-party/miniupnp/miniwget.c Mon Sep 19 15:32:25 2011
+@@ -32,6 +32,7 @@
#include <sys/select.h>
#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
#include <sys/socket.h>
Index: pkg/PLIST-gtk
===================================================================
RCS file: /cvs/ports/net/transmission/pkg/PLIST-gtk,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-gtk
--- pkg/PLIST-gtk 12 Dec 2010 20:42:39 -0000 1.3
+++ pkg/PLIST-gtk 20 Sep 2011 08:47:13 -0000
@@ -14,6 +14,9 @@ share/icons/hicolor/22x22/apps/transmiss
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/transmission.png
+share/icons/hicolor/256x256/
+share/icons/hicolor/256x256/apps/
+share/icons/hicolor/256x256/apps/transmission.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/transmission.png
@@ -139,6 +142,9 @@ share/locale/nn/LC_MESSAGES/transmission
share/locale/oc/
share/locale/oc/LC_MESSAGES/
share/locale/oc/LC_MESSAGES/transmission-gtk.mo
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
+share/locale/pa/LC_MESSAGES/transmission-gtk.mo
share/locale/pl/LC_MESSAGES/transmission-gtk.mo
share/locale/pt/LC_MESSAGES/transmission-gtk.mo
share/locale/pt_BR/LC_MESSAGES/transmission-gtk.mo
@@ -151,6 +157,9 @@ share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/transmission-gtk.mo
share/locale/sr/LC_MESSAGES/transmission-gtk.mo
share/locale/sv/LC_MESSAGES/transmission-gtk.mo
+share/locale/ta_LK/
+share/locale/ta_LK/LC_MESSAGES/
+share/locale/ta_LK/LC_MESSAGES/transmission-gtk.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/transmission-gtk.mo
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/transmission/pkg/PLIST-main,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 10 Jan 2011 08:35:16 -0000 1.18
+++ pkg/PLIST-main 20 Sep 2011 08:47:13 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.18 2011/01/10 08:35:16 fgsch Exp $
+@pkgpath net/transmission
@newgroup _transmission:662
@newuser _transmission:662:662:daemon:Transmission
Account:/var/transmission:/sbin/nologin
-@pkgpath net/transmission
@bin bin/transmission-cli
@bin bin/transmission-create
@bin bin/transmission-daemon
--
Christian "naddy" Weisgerber na...@mips.inka.de
