Index: head/databases/mariadb101-server/Makefile =================================================================== --- head/databases/mariadb101-server/Makefile (revision 518807) +++ head/databases/mariadb101-server/Makefile (revision 518808) @@ -1,209 +1,209 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.41 -PORTREVISION= 1 +PORTVERSION= 10.1.43 +PORTREVISION= 0 CATEGORIES= databases 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 SUB_FILES= pkg-message -SLAVEDIRS= databases/mariadb101-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe libedit 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 ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY DOCS OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH SPHINX SPIDER TOKUDB 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 GROONGA_DESC= Optional Mroonga features 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 MSGPACK_DESC= MsgPack support 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 ZMQ_DESC= ZeroMQ support .endif 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_SSL=${OPENSSLBASE} \ -DKRB5_CONFIG=${KRB5CONFIG} \ -DCOMPILATION_COMMENT="FreeBSD Ports" CMAKE_ON+= WITH_LIBWRAP CMAKE_OFF+= WITH_UNIT_TESTS 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]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit OPTIONS_SUB= yes .if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql CMAKE_ON+= WITHOUT_SERVER GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part USES+= gnome mysql:101m USE_GNOME= libxml2 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO CMAKE_ON+= WITH_EMBEDDED_SERVER CMAKE_SKIP_BUILD_RPATH WITHOUT_EXAMPLE_STORAGE_ENGINE .for ENGINE in ${OPTIONS_GROUP_ENGINES} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO LZ4_CMAKE_BOOL= GRN_WITH_LZ4 WITH_INNODB_LZ4 LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_BOOL= WITH_INNODB_LZO LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 MROONGA_VARS= LICENSE+=LGPL20 LICENSE_COMB=multi MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy SNAPPY_CMAKE_BOOL= WITH_INNODB_SNAPPY 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 .endif # ${PKGNAMESUFFIX:M*-client} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .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 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .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 + @${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif .if ${PKGNAMESUFFIX:M*-client} post-install: ${RM} ${STAGEDIR}${PREFIX}/bin/wsrep* ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private .else 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 \ ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so \ ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ ${STAGEDIR}${PREFIX}/share/groonga/COPYING \ ${STAGEDIR}${DATADIR}/mroonga/COPYING ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/share/pkgconfig \ ${STAGEDIR}${PREFIX}/mysql/mysql-test \ ${STAGEDIR}${PREFIX}/mysql/sql-bench post-install-MROONGA-on: ${MV} ${STAGEDIR}${PREFIX}/share/groonga-normalizer-mysql \ ${STAGEDIR}${PREFIX}/share/groonga \ ${STAGEDIR}${PREFIX}/share/mysql .endif # ${PKGNAMESUFFIX:M*-client} .include Index: head/databases/mariadb101-server/distinfo =================================================================== --- head/databases/mariadb101-server/distinfo (revision 518807) +++ head/databases/mariadb101-server/distinfo (revision 518808) @@ -1,3 +1,3 @@ -TIMESTAMP = 1564600761 -SHA256 (mariadb-10.1.41.tar.gz) = 2b47c3afdae81eab2b9c29ba6a10328acb8d07166e8112744f6d704cc70100f2 -SIZE (mariadb-10.1.41.tar.gz) = 63615288 +TIMESTAMP = 1575218029 +SHA256 (mariadb-10.1.43.tar.gz) = c3d4c579cfa112be53ea538dba8643466b36e8d010cde35709e55c82cfc0bedf +SIZE (mariadb-10.1.43.tar.gz) = 63635313 Index: head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h =================================================================== --- head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h (revision 518807) +++ head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h (nonexistent) @@ -1,11 +0,0 @@ ---- storage/xtradb/include/ut0ut.h.orig 2019-10-08 20:51:54 UTC -+++ storage/xtradb/include/ut0ut.h -@@ -83,7 +83,7 @@ struct ut_when_dtor { (private) - the YieldProcessor macro defined in WinNT.h. It is a CPU architecture- - independent way by using YieldProcessor. */ - # define UT_RELAX_CPU() YieldProcessor() --# elif defined(__powerpc__) -+# elif defined(__powerpc__) && defined __GLIBC__ - #include - # define UT_RELAX_CPU() __ppc_get_timebase() - # else Property changes on: head/databases/mariadb101-server/files/patch-storage_xtradb_include_ut0ut.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt =================================================================== --- head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt (nonexistent) +++ head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt (revision 518808) @@ -0,0 +1,11 @@ +--- storage/mroonga/CMakeLists.txt.orig 2019-11-06 16:01:58 UTC ++++ storage/mroonga/CMakeLists.txt +@@ -80,7 +80,7 @@ else() + set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR}) + endif() + +-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION) ++file(READ ${MRN_SOURCE_DIR}/version_txt MRN_VERSION) + file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR) + file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR) + file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO) Property changes on: head/databases/mariadb101-server/files/patch-storage_mroonga_CMakeLists.txt ___________________________________________________________________ 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/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake =================================================================== --- head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 518807) +++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (revision 518808) @@ -1,39 +1,36 @@ -Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports - ---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2016-01-28 12:12:55 UTC +--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2019-11-06 06:20:37 UTC +++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake -@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB) - endif () - endif () +@@ -1,5 +1,12 @@ + include(ExternalProject) +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("/usr/include") + + add_library(lzma SHARED IMPORTED) + set_target_properties(lzma PROPERTIES IMPORTED_LOCATION + "/usr/lib/liblzma.so") +ELSE() ## add lzma with an external project set(xz_configure_opts --with-pic --enable-static) if (APPLE) -@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED) +@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED) set_target_properties(lzma PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a") add_dependencies(lzma build_lzma) +ENDIF() +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + include_directories("/usr/local/include") + add_library(snappy SHARED IMPORTED) + set_target_properties(snappy PROPERTIES IMPORTED_LOCATION + "/usr/local/lib/libsnappy.so") +ELSE() ## add snappy with an external project set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.") if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt") -@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED) +@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED) set_target_properties(snappy PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a") add_dependencies(snappy build_snappy) +ENDIF()