Index: head/net-p2p/transmission-cli/Makefile =================================================================== --- head/net-p2p/transmission-cli/Makefile (revision 490799) +++ head/net-p2p/transmission-cli/Makefile (revision 490800) @@ -1,89 +1,89 @@ # $FreeBSD$ PORTNAME= transmission DISTVERSION= 2.94 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= net-p2p SLAVEPORT?= cli PKGNAMESUFFIX?= -cli MAINTAINER= rigoletto@FreeBSD.org COMMENT= Meta-port for Transmission BitTorrent client LICENSE+= MIT .if ${SLAVEPORT:Ncli} LICENSE+= GPLv2+ LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING .endif .if ${SLAVEPORT:Nweb} LIB_DEPENDS+= libcurl.so:ftp/curl \ libdht.so:devel/jech-dht \ libb64.so:converters/libb64 \ libevent.so:devel/libevent \ libnatpmp.so:net/libnatpmp \ libutp.so:net/libutp \ libminiupnpc.so:net/miniupnpc USES+= cmake cpe iconv libtool localbase pkgconfig . if ${SLAVEPORT:Mcli} USES+= ssl NLS_USES= gettext-runtime:run . endif CPE_VENDOR= transmissionbt .endif USE_GITHUB= yes .if ${SLAVEPORT} != web SLAVES= cli daemon gtk qt CMAKE_ON+= ENABLE_${SLAVEPORT:tu} CMAKE_OFF+= ${SLAVES:N${SLAVEPORT}:tu:S/^/ENABLE_/} . if ${SLAVEPORT:Nweb:Ncli} CMAKE_OFF+= ENABLE_UTILS . endif DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${SLAVEPORT} CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} OPTIONS_DEFINE+= DOCS LITE NLS OPTIONS_SUB= yes OPTIONS_DEFAULT= OPENSSL NLS_CMAKE_BOOL= ENABLE_NLS OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL WOLFSSL OPENSSL_USES= ssl OPENSSL_CMAKE_ARGS= -DWITH_CRYPTO="openssl" WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl WOLFSSL_CMAKE_ARGS= -DWITH_CRYPTO="cyassl" LITE_CONFIGURE_ENABLE= lightweight LITE_CMAKE_BOOL= ENABLE_LIGHTWEIGHT .endif post-extract: @${FIND} ${WRKSRC}/web -name .git* -delete .if ${SLAVEPORT:Mweb} @${FIND} ${WRKSRC}/web \( -name '*.am' -o -name '*.in' \ -o -name '*.scss' \) -delete do-install: ( cd ${WRKSRC} && ${COPYTREE_SHARE} web ${STAGEDIR}${DATADIR} ) .endif .if ${SLAVEPORT:Mdaemon} post-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/home .endif .include Index: head/net-p2p/transmission-cli/files/patch-Units =================================================================== --- head/net-p2p/transmission-cli/files/patch-Units (nonexistent) +++ head/net-p2p/transmission-cli/files/patch-Units (revision 490800) @@ -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'; Property changes on: head/net-p2p/transmission-cli/files/patch-Units ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-p2p/transmission-daemon/Makefile =================================================================== --- head/net-p2p/transmission-daemon/Makefile (revision 490799) +++ head/net-p2p/transmission-daemon/Makefile (revision 490800) @@ -1,20 +1,20 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -daemon USES= ssl NLS_USES= gettext-runtime:run USERS= transmission GROUPS= transmission USE_RC_SUBR= transmission MASTERDIR= ${.CURDIR}/../transmission-cli DESCR= ${.CURDIR}/pkg-descr PKGMESSAGE= ${.CURDIR}/pkg-message PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= daemon .include "${MASTERDIR}/Makefile" Index: head/net-p2p/transmission-gtk/Makefile =================================================================== --- head/net-p2p/transmission-gtk/Makefile (revision 490799) +++ head/net-p2p/transmission-gtk/Makefile (revision 490800) @@ -1,21 +1,20 @@ # $FreeBSD$ -PORTREVISION= 2 - +PORTREVISION= 3 PKGNAMESUFFIX= -gtk LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libnotify.so:devel/libnotify RUN_DEPENDS= xdg-open:devel/xdg-utils USES= desktop-file-utils gnome ssl NLS_USES= gettext-tools:build USE_GNOME= cairo gdkpixbuf2 gtk30 intlhack pango MASTERDIR= ${.CURDIR}/../transmission-cli DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= gtk .include "${MASTERDIR}/Makefile" Index: head/net-p2p/transmission-qt/Makefile =================================================================== --- head/net-p2p/transmission-qt/Makefile (revision 490799) +++ head/net-p2p/transmission-qt/Makefile (revision 490800) @@ -1,41 +1,41 @@ # $FreeBSD$ -PORTREVISION= 5 +PORTREVISION= 6 PKGNAMESUFFIX= -${FLAVOR} LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 FLAVORS= qt5 qt4 FLAVOR?= ${FLAVORS:[1]} qt4_CONFLICTS_INSTALL= transmission-qt5 qt5_CONFLICTS_INSTALL= transmission-qt4 .if ${FLAVOR} == qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE=2019-03-15 USES= qt:4 NLS_USES= gettext-runtime:run qt:4 USE_QT= moc_build linguisttools_build qmake_build rcc_build \ uic_build corelib dbus gui network xml CMAKE_OFF+= USE_QT5 .endif .if ${FLAVOR} == qt5 USES= qt:5 NLS_USES= gettext-runtime:run qt:5 USE_QT= buildtools_build linguisttools_build qmake_build \ core dbus gui network widgets CMAKE_ON= USE_QT5 .endif USES+= compiler:c++11-lang MASTERDIR= ${.CURDIR}/../transmission-cli DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist SLAVEPORT= qt .include "${MASTERDIR}/Makefile"