From owner-svn-ports-head@FreeBSD.ORG Wed Jun 26 17:12:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C37EA1B7; Wed, 26 Jun 2013 17:12:10 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A45BB106F; Wed, 26 Jun 2013 17:12:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5QHCAS5097532; Wed, 26 Jun 2013 17:12:10 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5QHC9mV097525; Wed, 26 Jun 2013 17:12:09 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201306261712.r5QHC9mV097525@svn.freebsd.org> From: Chris Rees Date: Wed, 26 Jun 2013 17:12:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321800 - in head/net-p2p: transmission-cli transmission-daemon transmission-gtk transmission-qt4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jun 2013 17:12:10 -0000 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 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@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