Index: head/databases/mariadb101-server/Makefile =================================================================== --- head/databases/mariadb101-server/Makefile (revision 425915) +++ head/databases/mariadb101-server/Makefile (revision 425916) @@ -1,184 +1,181 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.18 -PORTREVISION= 1 +PORTVERSION= 10.1.19 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?= 101-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BROKEN_aarch64= Fails to link: missing sbrk BROKEN_powerpc64= Does not build SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client USES= bison:build cmake compiler:c++11-lib cpe execinfo ssl shebangfix 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_EXCLUDE_i386= 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 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" \ -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_LIBWRAP=1 \ -DWITH_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ -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[02-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/wsrep* .else # MySQL-Server part USES+= mysql:101m USE_GNOME= libxml2 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 .endfor GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://mariadb.atlassian.net/browse/MDEV-9627 post-install: # 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 .endif # defined(CLIENT_ONLY) .include .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if ${OPSYS} == FreeBSD . if ${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 .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 .endif -.if exists(${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt) -post-configure: +post-configure-MROONGA-on: @${REINPLACE_CMD} "s|/usr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \ ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt -.endif .include Index: head/databases/mariadb101-server/distinfo =================================================================== --- head/databases/mariadb101-server/distinfo (revision 425915) +++ head/databases/mariadb101-server/distinfo (revision 425916) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475615460 -SHA256 (mariadb-10.1.18.tar.gz) = d7336907e9ff44496d6453f92526b25bd253638a64a051ca879f953499873b73 -SIZE (mariadb-10.1.18.tar.gz) = 61187451 +TIMESTAMP = 1478591187 +SHA256 (mariadb-10.1.19.tar.gz) = 5b9373f314e2d1727422fb3795bcf50c1c59005129b35b6cadafae5663251a81 +SIZE (mariadb-10.1.19.tar.gz) = 61222929 Index: head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h =================================================================== --- head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h (revision 425915) +++ head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h (nonexistent) @@ -1,67 +0,0 @@ -Patch to allow build with clang from Don Lewis -https://jira.mariadb.org/projects/MDEV/issues/MDEV-8051 - ---- storage/oqgraph/oqgraph_shim.h.orig 2016-01-28 12:12:55 UTC -+++ storage/oqgraph/oqgraph_shim.h -@@ -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: head/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h ___________________________________________________________________ Deleted: eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: vn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc =================================================================== --- head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc (revision 425915) +++ head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.cc (nonexistent) @@ -1,14 +0,0 @@ -Patch to allow build with clang from Don Lewis -https://jira.mariadb.org/projects/MDEV/issues/MDEV-8051 - ---- 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: head/databases/mariadb101-server/files/patch-storage_oqgraph_graphcore.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