2 files changed, 153 insertions, 1 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 26288d58ee42..57f091b95d5f 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	transmission
 DISTVERSION=	2.94
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	net-p2p
 SLAVEPORT?=	cli
 PKGNAMESUFFIX?=	-cli
diff --git a/net-p2p/transmission-cli/files/patch-Units b/net-p2p/transmission-cli/files/patch-Units
new file mode 100644
index 000000000000..001fefee2124
--- /dev/null
+++ b/net-p2p/transmission-cli/files/patch-Units
@@ -0,0 +1,152 @@
+--- cli/cli.c.orig		2018-05-01 10:18:29.000000000 -0700
++++ cli/cli.c			2019-01-18 17:21:27.893302000 -0800
+@@ -46,14 +46,14 @@
+ #define MEM_G_STR "GiB"
+ #define MEM_T_STR "TiB"
+ 
+-#define DISK_K 1000
++#define DISK_K 1024
+ #define DISK_B_STR   "B"
+ #define DISK_K_STR "kB"
+ #define DISK_M_STR "MB"
+ #define DISK_G_STR "GB"
+ #define DISK_T_STR "TB"
+ 
+-#define SPEED_K 1000
++#define SPEED_K 1024
+ #define SPEED_B_STR  "B/s"
+ #define SPEED_K_STR "kB/s"
+ #define SPEED_M_STR "MB/s"
+--- daemon/daemon.c.orig	2018-05-01 10:18:29.000000000 -0700
++++ daemon/daemon.c		2019-01-18 17:21:55.699919000 -0800
+@@ -50,14 +50,14 @@
+ #define MEM_G_STR "GiB"
+ #define MEM_T_STR "TiB"
+ 
+-#define DISK_K 1000
++#define DISK_K 1024
+ #define DISK_B_STR  "B"
+ #define DISK_K_STR "kB"
+ #define DISK_M_STR "MB"
+ #define DISK_G_STR "GB"
+ #define DISK_T_STR "TB"
+ 
+-#define SPEED_K 1000
++#define SPEED_K 1024
+ #define SPEED_B_STR  "B/s"
+ #define SPEED_K_STR "kB/s"
+ #define SPEED_M_STR "MB/s"
+--- daemon/remote.c.orig	2018-05-01 10:18:29.000000000 -0700
++++ daemon/remote.c		2019-01-18 18:03:10.333078000 -0800
+@@ -44,14 +44,14 @@
+ #define MEM_G_STR "GiB"
+ #define MEM_T_STR "TiB"
+ 
+-#define DISK_K 1000
++#define DISK_K 1024
+ #define DISK_B_STR  "B"
+ #define DISK_K_STR "kB"
+ #define DISK_M_STR "MB"
+ #define DISK_G_STR "GB"
+ #define DISK_T_STR "TB"
+ 
+-#define SPEED_K 1000
++#define SPEED_K 1024
+ #define SPEED_B_STR  "B/s"
+ #define SPEED_K_STR "kB/s"
+ #define SPEED_M_STR "MB/s"
+--- gtk/util.c.orig		2018-05-01 10:18:29.000000000 -0700
++++ gtk/util.c			2019-01-18 17:23:10.918334000 -0800
+@@ -39,13 +39,13 @@
+ const char * mem_G_str = N_("GiB");
+ const char * mem_T_str = N_("TiB");
+ 
+-const int disk_K = 1000;
++const int disk_K = 1024;
+ const char * disk_K_str = N_("kB");
+ const char * disk_M_str = N_("MB");
+ const char * disk_G_str = N_("GB");
+ const char * disk_T_str = N_("TB");
+ 
+-const int speed_K = 1000;
++const int speed_K = 1024;
+ const char * speed_K_str = N_("kB/s");
+ const char * speed_M_str = N_("MB/s");
+ const char * speed_G_str = N_("GB/s");
+--- libtransmission/libtransmission-test.c.orig	2018-05-01 10:18:29.000000000 -0700
++++ libtransmission/libtransmission-test.c	2019-01-18 17:23:43.535466000 -0800
+@@ -200,14 +200,14 @@
+ #define MEM_G_STR "GiB"
+ #define MEM_T_STR "TiB"
+ 
+-#define DISK_K 1000
++#define DISK_K 1024
+ #define DISK_B_STR  "B"
+ #define DISK_K_STR "kB"
+ #define DISK_M_STR "MB"
+ #define DISK_G_STR "GB"
+ #define DISK_T_STR "TB"
+ 
+-#define SPEED_K 1000
++#define SPEED_K 1024
+ #define SPEED_B_STR  "B/s"
+ #define SPEED_K_STR "kB/s"
+ #define SPEED_M_STR "MB/s"
+--- qt/Formatter.cc.orig	2018-05-01 10:18:29.000000000 -0700
++++ qt/Formatter.cc		2019-01-18 17:25:58.166361000 -0800
+@@ -29,7 +29,7 @@
+ void
+ Formatter::initUnits ()
+ {
+- speed_K = 1000;
++ speed_K = 1024;
+  unitStrings[SPEED][B]  = tr ( "B/s");
+  unitStrings[SPEED][KB] = tr ("kB/s");
+  unitStrings[SPEED][MB] = tr ("MB/s");
+@@ -41,7 +41,7 @@
+                           unitStrings[SPEED][GB].toUtf8().constData(),
+                           unitStrings[SPEED][TB].toUtf8().constData());
+ 
+-  size_K = 1000;
++  size_K = 1024;
+   unitStrings[SIZE][B]  = tr ( "B");
+   unitStrings[SIZE][KB] = tr ("kB");
+   unitStrings[SIZE][MB] = tr ("MB");
+--- utils/units.h.orig	2018-05-01 10:18:29.000000000 -0700
++++ utils/units.h	2019-01-18 17:26:23.460607000 -0800
+@@ -16,14 +16,14 @@
+ #define MEM_G_STR "GiB"
+ #define MEM_T_STR "TiB"
+ 
+-#define DISK_K 1000
++#define DISK_K 1024
+ #define DISK_B_STR  "B"
+ #define DISK_K_STR "kB"
+ #define DISK_M_STR "MB"
+ #define DISK_G_STR "GB"
+ #define DISK_T_STR "TB"
+ 
+-#define SPEED_K 1000
++#define SPEED_K 1024
+ #define SPEED_B_STR  "B/s"
+ #define SPEED_K_STR "kB/s"
+ #define SPEED_M_STR "MB/s"
+--- web/javascript/formatter.js.orig	2018-05-01 10:18:29.000000000 -0700
++++ web/javascript/formatter.js		2019-01-18 17:26:43.307090000 -0800
+@@ -7,14 +7,14 @@
+ 
+ Transmission.fmt = (function()
+ {
+-	var speed_K = 1000;
++	var speed_K = 1024;
+ 	var speed_B_str =  'B/s';
+ 	var speed_K_str = 'kB/s';
+ 	var speed_M_str = 'MB/s';
+ 	var speed_G_str = 'GB/s';
+ 	var speed_T_str = 'TB/s';
+ 
+-	var size_K = 1000;
++	var size_K = 1024;
+ 	var size_B_str =  'B';
+ 	var size_K_str = 'kB';
+ 	var size_M_str = 'MB';