Index: net-p2p/Makefile =================================================================== --- net-p2p/Makefile +++ net-p2p/Makefile @@ -92,8 +92,7 @@ SUBDIR += transmission-cli SUBDIR += transmission-daemon SUBDIR += transmission-gtk - SUBDIR += transmission-qt4 - SUBDIR += transmission-qt5 + SUBDIR += transmission-qt SUBDIR += transmission-remote-gui SUBDIR += tribler SUBDIR += twister Index: net-p2p/transmission-cli/Makefile =================================================================== --- net-p2p/transmission-cli/Makefile +++ net-p2p/transmission-cli/Makefile @@ -1,14 +1,12 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.93 -PORTREVISION?= 1 +PORTVERSION= 2.94 CATEGORIES?= net-p2p -MASTER_SITES= https://github.com/transmission/transmission-releases/raw/master/ \ - http://transmission.cachefly.net/ +MASTER_SITES= https://github.com/transmission/transmission-releases/raw/master/ PKGNAMESUFFIX?= -cli -MAINTAINER?= crees@FreeBSD.org +MAINTAINER?= lebarondemerde@privacychain.ch COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities SLAVEPORT?= cli Index: net-p2p/transmission-cli/distinfo =================================================================== --- net-p2p/transmission-cli/distinfo +++ net-p2p/transmission-cli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519849051 -SHA256 (transmission-2.93.tar.xz) = 8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b -SIZE (transmission-2.93.tar.xz) = 3363868 +TIMESTAMP = 1529800001 +SHA256 (transmission-2.94.tar.xz) = 35442cc849f91f8df982c3d0d479d650c6ca19310a994eccdaa79a4af3916b7d +SIZE (transmission-2.94.tar.xz) = 3365952 Index: net-p2p/transmission-cli/files/patch-fix-with-libressl =================================================================== --- net-p2p/transmission-cli/files/patch-fix-with-libressl +++ /dev/null @@ -1,23 +0,0 @@ ---- libtransmission/crypto-utils-openssl.c.orig 2018-03-01 00:44:45 UTC -+++ libtransmission/crypto-utils-openssl.c -@@ -147,7 +147,7 @@ tr_sha1_final (tr_sha1_ctx_t handle, - **** - ***/ - --#if OPENSSL_VERSION_NUMBER < 0x0090802fL -+#if OPENSSL_VERSION_NUMBER < 0x0090802fL || defined(LIBRESSL_VERSION_NUMBER) - - static EVP_CIPHER_CTX * - openssl_evp_cipher_context_new (void) -@@ -230,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t handle, - **** - ***/ - --#if OPENSSL_VERSION_NUMBER < 0x10100000 -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) - static inline int - DH_set0_pqg (DH * dh, - BIGNUM * p, - - - Index: net-p2p/transmission-cli/files/patch-libtransmission_crypto-utils-openssl.c =================================================================== --- net-p2p/transmission-cli/files/patch-libtransmission_crypto-utils-openssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libtransmission/crypto-utils-openssl.c.orig 2018-01-23 19:17:43 UTC -+++ libtransmission/crypto-utils-openssl.c -@@ -230,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t handle, - **** - ***/ - --#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) - static inline int - DH_set0_pqg (DH * dh, - BIGNUM * p, Index: net-p2p/transmission-daemon/Makefile =================================================================== --- net-p2p/transmission-daemon/Makefile +++ net-p2p/transmission-daemon/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX= -daemon -MAINTAINER= crees@FreeBSD.org +MAINTAINER= lebarondemerde@privacychain.ch COMMENT= Fast and lightweight daemon BitTorrent client RUN_DEPENDS= ${GEN_RUN_DEPENDS} Index: net-p2p/transmission-gtk/Makefile =================================================================== --- net-p2p/transmission-gtk/Makefile +++ net-p2p/transmission-gtk/Makefile @@ -2,7 +2,7 @@ PKGNAMESUFFIX= -gtk -MAINTAINER= crees@FreeBSD.org +MAINTAINER= lebarondemerde@privacychain.ch COMMENT= Fast and lightweight GTK+3 BitTorrent client LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ Index: net-p2p/transmission-qt/Makefile =================================================================== --- /dev/null +++ net-p2p/transmission-qt/Makefile @@ -0,0 +1,70 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -${FLAVOR} + +MAINTAINER= lebarondemerde@privacychain.ch +COMMENT= Fast and lightweight Qt4 BitTorrent client + +LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 +RUN_DEPENDS= ${GEN_RUN_DEPENDS} + +FLAVORS= qt4 qt5 +FLAVOR?= ${FLAVORS:[1]} + +qt4_CONFLICTS_INSTALL= transmission-qt5 +qt5_CONFLICTS_INSTALL= transmission-qt4 + +USES= gettext-runtime:run desktop-file-utils + +.if ${FLAVOR} == qt4 +USE_QT4= moc_build qmake_build uic_build rcc_build \ + corelib gui dbus network xml +.endif + +.if ${FLAVOR} == qt5 +USE_QT5= buildtools_build linguisttools_build qmake_build \ + core dbus gui network widgets +.endif + +QT_NONSTANDARD= yes + +EXTRA_CONF_ARGS=--disable-cli \ + --disable-daemon \ + --without-gtk \ + --disable-mac \ + --disable-nls + +PLIST_SUB= QT_SUFFIX=${_QT_RELNAME} + +MASTERDIR= ${.CURDIR}/../transmission-cli +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist + +SLAVEPORT= qt + +post-patch: general-patch + @${REINPLACE_CMD} -e 's|/share/man|/man|g ; /PKGCONFIG/s| openssl||g' \ + ${WRKSRC}/qt/qtr.pro + @${ECHO_CMD} 'LIBS += -l${PORT_OPTIONS:M*SSL:tl:S/openssl/crypto/}' \ + >>${WRKSRC}/qt/qtr.pro + +post-build: + @(cd ${WRKSRC}/qt && ${QMAKE} ${QMAKE_ARGS} qtr.pro && ${MAKE_CMD}) + +do-install: + @(cd ${WRKSRC}/qt && \ + ${SETENV} INSTALL_ROOT=${STAGEDIR}${PREFIX} ${MAKE_CMD} install) + +post-install: general-install + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/transmission-qt + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/qt/README.txt \ + ${STAGEDIR}${DOCSDIR}/README-${FLAVOR} + ${INSTALL_DATA} ${WRKSRC}/qt/transmission-qt.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKSRC}/qt/icons/transmission.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/transmission-qt.png + +.include "${MASTERDIR}/Makefile" Index: net-p2p/transmission-qt/pkg-descr =================================================================== --- /dev/null +++ net-p2p/transmission-qt/pkg-descr @@ -0,0 +1,13 @@ +A fast and lightweight Qt BitTorrent client, loosely based on the GTK+ client. + +This is the only Transmission client that can act as its own self-contained +session (as the GTK+ and Mac clients do), and can also connect to a remote +session (as the web client and transmission-remote terminal client do). + +Transmission has been built from the ground up to be a lightweight, yet +powerful BitTorrent client. Its simple, intuitive interface is designed +to integrate tightly with whatever computing environment you choose to +use. Transmission strikes a balance between providing useful functionality +without feature bloat. Furthermore, it is free for anyone to use or modify. + +WWW: http://www.transmissionbt.com/ Index: net-p2p/transmission-qt/pkg-plist =================================================================== --- /dev/null +++ net-p2p/transmission-qt/pkg-plist @@ -0,0 +1,8 @@ +bin/transmission-qt +man/man1/transmission-qt.1.gz +share/applications/transmission-qt.desktop +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README-%%QT_SUFFIX%% +share/pixmaps/transmission-qt.png Index: net-p2p/transmission/Makefile =================================================================== --- net-p2p/transmission/Makefile +++ net-p2p/transmission/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.93 +PORTVERSION= 2.94 CATEGORIES= net-p2p -MAINTAINER= crees@FreeBSD.org +MAINTAINER= lebarondemerde@privacychain.ch COMMENT= Meta-port for Transmission BitTorrent client RUN_DEPENDS= transmission-cli:net-p2p/transmission-cli \ Index: www/transmission-web/Makefile =================================================================== --- www/transmission-web/Makefile +++ www/transmission-web/Makefile @@ -3,7 +3,7 @@ CATEGORIES= www net-p2p PKGNAMESUFFIX= -web -MAINTAINER= crees@FreeBSD.org +MAINTAINER= lebarondemerde@privacychain.ch COMMENT= Fast and lightweight WebUI for Transmission BitTorrent client DESCR= ${.CURDIR}/pkg-descr