svn commit: r362440 - in head/net-p2p: transmission transmission-cli transmission-cli/files transmission-daemon

[Chris Rees]

Author: crees
Date: Mon Jul 21 15:02:21 2014
New Revision: 362440
URL: http://svnweb.freebsd.org/changeset/ports/362440
QAT: https://qat.redports.org/buildarchive/r362440/

Log:
  Update to 2.84
  
  PR:		ports/191592
  Submitted by:	Andrew Berg

Added:
  head/net-p2p/transmission-cli/files/patch-qt-mainwin.cc   (contents, props changed)
Deleted:
  head/net-p2p/transmission-cli/files/patch-qt_favicon_cc
  head/net-p2p/transmission-cli/files/patch-qt_file-tree_cc
  head/net-p2p/transmission-cli/files/patch-qt_torrent-filter_cc
Modified:
  head/net-p2p/transmission-cli/Makefile
  head/net-p2p/transmission-cli/distinfo
  head/net-p2p/transmission-daemon/Makefile
  head/net-p2p/transmission/Makefile

Modified: head/net-p2p/transmission-cli/Makefile
==============================================================================
--- head/net-p2p/transmission-cli/Makefile	Mon Jul 21 14:41:42 2014	(r362439)
+++ head/net-p2p/transmission-cli/Makefile	Mon Jul 21 15:02:21 2014	(r362440)
@@ -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}/f
 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}
 

Modified: head/net-p2p/transmission-cli/distinfo
==============================================================================
--- head/net-p2p/transmission-cli/distinfo	Mon Jul 21 14:41:42 2014	(r362439)
+++ head/net-p2p/transmission-cli/distinfo	Mon Jul 21 15:02:21 2014	(r362440)
@@ -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

Added: head/net-p2p/transmission-cli/files/patch-qt-mainwin.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/transmission-cli/files/patch-qt-mainwin.cc	Mon Jul 21 15:02:21 2014	(r362440)
@@ -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<QGridLayout*> (d->layout ());
+-  if (l == nullptr)
++  auto QGridLayout * l = dynamic_cast<QGridLayout*> (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<QGridLayout*>(msgBox.layout());
+-  if (layout == nullptr)
++  auto QGridLayout * layout = dynamic_cast<QGridLayout*>(msgBox.layout());
++  if (layout == NULL)
+     {
+       layout = new QGridLayout;
+       msgBox.setLayout (layout);

Modified: head/net-p2p/transmission-daemon/Makefile
==============================================================================
--- head/net-p2p/transmission-daemon/Makefile	Mon Jul 21 14:41:42 2014	(r362439)
+++ head/net-p2p/transmission-daemon/Makefile	Mon Jul 21 15:02:21 2014	(r362440)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-daemon
 
 MAINTAINER=	crees at FreeBSD.org

Modified: head/net-p2p/transmission/Makefile
==============================================================================
--- head/net-p2p/transmission/Makefile	Mon Jul 21 14:41:42 2014	(r362439)
+++ head/net-p2p/transmission/Makefile	Mon Jul 21 15:02:21 2014	(r362440)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	transmission
-PORTVERSION=	2.82
+PORTVERSION=	2.84
 CATEGORIES=	net-p2p
 MASTER_SITES=	# empty
 DISTFILES=	# empty