10 files changed, 180 insertions, 1 deletions

diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 4afcef6e1872..ba0ef5956b24 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -91,6 +91,8 @@
     SUBDIR += py-vertex
     SUBDIR += qbittorrent-28
     SUBDIR += qbittorrent-28-nox11
+    SUBDIR += qbittorrent-29
+    SUBDIR += qbittorrent-29-nox11
     SUBDIR += qtella
     SUBDIR += qtorrent
     SUBDIR += rtgui
diff --git a/net-p2p/qbittorrent-28/Makefile b/net-p2p/qbittorrent-28/Makefile
index 17d73ef308f4..9c705decd46a 100644
--- a/net-p2p/qbittorrent-28/Makefile
+++ b/net-p2p/qbittorrent-28/Makefile
@@ -13,6 +13,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	dougb@FreeBSD.org
 COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
 
+NO_LATEST_LINK=	yes
+
+DEPRECATED=	Please migrate to net-p2p/qbittorrent-29
+EXPIRATION_DATE=	2011-10-31
+
 LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
 		torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15
 
@@ -51,10 +56,10 @@ CONFIGURE_ARGS+=	--disable-qt-dbus
 post-install:
 .if !defined(QB28_NOX_SLAVE)
 	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent
+	@${CAT} ${PKGMESSAGE}
 .else
 	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent-nox
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 ${MANPREFIX}/man/man1
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/qbittorrent-29-nox11/Makefile b/net-p2p/qbittorrent-29-nox11/Makefile
new file mode 100644
index 000000000000..b0acf5cde913
--- /dev/null
+++ b/net-p2p/qbittorrent-29-nox11/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for:	qbittorrent-nox11-29
+# Date created:				1 October 2011
+# Whom:					Doug Barton <dougb@FreeBSD.org>
+#
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-nox11
+
+COMMENT=	Bittorrent client using libtorrent-rasterbar, web UI version
+
+MASTERDIR=	${.CURDIR}/../qbittorrent-29
+
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
+
+MAN1=		qbittorrent-nox.1
+
+QB29_NOX_SLAVE=	true
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-p2p/qbittorrent-29-nox11/pkg-descr b/net-p2p/qbittorrent-29-nox11/pkg-descr
new file mode 100644
index 000000000000..d7ca6bba0c7c
--- /dev/null
+++ b/net-p2p/qbittorrent-29-nox11/pkg-descr
@@ -0,0 +1,23 @@
+qBittorrent v2 is the closest open source (GNU GPL v2 license) equivalent
+to utorrent.  It is based on libtorrent-rasterbar.
+
+Features:
+
+	Remote control through a Web user interface
+		* Nearly identical to the regular UI, all in Ajax
+
+	Well-integrated and extensible Search Engine
+	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
+	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
+	Advanced RSS support with download filters (inc. regex)
+	IP Filtering (eMule and PeerGuardian compatible)
+
+WWW: http://www.qbittorrent.org/
diff --git a/net-p2p/qbittorrent-29-nox11/pkg-plist b/net-p2p/qbittorrent-29-nox11/pkg-plist
new file mode 100644
index 000000000000..1cbfbce436ab
--- /dev/null
+++ b/net-p2p/qbittorrent-29-nox11/pkg-plist
@@ -0,0 +1 @@
+bin/qbittorrent-nox
diff --git a/net-p2p/qbittorrent-29/Makefile b/net-p2p/qbittorrent-29/Makefile
new file mode 100644
index 000000000000..5c0be4cccdd1
--- /dev/null
+++ b/net-p2p/qbittorrent-29/Makefile
@@ -0,0 +1,60 @@
+# New ports collection makefile for:	qbittorrent-29
+# Date created:				1 October 2011
+# Whom:					Doug Barton <dougb@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME=	qbittorrent
+PORTVERSION=	2.9.0
+PORTREVISION?=	0
+CATEGORIES=	net-p2p ipv6
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
+
+MAINTAINER=	dougb@FreeBSD.org
+COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
+
+LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
+		torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15
+
+MAKE_JOBS_SAFE=	yes
+
+CONFLICTS=	qbittorrent-2.[2345678].* qbittorrent-3.[0-9].*
+
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib network qmake_build moc_build rcc_build
+
+.if !defined(QB29_NOX_SLAVE)
+.if defined(WITHOUT_X11)
+BROKEN=	Use net-p2p/${PORTNAME}-nox11 for the non-GUI version
+.endif
+LIB_DEPENDS+=	GeoIP.5:${PORTSDIR}/net/GeoIP
+OPTIONS=	DBUS "Enable dbus support" off
+QT_COMPONENTS+=	gui xml uic_build
+INSTALLS_ICONS=	yes
+.else
+CONFIGURE_ARGS+=	--disable-gui
+.endif
+
+QT_NONSTANDARD=	yes
+HAS_CONFIGURE=	yes
+
+MAN1?=		qbittorrent.1
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DBUS)
+QT_COMPONENTS+=		dbus
+.else
+CONFIGURE_ARGS+=	--disable-qt-dbus
+.endif
+
+post-install:
+.if !defined(QB29_NOX_SLAVE)
+	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent
+	@${CAT} ${PKGMESSAGE}
+.else
+	@${STRIP_CMD} ${PREFIX}/bin/qbittorrent-nox
+	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 ${MANPREFIX}/man/man1
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net-p2p/qbittorrent-29/distinfo b/net-p2p/qbittorrent-29/distinfo
new file mode 100644
index 000000000000..e0ad740ebf8b
--- /dev/null
+++ b/net-p2p/qbittorrent-29/distinfo
@@ -0,0 +1,2 @@
+SHA256 (qbittorrent-2.9.0.tar.gz) = 9f9bdcf1a0baf583646945728e25f29f86b9c2ebaa59e64a02d9def5dac6da0e
+SIZE (qbittorrent-2.9.0.tar.gz) = 3394166
diff --git a/net-p2p/qbittorrent-29/pkg-descr b/net-p2p/qbittorrent-29/pkg-descr
new file mode 100644
index 000000000000..6c8a36048adb
--- /dev/null
+++ b/net-p2p/qbittorrent-29/pkg-descr
@@ -0,0 +1,22 @@
+qBittorrent v2 is the closest open source (GNU GPL v2 license) equivalent
+to utorrent.  It is based on the Qt4 toolkit and libtorrent-rasterbar.
+
+Features:
+
+	Well-integrated and extensible Search Engine
+	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
+	Remote control through a Web user interface
+		* Nearly identical to the regular UI, all in Ajax
+	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
+	Advanced RSS support with download filters (inc. regex)
+	IP Filtering (eMule and PeerGuardian compatible)
+
+WWW: http://www.qbittorrent.org/
diff --git a/net-p2p/qbittorrent-29/pkg-message b/net-p2p/qbittorrent-29/pkg-message
new file mode 100644
index 000000000000..157ed5b528c6
--- /dev/null
+++ b/net-p2p/qbittorrent-29/pkg-message
@@ -0,0 +1,5 @@
+
+****************************************************************************
+*      To change the appearance of the interface use misc/qt4-qtconfig     *
+****************************************************************************
+
diff --git a/net-p2p/qbittorrent-29/pkg-plist b/net-p2p/qbittorrent-29/pkg-plist
new file mode 100644
index 000000000000..dcd1b5c55a5f
--- /dev/null
+++ b/net-p2p/qbittorrent-29/pkg-plist
@@ -0,0 +1,39 @@
+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
+share/icons/hicolor/32x32/apps/qbittorrent.png
+share/icons/hicolor/36x36/apps/qbittorrent.png
+share/icons/hicolor/48x48/apps/qbittorrent.png
+share/icons/hicolor/64x64/apps/qbittorrent.png
+share/icons/hicolor/72x72/apps/qbittorrent.png
+share/icons/hicolor/96x96/apps/qbittorrent.png
+share/pixmaps/qbittorrent.png
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/36x36/apps
+@dirrmtry share/icons/hicolor/36x36
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/22x22/apps
+@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
+@dirrmtry share/icons
+@dirrmtry share/applications