11 files changed, 24 insertions, 22 deletions

diff --git a/MOVED b/MOVED
index 64ebc278f5ca..045c29260e6b 100644
--- a/MOVED
+++ b/MOVED
@@ -3634,3 +3634,5 @@ audio/volumecontrol.app|audio/volumecontrol|2012-08-06|Project renamed
 editors/textedit.app|editors/textedit|2012-08-07|Project renamed
 deskutils/preferences.app|deskutils/preferences|2012-08-07|Project renamed
 www/trac-ctxtnavadd||2012-08-09|Functionality of this plugin merged into Trac itself - see trac.web.chrome.add_ctxtnav function
+net-p2p/qbittorrent-29|net-p2p/qbittorrent|2012-08-11|Moved to match port name
+net-p2p/qbittorrent-29-nox11|net-p2p/qbittorrent-nox11|2012-08-11|Moved to match port name
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 7613c8f2f55e..42b7609b1308 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -84,8 +84,8 @@
     SUBDIR += py-py2play
     SUBDIR += py-transmissionrpc
     SUBDIR += py-vertex
-    SUBDIR += qbittorrent-29
-    SUBDIR += qbittorrent-29-nox11
+    SUBDIR += qbittorrent
+    SUBDIR += qbittorrent-nox11
     SUBDIR += qtella
     SUBDIR += qtorrent
     SUBDIR += retroshare
diff --git a/net-p2p/qbittorrent-29/distinfo b/net-p2p/qbittorrent-29/distinfo
deleted file mode 100644
index 47bbd5aaee1c..000000000000
--- a/net-p2p/qbittorrent-29/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (qbittorrent-2.9.11.tar.gz) = 3d090ff576f19074dc8acbfe64cdec23c430183d6593b82bdaf2fb691e41c222
-SIZE (qbittorrent-2.9.11.tar.gz) = 3571306
diff --git a/net-p2p/qbittorrent-29-nox11/Makefile b/net-p2p/qbittorrent-nox11/Makefile
index b0acf5cde913..4db666bb0232 100644
--- a/net-p2p/qbittorrent-29-nox11/Makefile
+++ b/net-p2p/qbittorrent-nox11/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:	qbittorrent-nox11-29
-# Date created:				1 October 2011
+# New ports collection makefile for:	qbittorrent-nox11
+# Date created:				11 August 2012
 # Whom:					Doug Barton <dougb@FreeBSD.org>
 #
 # $FreeBSD$
@@ -8,13 +8,13 @@ PKGNAMESUFFIX=	-nox11
 
 COMMENT=	Bittorrent client using libtorrent-rasterbar, web UI version
 
-MASTERDIR=	${.CURDIR}/../qbittorrent-29
+MASTERDIR=	${.CURDIR}/../qbittorrent
 
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 MAN1=		qbittorrent-nox.1
 
-QB29_NOX_SLAVE=	true
+QB_NOX_SLAVE=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/qbittorrent-29-nox11/pkg-descr b/net-p2p/qbittorrent-nox11/pkg-descr
index d7ca6bba0c7c..d359b2fcaecf 100644
--- a/net-p2p/qbittorrent-29-nox11/pkg-descr
+++ b/net-p2p/qbittorrent-nox11/pkg-descr
@@ -1,5 +1,5 @@
-qBittorrent v2 is the closest open source (GNU GPL v2 license) equivalent
-to utorrent.  It is based on libtorrent-rasterbar.
+qBittorrent is the closest open source (GNU GPL v2 license) equivalent
+to uTorrent.  It is based on libtorrent-rasterbar.
 
 Features:
 
@@ -10,13 +10,13 @@ Features:
 	Simultaneous search in most famous BitTorrent search sites
 	Per-category-specific search requests (e.g. Books, Music, Movies)
 	All Bittorrent extensions
-		* DHT, Peer Exchange, Full encryption, Magnet URI
+		* DHT, Peer Exchange, Full encryption, Magnet URI, uTP
 	Advanced control over trackers, peers and torrents
 		* Torrents queueing and prioritizing
 		* Torrent content selection and prioritizing
 	UPnP / NAT-PMP port forwarding support
 	Available in ~25 languages (Unicode support)
