diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile index 9cf6a5edb5c6..ceedda057ba9 100644 --- a/net-p2p/transmission-cli/Makefile +++ b/net-p2p/transmission-cli/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.82 +PORTVERSION= 2.84 PORTREVISION?= 0 CATEGORIES?= net-p2p #MASTER_SITES= http://download.m0k.org/${PORTNAME}/files/ @@ -36,13 +36,15 @@ GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web # This is master port of transmission-*, so don't override USES definition -USES+= gmake pkgconfig iconv +USES+= gmake pkgconfig iconv tar:xz USE_OPENSSL= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS=--with-zlib=/usr \ ${EXTRA_CONF_ARGS} +CONFIGURE_ENV+= OPENSSL_LIBS=${OPENSSL_LDFLAGS} \ + OPENSSL_CFLAGS=${OPENSSL_CFLAGS},-I${OPENSSLINC} EXTRA_CONF_ARGS?=--enable-cli \ --disable-daemon \ --without-gtk \ @@ -56,8 +58,6 @@ CONFIGURE_ARGS+=--enable-lightweight EXTRA_PATCHES= ${PATCHDIR}/disable-web .endif -USE_XZ= yes - DOCS= AUTHORS NEWS README DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} diff --git a/net-p2p/transmission-cli/distinfo b/net-p2p/transmission-cli/distinfo index b165058f696a..0aca3372c13f 100644 --- a/net-p2p/transmission-cli/distinfo +++ b/net-p2p/transmission-cli/distinfo @@ -1,2 +1,2 @@ -SHA256 (transmission-2.82.tar.xz) = 3996651087df67a85f1e1b4a92b1b518ddefdd84c654b8df6fbccb0b91f03522 -SIZE (transmission-2.82.tar.xz) = 3172024 +SHA256 (transmission-2.84.tar.xz) = a9fc1936b4ee414acc732ada04e84339d6755cd0d097bcbd11ba2cfc540db9eb +SIZE (transmission-2.84.tar.xz) = 3077836 diff --git a/net-p2p/transmission-cli/files/patch-qt-mainwin.cc b/net-p2p/transmission-cli/files/patch-qt-mainwin.cc new file mode 100644 index 000000000000..aa78bf01cfeb --- /dev/null +++ b/net-p2p/transmission-cli/files/patch-qt-mainwin.cc @@ -0,0 +1,24 @@ +--- qt/mainwin.cc.orig 2014-07-21 14:31:59.381934558 +0100 ++++ qt/mainwin.cc 2014-07-21 14:35:42.020934743 +0100 +@@ -1165,8 +1165,8 @@ + QCheckBox * b = new QCheckBox (tr ("Show &options dialog")); + b->setChecked (myPrefs.getBool (Prefs::OPTIONS_PROMPT)); + b->setObjectName (SHOW_OPTIONS_CHECKBOX_NAME); +- auto l = dynamic_cast (d->layout ()); +- if (l == nullptr) ++ auto QGridLayout * l = dynamic_cast (d->layout ()); ++ if (l == NULL) + { + l = new QGridLayout; + d->setLayout (l); +@@ -1313,8 +1313,8 @@ + msgBox.setDefaultButton (QMessageBox::Cancel); + msgBox.setIcon (QMessageBox::Question); + // hack needed to keep the dialog from being too narrow +- auto layout = dynamic_cast(msgBox.layout()); +- if (layout == nullptr) ++ auto QGridLayout * layout = dynamic_cast(msgBox.layout()); ++ if (layout == NULL) + { + layout = new QGridLayout; + msgBox.setLayout (layout); diff --git a/net-p2p/transmission-cli/files/patch-qt_favicon_cc b/net-p2p/transmission-cli/files/patch-qt_favicon_cc deleted file mode 100644 index f78999581cea..000000000000 --- a/net-p2p/transmission-cli/files/patch-qt_favicon_cc +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD$ ---- qt/favicon.cc.orig Fri Aug 9 04:45:47 2013 -+++ qt/favicon.cc Thu Aug 22 16:39:50 2013 -@@ -14,7 +14,12 @@ - #include - #include - #include -+ -+#if QT_VERSION >= 0x050000 - #include -+#else -+#include -+#endif - - #include "favicon.h" - -@@ -40,7 +45,11 @@ Favicons :: ~Favicons( ) - QString - Favicons :: getCacheDir( ) - { -+#if QT_VERSION >= 0x050000 - const QString base = QStandardPaths::writableLocation (QStandardPaths::CacheLocation); -+#else -+ const QString base = QDesktopServices::storageLocation( QDesktopServices::CacheLocation ); -+#endif - return QDir( base ).absoluteFilePath( "favicons" ); - } - diff --git a/net-p2p/transmission-cli/files/patch-qt_file-tree_cc b/net-p2p/transmission-cli/files/patch-qt_file-tree_cc deleted file mode 100644 index 3ca53511a0ef..000000000000 --- a/net-p2p/transmission-cli/files/patch-qt_file-tree_cc +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD$ ---- qt/file-tree.cc.orig Fri Aug 9 04:45:54 2013 -+++ qt/file-tree.cc Thu Aug 22 16:40:53 2013 -@@ -885,7 +885,11 @@ FileTreeView :: FileTreeView (QWidget * parent, bool i - for (int i=0; i= 0x050000 - header()->setSectionResizeMode(i, QHeaderView::Interactive); -+#else -+ header()->setResizeMode(i, QHeaderView::Interactive); -+#endif - } - - connect (this, SIGNAL(clicked(const QModelIndex&)), diff --git a/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc b/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc deleted file mode 100644 index 0beebf73291f..000000000000 --- a/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD$ ---- qt/torrent-filter.cc.orig Sat Jul 6 22:21:17 2013 -+++ qt/torrent-filter.cc Sat Jul 6 22:29:10 2013 -@@ -211,7 +211,7 @@ TorrentFilter :: hiddenRowCount( ) const - void - TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const - { -- std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0); -+ std::fill_n (setmeCounts, int(FilterMode::NUM_MODES), 0); - - for (int row(0); ; ++row) - { diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile index bc2c0211393c..4ccb83373052 100644 --- a/net-p2p/transmission-daemon/Makefile +++ b/net-p2p/transmission-daemon/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= -daemon MAINTAINER= crees@FreeBSD.org diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile index 39c7e71dc1ea..a10a41d8ccdc 100644 --- a/net-p2p/transmission/Makefile +++ b/net-p2p/transmission/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= transmission -PORTVERSION= 2.82 +PORTVERSION= 2.84 CATEGORIES= net-p2p MASTER_SITES= # empty DISTFILES= # empty