Index: head/databases/percona55-client/files/patch-CMakeLists.txt =================================================================== --- head/databases/percona55-client/files/patch-CMakeLists.txt (revision 400945) +++ head/databases/percona55-client/files/patch-CMakeLists.txt (revision 400946) @@ -1,71 +1,72 @@ ---- CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100 -+++ CMakeLists.txt 2015-01-21 20:01:50.952601051 +0100 -@@ -400,32 +400,11 @@ +--- CMakeLists.txt.orig 2015-11-02 16:25:51 UTC ++++ CMakeLists.txt +@@ -403,33 +403,11 @@ IF(WITH_UNIT_TESTS) 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) -@@ -461,19 +440,21 @@ +@@ -466,19 +444,21 @@ IF(WIN32) 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} -@@ -499,6 +480,7 @@ +@@ -504,6 +484,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) Index: head/databases/percona55-server/Makefile =================================================================== --- head/databases/percona55-server/Makefile (revision 400945) +++ head/databases/percona55-server/Makefile (revision 400946) @@ -1,99 +1,99 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.44-37.3 +DISTVERSION= 5.5.46-37.5 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ PKGNAMESUFFIX?= 55-server DISTNAME= percona-server-${DISTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/percona55-client USES= bison cmake readline shebangfix CXXFLAGS+= ${CPPFLAGS} OPTIONS_DEFINE= OPENSSL FASTMTX OPTIONS_DEFAULT= OPENSSL FASTMTX_DESC= Replace mutexes with spinlocks DATADIR= ${PREFIX}/share/mysql 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 \ -DHAVE_PAM=0 \ -DWITH_UNIT_TESTS=0 \ -DENABLE_DTRACE=OFF 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:MOPENSSL} 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= 55p CONFLICTS_INSTALL= mysql*-server-* \ mariadb*-server-* \ percona5[0-46-9]-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql INFO= mysql MANPAGES= 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" post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt .include .if ${ARCH} == "arm" BROKEN= Does not compile on arm .endif .include Index: head/databases/percona55-server/distinfo =================================================================== --- head/databases/percona55-server/distinfo (revision 400945) +++ head/databases/percona55-server/distinfo (revision 400946) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.5.44-37.3.tar.gz) = 0fa6d5203eda766778cb26cbc70fbc3d50a3472322d30a2afffb5c3ab12eaed2 -SIZE (percona-server-5.5.44-37.3.tar.gz) = 22724202 +SHA256 (percona-server-5.5.46-37.5.tar.gz) = 15092f44fe9624d4f1172f268fd0bdd0ed6150897e6aa42d9f4521e5c77fbd20 +SIZE (percona-server-5.5.46-37.5.tar.gz) = 22760742 Index: head/databases/percona55-server/pkg-plist =================================================================== --- head/databases/percona55-server/pkg-plist (revision 400945) +++ head/databases/percona55-server/pkg-plist (revision 400946) @@ -1,143 +1,143 @@ bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_convert_table_format bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/perror bin/replace bin/resolve_stack_dump bin/resolveip lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/audit_log.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_example.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/libfnv1a_udf.so lib/mysql/plugin/libfnv_udf.so lib/mysql/plugin/libmurmur_udf.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/scalability_metrics.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqlman.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/config.huge.ini %%DATADIR%%/config.medium.ini %%DATADIR%%/config.small.ini %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/ndb-config-2-node.ini %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys -@dir /var/db/mysql +@dir(mysql,mysql,) /var/db/mysql