[pkgsrc/trunk]: pkgsrc/net/synergy Update to synergy-1.7.0.

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03e328eb417d
branches:  trunk
changeset: 648452:03e328eb417d
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Mar 14 23:37:54 2015 +0000

description:
Update to synergy-1.7.0.

Enhancement #4313 - SSL encrypted secure connection
Enhancement #4168 - Plugin manager for GUI
Enhancement #4307 - Always show client auto-detect dialog
Enhancement #4397 - Modernize Mac build script (deployment and signing)
Enhancement #4398 - Remove obsolete Mac database cleaner
Enhancement #4337 - Remove IStreamFilterFactory dead code

diffstat:

 net/synergy/Makefile                                          |  25 +++++++---
 net/synergy/distinfo                                          |  10 +--
 net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp |  23 ----------
 net/synergy/patches/patch-tools_cryptopp562_wake.cpp          |  25 -----------
 4 files changed, 20 insertions(+), 63 deletions(-)

diffs (140 lines):

diff -r deb4e9a400df -r 03e328eb417d net/synergy/Makefile
--- a/net/synergy/Makefile      Sat Mar 14 23:02:52 2015 +0000
+++ b/net/synergy/Makefile      Sat Mar 14 23:37:54 2015 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2015/02/21 09:19:17 tnn Exp $
+# $NetBSD: Makefile,v 1.26 2015/03/14 23:37:54 tnn Exp $
 #
 
-DISTNAME=              synergy-1.6.2
+DISTNAME=              synergy-1.7.0
 CATEGORIES=            net x11
-MASTER_SITES=          -https://github.com/synergy/synergy/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=synergy/}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://synergy-project.org/
@@ -13,7 +13,16 @@
 EXTRACT_USING=         bsdtar
 USE_LANGUAGES=         c c++
 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.
+# Fortunately for us, cmake seems to take precedence in infrastructure.
 USE_CMAKE=             yes
+GNU_CONFIGURE=         yes
+
+CONFIG_SUB_OVERRIDE+=  ext/gmock-1.6.0/build-aux/config.sub
+CONFIG_SUB_OVERRIDE+=  ext/gmock-1.6.0/build-aux/config.sub
+CONFIG_GUESS_OVERRIDE+=        ext/gtest-1.6.0/build-aux/config.guess
+CONFIG_GUESS_OVERRIDE+=        ext/gtest-1.6.0/build-aux/config.guess
 
 EXAMPLES=      MacReadme.txt org.synergy-foss.org.synergyc.plist \
                org.synergy-foss.org.synergys.plist synergy.conf.example \
@@ -29,8 +38,6 @@
 BUILDLINK_TRANSFORM+=          rm:-march=native
 
 post-extract:
