Update to 1.5.0

7 files changed, 57 insertions, 44 deletions

diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 4e3d2e67c7e3..1fa5bbf35b73 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	synergy
-PORTVERSION=	1.3.8
-PORTREVISION=	1
+PORTVERSION=	1.5.0
 DISTVERSIONSUFFIX=	-Source
 CATEGORIES=	sysutils
-MASTER_SITES=	GOOGLE_CODE
+MASTER_SITES=	http://synergy-project.org/files/packages/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-r2278${DISTVERSIONSUFFIX}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Mouse and keyboard sharing utility
@@ -13,21 +13,34 @@ COMMENT=	Mouse and keyboard sharing utility
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 USES=		cmake
 USE_XORG=	ice xtst x11 sm
 
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+
 MAKE_JOBS_UNSAFE=yes
 
-CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-PLIST_FILES=	bin/synergys bin/synergyc
+PLIST_FILES=    bin/synergyc bin/synergyd bin/synergys bin/syntool \
+		man/man1/synergyc.1.gz man/man1/synergys.1.gz
 PORTEXAMPLES=	synergy.conf.example synergy.conf.example-basic \
 		synergy.conf.example-advanced
 
+post-extract:
+	cd ${WRKSRC}/ext/
+	${MKDIR} ${WRKSRC}/ext/cryptopp562
+	(cd ${WRKSRC}/ext/cryptopp562 && ${TAR} xfz ${WRKSRC}/ext/cryptopp562.zip)
+
 do-install:
-.for f in synergys synergyc
+.for f in synergyc synergyd synergys syntool
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/synergyc.man \
+		${STAGEDIR}${MANPREFIX}/man/man1/synergyc.1
+	${INSTALL_MAN} ${WRKSRC}/doc/synergys.man \
+		${STAGEDIR}${MANPREFIX}/man/man1/synergys.1
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
diff --git a/sysutils/synergy/distinfo b/sysutils/synergy/distinfo
index 0fa0ae77587f..223cfe655444 100644
--- a/sysutils/synergy/distinfo
+++ b/sysutils/synergy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (synergy-1.3.8-Source.tar.gz) = 0afc83e4ed0b46ed497d4229b2b2854e8d3c581a112f4da05110943edbfacc03
-SIZE (synergy-1.3.8-Source.tar.gz) = 2518396
+SHA256 (synergy-1.5.0-r2278-Source.tar.gz) = 66bf6016a2e71b2b2b26fc445d28324d1d286b6fca7ae3e9d19fd300769af024
+SIZE (synergy-1.5.0-r2278-Source.tar.gz) = 4350894
diff --git a/sysutils/synergy/files/patch-CConfig.cpp b/sysutils/synergy/files/patch-CConfig.cpp
deleted file mode 100644
index e9ba4102d999..000000000000
--- a/sysutils/synergy/files/patch-CConfig.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/lib/server/CConfig.cpp.orig	2011-01-21 11:51:35.000000000 +0800
-+++ src/lib/server/CConfig.cpp	2013-11-26 10:00:44.000000000 +0800
-@@ -1908,9 +1908,9 @@
- 	return m_line;
- }
- 
--CConfigReadContext::operator void*() const
-+CConfigReadContext::operator bool() const
- {
--	return m_stream;
-+	return m_stream.good();
- }
- 
- bool
diff --git a/sysutils/synergy/files/patch-CConfig.h b/sysutils/synergy/files/patch-CConfig.h
deleted file mode 100644
index aa825a9bdb68..000000000000
--- a/sysutils/synergy/files/patch-CConfig.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/sysutils/synergy/files/patch-CMakeLists.txt b/sysutils/synergy/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..316d9bf52ed9
--- /dev/null
+++ b/sysutils/synergy/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2014-05-23 23:43:58.000000000 +0800
++++ CMakeLists.txt	2014-05-30 13:55:26.000000000 +0800
+@@ -74,10 +74,6 @@
+ # Depending on the platform, pass in the required defines.
+ if (UNIX)
+ 
+-	# warnings as errors:
+-	# we have a problem with people checking in code with warnings.
+-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-
+ 	# For config.h, detect the libraries, functions, etc.
+ 	include(CheckIncludeFiles)
+ 	include(CheckLibraryExists)
diff --git a/sysutils/synergy/files/patch-gtest-port.h b/sysutils/synergy/files/patch-gtest-port.h
deleted file mode 100644
index 08e6ff80ec78..000000000000
--- a/sysutils/synergy/files/patch-gtest-port.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.
diff --git a/sysutils/synergy/files/patch-src-test-CMakeLists.txt b/sysutils/synergy/files/patch-src-test-CMakeLists.txt
new file mode 100644
index 000000000000..b88eb91c838e
--- /dev/null
+++ b/sysutils/synergy/files/patch-src-test-CMakeLists.txt
@@ -0,0 +1,23 @@
+--- src/test/CMakeLists.txt.orig	2014-05-30 14:01:30.000000000 +0800
++++ src/test/CMakeLists.txt	2014-05-30 14:12:21.000000000 +0800
+@@ -14,20 +14,5 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-include_directories(
+-	../../ext/gtest-1.6.0
+-	../../ext/gtest-1.6.0/include
+-	../../ext/gmock-1.6.0
+-	../../ext/gmock-1.6.0/include)
+-	
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
+-
+-if (UNIX)
+-	# ignore warnings in gtest and gmock
+-	set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
+-	set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
+-endif()
+-
+ add_subdirectory(integtests)
+ add_subdirectory(unittests)