diff options
author | brnrd <brnrd@FreeBSD.org> | 2017-07-02 21:32:15 +0800 |
---|---|---|
committer | brnrd <brnrd@FreeBSD.org> | 2017-07-02 21:32:15 +0800 |
commit | ff766113d387d386b76a10734b5e0a0a8c0448c5 (patch) | |
tree | c7ed03370bb6f1dd0125f2da3f80d77a60fb79de /databases/mariadb101-server | |
parent | ad01171234b40a450068173cd7840aeb4df4645d (diff) | |
download | freebsd-ports-gnome-ff766113d387d386b76a10734b5e0a0a8c0448c5.tar.gz freebsd-ports-gnome-ff766113d387d386b76a10734b5e0a0a8c0448c5.tar.zst freebsd-ports-gnome-ff766113d387d386b76a10734b5e0a0a8c0448c5.zip |
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
Diffstat (limited to 'databases/mariadb101-server')
-rw-r--r-- | databases/mariadb101-server/Makefile | 38 | ||||
-rw-r--r-- | databases/mariadb101-server/distinfo | 6 | ||||
-rw-r--r-- | databases/mariadb101-server/files/patch-MDEV-12281 | 30 |
3 files changed, 32 insertions, 42 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 1ee139a76021..f5b6b522d783 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -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}/ \ @@ -46,18 +46,26 @@ FASTMTX_DESC= Replace mutexes with spinlocks # MySQL-Server options OPTIONS_DEFINE+= MAXKEY OPTIONS_DEFAULT+= MAXKEY SPHINX SPIDER -OPTIONS_GROUP= ENGINES +OPTIONS_GROUP= COMPRESSION ENGINES GROONGA +OPTIONS_DEFINE= CONNECT_EXTRA +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 +131,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 +167,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> @@ -167,8 +191,4 @@ post-patch: ${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> diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo index 1792151eec79..aaae0fe5f205 100644 --- a/databases/mariadb101-server/distinfo +++ b/databases/mariadb101-server/distinfo @@ -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 diff --git a/databases/mariadb101-server/files/patch-MDEV-12281 b/databases/mariadb101-server/files/patch-MDEV-12281 deleted file mode 100644 index 4f3223cbb8f3..000000000000 --- a/databases/mariadb101-server/files/patch-MDEV-12281 +++ /dev/null @@ -1,30 +0,0 @@ ---- storage/innobase/dict/dict0stats.cc.orig 2017-05-02 07:13:44.000000000 +0200 -+++ storage/innobase/dict/dict0stats.cc 2017-05-03 17:26:34.159233678 +0200 -@@ -1168,10 +1168,10 @@ - leaf-level delete marks because delete marks on - non-leaf level do not make sense. */ - -- if (level == 0 && srv_stats_include_delete_marked? 0: -+ if (level == 0 && (srv_stats_include_delete_marked ? 0: - rec_get_deleted_flag( - rec, -- page_is_comp(btr_pcur_get_page(&pcur)))) { -+ page_is_comp(btr_pcur_get_page(&pcur))))) { - - if (rec_is_last_on_page - && !prev_rec_is_copied ---- storage/xtradb/dict/dict0stats.cc.orig 2017-05-02 07:13:52.000000000 +0200 -+++ storage/xtradb/dict/dict0stats.cc 2017-05-08 18:37:24.659231976 +0200 -@@ -1168,10 +1168,10 @@ - leaf-level delete marks because delete marks on - non-leaf level do not make sense. */ - -- if (level == 0 && srv_stats_include_delete_marked? 0: -+ if (level == 0 && (srv_stats_include_delete_marked ? 0: - rec_get_deleted_flag( - rec, -- page_is_comp(btr_pcur_get_page(&pcur)))) { -+ page_is_comp(btr_pcur_get_page(&pcur))))) { - - if (rec_is_last_on_page - && !prev_rec_is_copied |