CVS commit: pkgsrc/net/synergy

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Jul 18 16:04:43 UTC 2019

Modified Files:
        pkgsrc/net/synergy: distinfo
        pkgsrc/net/synergy/patches: patch-CMakeLists.txt

Log Message:
synergy: Don't hardcode paths to libssl/libcrypt on Darwin.

>From madewokherd on freenode.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/synergy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/synergy/patches/patch-CMakeLists.txt

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/distinfo
diff -u pkgsrc/net/synergy/distinfo:1.28 pkgsrc/net/synergy/distinfo:1.29
--- pkgsrc/net/synergy/distinfo:1.28    Tue Jun  4 12:27:55 2019
+++ pkgsrc/net/synergy/distinfo Thu Jul 18 16:04:43 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.28 2019/06/04 12:27:55 abs Exp $
+$NetBSD: distinfo,v 1.29 2019/07/18 16:04:43 nia Exp $
 
 SHA1 (synergy-core-1.10.2.tar.gz) = ad236af38aa2b24f21ebab19abcf67a95e602bcf
 RMD160 (synergy-core-1.10.2.tar.gz) = 06216e1e22be7427e041017e3d08ae26243d2708
 SHA512 (synergy-core-1.10.2.tar.gz) = adf2f0fd3319d81d16384a0b44a23b03b5f118aa4ada6acfd16149d8dba0a79f2685bd25bc0a9b571564e0cf1abde9997cfc94aadb4da5592040e242268dbffc
 Size (synergy-core-1.10.2.tar.gz) = 6700286 bytes
-SHA1 (patch-CMakeLists.txt) = c8009e8a58ef9ab0bdc0d10674d4d8e7b584565e
+SHA1 (patch-CMakeLists.txt) = 69a702eb389c92104e1cdbe6be8a059dcc7d8765
 SHA1 (patch-src_lib_server_CConfig.cpp) = 94c5e9a57f9880ab8fcb75320bd2dbb306540966
 SHA1 (patch-tools_gmock-1.6.0_configure) = 0a3a23076b15858b79a8b3c2a9144ddaaad7ebe3
 SHA1 (patch-tools_gmock-1.6.0_include_gmock_internal_gmock-port.h) = 70d0f775e952a67b2680c480f757e60eb183e5be

Index: pkgsrc/net/synergy/patches/patch-CMakeLists.txt
diff -u pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.1 pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/net/synergy/patches/patch-CMakeLists.txt:1.1 Thu Jan 25 14:13:22 2018
+++ pkgsrc/net/synergy/patches/patch-CMakeLists.txt     Thu Jul 18 16:04:43 2019
@@ -1,16 +1,40 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2018/01/25 14:13:22 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/07/18 16:04:43 nia Exp $
 
---- CMakeLists.txt.orig        2017-09-18 11:05:03.000000000 +0000
+Don't use hardcoded paths for finding libcrypto and libssl.
+
+--- CMakeLists.txt.orig        2019-05-09 16:52:59.000000000 +0000
 +++ CMakeLists.txt
-@@ -299,10 +299,8 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Da
-         ${OPENSSL_ROOT}/lib/libssl.a
-         ${OPENSSL_ROOT}/lib/libcrypto.a
-     )
+@@ -279,32 +279,7 @@ endif()
+ #
+ # OpenSSL
+ #
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+-    set (OPENSSL_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/windows)
+-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+-        set (OPENSSL_ROOT "${OPENSSL_ROOT}/x64")
+-    else()
+-        set (OPENSSL_ROOT "${OPENSSL_ROOT}/x86")
+-    endif()
+-
+-    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+-    set (OPENSSL_LIBS
+-        ${OPENSSL_ROOT}/lib/libeay32.lib
+-        ${OPENSSL_ROOT}/lib/ssleay32.lib
+-    )
+-elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-    set (OPENSSL_ROOT /usr/local/opt/openssl)
+-
+-    include_directories (BEFORE SYSTEM ${OPENSSL_ROOT}/include)
+-    set (OPENSSL_LIBS
+-        ${OPENSSL_ROOT}/lib/libssl.a
+-        ${OPENSSL_ROOT}/lib/libcrypto.a
+-    )
 -elseif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+else()
-     set (OPENSSL_LIBS ssl crypto)
+-    set (OPENSSL_LIBS ssl crypto)
 -else()
 -    message (FATAL_ERROR "Couldn't find OpenSSL")
- endif()
+-endif()
++set (OPENSSL_LIBS ssl crypto)
  
  #
+ # Configure_file... but for directories, recursively.