Index: head/databases/mysqlwsrep56-server/Makefile =================================================================== --- head/databases/mysqlwsrep56-server/Makefile (revision 461146) +++ head/databases/mysqlwsrep56-server/Makefile (revision 461147) @@ -1,153 +1,153 @@ # Created by: Philip Stoev # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.6.38 +PORTVERSION?= 5.6.39 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.21 +DISTVERSIONSUFFIX?= -25.22 CATEGORIES= databases ipv6 PKGNAMESUFFIX= 56-server MAINTAINER= devel@galeracluster.com COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 RUN_DEPENDS= bash:shells/bash \ lsof:sysutils/lsof \ netcat:net/netcat \ rsync:net/rsync \ socat:net/socat LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4 BROKEN_powerpc64= Does not build DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql NOT_FOR_ARCHS= aarch64 armv6 armv7 powerpc64 NOT_FOR_ARCHS_REASON= error: Unsupported platform USES= bison \ cmake:outsource,noninja \ compiler:c++11-lib \ compiler:c11 \ libedit \ perl5 \ shebangfix \ ssl USE_PERL5= run USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= codership GH_PROJECT?= mysql-wsrep MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DWITH_SSL=${OPENSSLBASE} \ -DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \ -DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \ -DINSTALL_MYSQLTESTDIR=0 \ -DWITH_LIBWRAP=1 \ -DWITH_WSREP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .ifdef USE_MYSQL .error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server-* \ mysql[0-9]*-server-* \ mysqlwsrep57*-server-* \ mysqlwsrep[1-489]*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql MMAN1= my_print_defaults.1 \ myisam_ftdump.1 \ myisamchk.1 \ myisamlog.1 \ myisampack.1 \ mysql.server.1 \ mysql_convert_table_format.1 \ mysql_fix_extensions.1 \ mysql_install_db.1 \ mysql_plugin.1 \ mysql_secure_installation.1 \ mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 \ mysql_upgrade.1 \ mysql_zap.1 \ mysqlbug.1 \ mysqld_multi.1 \ mysqld_safe.1 \ mysqldumpslow.1 \ mysqlhotcopy.1 \ mysqlman.1 \ mysqltest.1 \ perror.1 \ replace.1 \ resolve_stack_dump.1 \ resolveip.1 .include post-patch: ${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysqlwsrep56-server/distinfo =================================================================== --- head/databases/mysqlwsrep56-server/distinfo (revision 461146) +++ head/databases/mysqlwsrep56-server/distinfo (revision 461147) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508939312 -SHA256 (codership-mysql-wsrep-wsrep_5.6.38-25.21_GH0.tar.gz) = 9fcad79b2a8940c5a16077790f2b0eebc9ca5c75679f010cfe78ec6d939e965a -SIZE (codership-mysql-wsrep-wsrep_5.6.38-25.21_GH0.tar.gz) = 32414996 +TIMESTAMP = 1518010018 +SHA256 (codership-mysql-wsrep-wsrep_5.6.39-25.22_GH0.tar.gz) = 3dd634a6d36b5e5827a9871d7d4cc0e3a6efb11783c24b25bcc495dce9ae3b2b +SIZE (codership-mysql-wsrep-wsrep_5.6.39-25.22_GH0.tar.gz) = 32322969 Index: head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt (revision 461146) +++ head/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt (revision 461147) @@ -1,65 +1,65 @@ ---- client/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC -+++ client/CMakeLists.txt -@@ -31,17 +31,20 @@ INCLUDE_DIRECTORIES( +--- client/CMakeLists.txt.orig 2018-01-31 14:03:53.000000000 +0100 ++++ client/CMakeLists.txt 2018-02-07 11:27:46.846686000 +0100 +@@ -31,17 +31,20 @@ COPY_OPENSSL_DLLS(copy_openssl_client) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + ADD_DEPENDENCIES(mysqltest GenError) - +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -51,17 +54,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli +@@ -51,17 +54,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -74,6 +81,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -74,6 +81,7 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -83,11 +91,6 @@ ENDIF(WIN32) +@@ -83,11 +91,6 @@ SET_TARGET_PROPERTIES ( mysql_plugin mysql_upgrade - mysqlcheck - mysqldump - mysqlimport - mysqlshow - mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN)