This updates net/transmission to 2.42.
The GTK+ client now uses GTK+3.
I've only lightly tested the daemon client. The GTK+ and Qt clients
start up, beyond that I don't know.
Stefan Unterweger wasn't quite happy about 2.41:
> transmission-cli now doesn't write the download into the directory from
> which it was invoked [...]
> But I have the feeling that this may be actually an ill-advised, but
> deliberate change from upstream, so this is just me ranting.
The CLI client has always been rather neglected, and personally I
barely see its use.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile 25 Sep 2011 21:55:49 -0000 1.70
+++ Makefile 6 Nov 2011 18:15:55 -0000
@@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.70 2011/09/25 21:55:49 naddy Exp $
-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
+COMMENT-main= BitTorrent command line and daemon client
+COMMENT-gtk= BitTorrent client with GTK+ interface
+COMMENT-qt= BitTorrent client with Qt interface
-VER= 2.33
+VER= 2.42
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gtk= transmission-gtk-${VER}
PKGNAME-qt= transmission-qt-${VER}
-REVISION-gtk= 0
CATEGORIES= net
HOMEPAGE= http://www.transmissionbt.com/
@@ -38,10 +37,10 @@ FLAVOR?=
WANTLIB= c crypto curl event_core event_extra idn m pthread ssl z
WANTLIB-gtk= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xxf86vm GL atk-1.0 cairo \
- dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype \
- gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
- gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 pangoft2-1.0 \
- pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
+ cairo-gobject drm expat ffi fontconfig freetype \
+ gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
+ gobject-2.0 gthread-2.0 gtk-3 pango-1.0 pangoft2-1.0 \
+ pangocairo-1.0 pixman-1 png pcre pthread-stubs stdc++ xcb \
xcb-render xcb-shm
WANTLIB-qt= ${WANTLIB} QtCore QtDBus QtGui QtNetwork QtXml \
expat fontconfig freetype stdc++
@@ -51,8 +50,7 @@ MODULES= devel/gettext textproc/intltool
LIB_DEPENDS= devel/libevent2 \
net/curl
LIB_DEPENDS-gtk=${LIB_DEPENDS} \
- x11/gtk+2 \
- x11/dbus-glib
+ x11/gtk+3
LIB_DEPENDS-qt= ${LIB_DEPENDS} \
x11/qt4
@@ -68,10 +66,7 @@ TAR= ${LOCALBASE}/bin/gtar
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= --disable-shared \
- --disable-libnotify \
- --disable-libappindicator \
- --disable-libcanberra
+CONFIGURE_ARGS= --disable-shared
# unaligned accesses throughout
CONFIGURE_ARGS+=--disable-utp
@@ -81,7 +76,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
.include <bsd.port.arch.mk>
.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--disable-gtk
+CONFIGURE_ARGS+=--without-gtk
.endif
.if ${BUILD_PACKAGES:M-qt}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- distinfo 25 Sep 2011 21:55:49 -0000 1.35
+++ distinfo 6 Nov 2011 18:15:55 -0000
@@ -1,5 +1,5 @@
-MD5 (transmission-2.33.tar.xz) = dt8rAC6eJD8uRge0DAGZdA==
-RMD160 (transmission-2.33.tar.xz) = i4IoovrVWmTUYxTxv4eai4n6FQ0=
-SHA1 (transmission-2.33.tar.xz) = pVAnI+m4/cmCzE08BS5IOctFsag=
-SHA256 (transmission-2.33.tar.xz) =
wVp/nYJ0P7Mp7hLkG/JCBw3bqoxnQdp84LuR2NOZoHI=
-SIZE (transmission-2.33.tar.xz) = 2583032
+MD5 (transmission-2.42.tar.xz) = UPbddsXAH0XV7SB4PGhoFQ==
+RMD160 (transmission-2.42.tar.xz) = x0aIphwqhIn4eDYwRqxwXxzj8AU=
+SHA1 (transmission-2.42.tar.xz) = eJAwlYQv4TMcC2riFKnpmw8RKVE=
+SHA256 (transmission-2.42.tar.xz) =
ypTY3lM4F4wiEOhuMapSL1WcrIfaM6hRmfvYG36LBOs=
+SIZE (transmission-2.42.tar.xz) = 2629072
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/transmission/patches/patch-configure,v
retrieving revision 1.25
diff -u -p -r1.25 patch-configure
--- patches/patch-configure 23 Sep 2011 09:12:32 -0000 1.25
+++ patches/patch-configure 6 Nov 2011 18:15:55 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.25 2011/09/23 09:12:32 naddy Exp $
---- 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
+--- configure.orig Thu Oct 20 04:02:58 2011
++++ configure Sun Nov 6 19:06:37 2011
+@@ -11648,8 +11648,8 @@ if test 0 = "0"; then
else
supported_build=no
if test "x$GCC" = "xyes" ; then
@@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.25 2011/09
fi
fi
if test "x$supported_build" = "xno"; then
-@@ -15421,7 +15421,7 @@ esac
+@@ -16049,7 +16049,7 @@ esac
if test "x$GCC" = "xyes" ; then
@@ -21,7 +21,7 @@ $OpenBSD: patch-configure,v 1.25 2011/09
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
$as_echo_n "checking gcc version... " >&6; }
-@@ -15433,10 +15433,10 @@ $as_echo_n "checking gcc version... " >&6; }
+@@ -16061,10 +16061,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,7 +34,7 @@ $OpenBSD: patch-configure,v 1.25 2011/09
fi
fi
-@@ -18382,7 +18382,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+@@ -18868,7 +18868,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
Index: patches/patch-third-party_libutp_utypes_h
===================================================================
RCS file: patches/patch-third-party_libutp_utypes_h
diff -N patches/patch-third-party_libutp_utypes_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-third-party_libutp_utypes_h 6 Nov 2011 18:15:55 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- third-party/libutp/utypes.h.orig Wed Sep 28 19:46:15 2011
++++ third-party/libutp/utypes.h Wed Sep 28 19:47:06 2011
+@@ -36,7 +36,11 @@ typedef const char * cstr;
+ typedef char * str;
+
+ #ifndef __cplusplus
++#ifdef HAVE_STDBOOL_H
++#include <stdbool.h>
++#else
+ typedef uint8 bool;
++#endif
+ #endif
+
+ #endif //__UTYPES_H__
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.2
diff -u -p -r1.2 patch-third-party_miniupnp_miniwget_c
--- patches/patch-third-party_miniupnp_miniwget_c 23 Sep 2011 09:12:32
-0000 1.2
+++ patches/patch-third-party_miniupnp_miniwget_c 6 Nov 2011 18:15:55
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-third-party_miniupnp_miniwget_c,v 1.2 2011/09/23 09:12:32
naddy Exp $
---- 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 @@
+--- third-party/miniupnp/miniwget.c.orig Fri Sep 23 07:58:42 2011
++++ third-party/miniupnp/miniwget.c Wed Sep 28 13:42:49 2011
+@@ -33,6 +33,7 @@
#include <sys/select.h>
#endif /* #else defined(__amigaos__) && !defined(__amigaos4__) */
#include <sys/socket.h>
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/transmission/pkg/PLIST-main,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST-main
--- pkg/PLIST-main 23 Sep 2011 09:12:32 -0000 1.19
+++ pkg/PLIST-main 6 Nov 2011 18:15:55 -0000
@@ -35,14 +35,13 @@ share/transmission/web/images/buttons/to
share/transmission/web/images/favicon.ico
share/transmission/web/images/favicon.png
share/transmission/web/images/graphics/
+share/transmission/web/images/graphics/blue-turtle.png
share/transmission/web/images/graphics/chrome.png
share/transmission/web/images/graphics/filter_bar.png
share/transmission/web/images/graphics/filter_icon.png
share/transmission/web/images/graphics/iphone_chrome.png
share/transmission/web/images/graphics/lock_icon.png
share/transmission/web/images/graphics/logo.png
-share/transmission/web/images/graphics/transfer_arrows.png
-share/transmission/web/images/graphics/wait20.gif
share/transmission/web/images/progress/
share/transmission/web/images/progress/progress.png
share/transmission/web/images/webclip-icon.png
@@ -50,23 +49,25 @@ share/transmission/web/index.html
share/transmission/web/javascript/
share/transmission/web/javascript/common.js
share/transmission/web/javascript/dialog.js
+share/transmission/web/javascript/file-row.js
share/transmission/web/javascript/formatter.js
+share/transmission/web/javascript/inspector.js
share/transmission/web/javascript/jquery/
share/transmission/web/javascript/jquery/jquery.contextmenu.min.js
share/transmission/web/javascript/jquery/jquery.form.js
share/transmission/web/javascript/jquery/jquery.form.min.js
-share/transmission/web/javascript/jquery/jquery.min.js
share/transmission/web/javascript/jquery/jquery.transmenu.min.js
-share/transmission/web/javascript/jquery/json.min.js
-share/transmission/web/javascript/menu.js
+share/transmission/web/javascript/jquery/json2.min.js
+share/transmission/web/javascript/prefs-dialog.js
+share/transmission/web/javascript/remote.js
+share/transmission/web/javascript/torrent-row.js
share/transmission/web/javascript/torrent.js
share/transmission/web/javascript/transmission.js
-share/transmission/web/javascript/transmission.remote.js
share/transmission/web/stylesheets/
share/transmission/web/stylesheets/common.css
-share/transmission/web/stylesheets/ie6.css
share/transmission/web/stylesheets/ie7.css
-share/transmission/web/stylesheets/iphone.css
+share/transmission/web/stylesheets/ieAll.css
+share/transmission/web/stylesheets/mobile.css
@rcscript ${RCDIR}/transmission_daemon
@mode 750
@owner _transmission
--
Christian "naddy" Weisgerber na...@mips.inka.de
