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,116 +1,55 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.93 -PORTREVISION?= 1 -CATEGORIES?= net-p2p -MASTER_SITES= https://github.com/transmission/transmission-releases/raw/master/ \ - http://transmission.cachefly.net/ +DISTVERSION= 2.94 +CATEGORIES+= net-p2p PKGNAMESUFFIX?= -cli -MAINTAINER?= crees@FreeBSD.org -COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities +MAINTAINER= lebarondemerde@privacychain.ch +COMMENT= Transmission is a fast, easy, and free BitTorrent client -SLAVEPORT?= cli - -LICENSE= GPLv2+ -.if ${SLAVEPORT} == cli LICENSE+= MIT -LICENSE_COMB= multi -.endif -LICENSE_FILE= ${WRKSRC}/COPYING - -USES+= cpe tar:xz -CPE_VENDOR= transmissionbt - -CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5* -EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party - -.if ${SLAVEPORT} != web -LIB_DEPENDS?= ${GEN_LIB_DEPENDS} - -# General dependencies -GEN_LIB_DEPENDS=libb64.so:converters/libb64 \ - libcurl.so:ftp/curl \ +LIB_DEPENDS+= libcurl.so:ftp/curl \ libdht.so:devel/jech-dht \ - libminiupnpc.so:net/miniupnpc \ + libb64.so:converters/libb64 \ + libevent.so:devel/libevent \ libnatpmp.so:net/libnatpmp \ libutp.so:net/libutp \ - libevent.so:devel/libevent -GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:www/transmission-web + libminiupnpc.so:net/miniupnpc -# This is master port of transmission-*, so don't override USES definition -USES+= gmake iconv libtool localbase pkgconfig -GNU_CONFIGURE= yes -LIBS+= ${ICONV_LIB} -CONFIGURE_ENV= ${ICONV_LIB:C@.+@ac_cv_func_iconv=yes@} -CONFIGURE_ARGS= --without-inotify \ - --enable-external-b64 \ - --enable-external-dht \ - --enable-external-natpmp \ - ${EXTRA_CONF_ARGS} - -EXTRA_CONF_ARGS?=--enable-cli \ - --disable-daemon \ - --without-gtk \ - --disable-mac \ - --disable-nls - -EXTRA_PATCHES= ${PATCHDIR}/disable-web - -OPTIONS_DEFINE+= DOCS LITE -OPTIONS_DEFAULT+= OPENSSL -OPTIONS_SINGLE+= SSL -OPTIONS_SINGLE_SSL+= OPENSSL WOLFSSL +USES?= cmake:outsource cpe gettext-runtime:run iconv localbase \ + libtool pkgconfig ssl +CPE_VENDOR= transmissionbt +USE_GITHUB= yes -LITE_CONFIGURE_ENABLE= lightweight +LDFLAGS+= -L${LOCALBASE}/lib -lintl -ldht + +CMAKE_OFF?= ENABLE_GTK ENABLE_QT ENABLE_DAEMON +CMAKE_ON?= ENABLE_CLI + +OPTIONS_DEFINE+= DOCS LITE NLS + +OPTIONS_DEFAULT= OPENSSL +OPTIONS_SINGLE= SSL +OPTIONS_SINGLE_SSL= OPENSSL POLARSSL WOLFSSL OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CONFIGURE_ON= --with-crypto=openssl +POLARSSL_LIB_DEPENDS= libpolarssl.so:security/polarssl13 +POLARSSL_CONFIGURE_ON= --with-crypto=polarssl + WOLFSSL_LIB_DEPENDS= libwolfssl.so:security/wolfssl WOLFSSL_CONFIGURE_ON= --with-crypto=cyassl WOLFSSL_BROKEN= Requires security/wolfssl built with --enable-arc4 -.endif -DOCS= AUTHORS NEWS README -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +LITE_CONFIGURE_ENABLE= lightweight -general-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g' -.if ${SLAVEPORT} != gtk - @${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \ - ${WRKSRC}/libtransmission/utils.h -.endif - @${REINPLACE_CMD} -e \ - 's|rt_clock_gettime=yes|rt_clock_gettime=no|g ; \ - s|" == "|" = "|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|doc \\| \\|g' \ - ${WRKSRC}/Makefile.in -.if ${SLAVEPORT} != cli - @${REINPLACE_CMD} -e 's|utils \\|\\|g' \ - ${WRKSRC}/Makefile.in -.endif -# Don't conflict with patches but force system libraries - @${REINPLACE_CMD} -e 's|third-party \\|\\|g' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} \ - -e 's|third-party/[^ ]*Makefile||g' \ - ${WRKSRC}/configure - -post-patch: general-patch - -general-install: -.if ${SLAVEPORT} != web - (cd ${WRKSRC} && ${COPYTREE_SHARE} \ - "${DOCS}" ${STAGEDIR}${DOCSDIR}) -.endif +post-extract: + @${FIND} ${WRKSRC}/web -name .git* -delete -post-install: general-install .include 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 = 1529983390 +SHA256 (transmission-transmission-2.94_GH0.tar.gz) = 440c2fd0f89b1ab59d8a4b79ecd7bffd61bc000e36fb5b6c8e88142a4fadbb1f +SIZE (transmission-transmission-2.94_GH0.tar.gz) = 6342775 Index: net-p2p/transmission-cli/files/disable-web =================================================================== --- net-p2p/transmission-cli/files/disable-web +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.in.orig 2010-10-23 15:56:02.000000000 -0500 -+++ Makefile.in 2010-10-23 15:56:55.000000000 -0500 -@@ -303,15 +303,13 @@ - @BUILD_GTK_TRUE@GTK_DIR = gtk po - @BUILD_MAC_TRUE@MAC_DIR = macosx - SUBDIRS = \ -- extras \ - third-party \ - libtransmission \ - utils \ - $(DAEMON_DIR) \ - $(CLI_DIR) \ - $(GTK_DIR) \ -- $(MAC_DIR) \ -- web -+ $(MAC_DIR) - - EXTRA_DIST = \ - qt \ Index: net-p2p/transmission-cli/files/patch-CMakeLists.txt =================================================================== --- /dev/null +++ net-p2p/transmission-cli/files/patch-CMakeLists.txt @@ -0,0 +1,16 @@ +MakeLists.txt.orig 2018-03-17 20:05:12 UTC ++++ CMakeLists.txt +@@ -536,13 +536,6 @@ foreach(P daemon cli utils gtk qt) + endif() + endforeach() + +-if(ENABLE_DAEMON OR ENABLE_GTK OR ENABLE_QT) +- install(DIRECTORY web DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${TR_NAME} +- PATTERN *.am EXCLUDE +- PATTERN *.in EXCLUDE +- PATTERN *.scss EXCLUDE) +-endif() +- + if(ENABLE_GTK AND ENABLE_NLS) + find_package(Gettext REQUIRED) + add_subdirectory(po) Index: net-p2p/transmission-cli/files/patch-configure =================================================================== --- net-p2p/transmission-cli/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig 2016-03-06 20:24:37 UTC -+++ configure -@@ -19348,7 +19348,7 @@ $as_echo_n "checking µTP... " >&6; } - build_utp="no" - - ac_save_LIBS="$LIBS" --LIBS="-lutp" -+LIBS="-lutp $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include -@@ -19423,7 +19423,7 @@ $as_echo "$build_utp" >&6; } - - - ac_save_LIBS="$LIBS" --LIBS="-lminiupnpc" -+LIBS="-lminiupnpc $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking system miniupnpc library" >&5 - $as_echo_n "checking system miniupnpc library... " >&6; } - 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-fix_without_ipv6 =================================================================== --- net-p2p/transmission-cli/files/patch-fix_without_ipv6 +++ /dev/null @@ -1,11 +0,0 @@ ---- libtransmission/fdlimit.c.orig 2015-07-01 00:54:41 UTC -+++ libtransmission/fdlimit.c -@@ -517,7 +517,7 @@ tr_fdSocketCreate (tr_session * session, - - if (gFd->peerCount < session->peerLimit) - if ((s = socket (domain, type, 0)) == TR_BAD_SOCKET) -- if (sockerrno != EAFNOSUPPORT) -+ if (sockerrno != EPROTONOSUPPORT) - { - char err_buf[512]; - tr_logAddError (_("Couldn't create socket: %s"), 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-cli/files/patch-qt-app-h =================================================================== --- net-p2p/transmission-cli/files/patch-qt-app-h +++ /dev/null @@ -1,10 +0,0 @@ ---- qt/Application.h.orig 2013-11-13 20:00:41.000000000 +0100 -+++ qt/Application.h 2013-11-13 20:00:51.000000000 +0100 -@@ -13,6 +13,7 @@ - #ifndef QTR_APP_H - #define QTR_APP_H - -+#include - #include - #include - #include Index: net-p2p/transmission-cli/files/patch-qt_qtr_pro =================================================================== --- net-p2p/transmission-cli/files/patch-qt_qtr_pro +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-qt_qtr_pro,v 1.4 2012/04/07 10:55:04 naddy Exp $ ---- qt/qtr.pro.orig Fri Aug 9 04:45:47 2013 -+++ qt/qtr.pro Thu Aug 22 16:37:03 2013 -@@ -8,7 +8,7 @@ target.path = /bin - INSTALLS += target - - unix: INSTALLS += man --man.path = /share/man/man1/ -+man.path = /man/man1/ - man.files = transmission-qt.1 - - CONFIG += qt thread debug link_pkgconfig c++11 warn_on -@@ -34,7 +34,7 @@ LIBS += $${DHT_LIBS} - LIBS += $${LIBB64_LIBS} - LIBS += $${LIBUPNP_LIBS} - LIBS += $${LIBNATPMP_LIBS} --unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt -+unix: LIBS += -L$${EVENT_TOP}/lib -lz -levent_core -levent_extra - win32:LIBS += -levent-2.0 -lws2_32 -lintl - win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi - Index: net-p2p/transmission-cli/pkg-plist =================================================================== --- net-p2p/transmission-cli/pkg-plist +++ net-p2p/transmission-cli/pkg-plist @@ -7,5 +7,8 @@ man/man1/transmission-edit.1.gz man/man1/transmission-show.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/rpc-spec.txt +%%PORTDOCS%%%%DOCSDIR%%/send-email-when-torrent-done.sh Index: net-p2p/transmission-daemon/Makefile =================================================================== --- net-p2p/transmission-daemon/Makefile +++ net-p2p/transmission-daemon/Makefile @@ -2,28 +2,25 @@ PKGNAMESUFFIX= -daemon -MAINTAINER= crees@FreeBSD.org -COMMENT= Fast and lightweight daemon BitTorrent client +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_COMB= multi -RUN_DEPENDS= ${GEN_RUN_DEPENDS} +CMAKE_OFF= ENABLE_CLI ENABLE_GTK ENABLE_QT \ + ENABLE_UTILS -DESCR= ${.CURDIR}/pkg-descr -MASTERDIR= ${.CURDIR}/../transmission-cli -PLIST= ${.CURDIR}/pkg-plist -SLAVEPORT= daemon -PKGMESSAGE= ${.CURDIR}/pkg-message - -USE_RC_SUBR= transmission USERS= transmission GROUPS= transmission +USE_RC_SUBR= transmission + +MASTERDIR= ${.CURDIR}/../transmission-cli +DESCR= ${.CURDIR}/pkg-descr +PKGMESSAGE= ${.CURDIR}/pkg-message +PLIST= ${.CURDIR}/pkg-plist -EXTRA_CONF_ARGS=--disable-cli \ - --enable-daemon \ - --without-gtk \ - --disable-mac \ - --disable-nls +SLAVEPORT= cli post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/home + ${MKDIR} ${STAGEDIR}${ETCDIR}/home .include "${MASTERDIR}/Makefile" Index: net-p2p/transmission-daemon/pkg-plist =================================================================== --- net-p2p/transmission-daemon/pkg-plist +++ net-p2p/transmission-daemon/pkg-plist @@ -3,6 +3,9 @@ man/man1/transmission-daemon.1.gz man/man1/transmission-remote.1.gz %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/rpc-spec.txt +%%PORTDOCS%%%%DOCSDIR%%/send-email-when-torrent-done.sh @dir %%ETCDIR%%/home Index: net-p2p/transmission-gtk/Makefile =================================================================== --- net-p2p/transmission-gtk/Makefile +++ net-p2p/transmission-gtk/Makefile @@ -2,33 +2,24 @@ PKGNAMESUFFIX= -gtk -MAINTAINER= crees@FreeBSD.org -COMMENT= Fast and lightweight GTK+3 BitTorrent client - -LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ - libnotify.so:devel/libnotify \ - libdbus-glib-1.so:devel/dbus-glib - -RUN_DEPENDS= ${GEN_RUN_DEPENDS} \ - xdg-open:devel/xdg-utils +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_COMB= multi + +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ + libnotify.so:devel/libnotify +RUN_DEPENDS= xdg-open:devel/xdg-utils + +USES= cmake:outsource cpe desktop-file-utils gettext-tools:build \ + iconv localbase libtool pkgconfig ssl +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intlhack pango +CMAKE_OFF= ENABLE_CLI ENABLE_DAEMON ENABLE_QT ENABLE_UTILS +CMAKE_ON= ENABLE_GTK DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli PLIST= ${.CURDIR}/pkg-plist -SLAVEPORT= gtk -USE_GNOME= cairo gtk30 intlhack -USES= gettext pathfix desktop-file-utils -INSTALLS_ICONS= yes - -EXTRA_CONF_ARGS=--disable-cli \ - --disable-daemon \ - --with-gtk \ - --disable-mac \ - --enable-nls - -post-patch: general-patch - @${REINPLACE_CMD} -e 's|TryExec=.*||g ; /^$$/d' \ - ${WRKSRC}/gtk/transmission-gtk.desktop.in +SLAVEPORT= gtk .include "${MASTERDIR}/Makefile" Index: net-p2p/transmission-gtk/pkg-plist =================================================================== --- net-p2p/transmission-gtk/pkg-plist +++ net-p2p/transmission-gtk/pkg-plist @@ -2,8 +2,11 @@ man/man1/transmission-gtk.1.gz share/applications/transmission-gtk.desktop %%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/rpc-spec.txt +%%PORTDOCS%%%%DOCSDIR%%/send-email-when-torrent-done.sh share/icons/hicolor/16x16/apps/transmission.png share/icons/hicolor/22x22/apps/transmission.png share/icons/hicolor/24x24/apps/transmission.png @@ -48,8 +51,8 @@ share/locale/he/LC_MESSAGES/transmission-gtk.mo share/locale/hi/LC_MESSAGES/transmission-gtk.mo share/locale/hr/LC_MESSAGES/transmission-gtk.mo -share/locale/hy/LC_MESSAGES/transmission-gtk.mo share/locale/hu/LC_MESSAGES/transmission-gtk.mo +share/locale/hy/LC_MESSAGES/transmission-gtk.mo share/locale/ia/LC_MESSAGES/transmission-gtk.mo share/locale/id/LC_MESSAGES/transmission-gtk.mo share/locale/is/LC_MESSAGES/transmission-gtk.mo @@ -99,4 +102,3 @@ share/locale/vi/LC_MESSAGES/transmission-gtk.mo share/locale/zh_CN/LC_MESSAGES/transmission-gtk.mo share/locale/zh_TW/LC_MESSAGES/transmission-gtk.mo -share/pixmaps/transmission.png Index: net-p2p/transmission-qt/Makefile =================================================================== --- /dev/null +++ net-p2p/transmission-qt/Makefile @@ -0,0 +1,42 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -${FLAVOR} + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_COMB= multi + +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 + +FLAVORS= qt4 qt5 +FLAVOR?= ${FLAVORS:[1]} + +qt4_CONFLICTS_INSTALL= transmission-qt5 +qt5_CONFLICTS_INSTALL= transmission-qt4 + +USES= cmake:outsource cpe gettext-runtime:run iconv localbase \ + libtool pkgconfig + +.if ${FLAVOR} == qt4 +USE_QT4= moc_build qmake_build rcc_build uic_build corelib \ + dbus gui network xml +CMAKE_OFF= ENABLE_CLI ENABLE_DAEMON ENABLE_GTK ENABLE_NLS \ + ENABLE_UTILS +.endif + +.if ${FLAVOR} == qt5 +USE_QT5= buildtools_build linguisttools_build qmake_build \ + core dbus gui network widgets +CAKE_OFF= ENABLE_CLI ENABLE_DAEMON ENABLE_NLS ENABLE_GTK \ + ENABLE_UTILS +CMAKE_ON= USE_QT5 +.endif + +MASTERDIR= ${.CURDIR}/../transmission-cli +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist + +SLAVEPORT= qt + +.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-qt4/Makefile =================================================================== --- net-p2p/transmission-qt4/Makefile +++ net-p2p/transmission-qt4/Makefile @@ -1,53 +0,0 @@ -# $FreeBSD$ - -PKGNAMESUFFIX= -qt4 - -MAINTAINER= crees@FreeBSD.org -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} - -CONFLICTS_INSTALL= transmission-qt5-[0-9]* - -DESCR= ${.CURDIR}/pkg-descr -MASTERDIR= ${.CURDIR}/../transmission-cli -PLIST= ${.CURDIR}/pkg-plist -SLAVEPORT= qt4 - -QT_NONSTANDARD= yes -USE_QT4= moc_build qmake_build uic_build rcc_build \ - corelib gui dbus network xml -USES= compiler:c++11-lib desktop-file-utils - -EXTRA_CONF_ARGS=--disable-cli \ - --disable-daemon \ - --without-gtk \ - --disable-mac \ - --disable-nls - -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 - @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/qt/README.txt \ - ${STAGEDIR}${DOCSDIR}/README-qt4 - @${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-qt4/pkg-descr =================================================================== --- net-p2p/transmission-qt4/pkg-descr +++ net-p2p/transmission-qt4/pkg-descr @@ -1,13 +0,0 @@ -A fast and lightweight Qt4 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-qt4/pkg-plist =================================================================== --- net-p2p/transmission-qt4/pkg-plist +++ net-p2p/transmission-qt4/pkg-plist @@ -1,8 +0,0 @@ -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-qt4 -share/pixmaps/transmission-qt.png Index: net-p2p/transmission-qt5/Makefile =================================================================== --- net-p2p/transmission-qt5/Makefile +++ net-p2p/transmission-qt5/Makefile @@ -1,53 +0,0 @@ -# $FreeBSD$ - -PKGNAMESUFFIX= -qt5 - -MAINTAINER= crees@FreeBSD.org -COMMENT= Fast and lightweight Qt5 BitTorrent client - -LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 -RUN_DEPENDS= ${GEN_RUN_DEPENDS} - -CONFLICTS_INSTALL= transmission-qt4-[0-9]* - -DESCR= ${.CURDIR}/pkg-descr -MASTERDIR= ${.CURDIR}/../transmission-cli -PLIST= ${.CURDIR}/pkg-plist -SLAVEPORT= qt5 - -QT_NONSTANDARD= yes -USE_QT5= buildtools_build qmake_build core dbus gui network widgets -USES= compiler:c++11-lib desktop-file-utils - -EXTRA_CONF_ARGS=--disable-cli \ - --disable-daemon \ - --without-gtk \ - --disable-mac \ - --disable-nls - -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-qt5 - @${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-qt5/pkg-descr =================================================================== --- net-p2p/transmission-qt5/pkg-descr +++ net-p2p/transmission-qt5/pkg-descr @@ -1,13 +0,0 @@ -A fast and lightweight Qt5 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-qt5/pkg-plist =================================================================== --- net-p2p/transmission-qt5/pkg-plist +++ net-p2p/transmission-qt5/pkg-plist @@ -1,8 +0,0 @@ -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-qt5 -share/pixmaps/transmission-qt.png Index: net-p2p/transmission/Makefile =================================================================== --- net-p2p/transmission/Makefile +++ net-p2p/transmission/Makefile @@ -1,18 +1,30 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.93 +DISTVERSION= 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 \ - transmission-daemon:net-p2p/transmission-daemon \ - transmission-gtk:net-p2p/transmission-gtk +USES= metaport -CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.[56]* +OPTIONS_DEFINE= CLI DAEMON GTK QT4 QT5 WEB -USES= metaport +CLI_DESC= Command line version +DAEMON_DESC= Daemon version +GTK_DESC= GTK version +QT4_DESC= Qt4 version +QT5_DESC= Qt5 version +WEB_DESC= Web client + +OPTIONS_DEFAULT= CLI DAEMON GTK QT4 QT5 WEB + +CLI_RUN_DEPENDS= transmission-cli:net-p2p/transmission-cli +DAEMON_RUN_DEPENDS= transmission-daemon:net-p2p/transmission-daemon +GTK_RUN_DEPENDS= transmission-gtk:net-p2p/transmission-gtk +QT4_RUN_DEPENDS= transmission-qt4:net-p2p/transmission-qt@qt4 +QT5_RUN_DEPENDS= transmission-qt5:net-p2p/transmission-qt@qt5 +WEB_RUN_DEPENDS= transmission-cli:www/transmission-web .include Index: www/transmission-web/Makefile =================================================================== --- www/transmission-web/Makefile +++ www/transmission-web/Makefile @@ -1,25 +1,24 @@ # $FreeBSD$ -CATEGORIES= www net-p2p +CATEGORIES= www PKGNAMESUFFIX= -web -MAINTAINER= crees@FreeBSD.org -COMMENT= Fast and lightweight WebUI for Transmission BitTorrent client +USES= cpe +NO_ARCH= yes +NO_BUILD= yes +PORTDATA= web -DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../../net-p2p/transmission-cli +DESCR= ${.CURDIR}/pkg-descr PLIST= ${NONEXISTENT} -SLAVEPORT= web -PORTDATA= web - -NO_BUILD= yes +SLAVEPORT= web -post-extract: - @${FIND} ${WRKSRC}/web -name Makefile.* -delete +general-post-extract: + @${FIND} ${WRKSRC}/web \( -name '*.am' -o -name '*.in' \ + -o -name '*.scss' \) -delete do-install: - ${MKDIR} ${STAGEDIR}${DATADIR}/web - (cd ${WRKSRC}/web && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/web) + ( cd ${WRKSRC} && ${COPYTREE_SHARE} web ${STAGEDIR}${DATADIR} ) .include "${MASTERDIR}/Makefile"