diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | net-p2p/Makefile | 1 | ||||
| -rw-r--r-- | net-p2p/qbittorrent-nox11/Makefile | 21 | ||||
| -rw-r--r-- | net-p2p/qbittorrent/Makefile | 59 | ||||
| -rw-r--r-- | net-p2p/qbittorrent/distinfo | 6 | ||||
| -rw-r--r-- | net-p2p/qbittorrent/pkg-descr | 2 | ||||
| -rw-r--r-- | net-p2p/qbittorrent/pkg-plist | 3 |
7 files changed, 39 insertions, 54 deletions
@@ -10283,3 +10283,4 @@ net/syncthing-cli|net/syncthing|2018-06-18|Has expired: Included in net/syncthin x11-themes/adwaita-common||2018-06-19|Move to flavored version x11-themes/adwaita-qt4|x11-themes/adwaita-qt@qt4|2018-06-19|Move to flavored version x11-themes/adwaita-qt5|x11-themes/adwaita-qt@qt5|2018-06-19|Move to flavored version +net-p2p/qbittorrent-nox11|net-p2p/qbittorrent@nox|2018-06-20|Moved to a flavored version diff --git a/net-p2p/Makefile b/net-p2p/Makefile index 21b32f5767cf..b588d4c9d554 100644 --- a/net-p2p/Makefile +++ b/net-p2p/Makefile @@ -77,7 +77,6 @@ SUBDIR += py-tremc SUBDIR += py-vertex SUBDIR += qbittorrent - SUBDIR += qbittorrent-nox11 SUBDIR += qtum SUBDIR += radarr SUBDIR += retroshare diff --git a/net-p2p/qbittorrent-nox11/Makefile b/net-p2p/qbittorrent-nox11/Makefile deleted file mode 100644 index 6afcd71311ce..000000000000 --- a/net-p2p/qbittorrent-nox11/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Created by: Doug Barton <dougb@FreeBSD.org> -# $FreeBSD$ - -PKGNAMESUFFIX= -nox11 - -COMMENT= Bittorrent client using libtorrent-rasterbar, web UI version - -BROKEN_powerpc64= Does not build - -MASTERDIR= ${.CURDIR}/../qbittorrent - -DESCR= ${.CURDIR}/../qbittorrent/pkg-descr -PLIST_FILES+= bin/qbittorrent-nox \ - man/man1/qbittorrent-nox.1.gz -PLIST= ${NONEXISTENT} - -SLAVE_PORT= yes - -OPTIONS_EXCLUDE= DOCS - -.include "${MASTERDIR}/Makefile" diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile index 390b951a12f0..a3c50eff0d73 100644 --- a/net-p2p/qbittorrent/Makefile +++ b/net-p2p/qbittorrent/Makefile @@ -2,61 +2,64 @@ # $FreeBSD$ PORTNAME= qbittorrent -DISTVERSION= 3.3.16 -PORTREVISION= 2 +DISTVERSION= 4.1.1 CATEGORIES= net-p2p ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= yuri@FreeBSD.org -COMMENT?= Bittorrent client using Qt4/5 and libtorrent-rasterbar +COMMENT= Bittorrent client using Qt4/5 and libtorrent-rasterbar LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +BROKEN_FreeBSD_10= error: no matching constructor for initialization of 'const QString' + LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ libboost_system.so:devel/boost-libs -USES= compiler:c++11-lib pkgconfig tar:xz -GNU_CONFIGURE= yes -USE_QT5= core network xml qmake_build buildtools_build linguisttools_build -QT_NONSTANDARD= yes -DESTDIRNAME= INSTALL_ROOT +FLAVORS= default nox +default_LIB_DEPENDS= libGeoIP.so:net/GeoIP +nox_PKGNAMESUFFIX= -nox +nox_PLIST= ${NONEXISTENT} + +USES= compiler:c++11-lib pkgconfig tar:xz +GNU_CONFIGURE= yes +USE_QT5= core network svg xml buildtools_build linguisttools_build qmake_build +CONFIGURE_ARGS= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +QT_NONSTANDARD= yes +DESTDIRNAME= INSTALL_ROOT -PORTDOCS= AUTHORS Changelog README.md +.if ${FLAVOR:Udefault} == default +USES+= desktop-file-utils +USE_QT5+= concurrent gui widgets +USE_GL= gl +.endif -.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} == "no" -WITH_GUI:= yes -.else -WITH_GUI:= no -SUFFIX:= -nox +.if ${FLAVOR:U} == nox +SUFFIX= -nox +COMMENT+= (web UI version) +CONFIGURE_ARGS+= --disable-gui +PLIST_FILES= bin/qbittorrent${SUFFIX} \ + man/man1/qbittorrent${SUFFIX}.1.gz .endif OPTIONS_DEFINE= DBUS DEBUG DOCS +OPTIONS_DEFAULT= DBUS DEBUG_CONFIGURE_ENABLE= debug DBUS_CONFIGURE_ENABLE= qt-dbus DBUS_USE= qt5=dbus -.if ${WITH_GUI} == "yes" -LIB_DEPENDS+= libGeoIP.so:net/GeoIP -USES+= desktop-file-utils -USE_QT5+= concurrent gui widgets -USE_GL+= gl -OPTIONS_DEFAULT+= DBUS -.else -CONFIGURE_ARGS+= --disable-gui -.endif - -CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +PORTDOCS= AUTHORS Changelog README.md post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX} ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent${SUFFIX}.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ - ${RM} -r ${STAGEDIR}${PREFIX}/share/man + @${RM} -r ${STAGEDIR}${PREFIX}/share/man post-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo index 27eb5c87d854..2d3ddc996ff9 100644 --- a/net-p2p/qbittorrent/distinfo +++ b/net-p2p/qbittorrent/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508414513 -SHA256 (qbittorrent-3.3.16.tar.xz) = ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57 -SIZE (qbittorrent-3.3.16.tar.xz) = 2961420 +TIMESTAMP = 1529203767 +SHA256 (qbittorrent-4.1.1.tar.xz) = 8edc7a7fff8aa45e7bf763c91f30e064e1d7acd3f6efecb12fee420b75457ee7 +SIZE (qbittorrent-4.1.1.tar.xz) = 4333588 diff --git a/net-p2p/qbittorrent/pkg-descr b/net-p2p/qbittorrent/pkg-descr index 4372d299cccb..75a555620a35 100644 --- a/net-p2p/qbittorrent/pkg-descr +++ b/net-p2p/qbittorrent/pkg-descr @@ -20,4 +20,4 @@ Features: - Advanced RSS support with download filters (inc. regex) - IP Filtering (eMule and PeerGuardian compatible) -WWW: http://www.qbittorrent.org/ +WWW: https://www.qbittorrent.org/ diff --git a/net-p2p/qbittorrent/pkg-plist b/net-p2p/qbittorrent/pkg-plist index a680f1ed71c8..0593b370bf5b 100644 --- a/net-p2p/qbittorrent/pkg-plist +++ b/net-p2p/qbittorrent/pkg-plist @@ -24,4 +24,7 @@ share/icons/hicolor/72x72/apps/qbittorrent.png share/icons/hicolor/72x72/status/qbittorrent-tray.png share/icons/hicolor/96x96/apps/qbittorrent.png share/icons/hicolor/96x96/status/qbittorrent-tray.png +share/icons/hicolor/scalable/status/qbittorrent-tray-dark.svg +share/icons/hicolor/scalable/status/qbittorrent-tray-light.svg +share/icons/hicolor/scalable/status/qbittorrent-tray.svg share/pixmaps/qbittorrent.png |