git: 8316a36ca70f - main - databases/mariadb1011-server: Remove superfluous mariadb-server/ added in d8f9dd4dc0025cf5847148025dd1532a3c87287c
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 11 Oct 2023 13:00:36 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8316a36ca70fb89263f557b41234abc8c156edb6 commit 8316a36ca70fb89263f557b41234abc8c156edb6 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-10-11 12:58:47 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-10-11 12:58:47 +0000 databases/mariadb1011-server: Remove superfluous mariadb-server/ added in d8f9dd4dc0025cf5847148025dd1532a3c87287c Approved by: portmgr (blanket) --- .../mariadb1011-server/mariadb-server/Makefile | 294 ------------ .../mariadb1011-server/mariadb-server/distinfo | 3 - .../mariadb-server/files/client.cnf.sample.in | 52 --- .../mariadb-server/files/my.cnf.sample.in | 13 - .../mariadb-server/files/mysql-server.in | 149 ------ .../mariadb-server/files/patch-include_m__ctype.h | 13 - .../mariadb-server/files/patch-include_my__cpu.h | 48 -- .../files/patch-include_ssl__compat.h | 22 - .../files/patch-mysys_crc32_crc32c.cc | 24 - .../files/patch-scripts_mysql__config.sh | 10 - .../mariadb-server/files/patch-sql_mysqld.cc | 20 - ...store_columnstore_utils_common_threadnaming.cpp | 24 - ...storage_rocksdb_rocksdb_port_jemalloc__helper.h | 13 - .../files/patch-tpool_CMakeLists.txt | 8 - .../mariadb-server/files/pkg-message.in | 24 - .../mariadb-server/files/server.cnf.sample.in | 60 --- .../mariadb1011-server/mariadb-server/pkg-descr | 12 - .../mariadb1011-server/mariadb-server/pkg-plist | 517 --------------------- 18 files changed, 1306 deletions(-) diff --git a/databases/mariadb1011-server/mariadb-server/Makefile b/databases/mariadb1011-server/mariadb-server/Makefile deleted file mode 100644 index f387177a39ca..000000000000 --- a/databases/mariadb1011-server/mariadb-server/Makefile +++ /dev/null @@ -1,294 +0,0 @@ -PORTNAME?= mariadb -PORTVERSION= 10.11.2 -PORTREVISION?= 0 -CATEGORIES= databases -MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ - https://mirror.one.com/${SITESDIR}/ \ - https://ftp.nluug.nl/db/${SITESDIR}/ \ - https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \ - https://mirror.truenetwork.ru/${SITESDIR}/ \ - https://mirrors.aliyun.com/${SITESDIR}/ \ - https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \ - https://mirror.kku.ac.th/${SITESDIR}/ \ - https://espejito.fder.edu.uy/${SITESDIR}/ \ - https://mirror1.cl.netactuate.com/${SITESDIR}/ \ - https://ftp.osuosl.org/pub/${SITESDIR}/ \ - https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/ -PKGNAMESUFFIX?= 1011-server - -MAINTAINER= brnrd@FreeBSD.org -COMMENT?= Multithreaded SQL database (server) -WWW= https://mariadb.org/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -LIB_DEPENDS+= libfmt.so:devel/libfmt \ - libpcre2-8.so:devel/pcre2 \ - libzstd.so:archivers/zstd - -# Ugly workaround for MariaDB/CMake library detection -LDFLAGS+= -L${LOCALBASE}/lib - -USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl - -SUB_FILES= 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 - -MARIADB_USER?= mysql -MARIADB_GROUP?= mysql -MARIADB_DBDIR?= /var/db/mysql -MARIADB_RUNDIR?= /var/run/mysql -MARIADB_SOCK?= mysql.sock -MARIADB_LOGDIR?= /var/log/mysql - -USERS= ${MARIADB_USER} -GROUPS= ${MARIADB_GROUP} - -OPTIONS_SINGLE= GSSAPI -OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE -OPTIONS_DEFAULT= GSSAPI_BASE - -.if ${PKGNAMESUFFIX:M*-server} -# MySQL-Server options -OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP -OPTIONS_GROUP= COMPRESSION ENGINES GROONGA -OPTIONS_DEFINE= CONNECT_EXTRA DOCS -OPTIONS_DEFINE_amd64= WSREP -OPTIONS_DEFINE_aarch64= WSREP -OPTIONS_DEFINE_powerpc64le= WSREP -OPTIONS_DEFINE_powerpc64= WSREP -OPTIONS_DEFINE_riscv64= WSREP -OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD -OPTIONS_GROUP_ENGINES= COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER -OPTIONS_GROUP_GROONGA= ZMQ MSGPACK -OPTIONS_EXCLUDE_i386= ROCKSDB - -COLUMNSTORE_DESC= Columnar storage egine (BETA) -CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine -COMPRESSION_DESC= Optional page compression -ENGINES_DESC= Optional MariaDB storage engines -GROONGA_DESC= Optional Mroonga features -INNOBASE_DESC= InnoDB default engine -MROONGA_DESC= Mroonga Full Text Search engine -MSGPACK_DESC= MsgPack support -OQGRAPH_DESC= Open Query Graph Computation engine -ROCKSDB_DESC= RocksDB LSM engine -S3_DESC= S3 storage engine (Alpha) -SPHINX_DESC= SphinxSE engine -SPIDER_DESC= Partitioning and XA-transactions engine -WSREP_DESC= Build wsrep clustering -ZMQ_DESC= ZeroMQ support -.endif - -CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ - -DINSTALL_DOCDIR="share/doc/mysql" \ - -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ - -DINSTALL_INFODIR="info" \ - -DINSTALL_LIBDIR="lib/mysql" \ - -DINSTALL_MANDIR="share/man" \ - -DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \ - -DINSTALL_MYSQLSHAREDIR="share/mysql" \ - -DINSTALL_MYSQLTESTDIR= \ - -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ - -DINSTALL_SBINDIR="libexec" \ - -DINSTALL_SCRIPTDIR="bin" \ - -DINSTALL_SQLBENCHDIR= \ - -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DINSTALL_SYSCONFDIR="${ETCDIR}" \ - -DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \ - -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ - -DWITH_PCRE=system \ - -DWITH_LIBFMT=system \ - -DWITH_SSL="${OPENSSLBASE}" \ - -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ - -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ - -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ - -DKRB5_CONFIG="${KRB5CONFIG}" \ - -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ - -DCOMPILATION_COMMENT="FreeBSD Ports" \ - -DPLUGIN_AUTH_TEST_PLUGIN=NO -CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS -CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS -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* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* - -FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES -GSSAPI_BASE_USES= gssapi -GSSAPI_HEIMDAL_USES= gssapi:heimdal -GSSAPI_MIT_USES= gssapi:mit -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF -OPTIONS_SUB= yes -SUB_LIST+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ - MARIADB_SOCK="${MARIADB_SOCK}" - -.if ${PKGNAMESUFFIX:M*-client} -# MySQL-Client part -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 - -.else # ! ${PKGNAMESUFFIX:M*-client} -# MySQL-Server part -USES+= mysql:m - -USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin -USE_RC_SUBR= mysql-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}" -PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ - MARIADB_USER="${MARIADB_USER}" \ - MARIADB_GROUP="${MARIADB_GROUP}" - -.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} -${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO -${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC -.endfor -INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE -#COLUMNSTORE_BROKEN= fatal error: 'sys/sysinfo.h' file not found -CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC -CONNECT_EXTRA_USE= gnome=libxml2 -CONNECT_EXTRA_USES= gnome -CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC -GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI -LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON -LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF -LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 -LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON -LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF -LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 -MROONGA_IMPLIES= LZ4 -MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c -OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libJudy.so:devel/judy -ROCKSDB_USES= python -ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON -SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON -SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF -SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy -WSREP_CMAKE_BOOL= WITH_WSREP -WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 -WSREP_RUN_DEPENDS= bash:shells/bash \ - rsync:net/rsync \ - #stunnel:security/stunnel -WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync -ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 -ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd - -.for PLUGIN in ${DISABLED_PLUGINS} -CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO -.endfor - -.endif # ${PKGNAMESUFFIX:M*-client} - -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - -.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} -GSSAPI_BASE_IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - -.if ${ARCH} != amd64 && ${ARCH} != aarch64 -PLIST_SUB+= WSREP="@comment " -.endif - -#.if ${ARCH} == i386 -#USE_GCC= 9 -#CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE -#CXXFLAGS+= -fpermissive -#.endif - -post-patch: -.if ${OPSYS} == DragonFly - ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ - ${WRKSRC}/cmake/os/DragonFly.cmake -.endif - -pre-configure: - ${REINPLACE_CMD} 's|\(CHECK_LIBRARY_EXISTS.*\) "" HAVE_|\1 ${LOCALBASE}/lib HAVE_|' \ - ${WRKSRC}/cmake/pcre.cmake - -post-configure: - ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ - ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \ - ${WRKSRC}/scripts/mysql_config.sh - -pre-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d - -.if ${PKGNAMESUFFIX:M*-client} -post-install: - ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample - ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \ - ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample - ${RM} -r ${STAGEDIR}${DATADIR} \ - ${STAGEDIR}${PREFIX}/include/mysql/server \ - ${STAGEDIR}${ETCDIR}/init.d \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig - -post-install-GSSAPI_NONE-off: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so - -.else # ! ${PKGNAMESUFFIX:M*-client} -post-install: - ${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 - ${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \ - ${STAGEDIR}${PREFIX}/lib/mysql/ - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ - ${STAGEDIR}${PREFIX}/include/mysql/server/private \ - ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \ - ${STAGEDIR}${PREFIX}/libexec/rcmysql \ - ${STAGEDIR}/suite \ - ${STAGEDIR}${ETCDIR}/init.d \ - ${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} - ${RM} ${STAGEDIR}${DOCSDIR}/groonga/COPYING \ - ${STAGEDIR}${DATADIR}/mroonga/COPYING - -post-install-SPIDER-on: - ${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \ - ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample - -post-install-WSREP-on: - ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ - ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample - -.endif # ${PKGNAMESUFFIX:M*-client} - -.include <bsd.port.mk> diff --git a/databases/mariadb1011-server/mariadb-server/distinfo b/databases/mariadb1011-server/mariadb-server/distinfo deleted file mode 100644 index 17ec45de25fd..000000000000 --- a/databases/mariadb1011-server/mariadb-server/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1680372425 -SHA256 (mariadb-10.11.2.tar.gz) = 1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc -SIZE (mariadb-10.11.2.tar.gz) = 96372411 diff --git a/databases/mariadb1011-server/mariadb-server/files/client.cnf.sample.in b/databases/mariadb1011-server/mariadb-server/files/client.cnf.sample.in deleted file mode 100644 index 2513f6a04fb2..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/client.cnf.sample.in +++ /dev/null @@ -1,52 +0,0 @@ -# Options specific to client applications, see -# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups - -# Options specific to all client programs -[client] -# port = 3306 # inherited from %%ETCDIR%%/my.cnf -# socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf - -# Options specific to MariaDB client programs -[client-mariadb] - -# -## Options for specific client Tools -# - -# Options read by `mysql` -# Renamed from [mysql] starting with MariaDB 10.4.6. -[mariadb-client] Options read by mysql. Available starting with MariaDB 10.4.6. -prompt = \u@\h [\d]>\_ -no_auto_rehash - -# Options read by `mysqldump` -# Renamed from [mysqldump] starting with MariaDB 10.4.6. -[mariadb-dump] -max_allowed_packet = 256M -quote_names -quick - -# Options read by `mysqladmin` -# Renamed from [mysqladmin] starting with MariaDB 10.4.6. -[mariadb-admin] - -# Options read by `mysqlbinlog` -# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. -[mariadb-binlog] - -# Options read by `mysqlcheck` -# Renamed from [mysqlcheck] starting with MariaDB 10.4.6. -[mariadb-check] - -# Options read by `mysqlimport` -# Renamed from [mysqlimport] starting with MariaDB 10.4.6. -[mariadb-import] - -# Options read by `mysqlshow` -# Renamed from [mysqlshow] starting with MariaDB 10.4.6. -[mariadb-show] - -# Options read by `mysqlslap` -# Renamed from [mysqlslap] starting with MariaDB 10.4.6. -[mariadb-slap] - diff --git a/databases/mariadb1011-server/mariadb-server/files/my.cnf.sample.in b/databases/mariadb1011-server/mariadb-server/files/my.cnf.sample.in deleted file mode 100644 index 15dbc7e64da8..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/my.cnf.sample.in +++ /dev/null @@ -1,13 +0,0 @@ -# -# This group is read both by the client and the server -# use it for options that affect everything, see -# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups -# -[client-server] -port = 3306 -socket = %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% - -# -# include *.cnf from the config directory -# -!includedir %%ETCDIR%%/conf.d/ diff --git a/databases/mariadb1011-server/mariadb-server/files/mysql-server.in b/databases/mariadb1011-server/mariadb-server/files/mysql-server.in deleted file mode 100644 index e494dee09e92..000000000000 --- a/databases/mariadb1011-server/mariadb-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/mariadb-server/files/patch-include_m__ctype.h b/databases/mariadb1011-server/mariadb-server/files/patch-include_m__ctype.h deleted file mode 100644 index 8e323646752e..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-include_m__ctype.h +++ /dev/null @@ -1,13 +0,0 @@ ---- include/m_ctype.h.orig 2021-08-04 18:00:35 UTC -+++ include/m_ctype.h -@@ -43,6 +43,10 @@ extern "C" { - - #define CHARSET_DIR "charsets/" - -+#ifndef ulong -+typedef unsigned long ulong; -+#endif -+ - #define my_wc_t ulong - - #define MY_CS_REPLACEMENT_CHARACTER 0xFFFD diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-include_my__cpu.h b/databases/mariadb1011-server/mariadb-server/files/patch-include_my__cpu.h deleted file mode 100644 index e205cbfa05e2..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-include_my__cpu.h +++ /dev/null @@ -1,48 +0,0 @@ ---- include/my_cpu.h.orig 2021-09-27 13:32:48 UTC -+++ include/my_cpu.h -@@ -23,7 +23,8 @@ - The defines are the same ones used by the linux kernel - */ - --#ifdef _ARCH_PWR8 -+#if defined(_ARCH_PWR8) -+#if defined(linux) - #include <sys/platform/ppc.h> - /* Very low priority */ - #define HMT_very_low() __ppc_set_ppr_very_low() -@@ -37,6 +38,22 @@ - #define HMT_medium_high() __ppc_set_ppr_med_high() - /* High priority */ - #define HMT_high() asm volatile("or 3,3,3") -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <sys/sysctl.h> -+/* Very low priority */ -+#define HMT_very_low() __asm__ volatile ("or 31,31,31") -+/* Low priority */ -+#define HMT_low() __asm__ volatile ("or 1,1,1") -+/* Medium low priority */ -+#define HMT_medium_low() __asm__ volatile ("or 6,6,6") -+/* Medium priority */ -+#define HMT_medium() __asm__ volatile ("or 2,2,2") -+/* Medium high priority */ -+#define HMT_medium_high() __asm__ volatile ("or 5,5,5") -+/* High priority */ -+#define HMT_high() asm volatile("or 3,3,3") -+#endif - #else - #define HMT_very_low() - #define HMT_low() -@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void) - __asm__ __volatile__ ("pause"); - #endif - #elif defined(_ARCH_PWR8) -+#if defined(linux) - __ppc_get_timebase(); -+#elif defined(__FreeBSD__) -+ uint64_t __tb; -+ __asm__ volatile ("mfspr %0, 268" : "=r" (__tb)); -+#endif - #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) - /* Mainly, prevent the compiler from optimizing away delay loops */ - #ifdef _aarch64_ diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-include_ssl__compat.h b/databases/mariadb1011-server/mariadb-server/files/patch-include_ssl__compat.h deleted file mode 100644 index 132f629cf2eb..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-include_ssl__compat.h +++ /dev/null @@ -1,22 +0,0 @@ ---- include/ssl_compat.h.orig 2022-02-10 20:17:08 UTC -+++ include/ssl_compat.h -@@ -19,7 +19,8 @@ - /* OpenSSL version specific definitions */ - #if defined(OPENSSL_VERSION_NUMBER) - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ -+ !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() -@@ -73,7 +74,8 @@ - #define EVP_MD_CTX_SIZE sizeof(EVP_MD_CTX) - #endif - --#ifndef DH_set0_pqg -+#if !defined(DH_set0_pqg) && \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) - #endif - diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb1011-server/mariadb-server/files/patch-mysys_crc32_crc32c.cc deleted file mode 100644 index 445fd0e97865..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-mysys_crc32_crc32c.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- mysys/crc32/crc32c.cc.orig 2021-08-04 18:00:35 UTC -+++ mysys/crc32/crc32c.cc -@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) { - - return arch_ppc_crc32; - } -+#elif __FreeBSD__ -+#include <machine/cpu.h> -+#include <sys/auxv.h> -+#include <sys/elf_common.h> -+static int arch_ppc_probe(void) { -+ unsigned long cpufeatures; -+ arch_ppc_crc32 = 0; -+ -+#if defined(__powerpc64__) -+ elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures)); -+ if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1; -+#endif /* __powerpc64__ */ -+ -+ return arch_ppc_crc32; -+} - #endif // __linux__ - #endif - diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-scripts_mysql__config.sh b/databases/mariadb1011-server/mariadb-server/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 31b54bf148c5..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- scripts/mysql_config.sh.orig 2021-07-07 20:25:20 UTC -+++ scripts/mysql_config.sh -@@ -88,6 +88,7 @@ fi - # Create options - libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" - embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="-L$embedded_libs -%%LOCALBASE%%/lib " - - include="-I$pkgincludedir" - if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-sql_mysqld.cc b/databases/mariadb1011-server/mariadb-server/files/patch-sql_mysqld.cc deleted file mode 100644 index e433bfc7d450..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-sql_mysqld.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC -+++ sql/mysqld.cc -@@ -205,7 +205,7 @@ typedef fp_except fp_except_t; - - inline void setup_fpu() - { --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) - /* We can't handle floating point exceptions with threads, so disable - this on freebsd - Don't fall for overflow, underflow,divide-by-zero or loss of precision. -@@ -218,7 +218,7 @@ inline void setup_fpu() - fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | - FP_X_IMP)); - #endif /* FP_X_DNML */ --#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ -+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */ - - #ifdef HAVE_FEDISABLEEXCEPT - fedisableexcept(FE_ALL_EXCEPT); diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb1011-server/mariadb-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp deleted file mode 100644 index 26ea3d16ecd7..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp +++ /dev/null @@ -1,24 +0,0 @@ ---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC -+++ storage/columnstore/columnstore/utils/common/threadnaming.cpp -@@ -22,13 +22,21 @@ namespace utils - { - void setThreadName(const char* threadName) - { -+#ifdef __FreeBSD__ -+ pthread_set_name_np(pthread_self(), threadName); -+#else - prctl(PR_SET_NAME, threadName, 0, 0, 0); -+#endif - } - - std::string getThreadName() - { - char buf[32]; -+#ifdef __FreeBSD__ -+ pthread_get_name_np(pthread_self(), buf, sizeof(buf)); -+#else - prctl(PR_GET_NAME, buf, 0, 0, 0); -+#endif - return std::string(buf); - } - } // namespace utils diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h b/databases/mariadb1011-server/mariadb-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h deleted file mode 100644 index dab7177b65b8..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h +++ /dev/null @@ -1,13 +0,0 @@ ---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig 2020-06-23 15:10:17 UTC -+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h -@@ -26,6 +26,10 @@ - #include <jemalloc/jemalloc.h> - #endif - -+#ifdef __FreeBSD__ -+#define JEMALLOC_USABLE_SIZE_CONST const -+#endif -+ - #ifndef JEMALLOC_CXX_THROW - #define JEMALLOC_CXX_THROW - #endif diff --git a/databases/mariadb1011-server/mariadb-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb1011-server/mariadb-server/files/patch-tpool_CMakeLists.txt deleted file mode 100644 index 5ab7d5de3dd2..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/patch-tpool_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- tpool/CMakeLists.txt.orig 2020-06-23 15:10:18 UTC -+++ tpool/CMakeLists.txt -@@ -1,4 +1,5 @@ - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include) -+ADD_DEFINITIONS(-fPIC) - IF(WIN32) - SET(EXTRA_SOURCES tpool_win.cc aio_win.cc) - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/databases/mariadb1011-server/mariadb-server/files/pkg-message.in b/databases/mariadb1011-server/mariadb-server/files/pkg-message.in deleted file mode 100644 index 189a27624f5d..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/pkg-message.in +++ /dev/null @@ -1,24 +0,0 @@ -[ -{ type: install - message: <<EOM -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample -configuration files are provided in %%PREFIX%%/etc/mysql -and %%PREFIX%%/etc/mysql/conf.d. -The rc(8) script no longer uses /var/db/mysql/my.cnf for configuration -nor /var/db/mysql for logs and PID-file. - -This port does NOT include the mytop perl script, this is included in -the MariaDB tarball but the most recent version can be found in the -databases/mytop port -EOM -} -{ type: upgrade - message: <<EOM -Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag) -the first time you start the MySQL server after an upgrade from an -earlier version. -EOM -} - diff --git a/databases/mariadb1011-server/mariadb-server/files/server.cnf.sample.in b/databases/mariadb1011-server/mariadb-server/files/server.cnf.sample.in deleted file mode 100644 index 9e84965c7679..000000000000 --- a/databases/mariadb1011-server/mariadb-server/files/server.cnf.sample.in +++ /dev/null @@ -1,60 +0,0 @@ -# Options specific to server applications, see -# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups - -# Options specific to all server programs -[server] - -# Options specific to MariaDB server programs -[server-mariadb] - -# -# Options for specific server tools -# - -[mysqld] -user = %%MARIADB_USER%% -# port = 3306 # inherited from %%ETCDIR%%/my.cnf -# socket = %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf -bind-address = 127.0.0.1 -basedir = %%PREFIX%% -datadir = %%MARIADB_DBDIR%% -net_retry_count = 16384 -log_error = %%MARIADB_LOGDIR%%/mysqld.err -# [mysqld] configuration for ZFS -# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar -# Create separate datasets for data and logs, eg -# zroot/mysql compression=on recordsize=128k atime=off -# zroot/mysql/data recordsize=16k -# zroot/mysql/logs -# datadir = %%MARIADB_DBDIR%%/data -# innodb_log_group_home_dir = %%MARIADB_DBDIR%%/log -# audit_log_file = %%MARIADB_DBDIR%%/log/audit.log -# general_log_file = %%MARIADB_DBDIR%%/log/general.log -# log_bin = %%MARIADB_DBDIR%%/log/mysql-bin -# relay_log = %%MARIADB_DBDIR%%/log/relay-log -# slow_query_log_file = %%MARIADB_DBDIR%%/log/slow.log -# innodb_doublewrite = 0 -# innodb_flush_method = O_DSYNC - -# Options read by `mariadb_safe` -# Renamed from [mysqld_safe] starting with MariaDB 10.4.6. -[mariadb-safe] - -# Options read my `mariabackup` -[mariabackup] - -# Options read by `mysql_upgrade` -# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6. -[mariadb-upgrade] - -# Specific options read by the mariabackup SST method -[sst] - -# Options read by `mysqlbinlog` -# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6. -[mariadb-binlog] - -# Options read by `mysqladmin` -# Renamed from [mysqladmin] starting with MariaDB 10.4.6. -[mariadb-admin] - diff --git a/databases/mariadb1011-server/mariadb-server/pkg-descr b/databases/mariadb1011-server/mariadb-server/pkg-descr deleted file mode 100644 index f76c83728f01..000000000000 --- a/databases/mariadb1011-server/mariadb-server/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -MariaDB is a database server that offers drop-in replacement functionality -for MySQL. MariaDB is built by some of the original authors of MySQL, with -assistance from the broader community of Free and open source software -developers. In addition to the core functionality of MySQL, MariaDB offers -a rich set of feature enhancements including alternate storage engines, -server optimizations, and patches. - -MariaDB is primarily driven by developers at Monty Program, a company -founded by Michael "Monty" Widenius, the original author of MySQL, but -this is not the whole story about MariaDB. On the "About MariaDB" page you -will find more information about all participants in the MariaDB community, -including storage engines XtraDB and PBXT. diff --git a/databases/mariadb1011-server/mariadb-server/pkg-plist b/databases/mariadb1011-server/mariadb-server/pkg-plist deleted file mode 100644 index 96f3a8a38b83..000000000000 --- a/databases/mariadb1011-server/mariadb-server/pkg-plist +++ /dev/null @@ -1,517 +0,0 @@ -bin/aria_chk -bin/aria_dump_log -bin/aria_ftdump -bin/aria_pack -bin/aria_read_log -%%S3%%bin/aria_s3_copy -%%INNOBASE%%bin/innochecksum -%%INNOBASE%%bin/mariabackup -bin/mariadb-backup -bin/mariadb-client-test -bin/mariadb-client-test-embedded -bin/mariadb-dumpslow -bin/mariadb-embedded -bin/mariadb-fix-extensions -bin/mariadb-install-db -%%ROCKSDB%%bin/mariadb-ldb -bin/mariadb-secure-installation -bin/mariadb-test-embedded -bin/mariadb-tzinfo-to-sql -bin/mariadb-upgrade -bin/mariadbd-multi -bin/mariadbd-safe -bin/mariadbd-safe-helper -%%INNOBASE%%bin/mbstream -bin/myisam_ftdump -bin/myisamchk -bin/myisamlog -bin/myisampack -@comment bin/mytop -%%ROCKSDB%%bin/myrocks_hotbackup -bin/mysql_client_test -bin/mysql_client_test_embedded -bin/mysql_embedded -bin/mysql_fix_extensions -bin/mysql_install_db -%%ROCKSDB%%bin/mysql_ldb -bin/mysql_plugin -bin/mysql_secure_installation -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade -bin/mysql_waitpid -bin/mysqld_multi -bin/mysqld_safe -bin/mysqld_safe_helper -bin/mysqldumpslow -bin/mysqltest_embedded -bin/perror -bin/resolve_stack_dump -bin/resolveip -%%ROCKSDB%%bin/sst_dump -bin/test-connect-t -%%WSREP%%bin/wsrep_sst_common -%%WSREP%%bin/wsrep_sst_mariabackup -%%WSREP%%bin/wsrep_sst_mysqldump *** 463 LINES SKIPPED ***