Index: head/databases/mariadb100-client/Makefile =================================================================== --- head/databases/mariadb100-client/Makefile (revision 405180) +++ head/databases/mariadb100-client/Makefile (revision 405181) @@ -1,30 +1,25 @@ # $FreeBSD$ PORTNAME= mariadb PKGNAMESUFFIX= 100-client COMMENT= Multithreaded SQL database (client) LICENSE+= LGPL21 MASTERDIR= ${.CURDIR}/../mariadb100-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mariadb5*-client-* \ - mariadb10[1-9]-client-* \ - mysql*-client-* \ - percona*-client-* - CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql CLIENT_ONLY= yes post-install: ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 .include "${MASTERDIR}/Makefile" Index: head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake =================================================================== --- head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake (revision 405180) +++ head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake (nonexistent) @@ -1,18 +0,0 @@ ---- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200 -+++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200 -@@ -24,12 +24,12 @@ - SET(what system) - ENDIF() - -- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) - SET(CMAKE_REQUIRED_LIBRARIES) - - IF (HAVE_JEMALLOC) -- SET(LIBJEMALLOC ${libname}) -- SET(MALLOC_LIBRARY "${what} jemalloc") -+ SET(LIBJEMALLOC c) -+ SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() Property changes on: head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake =================================================================== --- head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake (nonexistent) +++ head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake (revision 405181) @@ -0,0 +1,28 @@ +Upstreamed https://github.com/MariaDB/server/pull/139 + +--- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 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() + +- 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) Property changes on: head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb100-server/Makefile =================================================================== --- head/databases/mariadb100-server/Makefile (revision 405180) +++ head/databases/mariadb100-server/Makefile (revision 405181) @@ -1,152 +1,149 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.22 +PORTVERSION= 10.0.23 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ 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?= 100-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) 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 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 BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL FASTMTX_DESC= Replace mutexes with spinlocks WITHOUT_SSL_DESC= No SSL/TLS support CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" DATADIR= ${PREFIX}/share/mysql .ifdef USE_MYSQL .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif +CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mariadb10[1-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 BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled 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 USES+= readline .else # MySQL-Server part - -CONFLICTS_INSTALL= mariadb5*-server-* \ - mariadb10[1-9]-server-* \ - mysql*-server-* \ - percona*-server-* - USE_MYSQL= yes WANT_MYSQL_VER= 100m USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 INNODB_CMAKE_OFF= -DWITHOUT_INNOBASE=1 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 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 ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess .endif .include .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 - -.if ${PORT_OPTIONS:MOQGRPAH} -IGNORE= currently MariaDB doesn't build correctly with OQGraph \ - See https://mariadb.atlassian.net/browse/MDEV-8128. .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 .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif .include Index: head/databases/mariadb100-server/distinfo =================================================================== --- head/databases/mariadb100-server/distinfo (revision 405180) +++ head/databases/mariadb100-server/distinfo (revision 405181) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.22.tar.gz) = 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b -SIZE (mariadb-10.0.22.tar.gz) = 56252325 +SHA256 (mariadb-10.0.23.tar.gz) = 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 +SIZE (mariadb-10.0.23.tar.gz) = 57394548 Index: head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake =================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake (revision 405180) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake (nonexistent) @@ -1,17 +0,0 @@ ---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake -@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) - endif () - check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) - if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) -- set(CMAKE_REQUIRED_LIBRARIES execinfo) -- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) -- if (HAVE_BACKTRACE_WITH_EXECINFO) -- list(APPEND EXTRA_SYSTEM_LIBS execinfo) -- else () -- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") -- endif () -+ list(APPEND EXTRA_SYSTEM_LIBS execinfo) - endif () - - if(HAVE_CLOCK_REALTIME) Property changes on: head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc =================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc (revision 405180) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc (nonexistent) @@ -1,14 +0,0 @@ ---- storage/tokudb/ft-index/portability/memory.cc.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/ft-index/portability/memory.cc -@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: - #include - #include - #include --#if defined(HAVE_MALLOC_H) --# include --#elif defined(HAVE_SYS_MALLOC_H) --# include --#endif - #include - #include - #include "memory.h" Property changes on: head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake =================================================================== --- head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake (revision 405180) +++ head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake (revision 405181) @@ -1,18 +1,28 @@ ---- cmake/jemalloc.cmake.orig 2015-06-17 14:54:11 UTC +Upstreamed https://github.com/MariaDB/server/pull/139 + +--- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC +++ cmake/jemalloc.cmake -@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC) +@@ -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() - CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c 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) -- SET(LIBJEMALLOC ${libname}) -- SET(MALLOC_LIBRARY "${what} jemalloc") -+ SET(LIBJEMALLOC c) -+ SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() Index: head/databases/mariadb100-server/files/patch-storage_connect_json.cpp =================================================================== --- head/databases/mariadb100-server/files/patch-storage_connect_json.cpp (nonexistent) +++ head/databases/mariadb100-server/files/patch-storage_connect_json.cpp (revision 405181) @@ -0,0 +1,13 @@ +# Add patch for https://mariadb.atlassian.net/browse/MDEV-9322 + +--- storage/connect/json.cpp.orig 2015-12-16 16:05:45 UTC ++++ storage/connect/json.cpp +@@ -594,7 +594,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char + if (fs) { + fputs(EL, fs); + fclose(fs); +- str = (err) ? NULL : "Ok"; ++ str = (err) ? NULL : (char*)"Ok"; + } else if (!err) { + str = ((JOUTSTR*)jp)->Strp; + jp->WriteChr('\0'); Property changes on: head/databases/mariadb100-server/files/patch-storage_connect_json.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake =================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake (nonexistent) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake (revision 405181) @@ -0,0 +1,17 @@ +--- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake +@@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) + endif () + check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) + if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO) +- set(CMAKE_REQUIRED_LIBRARIES execinfo) +- check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO) +- if (HAVE_BACKTRACE_WITH_EXECINFO) +- list(APPEND EXTRA_SYSTEM_LIBS execinfo) +- else () +- message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.") +- endif () ++ list(APPEND EXTRA_SYSTEM_LIBS execinfo) + endif () + + if(HAVE_CLOCK_REALTIME) Property changes on: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc =================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (nonexistent) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (revision 405181) @@ -0,0 +1,14 @@ +--- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-06-17 14:54:13 UTC ++++ storage/tokudb/PerconaFT/portability/memory.cc +@@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: + #include + #include + #include +-#if defined(HAVE_MALLOC_H) +-# include +-#elif defined(HAVE_SYS_MALLOC_H) +-# include +-#endif + #include + #include + #include "memory.h" Property changes on: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property