[Midnightbsd-cvs] mports [24287] trunk/databases/mysql80-client/files: update patchset

[laffer1 at midnightbsd.org]

Revision: 24287
          http://svnweb.midnightbsd.org/mports/?rev=24287
Author:   laffer1
Date:     2018-09-09 17:48:31 -0400 (Sun, 09 Sep 2018)
Log Message:
-----------
 update patchset

Modified Paths:
--------------
    trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
    trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
    trunk/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt

Added Paths:
-----------
    trunk/databases/mysql80-client/files/patch-cmake_os_MidnightBSD.cmake

Added: trunk/databases/mysql80-client/files/patch-cmake_os_MidnightBSD.cmake
===================================================================
--- trunk/databases/mysql80-client/files/patch-cmake_os_MidnightBSD.cmake	                        (rev 0)
+++ trunk/databases/mysql80-client/files/patch-cmake_os_MidnightBSD.cmake	2018-09-09 21:48:31 UTC (rev 24287)
@@ -0,0 +1,27 @@
+--- cmake/os/MidnightBSD.cmake.orig	2016-04-14 10:16:17 UTC
++++ cmake/os/MidnightBSD.cmake
+@@ -0,0 +1,24 @@
++INCLUDE(CheckCSourceRuns)
++
++# We require at least GCC 4.4 or Clang 3.3.
++IF(NOT FORCE_UNSUPPORTED_COMPILER)
++  IF(CMAKE_COMPILER_IS_GNUCC)
++    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++                    OUTPUT_VARIABLE GCC_VERSION)
++    IF(GCC_VERSION VERSION_LESS 4.4)
++      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++    ENDIF()
++  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
++    CHECK_C_SOURCE_RUNS("
++      int main()
++      {
++        return (__clang_major__ < 3) ||
++               (__clang_major__ == 3 && __clang_minor__ < 3);
++      }" HAVE_SUPPORTED_CLANG_VERSION)
++    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
++      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
++    ENDIF()
++  ELSE()
++    MESSAGE(FATAL_ERROR "Unsupported compiler!")
++  ENDIF()
++ENDIF()


Property changes on: trunk/databases/mysql80-client/files/patch-cmake_os_MidnightBSD.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h
===================================================================
--- trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h	2018-09-09 21:47:35 UTC (rev 24286)
+++ trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_chartype.h	2018-09-09 21:48:31 UTC (rev 24287)
@@ -5,7 +5,7 @@
  #if !defined(__NetBSD__) && !defined(__sun) \
    && !(defined(__APPLE__) && defined(__MACH__)) \
 -  && !defined(__FreeBSD__) && !defined(_AIX)
-+  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__)
++  && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__DragonFly__) && !defined(__MidnightBSD__)
  #ifndef __STDC_ISO_10646__
  /* In many places it is assumed that the first 127 code points are ASCII
   * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

Modified: trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c
===================================================================
--- trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c	2018-09-09 21:47:35 UTC (rev 24286)
+++ trunk/databases/mysql80-client/files/patch-cmd-line-utils_libedit_vi.c	2018-09-09 21:48:31 UTC (rev 24287)
@@ -5,7 +5,7 @@
   * this is against historical precedent...
   */
 -#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__MidnightBSD__)
  __weakref_visible char *my_get_alias_text(const char *)
      __weak_reference(get_alias_text);
  #endif
@@ -14,7 +14,7 @@
  	 Int c __attribute__((__unused__)))
  {
 -#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
++#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__MidnightBSD__)
  	char alias_name[3];
  	char *alias_text;
  

Modified: trunk/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt
===================================================================
--- trunk/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt	2018-09-09 21:47:35 UTC (rev 24286)
+++ trunk/databases/mysql80-client/files/patch-libmysql_CMakeLists.txt	2018-09-09 21:48:31 UTC (rev 24287)
@@ -5,7 +5,7 @@
  ENDIF()
  
 +INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++IF (CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
 +  ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC")
 +ENDIF()
 +
@@ -17,7 +17,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