Index: head/databases/mysql57-client/Makefile =================================================================== --- head/databases/mysql57-client/Makefile (revision 488370) +++ head/databases/mysql57-client/Makefile (revision 488371) @@ -1,49 +1,49 @@ # Created by: "Mahdi Mokhtari " # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mysql57-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \ mysql[0-46-9][0-9]-client-* \ mariadb[0-9][0-9]-client-* \ percona[0-9][0-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 \ -DWITH_NDBCLUSTER=1 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 OPTIONS_GROUP+= PLUGINS PLUGINS_DESC= Default Client Plugins OPTIONS_GROUP_PLUGINS= SASLCLIENT SASLCLIENT_DESC= SASL client plugin module SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASLCLIENT_BUILD_DEPENDS= ${LOCALBASE}/include/sasl/sasl.h:net/openldap24-sasl-client OPTIONS_DEFAULT+= SASLCLIENT # 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.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 .include "${MASTERDIR}/Makefile" Index: head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake =================================================================== --- head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake (revision 488370) +++ head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake (revision 488371) @@ -1,23 +1,31 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-12-19 17:43:09 UTC +--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC +++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,12 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) +@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) IF(NOT HAVE_SUPPORTED_CLANG_VERSION) MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") ENDIF() ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ >= 4); ++ }" I386_ATOMIC_BUILTINS) ++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) ++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") ++ ENDIF() + ELSEIF(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() ELSE() MESSAGE(FATAL_ERROR "Unsupported compiler!") ENDIF() -@@ -38,4 +44,6 @@ ENDIF() +@@ -38,4 +52,6 @@ ENDIF() # Should not be needed any more, but kept for easy resurrection if needed # #Legacy option, maybe not needed anymore , taken as is from autotools build # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) - +# For GCC maybe it's also good idea to use +# ADD_DEFINITIONS(-D_GNU_SOURCE) +