-       ${MKDIR} ${WRKSRC}/ext/cryptopp562
-       cd ${WRKSRC}/ext/cryptopp562 && unzip -aqo ../cryptopp562.zip
        ${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
@@ -55,10 +62,9 @@
                        -Wno-deprecated-register -Wno-tautological-compare
 .endif
 
-# tools/cryptopp562/GNUmakefile
-.include "../../mk/bsd.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-[0-6].*-i386)
-CXXFLAGS+=     -DCRYPTOPP_DISABLE_ASM
+# XXX surely there exists a better way to do this
+.if ${OPSYS} != "Linux"
+BUILDLINK_TRANSFORM+=  rm:-ldl
 .endif
 
 .include "../../www/curl/buildlink3.mk"
@@ -69,5 +75,6 @@
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
 .endif
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r deb4e9a400df -r 03e328eb417d net/synergy/distinfo
--- a/net/synergy/distinfo      Sat Mar 14 23:02:52 2015 +0000
+++ b/net/synergy/distinfo      Sat Mar 14 23:37:54 2015 +0000
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.15 2015/02/03 18:49:34 tnn Exp $
+$NetBSD: distinfo,v 1.16 2015/03/14 23:37:54 tnn Exp $
 
-SHA1 (synergy-1.6.2.tar.gz) = e3cab850da2ac63c1d7649c5a9fa0c7c204ef9a4
-RMD160 (synergy-1.6.2.tar.gz) = 861297c33477865d5a8e8027398d77efa13029c4
-Size (synergy-1.6.2.tar.gz) = 4411385 bytes
+SHA1 (synergy-1.7.0.tar.gz) = 8ec4dc9f888b6c551eacb23258549ed7681ed0c7
+RMD160 (synergy-1.7.0.tar.gz) = 49a542024cf6cfa8517a3b0fe4ced508d03ca3fa
+Size (synergy-1.7.0.tar.gz) = 8990045 bytes
 SHA1 (patch-src_lib_ipc_CIpcClientProxy.cpp) = 0779513d0653354c775a7f04417ae214f06795da
 SHA1 (patch-src_lib_ipc_CIpcServerProxy.cpp) = 8b486ad626a9bef7d74602035f3df73c3a91e0dd
-SHA1 (patch-src_lib_server_CClientProxy1__4.cpp) = fe1e10216c102082ed43b41025cd4bac2c04b090
 SHA1 (patch-src_lib_server_CConfig.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
-SHA1 (patch-tools_cryptopp562_wake.cpp) = b16e9702cfcee3180c129e03d8e0651ab0d13425
 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
diff -r deb4e9a400df -r 03e328eb417d net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp
--- a/net/synergy/patches/patch-src_lib_server_CClientProxy1__4.cpp     Sat Mar 14 23:02:52 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_lib_server_CClientProxy1__4.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $
-
-g++ on sparc64 complains: ISO C++ says that these are ambiguous:
-synergy/ProtocolUtil.h:82:16: note: candidate 1: static void ProtocolUtil::writef(void*, const char*, va_list)
-  static void   writef(void*, const char* fmt, va_list);
-                ^
-synergy/ProtocolUtil.h:53:16: note: candidate 2: static void ProtocolUtil::writef(synergy::IStream*, const char*, ...)
-  static void   writef(synergy::IStream*,
-                ^
-synergy/ProtocolUtil.h:82:16: error: 'static void ProtocolUtil::writef(void*, const char*, va_list)' is private
-  static void   writef(void*, const char* fmt, va_list);
-
---- src/lib/server/ClientProxy1_4.cpp.orig     2014-12-02 15:03:19.000000000 +0000
-+++ src/lib/server/ClientProxy1_4.cpp
-@@ -83,7 +83,7 @@ ClientProxy1_4::cryptoIv()
-       String data(reinterpret_cast<const char*>(iv), CRYPTO_IV_SIZE);
- 
-       LOG((CLOG_DEBUG2 "send crypto iv change to \"%s\"", getName().c_str()));
--      ProtocolUtil::writef(getStream(), kMsgDCryptoIv, &data);
-+      ProtocolUtil::writef(getStream(), kMsgDCryptoIv, "%s", &data);
-       
-       // change IV only after we've sent the current IV, otherwise
-       // the client won't be able to decrypt the new IV.
diff -r deb4e9a400df -r 03e328eb417d net/synergy/patches/patch-tools_cryptopp562_wake.cpp
--- a/net/synergy/patches/patch-tools_cryptopp562_wake.cpp      Sat Mar 14 23:02:52 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-tools_cryptopp562_wake.cpp,v 1.2 2015/02/03 18:49:34 tnn Exp $
-
---- ext/cryptopp562/wake.cpp.orig      2014-09-08 10:35:18.000000000 +0000
-+++ ext/cryptopp562/wake.cpp
-@@ -23,15 +23,15 @@ void WAKE_Base::GenKey(word32 k0, word32
-       signed int x, z, p;     
-       // x and z were declared as "long" in Wheeler's paper, which is a signed type. I don't know if that was intentional, but it's too late to change it now. -- Wei 7/4/2010
-       CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4);
--      static int tt[10]= {
-+      static int tt[8]= {
-               0x726a8f3b,                                                              // table
--              0xe69a3b5c,
--              0xd3c71fe5,
--              0xab3c73d2,
-+              (int)0xe69a3b5c,
-+              (int)0xd3c71fe5,
-+              (int)0xab3c73d2,
-               0x4d3a8eb3,
-               0x0396d6e8,
-               0x3d4c2f7a,
--              0x9ee27cf3, } ;
-+              (int)0x9ee27cf3, } ;
-       t[0] = k0;
-       t[1] = k1;
-       t[2] = k2;