Index: databases/mariadb101-server/Makefile =================================================================== --- databases/mariadb101-server/Makefile (revision 409886) +++ databases/mariadb101-server/Makefile (working copy) @@ -28,7 +28,7 @@ SITESDIR= mariadb/mariadb-${PORTVERSION}/source OPTIONS_DEFINE= FASTMTX -OPTIONS_SINGLE= GSSAPI +OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT OPTIONS_DEFAULT= GSSAPI_BASE @@ -45,7 +45,7 @@ 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) +OQGRAPH_DESC= Open Query Graph Computation engine SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine @@ -114,9 +114,6 @@ MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h 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. -OQGRAPH_USE= gcc=yes TOKUDB_LIB_DEPENDS= libsnappy.so:${PORTSDIR}/archivers/snappy post-install: Index: databases/mariadb101-server/files/patch-cmake_ssl.cmake =================================================================== --- databases/mariadb101-server/files/patch-cmake_ssl.cmake (revision 409886) +++ databases/mariadb101-server/files/patch-cmake_ssl.cmake (working copy) @@ -1,7 +1,4 @@ -MariaDB prefers static libraries, breaks builds with -ports' OpenSSL libs - ---- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC +--- cmake/ssl.cmake.orig 2016-01-28 12:12:42 UTC +++ cmake/ssl.cmake @@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL) @@ -16,3 +13,16 @@ FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD HINTS ${OPENSSL_ROOT_DIR}/lib) +@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL) + HINTS ${OPENSSL_ROOT_DIR}/lib) + MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR + OPENSSL_INCLUDE_DIR) +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() ++# IF (WITH_SSL_PATH) ++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) ++# ENDIF() + + INCLUDE(CheckSymbolExists) + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) Index: databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc =================================================================== --- databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc (nonexistent) +++ databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc (working copy) @@ -0,0 +1,11 @@ +--- storage/oqgraph/graphcore.cc.orig 2016-01-28 12:12:55 UTC ++++ storage/oqgraph/graphcore.cc +@@ -485,7 +485,7 @@ namespace open_query + optional + oqgraph_share::find_vertex(VertexID id) const + { +- return ::boost::find_vertex(id, g); ++ return oqgraph3::find_vertex(id, g); + } + + #if 0 Property changes on: databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.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:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h =================================================================== --- databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h (nonexistent) +++ databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h (working copy) @@ -0,0 +1,73 @@ +--- storage/oqgraph/oqgraph_shim.h.orig 2016-01-28 12:12:55 UTC ++++ storage/oqgraph/oqgraph_shim.h +@@ -254,7 +254,7 @@ namespace boost + typedef no_property type; + }; + +-#if BOOST_VERSION >= 104601 ++#if BOOST_VERSION >= 104601 && BOOST_VERSION < 104900 + template <> + struct graph_bundle_type + { +@@ -274,6 +274,33 @@ namespace boost + }; + #endif + ++ template<> ++ struct property_map ++ { ++ typedef void type; ++ typedef oqgraph3::edge_weight_property_map const_type; ++ }; ++ ++ template<> ++ struct property_map ++ { ++ typedef void type; ++ typedef oqgraph3::vertex_index_property_map const_type; ++ }; ++ ++ template<> ++ struct property_map ++ { ++ typedef void type; ++ typedef oqgraph3::edge_index_property_map const_type; ++ }; ++ ++} ++ ++namespace oqgraph3 ++{ ++ using namespace boost; ++ + inline graph_traits::vertex_descriptor + source( + const graph_traits::edge_descriptor& e, +@@ -401,27 +428,6 @@ namespace boost + return count; + } + +- template<> +- struct property_map +- { +- typedef void type; +- typedef oqgraph3::edge_weight_property_map const_type; +- }; +- +- template<> +- struct property_map +- { +- typedef void type; +- typedef oqgraph3::vertex_index_property_map const_type; +- }; +- +- template<> +- struct property_map +- { +- typedef void type; +- typedef oqgraph3::edge_index_property_map const_type; +- }; +- + inline property_map< + oqgraph3::graph, + edge_weight_t>::const_type::reference Property changes on: databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h ___________________________________________________________________ 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:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property