View | Details | Raw Unified | Return to bug 206510
Collapse All | Expand All

(-)net-p2p/qbittorrent/Makefile (-9 / +30 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/net-p2p/qbittorrent/Makefile 402681 2015-11-30 15:19:01Z miwi $
2
# $FreeBSD: head/net-p2p/qbittorrent/Makefile 402681 2015-11-30 15:19:01Z miwi $
3
3
4
PORTNAME=	qbittorrent
4
PORTNAME=	qbittorrent
5
PORTVERSION=	3.2.3
5
PORTVERSION=	3.3.3
6
DISTVERSIONPREFIX=	release-
6
DISTVERSIONPREFIX=	release-
7
CATEGORIES=	net-p2p ipv6
7
CATEGORIES=	net-p2p ipv6
8
8
Lines 20-57 Link Here
20
GH_PROJECT=	qBittorrent
20
GH_PROJECT=	qBittorrent
21
21
22
USES=		compiler:c++11-lang execinfo pkgconfig tar:xz
22
USES=		compiler:c++11-lang execinfo pkgconfig tar:xz
23
USE_QT4=	corelib network qmake_build linguisttools_build moc_build \
23
QT4_USE=	QT4=corelib,network,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build
24
		rcc_build uic_build
24
QT5_USE=	QT5=core,concurrent,network,widgets,qmake_build,buildtools_build,linguisttools_build
25
QT_NONSTANDARD=	yes
25
QT_NONSTANDARD=	yes
26
DESTDIRNAME=	INSTALL_ROOT
26
DESTDIRNAME=	INSTALL_ROOT
27
27
28
.if !defined(SLAVE_PORT)
28
.if !defined(SLAVE_PORT)
29
LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
29
LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
30
USES+=		desktop-file-utils
30
USES+=		desktop-file-utils
31
USE_QT4+=	gui xml
31
QT4_USE+=	QT4=gui,xml
32
QT5_USE+=	QT5=gui,xml
32
INSTALLS_ICONS=	yes
33
INSTALLS_ICONS=	yes
33
OPTIONS_DEFINE=	DBUS
34
OPTIONS_DEFINE=	DBUS
34
.endif
35
.endif
35
36
36
PORTDOCS=	AUTHORS Changelog README.md
37
PORTDOCS=	AUTHORS Changelog README.md
37
38
38
OPTIONS_DEFINE=	DEBUG DOCS DBUS
39
OPTIONS_DEFINE=		DEBUG DOCS DBUS
40
OPTIONS_RADIO=		QT
41
OPTIONS_RADIO_QT=	QT4 QT5
42
OPTIONS_DEFAULT=	QT4
43
OPTION_QT=		${SELECTED_OPTIONS:MQT*}
39
44
40
DEBUG_CONFIGURE_ENABLE=	debug
45
DEBUG_CONFIGURE_ENABLE=	debug
41
DBUS_CONFIGURE_ENABLE=	qt-dbus
46
DBUS_CONFIGURE_ENABLE=	qt-dbus
42
DBUS_USE=		QT4=dbus
47
48
.include <bsd.port.options.mk>
49
50
# Qt4 fails to detect base clang features, this section corrects it
51
.if ${PORT_OPTIONS:MQT4}
52
CXXFLAGS+=		-DQ_COMPILER_INITIALIZER_LISTS
53
.endif
54
55
.if ${PORT_OPTIONS:MDBUS}
56
USE_${OPTION_QT}+=	dbus
57
.endif
58
59
CXXFLAGS+=		-DBOOST_ASIO_DYN_LINK
43
CONFIGURE_ENV+=		zlib_CFLAGS=-I/usr/include
60
CONFIGURE_ENV+=		zlib_CFLAGS=-I/usr/include
44
CONFIGURE_ENV+=		zlib_LIBS=-lz
61
CONFIGURE_ENV+=		zlib_LIBS=-lz
45
CONFIGURE_ARGS+=	CXXFLAGS=-DBOOST_ASIO_DYN_LINK
62
CONFIGURE_ARGS+=	CXXFLAGS="${CXXFLAGS}"
63
CONFIGURE_ARGS+=	--with-${OPTION_QT:tl}
46
64
47
GNU_CONFIGURE=	yes
65
GNU_CONFIGURE=	yes
48
USE_OPENSSL=	yes
66
USE_OPENSSL=	yes
49
67
50
post-patch:
68
post-patch:
69
.if ${PORT_OPTIONS:MQT4}
51
	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,'	\
70
	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/bin/qmake-qt4,'	\
52
	    ${WRKSRC}/${CONFIGURE_SCRIPT}
71
	    ${WRKSRC}/${CONFIGURE_SCRIPT}
53
72
.else
54
.include <bsd.port.options.mk>
73
	${REINPLACE_CMD} 's,^\$$QT_QMAKE,${LOCALBASE}/lib/qt5/bin/qmake,'	\
74
	    ${WRKSRC}/${CONFIGURE_SCRIPT}
75
.endif
55
76
56
.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} != "no"
77
.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} != "no"
57
CONFIGURE_ARGS+=	--disable-gui
78
CONFIGURE_ARGS+=	--disable-gui
(-)net-p2p/qbittorrent/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (qBittorrent-qBittorrent-release-3.2.3_GH0.tar.xz) = 816d611a0af50c469f52946c94b88c003f908ee031ee0e55a45273e4c64897c5
1
SHA256 (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.xz) = 04f03623be427294238f119d1ab3311e8560a091778f12df03cc9380fad2c6d9
2
SIZE (qBittorrent-qBittorrent-release-3.2.3_GH0.tar.xz) = 4601930
2
SIZE (qBittorrent-qBittorrent-release-3.3.3_GH0.tar.xz) = 4984105
(-)net-p2p/qbittorrent/files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure	2015-08-02 13:18:04 UTC
2
+++ configure	2015-08-19 00:00:14 -0400
3
@@ -5809,7 +5809,7 @@
4
   fi
5
 
6
   # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
7
-  string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//')
8
+  string=$(echo " $*" | tr ' -' '\n' | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//')
9
   SAVEIFS=$IFS
10
   IFS=$(printf "\n\b")
11
   for i in $string; do

Return to bug 206510