net-p2p/transmission: Allow all variants to be installed concurrently

- split utils in a separated port

PR:		246272
Differential Revision:	https://reviews.freebsd.org/D24851

10 files changed, 52 insertions, 28 deletions

diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index ec3ebdaa6679..2c84c3257aaf 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -91,6 +91,7 @@
     SUBDIR += transmission-gtk
     SUBDIR += transmission-qt
     SUBDIR += transmission-remote-gui
+    SUBDIR += transmission-utils
     SUBDIR += udpt
     SUBDIR += uhub
     SUBDIR += vuze
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index 4d6648ef3e67..74eb0f35bc70 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	transmission
 DISTVERSION=	3.00
+PORTREVISION=	1
 CATEGORIES+=	net-p2p
 SLAVEPORT?=	cli
 PKGNAMESUFFIX?=	-cli
@@ -30,7 +31,6 @@ USES+=		cmake cpe iconv libtool localbase pkgconfig ssl
 
 .  if ${SLAVEPORT:Mcli}
 NLS_USES=	gettext-runtime:run
-CONFLICTS_INSTALL=      transmission-daemon
 .  endif
 
 CPE_VENDOR=	transmissionbt
@@ -39,15 +39,15 @@ CPE_VENDOR=	transmissionbt
 USE_GITHUB=	yes
 GH_TAGNAME=	3ef10de6d97d8cf181fdef81cc435d6a84c86000
 
-.if ${SLAVEPORT} != web
-SLAVES=		cli daemon gtk qt
+.if ${SLAVEPORT:Nutils}
+CMAKE_OFF+=	ENABLE_UTILS
+.endif
+
+.if ${SLAVEPORT:Nweb}
+SLAVES=		cli daemon gtk qt utils
 CMAKE_ON+=	ENABLE_${SLAVEPORT:tu}
 CMAKE_OFF+=	${SLAVES:N${SLAVEPORT}:tu:S/^/ENABLE_/}
 
-.  if ${SLAVEPORT:Nweb:Ncli:Ndaemon}
-CMAKE_OFF+=	ENABLE_UTILS
-.  endif
-
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${SLAVEPORT}
 CMAKE_ARGS+=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
 
@@ -55,7 +55,6 @@ OPTIONS_DEFINE+=	DOCS LITE NLS
 OPTIONS_SUB=		yes
 
 NLS_CMAKE_BOOL=		ENABLE_NLS
-
 LITE_CMAKE_BOOL=	ENABLE_LIGHTWEIGHT
 .endif
 
diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist
index c08e52f0a7ee..3919868bf1f2 100644
--- a/net-p2p/transmission-cli/pkg-plist
+++ b/net-p2p/transmission-cli/pkg-plist
@@ -1,13 +1,5 @@
 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.md
diff --git a/net-p2p/transmission-daemon/Makefile b/net-p2p/transmission-daemon/Makefile
index b6607d90fcf4..0cba62860268 100644
--- a/net-p2p/transmission-daemon/Makefile
+++ b/net-p2p/transmission-daemon/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-daemon
+PORTREVISION=	1
 
 USES=		ssl
 NLS_USES=	gettext-runtime:run
 
-CONFLICTS_INSTALL=	transmission-cli
-
 USERS=		transmission
 GROUPS=		transmission
 USE_RC_SUBR=	transmission
diff --git a/net-p2p/transmission-daemon/pkg-plist b/net-p2p/transmission-daemon/pkg-plist
index 3def042383c8..36fc854648ca 100644
--- a/net-p2p/transmission-daemon/pkg-plist
+++ b/net-p2p/transmission-daemon/pkg-plist
@@ -1,13 +1,5 @@
-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.md
diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile
index f3694ffda423..fa6cbfab4329 100644
--- a/net-p2p/transmission-gtk/Makefile
+++ b/net-p2p/transmission-gtk/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-gtk
+PORTREVISION=	1
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify
@@ -9,6 +10,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils
 USES=		desktop-file-utils gnome ssl
 NLS_USES=	gettext-tools:build
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intlhack pango
+INSTALL_ICONS=	yes
 
 MASTERDIR=	${.CURDIR}/../transmission-cli
 DESCR=		${.CURDIR}/pkg-descr
diff --git a/net-p2p/transmission-utils/Makefile b/net-p2p/transmission-utils/Makefile
new file mode 100644
index 000000000000..f440cb2868ca
--- /dev/null
+++ b/net-p2p/transmission-utils/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-utils
+
+NLS_USES=	gettext-tools:build
+
+MASTERDIR=	${.CURDIR}/../transmission-cli
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+SLAVEPORT=	utils
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/transmission-utils/pkg-descr b/net-p2p/transmission-utils/pkg-descr
new file mode 100644
index 000000000000..78f9987865e9
--- /dev/null
+++ b/net-p2p/transmission-utils/pkg-descr
@@ -0,0 +1,9 @@
+Transmission-utils iclude the tools to create and manipulate torrent files.
+
+Transmission has been built from the ground up to be a lightweight, yet
+powerful BitTorrent client. Its simple, intuitive interface is designed to
+integrate tightly with whatever computing environment you choose to use.
+Transmission strikes a balance between providing useful functionality
+without feature bloat. Furthermore, it is free for anyone to use or modify.
+
+WWW: http://www.transmissionbt.com/
diff --git a/net-p2p/transmission-utils/pkg-plist b/net-p2p/transmission-utils/pkg-plist
new file mode 100644
index 000000000000..a44e9893ae09
--- /dev/null
+++ b/net-p2p/transmission-utils/pkg-plist
@@ -0,0 +1,14 @@
+bin/transmission-create
+bin/transmission-edit
+bin/transmission-remote
+bin/transmission-show
+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.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/rpc-spec.txt
+%%PORTDOCS%%%%DOCSDIR%%/send-email-when-torrent-done.sh
diff --git a/net-p2p/transmission/Makefile b/net-p2p/transmission/Makefile
index 97f785bfc52c..912d908006b4 100644
--- a/net-p2p/transmission/Makefile
+++ b/net-p2p/transmission/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	transmission
 DISTVERSION=	3.00
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 
 MAINTAINER=	rigoletto@FreeBSD.org
@@ -12,19 +13,21 @@ LICENSE_COMB=	multi
 
 USES=		metaport
 
-OPTIONS_DEFINE=		CLI DAEMON GTK WEB QT
-OPTIONS_DEFAULT=        CLI GTK WEB
+OPTIONS_DEFINE=		CLI DAEMON GTK QT UTILS WEB
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CLI_DESC=		Command line version
 DAEMON_DESC=		Daemon version
 GTK_DESC=		GTK version
 QT_DESC=		Qt version
+UTILS_DESC=		Command line tools
 WEB_DESC=		Web client
 
 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
 QT_RUN_DEPENDS=		transmission-qt:net-p2p/transmission-qt
+UTILS_RUN_DEPENDS=	transmission-create:net-p2p/transmission-utils
 WEB_RUN_DEPENDS=	${DATADIR}/web/index.html:www/transmission-web
 
 .include <bsd.port.mk>