Index: mariadb101-client/Makefile =================================================================== --- mariadb101-client/Makefile (revision 437387) +++ mariadb101-client/Makefile (working copy) @@ -26,14 +26,19 @@ ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private . for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \ mysqlimport mysqlshow mysqlslap - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b} + ${STRIP_CMD} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/bin/${b} . endfor - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 +. for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \ + mysqlimport mysqlshow mysqlslap + ${INSTALL} -l rs ${STAGEDIR}${CMAKE_INSTALL_PREFIX} \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PORTVERSION:R}-${b} +.endfor + ${STRIP_CMD} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/lib/mysql/libmysqlclient.so.18 . for b in dialog.so mysql_clear_password.so client_ed25519.so - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/${b} + ${STRIP_CMD} ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/lib/mysql/plugin/${b} . endfor # Fix https://mariadb.atlassian.net/browse/MDEV-9388 - @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config + @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${CMAKE_INSTALL_PREFIX}/bin/mysql_config post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so Index: mariadb101-client/pkg-plist =================================================================== --- mariadb101-client/pkg-plist (revision 437387) +++ mariadb101-client/pkg-plist (working copy) @@ -1,117 +1,191 @@ -bin/msql2mysql -bin/mysql -bin/mysql_find_rows -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -bin/mysql_config -include/mysql/auth_dialog_client.h -include/mysql/big_endian.h -include/mysql/byte_order_generic.h -include/mysql/byte_order_generic_x86.h -include/mysql/byte_order_generic_x86_64.h -include/mysql/client_plugin.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/handler_ername.h -include/mysql/handler_state.h -include/mysql/keycache.h -include/mysql/little_endian.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_byteorder.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_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_com_server.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_audit.h -include/mysql/plugin_auth.h -include/mysql/plugin_auth_common.h -include/mysql/plugin_encryption.h -include/mysql/plugin_ftparser.h -include/mysql/plugin_password_validation.h -include/mysql/psi/mysql_file.h -include/mysql/psi/mysql_idle.h -include/mysql/psi/mysql_socket.h -include/mysql/psi/mysql_stage.h -include/mysql/psi/mysql_statement.h -include/mysql/psi/mysql_table.h -include/mysql/psi/mysql_thread.h -include/mysql/psi/psi.h -include/mysql/service_base64.h -include/mysql/service_debug_sync.h -include/mysql/service_encryption.h -include/mysql/service_encryption_scheme.h -include/mysql/service_kill_statement.h -include/mysql/service_logger.h -include/mysql/service_md5.h -include/mysql/service_my_snprintf.h -include/mysql/service_progress_report.h -include/mysql/service_sha1.h -include/mysql/service_sha2.h -include/mysql/service_thd_alloc.h -include/mysql/service_thd_autoinc.h -include/mysql/service_thd_error_context.h -include/mysql/service_thd_rnd.h -include/mysql/service_thd_specifics.h -include/mysql/service_thd_timezone.h -include/mysql/service_thd_wait.h -include/mysql/service_wsrep.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/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.18 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.18 -%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so -lib/mysql/plugin/client_ed25519.so -lib/mysql/plugin/daemon_example.ini -lib/mysql/plugin/dialog.so -lib/mysql/plugin/mysql_clear_password.so -man/man1/msql2mysql.1.gz -man/man1/mysql.1.gz -man/man1/mysql_config.1.gz -man/man1/mysql_find_rows.1.gz -man/man1/mysql_plugin.1.gz -man/man1/mysql_waitpid.1.gz -man/man1/mysqlaccess.1.gz -man/man1/mysqladmin.1.gz -man/man1/mysqlbinlog.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 +bin/%%MARIA_PREFIX_REL%%-mysql +bin/%%MARIA_PREFIX_REL%%-mysqladmin +bin/%%MARIA_PREFIX_REL%%-mysqlbinlog +bin/%%MARIA_PREFIX_REL%%-mysqlcheck +bin/%%MARIA_PREFIX_REL%%-mysqldump +bin/%%MARIA_PREFIX_REL%%-mysqlimport +bin/%%MARIA_PREFIX_REL%%-mysqlshow +bin/%%MARIA_PREFIX_REL%%-mysqlslap +%%MARIA_PREFIX_REL%%/bin/msql2mysql +%%MARIA_PREFIX_REL%%/bin/mysql +%%MARIA_PREFIX_REL%%/bin/mysql_config +%%MARIA_PREFIX_REL%%/bin/mysql_config.bak +%%MARIA_PREFIX_REL%%/bin/mysql_find_rows +%%MARIA_PREFIX_REL%%/bin/mysqlaccess +%%MARIA_PREFIX_REL%%/bin/mysqladmin +%%MARIA_PREFIX_REL%%/bin/mysqlbinlog +%%MARIA_PREFIX_REL%%/bin/mysqlcheck +%%MARIA_PREFIX_REL%%/bin/mysqld_safe_helper +%%MARIA_PREFIX_REL%%/bin/mysqldump +%%MARIA_PREFIX_REL%%/bin/mysqlimport +%%MARIA_PREFIX_REL%%/bin/mysqlshow +%%MARIA_PREFIX_REL%%/bin/mysqlslap +%%MARIA_PREFIX_REL%%/bin/wsrep_sst_common +%%MARIA_PREFIX_REL%%/bin/wsrep_sst_mysqldump +%%MARIA_PREFIX_REL%%/bin/wsrep_sst_rsync +%%MARIA_PREFIX_REL%%/bin/wsrep_sst_xtrabackup +%%MARIA_PREFIX_REL%%/bin/wsrep_sst_xtrabackup-v2 +%%MARIA_PREFIX_REL%%/include/mysql/auth_dialog_client.h +%%MARIA_PREFIX_REL%%/include/mysql/big_endian.h +%%MARIA_PREFIX_REL%%/include/mysql/byte_order_generic.h +%%MARIA_PREFIX_REL%%/include/mysql/byte_order_generic_x86.h +%%MARIA_PREFIX_REL%%/include/mysql/byte_order_generic_x86_64.h +%%MARIA_PREFIX_REL%%/include/mysql/client_plugin.h +%%MARIA_PREFIX_REL%%/include/mysql/decimal.h +%%MARIA_PREFIX_REL%%/include/mysql/errmsg.h +%%MARIA_PREFIX_REL%%/include/mysql/handler_ername.h +%%MARIA_PREFIX_REL%%/include/mysql/handler_state.h +%%MARIA_PREFIX_REL%%/include/mysql/keycache.h +%%MARIA_PREFIX_REL%%/include/mysql/little_endian.h +%%MARIA_PREFIX_REL%%/include/mysql/m_ctype.h +%%MARIA_PREFIX_REL%%/include/mysql/m_string.h +%%MARIA_PREFIX_REL%%/include/mysql/ma_dyncol.h +%%MARIA_PREFIX_REL%%/include/mysql/my_alloc.h +%%MARIA_PREFIX_REL%%/include/mysql/my_attribute.h +%%MARIA_PREFIX_REL%%/include/mysql/my_byteorder.h +%%MARIA_PREFIX_REL%%/include/mysql/my_compiler.h +%%MARIA_PREFIX_REL%%/include/mysql/my_config.h +%%MARIA_PREFIX_REL%%/include/mysql/my_dbug.h +%%MARIA_PREFIX_REL%%/include/mysql/my_decimal_limits.h +%%MARIA_PREFIX_REL%%/include/mysql/my_dir.h +%%MARIA_PREFIX_REL%%/include/mysql/my_getopt.h +%%MARIA_PREFIX_REL%%/include/mysql/my_global.h +%%MARIA_PREFIX_REL%%/include/mysql/my_list.h +%%MARIA_PREFIX_REL%%/include/mysql/my_net.h +%%MARIA_PREFIX_REL%%/include/mysql/my_pthread.h +%%MARIA_PREFIX_REL%%/include/mysql/my_sys.h +%%MARIA_PREFIX_REL%%/include/mysql/my_valgrind.h +%%MARIA_PREFIX_REL%%/include/mysql/my_xml.h +%%MARIA_PREFIX_REL%%/include/mysql/mysql.h +%%MARIA_PREFIX_REL%%/include/mysql/mysql_com.h +%%MARIA_PREFIX_REL%%/include/mysql/mysql_com_server.h +%%MARIA_PREFIX_REL%%/include/mysql/mysql_embed.h +%%MARIA_PREFIX_REL%%/include/mysql/mysql_time.h +%%MARIA_PREFIX_REL%%/include/mysql/mysql_version.h +%%MARIA_PREFIX_REL%%/include/mysql/mysqld_ername.h +%%MARIA_PREFIX_REL%%/include/mysql/mysqld_error.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin_audit.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin_auth.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin_auth_common.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin_encryption.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin_ftparser.h +%%MARIA_PREFIX_REL%%/include/mysql/plugin_password_validation.h +%%MARIA_PREFIX_REL%%/include/mysql/private/atomic/gcc_builtins.h +%%MARIA_PREFIX_REL%%/include/mysql/private/atomic/generic-msvc.h +%%MARIA_PREFIX_REL%%/include/mysql/private/atomic/nolock.h +%%MARIA_PREFIX_REL%%/include/mysql/private/atomic/solaris.h +%%MARIA_PREFIX_REL%%/include/mysql/private/atomic/x86-gcc.h +%%MARIA_PREFIX_REL%%/include/mysql/private/config.h +%%MARIA_PREFIX_REL%%/include/mysql/private/ft_global.h +%%MARIA_PREFIX_REL%%/include/mysql/private/hash.h +%%MARIA_PREFIX_REL%%/include/mysql/private/heap.h +%%MARIA_PREFIX_REL%%/include/mysql/private/lf.h +%%MARIA_PREFIX_REL%%/include/mysql/private/maria.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_alarm.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_atomic.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_base.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_bit.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_bitmap.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_check_opt.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_compare.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_context.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_cpu.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_crypt.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_default.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_handler_errors.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_libwrap.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_md5.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_nosys.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_rdtsc.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_rnd.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_stacktrace.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_systemd.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_time.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_tree.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_uctype.h +%%MARIA_PREFIX_REL%%/include/mysql/private/my_user.h +%%MARIA_PREFIX_REL%%/include/mysql/private/myisam.h +%%MARIA_PREFIX_REL%%/include/mysql/private/myisamchk.h +%%MARIA_PREFIX_REL%%/include/mysql/private/myisammrg.h +%%MARIA_PREFIX_REL%%/include/mysql/private/myisampack.h +%%MARIA_PREFIX_REL%%/include/mysql/private/mysql_async.h +%%MARIA_PREFIX_REL%%/include/mysql/private/mysqld_default_groups.h +%%MARIA_PREFIX_REL%%/include/mysql/private/mysys_err.h +%%MARIA_PREFIX_REL%%/include/mysql/private/password.h +%%MARIA_PREFIX_REL%%/include/mysql/private/probes_mysql.h +%%MARIA_PREFIX_REL%%/include/mysql/private/probes_mysql_nodtrace.h +%%MARIA_PREFIX_REL%%/include/mysql/private/queues.h +%%MARIA_PREFIX_REL%%/include/mysql/private/rijndael.h +%%MARIA_PREFIX_REL%%/include/mysql/private/service_versions.h +%%MARIA_PREFIX_REL%%/include/mysql/private/t_ctype.h +%%MARIA_PREFIX_REL%%/include/mysql/private/thr_alarm.h +%%MARIA_PREFIX_REL%%/include/mysql/private/thr_lock.h +%%MARIA_PREFIX_REL%%/include/mysql/private/thr_timer.h +%%MARIA_PREFIX_REL%%/include/mysql/private/thread_pool_priv.h +%%MARIA_PREFIX_REL%%/include/mysql/private/violite.h +%%MARIA_PREFIX_REL%%/include/mysql/private/waiting_threads.h +%%MARIA_PREFIX_REL%%/include/mysql/private/welcome_copyright_notice.h +%%MARIA_PREFIX_REL%%/include/mysql/private/wqueue.h +%%MARIA_PREFIX_REL%%/include/mysql/private/wsrep.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_file.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_idle.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_socket.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_stage.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_statement.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_table.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/mysql_thread.h +%%MARIA_PREFIX_REL%%/include/mysql/psi/psi.h +%%MARIA_PREFIX_REL%%/include/mysql/service_base64.h +%%MARIA_PREFIX_REL%%/include/mysql/service_debug_sync.h +%%MARIA_PREFIX_REL%%/include/mysql/service_encryption.h +%%MARIA_PREFIX_REL%%/include/mysql/service_encryption_scheme.h +%%MARIA_PREFIX_REL%%/include/mysql/service_kill_statement.h +%%MARIA_PREFIX_REL%%/include/mysql/service_logger.h +%%MARIA_PREFIX_REL%%/include/mysql/service_md5.h +%%MARIA_PREFIX_REL%%/include/mysql/service_my_snprintf.h +%%MARIA_PREFIX_REL%%/include/mysql/service_progress_report.h +%%MARIA_PREFIX_REL%%/include/mysql/service_sha1.h +%%MARIA_PREFIX_REL%%/include/mysql/service_sha2.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_alloc.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_autoinc.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_error_context.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_rnd.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_specifics.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_timezone.h +%%MARIA_PREFIX_REL%%/include/mysql/service_thd_wait.h +%%MARIA_PREFIX_REL%%/include/mysql/service_wsrep.h +%%MARIA_PREFIX_REL%%/include/mysql/services.h +%%MARIA_PREFIX_REL%%/include/mysql/sql_common.h +%%MARIA_PREFIX_REL%%/include/mysql/sql_state.h +%%MARIA_PREFIX_REL%%/include/mysql/sslopt-case.h +%%MARIA_PREFIX_REL%%/include/mysql/sslopt-longopts.h +%%MARIA_PREFIX_REL%%/include/mysql/sslopt-vars.h +%%MARIA_PREFIX_REL%%/include/mysql/typelib.h +%%MARIA_PREFIX_REL%%/lib/mysql/libmysqlclient.a +%%MARIA_PREFIX_REL%%/lib/mysql/libmysqlclient.so +%%MARIA_PREFIX_REL%%/lib/mysql/libmysqlclient.so.18 +%%MARIA_PREFIX_REL%%/lib/mysql/libmysqlclient_r.a +%%MARIA_PREFIX_REL%%/lib/mysql/libmysqlclient_r.so +%%MARIA_PREFIX_REL%%/lib/mysql/libmysqlclient_r.so.18 +%%MARIA_PREFIX_REL%%/lib/mysql/plugin/auth_gssapi_client.so +%%MARIA_PREFIX_REL%%/lib/mysql/plugin/client_ed25519.so +%%MARIA_PREFIX_REL%%/lib/mysql/plugin/daemon_example.ini +%%MARIA_PREFIX_REL%%/lib/mysql/plugin/dialog.so +%%MARIA_PREFIX_REL%%/lib/mysql/plugin/mysql_clear_password.so +%%MARIA_PREFIX_REL%%/man/man1/msql2mysql.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysql.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysql_config.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysql_find_rows.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysql_plugin.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysql_waitpid.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqlaccess.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqladmin.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqlbinlog.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqlcheck.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqldump.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqlimport.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqlshow.1.gz +%%MARIA_PREFIX_REL%%/man/man1/mysqlslap.1.gz +%%MARIA_PREFIX_REL%%/share/aclocal/mysql.m4 +%%MARIA_PREFIX_REL%%/share/pkgconfig/mariadb.pc Index: mariadb101-server/Makefile =================================================================== --- mariadb101-server/Makefile (revision 437387) +++ mariadb101-server/Makefile (working copy) @@ -42,6 +42,9 @@ OPTIONS_DEFAULT= GSSAPI_BASE FASTMTX_DESC= Replace mutexes with spinlocks +MARIA_PREFIX_REL= ${PORTNAME}${PORTVERSION:R} +CMAKE_INSTALL_PREFIX= ${PREFIX}/${MARIA_PREFIX_REL} +PLIST_SUB+= MARIA_PREFIX_REL=${MARIA_PREFIX_REL} .if !defined(CLIENT_ONLY) # MySQL-Server options @@ -93,11 +96,6 @@ .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]*-//}-* - FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes