Index: Makefile =================================================================== RCS file: /cvs/ports/net/transmission/Makefile,v retrieving revision 1.56 diff -u -r1.56 Makefile --- Makefile 11 Oct 2010 08:16:52 -0000 1.56 +++ Makefile 11 Oct 2010 09:40:45 -0000 @@ -3,16 +3,13 @@ COMMENT-main= lightweight BitTorrent command line and daemon client COMMENT-gui= lightweight BitTorrent client with graphical interface -VER= 1.93 +VER= 2.10 DISTNAME= transmission-${VER} PKGNAME-main= transmission-${VER} PKGNAME-gui= transmission-gui-${VER} CATEGORIES= net HOMEPAGE= http://www.transmissionbt.com/ -REVISION-main= 0 -REVISION-gui= 1 - MAINTAINER= Christian Weisgerber # GPLv2 @@ -29,18 +26,16 @@ 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 \ @@ -49,9 +44,9 @@ --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} @@ -60,15 +55,13 @@ 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 \ - 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 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 gdk_pixbuf-2.0 -LIB_DEPENDS+= 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 + xcb-render xcb-render-util +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 -r1.30 distinfo --- distinfo 3 May 2010 17:39:33 -0000 1.30 +++ distinfo 11 Oct 2010 09:40:45 -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.10.tar.bz2) = OzLZgddGq/iwKSxqsB0Q1A== +RMD160 (transmission-2.10.tar.bz2) = 6NoS4WiK0Yk5oc4c1HfeO3zBayk= +SHA1 (transmission-2.10.tar.bz2) = aSqIT+TCMFaoa5yQAa4vn0nnb8A= +SHA256 (transmission-2.10.tar.bz2) = UQ7yNH4obdzqOpd/2Ssut+MHOlVsmUC04ZoZCwIRqrY= +SIZE (transmission-2.10.tar.bz2) = 4086821 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: patches/patch-third-party_libnatpmp_getgateway_c =================================================================== RCS file: patches/patch-third-party_libnatpmp_getgateway_c diff -N patches/patch-third-party_libnatpmp_getgateway_c --- patches/patch-third-party_libnatpmp_getgateway_c 21 Mar 2010 16:30:28 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-third-party_libnatpmp_getgateway_c,v 1.3 2010/03/21 16:30:28 naddy Exp $ ---- third-party/libnatpmp/getgateway.c.orig Fri Mar 12 03:04:32 2010 -+++ third-party/libnatpmp/getgateway.c Fri Mar 12 23:10:54 2010 -@@ -273,7 +273,7 @@ int getdefaultgateway(in_addr_t *addr) - - do { - l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg)); -- } while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid)); -+ } while (l > 0 && (rtm.rtm_version != RTM_VERSION || rtm.rtm_seq != seq || rtm.rtm_pid != pid)); - - close(s); - Index: pkg/PLIST-gui =================================================================== RCS file: /cvs/ports/net/transmission/pkg/PLIST-gui,v retrieving revision 1.23 diff -u -r1.23 PLIST-gui --- pkg/PLIST-gui 3 May 2010 17:39:33 -0000 1.23 +++ pkg/PLIST-gui 11 Oct 2010 09:40:45 -0000 @@ -79,6 +79,9 @@ 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/ Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/transmission/pkg/PLIST-main,v retrieving revision 1.14 diff -u -r1.14 PLIST-main --- pkg/PLIST-main 21 Mar 2010 16:30:28 -0000 1.14 +++ pkg/PLIST-main 11 Oct 2010 09:40:45 -0000 @@ -1,12 +1,18 @@ @comment $OpenBSD: PLIST-main,v 1.14 2010/03/21 16:30:28 naddy Exp $ @pkgpath net/transmission +@bin bin/transmission-cli +@bin bin/transmission-create @bin bin/transmission-daemon +@bin bin/transmission-edit @bin bin/transmission-remote -@bin bin/transmissioncli +@bin bin/transmission-show +@man man/man1/transmission-cli.1 +@man man/man1/transmission-create.1 @man man/man1/transmission-daemon.1 +@man man/man1/transmission-edit.1 @man man/man1/transmission-remote.1 -@man man/man1/transmissioncli.1 @comment share/applications/ +@man man/man1/transmission-show.1 share/transmission/ share/transmission/web/ share/transmission/web/LICENSE @@ -18,6 +24,7 @@ share/transmission/web/images/buttons/info_activity.png share/transmission/web/images/buttons/info_files.png share/transmission/web/images/buttons/info_general.png +share/transmission/web/images/buttons/info_peers.png share/transmission/web/images/buttons/info_trackers.png share/transmission/web/images/buttons/tab_backgrounds.png share/transmission/web/images/buttons/toolbar_buttons.png @@ -29,8 +36,10 @@ 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 @@ -38,8 +47,10 @@ share/transmission/web/javascript/ share/transmission/web/javascript/common.js share/transmission/web/javascript/dialog.js +share/transmission/web/javascript/formatter.js share/transmission/web/javascript/jquery/ share/transmission/web/javascript/jquery/jquery.contextmenu.min.js +share/transmission/web/javascript/jquery/jquery.form-2.21.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