svn commit: r321800 - in head/net-p2p: transmission-cli transmission-daemon transmission-gtk transmission-qt4

[Chris Rees]

Author: crees
Date: Wed Jun 26 17:12:08 2013
New Revision: 321800
URL: http://svnweb.freebsd.org/changeset/ports/321800

Log:
  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 at gmail.com>
  
  Add LICENSE lines
  
  Submitted by:	4721 (frogs, IRC)

Modified:
  head/net-p2p/transmission-cli/Makefile
  head/net-p2p/transmission-cli/pkg-plist
  head/net-p2p/transmission-daemon/pkg-plist
  head/net-p2p/transmission-gtk/Makefile
  head/net-p2p/transmission-gtk/pkg-descr
  head/net-p2p/transmission-gtk/pkg-plist
  head/net-p2p/transmission-qt4/pkg-plist

Modified: head/net-p2p/transmission-cli/Makefile
==============================================================================
--- head/net-p2p/transmission-cli/Makefile	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-cli/Makefile	Wed Jun 26 17:12:08 2013	(r321800)
@@ -13,6 +13,14 @@ COMMENT?=	Lightweight CLI (command line)
 
 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

Modified: head/net-p2p/transmission-cli/pkg-plist
==============================================================================
--- head/net-p2p/transmission-cli/pkg-plist	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-cli/pkg-plist	Wed Jun 26 17:12:08 2013	(r321800)
@@ -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%%

Modified: head/net-p2p/transmission-daemon/pkg-plist
==============================================================================
--- head/net-p2p/transmission-daemon/pkg-plist	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-daemon/pkg-plist	Wed Jun 26 17:12:08 2013	(r321800)
@@ -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%%

Modified: head/net-p2p/transmission-gtk/Makefile
==============================================================================
--- head/net-p2p/transmission-gtk/Makefile	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-gtk/Makefile	Wed Jun 26 17:12:08 2013	(r321800)
@@ -1,23 +1,24 @@
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-gtk2
+PKGNAMESUFFIX=	-gtk
 
 MAINTAINER=	crees at 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 \

Modified: head/net-p2p/transmission-gtk/pkg-descr
==============================================================================
--- head/net-p2p/transmission-gtk/pkg-descr	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-gtk/pkg-descr	Wed Jun 26 17:12:08 2013	(r321800)
@@ -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

Modified: head/net-p2p/transmission-gtk/pkg-plist
==============================================================================
--- head/net-p2p/transmission-gtk/pkg-plist	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-gtk/pkg-plist	Wed Jun 26 17:12:08 2013	(r321800)
@@ -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

Modified: head/net-p2p/transmission-qt4/pkg-plist
==============================================================================
--- head/net-p2p/transmission-qt4/pkg-plist	Wed Jun 26 16:56:56 2013	(r321799)
+++ head/net-p2p/transmission-qt4/pkg-plist	Wed Jun 26 17:12:08 2013	(r321800)
@@ -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