Index: head/databases/mariadb55-server/Makefile =================================================================== --- head/databases/mariadb55-server/Makefile (revision 429416) +++ head/databases/mariadb55-server/Makefile (revision 429417) @@ -1,130 +1,130 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 5.5.53 -PORTREVISION= 2 +PORTVERSION= 5.5.54 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/source/ \ http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/source/ PKGNAMESUFFIX?= 55-server MAINTAINER= never@nevermind.kiev.ua COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb55-client USES= cmake execinfo shebangfix ssl SHEBANG_FILES= scripts/*.sh 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= \ -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 \ -DWITH_SSL=yes \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql BROKEN_aarch64= Fails to link: missing sbrk BROKEN_armv6= Does not compile on armv6 BROKEN_sparc64= Does not compile: Unsupported platform .if defined(USE_MYSQL) .error You have 'USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif .if !defined(CLIENT_ONLY) # MySQL-Server part USES+= mysql:55m CONFLICTS_INSTALL= mariadb5[0-46-9]-server-* \ mariadb1*-server-* \ mysql[0-9]*-server-* \ percona[0-9]*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DREADLINE_INCLUDE_DIR=/usr/include \ -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .else # MySQL-Client part USES+= ncurses readline .endif OPTIONS_DEFINE+= FASTMTX OPTIONS_SUB= yes NO_OPTIONS_SORT=yes FASTMTX_DESC= Replace mutexes with spinlocks FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 .if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OQGRAPH OPTIONS_DEFAULT+= MAXKEY MAXKEY_DESC= Change max key length from 1000 to 4000 OQGRAPH_DESC= Open Query Graph Computation engine OQGRAPH_USE= GCC=yes OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs OQGRAPH_BROKEN= yes MAXKEY_EXTRA_PATCHES= ${FILESDIR}/extra-patch-include_my_compare.h .endif .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif # Server segfaults on i386 when built with clang >= 3.4 .if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 USE_GCC= yes .endif post-extract-OQGRAPH-off: @${RM} -r ${WRKSRC}/storage/oqgraph post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .include Index: head/databases/mariadb55-server/distinfo =================================================================== --- head/databases/mariadb55-server/distinfo (revision 429416) +++ head/databases/mariadb55-server/distinfo (revision 429417) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476724173 -SHA256 (mariadb-5.5.53.tar.gz) = 4517296f5686af83c3f67bd9183ca1038c73a9c6c5e680389d167f72c644124e -SIZE (mariadb-5.5.53.tar.gz) = 45739935 +TIMESTAMP = 1482613700 +SHA256 (mariadb-5.5.54.tar.gz) = 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c +SIZE (mariadb-5.5.54.tar.gz) = 45765936 Index: head/databases/mariadb55-server/pkg-plist =================================================================== --- head/databases/mariadb55-server/pkg-plist (revision 429416) +++ head/databases/mariadb55-server/pkg-plist (revision 429417) @@ -1,216 +1,217 @@ @stopdaemon mysql-server bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log 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/mysqld_safe_helper 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 include/mysql/private/atomic/gcc_builtins.h include/mysql/private/atomic/generic-msvc.h include/mysql/private/atomic/nolock.h include/mysql/private/atomic/rwlock.h include/mysql/private/atomic/solaris.h include/mysql/private/atomic/x86-gcc.h include/mysql/private/base64.h include/mysql/private/config.h include/mysql/private/embedded_priv.h include/mysql/private/ft_global.h include/mysql/private/hash.h include/mysql/private/heap.h include/mysql/private/lf.h include/mysql/private/maria.h include/mysql/private/my_aes.h include/mysql/private/my_alarm.h include/mysql/private/my_atomic.h include/mysql/private/my_base.h include/mysql/private/my_bit.h include/mysql/private/my_bitmap.h include/mysql/private/my_check_opt.h include/mysql/private/my_compare.h include/mysql/private/my_context.h include/mysql/private/my_cpu.h include/mysql/private/my_libwrap.h include/mysql/private/my_md5.h include/mysql/private/my_nosys.h include/mysql/private/my_rdtsc.h include/mysql/private/my_stacktrace.h include/mysql/private/my_time.h include/mysql/private/my_tree.h include/mysql/private/my_uctype.h include/mysql/private/my_user.h include/mysql/private/myisam.h include/mysql/private/myisamchk.h include/mysql/private/myisammrg.h include/mysql/private/myisampack.h include/mysql/private/mysql_async.h include/mysql/private/mysqld_default_groups.h include/mysql/private/mysys_err.h include/mysql/private/password.h include/mysql/private/probes_mysql.h include/mysql/private/probes_mysql_nodtrace.h include/mysql/private/queues.h include/mysql/private/rijndael.h include/mysql/private/service_versions.h include/mysql/private/sha1.h include/mysql/private/sha2.h include/mysql/private/t_ctype.h include/mysql/private/thr_alarm.h include/mysql/private/thr_lock.h include/mysql/private/thread_pool_priv.h include/mysql/private/violite.h include/mysql/private/waiting_threads.h include/mysql/private/welcome_copyright_notice.h include/mysql/private/wqueue.h lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/feedback.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so lib/mysql/plugin/ha_innodb.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so lib/mysql/plugin/ha_sphinx.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_clear_password.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/query_cache_info.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/sphinx.so lib/mysql/plugin/sql_errlog.so libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/innochecksum.1.gz 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_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/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%%/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_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%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