svn commit: r395571 - in head/net-p2p: transmission-cli transmission-gtk

[Jan Beich]

Author: jbeich
Date: Sat Aug 29 21:48:05 2015
New Revision: 395571
URL: https://svnweb.freebsd.org/changeset/ports/395571

Log:
  net-p2p/transmission-*: minor cleanup
  
  o -cli slave still uses libtransmission under GPLv2
  o Chase r313708 in COMMENT for -gtk slave
  o Convert LITE to option helpers
  o Drop duplicate USES=tar (r362505 vs. r362522)

Modified:
  head/net-p2p/transmission-cli/Makefile   (contents, props changed)
  head/net-p2p/transmission-gtk/Makefile   (contents, props changed)

Modified: head/net-p2p/transmission-cli/Makefile
==============================================================================
--- head/net-p2p/transmission-cli/Makefile	Sat Aug 29 21:47:46 2015	(r395570)
+++ head/net-p2p/transmission-cli/Makefile	Sat Aug 29 21:48:05 2015	(r395571)
@@ -2,7 +2,7 @@
 
 PORTNAME=	transmission
 PORTVERSION=	2.84
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	net-p2p
 #MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 MASTER_SITES=	http://transmission.cachefly.net/
@@ -13,11 +13,10 @@ 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
+.if ${SLAVEPORT} == cli
+LICENSE+=	MIT
+LICENSE_COMB=	multi
 .endif
 LICENSE_FILE=	${WRKSRC}/COPYING
 
@@ -29,8 +28,6 @@ CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMES
 OPTIONS_DEFINE=	LITE DOCS
 EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
 
-.include <bsd.port.options.mk>
-
 .if ${SLAVEPORT} != web
 LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
 
@@ -69,15 +66,11 @@ EXTRA_CONF_ARGS?=--enable-cli \
 		 --disable-mac \
 		 --disable-nls
 
-.if ${PORT_OPTIONS:MLITE}
-CONFIGURE_ARGS+=--enable-lightweight
-.endif
+LITE_CONFIGURE_ENABLE=	lightweight
 
 EXTRA_PATCHES=	${PATCHDIR}/disable-web
 .endif
 
-USES+=		tar:xz
-
 DOCS=		AUTHORS NEWS README
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 

Modified: head/net-p2p/transmission-gtk/Makefile
==============================================================================
--- head/net-p2p/transmission-gtk/Makefile	Sat Aug 29 21:47:46 2015	(r395570)
+++ head/net-p2p/transmission-gtk/Makefile	Sat Aug 29 21:48:05 2015	(r395571)
@@ -4,7 +4,7 @@ PKGNAMESUFFIX=	-gtk
 PORTREVISION=	4
 
 MAINTAINER=	crees at FreeBSD.org
-COMMENT=	Fast and lightweight GTK+2 BitTorrent client
+COMMENT=	Fast and lightweight GTK+3 BitTorrent client
 
 LIB_DEPENDS=	${GEN_LIB_DEPENDS} \
 		libnotify.so:${PORTSDIR}/devel/libnotify \