1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

databases/mariadb102-server: Update to 10.2.7

- Regular update to 10.2.7
This commit is contained in:
Bernard Spil 2017-07-23 18:08:00 +00:00
parent 0c32d28225
commit b94f0b244f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=446502
6 changed files with 16 additions and 34 deletions

View File

@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= mariadb
PORTREVISION= 2
PKGNAMESUFFIX= 102-client
COMMENT= Multithreaded SQL database (client)

View File

@ -1,21 +0,0 @@
From 422d0f786e5e6eb103000a75738322c8baa9aa12 Mon Sep 17 00:00:00 2001
From: Georg Richter <georg@mariadb.com>
Date: Wed, 7 Jun 2017 10:35:35 +0200
Subject: [PATCH] Added MYSQL_VERSION_ID (beside MARIADB_VERSION_ID)
---
include/mariadb_version.h.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in
index c401d04..a82102f 100644
--- libmariadb/include/mariadb_version.h.in.orig 2017-05-14 23:13:15 UTC
+++ libmariadb/include/mariadb_version.h.in
@@ -12,6 +12,7 @@
#define PROTOCOL_VERSION @PROTOCOL_VERSION@
#define MARIADB_CLIENT_VERSION_STR "@MARIADB_CLIENT_VERSION@"
#define MARIADB_VERSION_ID @MARIADB_VERSION_ID@
+#define MYSQL_VERSION_ID @MARIADB_VERSION_ID@
#define MARIADB_PORT @MARIADB_PORT@
#define MARIADB_UNIX_ADDR "@MARIADB_UNIX_ADDR@"
#define MYSQL_CONFIG_NAME "my"

View File

@ -117,14 +117,15 @@ lib/mysql/libmariadb.so
lib/mysql/libmariadb.so.3
lib/mysql/libmariadbclient.a
lib/mysql/libmysqlservices.a
lib/mysql/libmysqlclient.a
lib/mysql/libmysqlclient.so
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.so
@comment lib/mysql/plugin/client_ed25519.so
lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/dialog.so
lib/mysql/plugin/libaurora.so
lib/mysql/plugin/libreplication.so
lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/sha256_password.so
lib/mysql/plugin/trace_example.so
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
%%DATADIR%%/charsets/armscii8.xml

View File

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME?= mariadb
PORTVERSION= 10.2.6
PORTREVISION?= 2
PORTVERSION= 10.2.7
PORTREVISION?= 0
CATEGORIES= databases ipv6
MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@ -28,7 +28,7 @@ SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
SLAVEDIRS= databases/mariadb102-client
USES= bison:build cmake compiler:c++11-lib cpe execinfo iconv:translit ncurses shebangfix ssl
USES= bison:build cmake compiler:c++11-lib cpe execinfo iconv:translit libedit ncurses shebangfix ssl
USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
@ -179,6 +179,7 @@ post-install:
${STAGEDIR}${PREFIX}/bin/mysqlaccess
${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \
${STAGEDIR}/${PREFIX}/share/pkgconfig
${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient*
# See https://mariadb.atlassian.net/browse/MDEV-9529
${RM} ${STAGEDIR}/${PREFIX}/bin/maria_add_gis_sp.sql
.endif # defined(CLIENT_ONLY)
@ -202,8 +203,8 @@ post-patch:
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
post-configure-MROONGA-on:
${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \
${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt
#post-configure-MROONGA-on:
# ${REINPLACE_CMD} 's|-llz4|-L${LOCALBASE}/lib -llz4|' \
# ${WRKSRC}/storage/mroonga/CMakeFiles/mroonga.dir/link.txt
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1495564383
SHA256 (mariadb-10.2.6.tar.gz) = c385c76e40d6e5f0577eba021805da5f494a30c9ef51884baefe206d5658a2e5
SIZE (mariadb-10.2.6.tar.gz) = 67599197
TIMESTAMP = 1499877512
SHA256 (mariadb-10.2.7.tar.gz) = 225ba1bbc48325ad38a9f433ff99da4641028f42404a29591cc370e4a676c0bc
SIZE (mariadb-10.2.7.tar.gz) = 67669554

View File

@ -4,6 +4,8 @@ bin/aria_ftdump
bin/aria_pack
bin/aria_read_log
bin/innochecksum
bin/mariabackup
bin/mbstream
bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk