Index: head/databases/mariadb-client/Makefile =================================================================== --- head/databases/mariadb-client/Makefile (revision 382336) +++ head/databases/mariadb-client/Makefile (revision 382337) @@ -1,45 +1,49 @@ # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= 53-client UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server MARIADB_CLIENT_SLAVE= yes USES+= readline CONFIGURE_ARGS= --without-server --with-libevent=no OPTIONS_DEFINE= THREADSAFE OPTIONS_DEFAULT= THREADSAFE THREADSAFE_DESC= Build thread-safe client CONFLICTS= mariadb5[4-9]-client-* \ mariadb1[0-9][0-9]-client-* \ mysql*-client-* \ percona*-client-* PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist MANS= mysql_config.1 mysql_upgrade.1 mysql.1 mysqladmin.1 \ mysqlbinlog.1 mysqlbug.1 mysqlcheck.1 \ mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 mysqltest.1 EXTRA_PATCHES= ${MASTERDIR}/files/patch-* MDB_CLIENT_SUBDIRS= include sql-common cmd-line-utils scripts strings regex mysys dbug extra libmysql libmysql_r client @man_dirs@ post-patch: @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_CLIENT_SUBDIRS}|" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-pkglibLIBRARIES|install-exec-am:|g" ${WRKSRC}/strings/Makefile.in ${WRKSRC}/mysys/Makefile.in ${WRKSRC}/dbug/Makefile.in @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in @${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|-fno-implicit-templates||g" ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ + +post-stage: + @${RM} -rf ${STAGEDIR}/${PREFIX}/include/mysql/private .include "${MASTERDIR}/Makefile" Index: head/databases/mariadb-client/pkg-plist =================================================================== --- head/databases/mariadb-client/pkg-plist (revision 382336) +++ head/databases/mariadb-client/pkg-plist (revision 382337) @@ -1,129 +1,79 @@ bin/mysql bin/mysql_config bin/mysql_fix_privilege_tables bin/mysql_upgrade bin/mysqladmin bin/mysqlbinlog bin/mysqlbug bin/mysqlcheck bin/mysqldump bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest include/mysql/client_plugin.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/keycache.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/ma_dyncol.h include/mysql/my_alloc.h include/mysql/my_attribute.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h include/mysql/my_decimal_limits.h include/mysql/my_dir.h include/mysql/my_getopt.h include/mysql/my_global.h include/mysql/my_list.h include/mysql/my_net.h include/mysql/my_no_pthread.h include/mysql/my_pthread.h include/mysql/my_sys.h include/mysql/my_valgrind.h include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_embed.h include/mysql/mysql_time.h include/mysql/mysql_version.h include/mysql/mysqld_ername.h include/mysql/mysqld_error.h include/mysql/plugin.h include/mysql/plugin_auth.h include/mysql/plugin_auth_common.h include/mysql/readline.h include/mysql/service_my_snprintf.h include/mysql/service_progress_report.h include/mysql/service_thd_alloc.h include/mysql/services.h include/mysql/sql_common.h include/mysql/sql_state.h include/mysql/sslopt-case.h include/mysql/sslopt-longopts.h include/mysql/sslopt-vars.h include/mysql/typelib.h -include/mysql/private/atomic/nolock.h -include/mysql/private/atomic/rwlock.h -include/mysql/private/atomic/x86-gcc.h -include/mysql/private/atomic/generic-msvc.h -include/mysql/private/atomic/gcc_builtins.h -include/mysql/private/config-win.h -include/mysql/private/config-netware.h -include/mysql/private/lf.h -include/mysql/private/my_bit.h -include/mysql/private/heap.h -include/mysql/private/maria.h -include/mysql/private/myisamchk.h -include/mysql/private/my_bitmap.h -include/mysql/private/my_uctype.h -include/mysql/private/myisam.h -include/mysql/private/myisampack.h -include/mysql/private/myisammrg.h -include/mysql/private/ft_global.h -include/mysql/private/mysys_err.h -include/mysql/private/my_base.h -include/mysql/private/help_start.h -include/mysql/private/help_end.h -include/mysql/private/my_nosys.h -include/mysql/private/my_alarm.h -include/mysql/private/queues.h -include/mysql/private/rijndael.h -include/mysql/private/sha1.h -include/mysql/private/my_aes.h -include/mysql/private/my_tree.h -include/mysql/private/my_trie.h -include/mysql/private/hash.h -include/mysql/private/thr_alarm.h -include/mysql/private/thr_lock.h -include/mysql/private/t_ctype.h -include/mysql/private/violite.h -include/mysql/private/my_md5.h -include/mysql/private/base64.h -include/mysql/private/service_versions.h -include/mysql/private/my_compare.h -include/mysql/private/my_handler.h -include/mysql/private/my_time.h -include/mysql/private/my_vle.h -include/mysql/private/my_user.h -include/mysql/private/my_atomic.h -include/mysql/private/my_libwrap.h -include/mysql/private/my_stacktrace.h -include/mysql/private/wqueue.h -include/mysql/private/waiting_threads.h -include/mysql/private/welcome_copyright_notice.h -include/mysql/private/my_regex.h lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.16 lib/mysql/libmysqlclient.so.16.0.0 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.16 lib/mysql/libmysqlclient_r.so.16.0.0 man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysqladmin.1.gz man/man1/mysqlbinlog.1.gz man/man1/mysqlbug.1.gz man/man1/mysqlcheck.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz man/man1/mysqlslap.1.gz man/man1/mysqltest.1.gz share/aclocal/mysql.m4 %%DATADIR%%/mysql_fix_privilege_tables.sql Index: head/databases/mariadb-server/Makefile =================================================================== --- head/databases/mariadb-server/Makefile (revision 382336) +++ head/databases/mariadb-server/Makefile (revision 382337) @@ -1,288 +1,339 @@ # $FreeBSD$ PORTNAME= mariadb PORTVERSION= 5.3.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://gd.tuwien.ac.at/db/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.fe.up.pt/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirror.de.gsnw.de:56431/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirror.layerjet.com/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirror.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ PKGNAMESUFFIX?= 53-server MAINTAINER= spil.oss@gmail.com COMMENT= Database server - drop-in replacement for MySQL LICENSE= GPLv2 UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} CONFLICTS?= mariadb5[4-9]-server-* \ mariadb1[0-9][0-9]-server-* \ mysql*-server-* \ percona*-server-* GNU_CONFIGURE= yes -USES+= libtool +USES+= libtool shebangfix +SHEBANG_FILES= scripts/* .if !defined(MARIADB_CLIENT_SLAVE) USE_MYSQL= yes WANT_MYSQL_VER= 53m .endif .if !defined(MARIADB_SCRIPTS_SLAVE) CPPFLAGS+= -I${LOCALBASE}/include DATADIR= ${PREFIX}/share/mysql USE_LDCONFIG= ${PREFIX}/lib/mysql USERS= mysql GROUPS= mysql OPTIONS_DEFINE+= STATIC SSL OPENSSL OPTIONS_DEFAULT+= SSL STATIC_DESC= Statically link executables (not on 9.x) SSL_DESC= Activate SSL support OPENSSL_DESC= Use OpenSSL instead of bundled yassl .if !defined(MARIADB_CLIENT_SLAVE) LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 MANS= innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \ myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \ mysql_install_db.1 mysql_tzinfo_to_sql.1 mysql_waitpid.1 mysqld_safe.1 \ mysqltest_embedded.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 INFO= mysql CONFIGURE_ARGS+= --with-embedded-server --enable-local-infile USE_RC_SUBR= mysql-server OPTIONS_DEFINE+= ARIADB ARCHIVE BLACKHOLE SPHINX FEDX FEDERATED XTRADB INNODB \ OQGRAPH PBXT PARTITION HANDLERSOCKET EXAMPLES MAXKEY ARIADB_DESC= Aria storage engine ARCHIVE_DESC= Archive storage plugin BLACKHOLE_DESC= Blackhole storage engine SPHINX_DESC= SE client for Sphinx search daemon FEDX_DESC= FederatedX (new) storage engine FEDERATED_DESC= Federated (old) storage engine XTRADB_DESC= XtraDB (InnoDB replacement) engine INNODB_DESC= InnoDB (old) engine OQGRAPH_DESC= Open Query Graph Computation engine PBXT_DESC= MVCC-based transactional engine PARTITION_DESC= Partitioning support HANDLERSOCKET_DESC= HandlerSocket support NDB_DESC= Enable NDB support (implies PARTITION) EXAMPLES_DESC= Example engine,daemon and ftsearch plugins MAXKEY_DESC= Change max key length from 1000 to 4000 OPTIONS_DEFAULT+= ARIADB ARCHIVE BLACKHOLE SPHINX FEDX XTRADB HANDLERSOCKET .endif # .if !defined(MARIADB_CLIENT_SLAVE) .include -.if ${OSVERSION} >= 1000000 -BROKEN= Does not build under FreeBSD 10 -.endif - .if ${OSVERSION} > 900000 && ${PORT_OPTIONS:MSTATIC} BROKEN= WITH_STATIC is not functional on 9-current .endif .if ${ARCH} == "i386" || ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-assembler .endif .if ${ARCH} == "i386" CONFIGURE_ARGS+= --with-big-tables .endif .if ${PORT_OPTIONS:MSSL} .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} .else CONFIGURE_ARGS+= --with-ssl=bundled MDB_EXTRA_SUBDIRS= extra .endif .else CONFIGURE_ARGS+= --without-ssl .endif .if ${PORT_OPTIONS:MSTATIC} CONFIGURE_ARGS+= --with-client-ldflags="-static -all-static" .endif .if ${PORT_OPTIONS:MTHREADSAFE} CONFIGURE_ARGS+= --enable-thread-safe-client .endif .if !defined(MARIADB_CLIENT_SLAVE) .if ${PORT_OPTIONS:MARIADB} PLIST_SUB+= ARIADB="" CONFIGURE_ARGS+= --with-plugin-aria --with-aria-tmp-tables PLUGINS+= aria .else CONFIGURE_ARGS+= --without-plugin-aria PLIST_SUB+= ARIADB="@comment " .endif .if ${PORT_OPTIONS:MSPHINX} PLIST_SUB+= SPHINX="" PLUGINS+= sphinx .else CONFIGURE_ARGS+= --without-plugin-sphinx PLIST_SUB+= SPHINX="@comment " .endif .if ${PORT_OPTIONS:MARCHIVE} PLIST_SUB+= ARCHIVE="" PLUGINS+= archive .else CONFIGURE_ARGS+= --without-plugin-archive PLIST_SUB+= ARCHIVE="@comment " .endif .if ${PORT_OPTIONS:MBLACKHOLE} PLIST_SUB+= BLACKHOLE="" PLUGINS+= blackhole .else CONFIGURE_ARGS+= --without-plugin-blackhole PLIST_SUB+= BLACKHOLE="@comment " .endif .if ${PORT_OPTIONS:MFEDERATED} PLIST_SUB+= FEDERATED="" PLUGINS+= federated .else CONFIGURE_ARGS+= --without-plugin-federated PLIST_SUB+= FEDERATED="@comment " .endif .if ${PORT_OPTIONS:MFEDX} PLIST_SUB+= FEDERATEDX="" PLUGINS+= federatedx .else CONFIGURE_ARGS+= --without-plugin-federatedx PLIST_SUB+= FEDERATEDX="@comment " .endif .if ${PORT_OPTIONS:MINNODB} PLIST_SUB+= INNODB="" PLUGINS+= innodb_plugin .else CONFIGURE_ARGS+= --without-plugin-innodb_plugin PLIST_SUB+= INNODB="@comment " .endif .if ${PORT_OPTIONS:MXTRADB} PLIST_SUB+= XTRADB="" PLUGINS+= xtradb .else CONFIGURE_ARGS+= --without-plugin-xtradb PLIST_SUB+= XTRADB="@comment " .endif .if ${PORT_OPTIONS:MHANDLERSOCKET} PLIST_SUB+= HANDLERSOCKET="" PLUGINS+= handlersocket .else CONFIGURE_ARGS+= --without-plugin-handlersocket PLIST_SUB+= HANDLERSOCKET="@comment " .endif .if ${PORT_OPTIONS:MOQGRAPH} CONFIGURE_ARGS+= --with-plugin-oqgraph PLIST_SUB+= OQGRAPH="" LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs PLUGINS+= oqgraph .else CONFIGURE_ARGS+= --without-plugin-oqgraph PLIST_SUB+= OQGRAPH="@comment " .endif .if ${PORT_OPTIONS:MPBXT} CONFIGURE_ARGS+= --with-plugin-pbxt PLIST_SUB+= PBXT="" PLUGINS+= pbxt .else CONFIGURE_ARGS+= --without-plugin-pbxt PLIST_SUB+= PBXT="@comment " .endif .if ${PORT_OPTIONS:MEXAMPLES} PLIST_SUB+= EXAMPLES="" .else CONFIGURE_ARGS+= --without-plugin-example --without-plugin-daemon_example --without-plugin-ftexample PLIST_SUB+= EXAMPLES="@comment " .endif .if ${PORT_OPTIONS:MNDB} CONFIGURE_ARGS+= --with-plugin-ndbcluster WITH_PARTITION=yes PLIST_SUB+= NDB="" PLUGINS+= ndbcluster .else CONFIGURE_ARGS+= --without-plugin-ndbcluster PLIST_SUB+= NDB="@comment " .endif .if ${PORT_OPTIONS:MPARTITION} CONFIGURE_ARGS+= --with-plugin-partition PLUGINS+= partition .else CONFIGURE_ARGS+= --without-plugin-partition .endif .if ${PORT_OPTIONS:MSTATIC} CONFIGURE_ARGS+= --with-mysqld-ldflags="-static -all-static" --with-plugins="${PLUGINS}" PLIST_SUB+= STATIC="@comment " .else PLIST_SUB+= STATIC="" .endif .if ${PORT_OPTIONS:MMAXKEY} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include__my_handler.h .endif .endif # .if !defined(MARIADB_CLIENT_SLAVE) .if defined(WITH_CHARSET) && ${WITH_CHARSET} != "" CONFIGURE_ARGS+= --with-charset=${WITH_CHARSET} .endif .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != "" CONFIGURE_ARGS+= --with-extra-charsets=${WITH_XCHARSET} .else CONFIGURE_ARGS+= --with-extra-charsets=complex .endif .if defined(WITH_COLLATION) && ${WITH_COLLATION} != "" CONFIGURE_ARGS+= --with-collation=${WITH_COLLATION} .endif .if ${PORT_OPTIONS:MSTATIC} && ( ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MNDB} ) pre-extract: @${ECHO} '' @${ECHO} "STATIC is not compatible with OPENSSL or NDB" @${ECHO} '' @${FALSE} .endif .if !defined(MARIADB_CLIENT_SLAVE) .if empty(PORT_OPTIONS:MSTATIC) SUB_FILES= pkg-message .endif pre-fetch: @${ECHO} '' @${ECHO} ' The following configuration options can be set in /etc/make.conf' @${ECHO} '' @${ECHO} " WITH_COLLATION=collate" @${ECHO} " Default collation (default: latin1_swedish_ci, selected: ${WITH_COLLATION})." @${ECHO} " WITH_CHARSET=charset" @${ECHO} " Primary built-in charset (default: latin1, selected: ${WITH_CHARSET})." @${ECHO} " WITH_XCHARSET=list" @${ECHO} " Other built-in charsets (default: complex, selected: ${WITH_XCHARSET})." @${ECHO} '' EXTRA_PATCHES+= ${FILESDIR}/scripts__Makefile.in MDB_SERVER_SUBDIRS= include @docs_dirs@ sql-common libservices mysys strings dbug ${MDB_EXTRA_SUBDIRS} unittest cmd-line-utils libmysql scripts @sql_server_dirs@ @sql_server@ @man_dirs@ @libmysqld_dirs@ support-files post-patch: @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SERVER_SUBDIRS}|" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|%%MANS%%|${MANS}|" ${WRKSRC}/man/Makefile.in @${REINPLACE_CMD} -e "s|^\(install:\).*|\1|" ${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in @${REINPLACE_CMD} -e "s|^\(aclocal_DATA =\).*|\1|" ${WRKSRC}/support-files/Makefile.in @${REINPLACE_CMD} -e "s|^\(pkginclude_HEADERS =\).*|\1|" ${WRKSRC}/cmd-line-utils/libedit/Makefile.in @${REINPLACE_CMD} -e "s|^\(install-data-am:\) install-pkgincludeHEADERS|\1|g" ${WRKSRC}/extra/Makefile.in ${WRKSRC}/include/Makefile.in @${REINPLACE_CMD} -e "s|^\(install-exec-am:\) install-pkglibLTLIBRARIES|\1|g" ${WRKSRC}/libmysql/Makefile.in + @${REINPLACE_CMD} -e "s|-fno-implicit-templates||g" ${WRKSRC}/configure + +post-stage: + # Delete files that should only be installed by client + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_convert_table_format + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_find_rows + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_fix_extensions + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_secure_installation + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_setpermission + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysql_zap + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqlaccess + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqld_multi + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqldumpslow + @${RM} ${STAGEDIR}/${PREFIX}/bin/mysqlhotcopy + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/client_plugin.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/decimal.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/errmsg.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/keycache.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/m_ctype.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/m_string.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/ma_dyncol.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_alloc.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_attribute.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_compiler.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_config.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_dbug.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_decimal_limits.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_dir.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_getopt.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_global.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_list.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_net.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_no_pthread.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_pthread.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_sys.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_valgrind.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/my_xml.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_com.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_embed.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_time.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/mysql_version.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin_auth.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/plugin_auth_common.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_my_snprintf.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_progress_report.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/service_thd_alloc.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/services.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sql_common.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-case.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-longopts.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/sslopt-vars.h + @${RM} ${STAGEDIR}/${PREFIX}/include/mysql/typelib.h .endif # .if !defined(MARIADB_CLIENT_SLAVE) .endif # .if !defined(MARIADB_SCRIPTS_SLAVE) .include Index: head/databases/mariadb-server/pkg-plist =================================================================== --- head/databases/mariadb-server/pkg-plist (revision 382336) +++ head/databases/mariadb-server/pkg-plist (revision 382337) @@ -1,365 +1,405 @@ -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -bin/mysql_client_test_embedded -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_fix_extensions -bin/mysql_install_db -bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_tzinfo_to_sql -bin/mysql_waitpid -bin/mysql_zap -bin/mysqlaccess -bin/mysqld_multi -bin/mysqld_safe -bin/mysqldumpslow -bin/mysqlhotcopy -bin/mysqltest_embedded -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip %%ARIADB%%bin/aria_chk %%ARIADB%%bin/aria_dump_log %%ARIADB%%bin/aria_ftdump %%ARIADB%%bin/aria_pack %%ARIADB%%bin/aria_read_log %%ARIADB%%lib/mysql/libaria.a %%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.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%%/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 %%HANDLERSOCKET%%bin/hsclient %%HANDLERSOCKET%%include/handlersocket/allocator.hpp %%HANDLERSOCKET%%include/handlersocket/auto_addrinfo.hpp %%HANDLERSOCKET%%include/handlersocket/auto_file.hpp %%HANDLERSOCKET%%include/handlersocket/auto_ptrcontainer.hpp %%HANDLERSOCKET%%include/handlersocket/config.hpp %%HANDLERSOCKET%%include/handlersocket/escape.hpp %%HANDLERSOCKET%%include/handlersocket/fatal.hpp %%HANDLERSOCKET%%include/handlersocket/hstcpcli.hpp %%HANDLERSOCKET%%include/handlersocket/mutex.hpp %%HANDLERSOCKET%%include/handlersocket/socket.hpp %%HANDLERSOCKET%%include/handlersocket/string_buffer.hpp %%HANDLERSOCKET%%include/handlersocket/string_ref.hpp %%HANDLERSOCKET%%include/handlersocket/string_util.hpp %%HANDLERSOCKET%%include/handlersocket/thread.hpp %%HANDLERSOCKET%%include/handlersocket/util.hpp %%HANDLERSOCKET%%lib/libhsclient.a %%HANDLERSOCKET%%lib/libhsclient.so %%HANDLERSOCKET%%lib/libhsclient.so.0 %%HANDLERSOCKET%%lib/libhsclient.so.0.0.0 %%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.a %%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so %%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0 %%HANDLERSOCKET%%lib/mysql/plugin/handlersocket.so.0.0.0 %%NDB%%bin/ndb_config %%NDB%%bin/ndb_delete_all %%NDB%%bin/ndb_desc %%NDB%%bin/ndb_drop_index %%NDB%%bin/ndb_drop_table %%NDB%%bin/ndb_error_reporter %%NDB%%bin/ndb_mgm %%NDB%%bin/ndb_print_backup_file %%NDB%%bin/ndb_print_schema_file %%NDB%%bin/ndb_print_sys_file %%NDB%%bin/ndb_restore %%NDB%%bin/ndb_select_all %%NDB%%bin/ndb_select_count %%NDB%%bin/ndb_show_tables %%NDB%%bin/ndb_size.pl %%NDB%%bin/ndb_test_platform %%NDB%%bin/ndb_waiter %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters.h %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_config_parameters_debug.h %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.h %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h %%NDB%%include/mysql/storage/ndb/mgmapi/ndb_logevent.h %%NDB%%include/mysql/storage/ndb/mgmapi/ndbd_exit_codes.h %%NDB%%include/mysql/storage/ndb/ndb_constants.h %%NDB%%include/mysql/storage/ndb/ndb_init.h %%NDB%%include/mysql/storage/ndb/ndb_types.h %%NDB%%include/mysql/storage/ndb/ndb_version.h %%NDB%%include/mysql/storage/ndb/ndbapi/Ndb.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbApi.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbDictionary.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbError.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbEventOperation.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexOperation.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexScanOperation.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbOperation.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbPool.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbRecAttr.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbReceiver.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanFilter.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbScanOperation.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/NdbTransaction.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_cluster_connection.hpp %%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndbapi_limits.h %%NDB%%include/mysql/storage/ndb/ndbapi/ndberror.h %%NDB%%lib/mysql/libndbclient.a %%NDB%%lib/mysql/libndbclient.so %%NDB%%lib/mysql/libndbclient.so.3 %%NDB%%lib/mysql/libndbclient.so.3.0.0 %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0 %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0.0.0 %%PBXT%%bin/xtstat %%SPHINX%%lib/mysql/plugin/sphinx.a %%SPHINX%%lib/mysql/plugin/sphinx.so %%SPHINX%%lib/mysql/plugin/sphinx.so.0 %%SPHINX%%lib/mysql/plugin/sphinx.so.0.0.0 %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 %%STATIC%%%%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0.0.0 %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 %%STATIC%%%%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0.0.0 %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0 %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/ha_example.so.0.0.0 %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0.0.0 %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 %%STATIC%%%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0.0.0 %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.a %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 %%STATIC%%%%FEDERATED%%lib/mysql/plugin/ha_federated.so.0.0.0 %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 %%STATIC%%%%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0.0.0 %%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a %%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so %%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0 %%STATIC%%%%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0.0.0 %%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.a %%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0 %%STATIC%%%%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0.0.0 %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 %%STATIC%%%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0.0.0 %%STATIC%%lib/mysql/plugin/auth_pam.so %%STATIC%%lib/mysql/plugin/auth_pam.so.0 %%STATIC%%lib/mysql/plugin/auth_pam.so.0.0.0 %%STATIC%%lib/mysql/plugin/dialog.a %%STATIC%%lib/mysql/plugin/dialog.so %%STATIC%%lib/mysql/plugin/dialog.so.0 %%STATIC%%lib/mysql/plugin/dialog.so.0.0.0 %%STATIC%%lib/mysql/plugin/feedback.so %%STATIC%%lib/mysql/plugin/feedback.so.0 %%STATIC%%lib/mysql/plugin/feedback.so.0.0.0 %%XTRADB%%bin/innochecksum +bin/my_print_defaults +bin/myisam_ftdump +bin/myisamchk +bin/myisamlog +bin/myisampack +bin/mysql_client_test_embedded +bin/mysql_install_db +bin/mysql_tzinfo_to_sql +bin/mysql_waitpid +bin/mysqld_safe +bin/mysqltest_embedded +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/x86-gcc.h include/mysql/private/authors.h +include/mysql/private/base64.h include/mysql/private/client_settings.h +include/mysql/private/config-netware.h +include/mysql/private/config-win.h include/mysql/private/contributors.h include/mysql/private/create_options.h include/mysql/private/debug_sync.h include/mysql/private/event_data_objects.h include/mysql/private/event_db_repository.h include/mysql/private/event_parse_data.h include/mysql/private/event_queue.h include/mysql/private/event_scheduler.h include/mysql/private/events.h include/mysql/private/field.h +include/mysql/private/ft_global.h include/mysql/private/gcalc_slicescan.h include/mysql/private/gcalc_tools.h include/mysql/private/gstream.h include/mysql/private/ha_ndbcluster.h include/mysql/private/ha_ndbcluster_binlog.h include/mysql/private/ha_ndbcluster_cond.h include/mysql/private/ha_ndbcluster_tables.h include/mysql/private/ha_partition.h include/mysql/private/handler.h +include/mysql/private/hash.h include/mysql/private/hash_filo.h +include/mysql/private/heap.h +include/mysql/private/help_end.h +include/mysql/private/help_start.h include/mysql/private/item.h include/mysql/private/item_cmpfunc.h include/mysql/private/item_create.h include/mysql/private/item_func.h include/mysql/private/item_geofunc.h include/mysql/private/item_row.h include/mysql/private/item_strfunc.h include/mysql/private/item_subselect.h include/mysql/private/item_sum.h include/mysql/private/item_timefunc.h include/mysql/private/item_xmlfunc.h include/mysql/private/lex.h include/mysql/private/lex_symbol.h +include/mysql/private/lf.h include/mysql/private/log.h include/mysql/private/log_event.h include/mysql/private/log_event_old.h include/mysql/private/log_slow.h +include/mysql/private/maria.h include/mysql/private/mem_root_array.h include/mysql/private/multi_range_read.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_compare.h include/mysql/private/my_decimal.h +include/mysql/private/my_handler.h +include/mysql/private/my_libwrap.h +include/mysql/private/my_md5.h +include/mysql/private/my_nosys.h +include/mysql/private/my_regex.h +include/mysql/private/my_stacktrace.h +include/mysql/private/my_time.h +include/mysql/private/my_tree.h +include/mysql/private/my_trie.h +include/mysql/private/my_uctype.h +include/mysql/private/my_user.h +include/mysql/private/my_vle.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_priv.h include/mysql/private/mysqld_suffix.h +include/mysql/private/mysys_err.h include/mysql/private/opt_range.h include/mysql/private/opt_subselect.h include/mysql/private/parse_file.h include/mysql/private/partition_element.h include/mysql/private/partition_info.h include/mysql/private/plistsort.c include/mysql/private/procedure.h include/mysql/private/protocol.h +include/mysql/private/queues.h +include/mysql/private/rijndael.h include/mysql/private/rpl_constants.h include/mysql/private/rpl_filter.h include/mysql/private/rpl_injector.h include/mysql/private/rpl_mi.h include/mysql/private/rpl_record.h include/mysql/private/rpl_record_old.h include/mysql/private/rpl_reporting.h include/mysql/private/rpl_rli.h include/mysql/private/rpl_tblmap.h include/mysql/private/rpl_utility.h include/mysql/private/scheduler.h +include/mysql/private/service_versions.h include/mysql/private/set_var.h +include/mysql/private/sha1.h include/mysql/private/slave.h include/mysql/private/sp.h include/mysql/private/sp_cache.h include/mysql/private/sp_head.h include/mysql/private/sp_pcontext.h include/mysql/private/sp_rcontext.h include/mysql/private/spatial.h include/mysql/private/sql_acl.h include/mysql/private/sql_array.h include/mysql/private/sql_bitmap.h include/mysql/private/sql_cache.h include/mysql/private/sql_class.h include/mysql/private/sql_crypt.h include/mysql/private/sql_cursor.h include/mysql/private/sql_error.h include/mysql/private/sql_expression_cache.h include/mysql/private/sql_handler.h include/mysql/private/sql_join_cache.h include/mysql/private/sql_lex.h include/mysql/private/sql_lifo_buffer.h include/mysql/private/sql_list.h include/mysql/private/sql_map.h include/mysql/private/sql_partition.h include/mysql/private/sql_plugin.h include/mysql/private/sql_plugin_services.h include/mysql/private/sql_profile.h include/mysql/private/sql_repl.h include/mysql/private/sql_select.h include/mysql/private/sql_servers.h include/mysql/private/sql_show.h include/mysql/private/sql_sort.h include/mysql/private/sql_string.h include/mysql/private/sql_trigger.h include/mysql/private/sql_udf.h include/mysql/private/sql_view.h include/mysql/private/structs.h +include/mysql/private/t_ctype.h include/mysql/private/table.h +include/mysql/private/thr_alarm.h +include/mysql/private/thr_lock.h include/mysql/private/tzfile.h include/mysql/private/tztime.h include/mysql/private/unireg.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/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.0 lib/mysql/libmysqld.so.0.0.0 lib/mysql/libmysqlservices.a lib/mysql/libmystrings.a lib/mysql/libmysys.a lib/mysql/libvio.a libexec/mysqld 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_client_test_embedded.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_waitpid.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqltest_embedded.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 man/man8/mysqlmanager.8.gz