- Update to version 1.0.0rc3.

8 files changed, 56 insertions, 28 deletions

diff --git a/net-p2p/qbittorrent-22/Makefile b/net-p2p/qbittorrent-22/Makefile
index 10912696f4ae..e826f8924623 100644
--- a/net-p2p/qbittorrent-22/Makefile
+++ b/net-p2p/qbittorrent-22/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	qbittorrent
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+DISTVERSION=	1.0.0rc3
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Bittorrent client written in C++ / Qt4 using libtorrent
 
-LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
-		torrent.1:${PORTSDIR}/net-p2p/rblibtorrent
+LIB_DEPENDS=	ccext2-1.5.0:${PORTSDIR}/devel/commoncpp \
+		torrent.1:${PORTSDIR}/net-p2p/rblibtorrent-devel
 
 USE_PYTHON=	2.3+
 USE_QT_VER=	4
@@ -24,18 +23,26 @@ INSTALLS_ICONS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_TARGET=	#
 CONFIGURE_ARGS=	--with-libtorrent-inc="${LOCALBASE}/include" \
-		--with-libtorrent-lib="${LOCALBASE}/lib" \
-		--with-libcurl-inc="${LOCALBASE}/include" \
-		--with-libcurl-lib="${LOCALBASE}/lib"
+		--with-libtorrent-lib="${LOCALBASE}/lib"
 CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}"
 MAKE_ENV=	QMAKESPEC="${QMAKESPEC}"
 
+OPTIONS=	IMAGEMAGICK "Enable libmagick++ support" off
+
 MAN1=		qbittorrent.1
 MANCOMPRESSED=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_IMAGEMAGICK)
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=--disable-libmagick
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|bin/qmake|bin/${QMAKE:T}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$$$PREFIX/share/man|${MANPREFIX}/man|' \
 		${WRKSRC}/src/src.pro
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-p2p/qbittorrent-22/distinfo b/net-p2p/qbittorrent-22/distinfo
index 93ed9fe12a68..b8a3518a91c3 100644
--- a/net-p2p/qbittorrent-22/distinfo
+++ b/net-p2p/qbittorrent-22/distinfo
@@ -1,3 +1,3 @@
-MD5 (qbittorrent-0.9.3.tar.gz) = b1f12106dd8b33c5280df5e02f0e9abf
-SHA256 (qbittorrent-0.9.3.tar.gz) = 532308bf882b9f55876599b4bcaefbc31bb45ea9ff62ce6805c2688c06f03ca2
-SIZE (qbittorrent-0.9.3.tar.gz) = 836332
+MD5 (qbittorrent-1.0.0rc3.tar.gz) = e4a711b47447259b5cfc26481585740e
+SHA256 (qbittorrent-1.0.0rc3.tar.gz) = a3a3a81a307fcec42deb6493ca8fc593a13d1e86ee5f05d3d41c75ee285062bd
+SIZE (qbittorrent-1.0.0rc3.tar.gz) = 1380102
diff --git a/net-p2p/qbittorrent-22/files/patch-src__bittorrent.h b/net-p2p/qbittorrent-22/files/patch-src__bittorrent.h
new file mode 100644
index 000000000000..6b225c1f43da
--- /dev/null
+++ b/net-p2p/qbittorrent-22/files/patch-src__bittorrent.h
@@ -0,0 +1,10 @@
+--- src/bittorrent.h.orig	Sun Sep  9 06:09:24 2007
++++ src/bittorrent.h	Mon Oct  1 12:37:38 2007
+@@ -27,6 +27,7 @@
+ #include <QStringList>
+ 
+ #include <libtorrent/session.hpp>
++#include <libtorrent/ip_filter.hpp>
+ #include "qtorrenthandle.h"
+ 
+ using namespace libtorrent;
diff --git a/net-p2p/qbittorrent-22/pkg-plist b/net-p2p/qbittorrent-22/pkg-plist
index aeb2a48626fc..3ea33cf924f1 100644
--- a/net-p2p/qbittorrent-22/pkg-plist
+++ b/net-p2p/qbittorrent-22/pkg-plist
@@ -1,7 +1,6 @@
 bin/qbittorrent
 share/applications/qBittorrent.desktop
 share/icons/hicolor/128x128/apps/qbittorrent.png
-share/icons/hicolor/16x16/apps/qbittorrent.png
 share/icons/hicolor/192x192/apps/qbittorrent.png
 share/icons/hicolor/22x22/apps/qbittorrent.png
 share/icons/hicolor/24x24/apps/qbittorrent.png
