Date: Thu, 3 Aug 2017 14:57:37 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r447220 - in branches/2017Q3/databases/mariadb101-server: . files Message-ID: <201708031457.v73Evbw1076999@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Thu Aug 3 14:57:37 2017 New Revision: 447220 URL: https://svnweb.freebsd.org/changeset/ports/447220 Log: MFH: r444882 r446504 databases/mariadb101-server: Update to 10.1.24 - Regression fix update to 10.1.24 - Backport option groups for groonga and compression - Use OS' libs, not bundled versions (lz4, lzo, snappy) - Add xml and odbc options for connect engine - Remove InnoDB/XtraDB fix (included upstream) - Fix bison issue [220367] PR: 220367 Reported by: iron@mail.ua databases/mariadb101-server: Fix re-definition of OPTIONS_DEFINE - Fix double definition of OPTIONS_DEFINE PR: 220527 Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> Approved by: port-secteam (with hat) Deleted: branches/2017Q3/databases/mariadb101-server/files/patch-MDEV-12281 Modified: branches/2017Q3/databases/mariadb101-server/Makefile branches/2017Q3/databases/mariadb101-server/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/databases/mariadb101-server/Makefile ============================================================================== --- branches/2017Q3/databases/mariadb101-server/Makefile Thu Aug 3 14:55:31 2017 (r447219) +++ branches/2017Q3/databases/mariadb101-server/Makefile Thu Aug 3 14:57:37 2017 (r447220) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.23 -PORTREVISION?= 2 +PORTVERSION= 10.1.24 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -44,20 +44,27 @@ FASTMTX_DESC= Replace mutexes with spinlocks .if !defined(CLIENT_ONLY) # MySQL-Server options -OPTIONS_DEFINE+= MAXKEY +OPTIONS_DEFINE+= CONNECT_EXTRA MAXKEY OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER -OPTIONS_GROUP= ENGINES +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 GSSAPI_BASE_USES= gssapi @@ -123,14 +130,28 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ -DWITHOUT_${ENGINE}=1 .endfor +CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC +CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO +LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF +LZ4_CMAKE_ON= -DGRN_WITH_LZ4=${LOCALBASE}/lib -DWITH_INNODB_LZ4=${LOCALBASE}/lib +LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 +LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF +LZO_CMAKE_ON= -DWITH_INNODB_LZO=${LOCALBASE}/lib +LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MAXKEY_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my__compare.h MROONGA_LIB_DEPENDS= liblz4.so:archivers/liblz4 +MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy -TOKUDB_LIB_DEPENDS= libsnappy.so:archivers/snappy +SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF +SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=${LOCALBASE}/lib +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 + NOT_FOR_ARCHS= i386 NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ https://mariadb.atlassian.net/browse/MDEV-9627 @@ -145,7 +166,9 @@ post-install: ${STAGEDIR}${PREFIX}/bin/mysqlaccess \ ${STAGEDIR}${PREFIX}/lib/mysql/plugin/client_ed25519.so ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ - ${STAGEDIR}${PREFIX}/share/pkgconfig + ${STAGEDIR}${PREFIX}/share/pkgconfig \ + ${STAGEDIR}${PREFIX}/mysql/mysql-test \ + ${STAGEDIR}${PREFIX}/mysql/sql-bench .endif # defined(CLIENT_ONLY) .include <bsd.port.pre.mk> @@ -166,9 +189,5 @@ post-patch: ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif - -post-configure-MROONGA-on: - @${REINPLACE_CMD} "s|/usr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \ - ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt .include <bsd.port.post.mk> Modified: branches/2017Q3/databases/mariadb101-server/distinfo ============================================================================== --- branches/2017Q3/databases/mariadb101-server/distinfo Thu Aug 3 14:55:31 2017 (r447219) +++ branches/2017Q3/databases/mariadb101-server/distinfo Thu Aug 3 14:57:37 2017 (r447220) @@ -1,3 +1,3 @@ -TIMESTAMP = 1493839895 -SHA256 (mariadb-10.1.23.tar.gz) = 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf -SIZE (mariadb-10.1.23.tar.gz) = 61772244 +TIMESTAMP = 1496303663 +SHA256 (mariadb-10.1.24.tar.gz) = b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e +SIZE (mariadb-10.1.24.tar.gz) = 61780687
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708031457.v73Evbw1076999>