Correct the package naming, to stop upsetting people.

Trim ABI versions from LIB_DEPENDS to pacify portlint

PR:		ports/179798
Submitted by:	Kevin Zheng <kevinz5000@gmail.com>

Add LICENSE lines

Submitted by:	4721 (frogs, IRC)

7 files changed, 18 insertions, 13 deletions

diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index dc902a160993..ef0f7ede4fd1 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -13,6 +13,14 @@ COMMENT?=	Lightweight CLI (command line) BitTorrent client and utilities
 
 SLAVEPORT?=	cli
 
+# Odd arrangement here-- cli is MIT, everything else is GPL
+.if ${SLAVEPORT} == cli
+LICENSE=	MIT
+.else
+LICENSE=	GPLv2
+.endif
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
 
 OPTIONS_DEFINE=	LITE
@@ -52,13 +60,13 @@ EXTRA_PATCHES=	${PATCHDIR}/disable-web
 
 USE_XZ=		yes
 
-DOCS=		AUTHORS COPYING NEWS README
+DOCS=		AUTHORS NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 general-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|noinst_PROGRAMS = |noinst_PROGRAMS = #|g'
-.if ${SLAVEPORT} != gtk2
+.if ${SLAVEPORT} != gtk
 	@${REINPLACE_CMD} -e '/#define DISABLE_GETTEXT/s,/\* \(.*\) \*/,\1,' \
 		${WRKSRC}/libtransmission/utils.h
 .endif
diff --git a/net-p2p/transmission-cli/pkg-plist b/net-p2p/transmission-cli/pkg-plist
index 58ae01daf4a8..d6901ff3bf70 100644
--- a/net-p2p/transmission-cli/pkg-plist
+++ b/net-p2p/transmission-cli/pkg-plist
@@ -3,7 +3,6 @@ bin/transmission-create
 bin/transmission-edit
 bin/transmission-show
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/transmission-daemon/pkg-plist b/net-p2p/transmission-daemon/pkg-plist
index 79cc3a27a322..3e1c684de016 100644
--- a/net-p2p/transmission-daemon/pkg-plist
+++ b/net-p2p/transmission-daemon/pkg-plist
@@ -1,7 +1,6 @@
 bin/transmission-daemon
 bin/transmission-remote
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/transmission-gtk/Makefile b/net-p2p/transmission-gtk/Makefile
index 59e2329ae324..aab406e4bb17 100644
--- a/net-p2p/transmission-gtk/Makefile
+++ b/net-p2p/transmission-gtk/Makefile
@@ -1,23 +1,24 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-gtk2
+PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Fast and lightweight GTK+2 BitTorrent client
 
 LIB_DEPENDS=	${GEN_LIB_DEPENDS} \
-		notify.4:${PORTSDIR}/devel/libnotify \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+		notify:${PORTSDIR}/devel/libnotify \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+
 RUN_DEPENDS=	${GEN_RUN_DEPENDS} \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 
 DESCR=		${.CURDIR}/pkg-descr
 MASTERDIR=	${.CURDIR}/../transmission-cli
 PLIST=		${.CURDIR}/pkg-plist
-SLAVEPORT=	gtk2
+SLAVEPORT=	gtk
 
-USE_GNOME=	gnomehack gtk30 desktopfileutils intlhack
-USES=		gettext
+USE_GNOME=	gtk30 desktopfileutils intlhack
+USES=		gettext pathfix
 INSTALLS_ICONS=	yes
 
 EXTRA_CONF_ARGS=--disable-cli \
diff --git a/net-p2p/transmission-gtk/pkg-descr b/net-p2p/transmission-gtk/pkg-descr
index b735240917bd..2157b586e2cd 100644
--- a/net-p2p/transmission-gtk/pkg-descr
+++ b/net-p2p/transmission-gtk/pkg-descr
@@ -1,4 +1,4 @@
-A fast and lightweight GTK+2 BitTorrent client.
+A fast and lightweight GTK BitTorrent client.
 
 Transmission has been built from the ground up to be a lightweight, yet
 powerful BitTorrent client. Its simple, intuitive interface is designed
diff --git a/net-p2p/transmission-gtk/pkg-plist b/net-p2p/transmission-gtk/pkg-plist
index db62e989b631..b73fc361758d 100644
--- a/net-p2p/transmission-gtk/pkg-plist
+++ b/net-p2p/transmission-gtk/pkg-plist
@@ -1,7 +1,6 @@
 bin/transmission-gtk
 share/applications/transmission-gtk.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 share/icons/hicolor/16x16/apps/transmission.png
diff --git a/net-p2p/transmission-qt4/pkg-plist b/net-p2p/transmission-qt4/pkg-plist
index 11f5b41a91a1..b849d470c27d 100644
--- a/net-p2p/transmission-qt4/pkg-plist
+++ b/net-p2p/transmission-qt4/pkg-plist
@@ -1,7 +1,6 @@
 bin/transmission-qt
 share/applications/transmission-qt.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README-qt4