CVS commit: pkgsrc/net/synergy

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/synergy
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Thu, 25 Jan 2018 14:13:22 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Jan 25 14:13:22 UTC 2018

Modified Files:
        pkgsrc/net/synergy: Makefile PLIST distinfo
        pkgsrc/net/synergy/patches: patch-tools_gmock-1.6.0_configure
            patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h
            patch-tools_gtest-1.6.0_configure
            patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h
Added Files:
        pkgsrc/net/synergy/patches: patch-CMakeLists.txt

Log Message:
synergy: update to 2.0.0

changes unknown


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/net/synergy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/synergy/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/synergy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/synergy/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_configure \
    pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h \
    pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_configure \
    pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/synergy/Makefile
diff -u pkgsrc/net/synergy/Makefile:1.46 pkgsrc/net/synergy/Makefile:1.47
--- pkgsrc/net/synergy/Makefile:1.46    Mon Jan  1 21:18:49 2018
+++ pkgsrc/net/synergy/Makefile Thu Jan 25 14:13:22 2018
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2018/01/01 21:18:49 adam Exp $
+# $NetBSD: Makefile,v 1.47 2018/01/25 14:13:22 tnn Exp $
 
-DISTNAME=              synergy-1.8.8
-PKGREVISION=           2
+DISTNAME=              synergy-core-2.0.0
+PKGNAME=               ${DISTNAME:S/-core//}
 CATEGORIES=            net x11
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=symless/}
+GITHUB_PROJECT=                synergy-core
 GITHUB_TAG=            v${PKGVERSION_NOREV}-stable
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -12,7 +13,6 @@ COMMENT=              Let a user share a mouse and k
 LICENSE=               gnu-gpl-v2
 
 USE_LANGUAGES=         c c++11
-USE_TOOLS+=            unzip
 # Main configuration is CMake, but subdirectories are GNU configure.
 # We need to set GNU_CONFIGURE=yes for config.{guess,sub} overrides to kick in.
 # We override the do-configure target to prevent pkgsrc from running both
@@ -20,10 +20,12 @@ USE_TOOLS+=         unzip
 USE_CMAKE=             yes
 GNU_CONFIGURE=         yes
 
-CONFIG_SUB_OVERRIDE+=  ext/gmock-1.6.0/build-aux/config.sub
-CONFIG_SUB_OVERRIDE+=  ext/gtest-1.6.0/build-aux/config.sub
-CONFIG_GUESS_OVERRIDE+=        ext/gmock-1.6.0/build-aux/config.guess
-CONFIG_GUESS_OVERRIDE+=        ext/gtest-1.6.0/build-aux/config.guess
+CONFIG_SUB_OVERRIDE+=  ext/gmock/build-aux/config.sub
+CONFIG_SUB_OVERRIDE+=  ext/gtest/build-aux/config.sub
+CONFIG_GUESS_OVERRIDE+=        ext/gmock/build-aux/config.guess
+CONFIG_GUESS_OVERRIDE+=        ext/gtest/build-aux/config.guess
+
+CONFIGURE_ENV+=                GIT_COMMIT=0bd448d5
 
 EXAMPLES=      MacReadme.txt org.synergy-foss.org.synergyc.plist \
                org.synergy-foss.org.synergys.plist synergy.conf.example \
@@ -38,12 +40,6 @@ SUBST_SED.fix-paths=         -e 's,"/etc,"${PKG
 
 BUILDLINK_TRANSFORM+=          rm:-march=native
 
-post-extract:
-       ${MKDIR} ${WRKSRC}/ext/gmock-1.6.0
-       cd ${WRKSRC}/ext/gmock-1.6.0 && unzip -aqo ../gmock-1.6.0.zip
-       ${MKDIR} ${WRKSRC}/ext/gtest-1.6.0
-       cd ${WRKSRC}/ext/gtest-1.6.0 && unzip -aqo ../gtest-1.6.0.zip
-
 .PHONY: do-configure
 do-configure: do-configure-cmake
 
@@ -54,6 +50,7 @@ do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bin/${p} ${DESTDIR}${PREFIX}/bin/${p}
        ${INSTALL_MAN} ${WRKSRC}/doc/${p}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${p}.1
 .endfor
+       ${INSTALL_PROGRAM} ${WRKSRC}/bin/synergy-core ${DESTDIR}${PREFIX}/bin/synergy-core
 .for f in ${EXAMPLES}
        ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
 .endfor

Index: pkgsrc/net/synergy/PLIST
diff -u pkgsrc/net/synergy/PLIST:1.6 pkgsrc/net/synergy/PLIST:1.7
--- pkgsrc/net/synergy/PLIST:1.6        Thu Jun 23 03:16:50 2011
+++ pkgsrc/net/synergy/PLIST    Thu Jan 25 14:13:22 2018
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2011/06/23 03:16:50 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/25 14:13:22 tnn Exp $
+bin/synergy-core
 bin/synergyc
 bin/synergys
 man/man1/synergyc.1

Index: pkgsrc/net/synergy/distinfo
diff -u pkgsrc/net/synergy/distinfo:1.25 pkgsrc/net/synergy/distinfo:1.26
--- pkgsrc/net/synergy/distinfo:1.25    Fri Jul 28 07:46:45 2017
+++ pkgsrc/net/synergy/distinfo Thu Jan 25 14:13:22 2018
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.25 2017/07/28 07:46:45 tnn Exp $
+$NetBSD: distinfo,v 1.26 2018/01/25 14:13:22 tnn Exp $
 
