svn commit: r474704 - in head: . net-p2p net-p2p/transmission net-p2p/transmission-cli net-p2p/transmission-cli/files net-p2p/transmission-daemon net-p2p/transmission-gtk net-p2p/transmission-qt ne...
Tobias C. Berner
tcberner at FreeBSD.org
Sun Jul 15 17:01:10 UTC 2018
Author: tcberner
Date: Sun Jul 15 17:01:05 2018
New Revision: 474704
URL: https://svnweb.freebsd.org/changeset/ports/474704
Log:
net-p2p/transmission* -- update and falvorize
* update to 2.94
* flavorize the Qt frontends
* give maintainership to lebarondemerde at privacychain.ch
PR: 226710
Approved by: portmgr (mat), crees (previous maintainer)
Differential Revision: https://reviews.freebsd.org/D14699
Added:
head/net-p2p/transmission-cli/files/patch-CMakeLists.txt (contents, props changed)
head/net-p2p/transmission-cli/files/patch-cmake_FindDHT.cmake (contents, props changed)
head/net-p2p/transmission-cli/files/patch-libtransmission_CMakeLists.txt (contents, props changed)
head/net-p2p/transmission-cli/files/patch-qt_Application.h (contents, props changed)
head/net-p2p/transmission-qt/
- copied from r474703, head/net-p2p/transmission-qt4/
Deleted:
head/net-p2p/transmission-cli/files/disable-web
head/net-p2p/transmission-cli/files/patch-configure
head/net-p2p/transmission-cli/files/patch-fix-with-libressl
head/net-p2p/transmission-cli/files/patch-fix_without_ipv6
head/net-p2p/transmission-cli/files/patch-libtransmission_crypto-utils-openssl.c
head/net-p2p/transmission-cli/files/patch-qt-app-h
head/net-p2p/transmission-cli/files/patch-qt_qtr_pro
head/net-p2p/transmission-qt4/
head/net-p2p/transmission-qt5/
Modified:
head/MOVED
head/net-p2p/Makefile
head/net-p2p/transmission-cli/Makefile
head/net-p2p/transmission-cli/distinfo
head/net-p2p/transmission-cli/pkg-plist
head/net-p2p/transmission-daemon/Makefile
head/net-p2p/transmission-daemon/pkg-plist
head/net-p2p/transmission-gtk/Makefile
head/net-p2p/transmission-gtk/pkg-plist
head/net-p2p/transmission-qt/Makefile
head/net-p2p/transmission-qt/pkg-descr
head/net-p2p/transmission-qt/pkg-plist
head/net-p2p/transmission/Makefile
head/www/transmission-web/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Jul 15 16:57:54 2018 (r474703)
+++ head/MOVED Sun Jul 15 17:01:05 2018 (r474704)
@@ -10328,3 +10328,5 @@ textproc/kibana46|textproc/kibana5|2018-07-10|Has expi
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 at qt4|2018-07-15|Moved into flavored version
+net-p2p/transmission-qt5|net-p2p/transmission-qt at qt5|2018-07-15|Moved into flavored version
Modified: head/net-p2p/Makefile
==============================================================================
--- head/net-p2p/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -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
Modified: head/net-p2p/transmission-cli/Makefile
==============================================================================
--- head/net-p2p/transmission-cli/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-cli/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -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 at FreeBSD.org
-COMMENT?= Lightweight CLI (command line) BitTorrent client and utilities
+MAINTAINER= lebarondemerde at privacychain.ch
+COMMENT= Meta-port for Transmission BitTorrent client
-SLAVEPORT?= cli
-
-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
-CONFLICTS_INSTALL= ${PORTNAME}${PKGNAMESUFFIX}-2.5*
+USES+= cmake:outsource cpe iconv libtool localbase pkgconfig
-EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
+. if ${SLAVEPORT:Mcli}
+USES+= ssl
+NLS_USES= gettext-runtime:run
+. endif
-.if ${SLAVEPORT} != web
-LIB_DEPENDS?= ${GEN_LIB_DEPENDS}
+CPE_VENDOR= transmissionbt
+.endif
-# 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
+USE_GITHUB= yes
-# 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 at .+@ac_cv_func_iconv=yes@}
-CONFIGURE_ARGS= --without-inotify \
- --enable-external-b64 \
- --enable-external-dht \
- --enable-external-natpmp \
- ${EXTRA_CONF_ARGS}
+.if ${SLAVEPORT} != web
+SLAVES= cli daemon gtk qt
+CMAKE_ON+= ENABLE_${SLAVEPORT:tu}
+CMAKE_OFF+= ${SLAVES:N${SLAVEPORT}:tu:S/^/ENABLE_/}
-EXTRA_CONF_ARGS?=--enable-cli \
- --disable-daemon \
- --without-gtk \
- --disable-mac \
- --disable-nls
+. if ${SLAVEPORT:Nweb:Ncli}
+CMAKE_OFF+= ENABLE_UTILS
+. endif
-EXTRA_PATCHES= ${PATCHDIR}/disable-web
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${SLAVEPORT}
+CMAKE_ARGS+= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
-OPTIONS_DEFINE+= DOCS LITE
-OPTIONS_DEFAULT+= OPENSSL
-OPTIONS_SINGLE+= SSL
-OPTIONS_SINGLE_SSL+= OPENSSL WOLFSSL
+OPTIONS_DEFINE+= DOCS LITE NLS
+OPTIONS_SUB= yes
+OPTIONS_DEFAULT= OPENSSL
-LITE_CONFIGURE_ENABLE= lightweight
+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
+WOLFSSL_CMAKE_ARGS= -DWITH_CRYPTO="cyassl"
-DOCS= AUTHORS NEWS README
-DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-
-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
+LITE_CONFIGURE_ENABLE= lightweight
+LITE_CMAKE_BOOL= ENABLE_LIGHTWEIGHT
.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
+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>
Modified: head/net-p2p/transmission-cli/distinfo
==============================================================================
--- head/net-p2p/transmission-cli/distinfo Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-cli/distinfo Sun Jul 15 17:01:05 2018 (r474704)
@@ -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
Added: head/net-p2p/transmission-cli/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-p2p/transmission-cli/files/patch-CMakeLists.txt Sun Jul 15 17:01:05 2018 (r474704)
@@ -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)
Added: head/net-p2p/transmission-cli/files/patch-cmake_FindDHT.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-p2p/transmission-cli/files/patch-cmake_FindDHT.cmake Sun Jul 15 17:01:05 2018 (r474704)
@@ -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})
Added: head/net-p2p/transmission-cli/files/patch-libtransmission_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-p2p/transmission-cli/files/patch-libtransmission_CMakeLists.txt Sun Jul 15 17:01:05 2018 (r474704)
@@ -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()
Added: head/net-p2p/transmission-cli/files/patch-qt_Application.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-p2p/transmission-cli/files/patch-qt_Application.h Sun Jul 15 17:01:05 2018 (r474704)
@@ -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;
Modified: head/net-p2p/transmission-cli/pkg-plist
==============================================================================
--- head/net-p2p/transmission-cli/pkg-plist Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-cli/pkg-plist Sun Jul 15 17:01:05 2018 (r474704)
@@ -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
Modified: head/net-p2p/transmission-daemon/Makefile
==============================================================================
--- head/net-p2p/transmission-daemon/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-daemon/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -2,28 +2,18 @@
PKGNAMESUFFIX= -daemon
-MAINTAINER= crees at FreeBSD.org
-COMMENT= Fast and lightweight daemon BitTorrent client
+USES= ssl
+NLS_USES= gettext-runtime:run
-RUN_DEPENDS= ${GEN_RUN_DEPENDS}
+USERS= transmission
+GROUPS= transmission
+USE_RC_SUBR= transmission
-DESCR= ${.CURDIR}/pkg-descr
MASTERDIR= ${.CURDIR}/../transmission-cli
-PLIST= ${.CURDIR}/pkg-plist
-SLAVEPORT= daemon
+DESCR= ${.CURDIR}/pkg-descr
PKGMESSAGE= ${.CURDIR}/pkg-message
+PLIST= ${.CURDIR}/pkg-plist
-USE_RC_SUBR= transmission
-USERS= transmission
-GROUPS= transmission
-
-EXTRA_CONF_ARGS=--disable-cli \
- --enable-daemon \
- --without-gtk \
- --disable-mac \
- --disable-nls
-
-post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}/home
+SLAVEPORT= daemon
.include "${MASTERDIR}/Makefile"
Modified: head/net-p2p/transmission-daemon/pkg-plist
==============================================================================
--- head/net-p2p/transmission-daemon/pkg-plist Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-daemon/pkg-plist Sun Jul 15 17:01:05 2018 (r474704)
@@ -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
Modified: head/net-p2p/transmission-gtk/Makefile
==============================================================================
--- head/net-p2p/transmission-gtk/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-gtk/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -2,33 +2,18 @@
PKGNAMESUFFIX= -gtk
-MAINTAINER= crees at 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"
Modified: head/net-p2p/transmission-gtk/pkg-plist
==============================================================================
--- head/net-p2p/transmission-gtk/pkg-plist Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-gtk/pkg-plist Sun Jul 15 17:01:05 2018 (r474704)
@@ -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
Modified: head/net-p2p/transmission-qt/Makefile
==============================================================================
--- head/net-p2p/transmission-qt4/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-qt/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -1,52 +1,36 @@
# $FreeBSD$
-PKGNAMESUFFIX= -qt4
+PKGNAMESUFFIX= -${FLAVOR}
-MAINTAINER= crees at FreeBSD.org
-COMMENT= Fast and lightweight Qt4 BitTorrent client
-
-LIB_DEPENDS= ${GEN_LIB_DEPENDS} \
- libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
-RUN_DEPENDS= ${GEN_RUN_DEPENDS}
-CONFLICTS_INSTALL= transmission-qt5-[0-9]*
+FLAVORS= qt4 qt5
+FLAVOR?= ${FLAVORS:[1]}
-DESCR= ${.CURDIR}/pkg-descr
-MASTERDIR= ${.CURDIR}/../transmission-cli
-PLIST= ${.CURDIR}/pkg-plist
-SLAVEPORT= qt4
+qt4_CONFLICTS_INSTALL= transmission-qt5
+qt5_CONFLICTS_INSTALL= transmission-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
+.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
-EXTRA_CONF_ARGS=--disable-cli \
- --disable-daemon \
- --without-gtk \
- --disable-mac \
- --disable-nls
+.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
-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
+MASTERDIR= ${.CURDIR}/../transmission-cli
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
-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
+SLAVEPORT= qt
.include "${MASTERDIR}/Makefile"
Modified: head/net-p2p/transmission-qt/pkg-descr
==============================================================================
--- head/net-p2p/transmission-qt4/pkg-descr Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-qt/pkg-descr Sun Jul 15 17:01:05 2018 (r474704)
@@ -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
Modified: head/net-p2p/transmission-qt/pkg-plist
==============================================================================
--- head/net-p2p/transmission-qt4/pkg-plist Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission-qt/pkg-plist Sun Jul 15 17:01:05 2018 (r474704)
@@ -2,7 +2,24 @@ 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%%/README-qt4
-share/pixmaps/transmission-qt.png
+%%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
Modified: head/net-p2p/transmission/Makefile
==============================================================================
--- head/net-p2p/transmission/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/net-p2p/transmission/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -1,18 +1,33 @@
# $FreeBSD$
PORTNAME= transmission
-PORTVERSION= 2.93
+DISTVERSION= 2.94
CATEGORIES= net-p2p
-MAINTAINER= crees at FreeBSD.org
+MAINTAINER= lebarondemerde at 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 at qt4
+QT5_RUN_DEPENDS= transmission-qt:net-p2p/transmission-qt at qt5
+WEB_RUN_DEPENDS= ${DATADIR}/web/index.html:www/transmission-web
.include <bsd.port.mk>
Modified: head/www/transmission-web/Makefile
==============================================================================
--- head/www/transmission-web/Makefile Sun Jul 15 16:57:54 2018 (r474703)
+++ head/www/transmission-web/Makefile Sun Jul 15 17:01:05 2018 (r474704)
@@ -1,25 +1,24 @@
# $FreeBSD$
-CATEGORIES= www net-p2p
+CATEGORIES= www
PKGNAMESUFFIX= -web
-MAINTAINER= crees at 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
+#post-extract:
+# @${FIND} ${WRKSRC}/web \( -name '*.am' -o -name '*.in' \
+ -o -name '*.scss' \) -delete
-NO_BUILD= yes
-
-post-extract:
- @${FIND} ${WRKSRC}/web -name Makefile.* -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"
More information about the svn-ports-all
mailing list