From owner-svn-ports-head@FreeBSD.ORG Thu Sep 12 09:45:45 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6E506427; Thu, 12 Sep 2013 09:45:45 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B92722AE; Thu, 12 Sep 2013 09:45:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8C9jjrs004455; Thu, 12 Sep 2013 09:45:45 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8C9jinn004437; Thu, 12 Sep 2013 09:45:44 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201309120945.r8C9jinn004437@svn.freebsd.org> From: Kevin Lo Date: Thu, 12 Sep 2013 09:45:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327047 - in head/sysutils/synergy: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 09:45:45 -0000 Author: kevlo Date: Thu Sep 12 09:45:44 2013 New Revision: 327047 URL: http://svnweb.freebsd.org/changeset/ports/327047 Log: - Add patch to fix compilation with clang - Trim Makefile header - Mark jobs unsafe - Add LICENSE Added: head/sysutils/synergy/files/ head/sysutils/synergy/files/patch-CConfig.cpp (contents, props changed) head/sysutils/synergy/files/patch-CConfig.h (contents, props changed) head/sysutils/synergy/files/patch-gtest-port.h (contents, props changed) Modified: head/sysutils/synergy/Makefile Modified: head/sysutils/synergy/Makefile ============================================================================== --- head/sysutils/synergy/Makefile Thu Sep 12 09:39:19 2013 (r327046) +++ head/sysutils/synergy/Makefile Thu Sep 12 09:45:44 2013 (r327047) @@ -1,9 +1,4 @@ -# New ports collection makefile for: synergy -# Date created: 26 March 2003 -# Whom: Kevin Lo -# # $FreeBSD$ -# PORTNAME= synergy PORTVERSION= 1.3.8 @@ -14,9 +9,14 @@ MASTER_SITES= GOOGLE_CODE MAINTAINER= kevlo@FreeBSD.org COMMENT= Mouse and keyboard sharing utility +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + USES= cmake USE_XORG= ice xtst x11 sm +MAKE_JOBS_UNSAFE=yes + CFLAGS+= -L${LOCALBASE}/lib -I${LOCALBASE}/include PLIST_FILES= bin/synergys bin/synergyc Added: head/sysutils/synergy/files/patch-CConfig.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy/files/patch-CConfig.cpp Thu Sep 12 09:45:44 2013 (r327047) @@ -0,0 +1,14 @@ +--- src/lib/server/CConfig.cpp.orig 2011-01-21 11:51:35.000000000 +0800 ++++ src/lib/server/CConfig.cpp 2013-09-12 17:23:04.000000000 +0800 +@@ -1908,9 +1908,9 @@ + return m_line; + } + +-CConfigReadContext::operator void*() const ++CConfigReadContext::operator bool() const + { +- return m_stream; ++ return !m_stream.bad(); + } + + bool Added: head/sysutils/synergy/files/patch-CConfig.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy/files/patch-CConfig.h Thu Sep 12 09:45:44 2013 (r327047) @@ -0,0 +1,11 @@ +--- src/lib/server/CConfig.h.orig 2013-09-12 16:03:30.000000000 +0800 ++++ src/lib/server/CConfig.h 2013-09-12 16:04:07.000000000 +0800 +@@ -483,7 +483,7 @@ + bool readLine(CString&); + UInt32 getLineNumber() const; + +- operator void*() const; ++ operator bool() const; + bool operator!() const; + + OptionValue parseBoolean(const CString&) const; Added: head/sysutils/synergy/files/patch-gtest-port.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/synergy/files/patch-gtest-port.h Thu Sep 12 09:45:44 2013 (r327047) @@ -0,0 +1,11 @@ +--- tools/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig 2011-05-07 10:25:30.000000000 +0800 ++++ tools/gtest-1.6.0/include/gtest/internal/gtest-port.h 2013-09-12 17:39:09.000000000 +0800 +@@ -204,6 +204,8 @@ + #define GTEST_NAME_ "Google Test" + #define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/" + ++#define GTEST_USE_OWN_TR1_TUPLE 1 ++ + // Determines the version of gcc that is used to compile this. + #ifdef __GNUC__ + // 40302 means version 4.3.2.