Page MenuHomeFreeBSD
Files F153392566

D18995.id53284.diff
No OneTemporary
Actions

D18995.id53284.diff
View Options

Index: net-p2p/transmission-cli/Makefile
===================================================================
--- net-p2p/transmission-cli/Makefile
+++ net-p2p/transmission-cli/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= transmission
-DISTVERSION= 2.94
-PORTREVISION?= 3
+DISTVERSION= 2.94-383
+DISTVERSIONSUFFIX= -g4a4233fea
CATEGORIES+= net-p2p
SLAVEPORT?= cli
PKGNAMESUFFIX?= -cli
@@ -28,10 +28,12 @@
libminiupnpc.so:net/miniupnpc
USES+= cmake cpe iconv libtool localbase pkgconfig
+USE_GITHUB= yes
. if ${SLAVEPORT:Mcli}
USES+= ssl
NLS_USES= gettext-runtime:run
+CONFLICTS_INSTALL= transmission-daemon
. endif
CPE_VENDOR= transmissionbt
@@ -44,7 +46,7 @@
CMAKE_ON+= ENABLE_${SLAVEPORT:tu}
CMAKE_OFF+= ${SLAVES:N${SLAVEPORT}:tu:S/^/ENABLE_/}
-. if ${SLAVEPORT:Nweb:Ncli}
+. if ${SLAVEPORT:Nweb:Ncli:Ndaemon}
CMAKE_OFF+= ENABLE_UTILS
. endif
Index: net-p2p/transmission-cli/distinfo
===================================================================
--- net-p2p/transmission-cli/distinfo
+++ net-p2p/transmission-cli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530806424
-SHA256 (transmission-transmission-2.94_GH0.tar.gz) = 440c2fd0f89b1ab59d8a4b79ecd7bffd61bc000e36fb5b6c8e88142a4fadbb1f
-SIZE (transmission-transmission-2.94_GH0.tar.gz) = 6342775
+TIMESTAMP = 1548621386
+SHA256 (transmission-transmission-2.94-383-g4a4233fea_GH0.tar.gz) = 99b2da65a65366156804e3ebe8cb1cf18d36e0251316a34bdaa836eae48b40e5
+SIZE (transmission-transmission-2.94-383-g4a4233fea_GH0.tar.gz) = 6639762
Index: net-p2p/transmission-cli/files/patch-CMakeLists.txt
===================================================================
--- net-p2p/transmission-cli/files/patch-CMakeLists.txt
+++ net-p2p/transmission-cli/files/patch-CMakeLists.txt
@@ -1,29 +1,25 @@
---- CMakeLists.txt.orig 2018-07-09 22:28:43 UTC
+--- CMakeLists.txt.orig 2019-01-27 18:13:09 UTC
+++ CMakeLists.txt
-@@ -511,9 +511,9 @@ endif()
- # endif()
+@@ -437,7 +437,10 @@ set(NEEDED_HEADERS
+ xlocale.h)
if(ENABLE_NLS)
-- check_library_exists(intl libintl_gettext "" HAVE_LIBINTL)
-- if(HAVE_LIBINTL)
-- set(LIBINTL_LIBRARY intl)
+- list(APPEND NEEDED_HEADERS libintl.h)
+ find_package(Intl)
+ if(Intl_FOUND)
-+ set(LIBINTL_LIBRARY ${Intl_LIBRARIES})
- endif()
++ set(LIBINTL_LIBRARY ${Intl_LIBRARIES})
++ endif()
endif()
-@@ -536,13 +536,6 @@ foreach(P daemon cli utils gtk qt)
+ foreach(H ${NEEDED_HEADERS})
+@@ -545,10 +548,6 @@ foreach(P daemon cli utils gtk qt mac)
+ add_subdirectory(${P})
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)
+- tr_install_web(${CMAKE_INSTALL_DATAROOTDIR}/${TR_NAME})
-endif()
--
+
if(ENABLE_GTK AND ENABLE_NLS)
find_package(Gettext REQUIRED)
- add_subdirectory(po)
Index: net-p2p/transmission-cli/files/patch-libtransmission_tr-dht.c
===================================================================
--- net-p2p/transmission-cli/files/patch-libtransmission_tr-dht.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- libtransmission/tr-dht.c.orig 2018-12-27 04:04:08 UTC
-+++ libtransmission/tr-dht.c
-@@ -694,6 +694,11 @@ dht_random_bytes (void * buf, size_t size)
- return size;
- }
-
-+int dht_sendto(int sockfd, void const* buf, int len, int flags, struct sockaddr const* to, int tolen)
-+{
-+ return sendto(sockfd, buf, len, flags, to, tolen);
-+}
-+
- #if defined (_WIN32) && !defined (__MINGW32__)
- int
- dht_gettimeofday (struct timeval * tv, struct timezone * tz)
Index: net-p2p/transmission-cli/pkg-plist
===================================================================
--- net-p2p/transmission-cli/pkg-plist
+++ net-p2p/transmission-cli/pkg-plist
@@ -1,14 +1,16 @@
bin/transmission-cli
bin/transmission-create
bin/transmission-edit
+bin/transmission-remote
bin/transmission-show
man/man1/transmission-cli.1.gz
man/man1/transmission-create.1.gz
man/man1/transmission-edit.1.gz
+man/man1/transmission-remote.1.gz
man/man1/transmission-show.1.gz
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
%%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
@@ -1,10 +1,11 @@
# $FreeBSD$
-PORTREVISION= 3
PKGNAMESUFFIX= -daemon
USES= ssl
NLS_USES= gettext-runtime:run
+
+CONFLICTS_INSTALL= transmission-cli
USERS= transmission
GROUPS= transmission
Index: net-p2p/transmission-daemon/pkg-plist
===================================================================
--- net-p2p/transmission-daemon/pkg-plist
+++ net-p2p/transmission-daemon/pkg-plist
@@ -1,11 +1,17 @@
+bin/transmission-create
bin/transmission-daemon
+bin/transmission-edit
bin/transmission-remote
+bin/transmission-show
+man/man1/transmission-create.1.gz
man/man1/transmission-daemon.1.gz
+man/man1/transmission-edit.1.gz
man/man1/transmission-remote.1.gz
+man/man1/transmission-show.1.gz
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
%%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
@@ -1,6 +1,5 @@
# $FreeBSD$
-PORTREVISION= 4
PKGNAMESUFFIX= -gtk
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \
Index: net-p2p/transmission-gtk/pkg-plist
===================================================================
--- net-p2p/transmission-gtk/pkg-plist
+++ net-p2p/transmission-gtk/pkg-plist
@@ -1,10 +1,11 @@
bin/transmission-gtk
man/man1/transmission-gtk.1.gz
+share/appdata/transmission-gtk.appdata.xml
share/applications/transmission-gtk.desktop
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/rpc-spec.txt
%%PORTDOCS%%%%DOCSDIR%%/send-email-when-torrent-done.sh
share/icons/hicolor/16x16/apps/transmission.png
@@ -14,12 +15,12 @@
share/icons/hicolor/32x32/apps/transmission.png
share/icons/hicolor/48x48/apps/transmission.png
share/icons/hicolor/scalable/apps/transmission.svg
+share/icons/hicolor/symbolic/apps/transmission-symbolic.svg
%%NLS%%share/locale/an/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ar/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ast/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/az/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/be/LC_MESSAGES/transmission-gtk.mo
-%%NLS%%share/locale/be@latin/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/bg/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/bn/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/bo/LC_MESSAGES/transmission-gtk.mo
@@ -30,6 +31,7 @@
%%NLS%%share/locale/ceb/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ckb/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/cs/LC_MESSAGES/transmission-gtk.mo
+%%NLS%%share/locale/cy/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/da/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/de/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/el/LC_MESSAGES/transmission-gtk.mo
@@ -45,6 +47,7 @@
%%NLS%%share/locale/fil/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/fo/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/fr/LC_MESSAGES/transmission-gtk.mo
+%%NLS%%share/locale/fr_CA/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ga/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/gl/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/gv/LC_MESSAGES/transmission-gtk.mo
@@ -58,6 +61,7 @@
%%NLS%%share/locale/is/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/it/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ja/LC_MESSAGES/transmission-gtk.mo
+%%NLS%%share/locale/jbo/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ka/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/kk/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/ko/LC_MESSAGES/transmission-gtk.mo
@@ -90,7 +94,7 @@
%%NLS%%share/locale/sr/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/sv/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/sw/LC_MESSAGES/transmission-gtk.mo
-%%NLS%%share/locale/ta_LK/LC_MESSAGES/transmission-gtk.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/te/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/th/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/tl/LC_MESSAGES/transmission-gtk.mo
@@ -101,4 +105,5 @@
%%NLS%%share/locale/uz/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/vi/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/transmission-gtk.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/transmission-gtk.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/transmission-gtk.mo
Index: net-p2p/transmission-qt/Makefile
===================================================================
--- net-p2p/transmission-qt/Makefile
+++ net-p2p/transmission-qt/Makefile
@@ -1,36 +1,15 @@
# $FreeBSD$
-PORTREVISION= 7
-PKGNAMESUFFIX= -${FLAVOR}
+PKGNAMESUFFIX= -qt
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
+USES= compiler:c++11-lang 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
+CMAKE_ON= USE_QT
MASTERDIR= ${.CURDIR}/../transmission-cli
DESCR= ${.CURDIR}/pkg-descr
Index: net-p2p/transmission-qt/pkg-plist
===================================================================
--- net-p2p/transmission-qt/pkg-plist
+++ net-p2p/transmission-qt/pkg-plist
@@ -4,7 +4,7 @@
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/rpc-spec.txt
%%PORTDOCS%%%%DOCSDIR%%/send-email-when-torrent-done.sh
%%NLS%%%%DATADIR%%/translations/transmission_de.qm
@@ -15,11 +15,16 @@
%%NLS%%%%DATADIR%%/translations/transmission_hu.qm
%%NLS%%%%DATADIR%%/translations/transmission_id.qm
%%NLS%%%%DATADIR%%/translations/transmission_it_IT.qm
+%%NLS%%%%DATADIR%%/translations/transmission_ka.qm
%%NLS%%%%DATADIR%%/translations/transmission_kk.qm
%%NLS%%%%DATADIR%%/translations/transmission_ko.qm
%%NLS%%%%DATADIR%%/translations/transmission_lt.qm
-%%NLS%%%%DATADIR%%/translations/transmission_pl_PL.qm
+%%NLS%%%%DATADIR%%/translations/transmission_nl.qm
+%%NLS%%%%DATADIR%%/translations/transmission_pl.qm
%%NLS%%%%DATADIR%%/translations/transmission_pt_BR.qm
+%%NLS%%%%DATADIR%%/translations/transmission_pt_PT.qm
%%NLS%%%%DATADIR%%/translations/transmission_ru.qm
+%%NLS%%%%DATADIR%%/translations/transmission_sv.qm
+%%NLS%%%%DATADIR%%/translations/transmission_tr.qm
%%NLS%%%%DATADIR%%/translations/transmission_uk.qm
%%NLS%%%%DATADIR%%/translations/transmission_zh_CN.qm
Index: net-p2p/transmission/Makefile
===================================================================
--- net-p2p/transmission/Makefile
+++ net-p2p/transmission/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= transmission
-DISTVERSION= 2.94
-PORTREVISION= 2
+DISTVERSION= 3.00
CATEGORIES= net-p2p
MAINTAINER= rigoletto@FreeBSD.org
@@ -13,25 +12,19 @@
USES= metaport
-OPTIONS_DEFINE= CLI DAEMON GTK WEB
+OPTIONS_DEFINE= CLI DAEMON GTK WEB QT
+OPTIONS_DEFAULT= CLI DAEMON GTK WEB QT
-OPTIONS_RADIO= QT
-OPTIONS_RADIO_QT= QT4 QT5
-
CLI_DESC= Command line version
DAEMON_DESC= Daemon version
GTK_DESC= GTK version
-QT4_DESC= Qt4 version
-QT5_DESC= Qt5 version
+QT_DESC= Qt version
WEB_DESC= Web client
-OPTIONS_DEFAULT= CLI DAEMON GTK QT4 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
+QT_RUN_DEPENDS= transmission-qt:net-p2p/transmission-qt
WEB_RUN_DEPENDS= ${DATADIR}/web/index.html:www/transmission-web
.include <bsd.port.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 9:46 PM (17 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31935119
Default Alt Text
D18995.id53284.diff (12 KB)

Event Timeline