[Midnightbsd-cvs] mports [24473] trunk/databases/mysql57-client/files: update some patches

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Oct 14 23:53:40 EDT 2018


Revision: 24473
          http://svnweb.midnightbsd.org/mports/?rev=24473
Author:   laffer1
Date:     2018-10-14 23:53:38 -0400 (Sun, 14 Oct 2018)
Log Message:
-----------
update some patches

Modified Paths:
--------------
    trunk/databases/mysql57-client/files/patch-configure.cmake
    trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
    trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt

Modified: trunk/databases/mysql57-client/files/patch-configure.cmake
===================================================================
--- trunk/databases/mysql57-client/files/patch-configure.cmake	2018-10-14 21:44:38 UTC (rev 24472)
+++ trunk/databases/mysql57-client/files/patch-configure.cmake	2018-10-15 03:53:38 UTC (rev 24473)
@@ -4,7 +4,7 @@
  ENDIF()
  
  
-+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|MidnightBSD")
 +  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
 +    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
 +ENDIF()

Modified: trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt	2018-10-14 21:44:38 UTC (rev 24472)
+++ trunk/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt	2018-10-15 03:53:38 UTC (rev 24473)
@@ -5,7 +5,7 @@
    IF(UNIX)
      # libtool compatability
 -    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
++    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly|MidnightBSD" OR APPLE)
        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
      ELSE()
        SET(OS_SHARED_LIB_VERSION

Modified: trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt
===================================================================
--- trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt	2018-10-14 21:44:38 UTC (rev 24472)
+++ trunk/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt	2018-10-15 03:53:38 UTC (rev 24473)
@@ -1,10 +1,21 @@
---- libmysql/authentication_ldap/CMakeLists.txt.orig	2018-03-04 13:40:40 UTC
-+++ libmysql/authentication_ldap/CMakeLists.txt
-@@ -54,7 +54,7 @@ ENDIF()
+--- libmysql/authentication_ldap/CMakeLists.txt.orig	2018-03-04 08:40:40.000000000 -0500
++++ libmysql/authentication_ldap/CMakeLists.txt	2018-10-14 23:46:46.052955000 -0400
+@@ -19,7 +19,7 @@
+ 
+ INCLUDE(CheckIncludeFiles)
+ 
+-IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
++IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|MidnightBSD")
+   INCLUDE_DIRECTORIES(SYSTEM /usr/local/include)
+   LIST(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include")
+ ENDIF()
+@@ -53,8 +53,8 @@
+ # IF someone like can build the cyrus sasl library on windows and build LDAP authentication sasl client as well.
  IF (CMAKE_SYSTEM_NAME MATCHES "SunOS")
    SET(SASL_LIBRARY "sasl")
- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+-ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 -  SET(SASL_LIBRARY "-L/usr/local/lib -R/usr/local/lib -lsasl2")
++ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|MidnightBSD")
 +  SET(SASL_LIBRARY "-L/usr/local/lib -rpath /usr/local/lib -lsasl2")
  ELSE()
    SET(SASL_LIBRARY "sasl2")



More information about the Midnightbsd-cvs mailing list