Index: net-p2p/qbittorrent/Makefile =================================================================== --- net-p2p/qbittorrent/Makefile (revision 424149) +++ net-p2p/qbittorrent/Makefile (working copy) @@ -2,46 +2,49 @@ # $FreeBSD$ PORTNAME= qbittorrent -PORTVERSION= 3.3.3 -DISTVERSIONPREFIX= release- +PORTVERSION= 3.3.7 CATEGORIES= net-p2p ipv6 +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= yuri@rawbw.com -COMMENT?= Bittorrent client using Qt4 and libtorrent-rasterbar +COMMENT?= Bittorrent client using Qt4/Qt5 and libtorrent-rasterbar LICENSE= GPLv2 -BROKEN= fails to build - -# ABI versions specified on purpose for libtorrent-rasterbar LIB_DEPENDS= libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \ libboost_system.so:devel/boost-libs -USE_GITHUB= yes -GH_ACCOUNT= qBittorrent -GH_PROJECT= qBittorrent +.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} == "no" +HAVE_GUI:= yes +.else +HAVE_GUI:= no +.endif USES= compiler:c++11-lang execinfo pkgconfig tar:xz -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 +QT4_USE= QT4=corelib,network,xml,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build +QT5_USE= QT5=core,network,xml,qmake_build,buildtools_build,linguisttools_build QT_NONSTANDARD= yes DESTDIRNAME= INSTALL_ROOT +GNU_CONFIGURE= yes +#USE_OPENSSL= yes -.if !defined(SLAVE_PORT) +.if ${HAVE_GUI} == "yes" LIB_DEPENDS+= libGeoIP.so:net/GeoIP USES+= desktop-file-utils -QT4_USE+= QT4=gui,xml -QT5_USE+= QT5=gui,xml +QT4_USE+= QT4=gui +QT5_USE+= QT5=concurrent,gui,widgets GL=gl INSTALLS_ICONS= yes OPTIONS_DEFINE= DBUS +.else +CONFIGURE_ARGS+=--disable-gui .endif PORTDOCS= AUTHORS Changelog README.md OPTIONS_DEFINE= DEBUG DOCS DBUS -OPTIONS_RADIO= QT -OPTIONS_RADIO_QT= QT4 QT5 -OPTIONS_DEFAULT= QT4 +OPTIONS_SINGLE= QT +OPTIONS_SINGLE_QT= QT4 QT5 +OPTIONS_DEFAULT= QT5 OPTION_QT= ${SELECTED_OPTIONS:MQT*} DEBUG_CONFIGURE_ENABLE= debug @@ -49,39 +52,25 @@ .include -# 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="${CXXFLAGS}" -CONFIGURE_ARGS+= --with-${OPTION_QT:tl} +CONFIGURE_ARGS+= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" +#CONFIGURE_ARGS+= --with-${OPTION_QT:tl} +QT4_CONFIGURE_ON= --with-qt4 -GNU_CONFIGURE= yes -USE_OPENSSL= yes - post-patch: .if ${PORT_OPTIONS:MQT4} - ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \ + ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,' \ ${WRKSRC}/${CONFIGURE_SCRIPT} .else - ${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/lib/qt5/bin/qmake,' \ + ${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 -.endif - post-install: -.if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no" +.if ${HAVE_GUI} == "yes" @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent ${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/ Index: net-p2p/qbittorrent/distinfo =================================================================== --- net-p2p/qbittorrent/distinfo (revision 424149) +++ net-p2p/qbittorrent/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.gz) = 04f03623be427294238f119d1ab3311e8560a091778f12df03cc9380fad2c6d9 -SIZE (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.gz) = 4984105 +TIMESTAMP = 1476766504 +SHA256 (qbittorrent-3.3.7.tar.xz) = 72dc824a90fadc0825e6be6f1c215e38f976262c7f83b625061d542b2b664c40 +SIZE (qbittorrent-3.3.7.tar.xz) = 2884792 Index: net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp =================================================================== --- net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp (nonexistent) +++ net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp (working copy) @@ -0,0 +1,31 @@ +--- src/base/utils/string.cpp.orig 2016-10-18 05:39:24 UTC ++++ src/base/utils/string.cpp +@@ -37,7 +37,7 @@ + #ifdef QBT_USES_QT5 + #include + #endif +-#ifdef Q_OS_MAC ++#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506) + #include + #endif + +@@ -146,7 +146,8 @@ bool Utils::String::naturalCompareCaseSe + { + // provide a single `NaturalCompare` instance for easy use + // https://doc.qt.io/qt-5/threads-reentrancy.html +-#ifdef Q_OS_MAC // workaround for Apple xcode: https://stackoverflow.com/a/29929949 ++#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506) ++// workaround for Apple xcode: https://stackoverflow.com/a/29929949 + static QThreadStorage nCmp; + if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(true)); + return (nCmp.localData())(left, right); +@@ -160,7 +161,8 @@ bool Utils::String::naturalCompareCaseIn + { + // provide a single `NaturalCompare` instance for easy use + // https://doc.qt.io/qt-5/threads-reentrancy.html +-#ifdef Q_OS_MAC // workaround for Apple xcode: https://stackoverflow.com/a/29929949 ++#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506) ++// workaround for Apple xcode: https://stackoverflow.com/a/29929949 + static QThreadStorage nCmp; + if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(false)); + return (nCmp.localData())(left, right); Property changes on: net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property