From owner-svn-ports-head@FreeBSD.ORG Wed Nov 6 12:59:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B6614B39; Wed, 6 Nov 2013 12:59:48 +0000 (UTC) (envelope-from william88@gmail.com) Received: from mail-la0-x22e.google.com (mail-la0-x22e.google.com [IPv6:2a00:1450:4010:c03::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 987552D28; Wed, 6 Nov 2013 12:59:47 +0000 (UTC) Received: by mail-la0-f46.google.com with SMTP id el20so1688144lab.33 for ; Wed, 06 Nov 2013 04:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=EgmmzOGtlvd6wtI0TGJA4pWerUuEM6+mknVCRWy11tc=; b=QeDr6nfcbFVXiNbwv3rwkaVM1BvWJnWLhxc+o2czJNMv1Tj0U3XTl3HgqaCTEfMIxM wB2FGVMFP2Jkv501eDvRdoKbrsa+d3KAoZF12DEWibZeYY+zLZXhlacGlENMKap5q/uH +TFGkCJe0+rC+xrDOKeJzKEePobZ+0xNUqT5h1zmSUPdSgBoNZahTRRIHUVazcYbrwHS zlOeo2CingaBJ9cBFBKtgpp+/uErUVhvNRyw3ZlLDsuTMBBejwZ+UVce8faQzRd9h3mz 23vu4z9gTkQQ4CJO2JuPYNl6qxwaAmBskld3gmBJWQ3XfknKniN/QBuWkjzvxEP48pXJ W+Yw== MIME-Version: 1.0 X-Received: by 10.112.145.105 with SMTP id st9mr896673lbb.46.1383742785552; Wed, 06 Nov 2013 04:59:45 -0800 (PST) Received: by 10.114.176.34 with HTTP; Wed, 6 Nov 2013 04:59:45 -0800 (PST) In-Reply-To: <201311061255.rA6CtVPr076647@svn.freebsd.org> References: <201311061255.rA6CtVPr076647@svn.freebsd.org> Date: Wed, 6 Nov 2013 10:59:45 -0200 Message-ID: Subject: Re: svn commit: r332987 - in head/net-p2p: qbittorrent qbittorrent-nox11 From: William Grzybowski To: Rusmir Dusko Content-Type: text/plain; charset=ISO-8859-1 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , ports-committers 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, 06 Nov 2013 12:59:48 -0000 On Wed, Nov 6, 2013 at 10:55 AM, Rusmir Dusko wrote: > Author: nemysis > Date: Wed Nov 6 12:55:31 2013 > New Revision: 332987 > URL: http://svnweb.freebsd.org/changeset/ports/332987 > > Log: > net-p2p/qbittorrent > > - Update to 3.1.2 > - Change dependency to net-p2p/libtorrent-rasterbar > - USE_QT4 add linguist_build uic_build > - Change from QB_NOX_SLAVE to SLAVE_PORT > - Add do-configure > - Support STAGEDIR > > net-p2p/qbittorrent-nox11 > > - Change from QB_NOX_SLAVE to SLAVE_PORT > - Support STAGEDIR > - Change and cleanup qbittorrent-nox11 to not conflict with master port > - Add SLAVE_PORT=yes > - Remove pkg-descr > > Approved by: wg (mentor) > > Deleted: > head/net-p2p/qbittorrent-nox11/pkg-descr > Modified: > head/net-p2p/qbittorrent-nox11/Makefile (contents, props changed) > head/net-p2p/qbittorrent/Makefile > head/net-p2p/qbittorrent/distinfo > head/net-p2p/qbittorrent/pkg-plist > > Modified: head/net-p2p/qbittorrent-nox11/Makefile > ============================================================================== > --- head/net-p2p/qbittorrent-nox11/Makefile Wed Nov 6 12:46:57 2013 (r332986) > +++ head/net-p2p/qbittorrent-nox11/Makefile Wed Nov 6 12:55:31 2013 (r332987) > @@ -7,13 +7,13 @@ COMMENT= Bittorrent client using libtorr > > MASTERDIR= ${.CURDIR}/../qbittorrent > > -DESCR= ${.CURDIR}/pkg-descr > -PLIST= ${.CURDIR}/pkg-plist > -PLIST_FILES+= bin/qbittorrent-nox > +DESCR= ${.CURDIR}/../qbittorrent/pkg-descr > +PLIST_FILES+= bin/qbittorrent-nox \ > + man/man1/qbittorrent-nox.1.gz > +PLIST= ${NONEXISTENT} > > -MAN1= qbittorrent-nox.1 > +SLAVE_PORT= yes > > -QB_NOX_SLAVE= true > +OPTIONS_EXCLUDE= DOCS > > -NO_STAGE= yes > .include "${MASTERDIR}/Makefile" > > Modified: head/net-p2p/qbittorrent/Makefile > ============================================================================== > --- head/net-p2p/qbittorrent/Makefile Wed Nov 6 12:46:57 2013 (r332986) > +++ head/net-p2p/qbittorrent/Makefile Wed Nov 6 12:55:31 2013 (r332987) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= qbittorrent > -PORTVERSION= 3.0.11 > +PORTVERSION= 3.1.2 > PORTREVISION?= 0 > CATEGORIES= net-p2p ipv6 > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ > @@ -13,49 +13,50 @@ COMMENT?= Bittorrent client using Qt4 an > LICENSE= GPLv2 > > # ABI versions specified on purpose for libtorrent-rasterbar > -LIB_DEPENDS= libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16 \ > - libexecinfo.so:${PORTSDIR}/devel/libexecinfo \ > +LIB_DEPENDS= libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \ > + libexecinfo.so:${PORTSDIR}/devel/libexecinfo > > USES= pkgconfig > -HAS_CONFIGURE= yes > -USE_QT4= corelib network qmake_build moc_build rcc_build > +USE_QT4= corelib network qmake_build linguist_build moc_build rcc_build uic_build > QT_NONSTANDARD= yes > +DESTDIRNAME= INSTALL_ROOT > > -MAN1?= qbittorrent.1 > - > -.if !defined(QB_NOX_SLAVE) > +.if !defined(SLAVE_PORT) > LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP > -USE_QT4+= gui xml uic_build > +USE_QT4+= gui xml > INSTALLS_ICONS= yes > OPTIONS_DEFINE= DBUS > -.else > -CONFIGURE_ARGS+= --disable-gui > .endif > > PORTDOCS= AUTHORS Changelog README TODO > > OPTIONS_DEFINE= DOCS DBUS > > -NO_STAGE= yes > +DBUS_CONFIGURE_ENABLE= qt-dbus > + > .include > > .if ${PORT_OPTIONS:MDBUS} > USE_QT4+= dbus > +.endif > + > +do-configure: > +.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "no" > + @cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${PREFIX} > .else > -CONFIGURE_ARGS+= --disable-qt-dbus > + @cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${PREFIX} --disable-gui > .endif > > post-install: > -.if ${PORT_OPTIONS:MDOCS} > - @${MKDIR} ${DOCSDIR} > - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} > -.endif > + @${MKDIR} ${STAGEDIR}${DOCSDIR} > + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} > > -.if !defined(QB_NOX_SLAVE) > - @${STRIP_CMD} ${PREFIX}/bin/qbittorrent > +.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "no" > + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent > + ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ > .else > - @${STRIP_CMD} ${PREFIX}/bin/qbittorrent-nox > - ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 ${MAN1PREFIX}/man/man1 > + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent-nox > + ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ > .endif > > .include > > Modified: head/net-p2p/qbittorrent/distinfo > ============================================================================== > --- head/net-p2p/qbittorrent/distinfo Wed Nov 6 12:46:57 2013 (r332986) > +++ head/net-p2p/qbittorrent/distinfo Wed Nov 6 12:55:31 2013 (r332987) > @@ -1,2 +1,2 @@ > -SHA256 (qbittorrent-3.0.11.tar.gz) = bce32693c265bb330776337da6e88be3e5e50cf218b2fa8c5cd6c515e7158480 > -SIZE (qbittorrent-3.0.11.tar.gz) = 5097233 > +SHA256 (qbittorrent-3.1.2.tar.gz) = a72e8ff9e2ccc49653b2fe78fc3e1213ed474c393578f39aa8a3d70cf43e3c8b > +SIZE (qbittorrent-3.1.2.tar.gz) = 3883015 > > Modified: head/net-p2p/qbittorrent/pkg-plist > ============================================================================== > --- head/net-p2p/qbittorrent/pkg-plist Wed Nov 6 12:46:57 2013 (r332986) > +++ head/net-p2p/qbittorrent/pkg-plist Wed Nov 6 12:55:31 2013 (r332987) > @@ -1,4 +1,5 @@ > bin/qbittorrent > +man/man1/qbittorrent.1.gz > share/applications/qBittorrent.desktop > share/icons/hicolor/128x128/apps/qbittorrent.png > share/icons/hicolor/16x16/apps/qbittorrent.png > @@ -12,3 +13,4 @@ share/icons/hicolor/64x64/apps/qbittorre > share/icons/hicolor/72x72/apps/qbittorrent.png > share/icons/hicolor/96x96/apps/qbittorrent.png > share/pixmaps/qbittorrent.png > +@dirrmtry share/applications Sorry, I missed that in the review, pkg-plist should not have @dirrm share/applications as it is now part of the mtree. See /usr/ports/CHANGES@20131021 -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil