Index: head/databases/mysql55-client/files/patch-client_mysql.cc =================================================================== --- head/databases/mysql55-client/files/patch-client_mysql.cc (revision 483020) +++ head/databases/mysql55-client/files/patch-client_mysql.cc (nonexistent) @@ -1,11 +0,0 @@ ---- client/mysql.cc.orig 2018-05-08 12:44:38.160868000 +0200 -+++ client/mysql.cc 2018-05-08 12:45:01.377062000 +0200 -@@ -2671,7 +2671,7 @@ - mysql_free_result(fields); - break; - } -- field_names[i][num_fields*2]= '\0'; -+ field_names[i][num_fields*2]= NULL; - j=0; - while ((sql_field=mysql_fetch_field(fields))) - { Property changes on: head/databases/mysql55-client/files/patch-client_mysql.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mysql55-server/Makefile =================================================================== --- head/databases/mysql55-server/Makefile (revision 483020) +++ head/databases/mysql55-server/Makefile (revision 483021) @@ -1,94 +1,94 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.5.61 +PORTVERSION= 5.5.62 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.5 PKGNAMESUFFIX?= 55-server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SLAVEDIRS= databases/mysql55-client USES= cmake:noninja readline shebangfix CXXFLAGS+= ${CPPFLAGS} NO_OPTIONS_SORT=yes OPTIONS_DEFINE= SSL FASTMTX OPTIONS_DEFAULT=SSL FASTMTX_DESC= Replace mutexes with spinlocks CMAKE_ARGS+= -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="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .include .if ${PORT_OPTIONS:MSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 55 CONFLICTS_INSTALL= mysql5[0-46-9]-server-* \ mysqlwsrep* \ mariadb*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server 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 \ perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysql55-server/distinfo =================================================================== --- head/databases/mysql55-server/distinfo (revision 483020) +++ head/databases/mysql55-server/distinfo (revision 483021) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533542607 -SHA256 (mysql-5.5.61.tar.gz) = 62a7f8aeb9c6c4d5a127f7254500878d9d172b70ad9639b098f3c01731f1fbf0 -SIZE (mysql-5.5.61.tar.gz) = 21027098 +TIMESTAMP = 1540551076 +SHA256 (mysql-5.5.62.tar.gz) = b1e7853bc1f04aabf6771e0ad947f35ac8d237f4b35d0706d1095c9526ff99d7 +SIZE (mysql-5.5.62.tar.gz) = 21111902