svn commit: r355803 - in head/sysutils/synergy: . files

[Kevin Lo]

Author: kevlo
Date: Fri May 30 09:00:03 2014
New Revision: 355803
URL: http://svnweb.freebsd.org/changeset/ports/355803
QAT: https://qat.redports.org/buildarchive/r355803/

Log:
  Update to 1.5.0

Added:
  head/sysutils/synergy/files/patch-CMakeLists.txt   (contents, props changed)
  head/sysutils/synergy/files/patch-src-test-CMakeLists.txt   (contents, props changed)
Deleted:
  head/sysutils/synergy/files/patch-CConfig.cpp
  head/sysutils/synergy/files/patch-CConfig.h
  head/sysutils/synergy/files/patch-gtest-port.h
Modified:
  head/sysutils/synergy/Makefile
  head/sysutils/synergy/distinfo

Modified: head/sysutils/synergy/Makefile
==============================================================================
--- head/sysutils/synergy/Makefile	Fri May 30 08:50:20 2014	(r355802)
+++ head/sysutils/synergy/Makefile	Fri May 30 09:00:03 2014	(r355803)
@@ -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 at FreeBSD.org
 COMMENT=	Mouse and keyboard sharing utility
@@ -13,21 +13,34 @@ COMMENT=	Mouse and keyboard sharing util
 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}

Modified: head/sysutils/synergy/distinfo
==============================================================================
--- head/sysutils/synergy/distinfo	Fri May 30 08:50:20 2014	(r355802)
+++ head/sysutils/synergy/distinfo	Fri May 30 09:00:03 2014	(r355803)
@@ -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

Added: head/sysutils/synergy/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/synergy/files/patch-CMakeLists.txt	Fri May 30 09:00:03 2014	(r355803)
@@ -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)

Added: head/sysutils/synergy/files/patch-src-test-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/synergy/files/patch-src-test-CMakeLists.txt	Fri May 30 09:00:03 2014	(r355803)
@@ -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)