diff options
Diffstat (limited to 'databases')
43 files changed, 23 insertions, 331 deletions
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile index bef6fba557a4..28725fb916a3 100644 --- a/databases/arrow/Makefile +++ b/databases/arrow/Makefile @@ -14,8 +14,6 @@ COMMENT= Columnar in-memory analytics layer for big data LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/../LICENSE.txt -BROKEN_FreeBSD_11= The OpenSSL must be greater than or equal to 1.1.0 - LIB_DEPENDS= libboost_system.so:devel/boost-libs USES= cmake compiler:c++11-lang localbase pkgconfig python:build diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index b6e3fa36090a..0e224cac89b1 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -209,14 +209,6 @@ CC= clang CXX= clang++ .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " \ - MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" \ - MODERN_LIMITS="@comment " -.endif - SOVERSION= ${PORTVERSION} .include <bsd.port.pre.mk> diff --git a/databases/clickhouse/files/clickhouse.in b/databases/clickhouse/files/clickhouse.in index a3ff2098e49b..f058335c875d 100644 --- a/databases/clickhouse/files/clickhouse.in +++ b/databases/clickhouse/files/clickhouse.in @@ -8,9 +8,6 @@ # # clickhouse_enable (bool): Set to "NO" by default # Set it to "YES" to enable clickhouse server -%%LEGACY_LIMITS%%# clickhouse_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U clickhouse` -%%LEGACY_LIMITS%%# just before clickhouse starts. # clickhouse_config (str): Path to config file (required). # (default: %%PREFIX%%/etc/clickhouse-server/config.xml) # clickhouse_rundir (str): Path to directory holding a pidfile. @@ -32,7 +29,6 @@ rcvar=clickhouse_enable load_rc_config ${name} : ${clickhouse_enable="NO"} -%%LEGACY_LIMITS%%: ${clickhouse_limits="NO"} : ${clickhouse_config="%%PREFIX%%/etc/clickhouse-server/config.xml"} : ${clickhouse_rundir="/var/run/clickhouse"} : ${clickhouse_user="clickhouse"} @@ -54,12 +50,7 @@ clickhouse_prestart () { install -d -o ${clickhouse_user} -g ${clickhouse_group} ${_dir} done -%%LEGACY_LIMITS%% if checkyesno clickhouse_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${clickhouse_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } run_rc_command "$1" diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile index 9483ebc41aff..49d1dc430c8c 100644 --- a/databases/couchdb3/Makefile +++ b/databases/couchdb3/Makefile @@ -74,7 +74,7 @@ post-patch: -e 's,$$LOG_FILE,${LOGFILE},g' \ ${WRKSRC}/configure # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238514 -.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200000 || ${ARCH} == i386) +.if ${OPSYS} == FreeBSD && ${ARCH} == i386 @${REINPLACE_CMD} \ -e 's,$$FLTO_FLAG ,,g' \ ${WRKSRC}/src/jiffy/rebar.config diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile index ddda28966943..fc54585a679e 100644 --- a/databases/foundationdb-devel/Makefile +++ b/databases/foundationdb-devel/Makefile @@ -10,7 +10,6 @@ COMMENT= Distributed, transactional key-value store LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11= requires newer OpenSSL ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= not yet ported to anything else diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile index 739120dfc3c8..a959372b3c62 100644 --- a/databases/foundationdb/Makefile +++ b/databases/foundationdb/Makefile @@ -8,7 +8,6 @@ COMMENT= Distributed, transactional key-value store LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_11= requires newer OpenSSL ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= not yet ported to anything else diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile index 207098da4a06..97d1fda62a36 100644 --- a/databases/gnats4/Makefile +++ b/databases/gnats4/Makefile @@ -12,7 +12,6 @@ COMMENT= GNATS, the GNU Problem Report Management System BROKEN_mips= Does not build: error: conflicting types for yy_scan_string BROKEN_mips64= Does not build: error: conflicting types for yy_scan_string -BROKEN_FreeBSD_11_powerpc64= fails to build on powerpc64 elfv1: conflicting types for yy_scan_string BROKEN_FreeBSD_12_powerpc64= fails to build on powerpc64 elfv1: conflicting types for yy_scan_string GNU_CONFIGURE= yes diff --git a/databases/iowow/files/patch-src_platform_unix_unix.c b/databases/iowow/files/patch-src_platform_unix_unix.c index 6910201ce373..7e58d255962b 100644 --- a/databases/iowow/files/patch-src_platform_unix_unix.c +++ b/databases/iowow/files/patch-src_platform_unix_unix.c @@ -5,18 +5,7 @@ return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno); } -#else -+#elif defined(__FreeBSD_version) && __FreeBSD_version > 1100501 ++#elif defined(__FreeBSD_version) if (fdatasync(fh) == -1) { return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno); } -@@ -384,6 +384,10 @@ void iwp_set_current_thread_name(const char *name) { - - #if defined(__linux__) - prctl(PR_SET_NAME, name); -+#elif defined(__FreeBSD__) -+ // We're using even more non-standard pthread_set_name_np() here -+ // because pthread_setname_np() is not available on FreeBSD 11.X. -+ pthread_set_name_np(pthread_self(), name); - #elif defined(__NetBSD__) - rv = pthread_setname_np(pthread_self(), "%s", (void*) name); - #elif defined(__APPLE__) diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile index 0d2562ab2541..ae36e9bc3c2f 100644 --- a/databases/mariadb103-server/Makefile +++ b/databases/mariadb103-server/Makefile @@ -164,12 +164,6 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .endif # ${PKGNAMESUFFIX:M*-client} .if defined(WITH_OPENSSL_PORT) diff --git a/databases/mariadb103-server/files/mysql-server.in b/databases/mariadb103-server/files/mysql-server.in index 9da717d5b9a3..356d6bb2f9c0 100644 --- a/databases/mariadb103-server/files/mysql-server.in +++ b/databases/mariadb103-server/files/mysql-server.in @@ -7,9 +7,6 @@ # 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 "/var/db/mysql" # Base database directory. # mysql_(instance_)?args (str): Custom additional arguments to be passed @@ -31,9 +28,7 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_user="mysql"} -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} @@ -49,9 +44,7 @@ if [ -n "$2" ]; then "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${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_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" ;; @@ -117,12 +110,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index eef8cc75b7de..52bd6a11c638 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -190,12 +190,6 @@ CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -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= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif diff --git a/databases/mariadb104-server/files/mysql-server.in b/databases/mariadb104-server/files/mysql-server.in index 4e2753f09ee6..965e81ac025c 100644 --- a/databases/mariadb104-server/files/mysql-server.in +++ b/databases/mariadb104-server/files/mysql-server.in @@ -7,9 +7,6 @@ # 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): Base database directory. # Default to "/var/db/mysql" # mysql_(instance_)?args (str): Custom additional arguments to be passed @@ -34,9 +31,7 @@ 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="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} @@ -52,9 +47,7 @@ if [ -n "$2" ]; then "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${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:-\"${mysql_socket}\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" @@ -126,12 +119,7 @@ mysql_prestart() install -d -o ${mysql_user} -g $(id -gn $mysql_user) "${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 + return 0 } mysql_poststart() diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 4a3565ff8fb5..2d4f7c8c7baf 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -196,12 +196,6 @@ CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -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 diff --git a/databases/mariadb105-server/files/mysql-server.in b/databases/mariadb105-server/files/mysql-server.in index c4fd7307ca24..8d0b8e7eff4e 100644 --- a/databases/mariadb105-server/files/mysql-server.in +++ b/databases/mariadb105-server/files/mysql-server.in @@ -7,9 +7,6 @@ # 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 @@ -32,9 +29,7 @@ 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%%"} @@ -51,9 +46,7 @@ if [ -n "$2" ]; then "$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\"}" @@ -125,12 +118,7 @@ mysql_prestart() 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 + return 0 if [ ! -d "${mysql_rundir}" ]; then install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir} fi diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile index 4e13727dd6a9..2e4aa23131fd 100644 --- a/databases/memcached/Makefile +++ b/databases/memcached/Makefile @@ -61,7 +61,7 @@ MAKE_JOBS_UNSAFE= yes .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 +.if ${OPSYS} == FreeBSD CONFIGURE_ARGS+= --enable-tls USES+= ssl .endif diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile index 08bc75c50f91..df8ffe780562 100644 --- a/databases/mongodb36/Makefile +++ b/databases/mongodb36/Makefile @@ -55,12 +55,6 @@ SSL_MAKE_ARGS= --ssl .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .if ${ARCH} == aarch64 EXTRA_PATCHES= ${FILESDIR}/aarch64 .endif diff --git a/databases/mongodb36/files/mongod.in b/databases/mongodb36/files/mongod.in index e885be83196c..20b0f5c0f43d 100644 --- a/databases/mongodb36/files/mongod.in +++ b/databases/mongodb36/files/mongod.in @@ -9,9 +9,6 @@ # # mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +25,6 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"} : ${mongod_user="mongodb"} @@ -51,12 +47,7 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } run_rc_command "$1" diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile index 861c448b094e..663fdfd395ae 100644 --- a/databases/mongodb40/Makefile +++ b/databases/mongodb40/Makefile @@ -57,12 +57,6 @@ SSL_MAKE_ARGS= --ssl .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif diff --git a/databases/mongodb40/files/mongod.in b/databases/mongodb40/files/mongod.in index e885be83196c..20b0f5c0f43d 100644 --- a/databases/mongodb40/files/mongod.in +++ b/databases/mongodb40/files/mongod.in @@ -9,9 +9,6 @@ # # mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +25,6 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"} : ${mongod_user="mongodb"} @@ -51,12 +47,7 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } run_rc_command "$1" diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile index 472210ec4353..13a88e3913b3 100644 --- a/databases/mongodb42/Makefile +++ b/databases/mongodb42/Makefile @@ -57,7 +57,6 @@ MAKE_ARGS= --prefix=${STAGEDIR}${PREFIX} \ USERS= mongodb GROUPS= mongodb -LTO_LDFLAGS= -fuse-ld=lld LTO_MAKE_ARGS= --lto=on SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 @@ -73,12 +72,6 @@ SSL_MAKE_ARGS= --ssl BROKEN= Aarch64 needs LSE atomics which was fixed in https://cgit.freebsd.org/src/commit/?id=efe67f33c322265eb303ec0ab40275100795b22a .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif diff --git a/databases/mongodb42/files/mongod.in b/databases/mongodb42/files/mongod.in index e885be83196c..20b0f5c0f43d 100644 --- a/databases/mongodb42/files/mongod.in +++ b/databases/mongodb42/files/mongod.in @@ -9,9 +9,6 @@ # # mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +25,6 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"} : ${mongod_user="mongodb"} @@ -51,12 +47,7 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } run_rc_command "$1" diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile index a3720cf9b94f..1a361999b525 100644 --- a/databases/mongodb44/Makefile +++ b/databases/mongodb44/Makefile @@ -63,12 +63,6 @@ SSL_MAKE_ARGS= --ssl .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif diff --git a/databases/mongodb44/files/mongod.in b/databases/mongodb44/files/mongod.in index e885be83196c..20b0f5c0f43d 100644 --- a/databases/mongodb44/files/mongod.in +++ b/databases/mongodb44/files/mongod.in @@ -9,9 +9,6 @@ # # mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +25,6 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"} : ${mongod_user="mongodb"} @@ -51,12 +47,7 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } run_rc_command "$1" diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile index 593808b7b8e3..4d331897e774 100644 --- a/databases/mongodb50/Makefile +++ b/databases/mongodb50/Makefile @@ -64,12 +64,6 @@ SSL_MAKE_ARGS= --ssl .include <bsd.port.pre.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif diff --git a/databases/mongodb50/files/mongod.in b/databases/mongodb50/files/mongod.in index e885be83196c..20b0f5c0f43d 100644 --- a/databases/mongodb50/files/mongod.in +++ b/databases/mongodb50/files/mongod.in @@ -9,9 +9,6 @@ # # mongod_enable (bool): Set to "NO" by default. # Set it to "YES" to enable mongod. -%%LEGACY_LIMITS%%# mongod_limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mongodb` -%%LEGACY_LIMITS%%# just before mongod starts. # mongod_dbpath (str): Default to "/var/db/mongodb" # Base database directory. # mongod_flags (str): Custom additional arguments to be passed to mongod. @@ -28,7 +25,6 @@ rcvar=mongod_enable load_rc_config $name : ${mongod_enable="NO"} -%%LEGACY_LIMITS%%: ${mongod_limits="NO"} : ${mongod_dbpath="/var/db/mongodb"} : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"} : ${mongod_user="mongodb"} @@ -51,12 +47,7 @@ mongod_prestart() if [ ! -d ${mongod_dbpath} ]; then mongod_create_dbpath || return 1 fi -%%LEGACY_LIMITS%% if checkyesno mongod_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } run_rc_command "$1" diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile index 31605a38fb0e..64b3243d46c8 100644 --- a/databases/mysql-connector-c/Makefile +++ b/databases/mysql-connector-c/Makefile @@ -25,7 +25,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} CFLAGS+= -march=i586 .endif -.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl +.if (${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl EXTRA_PATCHES+= ${FILESDIR}/extra-patch-vio_viosslfactories.c \ ${FILESDIR}/extra-patch-mysys__ssl_my__aes__openssl.cc .endif diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 80ec9d48c6f8..bd0010044b83 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -59,12 +59,6 @@ USES+= compiler:c++11-lang USE_CXXSTD= gnu++98 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .if ${PORT_OPTIONS:MSSL} CMAKE_ARGS+= -DWITH_SSL=bundled .endif diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in index 6e9ca18040a6..5bd18d2d68c8 100644 --- a/databases/mysql55-server/files/mysql-server.in +++ b/databases/mysql55-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_optfile (str): Server-specific option file. @@ -29,12 +26,10 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -56,12 +51,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 1805470ec640..ff2f3527e6dd 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -146,12 +146,6 @@ USES+= compiler:c++11-lib USE_CXXSTD= c++11 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .include <bsd.port.pre.mk> post-patch: diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in index cf0a501c6f46..af1a234269ed 100644 --- a/databases/mysql56-server/files/mysql-server.in +++ b/databases/mysql56-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. # mysql_confdir (str): Default to "%%ETCDIR%%" @@ -33,7 +30,6 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="%%MY_DBDIR%%"} : ${mysql_confdir="%%ETCDIR%%"} if [ -f "${mysql_confdir}/my.cnf" ]; then @@ -46,7 +42,6 @@ mysql_extra="--defaults-extra-file=${mysql_optfile}" fi mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -68,12 +63,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 2ace4c5f7304..1e8f93fdffa9 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -149,12 +149,6 @@ CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .include <bsd.port.pre.mk> .if ${SSL_DEFAULT} == base diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in index 37022059e2bc..3addbaa92431 100644 --- a/databases/mysql57-server/files/mysql-server.in +++ b/databases/mysql57-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. # mysql_confdir (str): Default to "%%ETCDIR%%" @@ -33,7 +30,6 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="%%MY_DBDIR%%"} : ${mysql_confdir="%%ETCDIR%%"} if [ -f "${mysql_confdir}/my.cnf" ]; then @@ -47,7 +43,6 @@ fi mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -68,12 +63,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 771fef19bd1a..e31ffae5f1fb 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -180,22 +180,6 @@ FEDERATED_SUB_LIST_OFF+= FEDER="" CMAKE_ARGS+= -DDISABLE_PSI_MEMORY=1 .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" && ${OSVERSION} < 1200000 -# clang 7.x and 8.x do not build properly on 11i386 -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -.endif - post-extract: @${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h @@ -208,4 +192,4 @@ post-install: ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/databases/mysql80-server/files/mysql-server.in b/databases/mysql80-server/files/mysql-server.in index b0297539a441..271c38c2d2c5 100644 --- a/databases/mysql80-server/files/mysql-server.in +++ b/databases/mysql80-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. # mysql_confdir (str): Default to "%%ETCDIR%%" @@ -33,7 +30,6 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="%%MY_DBDIR%%"} : ${mysql_confdir="%%ETCDIR%%"} if [ -f "${mysql_confdir}/my.cnf" ]; then @@ -46,7 +42,6 @@ mysql_extra="--defaults-extra-file=${mysql_optfile}" fi mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -67,12 +62,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile index 1930386321ac..1ca4c5b090c9 100644 --- a/databases/mysqlwsrep56-server/Makefile +++ b/databases/mysqlwsrep56-server/Makefile @@ -133,12 +133,6 @@ MMAN1= my_print_defaults.1 \ .include <bsd.port.options.mk> -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .include <bsd.port.pre.mk> # Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker diff --git a/databases/mysqlwsrep56-server/files/mysql-server.in b/databases/mysqlwsrep56-server/files/mysql-server.in index d6693957b2d4..c91277332e64 100644 --- a/databases/mysqlwsrep56-server/files/mysql-server.in +++ b/databases/mysqlwsrep56-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_optfile (str): Server-specific option file. @@ -29,14 +26,8 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} -: ${mysql_dbdir="/var/db/mysql"} -: ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" -: ${hostname:=`/bin/hostname`} -pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}" procname="%%PREFIX%%/libexec/mysqld" @@ -70,12 +61,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 70f20347216a..c977f270458d 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -162,12 +162,6 @@ SUB_LIST+= PERFSCHEMRC="" SUB_LIST+= PERFSCHEMRC="--skip-performance-schema" .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - .include <bsd.port.pre.mk> .if ${SSL_DEFAULT} == base @@ -178,13 +172,11 @@ CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} # ${LOCALBASE}/include/lz4.h does not compile with Clang 6. # Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used. -.if ${OSVERSION} >= 1200056 CFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS CXXFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS LDFLAGS+= -L${LOCALBASE}/lib -. if ${CHOSEN_COMPILER_TYPE} == clang +.if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-c++11-narrowing -. endif .endif # Ensure that assertions are not turned on in non-debug builds. diff --git a/databases/mysqlwsrep57-server/files/mysql-server.in b/databases/mysqlwsrep57-server/files/mysql-server.in index 17320906bf56..1ea9411cde8b 100644 --- a/databases/mysqlwsrep57-server/files/mysql-server.in +++ b/databases/mysqlwsrep57-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. # mysql_confdir (str): Default to "%%ETCDIR%%" @@ -35,7 +32,6 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="%%MY_DBDIR%%"} : ${mysql_confdir="%%ETCDIR%%"} if [ -f "${mysql_confdir}/my.cnf" ]; then @@ -48,7 +44,6 @@ mysql_extra="--defaults-extra-file=${mysql_optfile}" fi mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -83,12 +78,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile index 8347aaef1065..b62f436fd76f 100644 --- a/databases/percona56-server/Makefile +++ b/databases/percona56-server/Makefile @@ -97,12 +97,6 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" # Workaround to clang11/gcc10 with -fno-common by default CFLAGS+= -fcommon -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - post-install: @${MKDIR} ${STAGEDIR}/var/db/mysql .endif diff --git a/databases/percona56-server/files/mysql-server.in b/databases/percona56-server/files/mysql-server.in index 62ab20cd1658..aecef7080107 100644 --- a/databases/percona56-server/files/mysql-server.in +++ b/databases/percona56-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_optfile (str): Server-specific option file. @@ -29,12 +26,10 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -56,12 +51,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile index 2c4ee43ab3f5..e59570b1e847 100644 --- a/databases/percona57-server/Makefile +++ b/databases/percona57-server/Makefile @@ -140,12 +140,6 @@ CMAKE_ARGS+= -DWITH_AUTHENTICATION_LDAP=0 #MY_TESTDIR= "" #.endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " -.endif - post-install: ${MKDIR} ${STAGEDIR}/var/db/mysql ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring diff --git a/databases/percona57-server/files/mysql-server.in b/databases/percona57-server/files/mysql-server.in index 41280227b18b..5e0ebd0f85fd 100644 --- a/databases/percona57-server/files/mysql-server.in +++ b/databases/percona57-server/files/mysql-server.in @@ -8,9 +8,6 @@ # 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. -%%LEGACY_LIMITS%%# mysql_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_dbdir (str): Default to "%%MY_DBDIR%%" # Base database directory. # mysql_confdir (str): Default to "%%ETCDIR%%" @@ -31,7 +28,6 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_dbdir="%%MY_DBDIR%%"} : ${mysql_confdir="%%ETCDIR%%"} if [ -f "${mysql_dbdir}/my.cnf" ]; then @@ -41,7 +37,6 @@ else fi mysql_user="mysql" -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" @@ -73,12 +68,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql" ]; then mysql_create_auth_tables || return 1 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 + return 0 } mysql_poststart() diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile index aaa3333e1160..25b1c7115e11 100644 --- a/databases/rocksdb/Makefile +++ b/databases/rocksdb/Makefile @@ -20,7 +20,6 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING BROKEN_DragonFly= does not build on DragonFly BSD using GCC with -Werror BROKEN_armv6?= does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') BROKEN_armv7?= does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'` -BROKEN_FreeBSD_11_powerpc64= does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope BROKEN_FreeBSD_12_powerpc64= does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope BUILD_DEPENDS= bash:shells/bash |