[Midnightbsd-cvs] mports [20140] trunk/sysutils/synergy: synergy 1.7.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Aug 30 12:52:53 EDT 2015
Revision: 20140
http://svnweb.midnightbsd.org/mports/?rev=20140
Author: laffer1
Date: 2015-08-30 12:52:53 -0400 (Sun, 30 Aug 2015)
Log Message:
-----------
synergy 1.7.4
Modified Paths:
--------------
trunk/sysutils/synergy/Makefile
trunk/sysutils/synergy/distinfo
Added Paths:
-----------
trunk/sysutils/synergy/files/patch-CMakeLists.txt
trunk/sysutils/synergy/files/patch-src_CMakeLists.txt
trunk/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt
trunk/sysutils/synergy/files/patch-src_test_CMakeLists.txt
Removed Paths:
-------------
trunk/sysutils/synergy/files/patch-CConfig.cpp
trunk/sysutils/synergy/files/patch-CConfig.h
trunk/sysutils/synergy/files/patch-gtest-port.h
Modified: trunk/sysutils/synergy/Makefile
===================================================================
--- trunk/sysutils/synergy/Makefile 2015-08-30 16:49:59 UTC (rev 20139)
+++ trunk/sysutils/synergy/Makefile 2015-08-30 16:52:53 UTC (rev 20140)
@@ -2,35 +2,49 @@
# $FreeBSD: ports/sysutils/synergy/Makefile,v 1.14 2007/07/25 01:25:03 kevlo Exp $
PORTNAME= synergy
-PORTVERSION= 1.3.8
-DISTVERSIONSUFFIX= -Source
+PORTVERSION= 1.7.4
CATEGORIES= sysutils
-MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports at MidnightBSD.org
COMMENT= Mouse and keyboard sharing utility
+
LICENSE= gpl2
+LICENSE_FILE= ${WRKSRC}/LICENSE
-USE_CMAKE= yes
+USES= cmake cpe
+CPE_VENDOR= synergy-foss
USE_XORG= ice xtst x11 sm
+USE_GITHUB= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-stable
+
+DISTVERSIONPREFIX= v
+DISTVERSIONSUFFIX= -stable
+
+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 \
+ man/man1/synergyc.1.gz man/man1/synergys.1.gz
PORTEXAMPLES= synergy.conf.example synergy.conf.example-basic \
synergy.conf.example-advanced
+OPTIONS_DEFINE= EXAMPLES
+
do-install:
-.for f in synergys synergyc
+.for f in synergyc synergyd synergys
${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin
.endfor
-.if !defined(NOPORTEXAMPLES)
- ${MKDIR} ${EXAMPLESDIR}
+ ${INSTALL_MAN} ${WRKSRC}/doc/synergyc.man \
+ ${STAGEDIR}${MANPREFIX}/man/man1/synergyc.1
+ ${INSTALL_MAN} ${WRKSRC}/doc/synergys.man \
+ ${STAGEDIR}${MANPREFIX}/man/man1/synergys.1
+ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${EXAMPLESDIR}
.endfor
-.endif
.include <bsd.port.mk>
Modified: trunk/sysutils/synergy/distinfo
===================================================================
--- trunk/sysutils/synergy/distinfo 2015-08-30 16:49:59 UTC (rev 20139)
+++ trunk/sysutils/synergy/distinfo 2015-08-30 16:52:53 UTC (rev 20140)
@@ -1,2 +1,2 @@
-SHA256 (synergy-1.3.8-Source.tar.gz) = 0afc83e4ed0b46ed497d4229b2b2854e8d3c581a112f4da05110943edbfacc03
-SIZE (synergy-1.3.8-Source.tar.gz) = 2518396
+SHA256 (synergy-v1.7.4-stable_GH0.tar.gz) = 215dc3918b9f3ddfb57cc963f8df6751e5e834fd90c0a8b2767091589b012bdf
+SIZE (synergy-v1.7.4-stable_GH0.tar.gz) = 13665193
Deleted: trunk/sysutils/synergy/files/patch-CConfig.cpp
===================================================================
--- trunk/sysutils/synergy/files/patch-CConfig.cpp 2015-08-30 16:49:59 UTC (rev 20139)
+++ trunk/sysutils/synergy/files/patch-CConfig.cpp 2015-08-30 16:52:53 UTC (rev 20140)
@@ -1,14 +0,0 @@
---- 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
Deleted: trunk/sysutils/synergy/files/patch-CConfig.h
===================================================================
--- trunk/sysutils/synergy/files/patch-CConfig.h 2015-08-30 16:49:59 UTC (rev 20139)
+++ trunk/sysutils/synergy/files/patch-CConfig.h 2015-08-30 16:52:53 UTC (rev 20140)
@@ -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;
Added: trunk/sysutils/synergy/files/patch-CMakeLists.txt
===================================================================
--- trunk/sysutils/synergy/files/patch-CMakeLists.txt (rev 0)
+++ trunk/sysutils/synergy/files/patch-CMakeLists.txt 2015-08-30 16:52:53 UTC (rev 20140)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig 2015-05-26 23:56:21.000000000 +0800
++++ CMakeLists.txt 2015-08-03 14:02:26.524577000 +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")
+-
+ if (NOT APPLE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+ endif()
Property changes on: trunk/sysutils/synergy/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/sysutils/synergy/files/patch-gtest-port.h
===================================================================
--- trunk/sysutils/synergy/files/patch-gtest-port.h 2015-08-30 16:49:59 UTC (rev 20139)
+++ trunk/sysutils/synergy/files/patch-gtest-port.h 2015-08-30 16:52:53 UTC (rev 20140)
@@ -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.
Added: trunk/sysutils/synergy/files/patch-src_CMakeLists.txt
===================================================================
--- trunk/sysutils/synergy/files/patch-src_CMakeLists.txt (rev 0)
+++ trunk/sysutils/synergy/files/patch-src_CMakeLists.txt 2015-08-30 16:52:53 UTC (rev 20140)
@@ -0,0 +1,10 @@
+--- src/CMakeLists.txt.orig 2015-08-13 10:21:27.325279000 +0800
++++ src/CMakeLists.txt 2015-08-13 10:21:43.969252000 +0800
+@@ -17,7 +17,3 @@
+ add_subdirectory(lib)
+ add_subdirectory(cmd)
+ add_subdirectory(micro)
+-
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
+- add_subdirectory(test)
+-endif()
Property changes on: trunk/sysutils/synergy/files/patch-src_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt
===================================================================
--- trunk/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt (rev 0)
+++ trunk/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt 2015-08-30 16:52:53 UTC (rev 20140)
@@ -0,0 +1,9 @@
+--- src/lib/arch/CMakeLists.txt.orig 2015-08-03 10:52:29.431081000 +0800
++++ src/lib/arch/CMakeLists.txt 2015-08-03 10:52:45.330309000 +0800
+@@ -50,5 +50,5 @@
+ add_library(arch STATIC ${sources})
+
+ if (UNIX)
+- target_link_libraries(arch dl ${libs})
++ target_link_libraries(arch ${libs})
+ endif()
Property changes on: trunk/sysutils/synergy/files/patch-src_lib_arch_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/sysutils/synergy/files/patch-src_test_CMakeLists.txt
===================================================================
--- trunk/sysutils/synergy/files/patch-src_test_CMakeLists.txt (rev 0)
+++ trunk/sysutils/synergy/files/patch-src_test_CMakeLists.txt 2015-08-30 16:52:53 UTC (rev 20140)
@@ -0,0 +1,36 @@
+--- src/test/CMakeLists.txt.orig 2015-05-26 23:56:21.000000000 +0800
++++ src/test/CMakeLists.txt 2015-08-03 10:48:57.642889000 +0800
+@@ -1,33 +0,0 @@
+-# synergy -- mouse and keyboard sharing utility
+-# Copyright (C) 2012 Synergy Si Ltd.
+-# Copyright (C) 2011 Nick Bolton
+-#
+-# This package is free software; you can redistribute it and/or
+-# modify it under the terms of the GNU General Public License
+-# found in the file LICENSE that should have accompanied this file.
+-#
+-# This package is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU General Public License for more details.
+-#
+-# 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)
Property changes on: trunk/sysutils/synergy/files/patch-src_test_CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list