-	utorrent spoofing to bypass private trackers whitelisting
+	uTorrent spoofing to bypass private trackers whitelisting
 	Advanced RSS support with download filters (inc. regex)
 	IP Filtering (eMule and PeerGuardian compatible)
 
diff --git a/net-p2p/qbittorrent-29-nox11/pkg-plist b/net-p2p/qbittorrent-nox11/pkg-plist
index 1cbfbce436ab..1cbfbce436ab 100644
--- a/net-p2p/qbittorrent-29-nox11/pkg-plist
+++ b/net-p2p/qbittorrent-nox11/pkg-plist
diff --git a/net-p2p/qbittorrent-29/Makefile b/net-p2p/qbittorrent/Makefile
index e1e70552c9d4..6f5ed31e22e1 100644
--- a/net-p2p/qbittorrent-29/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:	qbittorrent-29
-# Date created:				1 October 2011
+# New ports collection makefile for:	qbittorrent
+# Date created:				11 August 2012
 # Whom:					Doug Barton <dougb@FreeBSD.org>
 #
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
-PORTVERSION=	2.9.11
-PORTREVISION?=	1
+PORTVERSION=	3.0.0
+PORTREVISION?=	0
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
@@ -19,11 +19,11 @@ LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 
 MAKE_JOBS_SAFE=	yes
 
-CONFLICTS=	qbittorrent-2.[2345678].* qbittorrent-3.[0-9].*
+CONFLICTS=	qbittorrent-2.* qbittorrent-4.[0-9].*
 
 USE_QT4=	corelib network qmake_build moc_build rcc_build
 
-.if !defined(QB29_NOX_SLAVE)
+.if !defined(QB_NOX_SLAVE)
 .if defined(WITHOUT_X11)
 BROKEN=	Use net-p2p/${PORTNAME}-nox11 for the non-GUI version
 .endif
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--disable-qt-dbus
 .endif
 
 post-install:
-.if !defined(QB29_NOX_SLAVE)
+.if !defined(QB_NOX_SLAVE)
 	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent
 	@${CAT} ${PKGMESSAGE}
 .else
diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo
new file mode 100644
index 000000000000..f79115a8918c
--- /dev/null
+++ b/net-p2p/qbittorrent/distinfo
@@ -0,0 +1,2 @@
+SHA256 (qbittorrent-3.0.0.tar.gz) = 6999ce802724f5620b14a237f4616305e8b3956d5058cbfd153684a8af3f47c6
+SIZE (qbittorrent-3.0.0.tar.gz) = 3625280
diff --git a/net-p2p/qbittorrent-29/pkg-descr b/net-p2p/qbittorrent/pkg-descr
index 6c8a36048adb..7bca781c4859 100644
--- a/net-p2p/qbittorrent-29/pkg-descr
+++ b/net-p2p/qbittorrent/pkg-descr
@@ -1,5 +1,5 @@
-qBittorrent v2 is the closest open source (GNU GPL v2 license) equivalent
-to utorrent.  It is based on the Qt4 toolkit and libtorrent-rasterbar.
+qBittorrent is the closest open source (GNU GPL v2 license) equivalent
+to uTorrent.  It is based on the Qt4 toolkit and libtorrent-rasterbar.
 
 Features:
 
@@ -7,7 +7,7 @@ Features:
 	Simultaneous search in most famous BitTorrent search sites
 	Per-category-specific search requests (e.g. Books, Music, Movies)
 	All Bittorrent extensions
-		* DHT, Peer Exchange, Full encryption, Magnet URI
+		* DHT, Peer Exchange, Full encryption, Magnet URI, uTP
 	Remote control through a Web user interface
 		* Nearly identical to the regular UI, all in Ajax
 	Advanced control over trackers, peers and torrents
diff --git a/net-p2p/qbittorrent-29/pkg-message b/net-p2p/qbittorrent/pkg-message
index 157ed5b528c6..157ed5b528c6 100644
--- a/net-p2p/qbittorrent-29/pkg-message
+++ b/net-p2p/qbittorrent/pkg-message
diff --git a/net-p2p/qbittorrent-29/pkg-plist b/net-p2p/qbittorrent/pkg-plist
index dcd1b5c55a5f..dcd1b5c55a5f 100644
--- a/net-p2p/qbittorrent-29/pkg-plist
+++ b/net-p2p/qbittorrent/pkg-plist