Date: Sat, 13 Feb 2016 19:02:11 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408822 - in head: Mk databases databases/mariadb101-client databases/mariadb101-client/files databases/mariadb101-server databases/mariadb101-server/files Message-ID: <201602131902.u1DJ2BSF027376@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Feb 13 19:02:11 2016 New Revision: 408822 URL: https://svnweb.freebsd.org/changeset/ports/408822 Log: [NEW PORTS] databases/mariadb101-{server,client}: 10.1.11 MariaDB is one of the most popular database servers in the world. It's made by the original developers of MySQL and guaranteed to stay open source. Notable users include Wikipedia, Facebook and Google. MariaDB turns data into structured information in a wide array of applications, ranging from banking to websites. It is an enhanced, drop-in replacement for MySQL. MariaDB is used because it is fast, scalable and robust, with a rich ecosystem of storage engines, plugins and many other tools make it very versatile for a wide variety of use cases. MariaDB is developed as open source software and as a relational database it provides an SQL interface for accessing data. This latest versions of MariaDB also include GIS and JSON features. WWW: http://mariadb.org/ Reviewed by: koobs (mentor), feld (mentor) Approved by: koobs (mentor), feld (mentor) Differential Revision: D3953 Added: head/databases/mariadb101-client/ - copied from r408786, head/databases/mariadb100-client/ head/databases/mariadb101-server/ - copied from r408786, head/databases/mariadb100-server/ Modified: head/Mk/bsd.database.mk head/databases/Makefile head/databases/mariadb101-client/Makefile head/databases/mariadb101-client/files/patch-CMakeLists.txt head/databases/mariadb101-client/files/patch-client_CMakeLists.txt head/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake head/databases/mariadb101-client/files/patch-extra_CMakeLists.txt head/databases/mariadb101-client/files/patch-include_CMakeLists.txt head/databases/mariadb101-client/files/patch-include_my_compare.h head/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt head/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt head/databases/mariadb101-client/files/patch-man_CMakeLists.txt head/databases/mariadb101-client/files/patch-mysys_my_default.c head/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh head/databases/mariadb101-client/files/patch-sql_CMakeLists.txt head/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt head/databases/mariadb101-client/pkg-plist head/databases/mariadb101-server/Makefile head/databases/mariadb101-server/distinfo head/databases/mariadb101-server/files/patch-CMakeLists.txt head/databases/mariadb101-server/files/patch-client_CMakeLists.txt head/databases/mariadb101-server/files/patch-cmake_jemalloc.cmake head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt head/databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp head/databases/mariadb101-server/files/patch-include_CMakeLists.txt head/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt head/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt head/databases/mariadb101-server/files/patch-man_CMakeLists.txt head/databases/mariadb101-server/files/patch-mysys_my__default.c head/databases/mariadb101-server/files/patch-pcre_CMakeLists.txt head/databases/mariadb101-server/files/patch-scripts_CMakeLists.txt head/databases/mariadb101-server/files/patch-scripts_mysql__config.sh head/databases/mariadb101-server/files/patch-scripts_mysqld__safe.sh head/databases/mariadb101-server/files/patch-sql_CMakeLists.txt head/databases/mariadb101-server/files/patch-sql_sql__trigger.cc head/databases/mariadb101-server/files/patch-sql_sql__view.cc head/databases/mariadb101-server/files/patch-sql_sys__vars.cc head/databases/mariadb101-server/files/patch-storage_connect_json.cpp head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc head/databases/mariadb101-server/files/patch-support-files_CMakeLists.txt head/databases/mariadb101-server/pkg-plist Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Sat Feb 13 18:18:10 2016 (r408821) +++ head/Mk/bsd.database.mk Sat Feb 13 19:02:11 2016 (r408822) @@ -108,6 +108,7 @@ MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 MYSQL57_LIBVER= 20 MYSQL100m_LIBVER= 18 +MYSQL101m_LIBVER= 18 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Feb 13 18:18:10 2016 (r408821) +++ head/databases/Makefile Sat Feb 13 19:02:11 2016 (r408822) @@ -181,6 +181,8 @@ SUBDIR += mantis SUBDIR += mariadb100-client SUBDIR += mariadb100-server + SUBDIR += mariadb101-client + SUBDIR += mariadb101-server SUBDIR += mariadb55-client SUBDIR += mariadb55-server SUBDIR += mdbtools Modified: head/databases/mariadb101-client/Makefile ============================================================================== --- head/databases/mariadb100-client/Makefile Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/Makefile Sat Feb 13 19:02:11 2016 (r408822) @@ -1,19 +1,18 @@ # $FreeBSD$ PORTNAME= mariadb -PKGNAMESUFFIX= 100-client +PKGNAMESUFFIX= 101-client COMMENT= Multithreaded SQL database (client) -LICENSE+= LGPL21 - -MASTERDIR= ${.CURDIR}/../mariadb100-server +MASTERDIR= ${.CURDIR}/../mariadb101-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CMAKE_ARGS+= -DWITHOUT_SERVER=1 +CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DWITH_WSREP=0 +INSTALL_TARGET= install USE_LDCONFIG= ${PREFIX}/lib/mysql @@ -21,5 +20,13 @@ 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 + # Fix https://mariadb.atlassian.net/browse/MDEV-9388 + @${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config .include "${MASTERDIR}/Makefile" Modified: head/databases/mariadb101-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,35 +1,24 @@ ---- CMakeLists.txt.orig 2015-08-05 20:11:27.000000000 +0200 -+++ CMakeLists.txt 2015-08-07 12:05:52.895578945 +0200 -@@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) +--- CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ CMakeLists.txt +@@ -382,7 +382,6 @@ ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) - ADD_SUBDIRECTORY(scripts) -ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(support-files) -+IF(FALSE) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(sql) -@@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(internal) - ENDIF() - ENDIF() -+ENDIF() - - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -461,6 +460,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) - -@@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP - IF(UNIX) + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + EXCEPTIONS-CLIENT COMPONENT Readme) + # MDEV-6526 these files are not installed anymore +@@ -471,6 +471,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() +ENDIF() Modified: head/databases/mariadb101-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-client_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-client_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 -+++ client/CMakeLists.txt 2014-09-05 22:40:26.210338712 +0200 -@@ -38,11 +38,12 @@ +--- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC ++++ client/CMakeLists.txt +@@ -38,11 +38,12 @@ IF(UNIX) SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) ENDIF(UNIX) @@ -14,8 +14,8 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -53,21 +54,25 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +IF(FALSE) @@ -41,7 +41,7 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") -@@ -79,10 +84,12 @@ +@@ -80,10 +85,12 @@ IF(WIN32) ENDIF(WIN32) # async_example is just a code example, do not install it. Modified: head/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake ============================================================================== --- head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-cmake_jemalloc.cmake Sat Feb 13 19:02:11 2016 (r408822) @@ -1,28 +1,18 @@ -Upstreamed https://github.com/MariaDB/server/pull/139 +# Upstreamed https://github.com/MariaDB/server/pull/140 ---- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC +--- cmake/jemalloc.cmake.orig 2015-12-23 15:33:29 UTC +++ cmake/jemalloc.cmake -@@ -20,11 +20,21 @@ MACRO (CHECK_JEMALLOC) - SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) - SET(what bundled) - ELSE() -- SET(libname jemalloc) -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND -+ CMAKE_SYSTEM_VERSION STRGREATER "10.0") -+ SET(libname c) -+ ELSE() -+ SET(libname jemalloc) -+ ENDIF() - SET(what system) - ENDIF() +@@ -12,7 +12,12 @@ MACRO(JEMALLOC_TRY_STATIC) + ENDMACRO() -- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND -+ CMAKE_SYSTEM_VERSION STRGREATER "10.0") -+ SET(HAVE_JEMALLOC ON) -+ ELSE() -+ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ ENDIF() - SET(CMAKE_REQUIRED_LIBRARIES) - - IF (HAVE_JEMALLOC) + MACRO(JEMALLOC_TRY_DYNAMIC) +- SET(libname jemalloc) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(libname c) ++ ELSE() ++ SET(libname jemalloc) ++ ENDIF() + SET(what system) + CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC) + ENDMACRO() Modified: head/databases/mariadb101-client/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-extra_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-extra_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- extra/CMakeLists.txt.orig 2015-01-25 16:21:40.000000000 +0100 -+++ extra/CMakeLists.txt 2015-01-29 20:20:56.846047266 +0100 -@@ -54,6 +54,7 @@ +--- 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) @@ -8,26 +8,27 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -@@ -74,9 +75,12 @@ +@@ -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) -+ENDIF() MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) -@@ -97,7 +101,9 @@ - ../storage/innobase/page/page0zip.cc - ) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) - ADD_DEPENDENCIES(innochecksum GenError) + ENDIF() +ENDIF() - Modified: head/databases/mariadb101-client/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-include_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-include_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- include/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 -+++ include/CMakeLists.txt 2012-12-23 00:48:29.000000000 +0200 -@@ -58,13 +58,18 @@ +--- 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) Modified: head/databases/mariadb101-client/files/patch-include_my_compare.h ============================================================================== --- head/databases/mariadb100-client/files/patch-include_my_compare.h Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-include_my_compare.h Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- include/my_compare.h.orig 2012-12-17 03:52:37.000000000 +0200 -+++ include/my_compare.h 2012-12-17 03:53:40.000000000 +0200 -@@ -40,7 +40,7 @@ +--- 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. */ Modified: head/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-libmysql_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-libmysql_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-09-24 22:29:47 UTC +--- libmysql/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC +++ libmysql/CMakeLists.txt -@@ -437,6 +437,8 @@ IF(NOT DISABLE_SHARED) +@@ -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}") Modified: head/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-libservices_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-libservices_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- libservices/CMakeLists.txt.orig 2014-08-09 00:13:47.000000000 +0200 -+++ libservices/CMakeLists.txt 2014-09-05 22:29:05.110415834 +0200 -@@ -29,4 +29,6 @@ +--- 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}) Modified: head/databases/mariadb101-client/files/patch-man_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-man_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-man_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- man/CMakeLists.txt.orig 2012-12-22 21:30:12.000000000 +0200 -+++ man/CMakeLists.txt 2012-12-22 21:30:54.000000000 +0200 -@@ -30,9 +30,13 @@ +--- 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) Modified: head/databases/mariadb101-client/files/patch-mysys_my_default.c ============================================================================== --- head/databases/mariadb100-client/files/patch-mysys_my_default.c Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-mysys_my_default.c Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- mysys/my_default.c.orig 2014-08-09 00:13:39.000000000 +0200 -+++ mysys/my_default.c 2014-09-05 19:56:48.006019959 +0200 -@@ -90,7 +90,7 @@ +--- mysys/my_default.c.orig 2015-12-23 15:33:31 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) */ @@ -9,7 +9,7 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -785,7 +785,7 @@ +@@ -784,7 +784,7 @@ static int search_default_file_with_ext( { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -18,7 +18,7 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ +@@ -802,6 +802,14 @@ 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 */ @@ -33,7 +33,7 @@ while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) { line++; -@@ -1067,7 +1075,8 @@ +@@ -1066,7 +1074,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); @@ -43,7 +43,7 @@ } } } -@@ -1223,13 +1232,10 @@ +@@ -1222,13 +1231,10 @@ static const char **init_default_directo #else Modified: head/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-pcre_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-pcre_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- pcre/CMakeLists.txt.orig 2014-08-09 00:13:36.000000000 +0200 -+++ pcre/CMakeLists.txt 2014-09-05 20:08:49.090972949 +0200 -@@ -513,6 +513,8 @@ +--- 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) Modified: head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-scripts_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 -+++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200 -@@ -72,6 +72,7 @@ +--- scripts/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC ++++ scripts/CMakeLists.txt +@@ -73,6 +73,7 @@ IF(UNIX) ) ENDIF() @@ -8,7 +8,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -81,6 +82,7 @@ +@@ -84,6 +85,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) @@ -16,7 +16,7 @@ # TCMalloc hacks IF(MALLOC_LIB) -@@ -140,6 +142,7 @@ +@@ -136,6 +138,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") @@ -24,7 +24,7 @@ # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) -@@ -180,6 +183,7 @@ +@@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) @@ -32,7 +32,7 @@ ENDIF(UNIX) -@@ -204,6 +208,7 @@ +@@ -195,6 +199,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() @@ -40,7 +40,7 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -219,6 +224,7 @@ +@@ -208,6 +213,7 @@ INSTALL_SCRIPT( COMPONENT Server ) ENDIF() @@ -48,16 +48,7 @@ SET(prefix "${CMAKE_INSTALL_PREFIX}") IF(INSTALL_SYSCONFDIR) -@@ -281,6 +287,8 @@ - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -339,18 +347,8 @@ +@@ -286,18 +292,8 @@ ELSE() SET(BIN_SCRIPTS msql2mysql mysql_config @@ -73,6 +64,6 @@ - mysqldumpslow - mysqld_multi - mysqld_safe + ${WSREP_BINARIES} + ${SYSTEMD_SCRIPTS} ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) Modified: head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh ============================================================================== --- head/databases/mariadb100-client/files/patch-scripts_mysql_config.sh Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-scripts_mysql_config.sh Sat Feb 13 19:02:11 2016 (r408822) @@ -1,14 +1,12 @@ ---- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 -+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 -@@ -108,8 +108,11 @@ - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " +--- 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 " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " + embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC + include="-I$pkgincludedir" + if [ "$basedir" != "/usr" ]; then Modified: head/databases/mariadb101-client/files/patch-sql_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-sql_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-sql_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,6 @@ ---- sql/CMakeLists.txt.orig 2014-09-05 22:49:59.808332000 +0200 -+++ sql/CMakeLists.txt 2014-09-05 22:50:18.768326206 +0200 -@@ -226,9 +226,9 @@ +--- sql/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC ++++ sql/CMakeLists.txt +@@ -275,9 +275,9 @@ RUN_BISON( ) # Gen_lex_hash Modified: head/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-client/files/patch-support-files_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/files/patch-support-files_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,11 +1,11 @@ ---- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300 -+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300 -@@ -41,15 +41,18 @@ +--- support-files/CMakeLists.txt.orig 2015-12-23 15:33:33 UTC ++++ support-files/CMakeLists.txt +@@ -41,15 +41,18 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() +IF(FALSE) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) + 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) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @@ -16,33 +16,30 @@ IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) + IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) + 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 ) -@@ -67,8 +70,10 @@ +@@ -60,12 +63,14 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles) + INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() + ENDIF() - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ IF(FALSE) - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - -@@ -92,6 +97,7 @@ - DESTINATION ${inst_location} COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ + 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) - IF (INSTALL_SYSCONFDIR) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d -@@ -101,6 +107,7 @@ - RENAME mysql COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ ENDIF() + INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +- ++ ++IF(FALSE) + SET(bindir ${INSTALL_BINDIRABS}) + SET(sbindir ${INSTALL_SBINDIRABS}) + SET(scriptdir ${INSTALL_SCRIPTDIRABS}) +@@ -115,6 +120,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) Modified: head/databases/mariadb101-client/pkg-plist ============================================================================== --- head/databases/mariadb100-client/pkg-plist Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-client/pkg-plist Sat Feb 13 19:02:11 2016 (r408822) @@ -1,8 +1,6 @@ bin/msql2mysql bin/mysql -bin/mysql_config bin/mysql_find_rows -bin/mysql_waitpid bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog @@ -11,6 +9,7 @@ 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 @@ -54,7 +53,9 @@ 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 @@ -64,17 +65,21 @@ include/mysql/psi/mysql_table.h include/mysql/psi/mysql_thread.h include/mysql/psi/psi.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_my_plugin_log.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_thd_alloc.h include/mysql/service_thd_autoinc.h include/mysql/service_thd_error_context.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 Modified: head/databases/mariadb101-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/Makefile Sat Feb 13 19:02:11 2016 (r408822) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.23 +PORTVERSION= 10.1.11 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -11,7 +11,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ -PKGNAMESUFFIX?= 100-server +PKGNAMESUFFIX?= 101-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -21,21 +21,39 @@ LICENSE= GPLv2 SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -SLAVEDIRS= databases/mariadb100-client -USES= bison:build cmake cpe execinfo gmake shebangfix -USE_LDCONFIG= ${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin +SLAVEDIRS= databases/mariadb101-client +USES= bison:build cmake cpe execinfo shebangfix +USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX -OPTIONS_RADIO= SSL -OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL -OPTIONS_DEFAULT+= OPENSSL -NO_OPTIONS_SORT= yes +OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_DEFAULT= GSSAPI_BASE -BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL FASTMTX_DESC= Replace mutexes with spinlocks -WITHOUT_SSL_DESC= No SSL/TLS support + +.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 + +ENGINES_DESC= Optional MariaDB storage engines +INNOBASE_DESC= Build InnoDB engine next to XtraDB +MAXKEY_DESC= Change max key length from 1000 to 4000 +MROONGA_DESC= Mroonga Full Text Search engine +OQGRAPH_DESC= Open Query Graph Computation engine (Requires GCC) +SPHINX_DESC= SphinxSE engine +SPIDER_DESC= Partitioning and XA-transactions engine +TOKUDB_DESC= Fractal tree index tree data structure engine +.endif + +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_USES= gssapi:heimdal +GSSAPI_MIT_USES= gssapi:mit CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ @@ -53,8 +71,9 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ - -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ + -DWITH_SSL=${OPENSSLBASE} \ + -DKRB5_CONFIG=${KRB5CONFIG} \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" @@ -65,29 +84,12 @@ DATADIR= ${PREFIX}/share/mysql .endif CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mariadb10[1-9]-${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]*-//}-* \ - -.if !defined(CLIENT_ONLY) -# MySQL-Server options -USE_MYSQL= yes -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -OPTIONS_DEFINE+= INNODB MAXKEY MROONGA OQGRAPH -OPTIONS_DEFAULT+= MAXKEY -OPTIONS_SUB= yes - -INNODB_DESC= Build InnoDB engine next to XtraDB -MAXKEY_DESC= Change max key length from 1000 to 4000 -MROONGA_DESC= Mroonga Full Text Search engine (gcc) -OQGRAPH_DESC= Open Query Graph Computation engine (gcc) -.endif + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled +USE_OPENSSL= yes FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 -OPENSSL_CMAKE_ON= -DWITH_SSL=yes -OPENSSL_USE= OPENSSL=yes -WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no .if defined(CLIENT_ONLY) # MySQL-Client part @@ -95,7 +97,9 @@ USES+= readline .else # MySQL-Server part USE_MYSQL= yes -WANT_MYSQL_VER= 100m +WANT_MYSQL_VER= 101m +OPTIONS_SUB= yes +USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql @@ -103,39 +107,50 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1 +.for ENGINE in ${OPTIONS_GROUP_ENGINES} +${ENGINE}_CMAKE_OFF= -DWITHOUT_${ENGINE}=1 +.endfor + MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h -MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 -OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1 OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libJudy.so:${PORTSDIR}/devel/judy # Currently OQGraph does not build using clang. # See See https://mariadb.atlassian.net/browse/MDEV-8051. -OQGRPAH_USE= gcc +OQGRAPH_USE= gcc=yes +TOKUDB_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy post-install: - # Remove programs to avoid conflict with mariadb100-client - # These are "client" components, so there should be a switch that - # prevents them from being installed but it's unknown right now +# Remove programs to avoid conflict with mariadb101-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 \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess + ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ + ${STAGEDIR}/${PREFIX}/share/pkgconfig +# See https://mariadb.atlassian.net/browse/MDEV-9529 + ${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql +.endif # defined(CLIENT_ONLY) + +.include <bsd.port.options.mk> + +.if defined(WITH_OPENSSL_PORT) && ${PORT_OPTIONS:MGSSAPI_BASE} +IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .include <bsd.port.pre.mk> +.if ${OPSYS} == DragonFly +CMAKE_ARGS+= -DWITHOUT_TOKUDB +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif -# Server segfaults on i386 when built with clang >= 3.4 -.if ${ARCH} == 'i386' && ${OSVERSION} >= 1001000 -USE_GCC= yes -.endif - post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @@ -143,7 +158,6 @@ post-patch: .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake - ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif .include <bsd.port.post.mk> Modified: head/databases/mariadb101-server/distinfo ============================================================================== --- head/databases/mariadb100-server/distinfo Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/distinfo Sat Feb 13 19:02:11 2016 (r408822) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.23.tar.gz) = 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 -SIZE (mariadb-10.0.23.tar.gz) = 57394548 +SHA256 (mariadb-10.1.11.tar.gz) = cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce +SIZE (mariadb-10.1.11.tar.gz) = 55184229 Modified: head/databases/mariadb101-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,16 +1,18 @@ ---- CMakeLists.txt.orig 2015-08-05 18:11:27 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- CMakeLists.txt.orig 2015-10-15 15:43:35 UTC +++ CMakeLists.txt -@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -452,6 +452,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT - COMPONENT Readme) - -@@ -490,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP - IF(UNIX) + INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER COPYING.thirdparty + EXCEPTIONS-CLIENT COMPONENT Readme) + # MDEV-6526 these files are not installed anymore +@@ -462,6 +463,7 @@ IF(UNIX) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() +ENDIF() Modified: head/databases/mariadb101-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-client_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-client_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,4 +1,6 @@ ---- client/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- client/CMakeLists.txt.orig 2015-10-15 15:43:35 UTC +++ client/CMakeLists.txt @@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( COPY_OPENSSL_DLLS(copy_openssl_client) @@ -24,9 +26,9 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli - +@@ -53,17 +56,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) + SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +ENDIF() @@ -46,7 +48,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl +@@ -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) Modified: head/databases/mariadb101-server/files/patch-cmake_jemalloc.cmake ============================================================================== --- head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-cmake_jemalloc.cmake Sat Feb 13 19:02:11 2016 (r408822) @@ -1,28 +1,24 @@ -Upstreamed https://github.com/MariaDB/server/pull/139 +Fix jemalloc detection on FreeBSD 10.x +Upstream https://github.com/MariaDB/server/pull/140 ---- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC +--- cmake/jemalloc.cmake.orig 2015-12-23 15:33:29 UTC +++ cmake/jemalloc.cmake -@@ -20,11 +20,21 @@ MACRO (CHECK_JEMALLOC) - SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) - SET(what bundled) - ELSE() -- SET(libname jemalloc) -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND -+ CMAKE_SYSTEM_VERSION STRGREATER "10.0") -+ SET(libname c) -+ ELSE() -+ SET(libname jemalloc) -+ ENDIF() - SET(what system) - ENDIF() +@@ -12,9 +12,16 @@ MACRO(JEMALLOC_TRY_STATIC) + ENDMACRO() -- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND + MACRO(JEMALLOC_TRY_DYNAMIC) +- SET(libname jemalloc) + SET(what system) +- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC) ++ IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND + CMAKE_SYSTEM_VERSION STRGREATER "10.0") -+ SET(HAVE_JEMALLOC ON) -+ ELSE() -+ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ ENDIF() - SET(CMAKE_REQUIRED_LIBRARIES) ++ # Since FreeBSD 10.0 jemalloc is in base libc ++ SET(libname c) ++ SET(HAVE_DYNAMIC_JEMALLOC ON) ++ ELSE() ++ SET(libname jemalloc) ++ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC) ++ ENDIF() + ENDMACRO() - IF (HAVE_JEMALLOC) + MACRO (CHECK_JEMALLOC) Modified: head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-extra_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-extra_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,8 @@ ---- extra/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- extra/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC +++ extra/CMakeLists.txt -@@ -78,9 +78,11 @@ IF(UNIX) +@@ -91,6 +91,8 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) @@ -9,6 +11,3 @@ TARGET_LINK_LIBRARIES(mysql_waitpid mysys) ENDIF() +ENDIF() - - - # Add path to the InnoDB headers Modified: head/databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp ============================================================================== --- head/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-extra_yassl_taocrypt_src_integer.cpp Sat Feb 13 19:02:11 2016 (r408822) @@ -1,11 +1 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2015-06-17 14:54:11 UTC -+++ extra/yassl/taocrypt/src/integer.cpp -@@ -74,7 +74,7 @@ template <class T> - CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( - size_type n, const void *) - { -- if (n > this->max_size()) -+ if (n > AlignedAllocator<T>::max_size()) - return 0; - if (n == 0) - return 0; +# Intentionally empty Modified: head/databases/mariadb101-server/files/patch-include_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-include_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-include_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,4 +1,6 @@ ---- include/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- include/CMakeLists.txt.orig 2015-10-15 15:43:36 UTC +++ include/CMakeLists.txt @@ -62,17 +62,21 @@ SET(HEADERS handler_ername.h Modified: head/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-libmysql_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,4 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- libmysql/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC +++ libmysql/CMakeLists.txt @@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy Modified: head/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-libservices_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,6 +1,8 @@ ---- libservices/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- libservices/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC +++ libservices/CMakeLists.txt -@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES +@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES logger_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) Modified: head/databases/mariadb101-server/files/patch-man_CMakeLists.txt ============================================================================== --- head/databases/mariadb100-server/files/patch-man_CMakeLists.txt Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-man_CMakeLists.txt Sat Feb 13 19:02:11 2016 (r408822) @@ -1,4 +1,6 @@ ---- man/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC +Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options + +--- man/CMakeLists.txt.orig 2015-10-15 15:43:37 UTC +++ man/CMakeLists.txt @@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys Modified: head/databases/mariadb101-server/files/patch-mysys_my__default.c ============================================================================== --- head/databases/mariadb100-server/files/patch-mysys_my__default.c Sat Feb 13 11:35:31 2016 (r408786) +++ head/databases/mariadb101-server/files/patch-mysys_my__default.c Sat Feb 13 19:02:11 2016 (r408822) @@ -1,4 +1,6 @@ ---- mysys/my_default.c.orig 2015-06-17 14:54:12 UTC +Obey hier(7) + +--- mysys/my_default.c.orig 2015-10-15 15:43:45 UTC +++ mysys/my_default.c @@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA @@ -9,7 +11,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602131902.u1DJ2BSF027376>