Update to 2.03. (Mostly mechanical.)
SHOWSTOPPER: The GTK client falls into a busy loop and eats all the CPU
it can get.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/transmission/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile 3 May 2010 17:39:33 -0000 1.54
+++ Makefile 24 Jul 2010 20:32:26 -0000
@@ -3,7 +3,7 @@
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gui= lightweight BitTorrent client with graphical interface
-VER= 1.93
+VER= 2.03
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gui= transmission-gui-${VER}
@@ -26,18 +26,16 @@ FLAVOR?=
MULTI_PACKAGES= -main
-WANTLIB= c crypto event idn m pthread ssl z
+WANTLIB= c crypto curl event eventextra idn m pthread ssl z
WANTLIB-main= ${WANTLIB}
MODULES= devel/gettext textproc/intltool
-LIB_DEPENDS= curl.>=14::net/curl \
- eventextra.>=1::devel/libeventextra
+LIB_DEPENDS= ::net/curl \
+ ::devel/libeventextra
USE_GMAKE= Yes
USE_LIBTOOL= Yes
-AUTOCONF_VERSION=2.63
-AUTOCONF= autoconf -I m4
-CONFIGURE_STYLE=autoconf no-autoheader
+CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-shared \
--disable-silent-rules \
--disable-libnotify \
@@ -46,9 +44,9 @@ CONFIGURE_ARGS= --disable-shared \
--disable-gconf2
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBEVENT_LIBS="-leventextra -levent" \
OPENSSL_CFLAGS="-I/usr/include" \
OPENSSL_LIBS="-lcrypto"
-LIBTOOL_FLAGS= --tag=disable-shared
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}
.if ${FLAVOR:L:Mno_gui}
@@ -57,15 +55,13 @@ CONFIGURE_ARGS+=--disable-gtk
MULTI_PACKAGES+=-gui
WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
- expat fontconfig freetype gio-2.0 glib-2.0 glitz \
- gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \
+ dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 \
+ gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz 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 \
xcb-render xcb-render-util
-LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
- dbus-glib-1::x11/dbus-glib
-LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
- curl.>=14::net/curl \
- eventextra.>=1::devel/libeventextra
+LIB_DEPENDS+= ::x11/gtk+2 \
+ ::x11/dbus-glib
RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main \
::devel/desktop-file-utils \
:gamin-*:sysutils/gamin,-server,no_python
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/transmission/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo 3 May 2010 17:39:33 -0000 1.30
+++ distinfo 24 Jul 2010 20:32:26 -0000
@@ -1,5 +1,5 @@
-MD5 (transmission-1.93.tar.bz2) = 9oNY0D5GvsVwS7qolJkBUg==
-RMD160 (transmission-1.93.tar.bz2) = AOuOE1Dy4Nnbc69x57iHQkEgD4k=
-SHA1 (transmission-1.93.tar.bz2) = J3k7gIjW/V2zuABJAHcMhK65kok=
-SHA256 (transmission-1.93.tar.bz2) =
6bex+5qtKAjuJ7Fj26hkf3OMI1EyAYZPqZRAELjXFnA=
-SIZE (transmission-1.93.tar.bz2) = 4381746
+MD5 (transmission-2.03.tar.bz2) = cpbIVnPtdno13jiDyye1RQ==
+RMD160 (transmission-2.03.tar.bz2) = 2VLfwyD4Hqn+805xAAbGpyXyk28=
+SHA1 (transmission-2.03.tar.bz2) = TnksyqWq2B0LtxZ5IVoqVyxOH9k=
+SHA256 (transmission-2.03.tar.bz2) =
BoAsb0ulFzQesoeycxRczV57D7oqJw2oLw6wpoPPQEY=
+SIZE (transmission-2.03.tar.bz2) = 4264966
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 24 Jul 2010 20:32:26 -0000
@@ -0,0 +1,32 @@
+$OpenBSD$
+--- configure.orig Wed Jul 21 06:14:12 2010
++++ configure Fri Jul 23 23:03:28 2010
+@@ -10870,8 +10870,8 @@ if test 0 = "0"; then
+ else
+ supported_build=no
+ if test "x$GCC" = "xyes" ; then
+- CFLAGS="$CFLAGS -g -O0"
+- CXXFLAGS="$CXXFLAGS -g -O0"
++ : CFLAGS="$CFLAGS -g -O0"
++ : CXXFLAGS="$CXXFLAGS -g -O0"
+ fi
+ fi
+ if test "x$supported_build" = "xno"; then
+@@ -15387,7 +15387,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"
++ : 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"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc version" >&5
+ $as_echo_n "checking gcc version... " >&6; }
+@@ -15399,7 +15399,7 @@ $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
+- CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement
-Winit-self"
++ : CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement
-Winit-self"
+ fi
+ fi
+
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 3 May 2010 17:39:33 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.4 2010/05/03 17:39:33 naddy Exp $
---- configure.ac.orig Fri Mar 12 03:04:38 2010
-+++ configure.ac Sat May 1 03:12:59 2010
-@@ -24,8 +24,8 @@ AC_PROG_LIBTOOL
- if test m4_substr(peer_id_prefix,6,1) = "0"; then
- supported_build=yes
- if test "x$GCC" = "xyes" ; then
-- CFLAGS="$CFLAGS -g -O3 "
-- CXXFLAGS="$CXXFLAGS -g -O3 "
-+ : CFLAGS="$CFLAGS -g -O3 "
-+ : CXXFLAGS="$CXXFLAGS -g -O3 "
- fi
- CPPFLAGS="$CPPFLAGS -DNDEBUG"
- else
-@@ -89,7 +89,7 @@ AC_PROG_CXX
- AC_C_INLINE
- 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"
-+ : 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"
-
- dnl figure out gcc version
- AC_MSG_CHECKING([gcc version])
-@@ -101,7 +101,7 @@ if test "x$GCC" = "xyes" ; then
- AC_MSG_RESULT($GCC_VERSION)
- if test $GCC_VERSION_NUM -ge 304; then
- dnl these were added in 3.4
-- CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement -Winit-self"
-+ : CFLAGS="$CFLAGS -Wextra -Wdeclaration-after-statement -Winit-self"
- fi
- fi
-
-@@ -205,13 +205,13 @@ AC_CHECK_LIB([rt],
- dnl build our copy of libevent whether we use it or not,
- dnl because "make dist" needs its Makefiles to exist, and
- dnl AM_CONDITIONAL + AC_CONFIG_SUBDIRS don't seem to play nice
--AC_CONFIG_SUBDIRS([third-party/libevent])
-+dnl AC_CONFIG_SUBDIRS([third-party/libevent])
- libevent_source=bundled
- AC_CHECK_LIB([event],[evutil_vsnprintf],
- [libevent_found=yes],
- [libevent_found=no],
- [$libevent_extra_libs])
--AC_CHECK_HEADER([event-config.h],
-+AC_CHECK_HEADER([evhttp.h],
- [libevent_headers_found=yes],
- [libevent_headers_found=no])
- libevent_source=bundled
-@@ -227,7 +227,7 @@ if test "x$libevent_source" = "xbundled"; then
- LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/libevent.la"
- else
- LIBEVENT_CFLAGS=""
-- LIBEVENT_LIBS="-levent $libevent_extra_libs"
-+ LIBEVENT_LIBS="-leventextra -levent $libevent_extra_libs"
- fi
- AC_ARG_VAR([LIBEVENT_CFLAGS], [C compiler flags for LIBEVENT, overriding
pkg-config])dnl
- AC_ARG_VAR([LIBEVENT_LIBS], [linker flags for LIBEVENT, overriding
pkg-config])dnl
Index: patches/patch-third-party_Makefile_in
===================================================================
RCS file: patches/patch-third-party_Makefile_in
diff -N patches/patch-third-party_Makefile_in
--- patches/patch-third-party_Makefile_in 1 May 2010 13:50:05 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-third-party_Makefile_in,v 1.1 2010/05/01 13:50:05 naddy Exp $
---- third-party/Makefile.in.orig Sat May 1 03:13:20 2010
-+++ third-party/Makefile.in Sat May 1 03:13:31 2010
-@@ -281,7 +281,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- transmissionlocaledir = @transmissionlocaledir@
--SUBDIRS = libnatpmp miniupnp libevent dht
-+SUBDIRS = libnatpmp miniupnp dht
- EXTRA_DIST = \
- macosx-libevent-config.h \
- macosx-libevent-event-config.h
Index: pkg/PLIST-gui
===================================================================
RCS file: /cvs/ports/net/transmission/pkg/PLIST-gui,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST-gui
--- pkg/PLIST-gui 3 May 2010 17:39:33 -0000 1.23
+++ pkg/PLIST-gui 24 Jul 2010 20:32:26 -0000
@@ -79,6 +79,9 @@ share/locale/fo/LC_MESSAGES/transmission
share/locale/fr/LC_MESSAGES/transmission.mo
share/locale/ga/LC_MESSAGES/transmission.mo
share/locale/gl/LC_MESSAGES/transmission.mo
+share/locale/gv/
+share/locale/gv/LC_MESSAGES/
+share/locale/gv/LC_MESSAGES/transmission.mo
share/locale/he/LC_MESSAGES/transmission.mo
share/locale/hi/
share/locale/hi/LC_MESSAGES/
--
Christian "naddy" Weisgerber [email protected]
