Index: head/databases/mysql55-client/Makefile =================================================================== --- head/databases/mysql55-client/Makefile (revision 401915) +++ head/databases/mysql55-client/Makefile (revision 401916) @@ -1,30 +1,29 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 PKGNAMESUFFIX= 55-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../mysql55-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql5[0-46-9]-client-* \ mariadb*-client-* \ percona*-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.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 .include "${MASTERDIR}/Makefile" Index: head/databases/mysql55-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysql55-client/files/patch-CMakeLists.txt (revision 401915) +++ head/databases/mysql55-client/files/patch-CMakeLists.txt (revision 401916) @@ -1,71 +1,72 @@ ---- CMakeLists.txt.orig 2014-11-04 07:49:52.000000000 +0000 -+++ CMakeLists.txt 2014-12-03 09:20:45.966491617 +0000 -@@ -387,32 +387,11 @@ +--- CMakeLists.txt.orig 2015-06-25 13:44:36.000000000 +0000 ++++ CMakeLists.txt 2015-09-19 07:48:14.145882685 +0000 +@@ -390,33 +390,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) - IF(WITH_EMBEDDED_SERVER) - ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) - ENDIF(WITH_EMBEDDED_SERVER) - - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) - ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) - ADD_SUBDIRECTORY(internal) - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-sles) +- ADD_SUBDIRECTORY(packaging/rpm-docker) -ENDIF() +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) +ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(man) INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -448,19 +427,21 @@ +@@ -453,19 +431,21 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() +IF(FALSE) ADD_SUBDIRECTORY(packaging/WiX) ADD_SUBDIRECTORY(packaging/solaris) +ENDIF() # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -486,6 +467,7 @@ +@@ -491,6 +471,7 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) Index: head/databases/mysql55-server/Makefile =================================================================== --- head/databases/mysql55-server/Makefile (revision 401915) +++ head/databases/mysql55-server/Makefile (revision 401916) @@ -1,93 +1,93 @@ # Created by: Alex Dupre # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.5.44 +PORTVERSION= 5.5.46 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 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-* \ 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 \ mysqltest.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" EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysql55-server/distinfo =================================================================== --- head/databases/mysql55-server/distinfo (revision 401915) +++ head/databases/mysql55-server/distinfo (revision 401916) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.44.tar.gz) = 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de -SIZE (mysql-5.5.44.tar.gz) = 21789766 +SHA256 (mysql-5.5.46.tar.gz) = 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e +SIZE (mysql-5.5.46.tar.gz) = 21838374