Christian Weisgerber <na...@mips.inka.de> wrote: > Since certain people are always clamoring for the very latest > Transmission, here's 2.00 Beta 1 for you guys to play with. Beta 2 > I took the GTK client for a spin, but on my slow Blade 100 it eats > all the CPU it can get. Maybe it doesn't on a faster box, maybe > something is broken. I didn't try the daemon. > > The version.h patch is there because many private trackers forbid beta > versions. So we lie. (What did they expect?)
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 7 Jun 2010 18:45:52 -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.00b2 DISTNAME= transmission-${VER} PKGNAME-main= transmission-${VER} PKGNAME-gui= transmission-gui-${VER} @@ -35,9 +35,7 @@ LIB_DEPENDS= curl.>=14::net/curl \ 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} 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 7 Jun 2010 18:45:52 -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.00b2.tar.bz2) = 2x3ZYNkr3GLWHe3rHT44cw== +RMD160 (transmission-2.00b2.tar.bz2) = mct0lq+G6rcZWGZgfaCaDtQZc3I= +SHA1 (transmission-2.00b2.tar.bz2) = hUoz/E2YF+1peTI3CoybKJk99F8= +SHA256 (transmission-2.00b2.tar.bz2) = GfdqBafuxuOgDJM3jMSPUGP8QblpgWzkBfVnIPPERsA= +SIZE (transmission-2.00b2.tar.bz2) = 3761555 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 7 Jun 2010 18:45:52 -0000 @@ -0,0 +1,41 @@ +$OpenBSD$ +--- configure.orig Mon Jun 7 18:48:58 2010 ++++ configure Mon Jun 7 18:50:23 2010 +@@ -10863,15 +10863,15 @@ CC="$lt_save_CC" + if test X = "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 + 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-libtransmission_version_h =================================================================== RCS file: patches/patch-libtransmission_version_h diff -N patches/patch-libtransmission_version_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libtransmission_version_h 7 Jun 2010 18:45:52 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ +--- libtransmission/version.h.orig Mon Jun 7 18:41:27 2010 ++++ libtransmission/version.h Mon Jun 7 18:42:48 2010 +@@ -1,8 +1,8 @@ +-#define PEERID_PREFIX "-TR193X-" +-#define USERAGENT_PREFIX "2.00b2" +-#define SVN_REVISION "10722" +-#define SVN_REVISION_NUM 10722 +-#define SHORT_VERSION_STRING "2.00b2" +-#define LONG_VERSION_STRING "2.00b2 (10722)" +-#define VERSION_STRING_INFOPLIST 2.00b2 +-#define TR_BETA_RELEASE 1 ++#define PEERID_PREFIX "-TR1930-" ++#define USERAGENT_PREFIX "1.93" ++#define SVN_REVISION "10621" ++#define SVN_REVISION_NUM 10621 ++#define SHORT_VERSION_STRING "1.93" ++#define LONG_VERSION_STRING "1.93 (10621)" ++#define VERSION_STRING_INFOPLIST 1.93 ++#define TR_STABLE_RELEASE 1 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 7 Jun 2010 18:45:52 -0000 @@ -22,9 +22,6 @@ share/icons/hicolor/48x48/apps/transmiss share/icons/hicolor/scalable/ share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/transmission.svg -share/locale/an/ -share/locale/an/LC_MESSAGES/ -share/locale/an/LC_MESSAGES/transmission.mo share/locale/ar/ share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/transmission.mo @@ -123,9 +120,6 @@ share/locale/mt/LC_MESSAGES/transmission share/locale/nb/LC_MESSAGES/transmission.mo share/locale/nl/LC_MESSAGES/transmission.mo share/locale/nn/LC_MESSAGES/transmission.mo -share/locale/oc/ -share/locale/oc/LC_MESSAGES/ -share/locale/oc/LC_MESSAGES/transmission.mo share/locale/pl/LC_MESSAGES/transmission.mo share/locale/pt/LC_MESSAGES/transmission.mo share/locale/pt_BR/LC_MESSAGES/transmission.mo @@ -145,9 +139,6 @@ share/locale/th/ share/locale/th/LC_MESSAGES/ share/locale/th/LC_MESSAGES/transmission.mo share/locale/tr/LC_MESSAGES/transmission.mo -share/locale/ug/ -share/locale/ug/LC_MESSAGES/ -share/locale/ug/LC_MESSAGES/transmission.mo share/locale/uk/LC_MESSAGES/transmission.mo share/locale/vi/LC_MESSAGES/transmission.mo share/locale/zh_CN/LC_MESSAGES/transmission.mo -- Christian "naddy" Weisgerber na...@mips.inka.de