diff options
Diffstat (limited to 'databases/mariadb-client')
| -rw-r--r-- | databases/mariadb-client/Makefile | 20 | ||||
| -rw-r--r-- | databases/mariadb-client/files/patch-scripts__Makefile.in | 38 | ||||
| -rw-r--r-- | databases/mariadb-client/pkg-plist | 55 |
3 files changed, 60 insertions, 53 deletions
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 @@ -12,13 +12,31 @@ 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,41 +1,16 @@ -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 @@ -77,10 +52,6 @@ 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 @@ -89,28 +60,8 @@ 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 |