4 files changed, 35 insertions, 26 deletions

diff --git a/net-p2p/sharktorrent/Makefile b/net-p2p/sharktorrent/Makefile
index 1e9607f94c1e..afba842f4b60 100644
--- a/net-p2p/sharktorrent/Makefile
+++ b/net-p2p/sharktorrent/Makefile
@@ -6,25 +6,34 @@
 #
 
 PORTNAME=	sharktorrent
-PORTVERSION=	0.1.1
-PORTREVISION=	5
+PORTVERSION=	0.1.8.4
 CATEGORIES=	net-p2p
-MASTER_SITES=	SF/${PORTNAME}/OldFiles
+MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-${PORTVERSION}-beta-src
 
-MAINTAINER=	dougb@FreeBSD.org
+MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ Bittorrent client using wxWidgets, libtorrent and boost
 
 LIB_DEPENDS=	boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
-		torrent.1:${PORTSDIR}/net-p2p/rblibtorrent
+		torrent-rasterbar.5:${PORTSDIR}/net-p2p/rblibtorrent-devel
 
-DEPRECATED=	Version is out of date, relies on too-old version of libtorrent
-EXPIRATION_DATE=	2010-03-15
-USE_WX=		2.6
-WX_CONF_ARGS=	absolute
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDLFAGS="-L${LOCALBASE}/lib"
-CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libtorrent
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui network
+MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/sharktorrent
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+post-patch:
+	${REINPLACE_CMD} -e 's|/opt|${LOCALBASE}|; s|-mt||' \
+		${WRKSRC}/src/src.pro
+
+do-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+		${QMAKE} ${QMAKEFLAGS} sharktorrent.pro
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin
+
 .include <bsd.port.mk>
diff --git a/net-p2p/sharktorrent/distinfo b/net-p2p/sharktorrent/distinfo
index 45ece23f442e..e3cfb9679e6f 100644
--- a/net-p2p/sharktorrent/distinfo
+++ b/net-p2p/sharktorrent/distinfo
@@ -1,3 +1,3 @@
-MD5 (sharktorrent-0.1.1.tar.gz) = f1802307e9f3fa78359d28024ebe039d
-SHA256 (sharktorrent-0.1.1.tar.gz) = 618124c1db56fbaf2f1e27a889379e56397b181c2e4f668a531be3f11ff0eece
-SIZE (sharktorrent-0.1.1.tar.gz) = 710540
+MD5 (sharktorrent-0.1.8.4-beta-src.tar.gz) = ac9b2d86223507b4f9009511ed597da5
+SHA256 (sharktorrent-0.1.8.4-beta-src.tar.gz) = cdadfd209c8de3415e5bfd4b406315320015f78a95c46cfff4c1e69e97b7d4fe
+SIZE (sharktorrent-0.1.8.4-beta-src.tar.gz) = 156638
diff --git a/net-p2p/sharktorrent/files/patch-src-stsession.cpp b/net-p2p/sharktorrent/files/patch-src-stsession.cpp
new file mode 100644
index 000000000000..4dab388e4d58
--- /dev/null
+++ b/net-p2p/sharktorrent/files/patch-src-stsession.cpp
@@ -0,0 +1,11 @@
+--- src/stsession.cpp.orig	2009-07-06 01:40:21.000000000 +0400
++++ src/stsession.cpp	2010-02-17 19:01:03.000000000 +0300
+@@ -501,7 +501,7 @@
+ 	for (std::vector<peer_info>::const_iterator i = peers.begin();

+ 						i != peers.end(); ++i, _icount++)

+ 	{

+-		asio::ip::address _address =  i->ip.address();

++		libtorrent::asio::ip::address _address =  i->ip.address();

+ 

+ 		m_map_peers[_icount].append( QString("%1").arg(_icount)  );

+ 		m_map_peers[_icount].append( QString(_address.to_string().c_str()) );

diff --git a/net-p2p/sharktorrent/files/patch-src__Makefile.in b/net-p2p/sharktorrent/files/patch-src__Makefile.in
deleted file mode 100644
index 3de915b6b621..000000000000
--- a/net-p2p/sharktorrent/files/patch-src__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/Makefile.in.orig	Sat Dec 16 20:45:49 2006
-+++ ./src/Makefile.in	Wed Apr 25 23:10:18 2007
-@@ -189,7 +189,7 @@
- 							sttorrentmetainfogui.cpp sttorrentslistctrl.cpp stconfigdata.cpp sharktorrentframe.cpp \
- 				sttaskbaricon.cpp stfiledroptarget.cpp ststrlong.cpp stpairstrhandle.cpp
- 
--sharktorrent_LDFLAGS = $(WX_LIBS) 
-+sharktorrent_LDFLAGS = $(WX_LIBS) -lboost_filesystem -ltorrent
- all: all-am
- 
- .SUFFIXES: