diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile index 7c84bcb118b5..c63c02509257 100644 --- a/databases/mariadb-client/Makefile +++ b/databases/mariadb-client/Makefile @@ -1,24 +1,42 @@ # New ports collection makefile for: mariadb-client # Date created: 30 May 2011 # Whom: Doug Barton # # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= -client COMMENT= Database client - drop-in replacement for MySQL MASTERDIR= ${.CURDIR}/../mariadb-server MARIADB_CLIENT_SLAVE= yes -CONFIGURE_ARGS= --without-server +CONFIGURE_ARGS= --without-server --with-libevent=no IGNORE= Post repo-copy, not ready for use yet CONFLICTS= mysql-client-[0-9]* PKGMESSAGE= /nonexistent # To avoid equivalent in master port +PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist +MAN1= 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%%|${MAN1}|" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in + +post-install: + ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ + .include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb-client/files/patch-scripts__Makefile.in b/databases/mariadb-client/files/patch-scripts__Makefile.in new file mode 100644 index 000000000000..ebb2b057f9d6 --- /dev/null +++ b/databases/mariadb-client/files/patch-scripts__Makefile.in @@ -0,0 +1,38 @@ +--- scripts/Makefile.in.orig 2011-03-01 22:25:08.000000000 -0800 ++++ scripts/Makefile.in 2011-06-02 23:35:04.000000000 -0700 +@@ -477,21 +477,7 @@ + BUILT_SOURCES = mysql_fix_privilege_tables.sql \ + mysql_fix_privilege_tables_sql.c + +-bin_SCRIPTS = @server_scripts@ \ +- msql2mysql \ +- mysql_config \ +- mysql_fix_privilege_tables \ +- mysql_fix_extensions \ +- mysql_setpermission \ +- mysql_secure_installation \ +- mysql_zap \ +- mysqlaccess \ +- mysqlbug \ +- mysql_convert_table_format \ +- mysql_find_rows \ +- mysqlhotcopy \ +- mysqldumpslow \ +- mysqld_multi ++bin_SCRIPTS = mysql_config mysql_fix_privilege_tables mysqlbug + + noinst_SCRIPTS = make_binary_distribution \ + make_sharedlib_distribution \ +@@ -528,11 +514,7 @@ + mysql_system_tables_fix.sql \ + CMakeLists.txt + +-dist_pkgdata_DATA = fill_help_tables.sql \ +- mysql_fix_privilege_tables.sql \ +- mysql_system_tables.sql \ +- mysql_system_tables_data.sql \ +- mysql_test_data_timezone.sql ++dist_pkgdata_DATA = mysql_fix_privilege_tables.sql + + CLEANFILES = @server_scripts@ \ + make_binary_distribution \ diff --git a/databases/mariadb-client/pkg-plist b/databases/mariadb-client/pkg-plist index 2f293b208a48..b9cdaa8920dc 100644 --- a/databases/mariadb-client/pkg-plist +++ b/databases/mariadb-client/pkg-plist @@ -1,116 +1,67 @@ -bin/msql2mysql -bin/my_print_defaults -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack bin/mysql -bin/mysql_client_test bin/mysql_config -bin/mysql_convert_table_format -bin/mysql_find_rows -bin/mysql_fix_extensions bin/mysql_fix_privilege_tables -bin/mysql_secure_installation -bin/mysql_setpermission bin/mysql_upgrade -bin/mysql_waitpid -bin/mysql_zap -bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlbug bin/mysqlcheck -bin/mysqld_multi bin/mysqldump -bin/mysqldumpslow -bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -include/evutil.h -include/event.h -include/event-config.h 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/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_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_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 -lib/mysql/libdbug.a -lib/mysql/libheap.a -lib/mysql/libmyisam.a -lib/mysql/libmyisammrg.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient.so.16 lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.la lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.16 -lib/mysql/libmysqlservices.a -lib/mysql/libmystrings.a -lib/mysql/libmysys.a share/aclocal/mysql.m4 -%%DATADIR%%/binary-configure -%%DATADIR%%/config.huge.ini -%%DATADIR%%/config.medium.ini -%%DATADIR%%/config.small.ini -%%DATADIR%%/fill_help_tables.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_fix_privilege_tables.sql -%%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 -@dirrm %%DATADIR%% -@dirrm lib/mysql -@dirrm include/mysql +@dirrmtry %%DATADIR%% +@dirrmtry include/mysql +@dirrmtry lib/mysql diff --git a/databases/mariadb-scripts/Makefile b/databases/mariadb-scripts/Makefile index 3489c3dbff76..9d770812ac71 100644 --- a/databases/mariadb-scripts/Makefile +++ b/databases/mariadb-scripts/Makefile @@ -1,33 +1,38 @@ # New ports collection makefile for: mariadb-scripts # Date created: 30 May 2011 # Whom: Doug Barton # # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= -scripts COMMENT= Scripts for mariadb - drop-in replacement for MySQL USE_PERL5= yes MASTERDIR= ${.CURDIR}/../mariadb-server MARIADB_SCRIPTS_SLAVE= yes IGNORE= Post repo-copy, not ready for use yet CONFLICTS= mysql-scripts-[0-9]* PKGMESSAGE= /nonexistent # To avoid equivalent in master port PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist MAN1= msql2mysql.1 mysql_convert_table_format.1 mysql_find_rows.1 \ mysql_fix_extensions.1 mysql_secure_installation.1 \ mysql_setpermission.1 mysql_zap.1 mysqlaccess.1 \ mysqldumpslow.1 mysqlhotcopy.1 mysqld_multi.1 +EXTRA_PATCHES= ${MASTERDIR}/files/patch-Makefile.in ${MASTERDIR}/files/patch-man__Makefile.in +MDB_SCRIPTS_SUBDIRS= scripts @man_dirs@ + post-patch: + @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SCRIPTS_SUBDIRS}|" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s|%%MANS%%|${MAN1}|" ${WRKSRC}/man/Makefile.in + @${REINPLACE_CMD} -e "s|^\(install-man: install-man1\).*|\1|" ${WRKSRC}/man/Makefile.in .include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb-scripts/files/patch-Makefile.in b/databases/mariadb-scripts/files/patch-Makefile.in deleted file mode 100644 index c60fbc44d875..000000000000 --- a/databases/mariadb-scripts/files/patch-Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.in.orig 2011-03-01 22:25:33.000000000 -0800 -+++ Makefile.in 2011-06-01 22:04:40.000000000 -0700 -@@ -476,14 +476,7 @@ - CMakeLists.txt \ - config/ac-macros/libevent_configure.m4 - --SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ -- @readline_topdir@ sql-common scripts \ -- libservices \ -- @sql_union_dirs@ storage \ -- @sql_server@ @man_dirs@ tests \ -- netware @libmysqld_dirs@ \ -- mysql-test support-files sql-bench @tools_dirs@ \ -- win -+SUBDIRS = scripts @man_dirs@ - - DIST_SUBDIRS = . include Docs zlib \ - cmd-line-utils sql-common scripts \ diff --git a/databases/mariadb-server/Makefile b/databases/mariadb-server/Makefile index 6d386dc7518f..936ace8bc922 100644 --- a/databases/mariadb-server/Makefile +++ b/databases/mariadb-server/Makefile @@ -1,261 +1,226 @@ # New ports collection makefile for: mariadb-server # Date created: 30 May 2011 # Whom: Doug Barton # # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX?= -server PORTVERSION= 5.2.5 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://www.percona.com/downloads/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://technocation.org/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://mirror.aarnet.edu.au/pub/MariaDB/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \ http://ftp-stud.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.switch.ch/mirror/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ MAINTAINER= dgeo@centrale-marseille.fr COMMENT?= Database server - drop-in replacement for MySQL IGNORE= Post repo-copy, not ready for use yet CONFLICTS?= mysql-server-[0-9]* GNU_CONFIGURE= yes .if !defined(MARIADB_SCRIPTS_SLAVE) +CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} +LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent + CPPFLAGS+= -I${LOCALBASE}/include DATADIR= ${PREFIX}/share/mysql USE_LDCONFIG= ${PREFIX}/lib/mysql -INFO= mysql - USERS= mysql GROUPS= mysql OPTIONS= SSL "Activate SSL support (yassl)" Off \ OPENSSL "Use OpenSSL instead of bundled yassl" Off -MAN1= comp_err.1 \ - msql2mysql.1 \ - my_print_defaults.1 \ - myisam_ftdump.1 \ - myisamchk.1 \ - myisamlog.1 \ - myisampack.1 \ - mysql-stress-test.pl.1 \ - mysql-test-run.pl.1 \ - mysql.1 \ - mysql.server.1 \ - mysql_client_test.1 \ - mysql_config.1 \ - mysql_convert_table_format.1 \ - mysql_find_rows.1 \ - mysql_fix_extensions.1 \ - mysql_fix_privilege_tables.1 \ - mysql_install_db.1 \ - mysql_secure_installation.1 \ - mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 \ - mysql_upgrade.1 \ - mysql_waitpid.1 \ - mysql_zap.1 \ - mysqlaccess.1 \ - mysqladmin.1 \ - mysqlbinlog.1 \ - mysqlbug.1 \ - mysqlcheck.1 \ - mysqld_multi.1 \ - mysqld_safe.1 \ - mysqldump.1 \ - mysqldumpslow.1 \ - mysqlhotcopy.1 \ - mysqlimport.1 \ - mysqlman.1 \ - mysqlshow.1 \ - mysqlslap.1 \ - mysqltest.1 \ - perror.1 \ - replace.1 \ - resolve_stack_dump.1 \ - resolveip.1 -MAN8= mysqld.8 \ - mysqlmanager.8 +MAKE_JOBS_SAFE= yes .if !defined(MARIADB_CLIENT_SLAVE) +MAN1= 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 +MAN8= mysqld.8 mysqlmanager.8 + LICENSE= GPLv2 +INFO= mysql + CONFIGURE_ARGS= --with-embedded-server USE_RC_SUBR= mysql-server OPTIONS+= ARIADB "Aria storage engine" On \ - PORTEVENT "Use libevent from ports" Off \ ARCHIVE "Archive storage plugin" On \ BLACKHOLE "Blackhole storage engine" On \ FEDERATED "Federated (old) storage engine" Off \ FEDERATEDX "FederatedX storage engine (Federated replacement)" On \ INNODB "InnoDB (old) engine" Off \ XTRADB "XtraDB (InnoDB replacement) engine" On \ OQGRAPH "Open Query Graph Computation engine" Off \ PBXT "MVCC-based transactional engine" Off \ PARTITION "Partitioning support" Off \ SPHINX "SE client for Sphinx search daemon" On \ NDB "Enable NDB support (imply PARTITION)" Off \ EXAMPLES "Example engine,daemon and ftsearch plugins" Off - -MAN1+= innochecksum.1 \ - mysql_client_test_embedded.1 \ - mysqltest_embedded.1 -.endif # .if !defined(MARIADB_CLIENT_SLAVE) -.endif # .if !defined(MARIADB_SCRIPTS_SLAVE) +.endif # .if !defined(MARIADB_CLIENT_SLAVE) .include .if ${ARCH} == "i386" || ${ARCH} == "amd64" CONFIGURE_ARGS+= --enable-assembler .endif .if defined(WITH_SSL) .if defined(WITH_OPENSSL) 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 defined(WITH_PORTEVENT) -CONFIGURE_ARGS+= --with-libevent=${LOCALBASE} -LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent -.else -CONFIGURE_ARGS+= --with-libevent=bundled -.endif + +.if !defined(MARIADB_CLIENT_SLAVE) .if defined(WITH_ARIADB) PLIST_SUB+= ARIADB="" CONFIGURE_ARGS+= --with-plugin-aria --with-aria-tmp-tables .else CONFIGURE_ARGS+= --without-plugin-aria PLIST_SUB+= ARIADB="@comment " .endif .if defined(WITH_SPHINX) PLIST_SUB+= SPHINX="" .else CONFIGURE_ARGS+= --without-plugin-sphinx PLIST_SUB+= SPHINX="@comment " .endif .if defined(WITH_ARIADB) PLIST_SUB+= ARIADB="" .else CONFIGURE_ARGS+= --without-plugin-aria PLIST_SUB+= ARIADB="@comment " .endif .if defined(WITH_ARCHIVE) PLIST_SUB+= ARCHIVE="" .else CONFIGURE_ARGS+= --without-plugin-archive PLIST_SUB+= ARCHIVE="@comment " .endif .if defined(WITH_BLACKHOLE) PLIST_SUB+= BLACKHOLE="" .else CONFIGURE_ARGS+= --without-plugin-blackhole PLIST_SUB+= BLACKHOLE="@comment " .endif .if defined(WITH_FEDERATED) PLIST_SUB+= FEDERATED="" .else CONFIGURE_ARGS+= --without-plugin-federated PLIST_SUB+= FEDERATED="@comment " .endif .if defined(WITH_FEDERATEDX) PLIST_SUB+= FEDERATEDX="" .else CONFIGURE_ARGS+= --without-plugin-federatedx PLIST_SUB+= FEDERATEDX="@comment " .endif .if defined(WITH_INNODB) PLIST_SUB+= INNODB="" .else CONFIGURE_ARGS+= --without-plugin-innodb_plugin PLIST_SUB+= INNODB="@comment " .endif .if defined(WITH_XTRADB) PLIST_SUB+= XTRADB="" .else CONFIGURE_ARGS+= --without-plugin-xtradb PLIST_SUB+= XTRADB="@comment " .endif .if defined(WITH_OQGRAPH) CONFIGURE_ARGS+= --with-plugin-oqgraph PLIST_SUB+= OQGRAPH="" LIB_DEPENDS+= boost_system.4:${PORTSDIR}/devel/boost-libs .else CONFIGURE_ARGS+= --without-plugin-oqgraph PLIST_SUB+= OQGRAPH="@comment " .endif .if defined(WITH_PBXT) CONFIGURE_ARGS+= --with-plugin-pbxt PLIST_SUB+= PBXT="" .else CONFIGURE_ARGS+= --without-plugin-pbxt PLIST_SUB+= PBXT="@comment " .endif .if defined(WITH_EXAMPLES) PLIST_SUB+= EXAMPLES="" .else CONFIGURE_ARGS+= --without-plugin-example --without-plugin-daemon_example --without-plugin-ftexample PLIST_SUB+= EXAMPLES="@comment " .endif .if defined(WITH_NDB) CONFIGURE_ARGS+= --with-plugin-ndbcluster WITH_PARTITION=yes - PLIST_SUB+= NDB="" .else CONFIGURE_ARGS+= --without-plugin-ndbcluster PLIST_SUB+= NDB="@comment " .endif .if defined(WITH_PARTITION) CONFIGURE_ARGS+= --with-plugin-partition .else CONFIGURE_ARGS+= --without-plugin-partition .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} .endif .if defined(WITH_COLLATION) && ${WITH_COLLATION} != "" CONFIGURE_ARGS+= --with-collation=${WITH_COLLATION} .endif -.if !defined(MARIADB_SCRIPTS_SLAVE) 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: none, selected: ${WITH_XCHARSET})." @${ECHO} '' +.if !defined(MARIADB_CLIENT_SLAVE) +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 '/^install:/ s|^\(install:\).*$$|\1|' \ - ${WRKSRC}/mysql-test/Makefile.in ${WRKSRC}/sql-bench/Makefile.in + @${REINPLACE_CMD} -e "s|%%SUBDIRS%%|${MDB_SERVER_SUBDIRS}|" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|%%MANS%%|${MAN1}|" ${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 post-install: @${CAT} pkg-message -.endif +.endif # .if !defined(MARIADB_CLIENT_SLAVE) +.endif # .if !defined(MARIADB_SCRIPTS_SLAVE) .include diff --git a/databases/mariadb-server/files/mysql-server.in b/databases/mariadb-server/files/mysql-server.in index 37af2233ad55..c8c522bb8a05 100644 --- a/databases/mariadb-server/files/mysql-server.in +++ b/databases/mariadb-server/files/mysql-server.in @@ -1,73 +1,70 @@ #!/bin/sh -# + # $FreeBSD$ # - # PROVIDE: mysql # REQUIRE: LOGIN # KEYWORD: shutdown - # # Add the following line to /etc/rc.conf to enable mysql: # mysql_enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. # mysql_limits (bool): Set to "NO" by default. # Set it to yes to run `limits -e -U mysql` # just before mysql starts. # mysql_dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_args (str): Custom additional arguments to be passed # to mysqld_safe (default empty). -# . /etc/rc.subr name="mysql" rcvar=`set_rcvar` load_rc_config $name : ${mysql_enable="NO"} : ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" pidfile="${mysql_dbdir}/`/bin/hostname`.pid" command="/usr/sbin/daemon" command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_dbdir}/my.cnf --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" mysql_install_db="%%PREFIX%%/bin/mysql_install_db" mysql_install_db_args="--ldata=${mysql_dbdir}" mysql_create_auth_tables() { eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir} } mysql_prestart() { if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi if checkyesno mysql_limits; then eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null else return 0 fi } mysql_poststart() { local timeout=15 while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do timeout=$(( timeout - 1 )) sleep 1 done return 0 } run_rc_command "$1" diff --git a/databases/mariadb-server/files/patch-Makefile.in b/databases/mariadb-server/files/patch-Makefile.in new file mode 100644 index 000000000000..d8ae17962963 --- /dev/null +++ b/databases/mariadb-server/files/patch-Makefile.in @@ -0,0 +1,30 @@ +--- Makefile.in.orig 2011-03-01 22:25:33.000000000 -0800 ++++ Makefile.in 2011-06-03 15:19:13.000000000 -0700 +@@ -476,24 +476,9 @@ + CMakeLists.txt \ + config/ac-macros/libevent_configure.m4 + +-SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ +- @readline_topdir@ sql-common scripts \ +- libservices \ +- @sql_union_dirs@ storage \ +- @sql_server@ @man_dirs@ tests \ +- netware @libmysqld_dirs@ \ +- mysql-test support-files sql-bench @tools_dirs@ \ +- win +- +-DIST_SUBDIRS = . include Docs zlib \ +- cmd-line-utils sql-common scripts \ +- libservices \ +- strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \ +- vio sql man tests \ +- netware libmysqld \ +- mysql-test support-files sql-bench server-tools \ +- win \ +- BUILD ++SUBDIRS = %%SUBDIRS%% ++ ++DIST_SUBDIRS = %%SUBDIRS%% + + DISTCLEANFILES = ac_available_languages_fragment + diff --git a/databases/mariadb-scripts/files/patch-man__Makefile.in b/databases/mariadb-server/files/patch-man__Makefile.in similarity index 73% rename from databases/mariadb-scripts/files/patch-man__Makefile.in rename to databases/mariadb-server/files/patch-man__Makefile.in index 5346b3739310..9326a9645bbb 100644 --- a/databases/mariadb-scripts/files/patch-man__Makefile.in +++ b/databases/mariadb-server/files/patch-man__Makefile.in @@ -1,20 +1,11 @@ --- man/Makefile.in.orig 2011-03-01 22:25:06.000000000 -0800 +++ man/Makefile.in 2011-06-01 22:55:49.000000000 -0700 @@ -450,7 +450,7 @@ yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@ yassl_thread_cxxflags = @yassl_thread_cxxflags@ zlib_dir = @zlib_dir@ -man1_MANS = @man1_files@ +man1_MANS = %%MANS%% man8_MANS = @man8_files@ EXTRA_DIST = $(man1_MANS) $(man8_MANS) all: all-am -@@ -676,7 +676,7 @@ - - install-info: install-info-am - --install-man: install-man1 install-man8 -+install-man: install-man1 - - installcheck-am: - diff --git a/databases/mariadb-server/files/scripts__Makefile.in b/databases/mariadb-server/files/scripts__Makefile.in new file mode 100644 index 000000000000..9a5f9c36ef3d --- /dev/null +++ b/databases/mariadb-server/files/scripts__Makefile.in @@ -0,0 +1,27 @@ +--- scripts/Makefile.in.orig 2011-03-01 22:25:08.000000000 -0800 ++++ scripts/Makefile.in 2011-06-03 21:58:20.000000000 -0700 +@@ -479,14 +479,11 @@ + + bin_SCRIPTS = @server_scripts@ \ + msql2mysql \ +- mysql_config \ +- mysql_fix_privilege_tables \ + mysql_fix_extensions \ + mysql_setpermission \ + mysql_secure_installation \ + mysql_zap \ + mysqlaccess \ +- mysqlbug \ + mysql_convert_table_format \ + mysql_find_rows \ + mysqlhotcopy \ +@@ -528,8 +525,7 @@ + mysql_system_tables_fix.sql \ + CMakeLists.txt + +-dist_pkgdata_DATA = fill_help_tables.sql \ +- mysql_fix_privilege_tables.sql \ ++dist_pkgdata_DATA = fill_help_tables.sql mysql_system_tables.sql mysql_system_tables_data.sql fill_help_tables.sql \ + mysql_system_tables.sql \ + mysql_system_tables_data.sql \ + mysql_test_data_timezone.sql diff --git a/databases/mariadb-server/pkg-plist b/databases/mariadb-server/pkg-plist index dd0c6971a5f9..d0c3637b0c54 100644 --- a/databases/mariadb-server/pkg-plist +++ b/databases/mariadb-server/pkg-plist @@ -1,321 +1,252 @@ %%ARIADB%%bin/aria_chk %%ARIADB%%bin/aria_dump_log %%ARIADB%%bin/aria_ftdump %%ARIADB%%bin/aria_pack %%ARIADB%%bin/aria_read_log bin/innochecksum bin/msql2mysql bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysql -bin/mysql_client_test bin/mysql_client_test_embedded -bin/mysql_config bin/mysql_convert_table_format bin/mysql_find_rows bin/mysql_fix_extensions -bin/mysql_fix_privilege_tables bin/mysql_install_db bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql -bin/mysql_upgrade bin/mysql_waitpid bin/mysql_zap bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlbug -bin/mysqlcheck bin/mysqld_multi bin/mysqld_safe -bin/mysqldump bin/mysqldumpslow bin/mysqlhotcopy -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysqltest bin/mysqltest_embedded -bin/perror -bin/replace -bin/resolve_stack_dump -bin/resolveip -%%PBXT%%bin/xtstat %%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 -include/evutil.h -include/event.h -include/event-config.h -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/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_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_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 +bin/perror +bin/replace +bin/resolve_stack_dump +bin/resolveip +%%PBXT%%bin/xtstat %%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_error.h -%%NDB%%include/mysql/storage/ndb/mgmapi/mgmapi_debug.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/ndbapi/ndbapi_limits.h -%%NDB%%include/mysql/storage/ndb/ndbapi/ndb_opt_defaults.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/NdbTransaction.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/ndb_cluster_connection.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbBlob.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/NdbIndexScanOperation.hpp -%%NDB%%include/mysql/storage/ndb/ndbapi/NdbIndexStat.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%%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 %%ARIADB%%lib/mysql/libaria.a lib/mysql/libdbug.a lib/mysql/libheap.a lib/mysql/libmyisam.a lib/mysql/libmyisammrg.a -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.la -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.16 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.la -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.16 lib/mysql/libmysqld.a lib/mysql/libmysqld.la lib/mysql/libmysqld.so lib/mysql/libmysqld.so.0 lib/mysql/libmysqlservices.a lib/mysql/libmystrings.a lib/mysql/libmysys.a +%%NDB%%lib/mysql/libndbclient.a +%%NDB%%lib/mysql/libndbclient.la +%%NDB%%lib/mysql/libndbclient.so +%%NDB%%lib/mysql/libndbclient.so.3 lib/mysql/libvio.a lib/mysql/plugin/dialog.a lib/mysql/plugin/dialog.la lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog.so.0 %%ARCHIVE%%lib/mysql/plugin/ha_archive.a %%ARCHIVE%%lib/mysql/plugin/ha_archive.la %%ARCHIVE%%lib/mysql/plugin/ha_archive.so %%ARCHIVE%%lib/mysql/plugin/ha_archive.so.0 %%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.a %%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.la %%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so %%BLACKHOLE%%lib/mysql/plugin/ha_blackhole.so.0 %%EXAMPLES%%lib/mysql/plugin/ha_example.a %%EXAMPLES%%lib/mysql/plugin/ha_example.la %%EXAMPLES%%lib/mysql/plugin/ha_example.so %%EXAMPLES%%lib/mysql/plugin/ha_example.so.0 +%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a +%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la +%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so +%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 +%%EXAMPLES%%lib/mysql/plugin/mypluglib.a +%%EXAMPLES%%lib/mysql/plugin/mypluglib.la +%%EXAMPLES%%lib/mysql/plugin/mypluglib.so +%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 %%FEDERATED%%lib/mysql/plugin/ha_federated.a %%FEDERATED%%lib/mysql/plugin/ha_federated.la %%FEDERATED%%lib/mysql/plugin/ha_federated.so %%FEDERATED%%lib/mysql/plugin/ha_federated.so.0 %%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.a %%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.la %%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so %%FEDERATEDX%%lib/mysql/plugin/ha_federatedx.so.0 %%INNODB%%lib/mysql/plugin/ha_innodb_plugin.a %%INNODB%%lib/mysql/plugin/ha_innodb_plugin.la %%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so %%INNODB%%lib/mysql/plugin/ha_innodb_plugin.so.0 +%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la +%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so +%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0 %%SPHINX%%lib/mysql/plugin/ha_sphinx.a %%SPHINX%%lib/mysql/plugin/ha_sphinx.la %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so.0 -%%XTRADB%%lib/mysql/plugin/ha_xtradb.a -%%XTRADB%%lib/mysql/plugin/ha_xtradb.la -%%XTRADB%%lib/mysql/plugin/ha_xtradb.so -%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.la -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so -%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so.0 -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.a -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.la -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so -%%EXAMPLES%%lib/mysql/plugin/libdaemon_example.so.0 -%%NDB%%lib/mysql/libndbclient.so.3 -%%NDB%%lib/mysql/libndbclient.so -%%NDB%%lib/mysql/libndbclient.la -%%NDB%%lib/mysql/libndbclient.a -%%EXAMPLES%%lib/mysql/plugin/mypluglib.a -%%EXAMPLES%%lib/mysql/plugin/mypluglib.la -%%EXAMPLES%%lib/mysql/plugin/mypluglib.so -%%EXAMPLES%%lib/mysql/plugin/mypluglib.so.0 %%SPHINX%%lib/mysql/plugin/sphinx.a %%SPHINX%%lib/mysql/plugin/sphinx.la %%SPHINX%%lib/mysql/plugin/sphinx.so %%SPHINX%%lib/mysql/plugin/sphinx.so.0 +%%XTRADB%%lib/mysql/plugin/ha_xtradb.a +%%XTRADB%%lib/mysql/plugin/ha_xtradb.la +%%XTRADB%%lib/mysql/plugin/ha_xtradb.so +%%XTRADB%%lib/mysql/plugin/ha_xtradb.so.0 libexec/mysqld -libexec/mysqlmanager %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd -share/aclocal/mysql.m4 %%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_fix_privilege_tables.sql %%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 -@dirrm %%DATADIR%%/ukrainian -@dirrm %%DATADIR%%/swedish -@dirrm %%DATADIR%%/spanish -@dirrm %%DATADIR%%/slovak -@dirrm %%DATADIR%%/serbian -@dirrm %%DATADIR%%/russian -@dirrm %%DATADIR%%/romanian -@dirrm %%DATADIR%%/portuguese -@dirrm %%DATADIR%%/polish -@dirrm %%DATADIR%%/norwegian-ny -@dirrm %%DATADIR%%/norwegian -@dirrm %%DATADIR%%/korean -@dirrm %%DATADIR%%/japanese -@dirrm %%DATADIR%%/italian -@dirrm %%DATADIR%%/hungarian -@dirrm %%DATADIR%%/greek -@dirrm %%DATADIR%%/german -@dirrm %%DATADIR%%/french -@dirrm %%DATADIR%%/estonian -@dirrm %%DATADIR%%/english -@dirrm %%DATADIR%%/dutch -@dirrm %%DATADIR%%/danish -@dirrm %%DATADIR%%/czech @dirrm %%DATADIR%%/charsets -@dirrm %%DATADIR%% -@dirrm lib/mysql/plugin -@dirrm lib/mysql +@dirrm %%DATADIR%%/czech +@dirrm %%DATADIR%%/danish +@dirrm %%DATADIR%%/dutch +@dirrm %%DATADIR%%/english +@dirrm %%DATADIR%%/estonian +@dirrm %%DATADIR%%/french +@dirrm %%DATADIR%%/german +@dirrm %%DATADIR%%/greek +@dirrm %%DATADIR%%/hungarian +@dirrm %%DATADIR%%/italian +@dirrm %%DATADIR%%/japanese +@dirrm %%DATADIR%%/korean +@dirrm %%DATADIR%%/norwegian +@dirrm %%DATADIR%%/norwegian-ny +@dirrm %%DATADIR%%/polish +@dirrm %%DATADIR%%/portuguese +@dirrm %%DATADIR%%/romanian +@dirrm %%DATADIR%%/russian +@dirrm %%DATADIR%%/serbian +@dirrm %%DATADIR%%/slovak +@dirrm %%DATADIR%%/spanish +@dirrm %%DATADIR%%/swedish +@dirrm %%DATADIR%%/ukrainian +@dirrmtry %%DATADIR%% %%NDB%%@dirrm include/mysql/storage/ndb/mgmapi %%NDB%%@dirrm include/mysql/storage/ndb/ndbapi %%NDB%%@dirrm include/mysql/storage/ndb %%NDB%%@dirrm include/mysql/storage -@dirrm include/mysql +@dirrmtry include/mysql +@dirrm lib/mysql/plugin +@dirrmtry lib/mysql