diff options
30 files changed, 250 insertions, 405 deletions
@@ -10328,3 +10328,5 @@ textproc/kibana46|textproc/kibana5|2018-07-10|Has expired: End of Life was 2018- print/cups-connector|print/cloud-print-connector|2018-07-11|Project renamed upstream net/wpa_gui|net/wpa_supplicant_gui|2018-07-12|Rename to wpa_supplicant_gui for ease of search lang/gcc47|lang/gcc6|2018-07-15|Has expired: Unsupported by upstream. Use GCC 6 or newer instead. +net-p2p/transmission-qt4|net-p2p/transmission-qt@qt4|2018-07-15|Moved into flavored version +net-p2p/transmission-qt5|net-p2p/transmission-qt@qt5|2018-07-15|Moved into flavored version diff --git a/net-p2p/Makefile b/net-p2p/Makefile index b588d4c9d554..12ea86cde877 100644 --- a/net-p2p/Makefile +++ b/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 diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile index 9bd0618b7f7f..5f94e3967e7b 100644 --- a/net-p2p/transmission-cli/Makefile +++ b/net-p2p/transmission-cli/Makefile @@ -1,116 +1,88 @@ # $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 +SLAVEPORT?= cli PKGNAMESUFFIX?= -cli -MAINTAINER?= crees@FreeBSD.org -COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities - -SLAVEPORT?= cli +MAINTAINER= lebarondemerde@privacychain.ch +COMMENT= Meta-port for Transmission BitTorrent client -LICENSE= GPLv2+ -.if ${SLAVEPORT} == cli LICENSE+= MIT + +.if ${SLAVEPORT:Ncli} +LICENSE+= GPLv2+ LICENSE_COMB= multi -.endif LICENSE_FILE= ${WRKSRC}/COPYING +.endif -USES+= cpe tar:xz -CPE_VENDOR= transmissionbt +.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:outsource cpe iconv libtool localbase pkgconfig -CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5* +. if ${SLAVEPORT:Mcli} +USES+= ssl +NLS_USES= gettext-runtime:run +. endif + +CPE_VENDOR= transmissionbt +.endif -EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party +USE_GITHUB= yes .if ${SLAVEPORT} != web -LIB_DEPENDS?= ${GEN_LIB_DEPENDS} +SLAVES= cli daemon gtk qt +CMAKE_ON+= ENABLE_${SLAVEPORT:tu} +CMAKE_OFF+= ${SLAVES:N${SLAVEPORT}:tu:S/^/ENABLE_/} -# General dependencies -GEN_LIB_DEPENDS=libb64.so:converters/libb64 \ - libcurl.so:ftp/curl \ - libdht.so:devel/jech-dht \ - libminiupnpc.so:net/miniupnpc \ - libnatpmp.so:net/libnatpmp \ - libutp.so:net/libutp \ - libevent.so:devel/libevent -GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:www/transmission-web - -# 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 +. if ${SLAVEPORT:Nweb:Ncli} +CMAKE_OFF+= ENABLE_UTILS +. endif -LITE_CONFIGURE_ENABLE= lightweight +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_CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" -OPENSSL_CONFIGURE_ON= --with-crypto=openssl +OPENSSL_CMAKE_ARGS= -DWITH_CRYPTO="openssl" 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} +WOLFSSL_CMAKE_ARGS= -DWITH_CRYPTO="cyassl" -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 +LITE_CONFIGURE_ENABLE= lightweight +LITE_CMAKE_BOOL= ENABLE_LIGHTWEIGHT .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 +post-extract: + @${FIND} ${WRKSRC}/web -name .git* -delete -general-install: -.if ${SLAVEPORT} != web - (cd ${WRKSRC} && ${COPYTREE_SHARE} \ - "${DOCS}" ${STAGEDIR}${DOCSDIR}) +.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 -post-install: general-install +.if ${SLAVEPORT:Mdaemon} +post-install: + ${MKDIR} ${STAGEDIR}${ETCDIR}/home +.endif .include <bsd.port.mk> diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo index 9e8e563d2c61..e6bb3c2593db 100644 --- a/net-p2p/transmission-cli/distinfo +++ b/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 = 1530806424 +SHA256 (transmission-transmission-2.94_GH0.tar.gz) = 440c2fd0f89b1ab59d8a4b79ecd7bffd61bc000e36fb5b6c8e88142a4fadbb1f +SIZE (transmission-transmission-2.94_GH0.tar.gz) = 6342775 diff --git a/net-p2p/transmission-cli/files/disable-web b/net-p2p/transmission-cli/files/disable-web deleted file mode 100644 index 2c63c36e62a8..000000000000 --- a/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 \ diff --git a/net-p2p/transmission-cli/files/patch-CMakeLists.txt b/net-p2p/transmission-cli/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..44943c66965b --- /dev/null +++ b/net-p2p/transmission-cli/files/patch-CMakeLists.txt @@ -0,0 +1,29 @@ +--- CMakeLists.txt.orig 2018-07-09 22:28:43 UTC ++++ CMakeLists.txt +@@ -511,9 +511,9 @@ endif() + # endif() + + if(ENABLE_NLS) +- check_library_exists(intl libintl_gettext "" HAVE_LIBINTL) +- if(HAVE_LIBINTL) +- set(LIBINTL_LIBRARY intl) ++ find_package(Intl) ++ if(Intl_FOUND) ++ set(LIBINTL_LIBRARY ${Intl_LIBRARIES}) + endif() + endif() + +@@ -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) diff --git a/net-p2p/transmission-cli/files/patch-cmake_FindDHT.cmake b/net-p2p/transmission-cli/files/patch-cmake_FindDHT.cmake new file mode 100644 index 000000000000..d1a612bd66ec --- /dev/null +++ b/net-p2p/transmission-cli/files/patch-cmake_FindDHT.cmake @@ -0,0 +1,12 @@ +--- cmake/FindDHT.cmake.orig 2018-07-08 18:11:40 UTC ++++ cmake/FindDHT.cmake +@@ -15,6 +15,10 @@ endif() + find_path(DHT_INCLUDE_DIR NAMES dht/dht.h HINTS ${_DHT_INCLUDEDIR}) + find_library(DHT_LIBRARY NAMES dht HINTS ${_DHT_LIBDIR}) + ++if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ set(DHT_INCLUDE_DIR /usr/local/lib) ++endif() ++ + set(DHT_INCLUDE_DIRS ${DHT_INCLUDE_DIR}) + set(DHT_LIBRARIES ${DHT_LIBRARY}) diff --git a/net-p2p/transmission-cli/files/patch-configure b/net-p2p/transmission-cli/files/patch-configure deleted file mode 100644 index 08adc06b0271..000000000000 --- a/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 <libutp/utp.h> -@@ -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; } - diff --git a/net-p2p/transmission-cli/files/patch-fix-with-libressl b/net-p2p/transmission-cli/files/patch-fix-with-libressl deleted file mode 100644 index bab700c3d19e..000000000000 --- a/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, - - - diff --git a/net-p2p/transmission-cli/files/patch-fix_without_ipv6 b/net-p2p/transmission-cli/files/patch-fix_without_ipv6 deleted file mode 100644 index fac20ad9a6b6..000000000000 --- a/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"), diff --git a/net-p2p/transmission-cli/files/patch-libtransmission_CMakeLists.txt b/net-p2p/transmission-cli/files/patch-libtransmission_CMakeLists.txt new file mode 100644 index 000000000000..26f2dc4bd2b8 --- /dev/null +++ b/net-p2p/transmission-cli/files/patch-libtransmission_CMakeLists.txt @@ -0,0 +1,11 @@ +--- libtransmission/CMakeLists.txt.orig 2018-07-10 05:34:13 UTC ++++ libtransmission/CMakeLists.txt +@@ -281,7 +281,7 @@ if(ENABLE_TESTS) + set(${TP}_TEST_BASENAME "${T}") + endif() + add_executable(${TP} ${${TP}_TEST_BASENAME}-test.c ${${T}-test_ADD_SOURCES}) +- target_link_libraries(${TP} ${TR_NAME} ${TR_NAME}-test) ++ target_link_libraries(${TP} ${TR_NAME} ${TR_NAME}-test ${DHT_LIBRARIES}) + if(DEFINED ${T}-test_DEFINITIONS) + target_compile_definitions(${TP} PRIVATE ${${T}-test_DEFINITIONS}) + endif() diff --git a/net-p2p/transmission-cli/files/patch-libtransmission_crypto-utils-openssl.c b/net-p2p/transmission-cli/files/patch-libtransmission_crypto-utils-openssl.c deleted file mode 100644 index eb418b01859d..000000000000 --- a/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, diff --git a/net-p2p/transmission-cli/files/patch-qt-app-h b/net-p2p/transmission-cli/files/patch-qt-app-h deleted file mode 100644 index 76dc92dc0262..000000000000 --- a/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 <ctime> - #include <QApplication> - #include <QSet> - #include <QTimer> diff --git a/net-p2p/transmission-cli/files/patch-qt_Application.h b/net-p2p/transmission-cli/files/patch-qt_Application.h new file mode 100644 index 000000000000..aea540e31885 --- /dev/null +++ b/net-p2p/transmission-cli/files/patch-qt_Application.h @@ -0,0 +1,10 @@ +--- qt/Application.h.orig 2018-07-04 17:44:30 UTC ++++ qt/Application.h +@@ -15,6 +15,7 @@ + #include <QTimer> + #include <QTranslator> + ++#include <time.h> + #include "FaviconCache.h" + + class AddData; diff --git a/net-p2p/transmission-cli/files/patch-qt_qtr_pro b/net-p2p/transmission-cli/files/patch-qt_qtr_pro deleted file mode 100644 index e45d21405a03..000000000000 --- a/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 - diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist index 0246e9eb8d94..4c1fdcc0b011 100644 --- a/net-p2p/transmission-cli/pkg-plist +++ b/net-p2p/transmission-cli/pkg-plist @@ -7,5 +7,8 @@ man/man1/transmission-create.1.gz 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 diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile index d865d48c14cb..0abf6e278190 100644 --- a/net-p2p/transmission-daemon/Makefile +++ b/net-p2p/transmission-daemon/Makefile @@ -2,28 +2,18 @@ PKGNAMESUFFIX= -daemon -MAINTAINER= crees@FreeBSD.org -COMMENT= Fast and lightweight daemon BitTorrent client +USES= ssl +NLS_USES= gettext-runtime:run -RUN_DEPENDS= ${GEN_RUN_DEPENDS} - -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 -EXTRA_CONF_ARGS=--disable-cli \ - --enable-daemon \ - --without-gtk \ - --disable-mac \ - --disable-nls +MASTERDIR= ${.CURDIR}/../transmission-cli +DESCR= ${.CURDIR}/pkg-descr +PKGMESSAGE= ${.CURDIR}/pkg-message +PLIST= ${.CURDIR}/pkg-plist -post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/home +SLAVEPORT= daemon .include "${MASTERDIR}/Makefile" diff --git a/net-p2p/transmission-daemon/pkg-plist b/net-p2p/transmission-daemon/pkg-plist index e6d038dfb5fb..32d7f6fb2bf3 100644 --- a/net-p2p/transmission-daemon/pkg-plist +++ b/net-p2p/transmission-daemon/pkg-plist @@ -3,6 +3,9 @@ bin/transmission-remote 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 diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile index 4b7270ab7d59..24ad95c6b113 100644 --- a/net-p2p/transmission-gtk/Makefile +++ b/net-p2p/transmission-gtk/Makefile @@ -2,33 +2,18 @@ PKGNAMESUFFIX= -gtk -MAINTAINER= crees@FreeBSD.org -COMMENT= Fast and lightweight GTK+3 BitTorrent client +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ + libnotify.so:devel/libnotify +RUN_DEPENDS= xdg-open:devel/xdg-utils -LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ - libnotify.so:devel/libnotify \ - libdbus-glib-1.so:devel/dbus-glib +USES= desktop-file-utils ssl +NLS_USES= gettext-tools:build +USE_GNOME= cairo gdkpixbuf2 glib20 gtk30 intlhack pango -RUN_DEPENDS= ${GEN_RUN_DEPENDS} \ - xdg-open:devel/xdg-utils - -DESCR= ${.CURDIR}/pkg-descr MASTERDIR= ${.CURDIR}/../transmission-cli +DESCR= ${.CURDIR}/pkg-descr 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" diff --git a/net-p2p/transmission-gtk/pkg-plist b/net-p2p/transmission-gtk/pkg-plist index c98d2602f70e..31bb08a264c1 100644 --- a/net-p2p/transmission-gtk/pkg-plist +++ b/net-p2p/transmission-gtk/pkg-plist @@ -2,8 +2,11 @@ bin/transmission-gtk 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/gv/LC_MESSAGES/transmission-gtk.mo 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/uz/LC_MESSAGES/transmission-gtk.mo 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 diff --git a/net-p2p/transmission-qt/Makefile b/net-p2p/transmission-qt/Makefile new file mode 100644 index 000000000000..ce985418e543 --- /dev/null +++ b/net-p2p/transmission-qt/Makefile @@ -0,0 +1,36 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -${FLAVOR} + +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 + +.if ${FLAVOR} == qt4 +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 + +MASTERDIR= ${.CURDIR}/../transmission-cli +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist + +SLAVEPORT= qt + +.include "${MASTERDIR}/Makefile" diff --git a/net-p2p/transmission-qt4/pkg-descr b/net-p2p/transmission-qt/pkg-descr index 9dd906c99b94..cc3899d15694 100644 --- a/net-p2p/transmission-qt4/pkg-descr +++ b/net-p2p/transmission-qt/pkg-descr @@ -1,4 +1,4 @@ -A fast and lightweight Qt4 BitTorrent client, loosely based on the GTK+ client. +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 diff --git a/net-p2p/transmission-qt/pkg-plist b/net-p2p/transmission-qt/pkg-plist new file mode 100644 index 000000000000..6dd71202fc0c --- /dev/null +++ b/net-p2p/transmission-qt/pkg-plist @@ -0,0 +1,25 @@ +bin/transmission-qt +man/man1/transmission-qt.1.gz +share/applications/transmission-qt.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 +%%DATADIR%%/translations/transmission_de.qm +%%DATADIR%%/translations/transmission_en.qm +%%DATADIR%%/translations/transmission_es.qm +%%DATADIR%%/translations/transmission_eu.qm +%%DATADIR%%/translations/transmission_fr.qm +%%DATADIR%%/translations/transmission_hu.qm +%%DATADIR%%/translations/transmission_id.qm +%%DATADIR%%/translations/transmission_it_IT.qm +%%DATADIR%%/translations/transmission_kk.qm +%%DATADIR%%/translations/transmission_ko.qm +%%DATADIR%%/translations/transmission_lt.qm +%%DATADIR%%/translations/transmission_pl_PL.qm +%%DATADIR%%/translations/transmission_pt_BR.qm +%%DATADIR%%/translations/transmission_ru.qm +%%DATADIR%%/translations/transmission_uk.qm +%%DATADIR%%/translations/transmission_zh_CN.qm diff --git a/net-p2p/transmission-qt4/Makefile b/net-p2p/transmission-qt4/Makefile deleted file mode 100644 index 7fafc40e110d..000000000000 --- a/net-p2p/transmission-qt4/Makefile +++ /dev/null @@ -1,52 +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 - -USE_QT= moc_build qmake_build uic_build rcc_build \ - corelib gui dbus network xml -USES= compiler:c++11-lib desktop-file-utils qmake:no_env qt:4 - -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" diff --git a/net-p2p/transmission-qt4/pkg-plist b/net-p2p/transmission-qt4/pkg-plist deleted file mode 100644 index d517a255aea6..000000000000 --- a/net-p2p/transmission-qt4/pkg-plist +++ /dev/null @@ -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 diff --git a/net-p2p/transmission-qt5/Makefile b/net-p2p/transmission-qt5/Makefile deleted file mode 100644 index fd04d9c8d2fe..000000000000 --- a/net-p2p/transmission-qt5/Makefile +++ /dev/null @@ -1,52 +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 - -USE_QT= buildtools_build qmake_build core dbus gui network widgets -USES= compiler:c++11-lib desktop-file-utils qmake:no_env qt:5 - -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" diff --git a/net-p2p/transmission-qt5/pkg-descr b/net-p2p/transmission-qt5/pkg-descr deleted file mode 100644 index 078dff87eff3..000000000000 --- a/net-p2p/transmission-qt5/pkg-descr +++ /dev/null @@ -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/ diff --git a/net-p2p/transmission-qt5/pkg-plist b/net-p2p/transmission-qt5/pkg-plist deleted file mode 100644 index b7c26441c004..000000000000 --- a/net-p2p/transmission-qt5/pkg-plist +++ /dev/null @@ -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 diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile index c3693a984e7f..b283fead8db6 100644 --- a/net-p2p/transmission/Makefile +++ b/net-p2p/transmission/Makefile @@ -1,18 +1,33 @@ # $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 +LICENSE= GPLv2+ MIT +LICENSE_COMB= multi -CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.[56]* +USES= metaport -USES= metaport +OPTIONS_DEFINE= CLI DAEMON GTK QT4 QT5 WEB + +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-qt:net-p2p/transmission-qt@qt4 +QT5_RUN_DEPENDS= transmission-qt:net-p2p/transmission-qt@qt5 +WEB_RUN_DEPENDS= ${DATADIR}/web/index.html:www/transmission-web .include <bsd.port.mk> diff --git a/www/transmission-web/Makefile b/www/transmission-web/Makefile index 466d192d8d0a..868be532d17a 100644 --- a/www/transmission-web/Makefile +++ b/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 +#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) +#do-install: +# ( cd ${WRKSRC} && ${COPYTREE_SHARE} web ${STAGEDIR}${DATADIR} ) .include "${MASTERDIR}/Makefile" |