diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-07-01 11:02:49 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-01 11:02:49 +0000 |
commit | 9233e8cca587c82fda3ea05cffb46dd52d484dba (patch) | |
tree | 518178f9dc0b14f53870ca304b590c118ae7ca68 /databases/mariadb101-client | |
parent | x11/mate-panel: sync no-x11 patch with upstream (diff) |
Remove expired ports:
2020-07-01 databases/mariadb101-client: Port will be removed when 10.5 is added, please switch to a newer version
2020-07-01 databases/mariadb101-server: Port will be removed when 10.5 is added, please switch to a newer version
2020-07-01 databases/mariadb102-server: Port will be removed when 10.5 is added, please switch to a newer version
2020-07-01 databases/mariadb102-client: Port will be removed when 10.5 is added, please switch to a newer version
Notes
Notes:
svn path=/head/; revision=540951
Diffstat (limited to 'databases/mariadb101-client')
19 files changed, 0 insertions, 572 deletions
diff --git a/databases/mariadb101-client/Makefile b/databases/mariadb101-client/Makefile deleted file mode 100644 index 365cdeaee564..000000000000 --- a/databases/mariadb101-client/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mariadb -PKGNAMESUFFIX= 101-client - -COMMENT= Multithreaded SQL database (client) - -MASTERDIR= ${.CURDIR}/../mariadb101-server - -FILESDIR= ${.CURDIR}/files -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb101-client/files/patch-CMakeLists.txt b/databases/mariadb101-client/files/patch-CMakeLists.txt deleted file mode 100644 index 052cc744a248..000000000000 --- a/databases/mariadb101-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- CMakeLists.txt.orig 2017-05-02 05:13:38 UTC -+++ CMakeLists.txt -@@ -385,7 +385,7 @@ ADD_SUBDIRECTORY(libmysql) - ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(libservices) --ADD_SUBDIRECTORY(sql/share) -+#ADD_SUBDIRECTORY(sql/share) - - IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) -@@ -465,6 +465,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.thirdparty - EXCEPTIONS-CLIENT COMPONENT Readme) - -@@ -476,6 +477,7 @@ IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mariadb101-client/files/patch-client_CMakeLists.txt b/databases/mariadb101-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 067830b3f117..000000000000 --- a/databases/mariadb101-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-02-04 17:02:08 UTC -+++ client/CMakeLists.txt -@@ -39,12 +39,13 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ENDIF() - -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -55,21 +56,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) --TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) -+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) - - MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) - SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -81,10 +86,12 @@ IF(WIN32) - ENDIF(WIN32) - - # async_example is just a code example, do not install it. -+IF(FALSE) - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example mysqlclient) -+ENDIF() - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb101-client/files/patch-cmake_ssl.cmake b/databases/mariadb101-client/files/patch-cmake_ssl.cmake deleted file mode 100644 index 5f8c1c0b6910..000000000000 --- a/databases/mariadb101-client/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,31 +0,0 @@ -MariaDB prefers static libraries, breaks builds with -ports' OpenSSL libs - ---- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC -+++ cmake/ssl.cmake -@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL) - - # On mac this list is <.dylib;.so;.a> - # We prefer static libraries, so we revert it here. -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() -+# IF (WITH_SSL_PATH) -+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -+# ENDIF() - FIND_LIBRARY(OPENSSL_LIBRARIES - NAMES ssl ssleay32 ssleay32MD - HINTS ${OPENSSL_ROOT_DIR}/lib) -@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL) - HINTS ${OPENSSL_ROOT_DIR}/lib) - MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR - OPENSSL_INCLUDE_DIR) -- IF (WITH_SSL_PATH) -- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -- ENDIF() -+# IF (WITH_SSL_PATH) -+# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) -+# ENDIF() - - INCLUDE(CheckSymbolExists) - SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) diff --git a/databases/mariadb101-client/files/patch-extra_CMakeLists.txt b/databases/mariadb101-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 1af179861af5..000000000000 --- a/databases/mariadb101-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ ---- extra/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC -+++ extra/CMakeLists.txt -@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError - DEPENDS - ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -88,18 +89,23 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_ - ) - ENDIF() - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() -+ENDIF() - - MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - - IF(UNIX) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - ENDIF() -+ENDIF() diff --git a/databases/mariadb101-client/files/patch-include_CMakeLists.txt b/databases/mariadb101-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index baaec26c51f7..000000000000 --- a/databases/mariadb101-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- include/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC -+++ include/CMakeLists.txt -@@ -66,13 +66,18 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I - FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - ENDFOREACH(f) --INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") -+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "psi_abi*" EXCLUDE -+) - - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() diff --git a/databases/mariadb101-client/files/patch-include_my__compare.h b/databases/mariadb101-client/files/patch-include_my__compare.h deleted file mode 100644 index 6a3f0e052da3..000000000000 --- a/databases/mariadb101-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2015-12-23 15:33:29 UTC -+++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h deleted file mode 100644 index ae94c3c0c38d..000000000000 --- a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/mysql/service_encryption.h.orig 2015-12-23 15:33:29 UTC -+++ include/mysql/service_encryption.h -@@ -37,9 +37,11 @@ extern "C" { - #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - #include <stdlib.h> - #else -+#ifndef __FreeBSD__ - #include <alloca.h> - #endif - #endif -+#endif - - /* returned from encryption_key_get_latest_version() */ - #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0) diff --git a/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt b/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt deleted file mode 100644 index 567cfcf9d52a..000000000000 --- a/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmysql/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC -+++ libmysql/CMakeLists.txt -@@ -441,6 +441,8 @@ IF(NOT DISABLE_SHARED) - # libtool compatability - IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") -+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "DragonFly") -+ SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}") - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX") - SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0") - ELSE() diff --git a/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 58a1955ce280..000000000000 --- a/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC -+++ libservices/CMakeLists.txt -@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES - logger_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb101-client/files/patch-man_CMakeLists.txt b/databases/mariadb101-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index b402908c9698..000000000000 --- a/databases/mariadb101-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- man/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC -+++ man/CMakeLists.txt -@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1) - SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1) - -+IF(FALSE) - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+ENDIF() - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) -+IF(FALSE) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -+ENDIF() - diff --git a/databases/mariadb101-client/files/patch-mysys_my__default.c b/databases/mariadb101-client/files/patch-mysys_my__default.c deleted file mode 100644 index eb3fb51932c2..000000000000 --- a/databases/mariadb101-client/files/patch-mysys_my__default.c +++ /dev/null @@ -1,60 +0,0 @@ ---- mysys/my_default.c.orig 2017-01-17 19:38:25 UTC -+++ mysys/my_default.c -@@ -785,7 +785,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -803,6 +803,22 @@ static int search_default_file_with_ext( - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1067,7 +1083,8 @@ void my_print_default_files(const char * - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1228,13 +1245,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt b/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt deleted file mode 100644 index f3ee3007bb97..000000000000 --- a/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- pcre/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC -+++ pcre/CMakeLists.txt -@@ -508,6 +508,8 @@ IF(PCRE_SHOW_REPORT) - MESSAGE(STATUS "") - ENDIF(PCRE_SHOW_REPORT) - -+IF(FALSE) - INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) -+ENDIF() - - # end CMakeLists.txt diff --git a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 70619e844dfa..000000000000 --- a/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2016-07-14 01:10:23 UTC -+++ scripts/CMakeLists.txt -@@ -45,6 +45,7 @@ ELSE() - MESSAGE(FATAL_ERROR "Cannot concatenate files") - ENDIF() - -+IF(FALSE) - # Build mysql_fix_privilege_tables.c - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c -@@ -65,6 +66,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs - ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c - ) -+ENDIF() - - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution -@@ -164,6 +166,7 @@ ENDIF() - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - -+IF(FALSE) - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables - SET(CC ${CMAKE_C_COMPILER}) -@@ -198,6 +201,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - ENDIF(UNIX) - -@@ -228,6 +232,7 @@ SET(mysqld_locations "$basedir/${INSTALL - SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english") - SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql") - -+IF() - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -241,6 +246,7 @@ INSTALL_SCRIPT( - COMPONENT Server - ) - ENDIF() -+ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") - IF(INSTALL_SYSCONFDIR) -@@ -333,13 +339,8 @@ ELSE() - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_setpermission -- mysql_secure_installation - mysqlaccess -- mysql_convert_table_format - mysql_find_rows -- mytop -- mysqlhotcopy - ${SERVER_SCRIPTS} - ${WSREP_SCRIPTS} - ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb101-client/files/patch-scripts_mysql__config.sh b/databases/mariadb101-client/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 6ce75cd52079..000000000000 --- a/databases/mariadb101-client/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC -+++ scripts/mysql_config.sh -@@ -106,7 +106,9 @@ fi - - # Create options - libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" -+libs="$libs -L%%LOCALBASE%%/lib " - embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - include="-I$pkgincludedir" - if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb101-client/files/patch-sql_CMakeLists.txt b/databases/mariadb101-client/files/patch-sql_CMakeLists.txt deleted file mode 100644 index ab969aeb23e6..000000000000 --- a/databases/mariadb101-client/files/patch-sql_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- sql/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC -+++ sql/CMakeLists.txt -@@ -275,9 +275,9 @@ RUN_BISON( - ) - - # Gen_lex_hash --IF(NOT CMAKE_CROSSCOMPILING) -+ - ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) --ENDIF() -+ - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h diff --git a/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index d8952102483f..000000000000 --- a/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2015-12-23 15:33:33 UTC -+++ support-files/CMakeLists.txt -@@ -59,6 +59,7 @@ ENDIF() - - IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+ IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -88,12 +89,14 @@ IF(UNIX) - ENDFOREACH() - ENDIF() - ENDIF() -+ ENDIF() - - CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development) - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -- -+ -+IF(FALSE) - SET(bindir ${INSTALL_BINDIRABS}) - SET(sbindir ${INSTALL_SBINDIRABS}) - SET(scriptdir ${INSTALL_SCRIPTDIRABS}) -@@ -160,6 +163,7 @@ IF(UNIX) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server - DESTINATION ${INSTALL_SYSCONFDIR}/init.d - RENAME mysql COMPONENT SupportFiles) -+ ENDIF() - - INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} - COMPONENT Common) diff --git a/databases/mariadb101-client/files/pkg-message.in b/databases/mariadb101-client/files/pkg-message.in deleted file mode 100644 index 00ac47038607..000000000000 --- a/databases/mariadb101-client/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <<EOM -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. -EOM -} -] diff --git a/databases/mariadb101-client/pkg-plist b/databases/mariadb101-client/pkg-plist deleted file mode 100644 index 35edb8fbc205..000000000000 --- a/databases/mariadb101-client/pkg-plist +++ /dev/null @@ -1,121 +0,0 @@ -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_crypt.h -include/mysql/service_my_print_error.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_embedded.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 -@comment %%DATADIR%%/wsrep.cnf |