3 files changed, 28 insertions, 39 deletions

diff --git a/net-im/qutim/Makefile b/net-im/qutim/Makefile
index 0800af313fa6..a33ffa604cb7 100644
--- a/net-im/qutim/Makefile
+++ b/net-im/qutim/Makefile
@@ -6,28 +6,43 @@
 #
 
 PORTNAME=	qutim
-PORTVERSION=	0.1.1
+PORTVERSION=	0.2b
 CATEGORIES=	net-im
 MASTER_SITES=	http://qutim.org/download/ \
 		http://dl.kibab.com/distfiles/qutim/ \
-		ftp://ftp.inferra.ru/pub/qutIM/
-DISTNAME=	qutim_${PORTVERSION}
+		ftp://ftp.inferra.ru/pub/qutim/
+DISTNAME=	qutim_${PORTVERSION}_svn326
 
 MAINTAINER=	webmaster@kibab.com
 COMMENT=	A Qt4-based lightweight ICQ client with advanced features
 
-BROKEN=		doesn't build with new QT 4.5
-
 USE_GMAKE=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	gui network xml moc_build qmake_build rcc_build uic_build
+QT_COMPONENTS=	gui designer_build script_build network webkit xml moc_build qmake_build rcc_build uic_build
+USE_XORG=	xscrnsaver
+
+MAKE_JOBS_SAFE=	yes
+
+USE_CMAKE=	yes
+CMAKE_BUILD_TYPE=	DEBUG
+CMAKE_USE_PTHREAD=	yes
+CMAKE_VERBOSE=	yes
+CMAKE_ARGS+=	-DUNIX:BOOL=1 -DBSD:BOOL=1
 
-PLIST_FILES=	bin/qutIM
+PLIST_FILES=	bin/qutim \
+		include/qutim/plugininterface.h \
+		include/qutim/protocolinterface.h \
+		include/qutim/iconmanagerinterface.h
+PLIST_DIRS=	include/qutim
 
-pre-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} -o Makefile qutIM.pro
+WRKSRC=		${WRKDIR}/qutim
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/build/bin/qutIM ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/include/qutim
+	@${INSTALL_PROGRAM} ${WRKSRC}/qutim ${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/include/qutim/plugininterface.h ${PREFIX}/include/qutim
+	@${INSTALL_DATA} ${WRKSRC}/include/qutim/protocolinterface.h ${PREFIX}/include/qutim
+	@${INSTALL_DATA} ${WRKSRC}/include/qutim/iconmanagerinterface.h ${PREFIX}/include/qutim
+	@${STRIP_CMD} ${PREFIX}/bin/qutim
 
 .include <bsd.port.mk>
diff --git a/net-im/qutim/distinfo b/net-im/qutim/distinfo
index 13929b106436..d83ad6e76fd6 100644
--- a/net-im/qutim/distinfo
+++ b/net-im/qutim/distinfo
@@ -1,3 +1,3 @@
-MD5 (qutim_0.1.1.tar.gz) = 0c43b30c1f428d0557f9d68f6cb4cff2
-SHA256 (qutim_0.1.1.tar.gz) = db62de671d9d6d5462dc2330ba9039cc1db74169eeefad8a2d3bc5609967df3c
-SIZE (qutim_0.1.1.tar.gz) = 805600
+MD5 (qutim_0.2b_svn326.tar.gz) = d45263742bcbdcd08ccfc6a13b1e0002
+SHA256 (qutim_0.2b_svn326.tar.gz) = 3197640c4bdbfc4301f4e22ca2b56d27878263a100415903f051ca13286ef298
+SIZE (qutim_0.2b_svn326.tar.gz) = 1670926
diff --git a/net-im/qutim/files/patch-protocol-oscar-icq-contactlist.cpp b/net-im/qutim/files/patch-protocol-oscar-icq-contactlist.cpp
deleted file mode 100644
index 2d01ad9f62b5..000000000000
--- a/net-im/qutim/files/patch-protocol-oscar-icq-contactlist.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- protocol/oscar/icq/contactlist.cpp.orig	2008-07-22 19:34:21.000000000 +0400
-+++ protocol/oscar/icq/contactlist.cpp	2008-07-22 20:14:46.000000000 +0400
-@@ -16,6 +16,7 @@
- //#include <QtGui>
- #include <QTcpSocket>
- #include <QNetworkProxy>
-+#include <sys/time.h>
- #include "treegroupitem.h"
- #include "treebuddyitem.h"
- #include "icqmessage.h"
-@@ -1559,8 +1560,14 @@
- 		msg->message = codec->toUnicode(socket->read(length - 1));
- 		
- 		QDateTime curTime = QDateTime::currentDateTime();
-+		
-+		// Use POSIX-compatible way to get daylight saving correction
-+		struct timeval tp;
-+		struct timezone tzp;
-+		gettimeofday(&tp, &tzp);
-+		
- 		int offset = (curTime.toLocalTime().time().hour() - curTime.toUTC().time().hour()) * 3600 + 
--			(curTime.toLocalTime().time().minute() - curTime.toUTC().time().minute()) * 60 - daylight * 3600;
-+			(curTime.toLocalTime().time().minute() - curTime.toUTC().time().minute()) * 60 - tzp.tz_dsttime * 3600;
- 		offlineDateTime = offlineDateTime.addSecs(offset);
- 		
- 		msg->date = offlineDateTime;