svn commit: r315458 - in head/net-p2p: ktorrent libktorrent

[Max Brazhnikov]

Author: makc
Date: Thu Mar 28 12:06:41 2013
New Revision: 315458
URL: http://svnweb.freebsd.org/changeset/ports/315458

Log:
  - Change dependency type for Boost: required only at build stage
  - Adjust USE_QT4 components
  - Switch to out-of-source build
  
  ktorrent only:
  - Explicitly depend on math/gmp
  - Fix potential build failure

Modified:
  head/net-p2p/ktorrent/Makefile
  head/net-p2p/libktorrent/Makefile

Modified: head/net-p2p/ktorrent/Makefile
==============================================================================
--- head/net-p2p/ktorrent/Makefile	Thu Mar 28 11:50:04 2013	(r315457)
+++ head/net-p2p/ktorrent/Makefile	Thu Mar 28 12:06:41 2013	(r315458)
@@ -3,19 +3,23 @@
 
 PORTNAME=	ktorrent
 DISTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION}/
 
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	BitTorrent client for KDE
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
+		gmp:${PORTSDIR}/math/gmp \
 		ktorrent.5:${PORTSDIR}/net-p2p/libktorrent
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 pimlibs workspace
-USE_QT4=	qmake_build moc_build rcc_build uic_build
-USES=		cmake
+USE_QT4=	corelib gui network qt3support qtestlib webkit \
+		qmake_build moc_build rcc_build uic_build
+USES=		cmake:outsource
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
@@ -28,4 +32,8 @@ PLIST_SUB+=	SHLIB_VER=${SHLIB_VER} \
 
 CMAKE_ARGS+=	-DENABLE_KIO_MAGNET=1
 
+post-patch:
+	${REINPLACE_CMD} -e 's,ktorrent,$${LIBKTORRENT_LIBRARIES},' \
+		${WRKSRC}/plugins/ipfilter/tests/CMakeLists.txt
+
 .include <bsd.port.mk>

Modified: head/net-p2p/libktorrent/Makefile
==============================================================================
--- head/net-p2p/libktorrent/Makefile	Thu Mar 28 11:50:04 2013	(r315457)
+++ head/net-p2p/libktorrent/Makefile	Thu Mar 28 12:06:41 2013	(r315458)
@@ -2,21 +2,22 @@
 
 PORTNAME=	libktorrent
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	net-p2p kde
 MASTER_SITES=	http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/
 
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Torrent library split from KTorrent
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/concept_check.hpp:${PORTSDIR}/devel/boost-libs
 LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
 		gmp:${PORTSDIR}/math/gmp \
-		qca:${PORTSDIR}/devel/qca \
-		boost_thread:${PORTSDIR}/devel/boost-libs
+		qca:${PORTSDIR}/devel/qca
 
 USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
-USE_QT4=	qmake_build moc_build rcc_build uic_build
-USES=		cmake
+USE_QT4=	qtestlib_build qmake_build moc_build rcc_build uic_build
+USES=		cmake:outsource
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes