Date: Mon, 14 Mar 2016 22:32:25 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411126 - in head/net-p2p/qbittorrent: . files Message-ID: <201603142232.u2EMWP6E058606@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Mon Mar 14 22:32:25 2016 New Revision: 411126 URL: https://svnweb.freebsd.org/changeset/ports/411126 Log: net-p2p/qbittorrent: Update to 3.3.3 This update includes the new options QT4/QT5 to allow the user to choose the Qt version. PR: 206510 Deleted: head/net-p2p/qbittorrent/files/patch-configure Modified: head/net-p2p/qbittorrent/Makefile head/net-p2p/qbittorrent/distinfo Modified: head/net-p2p/qbittorrent/Makefile ============================================================================== --- head/net-p2p/qbittorrent/Makefile Mon Mar 14 22:15:54 2016 (r411125) +++ head/net-p2p/qbittorrent/Makefile Mon Mar 14 22:32:25 2016 (r411126) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.2.3 +PORTVERSION= 3.3.3 DISTVERSIONPREFIX= release- CATEGORIES= net-p2p ipv6 @@ -20,38 +20,59 @@ GH_ACCOUNT= qBittorrent GH_PROJECT= qBittorrent USES= compiler:c++11-lang execinfo pkgconfig tar:xz -USE_QT4= corelib network qmake_build linguisttools_build moc_build \ - rcc_build uic_build +QT4_USE= QT4=corelib,network,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build +QT5_USE= QT5=core,concurrent,network,widgets,qmake_build,buildtools_build,linguisttools_build QT_NONSTANDARD= yes DESTDIRNAME= INSTALL_ROOT .if !defined(SLAVE_PORT) LIB_DEPENDS+= libGeoIP.so:${PORTSDIR}/net/GeoIP USES+= desktop-file-utils -USE_QT4+= gui xml +QT4_USE+= QT4=gui,xml +QT5_USE+= QT5=gui,xml INSTALLS_ICONS= yes OPTIONS_DEFINE= DBUS .endif PORTDOCS= AUTHORS Changelog README.md -OPTIONS_DEFINE= DEBUG DOCS DBUS +OPTIONS_DEFINE= DEBUG DOCS DBUS +OPTIONS_RADIO= QT +OPTIONS_RADIO_QT= QT4 QT5 +OPTIONS_DEFAULT= QT4 +OPTION_QT= ${SELECTED_OPTIONS:MQT*} DEBUG_CONFIGURE_ENABLE= debug DBUS_CONFIGURE_ENABLE= qt-dbus -DBUS_USE= QT4=dbus + +.include <bsd.port.options.mk> + +# Qt4 fails to detect base clang features, this section corrects it +.if ${PORT_OPTIONS:MQT4} +CXXFLAGS+= -DQ_COMPILER_INITIALIZER_LISTS +.endif + +.if ${PORT_OPTIONS:MDBUS} +USE_${OPTION_QT}+= dbus +.endif + +CXXFLAGS+= -DBOOST_ASIO_DYN_LINK CONFIGURE_ENV+= zlib_CFLAGS=-I/usr/include CONFIGURE_ENV+= zlib_LIBS=-lz -CONFIGURE_ARGS+= CXXFLAGS=-DBOOST_ASIO_DYN_LINK +CONFIGURE_ARGS+= CXXFLAGS="${CXXFLAGS}" +CONFIGURE_ARGS+= --with-${OPTION_QT:tl} GNU_CONFIGURE= yes USE_OPENSSL= yes post-patch: +.if ${PORT_OPTIONS:MQT4} ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \ ${WRKSRC}/${CONFIGURE_SCRIPT} - -.include <bsd.port.options.mk> +.else + ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/lib/qt5/bin/qmake,' \ + ${WRKSRC}/${CONFIGURE_SCRIPT} +.endif .if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} != "no" CONFIGURE_ARGS+= --disable-gui Modified: head/net-p2p/qbittorrent/distinfo ============================================================================== --- head/net-p2p/qbittorrent/distinfo Mon Mar 14 22:15:54 2016 (r411125) +++ head/net-p2p/qbittorrent/distinfo Mon Mar 14 22:32:25 2016 (r411126) @@ -1,2 +1,2 @@ -SHA256 (qBittorrent-qBittorrent-release-3.2.3_GH0.tar.gz) = 816d611a0af50c469f52946c94b88c003f908ee031ee0e55a45273e4c64897c5 -SIZE (qBittorrent-qBittorrent-release-3.2.3_GH0.tar.gz) = 4601930 +SHA256 (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.gz) = 04f03623be427294238f119d1ab3311e8560a091778f12df03cc9380fad2c6d9 +SIZE (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.gz) = 4984105
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603142232.u2EMWP6E058606>