aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorbrnrd <brnrd@FreeBSD.org>2018-11-10 22:11:45 +0800
committerbrnrd <brnrd@FreeBSD.org>2018-11-10 22:11:45 +0800
commitdc2bb77c576316d7debc7e7a92e9dabee3d410ff (patch)
treead7b7228087eac61a625e296370d914144983cf3 /databases
parentea95d952fa2cf031cc5ac9fc63b085ec197800f6 (diff)
downloadfreebsd-ports-gnome-dc2bb77c576316d7debc7e7a92e9dabee3d410ff.tar.gz
freebsd-ports-gnome-dc2bb77c576316d7debc7e7a92e9dabee3d410ff.tar.zst
freebsd-ports-gnome-dc2bb77c576316d7debc7e7a92e9dabee3d410ff.zip
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>
Diffstat (limited to 'databases')
-rw-r--r--databases/mariadb103-client/pkg-plist2
-rw-r--r--databases/mariadb103-server/Makefile6
-rw-r--r--databases/mariadb103-server/pkg-plist6
3 files changed, 6 insertions, 8 deletions
diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist
index f8f181a18fd9..04206d21ac6c 100644
--- a/databases/mariadb103-client/pkg-plist
+++ b/databases/mariadb103-client/pkg-plist
@@ -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
+@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
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 6ad3239472d1..7646a2160714 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -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
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index 18370efab042..fd5e3a0f6d4d 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -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