Index: branches/2019Q1/databases/mysql80-client/Makefile
===================================================================
--- branches/2019Q1/databases/mysql80-client/Makefile	(revision 490802)
+++ branches/2019Q1/databases/mysql80-client/Makefile	(revision 490803)
@@ -1,42 +1,42 @@
 # Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
 # $FreeBSD$
 
 PORTNAME=	mysql
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	80-client
 
 COMMENT=	Multithreaded SQL database (client)
 
 LICENSE+=	LGPL21
 
 BROKEN_powerpc64=	does not build: reports unsupported compiler
 BROKEN_sparc64=		does not build: reports unsupported compiler
 
 MASTERDIR=	${.CURDIR}/../mysql80-server
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	mysql8[1-9]-client-* \
 			mysql[0-79][0-9]-client-* \
 			mariadb[0-9][0-9]-client-* \
 			percona[0-9][0-9]-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql
 
 MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
 		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
 		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
 
 CLIENT_ONLY=	yes
 
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r
 post-install:
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
 	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
 	@${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt
===================================================================
--- branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 490802)
+++ branches/2019Q1/databases/mysql80-client/files/patch-scripts_CMakeLists.txt	(revision 490803)
@@ -1,64 +1,73 @@
---- scripts/CMakeLists.txt.orig	2018-11-04 20:58:12 UTC
+--- scripts/CMakeLists.txt.orig	2018-10-07 08:44:22 UTC
 +++ scripts/CMakeLists.txt
 @@ -80,6 +80,7 @@ ELSE()
    MESSAGE(FATAL_ERROR "Cannot concatenate files")
  ENDIF()
  
 +IF(FALSE)
  # Build mysql_fix_privilege_tables.c
  ADD_CUSTOM_COMMAND(
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
 @@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
    ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
  )
 +ENDIF()
  
  # If we do not have performance schema compiled in then sys will not work,
  # so only create an empty sys database with an auto-generated file,
 @@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER)
    )
  ENDIF()
  
 +IF(FALSE)
  IF(UNIX)
   FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
     "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
 @@ -211,6 +214,7 @@ IF(UNIX)
    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
  )
  ENDIF()
 +ENDIF()
  
  # TCMalloc hacks
  IF(MALLOC_LIB)
+@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+     LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
+     FOREACH(lib ${${target}_LIB_DEPENDS})
+       # Filter out "general", it is not a library, just CMake hint
+-      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
++      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
+         IF (lib MATCHES "^\\-l")
+           SET(${var} "${${var}} ${lib} ")
+         ELSEIF(lib MATCHES "^/")
 @@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
            STRING(REGEX REPLACE "^lib" "" lib "${lib}")
            SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
 +          SET(${var} "${${var}}-pthread " )
          ELSE()
            SET(${var} "${${var}}-l${lib} " )
          ENDIF()
 @@ -454,19 +460,7 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(mysql_config_COMPONENT COMPONENT Development)
  
 -  IF(WITH_SYSTEMD)
 -    SET(BIN_SCRIPTS
 -      mysql_config
 -      mysqldumpslow
 -      )
 -  ELSE()
 -    SET(BIN_SCRIPTS
 -      mysql_config
 -      mysqldumpslow
 -      mysqld_multi
 -      mysqld_safe
 -      )
 -  ENDIF()
 +  SET(BIN_SCRIPTS mysql_config)
  
    SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
    STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 490802)
+++ branches/2019Q1	(revision 490803)

Property changes on: branches/2019Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r490801