@@ -29,8 +28,6 @@ share/icons/hicolor/96x96/apps/qbittorrent.png
 @dirrmtry share/icons/hicolor/22x22
 @dirrmtry share/icons/hicolor/192x192/apps
 @dirrmtry share/icons/hicolor/192x192
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/128x128/apps
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 10912696f4ae..e826f8924623 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	qbittorrent
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+DISTVERSION=	1.0.0rc3
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Bittorrent client written in C++ / Qt4 using libtorrent
 
-LIB_DEPENDS=	curl.4:${PORTSDIR}/ftp/curl \
-		torrent.1:${PORTSDIR}/net-p2p/rblibtorrent
+LIB_DEPENDS=	ccext2-1.5.0:${PORTSDIR}/devel/commoncpp \
+		torrent.1:${PORTSDIR}/net-p2p/rblibtorrent-devel
 
 USE_PYTHON=	2.3+
 USE_QT_VER=	4
@@ -24,18 +23,26 @@ INSTALLS_ICONS=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_TARGET=	#
 CONFIGURE_ARGS=	--with-libtorrent-inc="${LOCALBASE}/include" \
-		--with-libtorrent-lib="${LOCALBASE}/lib" \
-		--with-libcurl-inc="${LOCALBASE}/include" \
-		--with-libcurl-lib="${LOCALBASE}/lib"
+		--with-libtorrent-lib="${LOCALBASE}/lib"
 CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}"
 MAKE_ENV=	QMAKESPEC="${QMAKESPEC}"
 
+OPTIONS=	IMAGEMAGICK "Enable libmagick++ support" off
+
 MAN1=		qbittorrent.1
 MANCOMPRESSED=	yes
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_IMAGEMAGICK)
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+.else
+CONFIGURE_ARGS+=--disable-libmagick
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|bin/qmake|bin/${QMAKE:T}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$$$PREFIX/share/man|${MANPREFIX}/man|' \
 		${WRKSRC}/src/src.pro
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo
index 93ed9fe12a68..b8a3518a91c3 100644
--- a/net-p2p/qbittorrent/distinfo
+++ b/net-p2p/qbittorrent/distinfo
@@ -1,3 +1,3 @@
-MD5 (qbittorrent-0.9.3.tar.gz) = b1f12106dd8b33c5280df5e02f0e9abf
-SHA256 (qbittorrent-0.9.3.tar.gz) = 532308bf882b9f55876599b4bcaefbc31bb45ea9ff62ce6805c2688c06f03ca2
-SIZE (qbittorrent-0.9.3.tar.gz) = 836332
+MD5 (qbittorrent-1.0.0rc3.tar.gz) = e4a711b47447259b5cfc26481585740e
+SHA256 (qbittorrent-1.0.0rc3.tar.gz) = a3a3a81a307fcec42deb6493ca8fc593a13d1e86ee5f05d3d41c75ee285062bd
+SIZE (qbittorrent-1.0.0rc3.tar.gz) = 1380102
diff --git a/net-p2p/qbittorrent/files/patch-src__bittorrent.h b/net-p2p/qbittorrent/files/patch-src__bittorrent.h
new file mode 100644
index 000000000000..6b225c1f43da
--- /dev/null
+++ b/net-p2p/qbittorrent/files/patch-src__bittorrent.h
@@ -0,0 +1,10 @@
+--- src/bittorrent.h.orig	Sun Sep  9 06:09:24 2007
++++ src/bittorrent.h	Mon Oct  1 12:37:38 2007
+@@ -27,6 +27,7 @@
+ #include <QStringList>
+ 
+ #include <libtorrent/session.hpp>
++#include <libtorrent/ip_filter.hpp>
+ #include "qtorrenthandle.h"
+ 
+ using namespace libtorrent;
diff --git a/net-p2p/qbittorrent/pkg-plist b/net-p2p/qbittorrent/pkg-plist
index aeb2a48626fc..3ea33cf924f1 100644
--- a/net-p2p/qbittorrent/pkg-plist
+++ b/net-p2p/qbittorrent/pkg-plist
@@ -1,7 +1,6 @@
 bin/qbittorrent
 share/applications/qBittorrent.desktop
 share/icons/hicolor/128x128/apps/qbittorrent.png
-share/icons/hicolor/16x16/apps/qbittorrent.png
 share/icons/hicolor/192x192/apps/qbittorrent.png
 share/icons/hicolor/22x22/apps/qbittorrent.png
 share/icons/hicolor/24x24/apps/qbittorrent.png
@@ -29,8 +28,6 @@ share/icons/hicolor/96x96/apps/qbittorrent.png
 @dirrmtry share/icons/hicolor/22x22
 @dirrmtry share/icons/hicolor/192x192/apps
 @dirrmtry share/icons/hicolor/192x192
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/128x128/apps
 @dirrmtry share/icons/hicolor/128x128
 @dirrmtry share/icons/hicolor