Index: head/databases/mysql56-server/Makefile =================================================================== --- head/databases/mysql56-server/Makefile (revision 316259) +++ head/databases/mysql56-server/Makefile (revision 316260) @@ -1,85 +1,85 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.10 +PORTVERSION= 5.6.11 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= MySQL-5.6 PKGNAMESUFFIX?= -server MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql56-client USES= cmake MAKE_JOBS_SAFE= yes 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_LIBEDIT=0 \ -DWITH_LIBWRAP=1 .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes WANT_MYSQL_VER= 56 USE_PERL5_RUN= yes LATEST_LINK= mysql56-server CONFLICTS_INSTALL= mysql-server-[34].* mysql-server-5.[0-57-9].* mariadb-server-5.* percona-server-5.* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql MAN1= 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 MAN8= mysqld.8 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-install: .if !defined(PACKAGE_BUILDING) @${CAT} ${PKGMESSAGE} .endif .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .include Index: head/databases/mysql56-server/distinfo =================================================================== --- head/databases/mysql56-server/distinfo (revision 316259) +++ head/databases/mysql56-server/distinfo (revision 316260) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.10.tar.gz) = 156c43a7bde1ada8552938c6b8f46162b568bca8ddb76998a645308d93fb70b6 -SIZE (mysql-5.6.10.tar.gz) = 35174149 +SHA256 (mysql-5.6.11.tar.gz) = ea4a494ea926a20ada56b1c139afdc65f5a68827068a509cd0801640d8dd079e +SIZE (mysql-5.6.11.tar.gz) = 35458544 Index: head/databases/mysql56-server/files/patch-sql_mysqld.cc =================================================================== --- head/databases/mysql56-server/files/patch-sql_mysqld.cc (revision 316259) +++ head/databases/mysql56-server/files/patch-sql_mysqld.cc (nonexistent) @@ -1,11 +0,0 @@ ---- sql/mysqld.cc.orig 2013-02-13 15:18:22.000000000 +0100 -+++ sql/mysqld.cc 2013-02-13 15:18:46.000000000 +0100 -@@ -6292,7 +6292,7 @@ - The connection was refused by TCP wrappers. - There are no details (by client IP) available to update the host_cache. - */ -- statistic_increment(connection_tcpwrap_errors, &LOCK_status); -+ statistic_increment(connection_errors_tcpwrap, &LOCK_status); - continue; - } - } Property changes on: head/databases/mysql56-server/files/patch-sql_mysqld.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/mysql56-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt (revision 316259) +++ head/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt (revision 316260) @@ -1,36 +1,41 @@ ---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 -@@ -153,13 +153,14 @@ +--- libmysql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200 ++++ libmysql/CMakeLists.txt 2013-04-19 15:04:52.000000000 +0200 +@@ -173,13 +173,14 @@ + ENDIF() # Merge several convenience libraries into one big mysqlclient - # and link them together into shared library. -MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development) +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) # Visual Studio users need debug static library for debug projects IF(MSVC) INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() +IF(FALSE) IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -194,13 +195,15 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) -- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries) -+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries NOINSTALL) -+IF(FALSE) + # Merge several convenience libraries into one big mysqlclient + # and link them together into shared library. + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) ++ IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -251,4 +254,5 @@ + INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries) ENDFOREACH() ENDIF() ++ ENDIF() ENDIF() -+ENDIF() Index: head/databases/mysql56-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mysql56-server/files/patch-sql_CMakeLists.txt (revision 316259) +++ head/databases/mysql56-server/files/patch-sql_CMakeLists.txt (revision 316260) @@ -1,18 +1,18 @@ ---- sql/CMakeLists.txt.orig 2010-12-23 17:31:28.000000000 +0100 -+++ sql/CMakeLists.txt 2010-12-23 17:33:36.000000000 +0100 -@@ -245,6 +245,7 @@ +--- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200 ++++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200 +@@ -423,6 +423,7 @@ IF(INSTALL_LAYOUT STREQUAL "STANDALONE") +IF(FALSE) - # We need to create empty directories (data/test) the installation. - # This does not work with current CPack due to http://www.cmake.org/Bug/view.php?id=8767 - # Avoid completely empty directories and install dummy file instead. -@@ -286,6 +287,7 @@ + # Copy db.opt into data/test/ + SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) + INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) +@@ -467,6 +468,7 @@ INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF() ENDIF() +ENDIF() ADD_CUSTOM_TARGET(show-dist-name COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"