svn commit: r452143 - in head/databases: mariadb102-client mariadb102-server

[Bernard Spil]

Author: brnrd
Date: Sun Oct 15 13:19:34 2017
New Revision: 452143
URL: https://svnweb.freebsd.org/changeset/ports/452143

Log:
  databases/mariadb102-server: Fix client ports and build
  
   - Move client headers to the client port [1]
   - Fix SNAPPY option for mariabackup [2]
     * switch to noninja to generate link.txt
  
  PR:		222825 [1], 221159 [2]
  Submitted by:	Piotr Kubaj <pkubaj at anongoth.pl> [1]
  Reported by:	sdalu at sdalu.com [2]

Modified:
  head/databases/mariadb102-client/pkg-plist
  head/databases/mariadb102-server/Makefile
  head/databases/mariadb102-server/pkg-plist

Modified: head/databases/mariadb102-client/pkg-plist
==============================================================================
--- head/databases/mariadb102-client/pkg-plist	Sun Oct 15 12:32:49 2017	(r452142)
+++ head/databases/mariadb102-client/pkg-plist	Sun Oct 15 13:19:34 2017	(r452143)
@@ -21,11 +21,16 @@ include/mysql/mariadb_ctype.h
 include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
 include/mysql/mysql.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth_common.h
- at comment include/mysql/mysqld_error.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
 lib/mysql/libmariadb.so
 lib/mysql/libmariadb.so.3

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Sun Oct 15 12:32:49 2017	(r452142)
+++ head/databases/mariadb102-server/Makefile	Sun Oct 15 13:19:34 2017	(r452143)
@@ -2,7 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.2.9
-PORTREVISION?=	0
+PORTREVISION?=	1
 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 iconv:translit libedit ncurses shebangfix ssl
+USES=		bison:build cmake:noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
@@ -201,8 +201,12 @@ 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
+# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
+post-configure-INNOBASE-on:
+	${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
+		-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
+		-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
+		-e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
+		${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
 
 .include <bsd.port.post.mk>

Modified: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist	Sun Oct 15 12:32:49 2017	(r452142)
+++ head/databases/mariadb102-server/pkg-plist	Sun Oct 15 13:19:34 2017	(r452143)
@@ -44,12 +44,12 @@ bin/wsrep_sst_mysqldump
 bin/wsrep_sst_rsync
 bin/wsrep_sst_xtrabackup
 bin/wsrep_sst_xtrabackup-v2
-include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_sys.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
+ at comment include/mysql/my_config.h
+ at comment include/mysql/my_global.h
+ at comment include/mysql/my_sys.h
+ at comment include/mysql/mysql_com.h
+ at comment include/mysql/mysql_version.h
+ at comment include/mysql/mysqld_error.h
 include/mysql/server/private/embedded_priv.h
 @comment lib/mysql/libmariadb.so
 @comment lib/mysql/libmariadb.so.3