Update net/transmission to 1.40. Lots of changes from 1.22. Highlights: * There's a spiffy new web interface for the GTK and daemon clients. * transmission-daemon and -remote have been completely rewritten.
Changes over 1.3x are incremental, but the showstopper bugs that kept me from updating the port to 1.3x are gone. Index: Makefile =================================================================== RCS file: /cvs/ports/net/transmission/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- Makefile 9 Jul 2008 19:43:42 -0000 1.27 +++ Makefile 28 Nov 2008 15:58:08 -0000 @@ -3,7 +3,7 @@ COMMENT-main= lightweight BitTorrent command line and daemon client COMMENT-gui= lightweight BitTorrent client with graphical interface -VER= 1.22 +VER= 1.40 DISTNAME= transmission-${VER} PKGNAME-main= transmission-${VER} PKGNAME-gui= transmission-gui-${VER} @@ -12,7 +12,7 @@ HOMEPAGE= http://www.transmissionbt.com/ MAINTAINER= Christian Weisgerber <[EMAIL PROTECTED]> -# GPLv3 +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -30,6 +30,8 @@ WANTLIB= c crypto idn m pthread ssl z WANTLIB-main= ${WANTLIB} MODULES= devel/gettext +LIB_DEPENDS= curl.>=12::net/curl +BUILD_DEPENDS= ::textproc/intltool USE_GMAKE= Yes USE_LIBTOOL= Yes @@ -51,14 +53,12 @@ WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposi dbus-glib-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 \ pangocairo-1.0 pixman-1 png pcre -LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ - notify.>=2::devel/libnotify \ - curl.>=9::net/curl +LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \ + notify.>=2::devel/libnotify LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \ - curl.>=9::net/curl -RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS} + curl.>=12::net/curl RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main \ - ::devel/desktop-file-utils ${RUN_DEPENDS} + ::devel/desktop-file-utils USE_X11= Yes .endif Index: distinfo =================================================================== RCS file: /cvs/ports/net/transmission/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- distinfo 9 Jul 2008 19:43:42 -0000 1.15 +++ distinfo 28 Nov 2008 15:58:08 -0000 @@ -1,5 +1,5 @@ -MD5 (transmission-1.22.tar.bz2) = qgotsZsPPb/XWg+zVNbEfQ== -RMD160 (transmission-1.22.tar.bz2) = vfsjmP6xiG7kl9YnpFcxA+crxtw= -SHA1 (transmission-1.22.tar.bz2) = j5QrfhNnrfVe6Vo4qQfy+1K4ypc= -SHA256 (transmission-1.22.tar.bz2) = 1Lo4GxETuhNzLLR+rissuth0ZN7sepCm1Jwpq9HAH5o= -SIZE (transmission-1.22.tar.bz2) = 3987969 +MD5 (transmission-1.40.tar.bz2) = SQ0TwUG6e0qWWCVB6oOkYQ== +RMD160 (transmission-1.40.tar.bz2) = T1voeO0iGowOpkQzD7vVvPWVtaQ= +SHA1 (transmission-1.40.tar.bz2) = RC8JLGpMPbzjl8oNimmaG8U3cE8= +SHA256 (transmission-1.40.tar.bz2) = lEq5z8/JpL1+/uzzLqYJ+mUXlwqXCMRO7m1XUMT/jgw= +SIZE (transmission-1.40.tar.bz2) = 4604462 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-configure,v retrieving revision 1.9 diff -u -p -r1.9 patch-configure --- patches/patch-configure 9 Jul 2008 19:43:42 -0000 1.9 +++ patches/patch-configure 28 Nov 2008 15:58:08 -0000 @@ -1,14 +1,14 @@ -$OpenBSD: patch-configure,v 1.9 2008/07/09 19:43:42 naddy Exp $ ---- configure.orig Fri May 9 21:02:35 2008 -+++ configure Wed May 14 17:31:53 2008 -@@ -20832,10 +20832,6 @@ else +$OpenBSD$ +--- configure.orig Thu Nov 27 21:20:39 2008 ++++ configure Thu Nov 27 21:21:19 2008 +@@ -21453,10 +21453,6 @@ else fi -if test "x$GCC" = "xyes" ; then -- CFLAGS="-g -Wall -W -O3 -funroll-loops" -- CXXFLAGS="-g -Wall -W -O3 -funroll-loops" +- CFLAGS="-g -Wall -Wformat-security -W -Wmissing-prototypes -Wdeclaration-after-statement -O3 -funroll-loops" +- CXXFLAGS="-g -Wall -Wformat-security -W -O3 -funroll-loops" -fi - { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 - echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } - if test "${ac_cv_header_stdc+set}" = set; then + + { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 + $as_echo_n "checking for ANSI C header files... " >&6; } Index: patches/patch-daemon_remote_c =================================================================== RCS file: patches/patch-daemon_remote_c diff -N patches/patch-daemon_remote_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-daemon_remote_c 28 Nov 2008 15:58:08 -0000 @@ -0,0 +1,47 @@ +$OpenBSD$ +--- daemon/remote.c.orig Mon Nov 10 16:52:35 2008 ++++ daemon/remote.c Thu Nov 27 22:33:20 2008 +@@ -572,11 +572,11 @@ strlratio( char * buf, + { + const double ratio = numerator / denominator; + if( ratio < 10.0 ) +- tr_snprintf( buf, buflen, "%'.2f", ratio ); ++ tr_snprintf( buf, buflen, "%.2f", ratio ); + else if( ratio < 100.0 ) +- tr_snprintf( buf, buflen, "%'.1f", ratio ); ++ tr_snprintf( buf, buflen, "%.1f", ratio ); + else +- tr_snprintf( buf, buflen, "%'.0f", ratio ); ++ tr_snprintf( buf, buflen, "%.0f", ratio ); + } + else if( numerator ) + tr_strlcpy( buf, "Infinity", buflen ); +@@ -593,24 +593,24 @@ strlsize( char * buf, + if( !size ) + tr_strlcpy( buf, "None", buflen ); + else if( size < (int64_t)KILOBYTE_FACTOR ) +- tr_snprintf( buf, buflen, "%'" PRId64 " bytes", (int64_t)size ); ++ tr_snprintf( buf, buflen, "%" PRId64 " bytes", (int64_t)size ); + else + { + double displayed_size; + if( size < (int64_t)MEGABYTE_FACTOR ) + { + displayed_size = (double) size / KILOBYTE_FACTOR; +- tr_snprintf( buf, buflen, "%'.1f KB", displayed_size ); ++ tr_snprintf( buf, buflen, "%.1f KB", displayed_size ); + } + else if( size < (int64_t)GIGABYTE_FACTOR ) + { + displayed_size = (double) size / MEGABYTE_FACTOR; +- tr_snprintf( buf, buflen, "%'.1f MB", displayed_size ); ++ tr_snprintf( buf, buflen, "%.1f MB", displayed_size ); + } + else + { + displayed_size = (double) size / GIGABYTE_FACTOR; +- tr_snprintf( buf, buflen, "%'.1f GB", displayed_size ); ++ tr_snprintf( buf, buflen, "%.1f GB", displayed_size ); + } + } + return buf; Index: patches/patch-gtk_blocklist_c =================================================================== RCS file: patches/patch-gtk_blocklist_c diff -N patches/patch-gtk_blocklist_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gtk_blocklist_c 28 Nov 2008 15:58:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- gtk/blocklist.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/blocklist.c Thu Nov 27 22:33:20 2008 +@@ -145,7 +145,7 @@ blocklistThreadFunc( gpointer gcore ) + if( ok ) + { + emitProgress( core, TRUE, _( +- "Blocklist updated with %'d entries" ), rules ); ++ "Blocklist updated with %d entries" ), rules ); + pref_int_set( BLOCKLIST_DATE, time( NULL ) ); + } + Index: patches/patch-gtk_details_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_details_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_details_c --- patches/patch-gtk_details_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_details_c 28 Nov 2008 15:58:08 -0000 @@ -1,26 +1,21 @@ -$OpenBSD: patch-gtk_details_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/details.c.orig Fri May 9 21:00:55 2008 -+++ gtk/details.c Wed May 14 17:50:12 2008 -@@ -407,7 +407,7 @@ fmtpeercount (GtkWidget * l, int count) - gtk_label_set_text( GTK_LABEL(l), "?" ); - } else { - char str[16]; -- g_snprintf( str, sizeof str, "%'d", count ); -+ g_snprintf( str, sizeof str, "%d", count ); - gtk_label_set_text( GTK_LABEL(l), str ); - } +$OpenBSD$ +--- gtk/details.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/details.c Thu Nov 27 22:33:20 2008 +@@ -500,7 +500,7 @@ fmtpeercount( GtkWidget * l, + else + { + char str[16]; +- g_snprintf( str, sizeof str, "%'d", count ); ++ g_snprintf( str, sizeof str, "%d", count ); + gtk_label_set_text( GTK_LABEL( l ), str ); + } } -@@ -733,10 +733,10 @@ info_page_new (tr_torrent * tor) +@@ -907,7 +907,7 @@ info_page_new( tr_torrent * tor ) + hig_workarea_add_section_title ( t, &row, _( "Details" ) ); - tr_strlsize( sizeStr, info->pieceSize, sizeof(sizeStr) ); + g_snprintf( countStr, sizeof( countStr ), +- ngettext( "%'d Piece", "%'d Pieces", info->pieceCount ), ++ ngettext( "%d Piece", "%d Pieces", info->pieceCount ), + info->pieceCount ); + tr_strlsize( sizeStr, info->pieceSize, sizeof( sizeStr ) ); g_snprintf( buf, sizeof( buf ), -- /* %1$'d is number of pieces -+ /* %1$d is number of pieces - %2$s is how big each piece is */ -- ngettext( "%1$'d Piece @ %2$s", -- "%1$'d Pieces @ %2$s", -+ ngettext( "%1$d Piece @ %2$s", -+ "%1$d Pieces @ %2$s", - info->pieceCount ), - info->pieceCount, sizeStr ); - l = gtk_label_new (buf); Index: patches/patch-gtk_makemeta-ui_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_makemeta-ui_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_makemeta-ui_c --- patches/patch-gtk_makemeta-ui_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_makemeta-ui_c 28 Nov 2008 15:58:08 -0000 @@ -1,27 +1,25 @@ -$OpenBSD: patch-gtk_makemeta-ui_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/makemeta-ui.c.orig Fri May 9 21:00:55 2008 -+++ gtk/makemeta-ui.c Wed May 14 17:50:12 2008 -@@ -212,9 +212,9 @@ refreshFromBuilder( MakeMetaUI * ui ) - tr_strlsize( sizeStr, builder->totalSize, sizeof(sizeStr) ); - g_snprintf( buf, sizeof( buf ), - /* %1$s is the torrent size -- %2$'d is its number of files */ -- ngettext( "<i>%1$s; %2$'d File</i>", -- "<i>%1$s; %2$'d Files</i>", builder->fileCount ), -+ %2$d is its number of files */ -+ ngettext( "<i>%1$s; %2$d File</i>", -+ "<i>%1$s; %2$d Files</i>", builder->fileCount ), - sizeStr, builder->fileCount ); - } - gtk_label_set_markup ( GTK_LABEL(ui->size_lb), buf ); -@@ -226,8 +226,8 @@ refreshFromBuilder( MakeMetaUI * ui ) - g_snprintf( buf, sizeof( buf ), - /* %1$'s is number of pieces; - %2$s is how big each piece is */ -- ngettext( "<i>%1$'d Piece @ %2$s</i>", -- "<i>%1$'d Pieces @ %2$s</i>", -+ ngettext( "<i>%1$d Piece @ %2$s</i>", -+ "<i>%1$d Pieces @ %2$s</i>", - builder->pieceCount ), - builder->pieceCount, sizeStr ); +$OpenBSD$ +--- gtk/makemeta-ui.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/makemeta-ui.c Thu Nov 27 22:33:20 2008 +@@ -268,9 +268,9 @@ refreshFromBuilder( MakeMetaUI * ui ) + else { + tr_strlsize( sizeStr, builder->totalSize, sizeof( sizeStr ) ); + buf = g_strdup_printf( /* %1$s is the torrent size +- %2$'d is its number of files */ +- ngettext( "<i>%1$s; %2$'d File</i>", +- "<i>%1$s; %2$'d Files</i>", ++ %2$d is its number of files */ ++ ngettext( "<i>%1$s; %2$d File</i>", ++ "<i>%1$s; %2$d Files</i>", + builder->fileCount ), + sizeStr, builder->fileCount ); } +@@ -281,7 +281,7 @@ refreshFromBuilder( MakeMetaUI * ui ) + if( !filename ) + buf = g_strdup( "" ); + else { +- char * countStr = g_strdup_printf( ngettext( "%'d Piece", "%'d Pieces", ++ char * countStr = g_strdup_printf( ngettext( "%d Piece", "%d Pieces", + builder->pieceCount ), + builder->pieceCount ); + tr_strlsize( sizeStr, builder->pieceSize, sizeof( sizeStr ) ); Index: patches/patch-gtk_stats_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_stats_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_stats_c --- patches/patch-gtk_stats_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_stats_c 28 Nov 2008 15:58:08 -0000 @@ -1,21 +1,21 @@ -$OpenBSD: patch-gtk_stats_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/stats.c.orig Sat Jun 14 00:00:43 2008 -+++ gtk/stats.c Thu Jun 19 15:38:51 2008 -@@ -65,7 +65,7 @@ updateStats( gpointer gdata ) - setLabel( ui->one_time_lb, tr_strltime( buf, one.secondsActive, sizeof(buf) ) ); +$OpenBSD$ +--- gtk/stats.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/stats.c Thu Nov 27 22:33:20 2008 +@@ -72,7 +72,7 @@ updateStats( gpointer gdata ) + tr_strltime( buf, one.secondsActive, sizeof( buf ) ) ); setLabelFromRatio( ui->one_ratio_lb, one.ratio ); -- fmt = ngettext( "Started %'d time", "Started %'d times", (int)all.sessionCount ); -+ fmt = ngettext( "Started %d time", "Started %d times", (int)all.sessionCount ); - g_snprintf( buf, sizeof(buf), fmt, (int)all.sessionCount ); +- fmt = ngettext( "Started %'d time", "Started %'d times", ++ fmt = ngettext( "Started %d time", "Started %d times", + (int)all.sessionCount ); + g_snprintf( buf, sizeof( buf ), fmt, (int)all.sessionCount ); setLabel( ui->all_sessions_lb, buf ); - setLabel( ui->all_up_lb, tr_strlsize( buf, all.uploadedBytes, sizeof(buf) ) ); -@@ -131,7 +131,7 @@ stats_dialog_create( GtkWindow * parent, TrCore * core - hig_workarea_add_row( t, &row, _("Duration:"), l, NULL ); +@@ -153,7 +153,7 @@ stats_dialog_create( GtkWindow * parent, + hig_workarea_add_row( t, &row, _( "Duration:" ), l, NULL ); hig_workarea_add_section_divider( t, &row ); - hig_workarea_add_section_title( t, &row, _("Total") ); -- l = ui->all_sessions_lb = gtk_label_new( _("Started %'d time") ); -+ l = ui->all_sessions_lb = gtk_label_new( _("Started %d time") ); - hig_workarea_add_label_w( t, row++, l ); - l = ui->all_up_lb = gtk_label_new( NULL ); - hig_workarea_add_row( t, &row, _("Uploaded:"), l, NULL ); + hig_workarea_add_section_title( t, &row, _( "Total" ) ); +- l = ui->all_sessions_lb = gtk_label_new( _( "Started %'d time" ) ); ++ l = ui->all_sessions_lb = gtk_label_new( _( "Started %d time" ) ); + hig_workarea_add_label_w( t, row++, l ); + l = ui->all_up_lb = gtk_label_new( NULL ); + hig_workarea_add_row( t, &row, _( "Uploaded:" ), l, NULL ); Index: patches/patch-gtk_torrent-cell-renderer_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_torrent-cell-renderer_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_torrent-cell-renderer_c --- patches/patch-gtk_torrent-cell-renderer_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_torrent-cell-renderer_c 28 Nov 2008 15:58:08 -0000 @@ -1,25 +1,25 @@ -$OpenBSD: patch-gtk_torrent-cell-renderer_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/torrent-cell-renderer.c.orig Fri May 9 21:00:55 2008 -+++ gtk/torrent-cell-renderer.c Wed May 14 17:50:12 2008 -@@ -196,8 +196,8 @@ getStatusString( const tr_stat * torStat ) +$OpenBSD$ +--- gtk/torrent-cell-renderer.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/torrent-cell-renderer.c Thu Nov 27 22:33:20 2008 +@@ -202,8 +202,8 @@ getStatusString( const tr_stat * torStat ) - case TR_STATUS_DOWNLOAD: - g_string_append_printf( gstr, -- ngettext( "Downloading from %1$'d of %2$'d connected peer", -- "Downloading from %1$'d of %2$'d connected peers", -+ ngettext( "Downloading from %1$d of %2$d connected peer", -+ "Downloading from %1$d of %2$d connected peers", - torStat->peersConnected ), - torStat->peersSendingToUs, - torStat->peersConnected ); -@@ -205,8 +205,8 @@ getStatusString( const tr_stat * torStat ) + case TR_STATUS_DOWNLOAD: + g_string_append_printf( gstr, +- ngettext( "Downloading from %1$'d of %2$'d connected peer", +- "Downloading from %1$'d of %2$'d connected peers", ++ ngettext( "Downloading from %1$d of %2$d connected peer", ++ "Downloading from %1$d of %2$d connected peers", + torStat->peersConnected ), + torStat->peersSendingToUs + + torStat->webseedsSendingToUs, +@@ -213,8 +213,8 @@ getStatusString( const tr_stat * torStat ) - case TR_STATUS_SEED: - g_string_append_printf( gstr, -- ngettext( "Seeding to %1$'d of %2$'d connected peer", -- "Seeding to %1$'d of %2$'d connected peers", -+ ngettext( "Seeding to %1$d of %2$d connected peer", -+ "Seeding to %1$d of %2$d connected peers", - torStat->peersConnected ), - torStat->peersGettingFromUs, - torStat->peersConnected ); + case TR_STATUS_SEED: + g_string_append_printf( gstr, +- ngettext( "Seeding to %1$'d of %2$'d connected peer", +- "Seeding to %1$'d of %2$'d connected peers", ++ ngettext( "Seeding to %1$d of %2$d connected peer", ++ "Seeding to %1$d of %2$d connected peers", + torStat->peersConnected ), + torStat->peersGettingFromUs, + torStat->peersConnected ); Index: patches/patch-gtk_tr-icon_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_tr-icon_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_tr-icon_c --- patches/patch-gtk_tr-icon_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_tr-icon_c 28 Nov 2008 15:58:08 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-gtk_tr-icon_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/tr-icon.c.orig Fri May 9 21:00:55 2008 -+++ gtk/tr-icon.c Wed May 14 17:50:12 2008 -@@ -67,11 +67,11 @@ refresh_tooltip_cb( gpointer data ) +$OpenBSD$ +--- gtk/tr-icon.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/tr-icon.c Thu Nov 27 22:33:20 2008 +@@ -62,11 +62,11 @@ refresh_tooltip_cb( gpointer data ) tr_strlspeed( downStr, stats.clientDownloadSpeed, sizeof( downStr ) ); tr_strlspeed( upStr, stats.clientUploadSpeed, sizeof( upStr ) ); g_snprintf( tip, sizeof( tip ), @@ -11,8 +11,8 @@ $OpenBSD: patch-gtk_tr-icon_c,v 1.2 2008 + %2$d is the number of torrents we're downloading, %3$s is our download speed, %4$s is our upload speed */ -- _( "%1$'d Seeding, %2$'d Downloading\nDown: %3$s, Up: %4$s" ), -+ _( "%1$d Seeding, %2$d Downloading\nDown: %3$s, Up: %4$s" ), +- _( "%1$'d Seeding, %2$'d Downloading\nDown: %3$s, Up: %4$s" ), ++ _( "%1$d Seeding, %2$d Downloading\nDown: %3$s, Up: %4$s" ), stats.seedingCount, stats.downloadCount, downStr, upStr ); Index: patches/patch-gtk_tr-prefs_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_tr-prefs_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-gtk_tr-prefs_c --- patches/patch-gtk_tr-prefs_c 9 Jul 2008 19:43:42 -0000 1.1 +++ patches/patch-gtk_tr-prefs_c 28 Nov 2008 15:58:08 -0000 @@ -1,23 +1,14 @@ -$OpenBSD: patch-gtk_tr-prefs_c,v 1.1 2008/07/09 19:43:42 naddy Exp $ ---- gtk/tr-prefs.c.orig Sat Jun 14 00:00:43 2008 -+++ gtk/tr-prefs.c Thu Jun 19 15:38:51 2008 -@@ -298,8 +298,8 @@ updateBlocklistText( GtkWidget * w, TrCore * core ) - const int n = tr_blocklistGetRuleCount( tr_core_handle( core ) ); - char buf[512]; +$OpenBSD$ +--- gtk/tr-prefs.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/tr-prefs.c Thu Nov 27 22:33:20 2008 +@@ -431,8 +431,8 @@ updateBlocklistText( GtkWidget * w, + char buf[512]; + g_snprintf( buf, sizeof( buf ), -- ngettext( "Ignore the %'d _blocklisted peer", -- "Ignore the %'d _blocklisted peers", n ), n ); -+ ngettext( "Ignore the %d _blocklisted peer", -+ "Ignore the %d _blocklisted peers", n ), n ); +- ngettext( "Enable _blocklist (contains %'d rule)", +- "Enable _blocklist (contains %'d rules)", n ), n ); ++ ngettext( "Enable _blocklist (contains %d rule)", ++ "Enable _blocklist (contains %d rules)", n ), n ); gtk_button_set_label( GTK_BUTTON( w ), buf ); } - static gboolean -@@ -390,7 +390,7 @@ got_blocklist( tr_handle * handle UNUSED, - if( ok && !data->abortFlag ) - { - g_snprintf( data->secondary, sizeof( data->secondary ), -- _( "Blocklist updated with %'d entries" ), rules ); -+ _( "Blocklist updated with %d entries" ), rules ); - g_idle_add( blocklistDialogSetSecondary, data ); - g_idle_add( blocklistDialogAllowClose, data->dialog ); - g_idle_add( updateBlocklistTextFromData, data ); + Index: patches/patch-gtk_tr-torrent_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_tr-torrent_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_tr-torrent_c --- patches/patch-gtk_tr-torrent_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_tr-torrent_c 28 Nov 2008 15:58:08 -0000 @@ -1,14 +1,14 @@ -$OpenBSD: patch-gtk_tr-torrent_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/tr-torrent.c.orig Fri May 9 21:00:55 2008 -+++ gtk/tr-torrent.c Wed May 14 17:50:12 2008 -@@ -299,8 +299,8 @@ tr_torrent_status_str ( TrTorrent * gtor ) +$OpenBSD$ +--- gtk/tr-torrent.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/tr-torrent.c Thu Nov 27 22:33:20 2008 +@@ -289,8 +289,8 @@ tr_torrent_status_str( TrTorrent * gtor ) case TR_STATUS_SEED: top = g_strdup_printf( - ngettext( "Seeding to %1$'d of %2$'d connected peer", -- "Seeding to %1$'d of %2$'d connected peers", tpeers ), +- "Seeding to %1$'d of %2$'d connected peers", + ngettext( "Seeding to %1$d of %2$d connected peer", -+ "Seeding to %1$d of %2$d connected peers", tpeers ), - upeers, tpeers ); ++ "Seeding to %1$d of %2$d connected peers", + tpeers ), + upeers, tpeers ); break; - Index: patches/patch-gtk_tr-window_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_tr-window_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_tr-window_c --- patches/patch-gtk_tr-window_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_tr-window_c 28 Nov 2008 15:58:08 -0000 @@ -1,21 +1,21 @@ -$OpenBSD: patch-gtk_tr-window_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/tr-window.c.orig Fri May 9 21:00:55 2008 -+++ gtk/tr-window.c Wed May 14 17:50:12 2008 -@@ -590,13 +590,13 @@ updateTorrentCount( PrivateData * p ) - const int visibleCount = gtk_tree_model_iter_n_children( p->filter_model, NULL ); +$OpenBSD$ +--- gtk/tr-window.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/tr-window.c Thu Nov 27 22:33:20 2008 +@@ -706,13 +706,13 @@ updateTorrentCount( PrivateData * p ) if( torrentCount != visibleCount ) -- g_snprintf( buf, sizeof( buf ), ngettext( "%1$'d of %2$'d Torrent", -- "%1$'d of %2$'d Torrents", -+ g_snprintf( buf, sizeof( buf ), ngettext( "%1$d of %2$d Torrent", -+ "%1$d of %2$d Torrents", - torrentCount ), - visibleCount, torrentCount ); + g_snprintf( buf, sizeof( buf ), +- ngettext( "%1$'d of %2$'d Torrent", +- "%1$'d of %2$'d Torrents", ++ ngettext( "%1$d of %2$d Torrent", ++ "%1$d of %2$d Torrents", + torrentCount ), + visibleCount, torrentCount ); else - g_snprintf( buf, sizeof( buf ), ngettext( "%'d Torrent", - "%'d Torrents", + g_snprintf( buf, sizeof( buf ), ngettext( "%d Torrent", + "%d Torrents", torrentCount ), - torrentCount ); + torrentCount ); gtk_label_set_text( GTK_LABEL( p->gutter_lb ), buf ); Index: patches/patch-gtk_util_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-gtk_util_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-gtk_util_c --- patches/patch-gtk_util_c 9 Jul 2008 19:43:42 -0000 1.2 +++ patches/patch-gtk_util_c 28 Nov 2008 15:58:08 -0000 @@ -1,7 +1,7 @@ -$OpenBSD: patch-gtk_util_c,v 1.2 2008/07/09 19:43:42 naddy Exp $ ---- gtk/util.c.orig Fri May 9 21:00:55 2008 -+++ gtk/util.c Wed May 14 17:50:12 2008 -@@ -63,11 +63,11 @@ tr_strlratio( char * buf, double ratio, size_t buflen +$OpenBSD$ +--- gtk/util.c.orig Mon Nov 10 16:52:26 2008 ++++ gtk/util.c Thu Nov 27 22:42:28 2008 +@@ -57,11 +57,11 @@ tr_strlratio( char * buf, else if( (int)ratio == TR_RATIO_INF ) g_strlcpy( buf, "\xE2\x88\x9E", buflen ); else if( ratio < 10.0 ) @@ -16,86 +16,70 @@ $OpenBSD: patch-gtk_util_c,v 1.2 2008/07 return buf; } -@@ -88,18 +88,18 @@ tr_strlsize( char * buf, guint64 size, size_t buflen ) - } +@@ -86,7 +86,7 @@ tr_strlsize( char * buf, #else else if( size < (guint64)KILOBYTE_FACTOR ) -- g_snprintf( buf, buflen, ngettext("%'u byte", "%'u bytes", (guint)size), (guint)size ); -+ g_snprintf( buf, buflen, ngettext("%u byte", "%u bytes", (guint)size), (guint)size ); - else { - gdouble displayed_size; - if (size < (guint64)MEGABYTE_FACTOR) { + g_snprintf( buf, buflen, +- ngettext( "%'u byte", "%'u bytes", ++ ngettext( "%u byte", "%u bytes", + (guint)size ), (guint)size ); + else + { +@@ -94,17 +94,17 @@ tr_strlsize( char * buf, + if( size < (guint64)MEGABYTE_FACTOR ) + { displayed_size = (gdouble) size / KILOBYTE_FACTOR; -- g_snprintf( buf, buflen, _("%'.1f KB"), displayed_size ); -+ g_snprintf( buf, buflen, _("%.1f KB"), displayed_size ); - } else if (size < (guint64)GIGABYTE_FACTOR) { +- g_snprintf( buf, buflen, _( "%'.1f KB" ), displayed_size ); ++ g_snprintf( buf, buflen, _( "%.1f KB" ), displayed_size ); + } + else if( size < (guint64)GIGABYTE_FACTOR ) + { displayed_size = (gdouble) size / MEGABYTE_FACTOR; -- g_snprintf( buf, buflen, _("%'.1f MB"), displayed_size ); -+ g_snprintf( buf, buflen, _("%.1f MB"), displayed_size ); - } else { +- g_snprintf( buf, buflen, _( "%'.1f MB" ), displayed_size ); ++ g_snprintf( buf, buflen, _( "%.1f MB" ), displayed_size ); + } + else + { displayed_size = (gdouble) size / GIGABYTE_FACTOR; -- g_snprintf( buf, buflen, _("%'.1f GB"), displayed_size ); -+ g_snprintf( buf, buflen, _("%.1f GB"), displayed_size ); +- g_snprintf( buf, buflen, _( "%'.1f GB" ), displayed_size ); ++ g_snprintf( buf, buflen, _( "%.1f GB" ), displayed_size ); } } #endif -@@ -112,13 +112,13 @@ tr_strlspeed( char * buf, double kb_sec, size_t buflen +@@ -119,13 +119,13 @@ tr_strlspeed( char * buf, const double speed = kb_sec; - if ( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */ + if( speed < 1000.0 ) /* 0.0 KB to 999.9 KB */ - g_snprintf( buf, buflen, _( "%'.1f KB/s" ), speed ); + g_snprintf( buf, buflen, _( "%.1f KB/s" ), speed ); else if( speed < 102400.0 ) /* 0.98 MB to 99.99 MB */ -- g_snprintf( buf, buflen, _( "%'.2f MB/s" ), (speed/1024) ); -+ g_snprintf( buf, buflen, _( "%.2f MB/s" ), (speed/1024) ); +- g_snprintf( buf, buflen, _( "%'.2f MB/s" ), ( speed / 1024 ) ); ++ g_snprintf( buf, buflen, _( "%.2f MB/s" ), ( speed / 1024 ) ); else if( speed < 1024000.0 ) /* 100.0 MB to 999.9 MB */ -- g_snprintf( buf, buflen, _( "%'.1f MB/s" ), (speed/1024) ); -+ g_snprintf( buf, buflen, _( "%.1f MB/s" ), (speed/1024) ); +- g_snprintf( buf, buflen, _( "%'.1f MB/s" ), ( speed / 1024 ) ); ++ g_snprintf( buf, buflen, _( "%.1f MB/s" ), ( speed / 1024 ) ); else /* insane speeds */ -- g_snprintf( buf, buflen, _( "%'.2f GB/s" ), (speed/1048576) ); -+ g_snprintf( buf, buflen, _( "%.2f GB/s" ), (speed/1048576) ); +- g_snprintf( buf, buflen, _( "%'.2f GB/s" ), ( speed / 1048576 ) ); ++ g_snprintf( buf, buflen, _( "%.2f GB/s" ), ( speed / 1048576 ) ); return buf; } -@@ -134,14 +134,14 @@ tr_strltime( char * buf, int seconds, size_t buflen ) - - if( seconds < 60 ) - { -- g_snprintf( buf, buflen, ngettext( "%'d second", "%'d seconds", (int)seconds ), (int) seconds ); -+ g_snprintf( buf, buflen, ngettext( "%d second", "%d seconds", (int)seconds ), (int) seconds ); - return buf; - } - - if( seconds < ( 60 * 60 ) ) - { - const int minutes = ( seconds + 30 ) / 60; -- g_snprintf( buf, buflen, ngettext( "%'d minute", "%'d minutes", minutes ), minutes ); -+ g_snprintf( buf, buflen, ngettext( "%d minute", "%d minutes", minutes ), minutes ); - return buf; - } - -@@ -154,20 +154,20 @@ tr_strltime( char * buf, int seconds, size_t buflen ) - - const int minutes = ( seconds - hours * 60 * 60 + 30 ) / 60; - -- g_snprintf( h, sizeof(h), ngettext( "%'d hour", "%'d hours", hours ), hours ); -- g_snprintf( m, sizeof(m), ngettext( "%'d minute", "%'d minutes", minutes ), minutes ); -+ g_snprintf( h, sizeof(h), ngettext( "%d hour", "%d hours", hours ), hours ); -+ g_snprintf( m, sizeof(m), ngettext( "%d minute", "%d minutes", minutes ), minutes ); - g_snprintf( buf, buflen, "%s, %s", h, m ); - return buf; - } +@@ -146,14 +146,14 @@ tr_strltime( char * buf, + minutes = ( seconds % 3600 ) / 60; + seconds = ( seconds % 3600 ) % 60; + +- g_snprintf( d, sizeof( d ), ngettext( "%'d day", "%'d days", ++ g_snprintf( d, sizeof( d ), ngettext( "%d day", "%d days", + days ), days ); +- g_snprintf( h, sizeof( h ), ngettext( "%'d hour", "%'d hours", ++ g_snprintf( h, sizeof( h ), ngettext( "%d hour", "%d hours", + hours ), hours ); + g_snprintf( m, sizeof( m ), +- ngettext( "%'d minute", "%'d minutes", minutes ), minutes ); ++ ngettext( "%d minute", "%d minutes", minutes ), minutes ); + g_snprintf( s, sizeof( s ), +- ngettext( "%'d second", "%'d seconds", seconds ), seconds ); ++ ngettext( "%d second", "%d seconds", seconds ), seconds ); - if( hours < 24 ) + if( days ) { -- g_snprintf( buf, buflen, ngettext( "%'d hour", "%'d hours", hours ), hours ); -+ g_snprintf( buf, buflen, ngettext( "%d hour", "%d hours", hours ), hours ); - return buf; - } - - days = seconds / ( 60 * 60 * 24 ); -- g_snprintf( buf, buflen, ngettext( "%'d day", "%'d days", days ), days ); -+ g_snprintf( buf, buflen, ngettext( "%d day", "%d days", days ), days ); - return buf; - } - Index: patches/patch-gtk_util_h =================================================================== RCS file: patches/patch-gtk_util_h diff -N patches/patch-gtk_util_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gtk_util_h 28 Nov 2008 15:58:08 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- gtk/util.h.orig Thu Nov 27 22:13:20 2008 ++++ gtk/util.h Thu Nov 27 22:13:46 2008 +@@ -41,7 +41,7 @@ typedef void ( *callbackfunc_t )( void* ); + + /* return a human-readable string for the size given in bytes. */ + char* tr_strlsize( char * buf, +- uint64_t size, ++ guint64 size, + size_t buflen ); + + /* return a human-readable string for the transfer rate given in bytes. */ Index: patches/patch-libtransmission_blocklist_c =================================================================== RCS file: patches/patch-libtransmission_blocklist_c diff -N patches/patch-libtransmission_blocklist_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-libtransmission_blocklist_c 28 Nov 2008 15:58:08 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- libtransmission/blocklist.c.orig Mon Nov 10 16:52:25 2008 ++++ libtransmission/blocklist.c Thu Nov 27 22:33:18 2008 +@@ -105,7 +105,7 @@ blocklistLoad( tr_blocklist * b ) + + { + char * base = tr_basename( b->filename ); +- tr_inf( _( "Blocklist \"%s\" contains %'zu entries" ), base, b->ruleCount ); ++ tr_inf( _( "Blocklist \"%s\" contains %zu entries" ), base, b->ruleCount ); + tr_free( base ); + } + } +@@ -293,7 +293,7 @@ _tr_blocklistSetContent( tr_blocklist * b, + + { + char * base = tr_basename( b->filename ); +- tr_inf( _( "Blocklist \"%1$s\" updated with %2$'d entries" ), base, lineCount ); ++ tr_inf( _( "Blocklist \"%1$s\" updated with %2$d entries" ), base, lineCount ); + tr_free( base ); + } + Index: patches/patch-third-party_libevent_test_bench_c =================================================================== RCS file: /cvs/ports/net/transmission/patches/patch-third-party_libevent_test_bench_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-third-party_libevent_test_bench_c --- patches/patch-third-party_libevent_test_bench_c 9 Jul 2008 19:43:42 -0000 1.1 +++ patches/patch-third-party_libevent_test_bench_c 28 Nov 2008 15:58:08 -0000 @@ -1,6 +1,6 @@ -$OpenBSD: patch-third-party_libevent_test_bench_c,v 1.1 2008/07/09 19:43:42 naddy Exp $ ---- third-party/libevent/test/bench.c.orig Wed Jul 9 21:22:08 2008 -+++ third-party/libevent/test/bench.c Wed Jul 9 21:22:27 2008 +$OpenBSD$ +--- third-party/libevent/test/bench.c.orig Mon Nov 10 16:52:42 2008 ++++ third-party/libevent/test/bench.c Thu Nov 27 22:29:11 2008 @@ -68,7 +68,7 @@ static struct event *events; static void read_cb(int fd, short which, void *arg) Index: pkg/PLIST-gui =================================================================== RCS file: /cvs/ports/net/transmission/pkg/PLIST-gui,v retrieving revision 1.11 diff -u -p -r1.11 PLIST-gui --- pkg/PLIST-gui 9 Jul 2008 19:43:42 -0000 1.11 +++ pkg/PLIST-gui 28 Nov 2008 15:58:08 -0000 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-gui,v 1.11 2008/07/09 19:43:42 naddy Exp $ -bin/transmission [EMAIL PROTECTED] bin/transmission @man man/man1/transmission.1 share/applications/transmission.desktop share/icons/ @@ -27,11 +27,26 @@ share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/transmission.mo share/locale/bg/LC_MESSAGES/transmission.mo share/locale/ca/LC_MESSAGES/transmission.mo +share/locale/ckb/ +share/locale/ckb/LC_MESSAGES/ +share/locale/ckb/LC_MESSAGES/transmission.mo share/locale/cs/LC_MESSAGES/transmission.mo share/locale/da/LC_MESSAGES/transmission.mo share/locale/de/LC_MESSAGES/transmission.mo share/locale/el/LC_MESSAGES/transmission.mo +share/locale/en_AU/ +share/locale/en_AU/LC_MESSAGES/ +share/locale/en_AU/LC_MESSAGES/transmission.mo +share/locale/en_CA/ +share/locale/en_CA/LC_MESSAGES/ +share/locale/en_CA/LC_MESSAGES/transmission.mo +share/locale/en_GB/ +share/locale/en_GB/LC_MESSAGES/ +share/locale/en_GB/LC_MESSAGES/transmission.mo +share/locale/eo/LC_MESSAGES/transmission.mo share/locale/es/LC_MESSAGES/transmission.mo +share/locale/et/LC_MESSAGES/transmission.mo +share/locale/eu/LC_MESSAGES/transmission.mo share/locale/fa/ share/locale/fa/LC_MESSAGES/ share/locale/fa/LC_MESSAGES/transmission.mo @@ -41,17 +56,31 @@ share/locale/ga/LC_MESSAGES/transmission share/locale/gl/LC_MESSAGES/transmission.mo share/locale/he/LC_MESSAGES/transmission.mo share/locale/hu/LC_MESSAGES/transmission.mo +share/locale/id/LC_MESSAGES/transmission.mo +share/locale/is/ +share/locale/is/LC_MESSAGES/ +share/locale/is/LC_MESSAGES/transmission.mo share/locale/it/LC_MESSAGES/transmission.mo share/locale/ja/LC_MESSAGES/transmission.mo share/locale/ka/ share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/transmission.mo +share/locale/ku/ +share/locale/ku/LC_MESSAGES/ +share/locale/ku/LC_MESSAGES/transmission.mo share/locale/lt/ share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/transmission.mo +share/locale/lv/LC_MESSAGES/transmission.mo share/locale/mk/ share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/transmission.mo +share/locale/ml/ +share/locale/ml/LC_MESSAGES/ +share/locale/ml/LC_MESSAGES/transmission.mo +share/locale/ms/ +share/locale/ms/LC_MESSAGES/ +share/locale/ms/LC_MESSAGES/transmission.mo share/locale/mt/ share/locale/mt/LC_MESSAGES/ share/locale/mt/LC_MESSAGES/transmission.mo @@ -65,8 +94,13 @@ share/locale/ro/LC_MESSAGES/transmission share/locale/ru/LC_MESSAGES/transmission.mo share/locale/sk/LC_MESSAGES/transmission.mo share/locale/sl/LC_MESSAGES/transmission.mo +share/locale/sr/LC_MESSAGES/transmission.mo share/locale/sv/LC_MESSAGES/transmission.mo +share/locale/te/ +share/locale/te/LC_MESSAGES/ +share/locale/te/LC_MESSAGES/transmission.mo share/locale/tr/LC_MESSAGES/transmission.mo +share/locale/uk/LC_MESSAGES/transmission.mo share/locale/zh_CN/LC_MESSAGES/transmission.mo share/locale/zh_TW/LC_MESSAGES/transmission.mo share/pixmaps/ Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/net/transmission/pkg/PLIST-main,v retrieving revision 1.8 diff -u -p -r1.8 PLIST-main --- pkg/PLIST-main 22 Apr 2008 16:50:43 -0000 1.8 +++ pkg/PLIST-main 28 Nov 2008 15:58:08 -0000 @@ -1,12 +1,52 @@ @comment $OpenBSD: PLIST-main,v 1.8 2008/04/22 16:50:43 naddy Exp $ @pkgpath net/transmission -bin/benc2php -bin/transmission-daemon -bin/transmission-proxy -bin/transmission-remote -bin/transmissioncli [EMAIL PROTECTED] bin/transmission-daemon [EMAIL PROTECTED] bin/transmission-remote [EMAIL PROTECTED] bin/transmissioncli @man man/man1/transmission-daemon.1 [EMAIL PROTECTED] man/man1/transmission-proxy.1 @man man/man1/transmission-remote.1 @man man/man1/transmissioncli.1 @comment share/applications/ +share/transmission/ +share/transmission/web/ +share/transmission/web/LICENSE +share/transmission/web/images/ +share/transmission/web/images/buttons/ +share/transmission/web/images/buttons/info_activity.png +share/transmission/web/images/buttons/info_general.png +share/transmission/web/images/buttons/tab_backgrounds.png +share/transmission/web/images/buttons/toolbar_buttons.png +share/transmission/web/images/buttons/torrent_buttons.png +share/transmission/web/images/favicon.ico +share/transmission/web/images/favicon.png +share/transmission/web/images/graphics/ +share/transmission/web/images/graphics/browser_firefox.gif +share/transmission/web/images/graphics/browser_opera.gif +share/transmission/web/images/graphics/browser_safari.gif +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/logo.png +share/transmission/web/images/graphics/transfer_arrows.png +share/transmission/web/images/progress/ +share/transmission/web/images/progress/progress.png +share/transmission/web/images/webclip-icon.png +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/jquery/ +share/transmission/web/javascript/jquery/jquery.contextmenu.min.js +share/transmission/web/javascript/jquery/jquery.dimensions.min.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/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/iphone.css -- Christian "naddy" Weisgerber [EMAIL PROTECTED]