- Add patch to fix compilation with clang

- Trim Makefile header
- Mark jobs unsafe
- Add LICENSE
This commit is contained in:
Kevin Lo 2013-09-12 09:45:44 +00:00
parent 1f9270b0bc
commit 8c9c5a701e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=327047
4 changed files with 41 additions and 5 deletions

View file

@ -1,9 +1,4 @@
# New ports collection makefile for: synergy
# Date created: 26 March 2003
# Whom: Kevin Lo <kevlo@FreeBSD.org>
#
# $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

View file

@ -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

View file

@ -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;

View file

@ -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.