svn commit: r441923 - in head/databases: . mariadb102-client mariadb102-client/files mariadb102-server mariadb102-server/files
Bernard Spil
brnrd at FreeBSD.org
Sun May 28 20:52:53 UTC 2017
Author: brnrd
Date: Sun May 28 20:52:49 2017
New Revision: 441923
URL: https://svnweb.freebsd.org/changeset/ports/441923
Log:
databases/mariadb102-server: Add MariaDB 10.2 ports
- Add mariadb102-client port
- Add RocksDB storage engine
- Add non-base page compressors
- First sweep at making cmake patches upstreamable
Added:
head/databases/mariadb102-client/
- copied from r413536, head/databases/mariadb101-client/
head/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h (contents, props changed)
head/databases/mariadb102-client/files/patch-libmariadb_include_ma__pthread.h (contents, props changed)
head/databases/mariadb102-server/
- copied from r413536, head/databases/mariadb101-server/
head/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-libmariadb_include_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-libmariadb_libmariadb_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-libmariadb_plugins_connection_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-libmariadb_plugins_trace_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-plugin_auth__ed25519_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-sql-common_client.c (contents, props changed)
head/databases/mariadb102-server/files/patch-sql_mysqld.cc (contents, props changed)
head/databases/mariadb102-server/files/patch-sql_share_CMakeLists.txt (contents, props changed)
head/databases/mariadb102-server/files/patch-sql_slave.cc (contents, props changed)
head/databases/mariadb102-server/files/patch-storage_innobase_lz4.cmake (contents, props changed)
head/databases/mariadb102-server/files/patch-storage_innobase_lzo.cmake (contents, props changed)
head/databases/mariadb102-server/files/patch-storage_innobase_snappy.cmake (contents, props changed)
head/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc (contents, props changed)
Deleted:
head/databases/mariadb102-client/files/patch-cmake_ssl.cmake
head/databases/mariadb102-client/files/patch-libmysql_CMakeLists.txt
head/databases/mariadb102-client/files/patch-libservices_CMakeLists.txt
head/databases/mariadb102-client/files/patch-pcre_CMakeLists.txt
head/databases/mariadb102-client/files/patch-sql_CMakeLists.txt
head/databases/mariadb102-server/files/patch-cmake_ssl.cmake
head/databases/mariadb102-server/files/patch-libmysql_CMakeLists.txt
head/databases/mariadb102-server/files/patch-storage_oqgraph_graphcore.cc
head/databases/mariadb102-server/files/patch-storage_oqgraph_oqgraph__shim.h
Modified:
head/databases/Makefile
head/databases/mariadb102-client/Makefile
head/databases/mariadb102-client/files/patch-CMakeLists.txt
head/databases/mariadb102-client/files/patch-client_CMakeLists.txt
head/databases/mariadb102-client/files/patch-extra_CMakeLists.txt
head/databases/mariadb102-client/files/patch-include_CMakeLists.txt
head/databases/mariadb102-client/files/patch-include_my__compare.h
head/databases/mariadb102-client/files/patch-man_CMakeLists.txt
head/databases/mariadb102-client/files/patch-mysys_my__default.c
head/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
head/databases/mariadb102-client/files/patch-scripts_mysql__config.sh
head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
head/databases/mariadb102-client/pkg-plist
head/databases/mariadb102-server/Makefile
head/databases/mariadb102-server/distinfo
head/databases/mariadb102-server/files/patch-CMakeLists.txt
head/databases/mariadb102-server/files/patch-client_CMakeLists.txt
head/databases/mariadb102-server/files/patch-extra_CMakeLists.txt
head/databases/mariadb102-server/files/patch-include_CMakeLists.txt
head/databases/mariadb102-server/files/patch-libservices_CMakeLists.txt
head/databases/mariadb102-server/files/patch-man_CMakeLists.txt
head/databases/mariadb102-server/files/patch-mysys_my__default.c
head/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt
head/databases/mariadb102-server/files/patch-scripts_mysql__config.sh
head/databases/mariadb102-server/files/patch-scripts_mysqld__safe.sh
head/databases/mariadb102-server/files/patch-sql_CMakeLists.txt
head/databases/mariadb102-server/files/patch-sql_sql__trigger.cc
head/databases/mariadb102-server/files/patch-sql_sql__view.cc
head/databases/mariadb102-server/files/patch-sql_sys__vars.cc
head/databases/mariadb102-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
head/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt
head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
head/databases/mariadb102-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
head/databases/mariadb102-server/files/patch-support-files_CMakeLists.txt
head/databases/mariadb102-server/files/pkg-message.in
head/databases/mariadb102-server/pkg-plist
Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile Sun May 28 19:17:17 2017 (r441922)
+++ head/databases/Makefile Sun May 28 20:52:49 2017 (r441923)
@@ -177,6 +177,8 @@
SUBDIR += mariadb100-server
SUBDIR += mariadb101-client
SUBDIR += mariadb101-server
+ SUBDIR += mariadb102-client
+ SUBDIR += mariadb102-server
SUBDIR += mariadb55-client
SUBDIR += mariadb55-server
SUBDIR += mdbtools
Modified: head/databases/mariadb102-client/Makefile
==============================================================================
--- head/databases/mariadb101-client/Makefile Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/Makefile Sun May 28 20:52:49 2017 (r441923)
@@ -1,18 +1,20 @@
# $FreeBSD$
PORTNAME= mariadb
-PKGNAMESUFFIX= 101-client
+PKGNAMESUFFIX= 102-client
COMMENT= Multithreaded SQL database (client)
-MASTERDIR= ${.CURDIR}/../mariadb101-server
+MASTERDIR= ${.CURDIR}/../mariadb102-server
FILESDIR= ${.CURDIR}/files
PATCHDIR= ${.CURDIR}/files
PLIST= ${.CURDIR}/pkg-plist
-CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DWITH_WSREP=0
-INSTALL_TARGET= install
+CMAKE_ARGS+= -DWITHOUT_SERVER=1 \
+ -DCONC_WITH_UNITTEST=0 \
+ -DCONC_WITH_MYSQLCOMPAT=1 \
+ -DWITH_WSREP=0
USE_LDCONFIG= ${PREFIX}/lib/mysql
@@ -21,14 +23,9 @@ CLIENT_ONLY= yes
post-install:
${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-. for b in mysql mysqladmin mysqlbinlog mysqlcheck mysqldump \
- mysqlimport mysqlshow mysqlslap
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${b}
-. endfor
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18
-. for b in dialog.so mysql_clear_password.so
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/${b}
-. endfor
+ ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
+ ${RM} -r ${STAGEDIR}${DATADIR}/policy
+ ${RM} ${STAGEDIR}${PREFIX}/man/man1/aria* ${STAGEDIR}${PREFIX}/man/man1/myisam*
# Fix https://mariadb.atlassian.net/browse/MDEV-9388
@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
Modified: head/databases/mariadb102-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,22 +1,23 @@
---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC
+--- CMakeLists.txt.orig 2017-04-04 19:11:32 UTC
+++ CMakeLists.txt
-@@ -380,7 +380,6 @@ ADD_SUBDIRECTORY(libmysql)
- ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(libservices)
--ADD_SUBDIRECTORY(sql/share)
-
- IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
-@@ -460,6 +459,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
+ ENDIF()
+ OPTION(ENABLED_PROFILING "Enable profiling" ON)
+ OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
++OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
++OPTION(WITHOUT_DOCS "Do not install documentation" OFF)
+ IF(UNIX)
+ OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
+ ENDIF()
+@@ -454,6 +456,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
++IF(NOT WITHOUT_DOCS)
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
- # MDEV-6526 these files are not installed anymore
-@@ -470,6 +470,7 @@ IF(UNIX)
+
+@@ -465,6 +468,7 @@ IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
ENDIF()
Modified: head/databases/mariadb102-client/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-client_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-client_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,57 +1,61 @@
---- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+--- client/CMakeLists.txt.orig 2017-04-04 19:11:32 UTC
+++ client/CMakeLists.txt
-@@ -38,11 +38,12 @@ IF(UNIX)
+@@ -43,11 +43,12 @@ IF(UNIX)
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
+ TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix)
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
-
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
+ TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
+@@ -60,15 +61,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+ENDIF()
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB})
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
+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")
-@@ -80,10 +85,12 @@ IF(WIN32)
- ENDIF(WIN32)
-
- # async_example is just a code example, do not install it.
-+IF(FALSE)
+ TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
+@@ -89,14 +94,21 @@ ENDIF(WIN32)
ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example mysqlclient)
-+ENDIF()
+ TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example
PROPERTIES HAS_CXX TRUE)
+-
+-FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog
++FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog
+ mysqladmin mysqlslap async_example)
+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
+ ENDFOREACH()
+
++IF(NOT WITHOUT_SERVER)
++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE)
++FOREACH(t mysqltest mysql_upgrade mysql_plugin)
++ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB})
++ENDFOREACH()
++ENDIF()
++
++
ADD_DEFINITIONS(-DHAVE_DLOPEN)
+
Modified: head/databases/mariadb102-client/files/patch-extra_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-extra_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-extra_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,4 +1,4 @@
---- extra/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+--- extra/CMakeLists.txt.orig 2017-04-04 19:11:33 UTC
+++ extra/CMakeLists.txt
@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError
DEPENDS
@@ -8,11 +8,11 @@
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()
+@@ -84,15 +85,19 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_
+ )
-+IF(FALSE)
+
++IF(NOT WITHOUT_SERVER)
MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
ADD_DEPENDENCIES(innochecksum GenError)
@@ -24,11 +24,12 @@
+ENDIF()
IF(UNIX)
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
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)
+@@ -102,3 +107,4 @@ IF(UNIX)
+ MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
+ TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
ENDIF()
+ENDIF()
Modified: head/databases/mariadb102-client/files/patch-include_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-include_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-include_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,15 +1,6 @@
---- include/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+--- include/CMakeLists.txt.orig 2017-04-04 19:11:34 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
-+)
-
+@@ -73,11 +73,13 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
@@ -20,3 +11,6 @@
PATTERN mysql EXCLUDE
REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
+ENDIF()
+
+ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+ FILES_MATCHING PATTERN "*.h"
Modified: head/databases/mariadb102-client/files/patch-include_my__compare.h
==============================================================================
--- head/databases/mariadb101-client/files/patch-include_my__compare.h Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-include_my__compare.h Sun May 28 20:52:49 2017 (r441923)
@@ -1,4 +1,4 @@
---- include/my_compare.h.orig 2015-12-23 15:33:29 UTC
+--- include/my_compare.h.orig 2017-04-04 19:11:34 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.
Added: head/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h Sun May 28 20:52:49 2017 (r441923)
@@ -0,0 +1,14 @@
+--- include/mysql/service_encryption.h.orig 2017-04-04 19:11:35 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)
Added: head/databases/mariadb102-client/files/patch-libmariadb_include_ma__pthread.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb102-client/files/patch-libmariadb_include_ma__pthread.h Sun May 28 20:52:49 2017 (r441923)
@@ -0,0 +1,10 @@
+--- libmariadb/include/ma_pthread.h.orig 2017-04-04 19:11:32 UTC
++++ libmariadb/include/ma_pthread.h
+@@ -23,6 +23,7 @@
+
+ #undef SAFE_MUTEX
+
++#include <pthread.h>
+ #include <errno.h>
+ #ifndef ETIME
+ #define ETIME ETIMEDOUT /* For FreeBSD */
Modified: head/databases/mariadb102-client/files/patch-man_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-man_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-man_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,10 +1,10 @@
---- man/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC
+--- man/CMakeLists.txt.orig 2017-04-04 19:11:35 UTC
+++ man/CMakeLists.txt
-@@ -32,9 +32,13 @@ SET(MAN1_DEVEL mysql_config.1)
+@@ -36,9 +36,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)
++IF(NOT WITHOUT_SERVER)
INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
+ENDIF()
Modified: head/databases/mariadb102-client/files/patch-mysys_my__default.c
==============================================================================
--- head/databases/mariadb101-client/files/patch-mysys_my__default.c Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-mysys_my__default.c Sun May 28 20:52:49 2017 (r441923)
@@ -1,14 +1,5 @@
---- mysys/my_default.c.orig 2016-03-24 09:12:11 UTC
+--- mysys/my_default.c.orig 2017-04-04 19:11:51 UTC
+++ mysys/my_default.c
-@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
-
- /* Which directories are searched for options (and in which order) */
-
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
- static const char **default_directories = NULL;
-
@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
{
MY_STAT stat_info;
@@ -25,8 +16,8 @@
+ 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);
++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++ name,name);
+ goto err;
+ }
+
@@ -43,7 +34,7 @@
}
}
}
-@@ -1223,13 +1232,10 @@ static const char **init_default_directo
+@@ -1192,13 +1201,10 @@ static const char **init_default_directo
#else
Modified: head/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,14 +1,14 @@
---- scripts/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC
+--- scripts/CMakeLists.txt.orig 2017-04-04 19:11:52 UTC
+++ scripts/CMakeLists.txt
-@@ -73,6 +73,7 @@ IF(UNIX)
- )
- ENDIF()
+@@ -90,6 +90,7 @@ SET(ADD_GIS_SP_EOL ";")
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
+ ${CMAKE_CURRENT_BINARY_DIR}/maria_add_gis_sp_bootstrap.sql ESCAPE_QUOTES @ONLY)
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -82,6 +83,7 @@ INSTALL(FILES
+@@ -102,6 +103,7 @@ INSTALL(FILES
${FIX_PRIVILEGES_SQL}
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
)
@@ -16,31 +16,15 @@
# TCMalloc hacks
IF(MALLOC_LIB)
-@@ -134,6 +136,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})
-@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
- DESTINATION ${INSTALL_BINDIR}
- COMPONENT Server
- )
-+ENDIF()
-
- ENDIF(UNIX)
-
-@@ -193,6 +197,7 @@ ELSE()
+@@ -177,6 +179,7 @@ ELSE()
SET(localstatedir ${MYSQL_DATADIR})
ENDIF()
-+IF()
++IF(NOT WITHOUT_SERVER)
IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -206,6 +211,7 @@ INSTALL_SCRIPT(
+@@ -190,6 +193,7 @@ INSTALL_SCRIPT(
COMPONENT Server
)
ENDIF()
@@ -48,22 +32,17 @@
SET(prefix "${CMAKE_INSTALL_PREFIX}")
IF(INSTALL_SYSCONFDIR)
-@@ -284,18 +290,8 @@ ELSE()
+@@ -277,13 +281,8 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config
-- mysql_fix_extensions
- mysql_setpermission
- mysql_secure_installation
-- mysql_zap
mysqlaccess
- mysql_convert_table_format
mysql_find_rows
- mytop
- mysqlhotcopy
-- mysqldumpslow
-- mysqld_multi
-- mysqld_safe
- ${WSREP_BINARIES}
+ ${SERVER_SCRIPTS}
+ ${WSREP_SCRIPTS}
${SYSTEMD_SCRIPTS}
- )
Modified: head/databases/mariadb102-client/files/patch-scripts_mysql__config.sh
==============================================================================
--- head/databases/mariadb101-client/files/patch-scripts_mysql__config.sh Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-scripts_mysql__config.sh Sun May 28 20:52:49 2017 (r441923)
@@ -1,12 +1,12 @@
---- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC
+--- scripts/mysql_config.sh.orig 2017-05-21 07:34:41 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 "
++libs="$libs -L/usr/local/lib "
embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
++embedded_libs="$embedded_libs -L/usr/local/lib "
include="-I$pkgincludedir"
if [ "$basedir" != "/usr" ]; then
Modified: head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,10 +1,10 @@
---- support-files/CMakeLists.txt.orig 2015-12-23 15:33:33 UTC
+--- support-files/CMakeLists.txt.orig 2017-04-04 19:12:36 UTC
+++ support-files/CMakeLists.txt
@@ -41,15 +41,18 @@ ELSE()
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
ENDIF()
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small wsrep)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh
${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
@@ -15,13 +15,13 @@
IF(UNIX)
SET(prefix ${CMAKE_INSTALL_PREFIX})
-+ IF(FALSE)
++ IF(NOT WITHOUT_SERVER)
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 )
-@@ -60,12 +63,14 @@ IF(UNIX)
- INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
- INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT SupportFiles)
+@@ -79,12 +82,14 @@ IF(UNIX)
+ ENDFOREACH()
+ ENDIF()
ENDIF()
+ ENDIF()
@@ -31,11 +31,11 @@
INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-
+
-+IF(FALSE)
++IF(NOT WITHOUT_SERVER)
SET(bindir ${INSTALL_BINDIRABS})
SET(sbindir ${INSTALL_SBINDIRABS})
SET(scriptdir ${INSTALL_SCRIPTDIRABS})
-@@ -115,6 +120,7 @@ IF(UNIX)
+@@ -136,6 +141,7 @@ IF(UNIX)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server
DESTINATION ${INSTALL_SYSCONFDIR}/init.d
RENAME mysql COMPONENT SupportFiles)
Modified: head/databases/mariadb102-client/pkg-plist
==============================================================================
--- head/databases/mariadb101-client/pkg-plist Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-client/pkg-plist Sun May 28 20:52:49 2017 (r441923)
@@ -1,3 +1,4 @@
+bin/mariadb_config
bin/msql2mysql
bin/mysql
bin/mysql_find_rows
@@ -20,11 +21,21 @@ include/mysql/decimal.h
include/mysql/errmsg.h
include/mysql/handler_ername.h
include/mysql/handler_state.h
+include/mysql/json_lib.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/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
include/mysql/my_alloc.h
include/mysql/my_attribute.h
include/mysql/my_byteorder.h
@@ -49,6 +60,10 @@ include/mysql/mysql_time.h
include/mysql/mysql_version.h
include/mysql/mysqld_ername.h
include/mysql/mysqld_error.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/pack.h
include/mysql/plugin.h
include/mysql/plugin_audit.h
include/mysql/plugin_auth.h
@@ -64,18 +79,28 @@ 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/psi/psi_abi_v0.h
+include/mysql/psi/psi_abi_v1.h
+include/mysql/psi/psi_abi_v2.h
+include/mysql/psi/psi_base.h
+include/mysql/psi/psi_memory.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
@@ -87,18 +112,69 @@ 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/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
+lib/mysql/libmysqlservices.a
+ at comment lib/mysql/plugin/client_ed25519.so
lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/dialog.so
+lib/mysql/plugin/libaurora.so
+lib/mysql/plugin/libreplication.so
lib/mysql/plugin/mysql_clear_password.so
-%%DATADIR%%/maria_add_gis_sp.sql
-%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+lib/mysql/plugin/sha256_password.so
+lib/mysql/plugin/trace_example.so
+%%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%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%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%%/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
man/man1/msql2mysql.1.gz
man/man1/mysql.1.gz
man/man1/mysql_config.1.gz
Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb101-server/Makefile Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-server/Makefile Sun May 28 20:52:49 2017 (r441923)
@@ -1,17 +1,17 @@
# $FreeBSD$
PORTNAME?= mariadb
-PORTVERSION= 10.1.13
+PORTVERSION= 10.2.6
CATEGORIES= databases ipv6
-MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \
- http://mirrors.supportex.net/${SITESDIR}/ \
+MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
http://gd.tuwien.ac.at/db/${SITESDIR}/ \
http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
http://mirror.layerjet.com/${SITESDIR}/ \
- http://mirror.switch.ch/mirror/${SITESDIR}/
-PKGNAMESUFFIX?= 101-server
+ http://mirror.switch.ch/mirror/${SITESDIR}/ \
+ http://ftp.osuosl.org/pub/${SITESDIR}/
+PKGNAMESUFFIX?= 102-server
MAINTAINER= brnrd at FreeBSD.org
COMMENT?= Multithreaded SQL database (server)
@@ -24,36 +24,42 @@ LICENSE_PERMS_PerconaFT= dist-mirror dis
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-SLAVEDIRS= databases/mariadb101-client
-USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix
+SLAVEDIRS= databases/mariadb102-client
+USES= bison:build cmake compiler:c++11-lib cpe execinfo iconv:translit ncurses shebangfix ssl
USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql
-OPTIONS_DEFINE= FASTMTX
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE
-FASTMTX_DESC= Replace mutexes with spinlocks
-
.if !defined(CLIENT_ONLY)
# MySQL-Server options
-OPTIONS_DEFINE+= MAXKEY
-OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER
-OPTIONS_GROUP= ENGINES
-OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB
+OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER
+OPTIONS_GROUP= COMPRESSION ENGINES GROONGA
+OPTIONS_DEFINE= CONNECT_EXTRA
+OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD
+OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB
+OPTIONS_GROUP_GROONGA= ZMQ MSGPACK
OPTIONS_EXCLUDE_i386= TOKUDB
+CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine
+COMPRESSION_DESC= Optional page compression
ENGINES_DESC= Optional MariaDB storage engines
-INNOBASE_DESC= Build InnoDB engine next to XtraDB
-MAXKEY_DESC= Change max key length from 1000 to 4000
+GROONGA_DESC= Optional Mroonga features
+INNOBASE_DESC= InnoDB default engine
MROONGA_DESC= Mroonga Full Text Search engine
+MSGPACK_DESC= MsgPack support
OQGRAPH_DESC= Open Query Graph Computation engine
+ROCKSDB_DESC= RocksDB LSM engine (Alpha)
SPHINX_DESC= SphinxSE engine
SPIDER_DESC= Partitioning and XA-transactions engine
TOKUDB_DESC= Fractal tree index tree data structure engine
+XTRADB_DESC= Build XtraDB engine next to InnoDB
+ZMQ_DESC= ZeroMQ support
+ZSTD_DESC+= Zstandard compression support (RocksDB only)
.endif
GSSAPI_BASE_USES= gssapi
@@ -75,12 +81,25 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc
-DINSTALL_SHAREDIR="share" \
-DINSTALL_SQLBENCHDIR= \
-DINSTALL_SUPPORTFILESDIR="share/mysql" \
- -DWITH_UNIT_TESTS=0 \
+ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
+ -DWITH_JEMALLOC="system" \
-DWITH_LIBWRAP=1 \
- -DWITH_SSL=${OPENSSLBASE} \
- -DKRB5_CONFIG=${KRB5CONFIG} \
- -DEXECINFO_ROOT=${LOCALBASE} \
- -DCOMPILATION_COMMENT="FreeBSD Ports"
+ -DWITH_SSL="${OPENSSLBASE}" \
+ -DWITH_UNIT_TESTS=0 \
+ -DWITHOUT_DOCS=1 \
+ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
+ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
+ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
+ -DEXECINFO_ROOT="${LOCALBASE}" \
+ -DICONV_LIBRARIES="${ICONV_LIB_PATH}" \
+ -DKRB5_CONFIG="${KRB5CONFIG}" \
+ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
+ -DOPENSSL_ROOT_DIR="${OPENSSLBASE}" \
+ -DOPENSSL_CRYPTO_LIBRARY="${OPENSSLBASE}/lib/libcrypto.so" \
+ -DOPENSSL_SSL_LIBRARY="${OPENSSLBASE}/lib/libssl.so" \
+ -DREMOTEIO_PLUGIN_TYPE="NO" \
+ -DCOMPILATION_COMMENT="FreeBSD Ports" \
+ -DCMAKE_PREFIX_PATH=${PREFIX}
DATADIR= ${PREFIX}/share/mysql
@@ -89,11 +108,10 @@ DATADIR= ${PREFIX}/share/mysql
.endif
CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
- mariadb10[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+ mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-USE_OPENSSL= yes
FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1
OPTIONS_SUB= yes
@@ -103,8 +121,7 @@ USES+= readline
GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
.else
# MySQL-Server part
-USE_MYSQL= yes
-WANT_MYSQL_VER= 101m
+USES+= mysql:102m
USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
USE_RC_SUBR= mysql-server
USERS= mysql
@@ -112,26 +129,44 @@ GROUPS= mysql
CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \
-DPLUGIN_AUTH_GSSAPI_CLIENT=NO \
-DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_CLIENT=1
.for ENGINE in ${OPTIONS_GROUP_ENGINES}
${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \
-DWITHOUT_${ENGINE}=1
+${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC
.endfor
-GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO
-MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h
+CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC
+CONNECT_EXTRA_USE= gnome=libxml2
+GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO
+LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
+LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON
+LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
+LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF
+LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON
+LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2
+MROONGA_IMPLIES= LZ4
+MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack
OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \
libJudy.so:devel/judy
-TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy
+SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
+SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON
+SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy
+TOKUDB_IMPLIES= SNAPPY
TOKUDB_PORTDOCS= README.md
TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
+ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
+ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON
+ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd
+
NOT_FOR_ARCHS= i386
NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \
- https://mariadb.atlassian.net/browse/MDEV-9627
+ https://jira.mariadb.org/browse/MDEV-9627
post-install:
-# Remove programs to avoid conflict with mariadb101-client
+# Remove programs to avoid conflict with mariadb102-client
# These are "client" components, so there should be a switch that
# prevents them from being installed but it's unknown right now
${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \
@@ -154,22 +189,17 @@ GSSAPI_BASE_IGNORE= BASE_GSSAPI is not c
CMAKE_ARGS+= -DWITHOUT_TOKUDB
.endif
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012
-CMAKE_ARGS+= -DWITH_JEMALLOC="system"
-.else
-CMAKE_ARGS+= -DWITH_JEMALLOC="no"
-.if ${PORT_OPTIONS:MGSSAPI_BASE}
-IGNORE= requires a Kerberos implementation from ports on FreeBSD < 10. Select GSSAPI_HEIMDAL or GSSAPI_MIT option
-.endif
-.endif
-
post-patch:
- @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
- @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
- @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
+ ${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
+ ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
+ ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh
.if ${OPSYS} == DragonFly
${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
+post-configure-MROONGA-on:
+ ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \
+ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt
+
.include <bsd.port.post.mk>
Modified: head/databases/mariadb102-server/distinfo
==============================================================================
--- head/databases/mariadb101-server/distinfo Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-server/distinfo Sun May 28 20:52:49 2017 (r441923)
@@ -1,2 +1,3 @@
-SHA256 (mariadb-10.1.13.tar.gz) = 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d
-SIZE (mariadb-10.1.13.tar.gz) = 55272572
+TIMESTAMP = 1495564383
+SHA256 (mariadb-10.2.6.tar.gz) = c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5
+SIZE (mariadb-10.2.6.tar.gz) = 67599197
Modified: head/databases/mariadb102-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-server/files/patch-CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-server/files/patch-CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,16 +1,23 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- CMakeLists.txt.orig 2016-03-24 09:12:10 UTC
+--- CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
+++ CMakeLists.txt
-@@ -460,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+@@ -170,6 +170,8 @@ IF(DISABLE_SHARED)
+ ENDIF()
+ OPTION(ENABLED_PROFILING "Enable profiling" ON)
+ OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF)
++OPTION(WITHOUT_CLIENT "Build only the server components" OFF)
++OPTION(WITHOUT_DOCS "Do not install documentation" OFF)
+ IF(UNIX)
+ OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF)
+ ENDIF()
+@@ -452,6 +454,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty
++IF(NOT WITHOUT_DOCS)
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty
EXCEPTIONS-CLIENT COMPONENT Readme)
- # MDEV-6526 these files are not installed anymore
-@@ -470,6 +471,7 @@ IF(UNIX)
+
+@@ -463,6 +466,7 @@ IF(UNIX)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
ENDIF()
Modified: head/databases/mariadb102-server/files/patch-client_CMakeLists.txt
==============================================================================
--- head/databases/mariadb101-server/files/patch-client_CMakeLists.txt Sun Apr 17 18:59:10 2016 (r413536)
+++ head/databases/mariadb102-server/files/patch-client_CMakeLists.txt Sun May 28 20:52:49 2017 (r441923)
@@ -1,72 +1,78 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- client/CMakeLists.txt.orig 2015-10-15 15:43:35 UTC
+--- client/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
+++ client/CMakeLists.txt
-@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
- COPY_OPENSSL_DLLS(copy_openssl_client)
+@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
+ SET(CLIENT_LIB mariadbclient mysys)
ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
++
++IF(NOT WITHOUT_CLIENT)
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
-@@ -37,6 +38,7 @@ IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
+ TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB})
+@@ -43,11 +45,6 @@ IF(UNIX)
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
ENDIF(UNIX)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
- SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+-MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+-SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+-TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix)
+-SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+-
-+IF(FALSE)
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
-
-@@ -53,17 +56,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+ TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB})
+@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
+ TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB})
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-
-+IF(FALSE)
+-MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
+-TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB})
+-ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
+-
+-MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+-TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB})
+-
+-MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+-TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB})
+-
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-
-@@ -73,17 +80,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
- MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-+ENDIF()
-
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
- MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
- ENDIF(WIN32)
+ TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB})
-+IF(FALSE)
- # async_example is just a code example, do not install it.
+@@ -89,14 +76,34 @@ ENDIF(WIN32)
ADD_EXECUTABLE(async_example async_example.c)
- TARGET_LINK_LIBRARIES(async_example mysqlclient)
-+ENDIF()
+ TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB})
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list