svn commit: r329022 - in head/net-im/qutim: . files

[John Marino]

Author: marino
Date: Wed Oct  2 08:38:57 2013
New Revision: 329022
URL: http://svnweb.freebsd.org/changeset/ports/329022

Log:
  net-im/qutim: add <unistd.h> for modern compilers, fix binutils
  
  In addition to the header inclusion, the linking stage failed on modern
  binutils because libX11 was used without being explicitly listed.  The
  LDFLAGS from the Makefile were getting overwritten by the CMake makefile,
  so that had to be patch to allow the LDFLAGS to be appended.
  
  Approved by:	portmgr (bapt, implicit)

Added:
  head/net-im/qutim/files/
  head/net-im/qutim/files/patch-CMakeLists.txt   (contents, props changed)
  head/net-im/qutim/files/patch-src_3rdparty_qtsolutions_qtlocalpeer.cpp   (contents, props changed)
Modified:
  head/net-im/qutim/Makefile

Modified: head/net-im/qutim/Makefile
==============================================================================
--- head/net-im/qutim/Makefile	Wed Oct  2 07:45:46 2013	(r329021)
+++ head/net-im/qutim/Makefile	Wed Oct  2 08:38:57 2013	(r329022)
@@ -11,7 +11,7 @@ MASTER_SITES=	http://dl.kibab.com/distfi
 DISTNAME=	qutim_${PORTVERSION}_svn529
 
 MAINTAINER=	webmaster at kibab.com
-COMMENT=	A Qt4-based multiprotocol IM client with advanced features
+COMMENT=	Qt4-based multiprotocol IM client with advanced features
 
 USE_QT4=	designer_build	\
 		gui		\
@@ -29,6 +29,7 @@ USE_XORG=	xscrnsaver
 
 USES=		cmake
 CMAKE_ARGS+=	-DUNIX:BOOL=1 -DBSD:BOOL=1
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 

Added: head/net-im/qutim/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/qutim/files/patch-CMakeLists.txt	Wed Oct  2 08:38:57 2013	(r329022)
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2009-10-11 14:09:56.000000000 +0000
++++ CMakeLists.txt
+@@ -11,7 +11,7 @@ if( UNIX )
+ 	if( BSD )
+ 		SET( CMAKE_THREAD_LIBS -pthread )
+ 		SET( CMAKE_USE_PTHREADS ON )
+-		SET( CMAKE_EXE_LINKER_FLAGS -pthread )
++		SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread" )
+ 	endif( BSD )
+ endif( UNIX )
+ 

Added: head/net-im/qutim/files/patch-src_3rdparty_qtsolutions_qtlocalpeer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-im/qutim/files/patch-src_3rdparty_qtsolutions_qtlocalpeer.cpp	Wed Oct  2 08:38:57 2013	(r329022)
@@ -0,0 +1,10 @@
+--- src/3rdparty/qtsolutions/qtlocalpeer.cpp.orig	2009-06-03 11:32:52.000000000 +0000
++++ src/3rdparty/qtsolutions/qtlocalpeer.cpp
+@@ -56,6 +56,7 @@ typedef BOOL(WINAPI*PProcessIdToSessionI
+ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
++#include <unistd.h>
+ #include <time.h>
+ #endif
+