From bf219f35e28b142e21f2e9eed597c61b7ede2ec6 Mon Sep 17 00:00:00 2001
From: tcberner <tcberner@FreeBSD.org>
Date: Mon, 16 Jul 2018 11:08:17 +0000
Subject: net-p2p/transmission -- fix metaport wrt to Qt-flavors, cleanup
 USE_GNOME

* the metaport was depending on both Qt-flavors
* the gtk slave had redundant dependencies (reported by kwm)

Submitted by:	lebarondemerde@privacychain.ch
Differential Revision:	https://reviews.freebsd.org/D16284
---
 net-p2p/transmission-gtk/Makefile |  5 +++--
 net-p2p/transmission/Makefile     | 20 ++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'net-p2p')

diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile
index 24ad95c6b113..ae7e7e1779d2 100644
--- a/net-p2p/transmission-gtk/Makefile
+++ b/net-p2p/transmission-gtk/Makefile
@@ -1,4 +1,5 @@
 # $FreeBSD$
+PORTREVISION=	1
 
 PKGNAMESUFFIX=	-gtk
 
@@ -6,9 +7,9 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-USES=		desktop-file-utils ssl
+USES=		desktop-file-utils gnome ssl
 NLS_USES=	gettext-tools:build
-USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intlhack pango
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intlhack pango
 
 MASTERDIR=	${.CURDIR}/../transmission-cli
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index b283fead8db6..11fce8503395 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	transmission
 DISTVERSION=	2.94
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 
 MAINTAINER=	lebarondemerde@privacychain.ch
@@ -12,16 +13,19 @@ LICENSE_COMB=	multi
 
 USES=		metaport
 
-OPTIONS_DEFINE=		CLI DAEMON GTK QT4 QT5 WEB
+OPTIONS_DEFINE=		CLI DAEMON GTK 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_RADIO=		QT
+OPTIONS_RADIO_QT=	QT4 QT5
 
-OPTIONS_DEFAULT=	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 WEB
 
 CLI_RUN_DEPENDS=	transmission-cli:net-p2p/transmission-cli
 DAEMON_RUN_DEPENDS=	transmission-daemon:net-p2p/transmission-daemon
-- 
cgit