-SHA1 (synergy-1.8.8.tar.gz) = 6e01c68e5f20382ec9e77c25cfdf1525bdd513bb
-RMD160 (synergy-1.8.8.tar.gz) = 92d0c32ab8075169994f15d4db550ef916e9d7f8
-SHA512 (synergy-1.8.8.tar.gz) = b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6
-Size (synergy-1.8.8.tar.gz) = 13498599 bytes
+SHA1 (synergy-core-2.0.0.tar.gz) = f979e1803aee34b54a3cd6fa725810f7d73eb5a5
+RMD160 (synergy-core-2.0.0.tar.gz) = 32c9db97381354ef6de3b86fffc72eeb6e83f05b
+SHA512 (synergy-core-2.0.0.tar.gz) = 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13
+Size (synergy-core-2.0.0.tar.gz) = 5892923 bytes
+SHA1 (patch-CMakeLists.txt) = c8009e8a58ef9ab0bdc0d10674d4d8e7b584565e
 SHA1 (patch-src_lib_server_CConfig.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
-SHA1 (patch-tools_gmock-1.6.0_configure) = 3a10f06cba4f0af02e0175bf007d1937e3b5a25e
-SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 7e3b8ac2209e895f8949f35ef710300b727384ce
-SHA1 (patch-tools_gtest-1.6.0_configure) = 85386ecd2bf9ab8247ed7d244d6e96887b3c1d5d
-SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = 2db6f0bc8a2e38b1beb56ac51428c8aaa5ef3b75
+SHA1 (patch-tools_gmock-1.6.0_configure) = 0a3a23076b15858b79a8b3c2a9144ddaaad7ebe3
+SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 70d0f775e952a67b2680c480f757e60eb183e5be
+SHA1 (patch-tools_gtest-1.6.0_configure) = df73a2566790e23501795af54f9c17324e7a6c83
+SHA1 (patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h) = ee496a203a5372a06a83a3d73d6d87b1b0c58157

Index: pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_configure
diff -u pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_configure:1.2 pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_configure:1.3
--- pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_configure:1.2    Tue Feb  3 18:49:34 2015
+++ pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_configure        Thu Jan 25 14:13:22 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.2 2015/02/03 18:49:34 tnn Exp $
+$NetBSD: patch-tools_gmock-1.6.0_configure,v 1.3 2018/01/25 14:13:22 tnn Exp $
 
 Fix wrong usage of test(1).
 
---- ext/gmock-1.6.0/configure.orig     2011-05-07 02:25:30.000000000 +0000
-+++ ext/gmock-1.6.0/configure
+--- ext/gmock/configure.orig   2011-05-07 02:25:30.000000000 +0000
++++ ext/gmock/configure
 @@ -14896,7 +14896,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
         have_pthreads="$acx_pthread_ok"
Index: pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h
diff -u pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h:1.2 pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h:1.3
--- pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h:1.2  Tue Feb  3 18:49:34 2015
+++ pkgsrc/net/synergy/patches/patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h      Thu Jan 25 14:13:22 2018
@@ -1,7 +1,7 @@
-$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.2 2015/02/03 18:49:34 tnn Exp $
+$NetBSD: patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h,v 1.3 2018/01/25 14:13:22 tnn Exp $
 
---- ext/gmock-1.6.0/include/gmock/internal/gmock-port.h.orig   2011-05-07 02:25:30.000000000 +0000
-+++ ext/gmock-1.6.0/include/gmock/internal/gmock-port.h
+--- ext/gmock/include/gmock/internal/gmock-port.h.orig 2011-05-07 02:25:30.000000000 +0000
++++ ext/gmock/include/gmock/internal/gmock-port.h
 @@ -50,6 +50,14 @@
  // tr1/tuple.  gmock-port.h does this via gtest-port.h, which is
  // guaranteed to pull in the tuple header.
Index: pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_configure
diff -u pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_configure:1.2 pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_configure:1.3
--- pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_configure:1.2    Tue Feb  3 18:49:34 2015
+++ pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_configure        Thu Jan 25 14:13:22 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.2 2015/02/03 18:49:34 tnn Exp $
+$NetBSD: patch-tools_gtest-1.6.0_configure,v 1.3 2018/01/25 14:13:22 tnn Exp $
 
 Fix wrong usage of test(1).
 
---- ext/gtest-1.6.0/configure.orig     2011-05-07 02:25:30.000000000 +0000
-+++ ext/gtest-1.6.0/configure
+--- ext/gtest/configure.orig   2011-05-07 02:25:30.000000000 +0000
++++ ext/gtest/configure
 @@ -14861,7 +14861,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
         have_pthreads="$acx_pthread_ok"
Index: pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h
diff -u pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h:1.2 pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h:1.3
--- pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h:1.2  Tue Feb  3 18:49:34 2015
+++ pkgsrc/net/synergy/patches/patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h      Thu Jan 25 14:13:22 2018
@@ -1,7 +1,7 @@
-$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.2 2015/02/03 18:49:34 tnn Exp $
+$NetBSD: patch-tools_gtest-1.6.0_include_gtest_internal_gtest-port.h,v 1.3 2018/01/25 14:13:22 tnn Exp $
 
---- ext/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig   2011-05-07 02:25:30.000000000 +0000
-+++ ext/gtest-1.6.0/include/gtest/internal/gtest-port.h
+--- ext/gtest/include/gtest/internal/gtest-port.h.orig 2011-05-07 02:25:30.000000000 +0000
++++ ext/gtest/include/gtest/internal/gtest-port.h
 @@ -481,6 +481,16 @@
  #  define BOOST_TR1_DETAIL_CONFIG_HPP_INCLUDED
  #  include <tuple>

Added files:

Index: pkgsrc/net/synergy/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Jan 25 14:13:22 2018
+++ pkgsrc/net/synergy/patches/patch-CMakeLists.txt     Thu Jan 25 14:13:22 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/25 14:13:22 tnn Exp $
+
+--- CMakeLists.txt.orig        2017-09-18 11:05:03.000000000 +0000
++++ CMakeLists.txt
+@@ -299,10 +299,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Da
+         ${OPENSSL_ROOT}/lib/libssl.a
+         ${OPENSSL_ROOT}/lib/libcrypto.a
+     )
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++else()
+     set (OPENSSL_LIBS ssl crypto)
+-else()
+-    message (FATAL_ERROR "Couldn't find OpenSSL")
+ endif()
+ 
+ #

Prev by Date: CVS commit: pkgsrc/x11/py-sip
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/x11/py-sip
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index