svn commit: r484613 - in head/databases: mariadb103-client mariadb103-server

[Bernard Spil]

Author: brnrd
Date: Sat Nov 10 14:11:45 2018
New Revision: 484613
URL: https://svnweb.freebsd.org/changeset/ports/484613

Log:
  databases/mariadb103-server: Remove XTRADB option
  
   - The XtraDB engine was removed from 10.3
   - Fix plist conflict for TOKUDB option [1]
  
  PR:		232906 [1]
  Submitted by:	Oleg Sidorkin <osidorkin gmail com>

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

Modified: head/databases/mariadb103-client/pkg-plist
==============================================================================
--- head/databases/mariadb103-client/pkg-plist	Sat Nov 10 14:02:00 2018	(r484612)
+++ head/databases/mariadb103-client/pkg-plist	Sat Nov 10 14:11:45 2018	(r484613)
@@ -110,7 +110,7 @@ man/man1/mysqltest_embedded.1.gz
 man/man1/replace.1.gz
 @comment man/man1/resolve_stack_dump.1.gz
 @comment man/man1/resolveip.1.gz
-man/man1/tokuft_logprint.1.gz
+ at comment man/man1/tokuft_logprint.1.gz
 @comment man/man1/tokuftdump.1.gz
 @comment man/man1/wsrep_sst_common.1.gz
 @comment man/man1/wsrep_sst_mariabackup.1.gz

Modified: head/databases/mariadb103-server/Makefile
==============================================================================
--- head/databases/mariadb103-server/Makefile	Sat Nov 10 14:02:00 2018	(r484612)
+++ head/databases/mariadb103-server/Makefile	Sat Nov 10 14:11:45 2018	(r484613)
@@ -44,7 +44,7 @@ OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
 OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
 OPTIONS_DEFINE_amd64=	WSREP
 OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
-OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB XTRADB
+OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
 OPTIONS_EXCLUDE_i386=	TOKUDB
 
@@ -61,7 +61,6 @@ SPHINX_DESC=	SphinxSE engine
 SPIDER_DESC=	Partitioning and XA-transactions engine
 TOKUDB_DESC=	Fractal tree index tree data structure engine
 WSREP_DESC=	Build wsrep clustering
-XTRADB_DESC=	Build XtraDB engine next to InnoDB
 ZMQ_DESC=	ZeroMQ support
 ZSTD_DESC+=	Zstandard compression support (RocksDB only)
 .endif
@@ -132,11 +131,10 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 		-DWITHOUT_CLIENT=1
 
-.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
+.for ENGINE in ${OPTIONS_GROUP_ENGINES}
 ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${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/mariadb103-server/pkg-plist
==============================================================================
--- head/databases/mariadb103-server/pkg-plist	Sat Nov 10 14:02:00 2018	(r484612)
+++ head/databases/mariadb103-server/pkg-plist	Sat Nov 10 14:11:45 2018	(r484613)
@@ -3,9 +3,9 @@ bin/aria_dump_log
 bin/aria_ftdump
 bin/aria_pack
 bin/aria_read_log
-bin/innochecksum
-bin/mariabackup
-bin/mbstream
+%%INNOBASE%%bin/innochecksum
+%%INNOBASE%%bin/mariabackup
+%%INNOBASE%%bin/mbstream
 @comment bin/msql2mysql
 bin/my_print_defaults
 bin/myisam_ftdump