svn commit: r548770 - head/misc/far2l/files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Sep 16 08:04:23 2020
New Revision: 548770
URL: https://svnweb.freebsd.org/changeset/ports/548770

Log:
  Unbreak the build after recent update of `security/libssh' using roughly
  the same patch as in r548664.
  
  Reported by:	pkg-fallout

Added:
  head/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake   (contents, props changed)

Added: head/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/far2l/files/patch-cmake_modules_FindLibSSH.cmake	Wed Sep 16 08:04:23 2020	(r548770)
@@ -0,0 +1,26 @@
+--- cmake/modules/FindLibSSH.cmake.orig	2020-06-22 23:39:14 UTC
++++ cmake/modules/FindLibSSH.cmake
+@@ -61,15 +61,20 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUDE_DIRS)
+             )
+ 
+         if (LibSSH_FIND_VERSION)
+-            file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
++            # libssh >= 0.9.5 provides dedicated version header file
++            set(_libssh_version_header ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h)
++            if (NOT EXISTS ${_libssh_version_header})
++                set(_libssh_version_header ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h)
++            endif()
++            file(STRINGS ${_libssh_version_header} LIBSSH_VERSION_MAJOR
+                 REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+             # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
+             if (LIBSSH_VERSION_MAJOR)
+                 string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
+-                file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
++                file(STRINGS ${_libssh_version_header} LIBSSH_VERSION_MINOR
+                     REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
+                 string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
+-                file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
++                file(STRINGS ${_libssh_version_header} LIBSSH_VERSION_PATCH
+                     REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
+                 string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
+