diff options
| author | brnrd <brnrd@FreeBSD.org> | 2019-01-13 22:43:08 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2019-01-13 22:43:08 +0800 |
| commit | 7696aae93ffb1cae20667c0b7e17c2b869392680 (patch) | |
| tree | f8af5b336e1dbd7e8953046491063069d7ab4518 | |
| parent | 3788fe976361d3954a3bffbb771a0e1ca6b7f87f (diff) | |
| download | freebsd-ports-gnome-7696aae93ffb1cae20667c0b7e17c2b869392680.tar.gz freebsd-ports-gnome-7696aae93ffb1cae20667c0b7e17c2b869392680.tar.zst freebsd-ports-gnome-7696aae93ffb1cae20667c0b7e17c2b869392680.zip | |
databases/mariadb103-server: Update to 10.3.12
| -rw-r--r-- | databases/mariadb103-client/Makefile | 5 | ||||
| -rw-r--r-- | databases/mariadb103-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/mariadb103-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb103-server/pkg-plist | 3 |
4 files changed, 9 insertions, 13 deletions
diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile index f336d508877a..04c90b53d873 100644 --- a/databases/mariadb103-client/Makefile +++ b/databases/mariadb103-client/Makefile @@ -23,11 +23,6 @@ CLIENT_ONLY= yes CONFLICTS_INSTALL= databases/mytop -post-configure: - ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ - ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c - post-install: ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index c9bfbb0cfea0..aac9b6e564a4 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.11 -PORTREVISION?= 2 +PORTVERSION= 10.3.12 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -29,7 +29,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql -SHEBANG_FILES= scripts/*.sh storage/rocksdb/myrocks_hotbackup +SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql @@ -87,6 +87,7 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ -DWITH_JEMALLOC="system" \ -DWITH_LIBWRAP=1 \ + -DWITH_CONNECT_WITH_MONGO="OFF" \ -DWITH_SSL="${OPENSSLBASE}" \ -DWITH_UNIT_TESTS=0 \ -DWITHOUT_DOCS=1 \ @@ -192,6 +193,7 @@ CMAKE_ARGS+= -DWITHOUT_TOKUDB .endif post-patch: + ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo index 9894c9af6116..97b807343d59 100644 --- a/databases/mariadb103-server/distinfo +++ b/databases/mariadb103-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542715300 -SHA256 (mariadb-10.3.11.tar.gz) = 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 -SIZE (mariadb-10.3.11.tar.gz) = 70669435 +TIMESTAMP = 1547313088 +SHA256 (mariadb-10.3.12.tar.gz) = f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6 +SIZE (mariadb-10.3.12.tar.gz) = 70666408 diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist index fd5e3a0f6d4d..93c46db4839e 100644 --- a/databases/mariadb103-server/pkg-plist +++ b/databases/mariadb103-server/pkg-plist @@ -49,8 +49,6 @@ bin/resolveip %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan -%%WSREP%%bin/wsrep_sst_xtrabackup -%%WSREP%%bin/wsrep_sst_xtrabackup-v2 @comment data/test/db.opt @comment include/mysql/my_config.h @comment include/mysql/my_global.h @@ -164,6 +162,7 @@ lib/mysql/plugin/auth_ed25519.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so +lib/mysql/plugin/caching_sha2_password.so @comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so |