Page MenuHomeFreeBSD
Files F148610944

D43946.id170635.diff
No OneTemporary
Actions

D43946.id170635.diff
View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,28 @@
All ports committers are allowed to commit to this file.
+20240228:
+AUTHOR: tcberner@FreeBSD.org
+
+ Simplify and improve the mysql/mariadb ports and packages.
+
+ Changes:
+ * only one client port for each provider:
+ - databases/mysql-client
+ - databases/mariadb-client
+ * servers install to ${LOCALBASE}/${provider}${version}
+ * new default version MYSQL_CLIENT_DEFAULT=mysql|mariadb
+ * mysql.mk only adds run or build depends on ${MYSQL_CLIENT_DEFAULT}
+
+ The greatest benefit of this is, that one can have multiple
+ mysql/mariadb servers installed at once; which makes migrations
+ to never server versions finally easier.
+
+ The respective client ports should be kept at the version of the latest
+ provided server package. So if there is a databases/mysql82-server port
+ in the future, databases/mysql-client should be updated to use that one.
+
+ Note: the clients are backwards compatible.
20251111:
AUTHOR: kiwi@FreeBSD.org
diff --git a/MOVED b/MOVED
--- a/MOVED
+++ b/MOVED
@@ -5088,3 +5088,6 @@
multimedia/ccextractor-gui||2026-01-20|Superseeded by flutter GUI, which we do not support
x11-fonts/open-sans|x11-fonts/opensans-ttf|2026-01-24|Rename to match upstream naming
x11-toolkits/py-wxPython4|x11-toolkits/py-wxpython|2026-01-26|Normalise and match Python package name
+databases/mysql80-client|databases/mysql-client|YYYY-MM-DD|No reason to keep old client libraries
+databases/mariadb106-client|databases/mariadb-client|YYYY-MM-DD|No reason to keep old client libraries
+databases/mariadb1011-client|databases/mariadb-client|YYYY-MM-DD|No reason to keep old client libraries
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -1,159 +1,70 @@
-# Provide support for MySQL
-# Feature: mysql
-# Usage: USES=mysql or USES=mysql:args
-# Valid ARGS: <version>, client, server
-#
-# version If no version is given (by the maintainer via the port), try to
-# find the currently installed version. Fall back to default if
-# necessary (MySQL-8.0 = 80, look at bsd.default-versions.mk for
-# possible values).
-# client Depends on the libmysqlclient library (default)
-# server Depend on the server at run/build time. If none of these is
-# set, depends on the client.
+# Provide support for MySQL clients
#
-# IGNORE_WITH_MYSQL
-# This variable can be defined if the ports does not support one
-# or more versions of MySQL.
-# WITH_MYSQL_VER
-# User defined variable to set MySQL version.
-# MYSQL_VER
-# Detected MySQL version.
+# Feature: mysql
+# Usage: USES=mysql[:args]
+# Valid ARGS: <none>, build, lib, run
+# <none>: (default) same as lib
+# build: add BUILD_DEPENDS
+# lib: add LIB_DEPENDS
+# run: add RUN_DEPENDS
+# mysql: use mysql-client disregarding ${MYSQL_CLIENT_DEFAULT}
+# mariadb: use mariadb-client disregarding ${MYSQL_CLIENT_DEFAULT}
#
-# DBD_MYSQL
-# Set compatible p5-DBD-mysql version
+# Additionally this USES defines the following knobs for ports to use:
+# DBD_MYSQL can be used a value for *_DEPENDS, points to
+# either p5-DBD-mysql or p5-DBD-MariaDB
#
# MAINTAINER: ports@FreeBSD.org
.if !defined(_INCLUDE_USES_MYSQL_MK)
_INCLUDE_USES_MYSQL_MK= yes
-. if !empty(mysql_ARGS)
-.undef _WANT_MYSQL_VER
-.undef _WANT_MYSQL_SERVER
-_MYSQL_ARGS= ${mysql_ARGS:S/,/ /g}
-. if ${_MYSQL_ARGS:Mserver}
-_WANT_MYSQL_SERVER= yes
-_MYSQL_ARGS:= ${_MYSQL_ARGS:Nserver}
-. endif
-. if ${_MYSQL_ARGS:Mclient}
-_WANT_MYSQL_CLIENT= yes
-_MYSQL_ARGS:= ${_MYSQL_ARGS:Nclient}
+_mysql_depends= build lib run
+_mysql_valid_args= ${_mysql_depends} mysql mariadb
+. for _arg in ${mysql_ARGS:O:u}
+. if empty(_mysql_valid_args:M${_arg})
+IGNORE= "Invalid argument 'mysql:${_arg}'. Only '${_mysql_valid_args}' are supported."
. endif
-
-# Port requested a version
-. if !empty(_MYSQL_ARGS)
-_WANT_MYSQL_VER= ${_MYSQL_ARGS}
-. if (${_WANT_MYSQL_VER:C/[0-9]*//} == "m")
-_WANT_MYSQL_FLAVOUR= mariadb
-. else
-_WANT_MYSQL_FLAVOUR= mysql
-. endif
-. endif
-. endif # !empty(mysql_ARGS)
-
-. if defined(DEFAULT_MYSQL_VER)
-WARNING+= "DEFAULT_MYSQL_VER is defined, consider using DEFAULT_VERSIONS=mysql=${DEFAULT_MYSQL_VER} instead"
-. endif
-
-DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//}
-# MySQL client version currently supported.
-# When adding a version, please keep the comment in
-# Mk/bsd.default-versions.mk in sync.
-MYSQL80_LIBVER= 21
-MYSQL84_LIBVER= 24
-MYSQL91_LIBVER= 24
-MYSQL94_LIBVER= 24
-
-. for v in 106 1011 114 118
-MYSQL${v}m_LIBVER= 3
. endfor
-# Setting/finding MySQL version we want.
-. if exists(${LOCALBASE}/bin/mariadb)
-_MARIADB!= ${LOCALBASE}/bin/mariadb --version | ${GREP} MariaDB | wc -l
-. elif exists(${LOCALBASE}/bin/mysql)
-_MYSQL!= ${LOCALBASE}/bin/mysql_config --version | ${SED} -e 's/\([0-9]\{1,2\}\)\.\([0-9]*\).*/\1\2/'
-_MARIADB!= ${LOCALBASE}/bin/mysql --version | ${GREP} MariaDB | wc -l
-
-. if ${_MARIADB} == 1
-_MYSQL_VER= ${_MYSQL}m
-_MYSQL_FLAVOUR= mariadb
-. else
-_MYSQL_VER= ${_MYSQL}
-_MYSQL_FLAVOUR= mysql
-. endif
+. if ${mysql_ARGS:Mmysql} && ${mysql_ARGS:Mmariadb}
+IGNORE= "Invalid arguments 'mysql:${mysql_ARGS:tW:C/ /,/}'. Only one of 'mysql' and 'mariadb' are supported."
. endif
-. if defined(_WANT_MYSQL_VER)
-. if defined(WITH_MYSQL_VER) && (${WITH_MYSQL_VER:C/[0-9]*//} == "m")
-WITH_MYSQL_FLAVOUR= mariadb
-. else
-WITH_MYSQL_FLAVOUR= mysql
-. endif
-. if defined(WITH_MYSQL_VER) && ${WITH_MYSQL_VER} != ${_WANT_MYSQL_VER}
-IGNORE= cannot install: the port wants ${_WANT_MYSQL_FLAVOUR}${_WANT_MYSQL_VER:C/[m]//}-client and you try to install ${WITH_MYSQL_FLAVOUR}${WITH_MYSQL_VER:C/[m]//}-client
+_mysql_depend= #
+. for _depend in ${_mysql_depends:O:u}
+. if ${mysql_ARGS:M${_depend}}
+_mysql_depend+= ${_depend}
. endif
-MYSQL_VER= ${_WANT_MYSQL_VER}
-. elif defined(WITH_MYSQL_VER)
-MYSQL_VER= ${WITH_MYSQL_VER}
-. else
-. if defined(_MYSQL_VER)
-MYSQL_VER= ${_MYSQL_VER}
-. else
-MYSQL_VER= ${DEFAULT_MYSQL_VER}
-. endif
-. endif # _WANT_MYSQL_VER
-
-. if ${MYSQL_VER:C/[0-9]*//} == "m"
-MYSQL_FLAVOUR= mariadb
-. else
-MYSQL_FLAVOUR= mysql
+. endfor
+. if empty(_mysql_depend)
+_mysql_depend= lib
. endif
-. if defined(_MYSQL_VER)
-. if ${_MYSQL_VER} != ${MYSQL_VER}
-IGNORE= cannot install: MySQL versions mismatch: ${_MYSQL_FLAVOUR}${_MYSQL_VER:C/[m]//}-client is installed and wanted version is ${MYSQL_FLAVOUR}${MYSQL_VER:C/[m]//}-client
-. endif
-. endif
+_mysql_default= ${MYSQL_CLIENT_DEFAULT}
-_MYSQL_SHLIB= libmysqlclient
-. if (${MYSQL_VER:C/[0-9]*//} == "m")
-_MYSQL_SERVER_FLAVOUR= mariadb
-_MYSQL_CLIENT_FLAVOUR= mariadb
-. if ${MYSQL_VER:C/m//} >= 105
-_MYSQL_SHLIB= libmariadb
-. endif
-. else
-_MYSQL_SERVER_FLAVOUR= mysql
-_MYSQL_CLIENT_FLAVOUR= mysql
+. if ${mysql_ARGS:Mmysql}
+_mysql_default= mysql
+. elif ${mysql_ARGS:Mmariadb}
+_mysql_default= mariadb
. endif
-_MYSQL_CLIENT= databases/${_MYSQL_CLIENT_FLAVOUR}${MYSQL_VER:C/[m]//}-client
-_MYSQL_SERVER= databases/${_MYSQL_SERVER_FLAVOUR}${MYSQL_VER:C/[m]//}-server
-
-# And now we are checking if we can use it
-. if defined(MYSQL${MYSQL_VER}_LIBVER)
-. if defined(IGNORE_WITH_MYSQL)
-. for VER in ${IGNORE_WITH_MYSQL}
-. if (${MYSQL_VER} == "${VER}")
-IGNORE= cannot install: does not work with MySQL version ${MYSQL_VER} (MySQL ${IGNORE_WITH_MYSQL} not supported)
-. endif
-. endfor
-. endif # IGNORE_WITH_MYSQL
-. if defined(_WANT_MYSQL_SERVER)
-RUN_DEPENDS+= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
-. endif
-. if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER)
-LIB_DEPENDS+= ${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
-. endif
-. else
-IGNORE= cannot install: unknown MySQL version: ${MYSQL_VER}
-. endif # Check for correct libs
-
-. if ${MYSQL_FLAVOUR} == mariadb
-DBD_MYSQL= p5-DBD-mysql4>=0:databases/p5-DBD-mysql4
-. else
-DBD_MYSQL= p5-DBD-mysql>=0:databases/p5-DBD-mysql
+# chose the client's origin depending on ${_mysql_default}
+_MYSQL_CLIENT_PORT= databases/${_mysql_default}-client
+. if ${_mysql_default} == mysql
+_MYSQL_CLIENT_LIB= libmysqlclient.so
+DBD_MYSQL= p5-DBD-mysql>=0:databases/p5-DBD-mysql
+. elif ${_mysql_default} == mariadb
+_MYSQL_CLIENT_LIB= libmariadb.so
+DBD_MYSQL= p5-DBD-MariaDB>=0:databases/p5-DBD-MariaDB
. endif
+_MYSQL_CLIENT_BUILD_DEPENDS= ${_mysql_default}-client>=0:${_MYSQL_CLIENT_PORT}
+_MYSQL_CLIENT_LIB_DEPENDS= ${_MYSQL_CLIENT_LIB}:${_MYSQL_CLIENT_PORT}
+_MYSQL_CLIENT_RUN_DEPENDS= mysql:${_MYSQL_CLIENT_PORT}
+
+# === Dependency handling
+. for _depend in ${_mysql_depend}
+${_depend:tu}_DEPENDS+= ${_MYSQL_CLIENT_${_depend:tu}_DEPENDS}
+. endfor
.endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -19,7 +19,7 @@
. for lang in APACHE BDB COROSYNC EBUR128 EMACS FIREBIRD FORTRAN FPC GCC \
GHOSTSCRIPT GL GO GUILE IMAGEMAGICK JAVA LAZARUS LIBRSVG2 LINUX LLVM \
- LUA LUAJIT MONO MYSQL NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
+ LUA LUAJIT MONO MYSQL_CLIENT NINJA NODEJS OPENLDAP PERL5 PGSQL PHP \
PYCRYPTOGRAPHY PYTHON PYTHON2 RUBY RUST SAMBA SSL TCLTK VARNISH
. if defined(${lang}_DEFAULT)
ERROR+= "The variable ${lang}_DEFAULT is set and it should only be defined through DEFAULT_VERSIONS+=${lang:tl}=${${lang}_DEFAULT} in /etc/make.conf"
@@ -105,8 +105,8 @@
. endif
# Possible values: 5.10, 5.20, 6.8
MONO_DEFAULT?= 5.20
-# Possible values: 8.0, 8.4, 9.1, 9.4, 10.6m, 10.11m, 11.4m, 11.8m
-MYSQL_DEFAULT?= 8.0
+# Possible values: mysql mariadb
+MYSQL_CLIENT_DEFAULT?= mysql
# Possible values: ninja, samurai
NINJA_DEFAULT?= ninja
# Possible value: 20, 22, 24, 25, current, lts (Note: current = 25 and lts = 24)
diff --git a/UPDATING b/UPDATING
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,76 @@
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+YYYYMMDD:
+ AFFECTS: users of databases/mroonga
+ AUTHOR: arrowd@FreeBSD.org
+ The port has been flavorized to allow selecting the version of a MySQL server
+ to compile against. The only version supported at the moment is mysql80.
+ This resulted in a change of package's name from "mroonga" to "mroonga-mysql80".
+
+YYYYMMDD:
+ AFFECTS: users of audio/teamspeak3-server, comms/cqrlog,
+ databases/percona-orchestrator, deskutils/moregroupware,
+ finance/frontaccounting, graphics/digikam, net-mgmt/icingaweb2-module-x509,
+ net-mgmt/librenms, net-mgmt/observium, net/rtg, security/webfwlog,
+ sysutils/froxlor, www/hotcrp
+ AUTHOR: arrowd@FreeBSD.org
+ Mentioned ports are no longer depend on a specific SQL server. You now have
+ to install an appropriate server manually. Consult software's documentation
+ to figure out what SQL server it is intended to run against. See also the
+ entry below that talks about changes in SQL server ports.
+
+ Users of the official binary packages are advised to mark installed
+ SQL server packages as non-automatic to prevent them from being removed by
+ "pkg autoremove":
+
+ # pkg info -g 'mysql*server'
+ # pkg info -g 'mariadb*server'
+ # pkg set -A 0 <packages printed by previous 2 commands>
+
+YYYYMMDD:
+ AFFECTS: users of net-mgmt/zabbix*-server
+ AUTHOR: arrowd@FreeBSD.org
+ MDB5, MDB6 and MYSQLDV options got removed. If you want to run Zabbix against
+ the MariaDB server, just install an appropriate version manually. See also
+ the entry below that talks about changes in SQL server ports.
+
+YYYYMMDD:
+ AFFECTS: users of databases/mysql*-server, databases/mariadb*-server
+ AUTHOR: arrowd@FreeBSD.org
+ The MySQL and MariaDB servers now install into a prefix. This makes
+ them co-installable. It is no longer possible to depend on a "default" MySQL
+ or MariaDB server.
+
+ Server's rc scripts and their variables are now suffixed with server version.
+ Users need to update their /etc/rc.conf, replacing mysql_foo vars like this:
+
+ mysql_enable="YES" -> mysqlXY_enable="YES"
+ mysql_args="..." -> mysqlXY_args="..."
+ ...
+
+ MariaDB multi-instance rc.conf renaming would look like:
+
+ mariadb_instances="prod test" -> mariadbXY_instances="prod test"
+ mariadb_prod_args="..." -> mariadbXY_prod_args="..."
+
+ The default path to server's my.cnf got changed from /usr/local/etc/mysql/my.cnf
+ to /usr/local/{mariadbXY,mysqlXY}/etc/mysql/my.cnf. If you did not change
+ this file, you can skip this migrating the config. To figure whether you made
+ changes to my.cnf run
+
+ # diff -u /usr/local/etc/mysql/my.cnf.sample /usr/local/etc/mysql/my.cnf
+
+ If you made changes to my.cnf and want to preserve them, run following commands
+ before upgrading, but after shutting down the server:
+
+ # mkdir -p /usr/local/{mariadbXY,mysqlXY}/etc/mysql
+ # mv /usr/local/etc/mysql/my.cnf /usr/local/{mariadbXY,mysqlXY}/etc/mysql/my.cnf
+
+ Note that while different SQL servers are now co-installable, they can't be
+ run in parallel without changing the mysqlXY_dbdir variable in rc.conf -
+ the default is the same "/var/db/mysql" across all servers!
+
20260125:
AFFECTS: users of dns/ddclient
AUTHOR: mjl@luckie.org.nz
diff --git a/audio/teamspeak3-server/Makefile b/audio/teamspeak3-server/Makefile
--- a/audio/teamspeak3-server/Makefile
+++ b/audio/teamspeak3-server/Makefile
@@ -1,5 +1,6 @@
PORTNAME= teamspeak3-server
PORTVERSION= 3.13.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= audio net
MASTER_SITES= https://files.teamspeak-services.com/releases/server/${PORTVERSION}/
@@ -47,11 +48,7 @@
update_mysql_to_mariadb.txt \
webquery.md
-OPTIONS_DEFINE= DOCS MYSQL
-
-MYSQL_USES= mysql:server
-MYSQL_VARS= SUB_LIST+=MYSQL=mysql
-MYSQL_VARS_OFF= SUB_LIST+=MYSQL=
+OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
diff --git a/audio/teamspeak3-server/files/teamspeak.in b/audio/teamspeak3-server/files/teamspeak.in
--- a/audio/teamspeak3-server/files/teamspeak.in
+++ b/audio/teamspeak3-server/files/teamspeak.in
@@ -1,7 +1,7 @@
#!/bin/sh
# PROVIDE: teamspeak
-# REQUIRE: LOGIN %%MYSQL%%
+# REQUIRE: LOGIN mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -38,8 +38,7 @@
OPTIONS_DEFAULT= X11
DOCS_CONFIGURE_ON= --with-docroot=${DOCSDIR}
-MYSQL_USES= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
+MYSQL_USES= mysql:mariadb
X11_USES= motif xorg
X11_USE= XORG=x11
X11_LIB_DEPENDS= libgd.so:graphics/gd \
diff --git a/cad/camotics/Makefile b/cad/camotics/Makefile
--- a/cad/camotics/Makefile
+++ b/cad/camotics/Makefile
@@ -28,7 +28,7 @@
GH_ACCOUNT= CauldronDevelopmentLLC
USES= compiler:c++14-lang desktop-file-utils gettext-runtime gl gnome \
- localbase:ldflags mysql:client pkgconfig python qt:5 scons \
+ localbase:ldflags mysql pkgconfig python qt:5 scons \
shared-mime-info shebangfix sqlite ssl
SHEBANG_FILES= examples/python/camotics_python_example.py \
tests/testHarness
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -16,7 +16,7 @@
ONLY_FOR_ARCHS= amd64 i386
USES= fpc gnome lazarus:flavors shebangfix ssl:run dos2unix \
- mysql:server xorg
+ mysql xorg
USE_GNOME+= cairo
USE_XORG= x11
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -56,11 +56,10 @@
SMSD_PLIST_SUB= SMSD=''
SMSD_PLIST_SUB_OFF= SMSD='@comment ' MSM='@comment ' PGM='@comment ' SQLT='@comment '
SMSD_CONFIGURE_OFF= --disable-smsd
-MYSQL_USES= mysql ssl
+MYSQL_USES= mysql:mariadb ssl
MYSQL_PLIST_SUB= MSM=''
MYSQL_PLIST_SUB_OFF= MSM='@comment '
MYSQL_CONFIGURE_OFF= --disable-mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
PGSQL_USES= pgsql
PGSQL_PLIST_SUB= PGM=''
PGSQL_PLIST_SUB_OFF= PGM='@comment '
diff --git a/databases/Makefile b/databases/Makefile
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -158,16 +158,13 @@
SUBDIR += luasql-postgres
SUBDIR += luasql-sqlite3
SUBDIR += mantis
+ SUBDIR += mariadb-client
SUBDIR += mariadb-connector-c
SUBDIR += mariadb-connector-odbc
SUBDIR += mariadb-java-client
- SUBDIR += mariadb1011-client
SUBDIR += mariadb1011-server
- SUBDIR += mariadb106-client
SUBDIR += mariadb106-server
- SUBDIR += mariadb114-client
SUBDIR += mariadb114-server
- SUBDIR += mariadb118-client
SUBDIR += mariadb118-server
SUBDIR += mdbtools
SUBDIR += mdbx
@@ -183,18 +180,15 @@
SUBDIR += mtop
SUBDIR += mydumper
SUBDIR += mysql++
+ SUBDIR += mysql-client
SUBDIR += mysql-connector-c++
SUBDIR += mysql-connector-j
SUBDIR += mysql-connector-java51
SUBDIR += mysql-connector-odbc
SUBDIR += mysql2pgsql
- SUBDIR += mysql80-client
SUBDIR += mysql80-server
- SUBDIR += mysql84-client
SUBDIR += mysql84-server
- SUBDIR += mysql91-client
SUBDIR += mysql91-server
- SUBDIR += mysql94-client
SUBDIR += mysql94-server
SUBDIR += mysqlbackup
SUBDIR += mysqldump-secure
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -37,7 +37,6 @@
OPTIONS_DEFAULT= MYSQL
MYSQL_DESC= Install MySQL Qt plugin and server
-MYSQL_USES= mysql:server
MYSQL_USE= QT=sqldriver-mysql:run
PGSQL_DESC= Install PostgreSQL Qt plugin
diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile
--- a/databases/cppdb/Makefile
+++ b/databases/cppdb/Makefile
@@ -48,7 +48,7 @@
CMAKE_ARGS+= -DDISABLE_MYSQL:BOOL=ON
PLIST_SUB+= MYSQL="@comment "
.else
-USES+= mysql
+USES+= mysql:mariadb
CMAKE_ARGS+= -DDISABLE_MYSQL:BOOL=OFF
.if ${PORT_OPTIONS:MMYSQL_INTERNAL}
CMAKE_ARGS+= -DMYSQL_BACKEND_INTERNAL:BOOL=ON
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -64,8 +64,7 @@
.endif
.if ${LIBGDA5_SLAVE}==mysql
-USES+= mysql
-IGNORE_WITH_MYSQL= 80
+USES+= mysql:mariadb
CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
.else
CONFIGURE_ARGS+= --without-mysql
diff --git a/databases/mariadb-client/Makefile b/databases/mariadb-client/Makefile
new file mode 100644
--- /dev/null
+++ b/databases/mariadb-client/Makefile
@@ -0,0 +1,15 @@
+PORTNAME= mariadb
+PKGNAMESUFFIX= -client
+
+COMMENT= Multithreaded SQL database (client)
+
+_MARIADB_LATEST= 118
+MASTERDIR= ${.CURDIR}/../${PORTNAME}${_MARIADB_LATEST}-server
+
+USE_LDCONFIG= ${PREFIX}/lib/mysql
+
+ETCDIR= ${PREFIX}/etc/mysql
+
+PLIST= ${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb118-client/pkg-plist b/databases/mariadb-client/pkg-plist
rename from databases/mariadb118-client/pkg-plist
rename to databases/mariadb-client/pkg-plist
--- a/databases/mariadb118-client/pkg-plist
+++ b/databases/mariadb-client/pkg-plist
@@ -66,7 +66,6 @@
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.a
lib/mysql/libmariadb.so
lib/mysql/libmariadb.so.3
@@ -76,6 +75,7 @@
lib/mysql/libmysqlclient_r.a
lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqlservices.a
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
lib/mysql/plugin/caching_sha2_password.so
lib/mysql/plugin/client_ed25519.so
lib/mysql/plugin/daemon_example.ini
diff --git a/databases/mariadb1011-client/Makefile b/databases/mariadb1011-client/Makefile
deleted file mode 100644
--- a/databases/mariadb1011-client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-PORTNAME= mariadb
-PKGNAMESUFFIX= 1011-client
-
-COMMENT= Multithreaded SQL database (client)
-
-MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
-
-PLIST= ${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb1011-client/pkg-plist b/databases/mariadb1011-client/pkg-plist
deleted file mode 100644
--- a/databases/mariadb1011-client/pkg-plist
+++ /dev/null
@@ -1,266 +0,0 @@
-bin/mariadb
-bin/mariadb-access
-bin/mariadb-admin
-bin/mariadb-binlog
-bin/mariadb-check
-bin/mariadb-config
-bin/mariadb-conv
-bin/mariadb-convert-table-format
-bin/mariadb-dump
-@comment bin/mariadb-dumpslow
-bin/mariadb-find-rows
-bin/mariadb-hotcopy
-bin/mariadb-import
-bin/mariadb-plugin
-bin/mariadb-show
-@comment bin/mariadb-secure-installation
-bin/mariadb-setpermission
-bin/mariadb-slap
-bin/mariadb-test
-bin/mariadb-waitpid
-bin/mariadb_config
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-@comment bin/mysql_secure_installation
-bin/mysql_setpermission
-@comment bin/mysql_plugin
-@comment bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-@comment bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysqltest
-bin/mytop
-bin/my_print_defaults
-bin/replace
-@sample %%ETCDIR%%/my.cnf.sample
-@sample %%ETCDIR%%/conf.d/client.cnf.sample
-include/mysql/errmsg.h
-include/mysql/ma_list.h
-include/mysql/ma_pvio.h
-include/mysql/ma_tls.h
-include/mysql/mariadb/ma_io.h
-include/mysql/mariadb_com.h
-include/mysql/mariadb_ctype.h
-include/mysql/mariadb_dyncol.h
-include/mysql/mariadb_rpl.h
-include/mysql/mariadb_stmt.h
-include/mysql/mariadb_version.h
-include/mysql/my_alloca.h
-include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysqld_error.h
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
-lib/mysql/libmariadb.a
-lib/mysql/libmariadb.so
-lib/mysql/libmariadb.so.3
-lib/mysql/libmariadbclient.a
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlservices.a
-lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/client_ed25519.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/mysql_clear_password.so
-@comment lib/mysql/plugin/zstd.so
-lib/mysql/plugin/sha256_password.so
-libdata/pkgconfig/libmariadb.pc
-share/man/man1/mariadb.1.gz
-share/man/man1/mariadb-access.1.gz
-share/man/man1/mariadb-admin.1.gz
-share/man/man1/mariadb-binlog.1.gz
-share/man/man1/mariadb-check.1.gz
-share/man/man1/mariadb-client-test-embedded.1.gz
-share/man/man1/mariadb-client-test.1.gz
-share/man/man1/mariadb-convert-table-format.1.gz
-share/man/man1/mariadb_config.1.gz
-share/man/man1/mariadb-dump.1.gz
-@comment share/man/man1/mariadb-dumpslow.1.gz
-@comment share/man/man1/mariadb-embedded.1.gz
-share/man/man1/mariadb-find-rows.1.gz
-share/man/man1/mariadb-hotcopy.1.gz
-share/man/man1/mariadb-import.1.gz
-share/man/man1/mariadb-plugin.1.gz
-@comment share/man/man1/mariadb-secure-installation.1.gz
-share/man/man1/mariadb-setpermission.1.gz
-share/man/man1/mariadb-show.1.gz
-share/man/man1/mariadb-slap.1.gz
-share/man/man1/mariadb-test-embedded.1.gz
-share/man/man1/mariadb-test.1.gz
-@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
-@comment share/man/man1/mariadb-waitpid.1.gz
-share/man/man1/msql2mysql.1.gz
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/my_safe_process.1.gz
-@comment share/man/man1/myisam_ftdump.1.gz
-@comment share/man/man1/myisamchk.1.gz
-@comment share/man/man1/myisamlog.1.gz
-@comment share/man/man1/myisampack.1.gz
-share/man/man1/mysql-stress-test.pl.1.gz
-share/man/man1/mysql-test-run.pl.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_client_test.1.gz
-share/man/man1/mysql_client_test_embedded.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_convert_table_format.1.gz
-share/man/man1/mysql_embedded.1.gz
-share/man/man1/mysql_find_rows.1.gz
-share/man/man1/mysql_plugin.1.gz
-@comment share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_setpermission.1.gz
-@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
-@comment share/man/man1/mysql_waitpid.1.gz
-share/man/man1/mysqlaccess.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-@comment share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlhotcopy.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/man/man1/mysqltest.1.gz
-share/man/man1/mysqltest_embedded.1.gz
-share/man/man1/mytop.1.gz
-@comment share/man/man1/perror.1.gz
-share/man/man1/replace.1.gz
-@comment share/man/man1/resolve_stack_dump.1.gz
-share/man/man3/mariadb_cancel.3.gz
-share/man/man3/mariadb_connection.3.gz
-share/man/man3/mariadb_dyncol_check.3.gz
-share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
-share/man/man3/mariadb_dyncol_column_count.3.gz
-share/man/man3/mariadb_dyncol_create_many_named.3.gz
-share/man/man3/mariadb_dyncol_create_many_num.3.gz
-share/man/man3/mariadb_dyncol_exists_named.3.gz
-share/man/man3/mariadb_dyncol_exists_num.3.gz
-share/man/man3/mariadb_dyncol_free.3.gz
-share/man/man3/mariadb_dyncol_list_named.3.gz
-share/man/man3/mariadb_dyncol_list_num.3.gz
-share/man/man3/mariadb_dyncol_unpack.3.gz
-share/man/man3/mariadb_dyncol_update_many_named.3.gz
-share/man/man3/mariadb_dyncol_update_many_num.3.gz
-share/man/man3/mariadb_get_infov.3.gz
-share/man/man3/mariadb_reconnect.3.gz
-share/man/man3/mariadb_rpl_close.3.gz
-share/man/man3/mariadb_rpl_fetch.3.gz
-share/man/man3/mariadb_rpl_get_optionsv.3.gz
-share/man/man3/mariadb_rpl_open.3.gz
-share/man/man3/mariadb_rpl_optionsv.3.gz
-share/man/man3/mariadb_stmt_execute_direct.3.gz
-share/man/man3/mariadb_stmt_fetch_fields.3.gz
-share/man/man3/mysql_affected_rows.3.gz
-share/man/man3/mysql_autocommit.3.gz
-share/man/man3/mysql_change_user.3.gz
-share/man/man3/mysql_close.3.gz
-share/man/man3/mysql_commit.3.gz
-share/man/man3/mysql_data_seek.3.gz
-share/man/man3/mysql_errno.3.gz
-share/man/man3/mysql_error.3.gz
-share/man/man3/mysql_fetch_field.3.gz
-share/man/man3/mysql_fetch_field_direct.3.gz
-share/man/man3/mysql_fetch_fields.3.gz
-share/man/man3/mysql_fetch_lengths.3.gz
-share/man/man3/mysql_fetch_row.3.gz
-share/man/man3/mysql_field_count.3.gz
-share/man/man3/mysql_field_seek.3.gz
-share/man/man3/mysql_field_tell.3.gz
-share/man/man3/mysql_free_result.3.gz
-share/man/man3/mysql_get_character_set_info.3.gz
-share/man/man3/mysql_get_client_info.3.gz
-share/man/man3/mysql_get_client_version.3.gz
-share/man/man3/mysql_get_host_info.3.gz
-share/man/man3/mysql_get_proto_info.3.gz
-share/man/man3/mysql_get_server_info.3.gz
-share/man/man3/mysql_get_server_version.3.gz
-share/man/man3/mysql_get_socket.3.gz
-share/man/man3/mysql_get_ssl_cipher.3.gz
-share/man/man3/mysql_hex_string.3.gz
-share/man/man3/mysql_info.3.gz
-share/man/man3/mysql_init.3.gz
-share/man/man3/mysql_kill.3.gz
-share/man/man3/mysql_more_results.3.gz
-share/man/man3/mysql_next_result.3.gz
-share/man/man3/mysql_num_fields.3.gz
-share/man/man3/mysql_num_rows.3.gz
-share/man/man3/mysql_options.3.gz
-share/man/man3/mysql_options4.3.gz
-share/man/man3/mysql_optionsv.3.gz
-share/man/man3/mysql_ping.3.gz
-share/man/man3/mysql_query.3.gz
-share/man/man3/mysql_read_query_result.3.gz
-share/man/man3/mysql_real_connect.3.gz
-share/man/man3/mysql_real_escape_string.3.gz
-share/man/man3/mysql_real_query.3.gz
-share/man/man3/mysql_refresh.3.gz
-share/man/man3/mysql_reset_connection.3.gz
-share/man/man3/mysql_rollback.3.gz
-share/man/man3/mysql_row_seek.3.gz
-share/man/man3/mysql_row_tell.3.gz
-share/man/man3/mysql_select_db.3.gz
-share/man/man3/mysql_send_query.3.gz
-share/man/man3/mysql_server_end.3.gz
-share/man/man3/mysql_server_init.3.gz
-share/man/man3/mysql_session_track_get_first.3.gz
-share/man/man3/mysql_session_track_get_next.3.gz
-share/man/man3/mysql_set_character_set.3.gz
-share/man/man3/mysql_set_server_option.3.gz
-share/man/man3/mysql_shutdown.3.gz
-share/man/man3/mysql_sqlstate.3.gz
-share/man/man3/mysql_ssl_set.3.gz
-share/man/man3/mysql_stat.3.gz
-share/man/man3/mysql_stmt_affected_rows.3.gz
-share/man/man3/mysql_stmt_attr_get.3.gz
-share/man/man3/mysql_stmt_attr_set.3.gz
-share/man/man3/mysql_stmt_bind_param.3.gz
-share/man/man3/mysql_stmt_bind_result.3.gz
-share/man/man3/mysql_stmt_close.3.gz
-share/man/man3/mysql_stmt_data_seek.3.gz
-share/man/man3/mysql_stmt_errno.3.gz
-share/man/man3/mysql_stmt_error.3.gz
-share/man/man3/mysql_stmt_execute.3.gz
-share/man/man3/mysql_stmt_fetch.3.gz
-share/man/man3/mysql_stmt_fetch_column.3.gz
-share/man/man3/mysql_stmt_field_count.3.gz
-share/man/man3/mysql_stmt_free_result.3.gz
-share/man/man3/mysql_stmt_init.3.gz
-share/man/man3/mysql_stmt_insert_id.3.gz
-share/man/man3/mysql_stmt_more_results.3.gz
-share/man/man3/mysql_stmt_next_result.3.gz
-share/man/man3/mysql_stmt_num_rows.3.gz
-share/man/man3/mysql_stmt_param_count.3.gz
-share/man/man3/mysql_stmt_param_metadata.3.gz
-share/man/man3/mysql_stmt_prepare.3.gz
-share/man/man3/mysql_stmt_reset.3.gz
-share/man/man3/mysql_stmt_result_metadata.3.gz
-share/man/man3/mysql_stmt_row_seek.3.gz
-share/man/man3/mysql_stmt_row_tell.3.gz
-share/man/man3/mysql_stmt_send_long_data.3.gz
-share/man/man3/mysql_stmt_sqlstate.3.gz
-share/man/man3/mysql_stmt_store_result.3.gz
-share/man/man3/mysql_stmt_warning_count.3.gz
-share/man/man3/mysql_store_result.3.gz
-share/man/man3/mysql_thread_end.3.gz
-share/man/man3/mysql_thread_id.3.gz
-share/man/man3/mysql_thread_init.3.gz
-share/man/man3/mysql_use_result.3.gz
-share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile
--- a/databases/mariadb1011-server/Makefile
+++ b/databases/mariadb1011-server/Makefile
@@ -35,13 +35,13 @@
USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-SUB_FILES= pkg-message
+SUB_FILES= my.cnf.sample pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh support-files/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql
+DATADIR= ${PREFIX}/share/mysql
MARIADB_USER?= mysql
MARIADB_GROUP?= mysql
@@ -57,6 +57,8 @@
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE
+SUFXD_NAME= mariadb1011
+
.if ${PKGNAMESUFFIX:M*-server}
# MySQL-Server options
OPTIONS_DEFAULT+= AWS_KEY_MGMT CONNECT_EXTRA HASHICORP_VAULT INNOBASE SPHINX SPIDER WSREP
@@ -127,9 +129,6 @@
DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-DATADIR= ${PREFIX}/share/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
@@ -150,22 +149,24 @@
CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
CMAKE_OFF+= WITH_WSREP
USES+= readline
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SUB_FILES+= my.cnf.sample client.cnf.sample
+SUB_FILES+= client.cnf.sample
.else # ! ${PKGNAMESUFFIX:M*-client}
# MySQL-Server part
-USES+= mysql:1011m
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR= mysql-server
+# Install to a prefix to be able to co-install multiple versions of the
+# server. The client installs to ${LOCALBASE}.
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
+
+USE_RC_SUBR= ${SUFXD_NAME}-server
CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
CMAKE_OFF+= WITH_CLIENT
SUB_FILES+= server.cnf.sample
SUB_LIST+= MARIADB_DBDIR="${MARIADB_DBDIR}" \
MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
- MARIADB_USER="${MARIADB_USER}"
+ MARIADB_USER="${MARIADB_USER}" \
+ SUFXD_NAME="${SUFXD_NAME}"
PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
MARIADB_USER="${MARIADB_USER}" \
MARIADB_GROUP="${MARIADB_GROUP}"
@@ -245,11 +246,18 @@
${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \
${WRKSRC}/scripts/mysql_config.sh
-pre-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
.if ${PKGNAMESUFFIX:M*-client}
post-install:
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
@@ -263,10 +271,11 @@
.else # ! ${PKGNAMESUFFIX:M*-client}
post-install:
+ ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
- ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+ ${STAGEDIR}${ETCDIR}/user_map.conf.sample
${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
${STAGEDIR}${PREFIX}/lib/mysql/
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
@@ -278,8 +287,6 @@
${STAGEDIR}${ETCDIR}/logrotate.d \
${STAGEDIR}${DOCSDIR}/COPYING
${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
- ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
- >> ${TMPPLIST}
post-install-MROONGA-on:
${MV} ${STAGEDIR}${PREFIX}/share/groonga ${STAGEDIR}${DOCSDIR}/
diff --git a/databases/mariadb1011-server/files/mariadb1011-server.in b/databases/mariadb1011-server/files/mariadb1011-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mariadb1011-server/files/mariadb1011-server.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_(instance_)?enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+%%LEGACY_LIMITS%%# %%SUFXD_NAME%%_(instance_)?limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%# just before mysql starts.
+# %%SUFXD_NAME%%_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_(instance_)?args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+# %%SUFXD_NAME%%_(instance_)?pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_(instance_)?user (str): User to run mysqld as
+# Default to "%%MARIADB_USER%%" created by the port
+# %%SUFXD_NAME%%_(instance_)?optfile (str): Server-specific option file.
+# Default to "${%%SUFXD_NAME%%_dbdir}/my.cnf".
+# %%SUFXD_NAME%%_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
+# %%SUFXD_NAME%%_instances (str): Set to "" by default.
+# If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+%%LEGACY_LIMITS%%: ${%%SUFXD_NAME%%_limits="NO"}
+: ${%%SUFXD_NAME%%_user="%%MARIADB_USER%%"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${%%SUFXD_NAME%%_user}"
+: ${%%SUFXD_NAME%%_dbdir="%%MARIADB_DBDIR%%"}
+: ${%%SUFXD_NAME%%_optfile="%%ETCDIR%%/my.cnf"}
+: ${%%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+
+if [ -n "$2" ]; then
+ instance="$2"
+ load_rc_config ${name}_${instance}
+ case "$%%SUFXD_NAME%%_instances" in
+ "$2 "*|*" $2 "*|*" $2"|"$2")
+ eval %%SUFXD_NAME%%_args="\${%%SUFXD_NAME%%_${instance}_args:-\"${%%SUFXD_NAME%%_args}\"}"
+ eval %%SUFXD_NAME%%_dbdir="\${%%SUFXD_NAME%%_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
+ %%LEGACY_LIMITS%%eval %%SUFXD_NAME%%_limits="\${%%SUFXD_NAME%%_${instance}_limits:-\"${%%SUFXD_NAME%%_limits}\"}"
+ eval %%SUFXD_NAME%%_user="\${%%SUFXD_NAME%%_${instance}_user:-\"${%%SUFXD_NAME%%_user}\"}"
+ %%LEGACY_LIMITS%%eval mysql_limits_args="\${%%SUFXD_NAME%%_${instance}_limits_args:-\"-e -U $%%SUFXD_NAME%%_user\"}"
+ eval %%SUFXD_NAME%%_socket="\${%%SUFXD_NAME%%_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+ eval %%SUFXD_NAME%%_optfile="\${%%SUFXD_NAME%%_${instance}_optfile:-\"%%PREFIX%%/etc/mariadb_${instance}/my.cnf\"}"
+ eval %%SUFXD_NAME%%_pidfile="\${%%SUFXD_NAME%%_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
+ ;;
+ *)
+ err 1 "$2 not found in %%SUFXD_NAME%%_instances" ;;
+ esac
+else
+ if [ -n "${%%SUFXD_NAME%%_instances}" -a -n "$1" ]; then
+ for instance in ${%%SUFXD_NAME%%_instances}; do
+ eval _enable="\${%%SUFXD_NAME%%_${instance}_enable}"
+ case "${_enable:-${%%SUFXD_NAME%%_enable}}" in
+ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ continue
+ ;;
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ if [ -z "$_enable" ]; then
+ _var=%%SUFXD_NAME%%_enable
+ else
+ _var=%%SUFXD_NAME%%_${instance}_enable
+ fi
+ warn "Bad value" \
+ "'${_enable:-${%%SUFXD_NAME%%_enable}}'" \
+ "for ${_var}. " \
+ "Instance ${instance} skipped."
+ continue
+ ;;
+ esac
+ echo "===> mysql instance: ${instance}"
+ if %%LOCALBASE%%/etc/rc.d/%%SUFXD_NAME%%-server $1 ${instance}; then
+ success="${instance} ${success}"
+ else
+ failed="${instance} (${retcode}) ${failed}"
+ fi
+ done
+ exit 0
+ else
+ %%SUFXD_NAME%%_pidfile=${%%SUFXD_NAME%%_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+ fi
+fi
+
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+ mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+pidfile=$%%SUFXD_NAME%%_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe ${mysql_extra} --user=${%%SUFXD_NAME%%_user} --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} ${%%SUFXD_NAME%%_socket:+--socket=${%%SUFXD_NAME%%_socket}} ${%%SUFXD_NAME%%_args}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args
+ [ $? -eq 0 ] && chown -R ${%%SUFXD_NAME%%_user}:$(id -gn $%%SUFXD_NAME%%_user) ${%%SUFXD_NAME%%_dbdir}
+}
+
+mysql_prestart()
+{
+ local dir
+ for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
+ if [ -f "${dir}/my.cnf" ]; then
+ echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+ return 1
+ fi
+ done
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ mysql_group="`/usr/bin/id -gn ${%%SUFXD_NAME%%_user}`"
+ [ "${%%SUFXD_NAME%%_socket}" = "" ] && %%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%" || %%SUFXD_NAME%%_rundir="`/usr/bin/dirname ${%%SUFXD_NAME%%_socket}`"
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -o ${%%SUFXD_NAME%%_user} -g ${mysql_group} "${%%SUFXD_NAME%%_rundir}"
+ fi
+%%LEGACY_LIMITS%% if checkyesno %%SUFXD_NAME%%_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -u${%%SUFXD_NAME%%_user} -g$(id -gn $%%SUFXD_NAME%%_user) -m755 ${%%SUFXD_NAME%%_rundir}
+ fi
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mariadb1011-server/files/mysql-server.in b/databases/mariadb1011-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mariadb1011-server/files/mysql-server.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%# just before mysql starts.
-# mysql_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
-# Base database directory.
-# mysql_(instance_)?args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-# Default to "%%MARIADB_USER%%" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
-# mysql_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
-# mysql_instances (str): Set to "" by default.
-# If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="%%MARIADB_USER%%"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
-: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
-: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mariadbd"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
- instance="$2"
- load_rc_config ${name}_${instance}
- case "$mysql_instances" in
- "$2 "*|*" $2 "*|*" $2"|"$2")
- eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
- eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
- eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
- eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
- eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
- eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
- ;;
- *)
- err 1 "$2 not found in mysql_instances" ;;
- esac
-else
- if [ -n "${mysql_instances}" -a -n "$1" ]; then
- for instance in ${mysql_instances}; do
- eval _enable="\${mysql_${instance}_enable}"
- case "${_enable:-${mysql_enable}}" in
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
- continue
- ;;
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- ;;
- *)
- if [ -z "$_enable" ]; then
- _var=mysql_enable
- else
- _var=mysql_${instance}_enable
- fi
- warn "Bad value" \
- "'${_enable:-${mysql_enable}}'" \
- "for ${_var}. " \
- "Instance ${instance} skipped."
- continue
- ;;
- esac
- echo "===> mysql instance: ${instance}"
- if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
- success="${instance} ${success}"
- else
- failed="${instance} (${retcode}) ${failed}"
- fi
- done
- exit 0
- else
- mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
- fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args
- [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- local dir
- for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
- if [ -f "${dir}/my.cnf" ]; then
- echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
- return 1
- fi
- done
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- mysql_group="`/usr/bin/id -gn ${mysql_user}`"
- [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
- fi
-%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%% else
-%%LEGACY_LIMITS%% return 0
-%%LEGACY_LIMITS%% fi
-%%MODERN_LIMITS%% return 0
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
- fi
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist
--- a/databases/mariadb1011-server/pkg-plist
+++ b/databases/mariadb1011-server/pkg-plist
@@ -6,55 +6,88 @@
%%S3%%bin/aria_s3_copy
%%INNOBASE%%bin/innochecksum
%%INNOBASE%%bin/mariabackup
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
bin/mariadb-backup
+bin/mariadb-binlog
+bin/mariadb-check
bin/mariadb-client-test
bin/mariadb-client-test-embedded
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
bin/mariadb-dumpslow
bin/mariadb-embedded
+bin/mariadb-find-rows
bin/mariadb-fix-extensions
+bin/mariadb-hotcopy
+bin/mariadb-import
bin/mariadb-install-db
-%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-plugin
bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-show
+bin/mariadb-slap
+bin/mariadb-test
bin/mariadb-test-embedded
bin/mariadb-tzinfo-to-sql
bin/mariadb-upgrade
+bin/mariadb-waitpid
+bin/mariadb_config
bin/mariadbd-multi
bin/mariadbd-safe
bin/mariadbd-safe-helper
%%INNOBASE%%bin/mbstream
+bin/msql2mysql
+bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
-@comment bin/mytop
-%%ROCKSDB%%bin/myrocks_hotbackup
+bin/mysql
bin/mysql_client_test
bin/mysql_client_test_embedded
+bin/mysql_config
+bin/mysql_convert_table_format
bin/mysql_embedded
+bin/mysql_find_rows
bin/mysql_fix_extensions
bin/mysql_install_db
-%%ROCKSDB%%bin/mysql_ldb
bin/mysql_plugin
bin/mysql_secure_installation
+bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper
+bin/mysqldump
bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
bin/mysqltest_embedded
+@comment bin/mytop
bin/perror
+bin/replace
bin/resolve_stack_dump
bin/resolveip
-%%ROCKSDB%%bin/sst_dump
bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_backup
%%WSREP%%bin/wsrep_sst_common
%%WSREP%%bin/wsrep_sst_mariabackup
%%WSREP%%bin/wsrep_sst_mysqldump
%%WSREP%%bin/wsrep_sst_rsync
%%WSREP%%bin/wsrep_sst_rsync_wan
-%%WSREP%%bin/wsrep_sst_backup
@comment %%ETCDIR%%/conf.d/client.cnf
%%ETCDIR%%/conf.d/enable_encryption.preset
%%HASHICORP_VAULT%%%%ETCDIR%%/conf.d/hashicorp_key_management.cnf
@@ -68,9 +101,29 @@
@sample %%ETCDIR%%/conf.d/server.cnf.sample
%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
-@comment %%ETCDIR%%/my.cnf
-@comment %%ETCDIR%%/server.cnf
+@sample %%ETCDIR%%/my.cnf.sample
@sample %%ETCDIR%%/user_map.conf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_alloca.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_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
include/mysql/server/big_endian.h
include/mysql/server/byte_order_generic.h
include/mysql/server/byte_order_generic_x86.h
@@ -150,6 +203,7 @@
include/mysql/server/mysql/service_progress_report.h
include/mysql/server/mysql/service_sha1.h
include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_sql.h
include/mysql/server/mysql/service_thd_alloc.h
include/mysql/server/mysql/service_thd_autoinc.h
include/mysql/server/mysql/service_thd_error_context.h
@@ -158,7 +212,6 @@
include/mysql/server/mysql/service_thd_specifics.h
include/mysql/server/mysql/service_thd_timezone.h
include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_sql.h
%%WSREP%%include/mysql/server/mysql/service_wsrep.h
include/mysql/server/mysql/services.h
include/mysql/server/mysql_com.h
@@ -175,21 +228,34 @@
include/mysql/server/sslopt-longopts.h
include/mysql/server/sslopt-vars.h
include/mysql/server/typelib.h
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
lib/mysql/libmariadbd.a
lib/mysql/libmariadbd.so
lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqld.a
lib/mysql/libmysqld.so
+lib/mysql/libmysqlservices.a
lib/mysql/pam_user_map.so
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth_0x0100.so
lib/mysql/plugin/auth_ed25519.so
-@comment lib/mysql/plugin/auth_gssapi_client.so
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
+@comment lib/mysql/plugin/auth_gssapi_client.so
lib/mysql/plugin/auth_pam.so
lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
lib/mysql/plugin/auth_pam_v1.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/dialog.so
lib/mysql/plugin/disks.so
lib/mysql/plugin/file_key_management.so
lib/mysql/plugin/func_test.so
@@ -209,6 +275,7 @@
%%HASHICORP_VAULT%%lib/mysql/plugin/hashicorp_key_management.so
lib/mysql/plugin/locales.so
lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/password_reuse_check.so
lib/mysql/plugin/provider_bzip2.so
lib/mysql/plugin/provider_lz4.so
@@ -221,6 +288,7 @@
lib/mysql/plugin/query_cache_info.so
lib/mysql/plugin/query_response_time.so
lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/sha256_password.so
lib/mysql/plugin/simple_password_check.so
lib/mysql/plugin/sql_errlog.so
lib/mysql/plugin/test_sql_service.so
@@ -230,228 +298,9 @@
lib/mysql/plugin/type_test.so
%%WSREP%%lib/mysql/plugin/wsrep_info.so
lib/mysql/plugin/zstd.so
+libdata/pkgconfig/libmariadb.pc
libexec/mariadbd
libexec/mysqld
-@comment share/man/man1/aria_chk.1.gz
-@comment share/man/man1/aria_dump_log.1.gz
-@comment share/man/man1/aria_ftdump.1.gz
-@comment share/man/man1/aria_pack.1.gz
-@comment share/man/man1/aria_read_log.1.gz
-@comment %%S3%%share/man/man1/aria_s3_copy.1.gz
-@comment share/man/man1/galera_new_cluster.1.gz
-@comment share/man/man1/galera_recovery.1.gz
-@comment share/man/man1/innochecksum.1.gz
-@comment share/man/man1/mariabackup.1.gz
-@comment share/man/man1/mariadb-access.1.gz
-@comment share/man/man1/mariadb-admin.1.gz
-@comment share/man/man1/mariadb-backup.1.gz
-@comment share/man/man1/mariadb-binlog.1.gz
-@comment share/man/man1/mariadb-check.1.gz
-@comment share/man/man1/mariadb-client-test-embedded.1.gz
-@comment share/man/man1/mariadb-client-test.1.gz
-@comment share/man/man1/mariadb-conv.1.gz
-@comment share/man/man1/mariadb-convert-table-format.1.gz
-@comment share/man/man1/mariadb-dump.1.gz
-@comment share/man/man1/mariadb-dumpslow.1.gz
-@comment share/man/man1/mariadb-embedded.1.gz
-@comment share/man/man1/mariadb-find-rows.1.gz
-@comment share/man/man1/mariadb-fix-extensions.1.gz
-@comment share/man/man1/mariadb-hotcopy.1.gz
-@comment share/man/man1/mariadb-import.1.gz
-@comment share/man/man1/mariadb-install-db.1.gz
-@comment %%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
-@comment share/man/man1/mariadb-plugin.1.gz
-@comment share/man/man1/mariadb-secure-installation.1.gz
-@comment share/man/man1/mariadb-service-convert.1.gz
-@comment share/man/man1/mariadb-setpermission.1.gz
-@comment share/man/man1/mariadb-show.1.gz
-@comment share/man/man1/mariadb-slap.1.gz
-@comment share/man/man1/mariadb-test-embedded.1.gz
-@comment share/man/man1/mariadb-test.1.gz
-@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
-@comment share/man/man1/mariadb-upgrade.1.gz
-@comment share/man/man1/mariadb-waitpid.1.gz
-@comment share/man/man1/mariadbd-multi.1.gz
-@comment share/man/man1/mariadbd-safe-helper.1.gz
-@comment share/man/man1/mariadbd-safe.1.gz
-@comment share/man/man1/mariadb.1.gz
-@comment share/man/man1/mariadb_config.1.gz
-@comment share/man/man1/mbstream.1.gz
-@comment share/man/man1/msql2mysql.1.gz
-@comment share/man/man1/my_print_defaults.1.gz
-@comment share/man/man1/my_safe_process.1.gz
-@comment share/man/man1/myisam_ftdump.1.gz
-@comment share/man/man1/myisamchk.1.gz
-@comment share/man/man1/myisamlog.1.gz
-@comment share/man/man1/myisampack.1.gz
-@comment %%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
-@comment share/man/man1/mysql-stress-test.pl.1.gz
-@comment share/man/man1/mysql-test-run.pl.1.gz
-@comment share/man/man1/mysql.1.gz
-@comment share/man/man1/mysql_client_test.1.gz
-@comment share/man/man1/mysql_client_test_embedded.1.gz
-@comment share/man/man1/mysql_config.1.gz
-@comment share/man/man1/mysql_convert_table_format.1.gz
-@comment share/man/man1/mysql_embedded.1.gz
-@comment share/man/man1/mysql_find_rows.1.gz
-@comment share/man/man1/mysql_plugin.1.gz
-@comment share/man/man1/mysql_setpermission.1.gz
-@comment share/man/man1/mysqlaccess.1.gz
-@comment share/man/man1/mysqladmin.1.gz
-@comment share/man/man1/mysqlbinlog.1.gz
-@comment share/man/man1/mysqlcheck.1.gz
-@comment share/man/man1/mysqldump.1.gz
-@comment share/man/man1/mysqlhotcopy.1.gz
-@comment share/man/man1/mysqlimport.1.gz
-@comment share/man/man1/mysqlshow.1.gz
-@comment share/man/man1/mysqlslap.1.gz
-@comment share/man/man1/mysqltest.1.gz
-@comment share/man/man1/mysqltest_embedded.1.gz
-@comment share/man/man1/mytop.1.gz
-@comment share/man/man1/mysql.server.1.gz
-@comment share/man/man1/mysql_fix_extensions.1.gz
-@comment share/man/man1/mysql_install_db.1.gz
-@comment %%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
-@comment share/man/man1/mysql_secure_installation.1.gz
-@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
-@comment share/man/man1/mysql_upgrade.1.gz
-@comment share/man/man1/mysql_waitpid.1.gz
-@comment share/man/man1/mysqld_multi.1.gz
-@comment share/man/man1/mysqld_safe.1.gz
-@comment share/man/man1/mysqld_safe_helper.1.gz
-@comment share/man/man1/mysqldumpslow.1.gz
-@comment share/man/man1/perror.1.gz
-@comment share/man/man1/replace.1.gz
-@comment share/man/man1/resolve_stack_dump.1.gz
-@comment share/man/man1/resolveip.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_common.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
-%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
-@comment share/man/man3/mariadb_cancel.3.gz
-@comment share/man/man3/mariadb_connection.3.gz
-@comment share/man/man3/mariadb_dyncol_check.3.gz
-@comment share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
-@comment share/man/man3/mariadb_dyncol_column_count.3.gz
-@comment share/man/man3/mariadb_dyncol_create_many_named.3.gz
-@comment share/man/man3/mariadb_dyncol_create_many_num.3.gz
-@comment share/man/man3/mariadb_dyncol_exists_named.3.gz
-@comment share/man/man3/mariadb_dyncol_exists_num.3.gz
-@comment share/man/man3/mariadb_dyncol_free.3.gz
-@comment share/man/man3/mariadb_dyncol_list_named.3.gz
-@comment share/man/man3/mariadb_dyncol_list_num.3.gz
-@comment share/man/man3/mariadb_dyncol_unpack.3.gz
-@comment share/man/man3/mariadb_dyncol_update_many_named.3.gz
-@comment share/man/man3/mariadb_dyncol_update_many_num.3.gz
-@comment share/man/man3/mariadb_get_infov.3.gz
-@comment share/man/man3/mariadb_reconnect.3.gz
-@comment share/man/man3/mariadb_rpl_close.3.gz
-@comment share/man/man3/mariadb_rpl_fetch.3.gz
-@comment share/man/man3/mariadb_rpl_get_optionsv.3.gz
-@comment share/man/man3/mariadb_rpl_open.3.gz
-@comment share/man/man3/mariadb_rpl_optionsv.3.gz
-@comment share/man/man3/mariadb_stmt_execute_direct.3.gz
-@comment share/man/man3/mariadb_stmt_fetch_fields.3.gz
-@comment share/man/man3/mysql_affected_rows.3.gz
-@comment share/man/man3/mysql_autocommit.3.gz
-@comment share/man/man3/mysql_change_user.3.gz
-@comment share/man/man3/mysql_close.3.gz
-@comment share/man/man3/mysql_commit.3.gz
-@comment share/man/man3/mysql_data_seek.3.gz
-@comment share/man/man3/mysql_errno.3.gz
-@comment share/man/man3/mysql_error.3.gz
-@comment share/man/man3/mysql_fetch_field.3.gz
-@comment share/man/man3/mysql_fetch_field_direct.3.gz
-@comment share/man/man3/mysql_fetch_fields.3.gz
-@comment share/man/man3/mysql_fetch_lengths.3.gz
-@comment share/man/man3/mysql_fetch_row.3.gz
-@comment share/man/man3/mysql_field_count.3.gz
-@comment share/man/man3/mysql_field_seek.3.gz
-@comment share/man/man3/mysql_field_tell.3.gz
-@comment share/man/man3/mysql_free_result.3.gz
-@comment share/man/man3/mysql_get_character_set_info.3.gz
-@comment share/man/man3/mysql_get_client_info.3.gz
-@comment share/man/man3/mysql_get_client_version.3.gz
-@comment share/man/man3/mysql_get_host_info.3.gz
-@comment share/man/man3/mysql_get_proto_info.3.gz
-@comment share/man/man3/mysql_get_server_info.3.gz
-@comment share/man/man3/mysql_get_server_version.3.gz
-@comment share/man/man3/mysql_get_socket.3.gz
-@comment share/man/man3/mysql_get_ssl_cipher.3.gz
-@comment share/man/man3/mysql_hex_string.3.gz
-@comment share/man/man3/mysql_info.3.gz
-@comment share/man/man3/mysql_init.3.gz
-@comment share/man/man3/mysql_kill.3.gz
-@comment share/man/man3/mysql_more_results.3.gz
-@comment share/man/man3/mysql_next_result.3.gz
-@comment share/man/man3/mysql_num_fields.3.gz
-@comment share/man/man3/mysql_num_rows.3.gz
-@comment share/man/man3/mysql_options.3.gz
-@comment share/man/man3/mysql_options4.3.gz
-@comment share/man/man3/mysql_optionsv.3.gz
-@comment share/man/man3/mysql_ping.3.gz
-@comment share/man/man3/mysql_query.3.gz
-@comment share/man/man3/mysql_read_query_result.3.gz
-@comment share/man/man3/mysql_real_connect.3.gz
-@comment share/man/man3/mysql_real_escape_string.3.gz
-@comment share/man/man3/mysql_real_query.3.gz
-@comment share/man/man3/mysql_refresh.3.gz
-@comment share/man/man3/mysql_reset_connection.3.gz
-@comment share/man/man3/mysql_rollback.3.gz
-@comment share/man/man3/mysql_row_seek.3.gz
-@comment share/man/man3/mysql_row_tell.3.gz
-@comment share/man/man3/mysql_select_db.3.gz
-@comment share/man/man3/mysql_send_query.3.gz
-@comment share/man/man3/mysql_server_end.3.gz
-@comment share/man/man3/mysql_server_init.3.gz
-@comment share/man/man3/mysql_session_track_get_first.3.gz
-@comment share/man/man3/mysql_session_track_get_next.3.gz
-@comment share/man/man3/mysql_set_character_set.3.gz
-@comment share/man/man3/mysql_set_server_option.3.gz
-@comment share/man/man3/mysql_shutdown.3.gz
-@comment share/man/man3/mysql_sqlstate.3.gz
-@comment share/man/man3/mysql_ssl_set.3.gz
-@comment share/man/man3/mysql_stat.3.gz
-@comment share/man/man3/mysql_stmt_affected_rows.3.gz
-@comment share/man/man3/mysql_stmt_attr_get.3.gz
-@comment share/man/man3/mysql_stmt_attr_set.3.gz
-@comment share/man/man3/mysql_stmt_bind_param.3.gz
-@comment share/man/man3/mysql_stmt_bind_result.3.gz
-@comment share/man/man3/mysql_stmt_close.3.gz
-@comment share/man/man3/mysql_stmt_data_seek.3.gz
-@comment share/man/man3/mysql_stmt_errno.3.gz
-@comment share/man/man3/mysql_stmt_error.3.gz
-@comment share/man/man3/mysql_stmt_execute.3.gz
-@comment share/man/man3/mysql_stmt_fetch.3.gz
-@comment share/man/man3/mysql_stmt_fetch_column.3.gz
-@comment share/man/man3/mysql_stmt_field_count.3.gz
-@comment share/man/man3/mysql_stmt_free_result.3.gz
-@comment share/man/man3/mysql_stmt_init.3.gz
-@comment share/man/man3/mysql_stmt_insert_id.3.gz
-@comment share/man/man3/mysql_stmt_more_results.3.gz
-@comment share/man/man3/mysql_stmt_next_result.3.gz
-@comment share/man/man3/mysql_stmt_num_rows.3.gz
-@comment share/man/man3/mysql_stmt_param_count.3.gz
-@comment share/man/man3/mysql_stmt_param_metadata.3.gz
-@comment share/man/man3/mysql_stmt_prepare.3.gz
-@comment share/man/man3/mysql_stmt_reset.3.gz
-@comment share/man/man3/mysql_stmt_result_metadata.3.gz
-@comment share/man/man3/mysql_stmt_row_seek.3.gz
-@comment share/man/man3/mysql_stmt_row_tell.3.gz
-@comment share/man/man3/mysql_stmt_send_long_data.3.gz
-@comment share/man/man3/mysql_stmt_sqlstate.3.gz
-@comment share/man/man3/mysql_stmt_store_result.3.gz
-@comment share/man/man3/mysql_stmt_warning_count.3.gz
-@comment share/man/man3/mysql_store_result.3.gz
-@comment share/man/man3/mysql_thread_end.3.gz
-@comment share/man/man3/mysql_thread_id.3.gz
-@comment share/man/man3/mysql_thread_init.3.gz
-@comment share/man/man3/mysql_use_result.3.gz
-@comment share/man/man3/mysql_warning_count.3.gz
-@comment share/man/man8/mariadbd.8.gz
-@comment share/man/man8/mysqld.8.gz
share/aclocal/mysql.m4
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
@@ -459,9 +308,229 @@
%%PORTDOCS%%%%DOCSDIR%%/README.md
%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/groonga/README.md
+%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
%%MROONGA%%share/groonga-normalizer-mysql/README.md
%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
-%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
+share/man/man1/aria_chk.1.gz
+share/man/man1/aria_dump_log.1.gz
+share/man/man1/aria_ftdump.1.gz
+share/man/man1/aria_pack.1.gz
+share/man/man1/aria_read_log.1.gz
+share/man/man1/aria_s3_copy.1.gz
+%%WSREP%%share/man/man1/galera_new_cluster.1.gz
+%%WSREP%%share/man/man1/galera_recovery.1.gz
+share/man/man1/innochecksum.1.gz
+share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-conv.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb-dump.1.gz
+share/man/man1/mariadb-dumpslow.1.gz
+share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+share/man/man1/mariadb-install-db.1.gz
+share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+share/man/man1/mariadb-secure-installation.1.gz
+share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+share/man/man1/mariadb-tzinfo-to-sql.1.gz
+share/man/man1/mariadb-upgrade.1.gz
+share/man/man1/mariadb-waitpid.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadbd-multi.1.gz
+share/man/man1/mariadbd-safe-helper.1.gz
+share/man/man1/mariadbd-safe.1.gz
+share/man/man1/mbstream.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+share/man/man1/myrocks_hotbackup.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+share/man/man1/mysql_fix_extensions.1.gz
+share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_plugin.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldump.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+share/man/man1/mytop.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+share/man/man1/resolve_stack_dump.1.gz
+share/man/man1/resolveip.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
+share/man/man8/mariadbd.8.gz
+share/man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
@@ -499,8 +568,8 @@
%%DATADIR%%/estonian/errmsg.sys
%%DATADIR%%/fill_help_tables.sql
%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/georgian/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/greek/errmsg.sys
%%DATADIR%%/hindi/errmsg.sys
%%DATADIR%%/hungarian/errmsg.sys
@@ -534,7 +603,5 @@
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
-@comment %%DATADIR%%/wsrep.cnf
%%WSREP%%%%DATADIR%%/wsrep_notify
@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
-
diff --git a/databases/mariadb106-client/Makefile b/databases/mariadb106-client/Makefile
deleted file mode 100644
--- a/databases/mariadb106-client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-PORTNAME= mariadb
-PKGNAMESUFFIX= 106-client
-
-COMMENT= Multithreaded SQL database (client)
-
-MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
-
-PLIST= ${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist
deleted file mode 100644
--- a/databases/mariadb106-client/pkg-plist
+++ /dev/null
@@ -1,266 +0,0 @@
-bin/mariadb
-bin/mariadb-access
-bin/mariadb-admin
-bin/mariadb-binlog
-bin/mariadb-check
-bin/mariadb-config
-bin/mariadb-conv
-bin/mariadb-convert-table-format
-bin/mariadb-dump
-@comment bin/mariadb-dumpslow
-bin/mariadb-find-rows
-bin/mariadb-hotcopy
-bin/mariadb-import
-bin/mariadb-plugin
-bin/mariadb-show
-@comment bin/mariadb-secure-installation
-bin/mariadb-setpermission
-bin/mariadb-slap
-bin/mariadb-test
-bin/mariadb-waitpid
-bin/mariadb_config
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-@comment bin/mysql_secure_installation
-bin/mysql_setpermission
-@comment bin/mysql_plugin
-@comment bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-@comment bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysqltest
-bin/mytop
-bin/my_print_defaults
-bin/replace
-@sample %%ETCDIR%%/my.cnf.sample
-@sample %%ETCDIR%%/conf.d/client.cnf.sample
-include/mysql/errmsg.h
-include/mysql/ma_list.h
-include/mysql/ma_pvio.h
-include/mysql/ma_tls.h
-include/mysql/mariadb/ma_io.h
-include/mysql/mariadb_com.h
-include/mysql/mariadb_ctype.h
-include/mysql/mariadb_dyncol.h
-include/mysql/mariadb_rpl.h
-include/mysql/mariadb_stmt.h
-include/mysql/mariadb_version.h
-include/mysql/my_alloca.h
-include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysqld_error.h
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
-lib/mysql/libmariadb.a
-lib/mysql/libmariadb.so
-lib/mysql/libmariadb.so.3
-lib/mysql/libmariadbclient.a
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlservices.a
-lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/client_ed25519.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/mysql_clear_password.so
-lib/mysql/plugin/sha256_password.so
-@comment lib/mysql/plugin/zstd.so
-libdata/pkgconfig/libmariadb.pc
-share/man/man1/mariadb.1.gz
-share/man/man1/mariadb-access.1.gz
-share/man/man1/mariadb-admin.1.gz
-share/man/man1/mariadb-binlog.1.gz
-share/man/man1/mariadb-check.1.gz
-share/man/man1/mariadb-client-test-embedded.1.gz
-share/man/man1/mariadb-client-test.1.gz
-share/man/man1/mariadb-convert-table-format.1.gz
-share/man/man1/mariadb_config.1.gz
-share/man/man1/mariadb-dump.1.gz
-@comment share/man/man1/mariadb-dumpslow.1.gz
-@comment share/man/man1/mariadb-embedded.1.gz
-share/man/man1/mariadb-find-rows.1.gz
-share/man/man1/mariadb-hotcopy.1.gz
-share/man/man1/mariadb-import.1.gz
-share/man/man1/mariadb-plugin.1.gz
-@comment share/man/man1/mariadb-secure-installation.1.gz
-share/man/man1/mariadb-setpermission.1.gz
-share/man/man1/mariadb-show.1.gz
-share/man/man1/mariadb-slap.1.gz
-share/man/man1/mariadb-test-embedded.1.gz
-share/man/man1/mariadb-test.1.gz
-@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
-@comment share/man/man1/mariadb-waitpid.1.gz
-share/man/man1/msql2mysql.1.gz
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/my_safe_process.1.gz
-@comment share/man/man1/myisam_ftdump.1.gz
-@comment share/man/man1/myisamchk.1.gz
-@comment share/man/man1/myisamlog.1.gz
-@comment share/man/man1/myisampack.1.gz
-share/man/man1/mysql-stress-test.pl.1.gz
-share/man/man1/mysql-test-run.pl.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_client_test.1.gz
-share/man/man1/mysql_client_test_embedded.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_convert_table_format.1.gz
-share/man/man1/mysql_embedded.1.gz
-share/man/man1/mysql_find_rows.1.gz
-share/man/man1/mysql_plugin.1.gz
-@comment share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_setpermission.1.gz
-@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
-@comment share/man/man1/mysql_waitpid.1.gz
-share/man/man1/mysqlaccess.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-@comment share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlhotcopy.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/man/man1/mysqltest.1.gz
-share/man/man1/mysqltest_embedded.1.gz
-share/man/man1/mytop.1.gz
-@comment share/man/man1/perror.1.gz
-share/man/man1/replace.1.gz
-@comment share/man/man1/resolve_stack_dump.1.gz
-share/man/man3/mariadb_cancel.3.gz
-share/man/man3/mariadb_connection.3.gz
-share/man/man3/mariadb_dyncol_check.3.gz
-share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
-share/man/man3/mariadb_dyncol_column_count.3.gz
-share/man/man3/mariadb_dyncol_create_many_named.3.gz
-share/man/man3/mariadb_dyncol_create_many_num.3.gz
-share/man/man3/mariadb_dyncol_exists_named.3.gz
-share/man/man3/mariadb_dyncol_exists_num.3.gz
-share/man/man3/mariadb_dyncol_free.3.gz
-share/man/man3/mariadb_dyncol_list_named.3.gz
-share/man/man3/mariadb_dyncol_list_num.3.gz
-share/man/man3/mariadb_dyncol_unpack.3.gz
-share/man/man3/mariadb_dyncol_update_many_named.3.gz
-share/man/man3/mariadb_dyncol_update_many_num.3.gz
-share/man/man3/mariadb_get_infov.3.gz
-share/man/man3/mariadb_reconnect.3.gz
-share/man/man3/mariadb_rpl_close.3.gz
-share/man/man3/mariadb_rpl_fetch.3.gz
-share/man/man3/mariadb_rpl_get_optionsv.3.gz
-share/man/man3/mariadb_rpl_open.3.gz
-share/man/man3/mariadb_rpl_optionsv.3.gz
-share/man/man3/mariadb_stmt_execute_direct.3.gz
-share/man/man3/mariadb_stmt_fetch_fields.3.gz
-share/man/man3/mysql_affected_rows.3.gz
-share/man/man3/mysql_autocommit.3.gz
-share/man/man3/mysql_change_user.3.gz
-share/man/man3/mysql_close.3.gz
-share/man/man3/mysql_commit.3.gz
-share/man/man3/mysql_data_seek.3.gz
-share/man/man3/mysql_errno.3.gz
-share/man/man3/mysql_error.3.gz
-share/man/man3/mysql_fetch_field.3.gz
-share/man/man3/mysql_fetch_field_direct.3.gz
-share/man/man3/mysql_fetch_fields.3.gz
-share/man/man3/mysql_fetch_lengths.3.gz
-share/man/man3/mysql_fetch_row.3.gz
-share/man/man3/mysql_field_count.3.gz
-share/man/man3/mysql_field_seek.3.gz
-share/man/man3/mysql_field_tell.3.gz
-share/man/man3/mysql_free_result.3.gz
-share/man/man3/mysql_get_character_set_info.3.gz
-share/man/man3/mysql_get_client_info.3.gz
-share/man/man3/mysql_get_client_version.3.gz
-share/man/man3/mysql_get_host_info.3.gz
-share/man/man3/mysql_get_proto_info.3.gz
-share/man/man3/mysql_get_server_info.3.gz
-share/man/man3/mysql_get_server_version.3.gz
-share/man/man3/mysql_get_socket.3.gz
-share/man/man3/mysql_get_ssl_cipher.3.gz
-share/man/man3/mysql_hex_string.3.gz
-share/man/man3/mysql_info.3.gz
-share/man/man3/mysql_init.3.gz
-share/man/man3/mysql_kill.3.gz
-share/man/man3/mysql_more_results.3.gz
-share/man/man3/mysql_next_result.3.gz
-share/man/man3/mysql_num_fields.3.gz
-share/man/man3/mysql_num_rows.3.gz
-share/man/man3/mysql_options.3.gz
-share/man/man3/mysql_options4.3.gz
-share/man/man3/mysql_optionsv.3.gz
-share/man/man3/mysql_ping.3.gz
-share/man/man3/mysql_query.3.gz
-share/man/man3/mysql_read_query_result.3.gz
-share/man/man3/mysql_real_connect.3.gz
-share/man/man3/mysql_real_escape_string.3.gz
-share/man/man3/mysql_real_query.3.gz
-share/man/man3/mysql_refresh.3.gz
-share/man/man3/mysql_reset_connection.3.gz
-share/man/man3/mysql_rollback.3.gz
-share/man/man3/mysql_row_seek.3.gz
-share/man/man3/mysql_row_tell.3.gz
-share/man/man3/mysql_select_db.3.gz
-share/man/man3/mysql_send_query.3.gz
-share/man/man3/mysql_server_end.3.gz
-share/man/man3/mysql_server_init.3.gz
-share/man/man3/mysql_session_track_get_first.3.gz
-share/man/man3/mysql_session_track_get_next.3.gz
-share/man/man3/mysql_set_character_set.3.gz
-share/man/man3/mysql_set_server_option.3.gz
-share/man/man3/mysql_shutdown.3.gz
-share/man/man3/mysql_sqlstate.3.gz
-share/man/man3/mysql_ssl_set.3.gz
-share/man/man3/mysql_stat.3.gz
-share/man/man3/mysql_stmt_affected_rows.3.gz
-share/man/man3/mysql_stmt_attr_get.3.gz
-share/man/man3/mysql_stmt_attr_set.3.gz
-share/man/man3/mysql_stmt_bind_param.3.gz
-share/man/man3/mysql_stmt_bind_result.3.gz
-share/man/man3/mysql_stmt_close.3.gz
-share/man/man3/mysql_stmt_data_seek.3.gz
-share/man/man3/mysql_stmt_errno.3.gz
-share/man/man3/mysql_stmt_error.3.gz
-share/man/man3/mysql_stmt_execute.3.gz
-share/man/man3/mysql_stmt_fetch.3.gz
-share/man/man3/mysql_stmt_fetch_column.3.gz
-share/man/man3/mysql_stmt_field_count.3.gz
-share/man/man3/mysql_stmt_free_result.3.gz
-share/man/man3/mysql_stmt_init.3.gz
-share/man/man3/mysql_stmt_insert_id.3.gz
-share/man/man3/mysql_stmt_more_results.3.gz
-share/man/man3/mysql_stmt_next_result.3.gz
-share/man/man3/mysql_stmt_num_rows.3.gz
-share/man/man3/mysql_stmt_param_count.3.gz
-share/man/man3/mysql_stmt_param_metadata.3.gz
-share/man/man3/mysql_stmt_prepare.3.gz
-share/man/man3/mysql_stmt_reset.3.gz
-share/man/man3/mysql_stmt_result_metadata.3.gz
-share/man/man3/mysql_stmt_row_seek.3.gz
-share/man/man3/mysql_stmt_row_tell.3.gz
-share/man/man3/mysql_stmt_send_long_data.3.gz
-share/man/man3/mysql_stmt_sqlstate.3.gz
-share/man/man3/mysql_stmt_store_result.3.gz
-share/man/man3/mysql_stmt_warning_count.3.gz
-share/man/man3/mysql_store_result.3.gz
-share/man/man3/mysql_thread_end.3.gz
-share/man/man3/mysql_thread_id.3.gz
-share/man/man3/mysql_thread_init.3.gz
-share/man/man3/mysql_use_result.3.gz
-share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -34,13 +34,13 @@
USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-SUB_FILES= pkg-message
+SUB_FILES= my.cnf.sample pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES= scripts/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql
+DATADIR= ${PREFIX}/share/mysql
MARIADB_USER?= mysql
MARIADB_GROUP?= mysql
@@ -56,6 +56,8 @@
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE
+SUFXD_NAME= mariadb106
+
.if ${PKGNAMESUFFIX:M*-server}
# MySQL-Server options
OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
@@ -120,9 +122,6 @@
DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-DATADIR= ${PREFIX}/share/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
@@ -144,22 +143,24 @@
CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
CMAKE_OFF+= WITH_WSREP
USES+= readline
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SUB_FILES+= my.cnf.sample client.cnf.sample
+SUB_FILES+= client.cnf.sample
.else # ! ${PKGNAMESUFFIX:M*-client}
# MySQL-Server part
-USES+= mysql:106m
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR= mysql-server
+# Install to a prefix to be able to co-install multiple versions of the
+# server. The client installs to ${LOCALBASE}.
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
+
+USE_RC_SUBR= ${SUFXD_NAME}-server
CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
CMAKE_OFF+= WITH_CLIENT
SUB_FILES+= server.cnf.sample
SUB_LIST+= MARIADB_DBDIR="${MARIADB_DBDIR}" \
MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
- MARIADB_USER="${MARIADB_USER}"
+ MARIADB_USER="${MARIADB_USER}" \
+ SUFXD_NAME="${SUFXD_NAME}"
PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
MARIADB_USER="${MARIADB_USER}" \
MARIADB_GROUP="${MARIADB_GROUP}"
@@ -242,11 +243,18 @@
${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \
${WRKSRC}/scripts/mysql_config.sh
-pre-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
.if ${PKGNAMESUFFIX:M*-client}
post-install:
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
@@ -260,10 +268,11 @@
.else # ! ${PKGNAMESUFFIX:M*-client}
post-install:
+ ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
- ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+ ${STAGEDIR}${ETCDIR}/user_map.conf.sample
${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
${STAGEDIR}${PREFIX}/lib/mysql/
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
@@ -275,8 +284,6 @@
${STAGEDIR}${ETCDIR}/logrotate.d \
${STAGEDIR}${DOCSDIR}/COPYING
${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
- ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
- >> ${TMPPLIST}
post-install-MROONGA-on:
${MV} ${STAGEDIR}${PREFIX}/share/groonga ${STAGEDIR}${DOCSDIR}
diff --git a/databases/mariadb106-server/files/mariadb106-server.in b/databases/mariadb106-server/files/mariadb106-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mariadb106-server/files/mariadb106-server.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_(instance_)?enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+%%LEGACY_LIMITS%%# %%SUFXD_NAME%%_(instance_)?limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%# just before mysql starts.
+# %%SUFXD_NAME%%_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_(instance_)?args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+# %%SUFXD_NAME%%_(instance_)?pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_(instance_)?user (str): User to run mysqld as
+# Default to "%%MARIADB_USER%%" created by the port
+# %%SUFXD_NAME%%_(instance_)?optfile (str): Server-specific option file.
+# Default to "${%%SUFXD_NAME%%_dbdir}/my.cnf".
+# %%SUFXD_NAME%%_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
+# %%SUFXD_NAME%%_instances (str): Set to "" by default.
+# If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+%%LEGACY_LIMITS%%: ${%%SUFXD_NAME%%_limits="NO"}
+: ${%%SUFXD_NAME%%_user="%%MARIADB_USER%%"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${%%SUFXD_NAME%%_user}"
+: ${%%SUFXD_NAME%%_dbdir="%%MARIADB_DBDIR%%"}
+: ${%%SUFXD_NAME%%_optfile="%%ETCDIR%%/my.cnf"}
+: ${%%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+
+if [ -n "$2" ]; then
+ instance="$2"
+ load_rc_config ${name}_${instance}
+ case "$%%SUFXD_NAME%%_instances" in
+ "$2 "*|*" $2 "*|*" $2"|"$2")
+ eval %%SUFXD_NAME%%_args="\${%%SUFXD_NAME%%_${instance}_args:-\"${%%SUFXD_NAME%%_args}\"}"
+ eval %%SUFXD_NAME%%_dbdir="\${%%SUFXD_NAME%%_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
+ %%LEGACY_LIMITS%%eval %%SUFXD_NAME%%_limits="\${%%SUFXD_NAME%%_${instance}_limits:-\"${%%SUFXD_NAME%%_limits}\"}"
+ eval %%SUFXD_NAME%%_user="\${%%SUFXD_NAME%%_${instance}_user:-\"${%%SUFXD_NAME%%_user}\"}"
+ %%LEGACY_LIMITS%%eval mysql_limits_args="\${%%SUFXD_NAME%%_${instance}_limits_args:-\"-e -U $%%SUFXD_NAME%%_user\"}"
+ eval %%SUFXD_NAME%%_socket="\${%%SUFXD_NAME%%_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+ eval %%SUFXD_NAME%%_optfile="\${%%SUFXD_NAME%%_${instance}_optfile:-\"%%PREFIX%%/etc/mariadb_${instance}/my.cnf\"}"
+ eval %%SUFXD_NAME%%_pidfile="\${%%SUFXD_NAME%%_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
+ ;;
+ *)
+ err 1 "$2 not found in %%SUFXD_NAME%%_instances" ;;
+ esac
+else
+ if [ -n "${%%SUFXD_NAME%%_instances}" -a -n "$1" ]; then
+ for instance in ${%%SUFXD_NAME%%_instances}; do
+ eval _enable="\${%%SUFXD_NAME%%_${instance}_enable}"
+ case "${_enable:-${%%SUFXD_NAME%%_enable}}" in
+ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ continue
+ ;;
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ if [ -z "$_enable" ]; then
+ _var=%%SUFXD_NAME%%_enable
+ else
+ _var=%%SUFXD_NAME%%_${instance}_enable
+ fi
+ warn "Bad value" \
+ "'${_enable:-${%%SUFXD_NAME%%_enable}}'" \
+ "for ${_var}. " \
+ "Instance ${instance} skipped."
+ continue
+ ;;
+ esac
+ echo "===> mysql instance: ${instance}"
+ if %%LOCALBASE%%/etc/rc.d/%%SUFXD_NAME%%-server $1 ${instance}; then
+ success="${instance} ${success}"
+ else
+ failed="${instance} (${retcode}) ${failed}"
+ fi
+ done
+ exit 0
+ else
+ %%SUFXD_NAME%%_pidfile=${%%SUFXD_NAME%%_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+ fi
+fi
+
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+ mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+pidfile=$%%SUFXD_NAME%%_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe ${mysql_extra} --user=${%%SUFXD_NAME%%_user} --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} ${%%SUFXD_NAME%%_socket:+--socket=${%%SUFXD_NAME%%_socket}} ${%%SUFXD_NAME%%_args}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args
+ [ $? -eq 0 ] && chown -R ${%%SUFXD_NAME%%_user}:$(id -gn $%%SUFXD_NAME%%_user) ${%%SUFXD_NAME%%_dbdir}
+}
+
+mysql_prestart()
+{
+ local dir
+ for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
+ if [ -f "${dir}/my.cnf" ]; then
+ echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+ return 1
+ fi
+ done
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ mysql_group="`/usr/bin/id -gn ${%%SUFXD_NAME%%_user}`"
+ [ "${%%SUFXD_NAME%%_socket}" = "" ] && %%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%" || %%SUFXD_NAME%%_rundir="`/usr/bin/dirname ${%%SUFXD_NAME%%_socket}`"
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -o ${%%SUFXD_NAME%%_user} -g ${mysql_group} "${%%SUFXD_NAME%%_rundir}"
+ fi
+%%LEGACY_LIMITS%% if checkyesno %%SUFXD_NAME%%_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -u${%%SUFXD_NAME%%_user} -g$(id -gn $%%SUFXD_NAME%%_user) -m755 ${%%SUFXD_NAME%%_rundir}
+ fi
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mariadb106-server/files/mysql-server.in b/databases/mariadb106-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mariadb106-server/files/mysql-server.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%# just before mysql starts.
-# mysql_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
-# Base database directory.
-# mysql_(instance_)?args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-# Default to "%%MARIADB_USER%%" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
-# mysql_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
-# mysql_instances (str): Set to "" by default.
-# If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="%%MARIADB_USER%%"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
-: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
-: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mariadbd"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
- instance="$2"
- load_rc_config ${name}_${instance}
- case "$mysql_instances" in
- "$2 "*|*" $2 "*|*" $2"|"$2")
- eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
- eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
- eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
- eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
- eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
- eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
- ;;
- *)
- err 1 "$2 not found in mysql_instances" ;;
- esac
-else
- if [ -n "${mysql_instances}" -a -n "$1" ]; then
- for instance in ${mysql_instances}; do
- eval _enable="\${mysql_${instance}_enable}"
- case "${_enable:-${mysql_enable}}" in
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
- continue
- ;;
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- ;;
- *)
- if [ -z "$_enable" ]; then
- _var=mysql_enable
- else
- _var=mysql_${instance}_enable
- fi
- warn "Bad value" \
- "'${_enable:-${mysql_enable}}'" \
- "for ${_var}. " \
- "Instance ${instance} skipped."
- continue
- ;;
- esac
- echo "===> mysql instance: ${instance}"
- if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
- success="${instance} ${success}"
- else
- failed="${instance} (${retcode}) ${failed}"
- fi
- done
- exit 0
- else
- mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
- fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args
- [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- local dir
- for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
- if [ -f "${dir}/my.cnf" ]; then
- echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
- return 1
- fi
- done
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- mysql_group="`/usr/bin/id -gn ${mysql_user}`"
- [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
- fi
-%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%% else
-%%LEGACY_LIMITS%% return 0
-%%LEGACY_LIMITS%% fi
-%%MODERN_LIMITS%% return 0
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
- fi
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -3,68 +3,123 @@
bin/aria_ftdump
bin/aria_pack
bin/aria_read_log
-%%S3%%bin/aria_s3_copy
%%INNOBASE%%bin/innochecksum
%%INNOBASE%%bin/mariabackup
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
bin/mariadb-backup
+bin/mariadb-binlog
+bin/mariadb-check
bin/mariadb-client-test
bin/mariadb-client-test-embedded
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
bin/mariadb-dumpslow
bin/mariadb-embedded
+bin/mariadb-find-rows
bin/mariadb-fix-extensions
+bin/mariadb-hotcopy
+bin/mariadb-import
bin/mariadb-install-db
%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-plugin
bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-show
+bin/mariadb-slap
+bin/mariadb-test
bin/mariadb-test-embedded
bin/mariadb-tzinfo-to-sql
bin/mariadb-upgrade
+bin/mariadb-waitpid
+bin/mariadb_config
bin/mariadbd-multi
bin/mariadbd-safe
bin/mariadbd-safe-helper
%%INNOBASE%%bin/mbstream
+bin/msql2mysql
+bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
-@comment bin/mytop
%%ROCKSDB%%bin/myrocks_hotbackup
+bin/mysql
bin/mysql_client_test
bin/mysql_client_test_embedded
+bin/mysql_config
+bin/mysql_convert_table_format
bin/mysql_embedded
+bin/mysql_find_rows
bin/mysql_fix_extensions
bin/mysql_install_db
%%ROCKSDB%%bin/mysql_ldb
bin/mysql_plugin
bin/mysql_secure_installation
+bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper
+bin/mysqldump
bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
bin/mysqltest_embedded
+@comment bin/mytop
bin/perror
+bin/replace
bin/resolve_stack_dump
bin/resolveip
%%ROCKSDB%%bin/sst_dump
bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_backup
%%WSREP%%bin/wsrep_sst_common
%%WSREP%%bin/wsrep_sst_mariabackup
%%WSREP%%bin/wsrep_sst_mysqldump
%%WSREP%%bin/wsrep_sst_rsync
%%WSREP%%bin/wsrep_sst_rsync_wan
-%%WSREP%%bin/wsrep_sst_backup
@comment %%ETCDIR%%/conf.d/client.cnf
%%ETCDIR%%/conf.d/enable_encryption.preset
%%ETCDIR%%/conf.d/mysql-clients.cnf
-%%S3%%%%ETCDIR%%/conf.d/s3.cnf
-@comment %%ETCDIR%%/server.cnf
@sample %%ETCDIR%%/conf.d/server.cnf.sample
%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
-%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
-@comment %%ETCDIR%%/my.cnf
+%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample
+@sample %%ETCDIR%%/my.cnf.sample
@sample %%ETCDIR%%/user_map.conf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_alloca.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_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
include/mysql/server/big_endian.h
include/mysql/server/byte_order_generic.h
include/mysql/server/byte_order_generic_x86.h
@@ -169,21 +224,34 @@
include/mysql/server/sslopt-longopts.h
include/mysql/server/sslopt-vars.h
include/mysql/server/typelib.h
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
lib/mysql/libmariadbd.a
lib/mysql/libmariadbd.so
lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqld.a
lib/mysql/libmysqld.so
+lib/mysql/libmysqlservices.a
lib/mysql/pam_user_map.so
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth_0x0100.so
lib/mysql/plugin/auth_ed25519.so
-@comment lib/mysql/plugin/auth_gssapi_client.so
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
+@comment lib/mysql/plugin/auth_gssapi_client.so
lib/mysql/plugin/auth_pam.so
lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
lib/mysql/plugin/auth_pam_v1.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/dialog.so
lib/mysql/plugin/disks.so
lib/mysql/plugin/file_key_management.so
lib/mysql/plugin/func_test.so
@@ -195,250 +263,32 @@
%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
-%%S3%%lib/mysql/plugin/ha_s3.so
%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
%%SPIDER%%lib/mysql/plugin/ha_spider.so
lib/mysql/plugin/ha_test_sql_discovery.so
lib/mysql/plugin/handlersocket.so
lib/mysql/plugin/locales.so
lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/qa_auth_client.so
lib/mysql/plugin/qa_auth_interface.so
lib/mysql/plugin/qa_auth_server.so
lib/mysql/plugin/query_cache_info.so
lib/mysql/plugin/query_response_time.so
lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/sha256_password.so
lib/mysql/plugin/simple_password_check.so
lib/mysql/plugin/sql_errlog.so
lib/mysql/plugin/test_sql_service.so
lib/mysql/plugin/test_versioning.so
lib/mysql/plugin/type_mysql_json.so
-lib/mysql/plugin/type_test.so
lib/mysql/plugin/type_mysql_timestamp.so
+lib/mysql/plugin/type_test.so
%%WSREP%%lib/mysql/plugin/wsrep_info.so
lib/mysql/plugin/zstd.so
+libdata/pkgconfig/libmariadb.pc
libexec/mariadbd
libexec/mysqld
-@comment share/man/man1/aria_chk.1.gz
-@comment share/man/man1/aria_dump_log.1.gz
-@comment share/man/man1/aria_ftdump.1.gz
-@comment share/man/man1/aria_pack.1.gz
-@comment share/man/man1/aria_read_log.1.gz
-@comment %%S3%%share/man/man1/aria_s3_copy.1.gz
-@comment share/man/man1/galera_new_cluster.1.gz
-@comment share/man/man1/galera_recovery.1.gz
-@comment share/man/man1/innochecksum.1.gz
-@comment share/man/man1/mariabackup.1.gz
-@comment share/man/man1/mariadb-access.1.gz
-@comment share/man/man1/mariadb-admin.1.gz
-@comment share/man/man1/mariadb-backup.1.gz
-@comment share/man/man1/mariadb-binlog.1.gz
-@comment share/man/man1/mariadb-check.1.gz
-@comment share/man/man1/mariadb-client-test-embedded.1.gz
-@comment share/man/man1/mariadb-client-test.1.gz
-@comment share/man/man1/mariadb-conv.1.gz
-@comment share/man/man1/mariadb-convert-table-format.1.gz
-@comment share/man/man1/mariadb-dump.1.gz
-@comment share/man/man1/mariadb-dumpslow.1.gz
-@comment share/man/man1/mariadb-embedded.1.gz
-@comment share/man/man1/mariadb-find-rows.1.gz
-@comment share/man/man1/mariadb-fix-extensions.1.gz
-@comment share/man/man1/mariadb-hotcopy.1.gz
-@comment share/man/man1/mariadb-import.1.gz
-@comment share/man/man1/mariadb-install-db.1.gz
-@comment %%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
-@comment share/man/man1/mariadb-plugin.1.gz
-@comment share/man/man1/mariadb-secure-installation.1.gz
-@comment share/man/man1/mariadb-service-convert.1.gz
-@comment share/man/man1/mariadb-setpermission.1.gz
-@comment share/man/man1/mariadb-show.1.gz
-@comment share/man/man1/mariadb-slap.1.gz
-@comment share/man/man1/mariadb-test-embedded.1.gz
-@comment share/man/man1/mariadb-test.1.gz
-@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
-@comment share/man/man1/mariadb-upgrade.1.gz
-@comment share/man/man1/mariadb-waitpid.1.gz
-@comment share/man/man1/mariadbd-multi.1.gz
-@comment share/man/man1/mariadbd-safe-helper.1.gz
-@comment share/man/man1/mariadbd-safe.1.gz
-@comment share/man/man1/mariadb.1.gz
-@comment share/man/man1/mariadb_config.1.gz
-@comment share/man/man1/mbstream.1.gz
-@comment share/man/man1/msql2mysql.1.gz
-@comment share/man/man1/my_print_defaults.1.gz
-@comment share/man/man1/my_safe_process.1.gz
-@comment share/man/man1/myisam_ftdump.1.gz
-@comment share/man/man1/myisamchk.1.gz
-@comment share/man/man1/myisamlog.1.gz
-@comment share/man/man1/myisampack.1.gz
-@comment %%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
-@comment share/man/man1/mysql-stress-test.pl.1.gz
-@comment share/man/man1/mysql-test-run.pl.1.gz
-@comment share/man/man1/mysql.1.gz
-@comment share/man/man1/mysql_client_test.1.gz
-@comment share/man/man1/mysql_client_test_embedded.1.gz
-@comment share/man/man1/mysql_config.1.gz
-@comment share/man/man1/mysql_convert_table_format.1.gz
-@comment share/man/man1/mysql_embedded.1.gz
-@comment share/man/man1/mysql_find_rows.1.gz
-@comment share/man/man1/mysql_plugin.1.gz
-@comment share/man/man1/mysql_setpermission.1.gz
-@comment share/man/man1/mysqlaccess.1.gz
-@comment share/man/man1/mysqladmin.1.gz
-@comment share/man/man1/mysqlbinlog.1.gz
-@comment share/man/man1/mysqlcheck.1.gz
-@comment share/man/man1/mysqldump.1.gz
-@comment share/man/man1/mysqlhotcopy.1.gz
-@comment share/man/man1/mysqlimport.1.gz
-@comment share/man/man1/mysqlshow.1.gz
-@comment share/man/man1/mysqlslap.1.gz
-@comment share/man/man1/mysqltest.1.gz
-@comment share/man/man1/mysqltest_embedded.1.gz
-@comment @comment share/man/man1/mytop.1.gz
-@comment share/man/man1/mysql.server.1.gz
-@comment share/man/man1/mysql_fix_extensions.1.gz
-@comment share/man/man1/mysql_install_db.1.gz
-@comment %%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
-@comment share/man/man1/mysql_secure_installation.1.gz
-@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
-@comment share/man/man1/mysql_upgrade.1.gz
-@comment share/man/man1/mysql_waitpid.1.gz
-@comment share/man/man1/mysqld_multi.1.gz
-@comment share/man/man1/mysqld_safe.1.gz
-@comment share/man/man1/mysqld_safe_helper.1.gz
-@comment share/man/man1/mysqldumpslow.1.gz
-@comment share/man/man1/perror.1.gz
-@comment share/man/man1/replace.1.gz
-@comment share/man/man1/resolve_stack_dump.1.gz
-@comment share/man/man1/resolveip.1.gz
-%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_common.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
-@comment %%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
-@comment share/man/man3/mariadb_cancel.3.gz
-@comment share/man/man3/mariadb_connection.3.gz
-@comment share/man/man3/mariadb_dyncol_check.3.gz
-@comment share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
-@comment share/man/man3/mariadb_dyncol_column_count.3.gz
-@comment share/man/man3/mariadb_dyncol_create_many_named.3.gz
-@comment share/man/man3/mariadb_dyncol_create_many_num.3.gz
-@comment share/man/man3/mariadb_dyncol_exists_named.3.gz
-@comment share/man/man3/mariadb_dyncol_exists_num.3.gz
-@comment share/man/man3/mariadb_dyncol_free.3.gz
-@comment share/man/man3/mariadb_dyncol_list_named.3.gz
-@comment share/man/man3/mariadb_dyncol_list_num.3.gz
-@comment share/man/man3/mariadb_dyncol_unpack.3.gz
-@comment share/man/man3/mariadb_dyncol_update_many_named.3.gz
-@comment share/man/man3/mariadb_dyncol_update_many_num.3.gz
-@comment share/man/man3/mariadb_get_infov.3.gz
-@comment share/man/man3/mariadb_reconnect.3.gz
-@comment share/man/man3/mariadb_rpl_close.3.gz
-@comment share/man/man3/mariadb_rpl_fetch.3.gz
-@comment share/man/man3/mariadb_rpl_get_optionsv.3.gz
-@comment share/man/man3/mariadb_rpl_open.3.gz
-@comment share/man/man3/mariadb_rpl_optionsv.3.gz
-@comment share/man/man3/mariadb_stmt_execute_direct.3.gz
-@comment share/man/man3/mariadb_stmt_fetch_fields.3.gz
-@comment share/man/man3/mysql_affected_rows.3.gz
-@comment share/man/man3/mysql_autocommit.3.gz
-@comment share/man/man3/mysql_change_user.3.gz
-@comment share/man/man3/mysql_close.3.gz
-@comment share/man/man3/mysql_commit.3.gz
-@comment share/man/man3/mysql_data_seek.3.gz
-@comment share/man/man3/mysql_errno.3.gz
-@comment share/man/man3/mysql_error.3.gz
-@comment share/man/man3/mysql_fetch_field.3.gz
-@comment share/man/man3/mysql_fetch_field_direct.3.gz
-@comment share/man/man3/mysql_fetch_fields.3.gz
-@comment share/man/man3/mysql_fetch_lengths.3.gz
-@comment share/man/man3/mysql_fetch_row.3.gz
-@comment share/man/man3/mysql_field_count.3.gz
-@comment share/man/man3/mysql_field_seek.3.gz
-@comment share/man/man3/mysql_field_tell.3.gz
-@comment share/man/man3/mysql_free_result.3.gz
-@comment share/man/man3/mysql_get_character_set_info.3.gz
-@comment share/man/man3/mysql_get_client_info.3.gz
-@comment share/man/man3/mysql_get_client_version.3.gz
-@comment share/man/man3/mysql_get_host_info.3.gz
-@comment share/man/man3/mysql_get_proto_info.3.gz
-@comment share/man/man3/mysql_get_server_info.3.gz
-@comment share/man/man3/mysql_get_server_version.3.gz
-@comment share/man/man3/mysql_get_socket.3.gz
-@comment share/man/man3/mysql_get_ssl_cipher.3.gz
-@comment share/man/man3/mysql_hex_string.3.gz
-@comment share/man/man3/mysql_info.3.gz
-@comment share/man/man3/mysql_init.3.gz
-@comment share/man/man3/mysql_kill.3.gz
-@comment share/man/man3/mysql_more_results.3.gz
-@comment share/man/man3/mysql_next_result.3.gz
-@comment share/man/man3/mysql_num_fields.3.gz
-@comment share/man/man3/mysql_num_rows.3.gz
-@comment share/man/man3/mysql_options.3.gz
-@comment share/man/man3/mysql_options4.3.gz
-@comment share/man/man3/mysql_optionsv.3.gz
-@comment share/man/man3/mysql_ping.3.gz
-@comment share/man/man3/mysql_query.3.gz
-@comment share/man/man3/mysql_read_query_result.3.gz
-@comment share/man/man3/mysql_real_connect.3.gz
-@comment share/man/man3/mysql_real_escape_string.3.gz
-@comment share/man/man3/mysql_real_query.3.gz
-@comment share/man/man3/mysql_refresh.3.gz
-@comment share/man/man3/mysql_reset_connection.3.gz
-@comment share/man/man3/mysql_rollback.3.gz
-@comment share/man/man3/mysql_row_seek.3.gz
-@comment share/man/man3/mysql_row_tell.3.gz
-@comment share/man/man3/mysql_select_db.3.gz
-@comment share/man/man3/mysql_send_query.3.gz
-@comment share/man/man3/mysql_server_end.3.gz
-@comment share/man/man3/mysql_server_init.3.gz
-@comment share/man/man3/mysql_session_track_get_first.3.gz
-@comment share/man/man3/mysql_session_track_get_next.3.gz
-@comment share/man/man3/mysql_set_character_set.3.gz
-@comment share/man/man3/mysql_set_server_option.3.gz
-@comment share/man/man3/mysql_shutdown.3.gz
-@comment share/man/man3/mysql_sqlstate.3.gz
-@comment share/man/man3/mysql_ssl_set.3.gz
-@comment share/man/man3/mysql_stat.3.gz
-@comment share/man/man3/mysql_stmt_affected_rows.3.gz
-@comment share/man/man3/mysql_stmt_attr_get.3.gz
-@comment share/man/man3/mysql_stmt_attr_set.3.gz
-@comment share/man/man3/mysql_stmt_bind_param.3.gz
-@comment share/man/man3/mysql_stmt_bind_result.3.gz
-@comment share/man/man3/mysql_stmt_close.3.gz
-@comment share/man/man3/mysql_stmt_data_seek.3.gz
-@comment share/man/man3/mysql_stmt_errno.3.gz
-@comment share/man/man3/mysql_stmt_error.3.gz
-@comment share/man/man3/mysql_stmt_execute.3.gz
-@comment share/man/man3/mysql_stmt_fetch.3.gz
-@comment share/man/man3/mysql_stmt_fetch_column.3.gz
-@comment share/man/man3/mysql_stmt_field_count.3.gz
-@comment share/man/man3/mysql_stmt_free_result.3.gz
-@comment share/man/man3/mysql_stmt_init.3.gz
-@comment share/man/man3/mysql_stmt_insert_id.3.gz
-@comment share/man/man3/mysql_stmt_more_results.3.gz
-@comment share/man/man3/mysql_stmt_next_result.3.gz
-@comment share/man/man3/mysql_stmt_num_rows.3.gz
-@comment share/man/man3/mysql_stmt_param_count.3.gz
-@comment share/man/man3/mysql_stmt_param_metadata.3.gz
-@comment share/man/man3/mysql_stmt_prepare.3.gz
-@comment share/man/man3/mysql_stmt_reset.3.gz
-@comment share/man/man3/mysql_stmt_result_metadata.3.gz
-@comment share/man/man3/mysql_stmt_row_seek.3.gz
-@comment share/man/man3/mysql_stmt_row_tell.3.gz
-@comment share/man/man3/mysql_stmt_send_long_data.3.gz
-@comment share/man/man3/mysql_stmt_sqlstate.3.gz
-@comment share/man/man3/mysql_stmt_store_result.3.gz
-@comment share/man/man3/mysql_stmt_warning_count.3.gz
-@comment share/man/man3/mysql_store_result.3.gz
-@comment share/man/man3/mysql_thread_end.3.gz
-@comment share/man/man3/mysql_thread_id.3.gz
-@comment share/man/man3/mysql_thread_init.3.gz
-@comment share/man/man3/mysql_use_result.3.gz
-@comment share/man/man3/mysql_warning_count.3.gz
-@comment share/man/man8/mariadbd.8.gz
-@comment share/man/man8/mysqld.8.gz
share/aclocal/mysql.m4
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
@@ -448,6 +298,226 @@
%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/groonga/README.md
%%MROONGA%%share/groonga-normalizer-mysql/README.md
%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
+share/man/man1/aria_chk.1.gz
+share/man/man1/aria_dump_log.1.gz
+share/man/man1/aria_ftdump.1.gz
+share/man/man1/aria_pack.1.gz
+share/man/man1/aria_read_log.1.gz
+%%S3%%share/man/man1/aria_s3_copy.1.gz
+%%WSREP%%share/man/man1/galera_new_cluster.1.gz
+%%WSREP%%share/man/man1/galera_recovery.1.gz
+%%INNOBASE%%share/man/man1/innochecksum.1.gz
+%%INNOBASE%%share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-conv.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb-dump.1.gz
+share/man/man1/mariadb-dumpslow.1.gz
+share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+share/man/man1/mariadb-install-db.1.gz
+%%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+share/man/man1/mariadb-secure-installation.1.gz
+share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+share/man/man1/mariadb-tzinfo-to-sql.1.gz
+share/man/man1/mariadb-upgrade.1.gz
+share/man/man1/mariadb-waitpid.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadbd-multi.1.gz
+share/man/man1/mariadbd-safe-helper.1.gz
+share/man/man1/mariadbd-safe.1.gz
+share/man/man1/mbstream.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+%%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+share/man/man1/mysql_fix_extensions.1.gz
+share/man/man1/mysql_install_db.1.gz
+%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_plugin.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldump.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/mytop.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+share/man/man1/resolve_stack_dump.1.gz
+share/man/man1/resolveip.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
+share/man/man8/mariadbd.8.gz
+share/man/man8/mysqld.8.gz
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
@@ -518,7 +588,5 @@
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
-@comment %%DATADIR%%/wsrep.cnf
%%WSREP%%%%DATADIR%%/wsrep_notify
@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
-
diff --git a/databases/mariadb114-client/Makefile b/databases/mariadb114-client/Makefile
deleted file mode 100644
--- a/databases/mariadb114-client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-PORTNAME= mariadb
-PKGNAMESUFFIX= 114-client
-
-COMMENT= Multithreaded SQL database (client)
-
-MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
-
-PLIST= ${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb114-client/pkg-plist b/databases/mariadb114-client/pkg-plist
deleted file mode 100644
--- a/databases/mariadb114-client/pkg-plist
+++ /dev/null
@@ -1,263 +0,0 @@
-bin/mariadb
-bin/mariadb-access
-bin/mariadb-admin
-bin/mariadb-binlog
-bin/mariadb-check
-bin/mariadb-config
-bin/mariadb-conv
-bin/mariadb-convert-table-format
-bin/mariadb-dump
-bin/mariadb-dumpslow
-bin/mariadb-find-rows
-bin/mariadb-hotcopy
-bin/mariadb-import
-bin/mariadb-plugin
-bin/mariadb-secure-installation
-bin/mariadb-setpermission
-bin/mariadb-show
-bin/mariadb-slap
-bin/mariadb-test
-bin/mariadb-waitpid
-bin/mariadb_config
-bin/msql2mysql
-bin/my_print_defaults
-bin/mysql
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysqltest
-bin/mytop
-bin/replace
-bin/resolve_stack_dump
-@sample %%ETCDIR%%/conf.d/client.cnf.sample
-@sample %%ETCDIR%%/my.cnf.sample
-include/mysql/errmsg.h
-include/mysql/ma_list.h
-include/mysql/ma_pvio.h
-include/mysql/ma_tls.h
-include/mysql/mariadb/ma_io.h
-include/mysql/mariadb_com.h
-include/mysql/mariadb_ctype.h
-include/mysql/mariadb_dyncol.h
-include/mysql/mariadb_rpl.h
-include/mysql/mariadb_stmt.h
-include/mysql/mariadb_version.h
-include/mysql/my_alloca.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_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.a
-lib/mysql/libmariadb.so
-lib/mysql/libmariadb.so.3
-lib/mysql/libmariadbclient.a
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlservices.a
-lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/client_ed25519.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/mysql_clear_password.so
-lib/mysql/plugin/sha256_password.so
-lib/mysql/plugin/zstd.so
-libdata/pkgconfig/libmariadb.pc
-share/man/man1/mariadb-access.1.gz
-share/man/man1/mariadb-admin.1.gz
-share/man/man1/mariadb-binlog.1.gz
-share/man/man1/mariadb-check.1.gz
-share/man/man1/mariadb-client-test-embedded.1.gz
-share/man/man1/mariadb-client-test.1.gz
-share/man/man1/mariadb-convert-table-format.1.gz
-share/man/man1/mariadb-dump.1.gz
-share/man/man1/mariadb-dumpslow.1.gz
-@comment share/man/man1/mariadb-embedded.1.gz
-share/man/man1/mariadb-find-rows.1.gz
-share/man/man1/mariadb-hotcopy.1.gz
-share/man/man1/mariadb-import.1.gz
-share/man/man1/mariadb-plugin.1.gz
-share/man/man1/mariadb-secure-installation.1.gz
-share/man/man1/mariadb-setpermission.1.gz
-share/man/man1/mariadb-show.1.gz
-share/man/man1/mariadb-slap.1.gz
-share/man/man1/mariadb-test-embedded.1.gz
-share/man/man1/mariadb-test.1.gz
-share/man/man1/mariadb-tzinfo-to-sql.1.gz
-share/man/man1/mariadb-waitpid.1.gz
-share/man/man1/mariadb.1.gz
-share/man/man1/mariadb_config.1.gz
-share/man/man1/msql2mysql.1.gz
-share/man/man1/my_print_defaults.1.gz
-share/man/man1/my_safe_process.1.gz
-share/man/man1/mysql-stress-test.pl.1.gz
-share/man/man1/mysql-test-run.pl.1.gz
-share/man/man1/mysql.1.gz
-share/man/man1/mysql_client_test.1.gz
-share/man/man1/mysql_client_test_embedded.1.gz
-share/man/man1/mysql_config.1.gz
-share/man/man1/mysql_convert_table_format.1.gz
-share/man/man1/mysql_embedded.1.gz
-share/man/man1/mysql_find_rows.1.gz
-share/man/man1/mysql_plugin.1.gz
-share/man/man1/mysql_secure_installation.1.gz
-share/man/man1/mysql_setpermission.1.gz
-@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
-share/man/man1/mysql_waitpid.1.gz
-share/man/man1/mysqlaccess.1.gz
-share/man/man1/mysqladmin.1.gz
-share/man/man1/mysqlbinlog.1.gz
-share/man/man1/mysqlcheck.1.gz
-share/man/man1/mysqldump.1.gz
-share/man/man1/mysqldumpslow.1.gz
-share/man/man1/mysqlhotcopy.1.gz
-share/man/man1/mysqlimport.1.gz
-share/man/man1/mysqlshow.1.gz
-share/man/man1/mysqlslap.1.gz
-share/man/man1/mysqltest.1.gz
-share/man/man1/mysqltest_embedded.1.gz
-share/man/man1/mytop.1.gz
-share/man/man1/perror.1.gz
-share/man/man1/replace.1.gz
-share/man/man1/resolve_stack_dump.1.gz
-share/man/man3/mariadb_cancel.3.gz
-share/man/man3/mariadb_connection.3.gz
-share/man/man3/mariadb_dyncol_check.3.gz
-share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
-share/man/man3/mariadb_dyncol_column_count.3.gz
-share/man/man3/mariadb_dyncol_create_many_named.3.gz
-share/man/man3/mariadb_dyncol_create_many_num.3.gz
-share/man/man3/mariadb_dyncol_exists_named.3.gz
-share/man/man3/mariadb_dyncol_exists_num.3.gz
-share/man/man3/mariadb_dyncol_free.3.gz
-share/man/man3/mariadb_dyncol_list_named.3.gz
-share/man/man3/mariadb_dyncol_list_num.3.gz
-share/man/man3/mariadb_dyncol_unpack.3.gz
-share/man/man3/mariadb_dyncol_update_many_named.3.gz
-share/man/man3/mariadb_dyncol_update_many_num.3.gz
-share/man/man3/mariadb_get_infov.3.gz
-share/man/man3/mariadb_reconnect.3.gz
-share/man/man3/mariadb_rpl_close.3.gz
-share/man/man3/mariadb_rpl_fetch.3.gz
-share/man/man3/mariadb_rpl_get_optionsv.3.gz
-share/man/man3/mariadb_rpl_open.3.gz
-share/man/man3/mariadb_rpl_optionsv.3.gz
-share/man/man3/mariadb_stmt_execute_direct.3.gz
-share/man/man3/mariadb_stmt_fetch_fields.3.gz
-share/man/man3/mysql_affected_rows.3.gz
-share/man/man3/mysql_autocommit.3.gz
-share/man/man3/mysql_change_user.3.gz
-share/man/man3/mysql_close.3.gz
-share/man/man3/mysql_commit.3.gz
-share/man/man3/mysql_data_seek.3.gz
-share/man/man3/mysql_errno.3.gz
-share/man/man3/mysql_error.3.gz
-share/man/man3/mysql_fetch_field.3.gz
-share/man/man3/mysql_fetch_field_direct.3.gz
-share/man/man3/mysql_fetch_fields.3.gz
-share/man/man3/mysql_fetch_lengths.3.gz
-share/man/man3/mysql_fetch_row.3.gz
-share/man/man3/mysql_field_count.3.gz
-share/man/man3/mysql_field_seek.3.gz
-share/man/man3/mysql_field_tell.3.gz
-share/man/man3/mysql_free_result.3.gz
-share/man/man3/mysql_get_character_set_info.3.gz
-share/man/man3/mysql_get_client_info.3.gz
-share/man/man3/mysql_get_client_version.3.gz
-share/man/man3/mysql_get_host_info.3.gz
-share/man/man3/mysql_get_proto_info.3.gz
-share/man/man3/mysql_get_server_info.3.gz
-share/man/man3/mysql_get_server_version.3.gz
-share/man/man3/mysql_get_socket.3.gz
-share/man/man3/mysql_get_ssl_cipher.3.gz
-share/man/man3/mysql_hex_string.3.gz
-share/man/man3/mysql_info.3.gz
-share/man/man3/mysql_init.3.gz
-share/man/man3/mysql_kill.3.gz
-share/man/man3/mysql_more_results.3.gz
-share/man/man3/mysql_next_result.3.gz
-share/man/man3/mysql_num_fields.3.gz
-share/man/man3/mysql_num_rows.3.gz
-share/man/man3/mysql_options.3.gz
-share/man/man3/mysql_options4.3.gz
-share/man/man3/mysql_optionsv.3.gz
-share/man/man3/mysql_ping.3.gz
-share/man/man3/mysql_query.3.gz
-share/man/man3/mysql_read_query_result.3.gz
-share/man/man3/mysql_real_connect.3.gz
-share/man/man3/mysql_real_escape_string.3.gz
-share/man/man3/mysql_real_query.3.gz
-share/man/man3/mysql_refresh.3.gz
-share/man/man3/mysql_reset_connection.3.gz
-share/man/man3/mysql_rollback.3.gz
-share/man/man3/mysql_row_seek.3.gz
-share/man/man3/mysql_row_tell.3.gz
-share/man/man3/mysql_select_db.3.gz
-share/man/man3/mysql_send_query.3.gz
-share/man/man3/mysql_server_end.3.gz
-share/man/man3/mysql_server_init.3.gz
-share/man/man3/mysql_session_track_get_first.3.gz
-share/man/man3/mysql_session_track_get_next.3.gz
-share/man/man3/mysql_set_character_set.3.gz
-share/man/man3/mysql_set_server_option.3.gz
-share/man/man3/mysql_shutdown.3.gz
-share/man/man3/mysql_sqlstate.3.gz
-share/man/man3/mysql_ssl_set.3.gz
-share/man/man3/mysql_stat.3.gz
-share/man/man3/mysql_stmt_affected_rows.3.gz
-share/man/man3/mysql_stmt_attr_get.3.gz
-share/man/man3/mysql_stmt_attr_set.3.gz
-share/man/man3/mysql_stmt_bind_param.3.gz
-share/man/man3/mysql_stmt_bind_result.3.gz
-share/man/man3/mysql_stmt_close.3.gz
-share/man/man3/mysql_stmt_data_seek.3.gz
-share/man/man3/mysql_stmt_errno.3.gz
-share/man/man3/mysql_stmt_error.3.gz
-share/man/man3/mysql_stmt_execute.3.gz
-share/man/man3/mysql_stmt_fetch.3.gz
-share/man/man3/mysql_stmt_fetch_column.3.gz
-share/man/man3/mysql_stmt_field_count.3.gz
-share/man/man3/mysql_stmt_free_result.3.gz
-share/man/man3/mysql_stmt_init.3.gz
-share/man/man3/mysql_stmt_insert_id.3.gz
-share/man/man3/mysql_stmt_more_results.3.gz
-share/man/man3/mysql_stmt_next_result.3.gz
-share/man/man3/mysql_stmt_num_rows.3.gz
-share/man/man3/mysql_stmt_param_count.3.gz
-share/man/man3/mysql_stmt_param_metadata.3.gz
-share/man/man3/mysql_stmt_prepare.3.gz
-share/man/man3/mysql_stmt_reset.3.gz
-share/man/man3/mysql_stmt_result_metadata.3.gz
-share/man/man3/mysql_stmt_row_seek.3.gz
-share/man/man3/mysql_stmt_row_tell.3.gz
-share/man/man3/mysql_stmt_send_long_data.3.gz
-share/man/man3/mysql_stmt_sqlstate.3.gz
-share/man/man3/mysql_stmt_store_result.3.gz
-share/man/man3/mysql_stmt_warning_count.3.gz
-share/man/man3/mysql_store_result.3.gz
-share/man/man3/mysql_thread_end.3.gz
-share/man/man3/mysql_thread_id.3.gz
-share/man/man3/mysql_thread_init.3.gz
-share/man/man3/mysql_use_result.3.gz
-share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile
--- a/databases/mariadb114-server/Makefile
+++ b/databases/mariadb114-server/Makefile
@@ -35,13 +35,13 @@
USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-SUB_FILES= pkg-message
+SUB_FILES= my.cnf.sample pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES?= scripts/*.sh support-files/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql
+DATADIR= ${PREFIX}/share/mysql
MARIADB_USER?= mysql
MARIADB_GROUP?= mysql
@@ -57,6 +57,8 @@
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE
+SUFXD_NAME= mariadb114
+
.if ${PKGNAMESUFFIX:M*-server}
# MySQL-Server options
OPTIONS_DEFAULT+= AWS_KEY_MGMT CONNECT_EXTRA HASHICORP_VAULT INNOBASE SPHINX SPIDER WSREP
@@ -129,9 +131,6 @@
DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-DATADIR= ${PREFIX}/share/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
@@ -155,22 +154,24 @@
CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
CMAKE_OFF+= WITH_WSREP
USES+= readline
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SUB_FILES+= my.cnf.sample client.cnf.sample
+SUB_FILES+= client.cnf.sample
.else # ! ${PKGNAMESUFFIX:M*-client}
# MySQL-Server part
-USES+= mysql:114m
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR= mysql-server
+# Install to a prefix to be able to co-install multiple versions of the
+# server. The client installs to ${LOCALBASE}.
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
+
+USE_RC_SUBR= ${SUFXD_NAME}-server
CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
CMAKE_OFF+= WITH_CLIENT
SUB_FILES+= server.cnf.sample
SUB_LIST+= MARIADB_DBDIR="${MARIADB_DBDIR}" \
MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
- MARIADB_USER="${MARIADB_USER}"
+ MARIADB_USER="${MARIADB_USER}" \
+ SUFXD_NAME="${SUFXD_NAME}"
PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
MARIADB_USER="${MARIADB_USER}" \
MARIADB_GROUP="${MARIADB_GROUP}"
@@ -243,11 +244,18 @@
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
-pre-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
.if ${PKGNAMESUFFIX:M*-client}
post-install:
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
@@ -261,10 +269,11 @@
.else # ! ${PKGNAMESUFFIX:M*-client}
post-install:
+ ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
- ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+ ${STAGEDIR}${ETCDIR}/user_map.conf.sample
${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
${STAGEDIR}${PREFIX}/lib/mysql/
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
@@ -278,8 +287,6 @@
${MV} ${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf \
${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf.sample
${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
- ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
- >> ${TMPPLIST}
post-install-HASHICORP_VAULT-on:
${MV} ${STAGEDIR}${ETCDIR}/conf.d/hashicorp_key_management.cnf \
diff --git a/databases/mariadb114-server/files/mariadb114-server.in b/databases/mariadb114-server/files/mariadb114-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mariadb114-server/files/mariadb114-server.in
@@ -0,0 +1,141 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_(instance_)?enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# %%SUFXD_NAME%%_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_(instance_)?args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+# %%SUFXD_NAME%%_(instance_)?pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_(instance_)?user (str): User to run mysqld as
+# Default to "%%MARIADB_USER%%" created by the port
+# %%SUFXD_NAME%%_(instance_)?optfile (str): Server-specific option file.
+# Default to "${%%SUFXD_NAME%%_dbdir}/my.cnf".
+# %%SUFXD_NAME%%_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
+# %%SUFXD_NAME%%_instances (str): Set to "" by default.
+# If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+: ${%%SUFXD_NAME%%_user="%%MARIADB_USER%%"}
+: ${%%SUFXD_NAME%%_dbdir="%%MARIADB_DBDIR%%"}
+: ${%%SUFXD_NAME%%_optfile="%%ETCDIR%%/my.cnf"}
+: ${%%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+
+if [ -n "$2" ]; then
+ instance="$2"
+ load_rc_config ${name}_${instance}
+ case "$%%SUFXD_NAME%%_instances" in
+ "$2 "*|*" $2 "*|*" $2"|"$2")
+ eval %%SUFXD_NAME%%_args="\${%%SUFXD_NAME%%_${instance}_args:-\"${%%SUFXD_NAME%%_args}\"}"
+ eval %%SUFXD_NAME%%_dbdir="\${%%SUFXD_NAME%%_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
+ eval %%SUFXD_NAME%%_user="\${%%SUFXD_NAME%%_${instance}_user:-\"${%%SUFXD_NAME%%_user}\"}"
+ eval %%SUFXD_NAME%%_socket="\${%%SUFXD_NAME%%_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+ eval %%SUFXD_NAME%%_optfile="\${%%SUFXD_NAME%%_${instance}_optfile:-\"%%PREFIX%%/etc/mariadb_${instance}/my.cnf\"}"
+ eval %%SUFXD_NAME%%_pidfile="\${%%SUFXD_NAME%%_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
+ ;;
+ *)
+ err 1 "$2 not found in %%SUFXD_NAME%%_instances" ;;
+ esac
+else
+ if [ -n "${%%SUFXD_NAME%%_instances}" -a -n "$1" ]; then
+ for instance in ${%%SUFXD_NAME%%_instances}; do
+ eval _enable="\${%%SUFXD_NAME%%_${instance}_enable}"
+ case "${_enable:-${%%SUFXD_NAME%%_enable}}" in
+ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ continue
+ ;;
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ if [ -z "$_enable" ]; then
+ _var=%%SUFXD_NAME%%_enable
+ else
+ _var=%%SUFXD_NAME%%_${instance}_enable
+ fi
+ warn "Bad value" \
+ "'${_enable:-${%%SUFXD_NAME%%_enable}}'" \
+ "for ${_var}. " \
+ "Instance ${instance} skipped."
+ continue
+ ;;
+ esac
+ echo "===> mysql instance: ${instance}"
+ if %%LOCALBASE%%/etc/rc.d/%%SUFXD_NAME%%-server $1 ${instance}; then
+ success="${instance} ${success}"
+ else
+ failed="${instance} (${retcode}) ${failed}"
+ fi
+ done
+ exit 0
+ else
+ %%SUFXD_NAME%%_pidfile=${%%SUFXD_NAME%%_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+ fi
+fi
+
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+ mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+pidfile=$%%SUFXD_NAME%%_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe ${mysql_extra} --user=${%%SUFXD_NAME%%_user} --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} ${%%SUFXD_NAME%%_socket:+--socket=${%%SUFXD_NAME%%_socket}} ${%%SUFXD_NAME%%_args}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args
+ [ $? -eq 0 ] && chown -R ${%%SUFXD_NAME%%_user}:$(id -gn $%%SUFXD_NAME%%_user) ${%%SUFXD_NAME%%_dbdir}
+}
+
+mysql_prestart()
+{
+ local dir
+ for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
+ if [ -f "${dir}/my.cnf" ]; then
+ echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+ return 1
+ fi
+ done
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ mysql_group="`/usr/bin/id -gn ${%%SUFXD_NAME%%_user}`"
+ [ "${%%SUFXD_NAME%%_socket}" = "" ] && %%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%" || %%SUFXD_NAME%%_rundir="`/usr/bin/dirname ${%%SUFXD_NAME%%_socket}`"
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -o ${%%SUFXD_NAME%%_user} -g ${mysql_group} "${%%SUFXD_NAME%%_rundir}"
+ fi
+ return 0
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -u${%%SUFXD_NAME%%_user} -g$(id -gn $%%SUFXD_NAME%%_user) -m755 ${%%SUFXD_NAME%%_rundir}
+ fi
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mariadb114-server/files/mysql-server.in b/databases/mariadb114-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mariadb114-server/files/mysql-server.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%# just before mysql starts.
-# mysql_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
-# Base database directory.
-# mysql_(instance_)?args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-# Default to "%%MARIADB_USER%%" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
-# mysql_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
-# mysql_instances (str): Set to "" by default.
-# If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="%%MARIADB_USER%%"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
-: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
-: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mariadbd"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
- instance="$2"
- load_rc_config ${name}_${instance}
- case "$mysql_instances" in
- "$2 "*|*" $2 "*|*" $2"|"$2")
- eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
- eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
- eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
- eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
- eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
- eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
- ;;
- *)
- err 1 "$2 not found in mysql_instances" ;;
- esac
-else
- if [ -n "${mysql_instances}" -a -n "$1" ]; then
- for instance in ${mysql_instances}; do
- eval _enable="\${mysql_${instance}_enable}"
- case "${_enable:-${mysql_enable}}" in
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
- continue
- ;;
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- ;;
- *)
- if [ -z "$_enable" ]; then
- _var=mysql_enable
- else
- _var=mysql_${instance}_enable
- fi
- warn "Bad value" \
- "'${_enable:-${mysql_enable}}'" \
- "for ${_var}. " \
- "Instance ${instance} skipped."
- continue
- ;;
- esac
- echo "===> mysql instance: ${instance}"
- if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
- success="${instance} ${success}"
- else
- failed="${instance} (${retcode}) ${failed}"
- fi
- done
- exit 0
- else
- mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
- fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args
- [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- local dir
- for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
- if [ -f "${dir}/my.cnf" ]; then
- echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
- return 1
- fi
- done
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- mysql_group="`/usr/bin/id -gn ${mysql_user}`"
- [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
- fi
-%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%% else
-%%LEGACY_LIMITS%% return 0
-%%LEGACY_LIMITS%% fi
-%%MODERN_LIMITS%% return 0
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
- fi
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb114-server/pkg-plist b/databases/mariadb114-server/pkg-plist
--- a/databases/mariadb114-server/pkg-plist
+++ b/databases/mariadb114-server/pkg-plist
@@ -6,48 +6,89 @@
%%S3%%bin/aria_s3_copy
%%INNOBASE%%bin/innochecksum
%%INNOBASE%%bin/mariabackup
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
bin/mariadb-backup
+bin/mariadb-binlog
+bin/mariadb-check
bin/mariadb-client-test
bin/mariadb-client-test-embedded
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+bin/mariadb-dumpslow
bin/mariadb-embedded
+bin/mariadb-find-rows
bin/mariadb-fix-extensions
+bin/mariadb-hotcopy
+bin/mariadb-import
bin/mariadb-install-db
-%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-plugin
+bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-show
+bin/mariadb-slap
+bin/mariadb-test
bin/mariadb-test-embedded
bin/mariadb-tzinfo-to-sql
bin/mariadb-upgrade
+bin/mariadb-waitpid
+bin/mariadb_config
bin/mariadbd-multi
bin/mariadbd-safe
bin/mariadbd-safe-helper
%%INNOBASE%%bin/mbstream
+bin/msql2mysql
+bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
-@comment bin/mytop
-%%ROCKSDB%%bin/myrocks_hotbackup
+bin/mysql
bin/mysql_client_test
bin/mysql_client_test_embedded
+bin/mysql_config
+bin/mysql_convert_table_format
bin/mysql_embedded
+bin/mysql_find_rows
bin/mysql_fix_extensions
bin/mysql_install_db
-%%ROCKSDB%%bin/mysql_ldb
+bin/mysql_plugin
+bin/mysql_secure_installation
+bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
+bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper
+bin/mysqldump
+bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
bin/mysqltest_embedded
+@comment bin/mytop
bin/perror
+bin/replace
+bin/resolve_stack_dump
bin/resolveip
-%%ROCKSDB%%bin/sst_dump
bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_backup
%%WSREP%%bin/wsrep_sst_common
%%WSREP%%bin/wsrep_sst_mariabackup
%%WSREP%%bin/wsrep_sst_mysqldump
%%WSREP%%bin/wsrep_sst_rsync
%%WSREP%%bin/wsrep_sst_rsync_wan
-%%WSREP%%bin/wsrep_sst_backup
+%%ETCDIR%%/conf.d/client.cnf
%%ETCDIR%%/conf.d/enable_encryption.preset
%%HASHICORP_VAULT%%@sample %%ETCDIR%%/conf.d/hashicorp_key_management.cnf.sample
@sample %%ETCDIR%%/conf.d/mysql-clients.cnf.sample
@@ -60,9 +101,29 @@
@sample %%ETCDIR%%/conf.d/server.cnf.sample
%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample
-@comment %%ETCDIR%%/my.cnf
-@comment %%ETCDIR%%/conf.d/client.cnf
+@sample %%ETCDIR%%/my.cnf.sample
@sample %%ETCDIR%%/user_map.conf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_alloca.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_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
include/mysql/server/big_endian.h
include/mysql/server/byte_order_generic.h
include/mysql/server/byte_order_generic_x86.h
@@ -142,6 +203,7 @@
include/mysql/server/mysql/service_progress_report.h
include/mysql/server/mysql/service_sha1.h
include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_sql.h
include/mysql/server/mysql/service_thd_alloc.h
include/mysql/server/mysql/service_thd_autoinc.h
include/mysql/server/mysql/service_thd_error_context.h
@@ -150,7 +212,6 @@
include/mysql/server/mysql/service_thd_specifics.h
include/mysql/server/mysql/service_thd_timezone.h
include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_sql.h
%%WSREP%%include/mysql/server/mysql/service_wsrep.h
include/mysql/server/mysql/services.h
include/mysql/server/mysql_com.h
@@ -167,22 +228,35 @@
include/mysql/server/sslopt-longopts.h
include/mysql/server/sslopt-vars.h
include/mysql/server/typelib.h
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
lib/mysql/libmariadbd.a
lib/mysql/libmariadbd.so
lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqld.a
lib/mysql/libmysqld.so
+lib/mysql/libmysqlservices.a
lib/mysql/pam_user_map.so
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth_0x0100.so
lib/mysql/plugin/auth_ed25519.so
-@comment lib/mysql/plugin/auth_gssapi_client.so
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
+@comment lib/mysql/plugin/auth_gssapi_client.so
lib/mysql/plugin/auth_mysql_sha2.so
lib/mysql/plugin/auth_pam.so
lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
lib/mysql/plugin/auth_pam_v1.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/dialog.so
lib/mysql/plugin/disks.so
lib/mysql/plugin/file_key_management.so
lib/mysql/plugin/func_test.so
@@ -202,6 +276,7 @@
%%HASHICORP_VAULT%%lib/mysql/plugin/hashicorp_key_management.so
lib/mysql/plugin/locales.so
lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/mysql_clear_password.so
lib/mysql/plugin/password_reuse_check.so
lib/mysql/plugin/provider_bzip2.so
lib/mysql/plugin/provider_lz4.so
@@ -214,6 +289,7 @@
lib/mysql/plugin/query_cache_info.so
lib/mysql/plugin/query_response_time.so
lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/sha256_password.so
lib/mysql/plugin/simple_password_check.so
lib/mysql/plugin/sql_errlog.so
lib/mysql/plugin/test_sql_service.so
@@ -222,45 +298,108 @@
lib/mysql/plugin/type_mysql_timestamp.so
lib/mysql/plugin/type_test.so
%%WSREP%%lib/mysql/plugin/wsrep_info.so
+lib/mysql/plugin/zstd.so
+libdata/pkgconfig/libmariadb.pc
libexec/mariadbd
libexec/mysqld
-@comment %%S3%%share/man/man1/aria_s3_copy.1.gz
+share/aclocal/mysql.m4
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-groonga.md
+%%WSREP%%%%PORTDOCS%%%%DOCSDIR%%/README-wsrep
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
+%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
+%%MROONGA%%share/groonga-normalizer-mysql/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
share/man/man1/aria_chk.1.gz
share/man/man1/aria_dump_log.1.gz
share/man/man1/aria_ftdump.1.gz
share/man/man1/aria_pack.1.gz
share/man/man1/aria_read_log.1.gz
+%%S3%%share/man/man1/aria_s3_copy.1.gz
%%WSREP%%share/man/man1/galera_new_cluster.1.gz
%%WSREP%%share/man/man1/galera_recovery.1.gz
share/man/man1/innochecksum.1.gz
share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
share/man/man1/mariadb-conv.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb-dump.1.gz
+share/man/man1/mariadb-dumpslow.1.gz
share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
share/man/man1/mariadb-install-db.1.gz
-%%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+share/man/man1/mariadb-secure-installation.1.gz
share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+share/man/man1/mariadb-tzinfo-to-sql.1.gz
share/man/man1/mariadb-upgrade.1.gz
+share/man/man1/mariadb-waitpid.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb_config.1.gz
share/man/man1/mariadbd-multi.1.gz
share/man/man1/mariadbd-safe-helper.1.gz
share/man/man1/mariadbd-safe.1.gz
share/man/man1/mbstream.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
share/man/man1/myisam_ftdump.1.gz
share/man/man1/myisamchk.1.gz
share/man/man1/myisamlog.1.gz
share/man/man1/myisampack.1.gz
-%%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
-@comment share/man/man1/mytop.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
share/man/man1/mysql_fix_extensions.1.gz
share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_plugin.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
share/man/man1/mysql_tzinfo_to_sql.1.gz
share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
share/man/man1/mysqld_multi.1.gz
share/man/man1/mysqld_safe.1.gz
share/man/man1/mysqld_safe_helper.1.gz
-%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysqldump.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/mytop.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+share/man/man1/resolve_stack_dump.1.gz
share/man/man1/resolveip.1.gz
%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
@@ -268,18 +407,128 @@
%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
share/man/man8/mariadbd.8.gz
share/man/man8/mysqld.8.gz
-share/aclocal/mysql.m4
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
-%%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
-%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-groonga.md
-%%MROONGA%%share/groonga-normalizer-mysql/README.md
-%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
-%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
@@ -316,8 +565,8 @@
%%DATADIR%%/estonian/errmsg.sys
%%DATADIR%%/fill_help_tables.sql
%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/georgian/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/greek/errmsg.sys
%%DATADIR%%/hindi/errmsg.sys
%%DATADIR%%/hungarian/errmsg.sys
@@ -328,17 +577,17 @@
%%DATADIR%%/maria_add_gis_sp.sql
%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
%%DATADIR%%/mariadb.logrotate
-%%DATADIR%%/mini-benchmark
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/mysql.server
%%DATADIR%%/mariadb_performance_tables.sql
%%DATADIR%%/mariadb_sys_schema.sql
%%DATADIR%%/mariadb_system_tables.sql
%%DATADIR%%/mariadb_system_tables_data.sql
%%DATADIR%%/mariadb_test_data_timezone.sql
%%DATADIR%%/mariadb_test_db.sql
+%%DATADIR%%/mini-benchmark
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
+%%DATADIR%%/mysql.server
%%DATADIR%%/mysqld_multi.server
%%DATADIR%%/norwegian-ny/errmsg.sys
%%DATADIR%%/norwegian/errmsg.sys
diff --git a/databases/mariadb118-client/Makefile b/databases/mariadb118-client/Makefile
deleted file mode 100644
--- a/databases/mariadb118-client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-PORTNAME= mariadb
-PKGNAMESUFFIX= 118-client
-
-COMMENT= Multithreaded SQL database (client)
-
-MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
-
-PLIST= ${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb118-server/Makefile b/databases/mariadb118-server/Makefile
--- a/databases/mariadb118-server/Makefile
+++ b/databases/mariadb118-server/Makefile
@@ -35,13 +35,13 @@
USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-SUB_FILES= pkg-message
+SUB_FILES= my.cnf.sample pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
-USE_LDCONFIG= ${PREFIX}/lib/mysql
SHEBANG_FILES?= scripts/*.sh support-files/*.sh
SITESDIR= mariadb/mariadb-${PORTVERSION}/source
DOCSDIR= ${PREFIX}/share/doc/mysql
+DATADIR= ${PREFIX}/share/mysql
MARIADB_USER?= mysql
MARIADB_GROUP?= mysql
@@ -57,6 +57,8 @@
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_DEFAULT= GSSAPI_BASE
+SUFXD_NAME= mariadb118
+
.if ${PKGNAMESUFFIX:M*-server}
# MySQL-Server options
OPTIONS_DEFAULT+= AWS_KEY_MGMT CONNECT_EXTRA HASHICORP_VAULT INNOBASE SPHINX SPIDER WSREP
@@ -129,9 +131,6 @@
DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-DATADIR= ${PREFIX}/share/mysql
-ETCDIR= ${PREFIX}/etc/mysql
-
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \
@@ -155,22 +154,24 @@
CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
CMAKE_OFF+= WITH_WSREP
USES+= readline
-USE_LDCONFIG= ${PREFIX}/lib/mysql
-SUB_FILES+= my.cnf.sample client.cnf.sample
+SUB_FILES+= client.cnf.sample
.else # ! ${PKGNAMESUFFIX:M*-client}
# MySQL-Server part
-USES+= mysql:118m
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR= mysql-server
+# Install to a prefix to be able to co-install multiple versions of the
+# server. The client installs to ${LOCALBASE}.
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
+
+USE_RC_SUBR= ${SUFXD_NAME}-server
CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
CMAKE_OFF+= WITH_CLIENT
SUB_FILES+= server.cnf.sample
SUB_LIST+= MARIADB_DBDIR="${MARIADB_DBDIR}" \
MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
- MARIADB_USER="${MARIADB_USER}"
+ MARIADB_USER="${MARIADB_USER}" \
+ SUFXD_NAME="${SUFXD_NAME}"
PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
MARIADB_USER="${MARIADB_USER}" \
MARIADB_GROUP="${MARIADB_GROUP}"
@@ -243,11 +244,18 @@
${WRKSRC}/cmake/os/DragonFly.cmake
.endif
-pre-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
.if ${PKGNAMESUFFIX:M*-client}
post-install:
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
@@ -261,10 +269,11 @@
.else # ! ${PKGNAMESUFFIX:M*-client}
post-install:
+ ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
- ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+ ${STAGEDIR}${ETCDIR}/user_map.conf.sample
${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
${STAGEDIR}${PREFIX}/lib/mysql/
${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
@@ -278,8 +287,6 @@
${MV} ${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf \
${STAGEDIR}${ETCDIR}/conf.d/mysql-clients.cnf.sample
${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
- ${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
- >> ${TMPPLIST}
post-install-HASHICORP_VAULT-on:
${MV} ${STAGEDIR}${ETCDIR}/conf.d/hashicorp_key_management.cnf \
diff --git a/databases/mariadb118-server/files/mariadb118-server.in b/databases/mariadb118-server/files/mariadb118-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mariadb118-server/files/mariadb118-server.in
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_(instance_)?enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+%%LEGACY_LIMITS%%# %%SUFXD_NAME%%_(instance_)?limits (bool): Set to "NO" by default.
+%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%# just before mysql starts.
+# %%SUFXD_NAME%%_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_(instance_)?args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+# %%SUFXD_NAME%%_(instance_)?pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_(instance_)?user (str): User to run mysqld as
+# Default to "%%MARIADB_USER%%" created by the port
+# %%SUFXD_NAME%%_(instance_)?optfile (str): Server-specific option file.
+# Default to "${%%SUFXD_NAME%%_dbdir}/my.cnf".
+# %%SUFXD_NAME%%_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
+# %%SUFXD_NAME%%_instances (str): Set to "" by default.
+# If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+%%LEGACY_LIMITS%%: ${%%SUFXD_NAME%%_limits="NO"}
+: ${%%SUFXD_NAME%%_user="%%MARIADB_USER%%"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${%%SUFXD_NAME%%_user}"
+: ${%%SUFXD_NAME%%_dbdir="%%MARIADB_DBDIR%%"}
+: ${%%SUFXD_NAME%%_optfile="%%ETCDIR%%/my.cnf"}
+: ${%%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+
+if [ -n "$2" ]; then
+ instance="$2"
+ load_rc_config ${name}_${instance}
+ case "$%%SUFXD_NAME%%_instances" in
+ "$2 "*|*" $2 "*|*" $2"|"$2")
+ eval %%SUFXD_NAME%%_args="\${%%SUFXD_NAME%%_${instance}_args:-\"${%%SUFXD_NAME%%_args}\"}"
+ eval %%SUFXD_NAME%%_dbdir="\${%%SUFXD_NAME%%_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
+ %%LEGACY_LIMITS%%eval %%SUFXD_NAME%%_limits="\${%%SUFXD_NAME%%_${instance}_limits:-\"${%%SUFXD_NAME%%_limits}\"}"
+ eval %%SUFXD_NAME%%_user="\${%%SUFXD_NAME%%_${instance}_user:-\"${%%SUFXD_NAME%%_user}\"}"
+ %%LEGACY_LIMITS%%eval mysql_limits_args="\${%%SUFXD_NAME%%_${instance}_limits_args:-\"-e -U $%%SUFXD_NAME%%_user\"}"
+ eval %%SUFXD_NAME%%_socket="\${%%SUFXD_NAME%%_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+ eval %%SUFXD_NAME%%_optfile="\${%%SUFXD_NAME%%_${instance}_optfile:-\"%%PREFIX%%/etc/mariadb_${instance}/my.cnf\"}"
+ eval %%SUFXD_NAME%%_pidfile="\${%%SUFXD_NAME%%_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
+ ;;
+ *)
+ err 1 "$2 not found in %%SUFXD_NAME%%_instances" ;;
+ esac
+else
+ if [ -n "${%%SUFXD_NAME%%_instances}" -a -n "$1" ]; then
+ for instance in ${%%SUFXD_NAME%%_instances}; do
+ eval _enable="\${%%SUFXD_NAME%%_${instance}_enable}"
+ case "${_enable:-${%%SUFXD_NAME%%_enable}}" in
+ [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+ continue
+ ;;
+ [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+ ;;
+ *)
+ if [ -z "$_enable" ]; then
+ _var=%%SUFXD_NAME%%_enable
+ else
+ _var=%%SUFXD_NAME%%_${instance}_enable
+ fi
+ warn "Bad value" \
+ "'${_enable:-${%%SUFXD_NAME%%_enable}}'" \
+ "for ${_var}. " \
+ "Instance ${instance} skipped."
+ continue
+ ;;
+ esac
+ echo "===> mysql instance: ${instance}"
+ if %%LOCALBASE%%/etc/rc.d/%%SUFXD_NAME%%-server $1 ${instance}; then
+ success="${instance} ${success}"
+ else
+ failed="${instance} (${retcode}) ${failed}"
+ fi
+ done
+ exit 0
+ else
+ %%SUFXD_NAME%%_pidfile=${%%SUFXD_NAME%%_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+ fi
+fi
+
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+ mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+pidfile=$%%SUFXD_NAME%%_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe ${mysql_extra} --user=${%%SUFXD_NAME%%_user} --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} ${%%SUFXD_NAME%%_socket:+--socket=${%%SUFXD_NAME%%_socket}} ${%%SUFXD_NAME%%_args}"
+
+mysql_create_auth_tables()
+{
+ eval $mysql_install_db $mysql_install_db_args
+ [ $? -eq 0 ] && chown -R ${%%SUFXD_NAME%%_user}:$(id -gn $%%SUFXD_NAME%%_user) ${%%SUFXD_NAME%%_dbdir}
+}
+
+mysql_prestart()
+{
+ local dir
+ for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
+ if [ -f "${dir}/my.cnf" ]; then
+ echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+ return 1
+ fi
+ done
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ mysql_group="`/usr/bin/id -gn ${%%SUFXD_NAME%%_user}`"
+ [ "${%%SUFXD_NAME%%_socket}" = "" ] && %%SUFXD_NAME%%_rundir="%%MARIADB_RUNDIR%%" || %%SUFXD_NAME%%_rundir="`/usr/bin/dirname ${%%SUFXD_NAME%%_socket}`"
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -o ${%%SUFXD_NAME%%_user} -g ${mysql_group} "${%%SUFXD_NAME%%_rundir}"
+ fi
+%%LEGACY_LIMITS%% if checkyesno %%SUFXD_NAME%%_limits; then
+%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%% else
+%%LEGACY_LIMITS%% return 0
+%%LEGACY_LIMITS%% fi
+%%MODERN_LIMITS%% return 0
+ if [ ! -d "${%%SUFXD_NAME%%_rundir}" ]; then
+ install -d -u${%%SUFXD_NAME%%_user} -g$(id -gn $%%SUFXD_NAME%%_user) -m755 ${%%SUFXD_NAME%%_rundir}
+ fi
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mariadb118-server/files/mysql-server.in b/databases/mariadb118-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mariadb118-server/files/mysql-server.in
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default.
-%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%# just before mysql starts.
-# mysql_(instance_)?dbdir (str): Default to "%%MARIADB_DBDIR%%"
-# Base database directory.
-# mysql_(instance_)?args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-# Default to "%%MARIADB_USER%%" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-# Default to "${mysql_dbdir}/my.cnf".
-# mysql_(instance)?rundir (str): Default to "%%MARIADB_RUNDIR%%"
-# mysql_instances (str): Set to "" by default.
-# If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="%%MARIADB_USER%%"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
-: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
-: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mariadbd"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
- instance="$2"
- load_rc_config ${name}_${instance}
- case "$mysql_instances" in
- "$2 "*|*" $2 "*|*" $2"|"$2")
- eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
- eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
- eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
- %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
- eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
- eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
- eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
- ;;
- *)
- err 1 "$2 not found in mysql_instances" ;;
- esac
-else
- if [ -n "${mysql_instances}" -a -n "$1" ]; then
- for instance in ${mysql_instances}; do
- eval _enable="\${mysql_${instance}_enable}"
- case "${_enable:-${mysql_enable}}" in
- [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
- continue
- ;;
- [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
- ;;
- *)
- if [ -z "$_enable" ]; then
- _var=mysql_enable
- else
- _var=mysql_${instance}_enable
- fi
- warn "Bad value" \
- "'${_enable:-${mysql_enable}}'" \
- "for ${_var}. " \
- "Instance ${instance} skipped."
- continue
- ;;
- esac
- echo "===> mysql instance: ${instance}"
- if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
- success="${instance} ${success}"
- else
- failed="${instance} (${retcode}) ${failed}"
- fi
- done
- exit 0
- else
- mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
- fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
- eval $mysql_install_db $mysql_install_db_args
- [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
- local dir
- for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
- if [ -f "${dir}/my.cnf" ]; then
- echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
- return 1
- fi
- done
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- mysql_group="`/usr/bin/id -gn ${mysql_user}`"
- [ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
- fi
-%%LEGACY_LIMITS%% if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%% else
-%%LEGACY_LIMITS%% return 0
-%%LEGACY_LIMITS%% fi
-%%MODERN_LIMITS%% return 0
- if [ ! -d "${mysql_rundir}" ]; then
- install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
- fi
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb118-server/pkg-plist b/databases/mariadb118-server/pkg-plist
--- a/databases/mariadb118-server/pkg-plist
+++ b/databases/mariadb118-server/pkg-plist
@@ -7,48 +7,89 @@
%%WSREP%%bin/galera_new_cluster
%%INNOBASE%%bin/innochecksum
%%INNOBASE%%bin/mariabackup
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
bin/mariadb-backup
+bin/mariadb-binlog
+bin/mariadb-check
bin/mariadb-client-test
bin/mariadb-client-test-embedded
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+bin/mariadb-dumpslow
bin/mariadb-embedded
+bin/mariadb-find-rows
bin/mariadb-fix-extensions
+bin/mariadb-hotcopy
+bin/mariadb-import
bin/mariadb-install-db
-%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-plugin
+bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-show
+bin/mariadb-slap
+bin/mariadb-test
bin/mariadb-test-embedded
bin/mariadb-tzinfo-to-sql
bin/mariadb-upgrade
+bin/mariadb-waitpid
+bin/mariadb_config
bin/mariadbd-multi
bin/mariadbd-safe
bin/mariadbd-safe-helper
%%INNOBASE%%bin/mbstream
+bin/msql2mysql
+bin/my_print_defaults
bin/myisam_ftdump
bin/myisamchk
bin/myisamlog
bin/myisampack
-@comment bin/mytop
-%%ROCKSDB%%bin/myrocks_hotbackup
+bin/mysql
bin/mysql_client_test
bin/mysql_client_test_embedded
+bin/mysql_config
+bin/mysql_convert_table_format
bin/mysql_embedded
+bin/mysql_find_rows
bin/mysql_fix_extensions
bin/mysql_install_db
-%%ROCKSDB%%bin/mysql_ldb
+bin/mysql_plugin
+bin/mysql_secure_installation
+bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
+bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper
+bin/mysqldump
+bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
bin/mysqltest_embedded
+@comment bin/mytop
bin/perror
+bin/replace
+bin/resolve_stack_dump
bin/resolveip
-%%ROCKSDB%%bin/sst_dump
bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_backup
%%WSREP%%bin/wsrep_sst_common
%%WSREP%%bin/wsrep_sst_mariabackup
%%WSREP%%bin/wsrep_sst_mysqldump
%%WSREP%%bin/wsrep_sst_rsync
%%WSREP%%bin/wsrep_sst_rsync_wan
-%%WSREP%%bin/wsrep_sst_backup
+@comment %%ETCDIR%%/conf.d/client.cnf
%%ETCDIR%%/conf.d/enable_encryption.preset
%%HASHICORP_VAULT%%@sample %%ETCDIR%%/conf.d/hashicorp_key_management.cnf.sample
@sample %%ETCDIR%%/conf.d/mysql-clients.cnf.sample
@@ -61,9 +102,29 @@
@sample %%ETCDIR%%/conf.d/server.cnf.sample
%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
%%WSREP%%@sample %%ETCDIR%%/conf.d/wsrep.cnf.sample
-@comment %%ETCDIR%%/my.cnf
-@comment %%ETCDIR%%/conf.d/client.cnf
+@sample %%ETCDIR%%/my.cnf.sample
@sample %%ETCDIR%%/user_map.conf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_alloca.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_com.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
include/mysql/server/big_endian.h
include/mysql/server/byte_order_generic.h
include/mysql/server/byte_order_generic_x86.h
@@ -143,6 +204,7 @@
include/mysql/server/mysql/service_progress_report.h
include/mysql/server/mysql/service_sha1.h
include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_sql.h
include/mysql/server/mysql/service_thd_alloc.h
include/mysql/server/mysql/service_thd_autoinc.h
include/mysql/server/mysql/service_thd_error_context.h
@@ -151,7 +213,6 @@
include/mysql/server/mysql/service_thd_specifics.h
include/mysql/server/mysql/service_thd_timezone.h
include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_sql.h
%%WSREP%%include/mysql/server/mysql/service_wsrep.h
include/mysql/server/mysql/services.h
include/mysql/server/mysql_com.h
@@ -168,23 +229,36 @@
include/mysql/server/sslopt-longopts.h
include/mysql/server/sslopt-vars.h
include/mysql/server/typelib.h
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
lib/mysql/libmariadbd.a
lib/mysql/libmariadbd.so
lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
lib/mysql/libmysqld.a
lib/mysql/libmysqld.so
+lib/mysql/libmysqlservices.a
lib/mysql/pam_user_map.so
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth_0x0100.so
lib/mysql/plugin/auth_ed25519.so
-@comment lib/mysql/plugin/auth_gssapi_client.so
%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
+@comment lib/mysql/plugin/auth_gssapi_client.so
lib/mysql/plugin/auth_mysql_sha2.so
lib/mysql/plugin/auth_pam.so
lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
lib/mysql/plugin/auth_pam_v1.so
lib/mysql/plugin/auth_parsec.so
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/dialog.so
lib/mysql/plugin/disks.so
lib/mysql/plugin/file_key_management.so
lib/mysql/plugin/func_test.so
@@ -195,7 +269,6 @@
lib/mysql/plugin/ha_federatedx.so
%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
%%S3%%lib/mysql/plugin/ha_s3.so
%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
%%SPIDER%%lib/mysql/plugin/ha_spider.so
@@ -204,6 +277,7 @@
%%HASHICORP_VAULT%%lib/mysql/plugin/hashicorp_key_management.so
lib/mysql/plugin/locales.so
lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/mysql_clear_password.so
@comment lib/mysql/plugin/parsec.so
lib/mysql/plugin/password_reuse_check.so
lib/mysql/plugin/provider_bzip2.so
@@ -217,6 +291,7 @@
lib/mysql/plugin/query_cache_info.so
lib/mysql/plugin/query_response_time.so
lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/sha256_password.so
lib/mysql/plugin/simple_password_check.so
lib/mysql/plugin/sql_errlog.so
lib/mysql/plugin/test_sql_service.so
@@ -225,45 +300,108 @@
lib/mysql/plugin/type_mysql_timestamp.so
lib/mysql/plugin/type_test.so
%%WSREP%%lib/mysql/plugin/wsrep_info.so
+lib/mysql/plugin/zstd.so
+libdata/pkgconfig/libmariadb.pc
libexec/mariadbd
libexec/mysqld
-@comment %%S3%%share/man/man1/aria_s3_copy.1.gz
+share/aclocal/mysql.m4
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-groonga.md
+%%WSREP%%%%PORTDOCS%%%%DOCSDIR%%/README-wsrep
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
+%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
+%%MROONGA%%share/groonga-normalizer-mysql/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
share/man/man1/aria_chk.1.gz
share/man/man1/aria_dump_log.1.gz
share/man/man1/aria_ftdump.1.gz
share/man/man1/aria_pack.1.gz
share/man/man1/aria_read_log.1.gz
+%%S3%%share/man/man1/aria_s3_copy.1.gz
%%WSREP%%share/man/man1/galera_new_cluster.1.gz
%%WSREP%%share/man/man1/galera_recovery.1.gz
share/man/man1/innochecksum.1.gz
share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
share/man/man1/mariadb-conv.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb-dump.1.gz
+share/man/man1/mariadb-dumpslow.1.gz
share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
share/man/man1/mariadb-install-db.1.gz
-%%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+share/man/man1/mariadb-secure-installation.1.gz
share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+share/man/man1/mariadb-tzinfo-to-sql.1.gz
share/man/man1/mariadb-upgrade.1.gz
+share/man/man1/mariadb-waitpid.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb_config.1.gz
share/man/man1/mariadbd-multi.1.gz
share/man/man1/mariadbd-safe-helper.1.gz
share/man/man1/mariadbd-safe.1.gz
share/man/man1/mbstream.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
share/man/man1/myisam_ftdump.1.gz
share/man/man1/myisamchk.1.gz
share/man/man1/myisamlog.1.gz
share/man/man1/myisampack.1.gz
-%%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
-@comment share/man/man1/mytop.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
share/man/man1/mysql_fix_extensions.1.gz
share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_plugin.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
share/man/man1/mysql_tzinfo_to_sql.1.gz
share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
share/man/man1/mysqld_multi.1.gz
share/man/man1/mysqld_safe.1.gz
share/man/man1/mysqld_safe_helper.1.gz
-%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysqldump.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+share/man/man1/mytop.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+share/man/man1/resolve_stack_dump.1.gz
share/man/man1/resolveip.1.gz
%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
@@ -271,18 +409,128 @@
%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
share/man/man8/mariadbd.8.gz
share/man/man8/mysqld.8.gz
-share/aclocal/mysql.m4
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
-%%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
-%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/README-groonga.md
-%%MROONGA%%share/groonga-normalizer-mysql/README.md
-%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
-%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
%%DATADIR%%/binary-configure
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
@@ -319,8 +567,8 @@
%%DATADIR%%/estonian/errmsg.sys
%%DATADIR%%/fill_help_tables.sql
%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/georgian/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
%%DATADIR%%/greek/errmsg.sys
%%DATADIR%%/hindi/errmsg.sys
%%DATADIR%%/hungarian/errmsg.sys
@@ -331,17 +579,17 @@
%%DATADIR%%/maria_add_gis_sp.sql
%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
%%DATADIR%%/mariadb.logrotate
-%%DATADIR%%/mini-benchmark
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/mysql.server
%%DATADIR%%/mariadb_performance_tables.sql
%%DATADIR%%/mariadb_sys_schema.sql
%%DATADIR%%/mariadb_system_tables.sql
%%DATADIR%%/mariadb_system_tables_data.sql
%%DATADIR%%/mariadb_test_data_timezone.sql
%%DATADIR%%/mariadb_test_db.sql
+%%DATADIR%%/mini-benchmark
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
+%%DATADIR%%/mysql.server
%%DATADIR%%/mysqld_multi.server
%%DATADIR%%/norwegian-ny/errmsg.sys
%%DATADIR%%/norwegian/errmsg.sys
diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@@ -13,15 +13,21 @@
BUILD_DEPENDS= ${NONEXISTENT}:${_MYSQL_SERVER}:configure
LIB_DEPENDS= libgroonga.so:textproc/groonga
+FLAVORS= mysql80
+FLAVOR?= ${FLAVORS:[1]}
+.for f in ${FLAVORS}
+${f}_PKGNAMESUFFIX= -${f}
+.endfor
+_MYSQL_SERVER= databases/${FLAVOR}-server
+
USES= compiler:c11 libtool mysql pkgconfig shebangfix
-IGNORE_WITH_MYSQL= 105m 106m 1011m 81
SHEBANG_FILES= data/rpm/post.sh data/rpm/preun.sh
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
+CONFIGURE_ARGS= --with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${SETENVI} ${MAKE} -V BUILD_WRKSRC)" \
--with-mysql-config=${PREFIX}/bin/mysql_config \
- --with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)"
+ --with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${SETENVI} ${MAKE} -V WRKSRC)"
SUB_FILES= pkg-message
diff --git a/databases/mysql94-client/Makefile b/databases/mysql-client/Makefile
rename from databases/mysql94-client/Makefile
rename to databases/mysql-client/Makefile
--- a/databases/mysql94-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,16 +1,13 @@
PORTNAME= mysql
PORTREVISION= 0
-PKGNAMESUFFIX= 94-client
+PKGNAMESUFFIX= -client
COMMENT= Multithreaded SQL database (client)
LICENSE+= LGPL21
-# MySQL8.2+ supports only 64-bit platforms
-# Review list after 13.x EoL
-NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
-
-MASTERDIR= ${.CURDIR}/../mysql94-server
+_MYSQL_LATEST= 94
+MASTERDIR= ${.CURDIR}/../${PORTNAME}${_MYSQL_LATEST}-server
PKGMESSAGE= ${.CURDIR}/pkg-message
PATCHDIR= ${MASTERDIR}/files
@@ -43,6 +40,9 @@
OPTIONS_SUB= yes
post-install:
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
+
@${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
diff --git a/databases/mysql94-client/pkg-message b/databases/mysql-client/pkg-message
rename from databases/mysql94-client/pkg-message
rename to databases/mysql-client/pkg-message
diff --git a/databases/mysql94-client/pkg-plist b/databases/mysql-client/pkg-plist
rename from databases/mysql94-client/pkg-plist
rename to databases/mysql-client/pkg-plist
--- a/databases/mysql94-client/pkg-plist
+++ b/databases/mysql-client/pkg-plist
@@ -12,6 +12,7 @@
bin/mysqlshow
bin/mysqlslap
bin/perror
+@sample %%ETCDIR%%/my.cnf.sample
include/mysql/errmsg.h
include/mysql/field_types.h
include/mysql/my_command.h
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -17,8 +17,7 @@
libprotobuf.so:devel/protobuf \
libzstd.so:archivers/zstd
-USES= cmake:noninja compiler:c++17-lang cpe gmake mysql ssl
-IGNORE_WITH_MYSQL= 105m 106m 1011m
+USES= cmake:noninja compiler:c++17-lang cpe gmake mysql:mysql ssl
CPE_VENDOR= oracle
USE_CXXSTD= c++17
USE_LDCONFIG= yes
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
deleted file mode 100644
--- a/databases/mysql80-client/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME= mysql
-PORTREVISION= 0
-PKGNAMESUFFIX= 80-client
-
-COMMENT= Multithreaded SQL database (client)
-
-LICENSE+= LGPL21
-
-MASTERDIR= ${.CURDIR}/../mysql80-server
-
-PKGMESSAGE= ${.CURDIR}/pkg-message
-PATCHDIR= ${MASTERDIR}/files
-PLIST= ${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL= mysql8[1-9]-client \
- mysql[0-79][0-9]-client \
- mariadb[0-9][0-9]-client \
- percona[0-9][0-9]-client
-
-CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
-
-USE_LDCONFIG+= ${PREFIX}/lib/mysql
-
-MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
- mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
- mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
-
-CLIENT_ONLY= yes
-
-OPTIONS_GROUP+= PLUGINS
-PLUGINS_DESC= Default Client Plugins
-OPTIONS_GROUP_PLUGINS= SASLCLIENT
-SASLCLIENT_DESC= SASL client plugin module
-SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
-SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USES= ldap
-
-OPTIONS_DEFAULT+= SASLCLIENT
-OPTIONS_SUB= yes
-
-# issue 166367: adding symlinks for back-compatibility with ${lib}_r
-post-install:
-# @${RM} ${STAGEDIR}${PREFIX}/lib/mysql/private/libprotobuf-lite.so.3.19.4
-# @${RM} ${STAGEDIR}${PREFIX}/lib/mysql/private/libprotobuf.so.3.19.4
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
- @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
- @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
- @${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql80-client/pkg-message b/databases/mysql80-client/pkg-message
deleted file mode 100644
--- a/databases/mysql80-client/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
- message: <<EOM
-This is the mysql CLIENT without the server.
-for complete server and client, please install databases/mysql80-server
-EOM
-}
-]
diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist
deleted file mode 100644
--- a/databases/mysql80-client/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-bin/comp_err
-bin/my_print_defaults
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_migrate_keyring
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlpump
-bin/mysqlshow
-bin/mysqlslap
-bin/perror
-@comment bin/zlib_decompress
-include/mysql/errmsg.h
-include/mysql/field_types.h
-include/mysql/my_command.h
-include/mysql/my_compress.h
-include/mysql/my_list.h
-include/mysql/mysql.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/udf_registration_types.h
-include/mysql/mysql_com.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.21
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.21
-@comment lib/private/libprotobuf-lite.so.3.19.4
-@comment lib/private/libprotobuf.so.3.19.4
-%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
-lib/mysql/plugin/authentication_fido_client.so
-lib/mysql/plugin/authentication_oci_client.so
-libdata/pkgconfig/mysqlclient.pc
-@comment share/man/man1/comp_err.1.gz
-@comment share/man/man1/lz4_decompress.1.gz
-@comment share/man/man1/mysql.1.gz
-@comment share/man/man1/mysql_config.1.gz
-@comment share/man/man1/mysql_config_editor.1.gz
-@comment share/man/man1/mysqladmin.1.gz
-@comment share/man/man1/mysqlbinlog.1.gz
-@comment share/man/man1/mysqlcheck.1.gz
-@comment share/man/man1/mysqldump.1.gz
-@comment share/man/man1/mysqlimport.1.gz
-@comment share/man/man1/mysqlman.1.gz
-@comment share/man/man1/mysqlpump.1.gz
-@comment share/man/man1/mysqlshow.1.gz
-@comment share/man/man1/mysqlslap.1.gz
-@comment share/man/man1/perror.1.gz
-@comment share/man/man1/zlib_decompress.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -14,7 +14,6 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
-SLAVEDIRS= databases/mysql80-client
USES= bison:build cmake:noninja cpe groff:run libedit localbase \
ncurses perl5 pkgconfig shebangfix ssl
@@ -105,9 +104,13 @@
IGNORE= You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
+SUFXD_NAME= mysql80
+
+SUB_FILES= my.cnf.sample
SUB_LIST= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
+ MY_TMPDIR=${MY_TMPDIR} \
+ SUFXD_NAME=${SUFXD_NAME}
PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
@@ -115,22 +118,22 @@
# MySQL-Server part
.if !defined(CLIENT_ONLY)
-USES+= mysql:80
+# Install to a prefix to be able to co-install multiple versions of the
+# server. Client installs directly to PREFIX
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona*-server
-USE_RC_SUBR= mysql-server
+USE_RC_SUBR= ${SUFXD_NAME}-server
-SUB_FILES= my.cnf.sample pkg-message
+SUB_FILES+= pkg-message
USERS= mysql
GROUPS= mysql
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-
MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
@@ -202,10 +205,20 @@
.endif
.if !defined(CLIENT_ONLY)
+
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
+
post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+
${MKDIR} ${STAGEDIR}${MY_SECDIR}
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif
diff --git a/databases/mysql80-server/files/mysql-server.in b/databases/mysql80-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mysql80-server/files/mysql-server.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
-# Base database directory.
-# mysql_confdir (str): Default to "%%ETCDIR%%"
-# Base configuration directory.
-# mysql_optfile (str): Server-specific option file.
-# Set it in the rc.conf or default behaviour of
-# `mysqld_safe` itself, will be picking
-# ${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-mysql_user="mysql"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysqld_init="${procname}"
-mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
-
-mysql_create_auth_tables()
-{
- eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- return 0
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql80-server/files/mysql80-server.in b/databases/mysql80-server/files/mysql80-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mysql80-server/files/mysql80-server.in
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# %%SUFXD_NAME%%_dbdir (str): Default to "%%MY_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_confdir (str): Default to "%%ETCDIR%%"
+# Base configuration directory.
+# %%SUFXD_NAME%%_optfile (str): Server-specific option file.
+# Set it in the rc.conf or default behaviour of
+# `mysqld_safe` itself, will be picking
+# ${%%SUFXD_NAME%%_confdir}/my.cnf if it exists.
+# %%SUFXD_NAME%%_pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+: ${%%SUFXD_NAME%%_dbdir="%%MY_DBDIR%%"}
+: ${%%SUFXD_NAME%%_confdir="%%ETCDIR%%"}
+if [ -f "${%%SUFXD_NAME%%_confdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_confdir}/my.cnf"}
+elif [ -f "${%%SUFXD_NAME%%_dbdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_dbdir}/my.cnf"}
+fi
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+mysql_user="mysql"
+: ${hostname:=`/bin/hostname`}
+pidfile=${%%SUFXD_NAME%%_pidfile:-"${%%SUFXD_NAME%%_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${%%SUFXD_NAME%%_args} %%FEDER%% %%PERFSCHEMRC%%"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+mysqld_init="${procname}"
+mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --user=${mysql_user}"
+
+mysql_create_auth_tables()
+{
+ eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ return 0
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -23,6 +23,7 @@
bin/mysqltest_safe_process
bin/mysqlxtest
etc/logrotate.d/mysqlrouter
+@sample %%ETCDIR%%/my.cnf.sample
lib/mysql/libmysqlharness.so
lib/mysql/libmysqlharness.so.1
lib/mysql/libmysqlharness_stdx.so
@@ -44,6 +45,7 @@
lib/mysql/libmysqlrouter_metadata_cache.so.1
lib/mysql/libmysqlrouter_mysqlxmessages.so.1
lib/mysql/libmysqlrouter_routing.so.1
+lib/mysql/libprotobuf-lite.so.24.4.0
lib/mysql/mysqlrouter/connection_pool.so
lib/mysql/mysqlrouter/destination_status.so
lib/mysql/mysqlrouter/http_auth_backend.so
@@ -57,13 +59,12 @@
lib/mysql/mysqlrouter/rest_metadata_cache.so
lib/mysql/mysqlrouter/rest_router.so
lib/mysql/mysqlrouter/rest_routing.so
-lib/mysql/mysqlrouter/router_protobuf.so
lib/mysql/mysqlrouter/router_openssl.so
+lib/mysql/mysqlrouter/router_protobuf.so
lib/mysql/mysqlrouter/routing.so
lib/mysql/plugin/adt_null.so
lib/mysql/plugin/auth.so
lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/conflicting_variables.so
lib/mysql/plugin/component_audit_api_message_emit.so
lib/mysql/plugin/component_example_component1.so
lib/mysql/plugin/component_example_component2.so
@@ -108,7 +109,7 @@
lib/mysql/plugin/component_test_system_variable_source.so
lib/mysql/plugin/component_test_table_access.so
lib/mysql/plugin/component_test_udf_registration.so
-@comment lib/mysql/plugin/component_test_udf_services.so
+lib/mysql/plugin/component_test_udf_services.so
lib/mysql/plugin/component_udf_reg_3_func.so
lib/mysql/plugin/component_udf_reg_avg_func.so
lib/mysql/plugin/component_udf_reg_int_func.so
@@ -119,14 +120,15 @@
lib/mysql/plugin/component_udf_unreg_int_func.so
lib/mysql/plugin/component_udf_unreg_real_func.so
lib/mysql/plugin/component_validate_password.so
+lib/mysql/plugin/conflicting_variables.so
lib/mysql/plugin/connection_control.so
lib/mysql/plugin/daemon_example.ini
lib/mysql/plugin/ddl_rewriter.so
lib/mysql/plugin/group_replication.so
%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
lib/mysql/plugin/ha_mock.so
-lib/mysql/plugin/component_test_udf_services.so
lib/mysql/plugin/keyring_file.so
+lib/mysql/plugin/keyring_udf.so
lib/mysql/plugin/libdaemon_example.so
lib/mysql/plugin/libtest_framework.so
lib/mysql/plugin/libtest_services.so
@@ -172,34 +174,32 @@
lib/mysql/plugin/test_services_command_services.so
lib/mysql/plugin/test_services_host_application_signal.so
lib/mysql/plugin/test_services_plugin_registry.so
-lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/keyring_udf.so
lib/mysql/plugin/test_udf_services.so
+lib/mysql/plugin/udf_example.so
lib/mysql/plugin/validate_password.so
lib/mysql/plugin/version_token.so
lib/mysql/private/libprotobuf-lite.so.24.4.0
lib/mysql/private/libprotobuf.so.24.4.0
-lib/mysql/libprotobuf-lite.so.24.4.0
libexec/mysqld
-@comment share/man/man1/ibd2sdi.1.gz
-@comment share/man/man1/innochecksum.1.gz
-@comment share/man/man1/my_print_defaults.1.gz
-@comment share/man/man1/myisam_ftdump.1.gz
-@comment share/man/man1/myisamchk.1.gz
-@comment share/man/man1/myisamlog.1.gz
-@comment share/man/man1/myisampack.1.gz
-@comment share/man/man1/mysql_secure_installation.1.gz
-@comment share/man/man1/mysql_ssl_rsa_setup.1.gz
-@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
-@comment share/man/man1/mysql_upgrade.1.gz
-@comment share/man/man1/mysql.server.1.gz
-@comment share/man/man1/mysqld_multi.1.gz
-@comment share/man/man1/mysqld_safe.1.gz
-@comment share/man/man1/mysqldumpslow.1.gz
-@comment share/man/man1/mysqlrouter_passwd.1.gz
-@comment share/man/man1/mysqlrouter_plugin_info.1.gz
-@comment share/man/man1/mysqlrouter.1.gz
-@comment share/man/man8/mysqld.8.gz
+share/man/man1/ibd2sdi.1.gz
+share/man/man1/innochecksum.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_ssl_rsa_setup.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlrouter.1.gz
+share/man/man1/mysqlrouter_passwd.1.gz
+share/man/man1/mysqlrouter_plugin_info.1.gz
+share/man/man8/mysqld.8.gz
%%DATADIR%%/bulgarian/errmsg.sys
%%DATADIR%%/charsets/Index.xml
%%DATADIR%%/charsets/README
@@ -260,8 +260,6 @@
%%DATADIR%%/uninstall_rewriter.sql
%%DATADIR%%router/docs/sample_mysqlrouter.conf
@dir lib/mysql/plugin/debug
-@dir %%DATADIR%%router/docs
-@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
@dir(mysql,mysql,0750) %%MY_SECDIR%%
@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/mysql84-client/Makefile b/databases/mysql84-client/Makefile
deleted file mode 100644
--- a/databases/mysql84-client/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-PORTNAME= mysql
-PORTREVISION= 0
-PKGNAMESUFFIX= 84-client
-
-COMMENT= Multithreaded SQL database (client)
-
-LICENSE+= LGPL21
-
-# MySQL8.2+ supports only 64-bit platforms
-# Review list after 13.x EoL
-NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
-
-MASTERDIR= ${.CURDIR}/../mysql84-server
-
-PKGMESSAGE= ${.CURDIR}/pkg-message
-PATCHDIR= ${MASTERDIR}/files
-PLIST= ${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL= mysql8[1-9]-client \
- mysql[0-79][0-9]-client \
- mariadb[0-9][0-9]-client \
- percona[0-9][0-9]-client
-
-CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
-
-USE_LDCONFIG+= ${PREFIX}/lib/mysql
-
-MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
- mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
- mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
-
-CLIENT_ONLY= yes
-
-OPTIONS_GROUP+= PLUGINS
-PLUGINS_DESC= Default Client Plugins
-OPTIONS_GROUP_PLUGINS= SASLCLIENT
-SASLCLIENT_DESC= SASL client plugin module
-SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
-SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USES= ldap
-
-OPTIONS_DEFAULT+= SASLCLIENT
-OPTIONS_SUB= yes
-
-post-install:
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
- @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
- @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
- @${LN} -s libmysqlclient.so.24 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.24
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql84-client/pkg-message b/databases/mysql84-client/pkg-message
deleted file mode 100644
--- a/databases/mysql84-client/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
- message: <<EOM
-This is the mysql CLIENT without the server.
-for complete server and client, please install databases/mysql84-server
-EOM
-}
-]
diff --git a/databases/mysql84-client/pkg-plist b/databases/mysql84-client/pkg-plist
deleted file mode 100644
--- a/databases/mysql84-client/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-bin/comp_err
-bin/my_print_defaults
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_migrate_keyring
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/perror
-include/mysql/errmsg.h
-include/mysql/field_types.h
-include/mysql/my_command.h
-include/mysql/my_compress.h
-include/mysql/my_list.h
-include/mysql/mysql.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/udf_registration_types.h
-include/mysql/mysql_com.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.24
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.24
-%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
-%%SASLCLIENT%%lib/mysql/plugin/authentication_oci_client.so
-%%SASLCLIENT%%lib/mysql/plugin/authentication_webauthn_client.so
-libdata/pkgconfig/mysqlclient.pc
-share/aclocal/mysql.m4
diff --git a/databases/mysql84-server/Makefile b/databases/mysql84-server/Makefile
--- a/databases/mysql84-server/Makefile
+++ b/databases/mysql84-server/Makefile
@@ -18,10 +18,6 @@
USES= bison:build cmake:noninja cpe groff:run libedit localbase \
ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
-
-SLAVEDIRS= databases/mysql84-client
-
CPE_VENDOR= oracle
USE_CXXSTD= c++20
@@ -91,9 +87,13 @@
IGNORE= you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again
.endif
+SUFXD_NAME= mysql84
+
+SUB_FILES= my.cnf.sample
SUB_LIST= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
+ MY_TMPDIR=${MY_TMPDIR} \
+ SUFXD_NAME=${SUFXD_NAME}
PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
@@ -101,22 +101,22 @@
# MySQL-Server part
.if !defined(CLIENT_ONLY)
-USES+= mysql:84
+# Install to a prefix to be able to co-install multiple versions of the
+# server. Client installs directly to PREFIX
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona*-server
-USE_RC_SUBR= mysql-server
+USE_RC_SUBR= ${SUFXD_NAME}-server
-SUB_FILES= my.cnf.sample pkg-message
+SUB_FILES+= pkg-message
USERS= mysql
GROUPS= mysql
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-
MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
@@ -171,10 +171,20 @@
@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
.if !defined(CLIENT_ONLY)
+
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
+
post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+
${MKDIR} ${STAGEDIR}${MY_SECDIR}
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif
diff --git a/databases/mysql84-server/files/mysql-server.in b/databases/mysql84-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mysql84-server/files/mysql-server.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
-# Base database directory.
-# mysql_confdir (str): Default to "%%ETCDIR%%"
-# Base configuration directory.
-# mysql_optfile (str): Server-specific option file.
-# Set it in the rc.conf or default behaviour of
-# `mysqld_safe` itself, will be picking
-# ${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-mysql_user="mysql"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysqld_init="${procname}"
-mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
-
-mysql_create_auth_tables()
-{
- eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- return 0
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql84-server/files/mysql84-server.in b/databases/mysql84-server/files/mysql84-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mysql84-server/files/mysql84-server.in
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# %%SUFXD_NAME%%_dbdir (str): Default to "%%MY_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_confdir (str): Default to "%%ETCDIR%%"
+# Base configuration directory.
+# %%SUFXD_NAME%%_optfile (str): Server-specific option file.
+# Set it in the rc.conf or default behaviour of
+# `mysqld_safe` itself, will be picking
+# ${%%SUFXD_NAME%%_confdir}/my.cnf if it exists.
+# %%SUFXD_NAME%%_pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+: ${%%SUFXD_NAME%%_dbdir="%%MY_DBDIR%%"}
+: ${%%SUFXD_NAME%%_confdir="%%ETCDIR%%"}
+if [ -f "${%%SUFXD_NAME%%_confdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_confdir}/my.cnf"}
+elif [ -f "${%%SUFXD_NAME%%_dbdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_dbdir}/my.cnf"}
+fi
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+mysql_user="mysql"
+: ${hostname:=`/bin/hostname`}
+pidfile=${%%SUFXD_NAME%%_pidfile:-"${%%SUFXD_NAME%%_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${%%SUFXD_NAME%%_args} %%FEDER%% %%PERFSCHEMRC%%"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+mysqld_init="${procname}"
+mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --user=${mysql_user}"
+
+mysql_create_auth_tables()
+{
+ eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ return 0
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql84-server/pkg-plist b/databases/mysql84-server/pkg-plist
--- a/databases/mysql84-server/pkg-plist
+++ b/databases/mysql84-server/pkg-plist
@@ -83,6 +83,7 @@
lib/mysql/plugin/component_example_component1.so
lib/mysql/plugin/component_example_component2.so
lib/mysql/plugin/component_example_component3.so
+lib/mysql/plugin/component_keyring_file.so
lib/mysql/plugin/component_log_filter_dragnet.so
lib/mysql/plugin/component_log_sink_json.so
lib/mysql/plugin/component_log_sink_syseventlog.so
@@ -102,15 +103,19 @@
lib/mysql/plugin/component_test_event_tracking_consumer_c.so
lib/mysql/plugin/component_test_event_tracking_producer_a.so
lib/mysql/plugin/component_test_event_tracking_producer_b.so
+lib/mysql/plugin/component_test_execute_prepared_statement.so
+lib/mysql/plugin/component_test_execute_regular_statement.so
lib/mysql/plugin/component_test_host_application_signal.so
lib/mysql/plugin/component_test_mysql_command_services.so
lib/mysql/plugin/component_test_mysql_current_thread_reader.so
lib/mysql/plugin/component_test_mysql_runtime_error.so
+lib/mysql/plugin/component_test_mysql_signal_handler.so
lib/mysql/plugin/component_test_mysql_system_variable_set.so
lib/mysql/plugin/component_test_mysql_thd_store_service.so
lib/mysql/plugin/component_test_pfs_notification.so
lib/mysql/plugin/component_test_pfs_resource_group.so
lib/mysql/plugin/component_test_sensitive_system_variables.so
+lib/mysql/plugin/component_test_server_telemetry_metrics.so
lib/mysql/plugin/component_test_server_telemetry_traces.so
lib/mysql/plugin/component_test_status_var_reader.so
lib/mysql/plugin/component_test_status_var_service.so
@@ -139,7 +144,6 @@
lib/mysql/plugin/component_udf_unreg_int_func.so
lib/mysql/plugin/component_udf_unreg_real_func.so
lib/mysql/plugin/component_validate_password.so
-lib/mysql/plugin/component_keyring_file.so
lib/mysql/plugin/conflicting_variables.so
lib/mysql/plugin/connection_control.so
lib/mysql/plugin/daemon_example.ini
@@ -189,10 +193,6 @@
lib/mysql/plugin/semisync_replica.so
lib/mysql/plugin/semisync_slave.so
lib/mysql/plugin/semisync_source.so
-lib/mysql/plugin/component_test_execute_prepared_statement.so
-lib/mysql/plugin/component_test_execute_regular_statement.so
-lib/mysql/plugin/component_test_mysql_signal_handler.so
-lib/mysql/plugin/component_test_server_telemetry_metrics.so
lib/mysql/plugin/test_security_context.so
lib/mysql/plugin/test_services_command_services.so
lib/mysql/plugin/test_services_host_application_signal.so
diff --git a/databases/mysql91-client/Makefile b/databases/mysql91-client/Makefile
deleted file mode 100644
--- a/databases/mysql91-client/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-PORTNAME= mysql
-PORTREVISION= 1
-PKGNAMESUFFIX= 91-client
-
-COMMENT= Multithreaded SQL database (client)
-
-LICENSE+= LGPL21
-
-# MySQL8.2+ supports only 64-bit platforms
-# Review list after 13.x EoL
-NOT_FOR_ARCHS= armv6 armv7 i386 powerpc
-
-MASTERDIR= ${.CURDIR}/../mysql91-server
-
-PKGMESSAGE= ${.CURDIR}/pkg-message
-PATCHDIR= ${MASTERDIR}/files
-PLIST= ${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL= mysql8[1-9]-client \
- mysql[0-79][0-9]-client \
- mariadb[0-9][0-9]-client \
- percona[0-9][0-9]-client
-
-CMAKE_ARGS+= -DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
-
-USE_LDCONFIG+= ${PREFIX}/lib/mysql
-
-MMAN1= comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
- mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
- mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
-
-CLIENT_ONLY= yes
-
-OPTIONS_GROUP+= PLUGINS
-PLUGINS_DESC= Default Client Plugins
-OPTIONS_GROUP_PLUGINS= SASLCLIENT
-SASLCLIENT_DESC= SASL client plugin module
-SASLCLIENT_CMAKE_BOOL= WITH_AUTHENTICATION_LDAP
-SASLCLIENT_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USES= ldap
-
-OPTIONS_DEFAULT+= SASLCLIENT
-OPTIONS_SUB= yes
-
-post-install:
- @${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
- @${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
- @${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
- @${LN} -s libmysqlclient.so.24 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.24
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql91-client/pkg-message b/databases/mysql91-client/pkg-message
deleted file mode 100644
--- a/databases/mysql91-client/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
- message: <<EOM
-This is the mysql CLIENT without the server.
-for complete server and client, please install databases/mysql91-server
-EOM
-}
-]
diff --git a/databases/mysql91-client/pkg-plist b/databases/mysql91-client/pkg-plist
deleted file mode 100644
--- a/databases/mysql91-client/pkg-plist
+++ /dev/null
@@ -1,40 +0,0 @@
-bin/comp_err
-bin/my_print_defaults
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_migrate_keyring
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/perror
-include/mysql/errmsg.h
-include/mysql/field_types.h
-include/mysql/my_command.h
-include/mysql/my_compress.h
-include/mysql/my_list.h
-include/mysql/mysql.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/udf_registration_types.h
-include/mysql/mysql_com.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_error.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.24
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.24
-%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
-%%SASLCLIENT%%lib/mysql/plugin/authentication_oci_client.so
-%%SASLCLIENT%%lib/mysql/plugin/authentication_openid_connect_client.so
-%%SASLCLIENT%%lib/mysql/plugin/authentication_webauthn_client.so
-%%SASLCLIENT%%lib/mysql/plugin/mysql_native_password.so
-libdata/pkgconfig/mysqlclient.pc
-share/aclocal/mysql.m4
diff --git a/databases/mysql91-server/Makefile b/databases/mysql91-server/Makefile
--- a/databases/mysql91-server/Makefile
+++ b/databases/mysql91-server/Makefile
@@ -18,10 +18,6 @@
USES= bison:build cmake:noninja cpe groff:run libedit localbase \
ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
-
-SLAVEDIRS= databases/mysql91-client
-
CPE_VENDOR= oracle
USE_CXXSTD= c++20
@@ -91,9 +87,13 @@
IGNORE= you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again
.endif
+SUFXD_NAME= mysql91
+
+SUB_FILES= my.cnf.sample
SUB_LIST= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
+ MY_TMPDIR=${MY_TMPDIR} \
+ SUFXD_NAME=${SUFXD_NAME}
PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
@@ -101,22 +101,22 @@
# MySQL-Server part
.if !defined(CLIENT_ONLY)
-USES+= mysql:91
+# Install to a prefix to be able to co-install multiple versions of the
+# server. Client installs directly to PREFIX
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona*-server
-USE_RC_SUBR= mysql-server
+USE_RC_SUBR= ${SUFXD_NAME}-server
-SUB_FILES= my.cnf.sample pkg-message
+SUB_FILES+= pkg-message
USERS= mysql
GROUPS= mysql
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-
MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
@@ -171,10 +171,20 @@
@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
.if !defined(CLIENT_ONLY)
+
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
+
post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+
${MKDIR} ${STAGEDIR}${MY_SECDIR}
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif
diff --git a/databases/mysql91-server/files/mysql-server.in b/databases/mysql91-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mysql91-server/files/mysql-server.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
-# Base database directory.
-# mysql_confdir (str): Default to "%%ETCDIR%%"
-# Base configuration directory.
-# mysql_optfile (str): Server-specific option file.
-# Set it in the rc.conf or default behaviour of
-# `mysqld_safe` itself, will be picking
-# ${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-mysql_user="mysql"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysqld_init="${procname}"
-mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
-
-mysql_create_auth_tables()
-{
- eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- return 0
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql91-server/files/mysql91-server.in b/databases/mysql91-server/files/mysql91-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mysql91-server/files/mysql91-server.in
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# %%SUFXD_NAME%%_dbdir (str): Default to "%%MY_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_confdir (str): Default to "%%ETCDIR%%"
+# Base configuration directory.
+# %%SUFXD_NAME%%_optfile (str): Server-specific option file.
+# Set it in the rc.conf or default behaviour of
+# `mysqld_safe` itself, will be picking
+# ${%%SUFXD_NAME%%_confdir}/my.cnf if it exists.
+# %%SUFXD_NAME%%_pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+: ${%%SUFXD_NAME%%_dbdir="%%MY_DBDIR%%"}
+: ${%%SUFXD_NAME%%_confdir="%%ETCDIR%%"}
+if [ -f "${%%SUFXD_NAME%%_confdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_confdir}/my.cnf"}
+elif [ -f "${%%SUFXD_NAME%%_dbdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_dbdir}/my.cnf"}
+fi
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+mysql_user="mysql"
+: ${hostname:=`/bin/hostname`}
+pidfile=${%%SUFXD_NAME%%_pidfile:-"${%%SUFXD_NAME%%_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${%%SUFXD_NAME%%_args} %%FEDER%% %%PERFSCHEMRC%%"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+mysqld_init="${procname}"
+mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --user=${mysql_user}"
+
+mysql_create_auth_tables()
+{
+ eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ return 0
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql91-server/pkg-plist b/databases/mysql91-server/pkg-plist
--- a/databases/mysql91-server/pkg-plist
+++ b/databases/mysql91-server/pkg-plist
@@ -273,4 +273,4 @@
@dir %%ETCDIR%%/keyring
@dir lib/mysql/plugin/debug
@dir %%MY_SECDIR%%
-@dir %%MY_TMPDIR%%
+@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/mysql94-server/Makefile b/databases/mysql94-server/Makefile
--- a/databases/mysql94-server/Makefile
+++ b/databases/mysql94-server/Makefile
@@ -18,10 +18,6 @@
USES= bison:build cmake:noninja cpe groff:run libedit localbase \
ncurses perl5 pkgconfig shebangfix ssl compiler:c++20-lang
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
-
-SLAVEDIRS= databases/mysql91-client
-
CPE_VENDOR= oracle
USE_CXXSTD= c++20
@@ -91,9 +87,13 @@
IGNORE= you have `USE_MYSQL' variable defined either in environment or in make(1) arguments, please undefine and try again
.endif
+SUFXD_NAME= mysql94
+
+SUB_FILES= my.cnf.sample
SUB_LIST= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
- MY_TMPDIR=${MY_TMPDIR}
+ MY_TMPDIR=${MY_TMPDIR} \
+ SUFXD_NAME=${SUFXD_NAME}
PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
MY_SECDIR=${MY_SECDIR} \
@@ -101,22 +101,22 @@
# MySQL-Server part
.if !defined(CLIENT_ONLY)
-USES+= mysql:94
+# Install to a prefix to be able to co-install multiple versions of the
+# server. Client installs directly to PREFIX
+PREFIX= ${LOCALBASE}/${SUFXD_NAME}
CONFLICTS_INSTALL= mysql*-server \
mysqlwsrep*-server \
mariadb*-server \
percona*-server
-USE_RC_SUBR= mysql-server
+USE_RC_SUBR= ${SUFXD_NAME}-server
-SUB_FILES= my.cnf.sample pkg-message
+SUB_FILES+= pkg-message
USERS= mysql
GROUPS= mysql
-USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin
-
MMAN1= ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
@@ -171,10 +171,20 @@
@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
.if !defined(CLIENT_ONLY)
+
+install-rc-script:
+ @${ECHO_MSG} "===> Staging rc.d startup script(s)"
+ @${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/rc.d
+ @for i in ${USE_RC_SUBR}; do \
+ _prefix=${LOCALBASE}; \
+ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${STAGEDIR}$${_prefix}/etc/rc.d/$${i%.sh}; \
+ ${ECHO_CMD} "@(root,wheel,0755) $${_prefix}/etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \
+ done
+
post-install:
- ${MKDIR} ${STAGEDIR}${ETCDIR}
+ @${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
- ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+
${MKDIR} ${STAGEDIR}${MY_SECDIR}
${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif
diff --git a/databases/mysql94-server/files/mysql-server.in b/databases/mysql94-server/files/mysql-server.in
deleted file mode 100644
--- a/databases/mysql94-server/files/mysql-server.in
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable MySQL.
-# mysql_dbdir (str): Default to "%%MY_DBDIR%%"
-# Base database directory.
-# mysql_confdir (str): Default to "%%ETCDIR%%"
-# Base configuration directory.
-# mysql_optfile (str): Server-specific option file.
-# Set it in the rc.conf or default behaviour of
-# `mysqld_safe` itself, will be picking
-# ${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str): Custom PID file path and name.
-# Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str): Custom additional arguments to be passed
-# to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-mysql_user="mysql"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysqld_init="${procname}"
-mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
-
-mysql_create_auth_tables()
-{
- eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
- if [ ! -d "${mysql_dbdir}/mysql/." ]; then
- mysql_create_auth_tables || return 1
- fi
- return 0
-}
-
-mysql_poststart()
-{
- local timeout=15
- while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
- timeout=$(( timeout - 1 ))
- sleep 1
- done
- return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql94-server/files/mysql94-server.in b/databases/mysql94-server/files/mysql94-server.in
new file mode 100644
--- /dev/null
+++ b/databases/mysql94-server/files/mysql94-server.in
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# %%SUFXD_NAME%%_enable (bool): Set to "NO" by default.
+# Set it to "YES" to enable MySQL.
+# %%SUFXD_NAME%%_dbdir (str): Default to "%%MY_DBDIR%%"
+# Base database directory.
+# %%SUFXD_NAME%%_confdir (str): Default to "%%ETCDIR%%"
+# Base configuration directory.
+# %%SUFXD_NAME%%_optfile (str): Server-specific option file.
+# Set it in the rc.conf or default behaviour of
+# `mysqld_safe` itself, will be picking
+# ${%%SUFXD_NAME%%_confdir}/my.cnf if it exists.
+# %%SUFXD_NAME%%_pidfile (str): Custom PID file path and name.
+# Default to "${%%SUFXD_NAME%%_dbdir}/${hostname}.pid".
+# %%SUFXD_NAME%%_args (str): Custom additional arguments to be passed
+# to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="%%SUFXD_NAME%%"
+rcvar=%%SUFXD_NAME%%_enable
+
+load_rc_config $name
+
+: ${%%SUFXD_NAME%%_enable="NO"}
+: ${%%SUFXD_NAME%%_dbdir="%%MY_DBDIR%%"}
+: ${%%SUFXD_NAME%%_confdir="%%ETCDIR%%"}
+if [ -f "${%%SUFXD_NAME%%_confdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_confdir}/my.cnf"}
+elif [ -f "${%%SUFXD_NAME%%_dbdir}/my.cnf" ]; then
+: ${%%SUFXD_NAME%%_optfile="${%%SUFXD_NAME%%_dbdir}/my.cnf"}
+fi
+if [ ! -z "${%%SUFXD_NAME%%_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${%%SUFXD_NAME%%_optfile}"
+fi
+
+mysql_user="mysql"
+: ${hostname:=`/bin/hostname`}
+pidfile=${%%SUFXD_NAME%%_pidfile:-"${%%SUFXD_NAME%%_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${%%SUFXD_NAME%%_args} %%FEDER%% %%PERFSCHEMRC%%"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="mysql_prestart"
+start_postcmd="mysql_poststart"
+mysqld_init="${procname}"
+mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${%%SUFXD_NAME%%_dbdir} --user=${mysql_user}"
+
+mysql_create_auth_tables()
+{
+ eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
+}
+
+mysql_prestart()
+{
+ if [ ! -d "${%%SUFXD_NAME%%_dbdir}/mysql/." ]; then
+ mysql_create_auth_tables || return 1
+ fi
+ return 0
+}
+
+mysql_poststart()
+{
+ local timeout=15
+ while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+ timeout=$(( timeout - 1 ))
+ sleep 1
+ done
+ return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql94-server/pkg-plist b/databases/mysql94-server/pkg-plist
--- a/databases/mysql94-server/pkg-plist
+++ b/databases/mysql94-server/pkg-plist
@@ -24,7 +24,7 @@
bin/mysqltest_safe_process
bin/mysqlxtest
etc/logrotate.d/mysqlrouter
-%%ETCDIR%%/my.cnf.sample
+@sample %%ETCDIR%%/my.cnf.sample
lib/mysql/libmysqlharness.so
lib/mysql/libmysqlharness.so.1
lib/mysql/libmysqlharness_stdx.so
@@ -284,5 +284,4 @@
@dir %%ETCDIR%%/keyring
@dir lib/mysql/plugin/debug
@dir %%MY_SECDIR%%
-@dir %%MY_TMPDIR%%
-
+@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@@ -12,8 +12,7 @@
LICENSE= LGPL21
-USES= gmake ocaml:camlp4,findplist,ldconfig mysql
-IGNORE_WITH_MYSQL= 80 81
+USES= gmake ocaml:camlp4,findplist,ldconfig mysql:mariadb
GNU_CONFIGURE= yes
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -19,7 +19,7 @@
RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI
TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep
-USES= compiler:c11 mysql perl5 ssl
+USES= compiler:c11 mysql:mysql perl5 ssl
USE_PERL5= configure
CONFIGURE_ARGS= ${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}}
@@ -30,10 +30,4 @@
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so
-.include <bsd.port.pre.mk>
-
-.if ${MYSQL_FLAVOUR} != mysql
-IGNORE= use databases/p5-DBD-mysql4 or databases/p5-DBD-MariaDB instead
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/percona-orchestrator/Makefile b/databases/percona-orchestrator/Makefile
--- a/databases/percona-orchestrator/Makefile
+++ b/databases/percona-orchestrator/Makefile
@@ -16,7 +16,7 @@
gsed>0:textproc/gsed \
jq>0:textproc/jq
-USES= go mysql:server shebangfix
+USES= go mysql shebangfix
USERS= percona
GROUPS= percona
diff --git a/databases/rubygem-dbd-mysql/Makefile b/databases/rubygem-dbd-mysql/Makefile
--- a/databases/rubygem-dbd-mysql/Makefile
+++ b/databases/rubygem-dbd-mysql/Makefile
@@ -14,6 +14,5 @@
rubygem-mysql>=0:databases/rubygem-mysql
USES= gem
-IGNORE_WITH_MYSQL= 80 81
.include <bsd.port.mk>
diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile
--- a/databases/rubygem-mysql/Makefile
+++ b/databases/rubygem-mysql/Makefile
@@ -11,7 +11,6 @@
LICENSE= GPLv2 RUBY
LICENSE_COMB= dual
-USES= gem mysql
-IGNORE_WITH_MYSQL= 80 81
+USES= gem mysql:mariadb
.include <bsd.port.mk>
diff --git a/databases/rubygem-mysql2/Makefile b/databases/rubygem-mysql2/Makefile
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@@ -12,6 +12,6 @@
RUN_DEPENDS= rubygem-bigdecimal>=0:math/rubygem-bigdecimal
-USES= gem mysql ssl
+USES= gem mysql:build ssl
.include <bsd.port.mk>
diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -33,7 +33,7 @@
# MySQL
MYSQL_VARS= MODULES+=tdbcmysql
-MYSQL_USES= mysql:client
+MYSQL_USES= mysql
MYSQL_DISTFILES= ${PORTNAME}mysql${PORTVERSION}${EXTRACT_SUFX}
# ODBC
diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile
--- a/deskutils/moregroupware/Makefile
+++ b/deskutils/moregroupware/Makefile
@@ -29,7 +29,7 @@
ADDONS_DESC= install additional workgroup features (addons)
ADDONS_DISTFILES= ${PORTNAME}-addons-${PORTVERSION}${EXTRACT_SUFX}
-MYSQL_USES= mysql:server
+MYSQL_USES= mysql
NLS_USES= gettext
PGSQL_USES= pgsql
diff --git a/devel/cbang/Makefile b/devel/cbang/Makefile
--- a/devel/cbang/Makefile
+++ b/devel/cbang/Makefile
@@ -23,7 +23,7 @@
USE_GITHUB= yes
GH_ACCOUNT= CauldronDevelopmentLLC
-USES= compiler:c++17-lang localbase mysql:client python:test scons \
+USES= compiler:c++17-lang localbase mysql python:test scons \
sqlite ssl
USE_CXXSTD= gnu++17
USE_LDCONFIG= yes
diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
--- a/dns/opendnssec2/Makefile
+++ b/dns/opendnssec2/Makefile
@@ -49,9 +49,8 @@
SOFTHSM_DESC= SoftHSM cryptographic store for PKCS \#11 interface
SQLITE_DESC= Use SQLite backend
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_ON= --with-enforcer-database=mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
SOFTHSM_RUN_DEPENDS= softhsm2>=2.5.0:security/softhsm2
SOFTHSM_CONFIGURE_ON= --with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
SQLITE_BUILD_DEPENDS= sqlite3>=3.3.9:databases/sqlite3
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -191,7 +191,7 @@
MYSQL_CONFIGURE_WITH= system-mysql
MYSQL_LIB_DEPENDS= libmysqlcppconn.so:databases/mysql-connector-c++
MYSQL_USES= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
+MYSQL_IGNORE= Does not build with contemporary mysql-client
SDK_CONFIGURE_ENABLE= odk
SDK_DISTFILES= unowinreg.dll:unoreg
diff --git a/finance/frontaccounting/Makefile b/finance/frontaccounting/Makefile
--- a/finance/frontaccounting/Makefile
+++ b/finance/frontaccounting/Makefile
@@ -22,14 +22,10 @@
WRKSRC= ${WRKDIR}/${DIST_SUBDIR}
-OPTIONS_DEFINE= APACHE LIGHTTPD NGINX NLS DOCS
-OPTIONS_DEFAULT= APACHE MYSQL_SERVER
-OPTIONS_RADIO= RG1
-OPTIONS_RADIO_RG1= MARIADB_CLIENT MYSQL_CLIENT MYSQL_SERVER
-
-MARIADB_CLIENT_DESC= MariaDB client connector support
-MYSQL_CLIENT_DESC= MySQL client connector support
-MYSQL_SERVER_DESC= MySQL server support
+OPTIONS_DEFINE= APACHE LIGHTTPD MYSQL NGINX NLS DOCS
+OPTIONS_DEFAULT= APACHE MYSQL
+
+MYSQL_DESC= MySQL client connector support
NGINX_DESC= NGINX web server
RG1_DESC= Database Connectivity
@@ -37,9 +33,7 @@
DOCS_VARS_OFF= PORTDOCSARGS='-not -path "./doc*"'
LIGHTTPD_RUN_DEPENDS= lighttpd:www/lighttpd
LIGHTTPD_USES= php:web
-MARIADB_CLIENT_USES= mysql:106m
-MYSQL_CLIENT_USES= mysql:client
-MYSQL_SERVER_USES= mysql:server
+MYSQL_USES= mysql
NGINX_RUN_DEPENDS= nginx:www/nginx
NGINX_USES= php:web
NLS_USES= gettext
@@ -50,10 +44,6 @@
USES+= php:cgi php:cli
.endif
-.if ${PORT_OPTIONS:MMYSQL_SERVER} || ${PORT_OPTIONS:MMARIADB_CLIENT}
-USE_PHP+= mysqli
-.endif
-
do-install:
@${MKDIR} ${STAGEDIR}${WWWDIR}
(cd ${WRKSRC} && ${COPYTREE_SHARE} . \
diff --git a/finance/quickfix/Makefile b/finance/quickfix/Makefile
--- a/finance/quickfix/Makefile
+++ b/finance/quickfix/Makefile
@@ -30,9 +30,8 @@
OPTIONS_SUB= YES
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= postgresql
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_WITH= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
RUBY_USES= ruby
RUBY_CONFIGURE_WITH= ruby
RUBY_LIB_DEPENDS+=libunwind.so:devel/libunwind
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -46,8 +46,7 @@
PERL_USES= perl5
MYSQL_CONFIGURE_ENABLE= mysql
-MYSQL_USES= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
+MYSQL_USES= mysql:mariadb
PAM_CONFIGURE_WITH= pam
diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
--- a/games/pvpgn/Makefile
+++ b/games/pvpgn/Makefile
@@ -43,9 +43,8 @@
D2_DESC= Diablo II server (D2CS/D2DBS)
D2_CONFIGURE_ENABLE= d2cs d2dbs
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_WITH= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= pgsql
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -116,11 +116,8 @@
MYSQL_CMAKE_BOOL= ENABLE_MYSQLSUPPORT
MYSQL_INTERNAL_DESC= Use a dedicated MySQL instance (requires MariaDB)
-MYSQL_INTERNAL_USES= mysql:server
+MYSQL_INTERNAL_USES= mysql
MYSQL_INTERNAL_CMAKE_BOOL= ENABLE_INTERNALMYSQL
-# Only works with MariaDB. Try to keep this in sync with supported MySQL
-# versions and add any version not ending with 'm' to the IGNORE list.
-MYSQL_INTERNAL_VARS= IGNORE_WITH_MYSQL="80 81"
MYSQL_INTERNAL_IMPLIES= MYSQL
SQLITE3_USE= QT=sqldriver-sqlite:run
diff --git a/lang/seed7/Makefile b/lang/seed7/Makefile
--- a/lang/seed7/Makefile
+++ b/lang/seed7/Makefile
@@ -17,7 +17,7 @@
LIB_DEPENDS= libodbc.so:databases/unixODBC
-USES= display:build mysql:client ncurses pgsql sqlite tar:tgz xorg
+USES= display:build mysql ncurses pgsql sqlite tar:tgz xorg
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -26,7 +26,7 @@
QMAIL WEBUI LIGHTTPD DOCS EXAMPLES SETUID
OPTIONS_MULTI= DB
-OPTIONS_MULTI_DB= HASH MYSQL MYSQL_COMPRESS MYSQL_LOCAL \
+OPTIONS_MULTI_DB= HASH MYSQL MYSQL_COMPRESS \
PGSQL PGSQL_LOCAL SQLITE2 SQLITE3
OPTIONS_RADIO= LDA
@@ -44,7 +44,6 @@
CLAMAV_LOCAL_DESC= RUN_DEPEND on ClamAV
MYSQL_DESC= MySQL 5.X.x as back-end
MYSQL_COMPRESS_DESC= Compress dspam <--> MySQL
-MYSQL_LOCAL_DESC= RUN_DEPEND on MySQL server
PGSQL_DESC= PostgreSQL as back-end
PGSQL_LOCAL_DESC= RUN_DEPEND on PostgreSQL server
SQLITE2_DESC= SQLite v2.x as back-end
@@ -274,12 +273,6 @@
. if ${PORT_OPTIONS:MMYSQL_COMPRESS}
CONFIGURE_ARGS+= --enable-client-compression
. endif
-. if ${PORT_OPTIONS:MMYSQL_LOCAL}
-WANT_MYSQL= server
-SUB_LIST+= MYSQL=mysql
-. else
-SUB_LIST+= MYSQL=
-. endif
.else
_DBDRV:= ${_DBDRV:S/mysql_drv,//}
PLIST_SUB+= MYSQL="@comment "
diff --git a/mail/dspam/files/dspam.in b/mail/dspam/files/dspam.in
--- a/mail/dspam/files/dspam.in
+++ b/mail/dspam/files/dspam.in
@@ -1,7 +1,7 @@
#!/bin/sh
# PROVIDE: dspam
-# REQUIRE: DAEMON %%MYSQL%% %%PGSQL%% %%CLAMD%%
+# REQUIRE: DAEMON mysql %%PGSQL%% %%CLAMD%%
# BEFORE: mail
# KEYWORD: shutdown
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -348,7 +348,7 @@
-e 's,XX_LMDB_INCLUDES_XX,${_LMDB_INCLUDES:S/,/\\,/g},'
.if ${PORT_OPTIONS:MMYSQL}
-SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -l${_MYSQL_SHLIB:S/lib//},' \
+SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib/mysql -lmysqlclient,' \
-e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE:S/,/\\,/g}/include/mysql,' \
-e 's,^\# (LOOKUP_MYSQL=),\1,'
.else
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -41,11 +41,10 @@
GDBMAUTH_CPPFLAGS= -I${LOCALBASE}/include
GDBMAUTH_LIB_DEPENDS= libgdbm.so:databases/gdbm
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_ON= --enable-auth-mysql \
--with-mysql-lib-dir=${LOCALBASE}/lib/mysql \
--with-mysql-include-dir=${LOCALBASE}/include/mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
PGSQL_USES= pgsql
PGSQL_CONFIGURE_ON= --enable-auth-pgsql \
--with-pgsql-lib-dir=${LOCALBASE}/lib \
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -118,7 +118,6 @@
--enable-incdir=${LOCALBASE}/include/mysql \
--enable-libdir=${LOCALBASE}/lib/mysql
MYSQL_CFLAGS= -fcommon
-MYSQL_VARS= IGNORE_WITH_MYSQL="105m 106m 1011m 81"
MYSQL_LIMITS_CONFIGURE_ON= --enable-mysql-limits
MYSQL_REPLICATION_CONFIGURE_ON= --enable-mysql-replication
ONCHANGE_SCRIPT_CONFIGURE_ON= --enable-onchange-script
diff --git a/net-mgmt/icingaweb2-module-x509/Makefile b/net-mgmt/icingaweb2-module-x509/Makefile
--- a/net-mgmt/icingaweb2-module-x509/Makefile
+++ b/net-mgmt/icingaweb2-module-x509/Makefile
@@ -15,7 +15,7 @@
icingaweb2${PHP_PKGNAMESUFFIX}>=2.11.4:net-mgmt/icingaweb2@${PHP_FLAVOR} \
icingaweb2-module-reactbundle${PHP_PKGNAMESUFFIX}>0:net-mgmt/icingaweb2-module-reactbundle@${PHP_FLAVOR}
-USES= mysql:server php:web,flavors ssl
+USES= mysql php:web,flavors ssl
USE_GITHUB= yes
GH_ACCOUNT= Icinga
diff --git a/net-mgmt/klg/Makefile b/net-mgmt/klg/Makefile
--- a/net-mgmt/klg/Makefile
+++ b/net-mgmt/klg/Makefile
@@ -12,7 +12,7 @@
LICENSE= BSD3CLAUSE
-USES= tar:txz php:web,flavors mysql:client
+USES= tar:txz php:web,flavors mysql
USE_PHP= mysqli sockets xml
NO_ARCH= yes
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -91,19 +91,17 @@
DBDIR= /var/db/${PORTNAME}
-OPTIONS_DEFINE= DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS \
+OPTIONS_DEFINE= DOCS EXAMPLES FPING IPMITOOL LIBVIRT NAGPLUGINS \
NMAP WMIC X11
OPTIONS_DEFAULT= FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC
FPING_DESC= Enable fping support ping monitoring
IPMITOOL_DESC= Enable support for monitoring hardware IPMI
-MYSQLD_DESC= Use local MySQL server
WMIC_DESC= Enable support for WMI polling
FPING_RUN_DEPENDS= fping:net/fping
IPMITOOL_RUN_DEPENDS= ipmitool:sysutils/ipmitool
LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt
-MYSQLD_USES= mysql:server
NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
NMAP_RUN_DEPENDS= nmap:security/nmap
WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -33,12 +33,11 @@
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-OPTIONS_DEFINE= APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS PYPOLLER SUBVERSION WMIC
+OPTIONS_DEFINE= APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT NAGPLUGINS PYPOLLER SUBVERSION WMIC
OPTIONS_DEFAULT= APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS PYPOLLER SUBVERSION WMIC
APACHEMOD_DESC= Use PHP with Apache 2.4+ module
FPING_DESC= Enable fping support ping monitoring
IPMITOOL_DESC= Enable support for monitoring hardware IPMI
-MYSQLD_DESC= Use local MySQL server
PYPOLLER_DESC= Enable Python Poller Wrapper
WMIC_DESC= Enable support for WMI polling
@@ -76,12 +75,6 @@
.endif
.endif
-.if ${PORT_OPTIONS:MMYSQLD}
-USES+= mysql:server
-.else
-USES+= mysql:client
-.endif
-
pre-install:
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php
${FIND} ${WRKSRC} -type d -empty -delete
diff --git a/net-mgmt/seafile-server/Makefile b/net-mgmt/seafile-server/Makefile
--- a/net-mgmt/seafile-server/Makefile
+++ b/net-mgmt/seafile-server/Makefile
@@ -79,7 +79,7 @@
${WRKSRC}/controller/seafile-controller.c
@${MKDIR} ${_PKGCONFIGDIR}
-.if ${MYSQL_FLAVOUR} == mariadb
+.if ${MYSQL_CLIENT_DEFAULT} == mariadb
# If mariadb is the selected flavor, link the pc file as
# mysqlclient so PKG_CHECK_MODULES can find it. Mariadb
# doesn't supply this file in the same way other flavours do.
diff --git a/net-mgmt/super_mediator/Makefile b/net-mgmt/super_mediator/Makefile
--- a/net-mgmt/super_mediator/Makefile
+++ b/net-mgmt/super_mediator/Makefile
@@ -30,10 +30,8 @@
SKIPSET_DESC= Enable SiLK IPSET files for filtering
SPREAD_DESC= Enable Spread libary as a pub/sub distribution capability
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_WITH= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
SKIPSET_LIB_DEPENDS= libsilk.so:security/silktools
SKIPSET_CONFIGURE_WITH= skipset
SPREAD_LIB_DEPENDS= libspread.so:net/spread4
diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
--- a/net-mgmt/zabbix6-server/Makefile
+++ b/net-mgmt/zabbix6-server/Makefile
@@ -85,7 +85,7 @@
OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 MYSQL OPENSSL SNMP SSH UNIXODBC
OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP NMAP SNMP SSH UNIXODBC
OPTIONS_SINGLE+= DB SSL
-OPTIONS_SINGLE_DB= MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL
+OPTIONS_SINGLE_DB= MYSQL ORACLE PGSQL
.if ${ZABBIX_BUILD} == "proxy"
OPTIONS_SINGLE_DB+= SQLITE
.endif
@@ -100,7 +100,6 @@
SSH_DESC= Support for SSH-based checks
UNIXODBC_DESC= Support for database checks via ODBC
MYSQL_DESC= MySQL 8.0 database support
-MYSQLDV_DESC= MYSQL DEFAULT_VERSIONS= (poudriere)
FPING_RUN_DEPENDS= fping:net/fping
@@ -111,18 +110,7 @@
LDAP_USES= ldap
MYSQL_CONFIGURE_ON= --with-mysql
-MYSQL_USES+= compiler:c11 mysql:80
-
-MYSQLDV_CONFIGURE_ON= --with-mysql
-MYSQLDV_USES+= compiler:c11 mysql
-
-MDB5_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MDB5_USES+= compiler:c11 mysql:105m
-MDB5_DESC= Mariadb 10.5 database support
-
-MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MDB6_USES+= compiler:c11 mysql:106m
-MDB6_DESC= Mariadb 10.6 database support
+MYSQL_USES+= compiler:c11 mysql
ORACLE_CONFIGURE_WITH= oracle
diff --git a/net-mgmt/zabbix6-server/files/zabbix_proxy.in b/net-mgmt/zabbix6-server/files/zabbix_proxy.in
--- a/net-mgmt/zabbix6-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix6-server/files/zabbix_proxy.in
@@ -4,9 +4,6 @@
# REQUIRE: DAEMON
%%PGSQL%%# REQUIRE: postgresql
%%MYSQL%%# REQUIRE: mysql
-%%MYSQLDV%%# REQUIRE: mysql
-%%MDB5%%# REQUIRE: mysql
-%%MDB6%%# REQUIRE: mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix6-server/files/zabbix_server.in b/net-mgmt/zabbix6-server/files/zabbix_server.in
--- a/net-mgmt/zabbix6-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix6-server/files/zabbix_server.in
@@ -4,9 +4,6 @@
# REQUIRE: DAEMON
%%PGSQL%%# REQUIRE: postgresql
%%MYSQL%%# REQUIRE: mysql
-%%MYSQLDV%%# REQUIRE: mysql
-%%MDB5%%# REQUIRE: mysql
-%%MDB6%%# REQUIRE: mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix7-server/Makefile b/net-mgmt/zabbix7-server/Makefile
--- a/net-mgmt/zabbix7-server/Makefile
+++ b/net-mgmt/zabbix7-server/Makefile
@@ -84,7 +84,7 @@
OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 MYSQL OPENSSL SNMP SSH UNIXODBC
OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP NMAP SNMP SSH UNIXODBC
OPTIONS_SINGLE+= DB SSL
-OPTIONS_SINGLE_DB= MDB5 MDB6 MYSQL MYSQLDV ORACLE PGSQL
+OPTIONS_SINGLE_DB= MYSQL ORACLE PGSQL
.if ${ZABBIX_BUILD} == "proxy"
OPTIONS_SINGLE_DB+= SQLITE
.endif
@@ -99,7 +99,6 @@
SSH_DESC= Support for SSH-based checks
UNIXODBC_DESC= Support for database checks via ODBC
MYSQL_DESC= MySQL 8.0 database support
-MYSQLDV_DESC= MYSQL DEFAULT_VERSIONS= (poudriere)
FPING_RUN_DEPENDS= fping:net/fping
@@ -110,18 +109,7 @@
LDAP_USES= ldap
MYSQL_CONFIGURE_ON= --with-mysql
-MYSQL_USES+= compiler:c11 mysql:80
-
-MYSQLDV_CONFIGURE_ON= --with-mysql
-MYSQLDV_USES+= compiler:c11 mysql
-
-MDB5_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MDB5_USES+= compiler:c11 mysql:105m
-MDB5_DESC= Mariadb 10.5 database support
-
-MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MDB6_USES+= compiler:c11 mysql:106m
-MDB6_DESC= Mariadb 10.6 database support
+MYSQL_USES+= compiler:c11 mysql
ORACLE_CONFIGURE_WITH= oracle
diff --git a/net-mgmt/zabbix7-server/files/zabbix_proxy.in b/net-mgmt/zabbix7-server/files/zabbix_proxy.in
--- a/net-mgmt/zabbix7-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix7-server/files/zabbix_proxy.in
@@ -4,9 +4,6 @@
# REQUIRE: DAEMON
%%PGSQL%%# REQUIRE: postgresql
%%MYSQL%%# REQUIRE: mysql
-%%MYSQLDV%%# REQUIRE: mysql
-%%MDB5%%# REQUIRE: mysql
-%%MDB6%%# REQUIRE: mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix7-server/files/zabbix_server.in b/net-mgmt/zabbix7-server/files/zabbix_server.in
--- a/net-mgmt/zabbix7-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix7-server/files/zabbix_server.in
@@ -4,9 +4,6 @@
# REQUIRE: DAEMON
%%PGSQL%%# REQUIRE: postgresql
%%MYSQL%%# REQUIRE: mysql
-%%MYSQLDV%%# REQUIRE: mysql
-%%MDB5%%# REQUIRE: mysql
-%%MDB6%%# REQUIRE: mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix74-server/Makefile b/net-mgmt/zabbix74-server/Makefile
--- a/net-mgmt/zabbix74-server/Makefile
+++ b/net-mgmt/zabbix74-server/Makefile
@@ -78,7 +78,7 @@
OPTIONS_DEFAULT+= CURL FPING IPMI IPV6 MYSQL OPENSSL SNMP SSH UNIXODBC
OPTIONS_DEFINE= CURL FPING IPMI IPV6 LDAP NMAP PCRE2 SNMP SSH UNIXODBC
OPTIONS_SINGLE+= DB SSL
-OPTIONS_SINGLE_DB= MDB5 MDB6 MYSQL MYSQLDV PGSQL
+OPTIONS_SINGLE_DB= MYSQL PGSQL
.if ${ZABBIX_BUILD} == "proxy"
OPTIONS_SINGLE_DB+= SQLITE
.endif
@@ -103,19 +103,9 @@
LDAP_CONFIGURE_WITH= ldap
LDAP_USES= ldap
+# TODO: unify mysql/maridb option, as they all use the same client port now
MYSQL_CONFIGURE_ON= --with-mysql
-MYSQL_USES+= compiler:c11 mysql:80
-
-MYSQLDV_CONFIGURE_ON= --with-mysql
-MYSQLDV_USES+= compiler:c11 mysql
-
-MDB5_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MDB5_USES+= compiler:c11 mysql:105m
-MDB5_DESC= Mariadb 10.5 database support
-
-MDB6_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
-MDB6_USES+= compiler:c11 mysql:106m
-MDB6_DESC= Mariadb 10.6 database support
+MYSQL_USES+= compiler:c11 mysql
PGSQL_CONFIGURE_WITH= postgresql
PGSQL_USES+= pgsql
diff --git a/net-mgmt/zabbix74-server/files/zabbix_proxy.in b/net-mgmt/zabbix74-server/files/zabbix_proxy.in
--- a/net-mgmt/zabbix74-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix74-server/files/zabbix_proxy.in
@@ -4,9 +4,6 @@
# REQUIRE: DAEMON
%%PGSQL%%# REQUIRE: postgresql
%%MYSQL%%# REQUIRE: mysql
-%%MYSQLDV%%# REQUIRE: mysql
-%%MDB5%%# REQUIRE: mysql
-%%MDB6%%# REQUIRE: mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-mgmt/zabbix74-server/files/zabbix_server.in b/net-mgmt/zabbix74-server/files/zabbix_server.in
--- a/net-mgmt/zabbix74-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix74-server/files/zabbix_server.in
@@ -4,9 +4,6 @@
# REQUIRE: DAEMON
%%PGSQL%%# REQUIRE: postgresql
%%MYSQL%%# REQUIRE: mysql
-%%MYSQLDV%%# REQUIRE: mysql
-%%MDB5%%# REQUIRE: mysql
-%%MDB6%%# REQUIRE: mysql
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf.local or /etc/rc.conf to
diff --git a/net-p2p/xbt/Makefile b/net-p2p/xbt/Makefile
--- a/net-p2p/xbt/Makefile
+++ b/net-p2p/xbt/Makefile
@@ -11,8 +11,7 @@
BUILD_DEPENDS= ${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs
-USES= compiler:c++17-lang mysql pkgconfig
-IGNORE_WITH_MYSQL= 105m 106m 1011m
+USES= compiler:c++17-lang mysql:mysql pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= OlafvdSpek
GH_TAGNAME= 9c7dbc4
diff --git a/net/rtg/Makefile b/net/rtg/Makefile
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -15,7 +15,7 @@
RUN_DEPENDS= p5-DBI>=0:databases/p5-DBI \
${DBD_MYSQL}
-USES= mysql:client perl5 shebangfix ssl
+USES= mysql perl5 shebangfix ssl
USE_RC_SUBR= rtgpoll
SHEBANG_FILES= etc/95.pl etc/report.pl etc/rtgtargmkr.pl.in
@@ -33,12 +33,9 @@
USERS= rtg
GROUPS= rtg
-OPTIONS_DEFINE= WEB MYSQL
-MYSQL_DESC= Pull MySQL server in as a dependancy for local setups
+OPTIONS_DEFINE= WEB
WEB_DESC= Include PHP-based web client interface pre-requisites
-MYSQL_USES= mysql:server
-
WEB_USES= php
WEB_USE= PHP=mysqli
WEB_SUB_FILES= pkg-message
diff --git a/science/orthanc-mysql/Makefile b/science/orthanc-mysql/Makefile
--- a/science/orthanc-mysql/Makefile
+++ b/science/orthanc-mysql/Makefile
@@ -26,7 +26,7 @@
libprotobuf.so:devel/protobuf
RUN_DEPENDS= Orthanc:science/orthanc
-USES= cmake localbase mysql:client python:build ssl
+USES= cmake localbase mysql python:build ssl
USE_LDCONFIG= ${DATADIR}/plugins
WRKSRC= ${WRKDIR}/OrthancMySQL-${PORTVERSION}
diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -48,13 +48,11 @@
GRE_CONFIGURE_ENABLE= gre
IPV6_CONFIGURE_ENABLE= ipv6
MPLS_CONFIGURE_ENABLE= mpls
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_WITH= mysql
MYSQL_CONFIGURE_ON= --with-mysql-includes=${LOCALBASE}/include/mysql \
--with-mysql-libraries=${LOCALBASE}/lib/mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
MYSQL_SSL_CONFIGURE_ENABLE= mysql-ssl-support
-MYSQL_SSL_VARS= IGNORE_WITH_MYSQL="80"
ODBC_BROKEN= fails to build with ODBC=on
ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
ODBC_CONFIGURE_WITH= odbc
diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
--- a/security/vaultwarden/Makefile
+++ b/security/vaultwarden/Makefile
@@ -38,7 +38,7 @@
WEBVAULT_DESC= Vaultwarden web (bw_web_builds)
S3_DESC= S3 storage backend support (experimental)
-MYSQL_USES= mysql:client
+MYSQL_USES= mysql
MYSQL_VARS= cargo_features+=mysql
PGSQL_USES= pgsql
PGSQL_VARS= cargo_features+=postgresql
diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -39,6 +39,7 @@
MYSQL_CONFIGURE_WITH= mysql
MYSQL_USE= php=mysqli
+MYSQL_USES= mysql
MYSQLIPV6_DESC= Build plugin for Mysql IPv6 support (implies MYSQL)
MYSQLIPV6_IMPLIES= MYSQL
@@ -75,12 +76,6 @@
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MMYSQLIPV6}
-USES+= mysql:server,client
-.elif ${PORT_OPTIONS:MMYSQL}
-USES+= mysql:client
-.endif
-
do-install:
@${MKDIR} ${STAGEDIR}${WWWDIR}/include/
${INSTALL_DATA} ${WRKSRC}/webfwlog/style.css ${STAGEDIR}${WWWDIR}
diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
--- a/sysutils/cfengine-devel/Makefile
+++ b/sysutils/cfengine-devel/Makefile
@@ -65,7 +65,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= mysql=${LOCALBASE}
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine321/Makefile b/sysutils/cfengine321/Makefile
--- a/sysutils/cfengine321/Makefile
+++ b/sysutils/cfengine321/Makefile
@@ -63,7 +63,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine322/Makefile b/sysutils/cfengine322/Makefile
--- a/sysutils/cfengine322/Makefile
+++ b/sysutils/cfengine322/Makefile
@@ -63,7 +63,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine323/Makefile b/sysutils/cfengine323/Makefile
--- a/sysutils/cfengine323/Makefile
+++ b/sysutils/cfengine323/Makefile
@@ -63,7 +63,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine324/Makefile b/sysutils/cfengine324/Makefile
--- a/sysutils/cfengine324/Makefile
+++ b/sysutils/cfengine324/Makefile
@@ -61,7 +61,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine325/Makefile b/sysutils/cfengine325/Makefile
--- a/sysutils/cfengine325/Makefile
+++ b/sysutils/cfengine325/Makefile
@@ -62,7 +62,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine326/Makefile b/sysutils/cfengine326/Makefile
--- a/sysutils/cfengine326/Makefile
+++ b/sysutils/cfengine326/Makefile
@@ -62,7 +62,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/cfengine327/Makefile b/sysutils/cfengine327/Makefile
--- a/sysutils/cfengine327/Makefile
+++ b/sysutils/cfengine327/Makefile
@@ -61,7 +61,6 @@
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH= --with-mysql=${LOCALBASE}
MYSQL_CONFIGURE_OFF= --without-mysql
-MYSQL_LIB_DEPENDS= libmysqlclient.so:${_MYSQL_CLIENT}
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
LIBVIRT_CONFIGURE_WITH= --with-libvirt=${LOCALBASE}
diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -23,7 +23,7 @@
NO_BUILD= yes
NO_WRKSUBDIR= yes
-OPTIONS_DEFINE= DKIM LIBNSS LOGROTATE MYSQLS NLS PCNTL
+OPTIONS_DEFINE= DKIM LIBNSS LOGROTATE NLS PCNTL
OPTIONS_RADIO= DNS FTP IMAPPOP3 SMTP WEB
OPTIONS_RADIO_WEB= APACHE LIGHTTPD NGINX
@@ -57,10 +57,9 @@
WEBALIZER_DESC= Webalizer (small, fast, static result pages)
AWSTATS_DESC= Awstats (more fancy, dynamic and static result pages)
LOGROTATE_DESC= Logrotate for log rotation
-MYSQLS_DESC= Depend on MySQL server
NLS_DESC= Enable NLS support (required for webFTP frontend)
-OPTIONS_DEFAULT= APACHE DOVECOT2 MYSQLS PCNTL POSTFIX PROFTPD WEBALIZER
+OPTIONS_DEFAULT= APACHE DOVECOT2 PCNTL POSTFIX PROFTPD WEBALIZER
POSTFIX_RUN_DEPENDS= postfix:mail/postfix
@@ -94,8 +93,6 @@
APACHE_USES= apache php:mod
-MYSQLS_USES= mysql:server
-
PCNTL_USE= PHP=pcntl
NLS_USES= gettext-runtime:run
diff --git a/sysutils/n98-magerun/Makefile b/sysutils/n98-magerun/Makefile
--- a/sysutils/n98-magerun/Makefile
+++ b/sysutils/n98-magerun/Makefile
@@ -11,7 +11,7 @@
LICENSE= MIT
-USES= mysql:client php:cli
+USES= mysql php:cli
USE_PHP= phar bz2 simplexml pdo_mysql zlib ctype dom posix
NO_ARCH= yes
diff --git a/sysutils/omnibackup/Makefile b/sysutils/omnibackup/Makefile
--- a/sysutils/omnibackup/Makefile
+++ b/sysutils/omnibackup/Makefile
@@ -58,8 +58,7 @@
RUN_DEPENDS+= pg_dumpall:databases/postgresql${PGSQL_VER_NODOT}-client
.endif
.if ${PORT_OPTIONS:MMYSQL}
-USES+= mysql
-RUN_DEPENDS+= mysqldump:${_MYSQL_CLIENT}
+USES+= mysql:build,run
.endif
.endif
diff --git a/sysutils/slurm-wlm/Makefile b/sysutils/slurm-wlm/Makefile
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@@ -25,7 +25,7 @@
libunwind.so:devel/libunwind \
libyaml.so:textproc/libyaml
-USES= compiler:c11 cpe gmake libtool localbase lua mysql:client perl5 \
+USES= compiler:c11 cpe gmake libtool localbase lua mysql perl5 \
pkgconfig python:build readline shebangfix ssl tar:bz2
CPE_VENDOR= schedmd
USE_LDCONFIG= yes
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -41,9 +41,8 @@
BDB_CONFIGURE_WITH= bdb
MYSQL_LIB_DEPENDS= libunwind.so:devel/libunwind
-MYSQL_USES= mysql ssl
+MYSQL_USES= mysql:mysql ssl
MYSQL_CONFIGURE_WITH= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="105m 106m 1011m"
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= postgresql
diff --git a/www/hotcrp/Makefile b/www/hotcrp/Makefile
--- a/www/hotcrp/Makefile
+++ b/www/hotcrp/Makefile
@@ -13,7 +13,7 @@
RUN_DEPENDS= pdftohtml:graphics/poppler-utils
-USES= php mysql:server
+USES= php mysql
USE_PHP= ctype gd mysqli session zlib
NO_BUILD= yes
diff --git a/www/kannel-sqlbox/Makefile b/www/kannel-sqlbox/Makefile
--- a/www/kannel-sqlbox/Makefile
+++ b/www/kannel-sqlbox/Makefile
@@ -33,7 +33,6 @@
OPTIONS_MULTI_DATABASE= MYSQL PGSQL SQLITE3
MYSQL_USES= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL=80
PGSQL_USES= pgsql
SQLITE3_USES= sqlite:3
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -38,9 +38,8 @@
OPTIONS_DEFINE= MYSQL PGSQL SQLITE3
OPTIONS_DEFAULT= SQLITE3
-MYSQL_USES= mysql
+MYSQL_USES= mysql:mariadb
MYSQL_CONFIGURE_WITH= mysql
-MYSQL_VARS= IGNORE_WITH_MYSQL="80 81"
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= pgsql
SQLITE3_USES= sqlite:3
diff --git a/www/onlyoffice-documentserver/Makefile b/www/onlyoffice-documentserver/Makefile
--- a/www/onlyoffice-documentserver/Makefile
+++ b/www/onlyoffice-documentserver/Makefile
@@ -132,7 +132,7 @@
OPTIONS_SINGLE= DB
OPTIONS_SINGLE_DB= MYSQL PGSQL
-MYSQL_USES+= mysql:client
+MYSQL_USES+= mysql
PGSQL_USES+= pgsql
PGSQL_VARS= WANT_PGSQL=client
diff --git a/www/p5-FCGI-Spawn/Makefile b/www/p5-FCGI-Spawn/Makefile
--- a/www/p5-FCGI-Spawn/Makefile
+++ b/www/p5-FCGI-Spawn/Makefile
@@ -34,7 +34,6 @@
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
-# RUN_DEPENDS+= mysql-server>=0:databases/mysql${MYSQL_VER}-server
SUB_LIST+= MYSQL=mysql
. else
SUB_LIST+= MYSQL=

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 3:25 AM (3 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29995236
Default Alt Text
D43946.id170635.diff (276 KB)

Event Timeline