svn commit: r442843 - head/databases/mariadb102-server

[Bernard Spil]

Author: brnrd
Date: Wed Jun  7 14:38:17 2017
New Revision: 442843
URL: https://svnweb.freebsd.org/changeset/ports/442843

Log:
  databases/mariadb102-server: Build InnoDB engine static
  
   - Change InnoDB from Dynamic plugin to static [2]
   - Unbreak new installs on GIS bootstrap [1]
  
  PR:		219831 [1], 219818 [2]
  Submitted by:	Benediktus Anindito <bennybroz105 at gmail.com> [1]
  Reported by:	martin at sugioarto.com [2]

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

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Wed Jun  7 14:37:28 2017	(r442842)
+++ head/databases/mariadb102-server/Makefile	Wed Jun  7 14:38:17 2017	(r442843)
@@ -2,6 +2,7 @@
 
 PORTNAME?=	mariadb
 PORTVERSION=	10.2.6
+PORTREVISION?=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
 		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
@@ -132,11 +133,12 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 		-DWITHOUT_CLIENT=1
 
-.for ENGINE in ${OPTIONS_GROUP_ENGINES}
+.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
 ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO \
 			-DWITHOUT_${ENGINE}=1
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
+INNOBASE_CMAKE_OFF=	-DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1
 
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2

Modified: head/databases/mariadb102-server/pkg-plist
==============================================================================
--- head/databases/mariadb102-server/pkg-plist	Wed Jun  7 14:37:28 2017	(r442842)
+++ head/databases/mariadb102-server/pkg-plist	Wed Jun  7 14:38:17 2017	(r442843)
@@ -3,6 +3,7 @@ bin/aria_dump_log
 bin/aria_ftdump
 bin/aria_pack
 bin/aria_read_log
+bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
 bin/myisamchk
@@ -124,7 +125,6 @@ lib/mysql/plugin/ha_blackhole.so
 lib/mysql/plugin/ha_connect.so
 lib/mysql/plugin/ha_federated.so
 lib/mysql/plugin/ha_federatedx.so
-%%INNOBASE%%lib/mysql/plugin/ha_innobase.so
 %%MROONGA%%lib/mysql/plugin/ha_mroonga.so
 %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
 %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
@@ -194,7 +194,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/magic
 %%SPIDER%%%%DATADIR%%/install_spider.sql
 @comment %%DATADIR%%/maria_add_gis_sp.sql
- at comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
 %%MROONGA%%%%DATADIR%%/mroonga/install.sql
 %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
 %%DATADIR%%/my-huge.cnf