diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-07-23 20:27:20 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-07-23 20:27:20 +0000 |
| commit | bddd38d81d0f8647ebeeef76d854f88e361e0d19 (patch) | |
| tree | 633e5407085962ed570c031389baf00386075b84 /databases/mariadb101-server | |
| parent | f2a21d42f2c13258106ab3d06038ed354e03ad48 (diff) | |
databases/mariadb101-server: Update to 10.1.16
- Update to latest version 10.1.16
- Switch from USE_OPENSSL to USES= ssl
- Switch from USE_MYSQL to USES= mysql
- Switch from WANT_MYSQL_VER to USES= mysql:101m
- Fix liblz4 linking for mroonga
- Register MROONGA lz4 depends
- Register libxml2 depends
Notes
Notes:
svn path=/head/; revision=418977
Diffstat (limited to 'databases/mariadb101-server')
| -rw-r--r-- | databases/mariadb101-server/Makefile | 16 | ||||
| -rw-r--r-- | databases/mariadb101-server/distinfo | 5 | ||||
| -rw-r--r-- | databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h | 9 |
3 files changed, 14 insertions, 16 deletions
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile index 39de1ebf62a8..a2864c24c52e 100644 --- a/databases/mariadb101-server/Makefile +++ b/databases/mariadb101-server/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.14 +PORTVERSION= 10.1.16 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -27,7 +27,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb101-client -USES= bison:build cmake compiler:c++11-lib cpe execinfo shebangfix +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 @@ -95,7 +95,6 @@ CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* -USE_OPENSSL= yes FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 OPTIONS_SUB= yes @@ -105,8 +104,8 @@ USES+= readline GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO .else # MySQL-Server part -USE_MYSQL= yes -WANT_MYSQL_VER= 101m +USES+= mysql:101m +USE_GNOME= libxml2 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql @@ -123,6 +122,7 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO \ 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 @@ -172,4 +172,10 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif +.if exists(${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt) +post-configure: + @${REINPLACE_CMD} "s|/XXXusr/bin/c++ |/usr/bin/c++ -L${LOCALBASE}/lib |" \ + ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt +.endif + .include <bsd.port.post.mk> diff --git a/databases/mariadb101-server/distinfo b/databases/mariadb101-server/distinfo index bf795b2cb47f..a4b5db9918de 100644 --- a/databases/mariadb101-server/distinfo +++ b/databases/mariadb101-server/distinfo @@ -1,2 +1,3 @@ -SHA256 (mariadb-10.1.14.tar.gz) = 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 -SIZE (mariadb-10.1.14.tar.gz) = 55341017 +TIMESTAMP = 1468917474 +SHA256 (mariadb-10.1.16.tar.gz) = 67cb35c62cc5d4cf48d7b614c0c7a9245a762ca23d4e588e15c616c102e64393 +SIZE (mariadb-10.1.16.tar.gz) = 55527069 diff --git a/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h b/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h index 6ee9e0672bb0..9966cc97a62c 100644 --- a/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h +++ b/databases/mariadb101-server/files/patch-storage_oqgraph_oqgraph__shim.h @@ -3,15 +3,6 @@ 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 -@@ -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<oqgraph3::graph> - { @@ -274,6 +274,33 @@ namespace boost }; #endif |