Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Jul 2015 05:18:39 +0000 (UTC)
From:      Kevin Lo <kevlo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r391971 - in head/sysutils/synergy: . files
Message-ID:  <201507140518.t6E5Idke056985@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevlo
Date: Tue Jul 14 05:18:38 2015
New Revision: 391971
URL: https://svnweb.freebsd.org/changeset/ports/391971

Log:
  Update to 1.7.3
  
  Differential Revision:	https://reviews.freebsd.org/D3048
  Submitted by:	jonathan

Added:
  head/sysutils/synergy/files/patch-src_CMakeLists.txt   (contents, props changed)
  head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt   (contents, props changed)
Deleted:
  head/sysutils/synergy/files/patch-src-test-CMakeLists.txt
Modified:
  head/sysutils/synergy/Makefile
  head/sysutils/synergy/distinfo
  head/sysutils/synergy/files/patch-CMakeLists.txt

Modified: head/sysutils/synergy/Makefile
==============================================================================
--- head/sysutils/synergy/Makefile	Tue Jul 14 04:57:30 2015	(r391970)
+++ head/sysutils/synergy/Makefile	Tue Jul 14 05:18:38 2015	(r391971)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	synergy
-PORTVERSION=	1.6.2
+PORTVERSION=	1.7.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	kevlo@FreeBSD.org
@@ -15,6 +15,9 @@ CPE_VENDOR=	synergy-foss
 USE_XORG=	ice xtst x11 sm
 USE_GITHUB=	yes
 
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-stable
+
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 MAKE_JOBS_UNSAFE=yes
@@ -29,9 +32,10 @@ PORTEXAMPLES=	synergy.conf.example syner
 OPTIONS_DEFINE=	EXAMPLES
 
 post-extract:
-	cd ${WRKSRC}/ext/
-	${MKDIR} ${WRKSRC}/ext/cryptopp562
-	(cd ${WRKSRC}/ext/cryptopp562 && ${TAR} xfz ${WRKSRC}/ext/cryptopp562.zip)
+	cp ${WRKSRC}/LICENSE ${WRKSRC}/COPYING
+	${MKDIR} -p ${WRKSRC}/ext/gmock-1.6.0 ${WRKSRC}/ext/gtest-1.6.0
+	(cd ${WRKSRC}/ext/gmock-1.6.0 && ${TAR} xfz ../gmock-1.6.0.zip)
+	(cd ${WRKSRC}/ext/gtest-1.6.0 && ${TAR} xfz ../gtest-1.6.0.zip)
 
 do-install:
 .for f in synergyc synergyd synergys

Modified: head/sysutils/synergy/distinfo
==============================================================================
--- head/sysutils/synergy/distinfo	Tue Jul 14 04:57:30 2015	(r391970)
+++ head/sysutils/synergy/distinfo	Tue Jul 14 05:18:38 2015	(r391971)
@@ -1,2 +1,2 @@
-SHA256 (synergy-synergy-1.6.2_GH0.tar.gz) = 36c0a2c9ea1c3a13a6134ce1e76ad8dd2f442100dd6075c53f31b399d2543ba3
-SIZE (synergy-synergy-1.6.2_GH0.tar.gz) = 4411385
+SHA256 (synergy-synergy-v1.7.3-stable_GH0.tar.gz) = a4effc3ddb0ef6de95f83fa62b5290e2909f8b76729b1bde89c5061e5d381e25
+SIZE (synergy-synergy-v1.7.3-stable_GH0.tar.gz) = 13661943

Modified: head/sysutils/synergy/files/patch-CMakeLists.txt
==============================================================================
--- head/sysutils/synergy/files/patch-CMakeLists.txt	Tue Jul 14 04:57:30 2015	(r391970)
+++ head/sysutils/synergy/files/patch-CMakeLists.txt	Tue Jul 14 05:18:38 2015	(r391971)
@@ -1,6 +1,6 @@
---- 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 @@
+--- CMakeLists.txt.orig	2015-05-26 15:56:21 UTC
++++ CMakeLists.txt
+@@ -74,10 +74,6 @@ endif()
  # Depending on the platform, pass in the required defines.
  if (UNIX)
  
@@ -8,6 +8,6 @@
 -	# 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)
+ 	if (NOT APPLE)
+ 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ 	endif()

Added: head/sysutils/synergy/files/patch-src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/synergy/files/patch-src_CMakeLists.txt	Tue Jul 14 05:18:38 2015	(r391971)
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2015-05-26 15:56:21 UTC
++++ src/CMakeLists.txt
+@@ -18,6 +18,7 @@ add_subdirectory(lib)
+ add_subdirectory(cmd)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"
++    AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
+ 	add_subdirectory(test)
+ endif()

Added: head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt	Tue Jul 14 05:18:38 2015	(r391971)
@@ -0,0 +1,10 @@
+--- src/lib/arch/CMakeLists.txt.orig	2015-05-26 15:56:21 UTC
++++ src/lib/arch/CMakeLists.txt
+@@ -49,6 +49,6 @@ endif()
+ 
+ add_library(arch STATIC ${sources})
+ 
+-if (UNIX)
++if (UNIX AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ 	target_link_libraries(arch dl ${libs})
+ endif()



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507140518.t6E5Idke056985>