Index: head/databases/mariadb101-server/Makefile =================================================================== --- head/databases/mariadb101-server/Makefile (revision 415009) +++ head/databases/mariadb101-server/Makefile (revision 415010) @@ -1,177 +1,175 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.13 +PORTVERSION= 10.1.14 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 101-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_powerpc64= Does not build SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_DEFINE= FASTMTX OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE FASTMTX_DESC= Replace mutexes with spinlocks .if !defined(CLIENT_ONLY) # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER OPTIONS_GROUP= ENGINES OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB OPTIONS_EXCLUDE_i386= TOKUDB ENGINES_DESC= Optional MariaDB storage engines INNOBASE_DESC= Build InnoDB engine next to XtraDB MAXKEY_DESC= Change max key length from 1000 to 4000 MROONGA_DESC= Mroonga Full Text Search engine OQGRAPH_DESC= Open Query Graph Computation engine SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine .endif GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit 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= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBWRAP=1 \ -DWITH_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* USE_OPENSSL= yes FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part USE_MYSQL= yes WANT_MYSQL_VER= 101m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 .endfor GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://mariadb.atlassian.net/browse/MDEV-9627 post-install: # Remove programs to avoid conflict with mariadb101-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ ${STAGEDIR}/${PREFIX}/share/pkgconfig -# See https://mariadb.atlassian.net/browse/MDEV-9529 - ${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include .if ${OPSYS} == DragonFly CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .if ${PORT_OPTIONS:MGSSAPI_BASE} IGNORE= requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option .endif .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif .include Index: head/databases/mariadb101-server/distinfo =================================================================== --- head/databases/mariadb101-server/distinfo (revision 415009) +++ head/databases/mariadb101-server/distinfo (revision 415010) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.1.13.tar.gz) = 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d -SIZE (mariadb-10.1.13.tar.gz) = 55272572 +SHA256 (mariadb-10.1.14.tar.gz) = 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 +SIZE (mariadb-10.1.14.tar.gz) = 55341017 Index: head/databases/mariadb101-server/pkg-plist =================================================================== --- head/databases/mariadb101-server/pkg-plist (revision 415009) +++ head/databases/mariadb101-server/pkg-plist (revision 415010) @@ -1,191 +1,252 @@ 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_client_test bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_embedded 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/mysqltest_embedded @comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump bin/resolveip %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump bin/wsrep_sst_common bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 +include/mysql/private/atomic/gcc_builtins.h +include/mysql/private/atomic/generic-msvc.h +include/mysql/private/atomic/nolock.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/ft_global.h include/mysql/private/embedded_priv.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_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_crypt.h +include/mysql/private/my_default.h +include/mysql/private/my_handler_errors.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_rnd.h +include/mysql/private/my_stacktrace.h +include/mysql/private/my_systemd.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/thr_timer.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 +include/mysql/private/wsrep.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 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so @comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/example_key_management.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%INNOBASE%%lib/mysql/plugin/ha_innodb.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/mypluglib.so @comment 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/query_response_time.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so lib/mysql/plugin/wsrep_info.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%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic @comment %%DATADIR%%/maria_add_gis_sp.sql @comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%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_to_mariadb.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 %%DATADIR%%/wsrep.cnf %%DATADIR%%/wsrep_notify