Browse Source

cleanup: drop support for EOL FreeBSD 11.X

Search criteria used:
- 11.4
- OSREL*
- OSVER*
- *_FreeBSD_11

Input from:
- adridg: devel/qca-legacy
- jbeich: _WITH_DPRINTF, _WITH_GETLINE, GNU bfd workarounds
- sunpoet: security/p5-*OpenSSL*

Reviewed by:	doceng, kde, multimedia, perl, python, ruby, rust
Differential Revision: https://reviews.freebsd.org/D32008
Test Plan: make index
main^2
Rene Ladan 1 month ago
parent
commit
620968a43a
  1. 2
      MOVED
  2. 2
      Mk/Scripts/rust-compat11-canary.sh
  3. 6
      Mk/Uses/qca.mk
  4. 2
      Mk/bsd.port.mk
  5. 8
      Tools/scripts/tindex
  6. 1
      archivers/py-zstandard/Makefile
  7. 21
      astro/kosmorro/Makefile
  8. 4
      astro/kosmorro/pkg-plist
  9. 2
      astro/qmapshack/Makefile
  10. 8
      audio/csound/Makefile
  11. 2
      audio/moony-lv2/Makefile
  12. 17
      audio/musicpd/files/patch-meson.build
  13. 2
      audio/surge-synthesizer-lv2/Makefile
  14. 5
      audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp
  15. 3
      audio/tagutil/Makefile
  16. 1
      audio/vst3sdk/Makefile
  17. 3
      audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp
  18. 7
      base/gcc6/Makefile
  19. 1
      biology/abyss/Makefile
  20. 4
      biology/ddocent/Makefile
  21. 2
      biology/igv/Makefile
  22. 2
      biology/jalview/Makefile
  23. 2
      biology/ncbi-cxx-toolkit/Makefile
  24. 45
      cad/PrusaSlicer/files/patch-src_libslic3r_Thread.cpp
  25. 3
      cad/astk-serveur/Makefile
  26. 1
      cad/openvsp/Makefile
  27. 1
      cad/stepcode/Makefile
  28. 10
      chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt
  29. 5
      chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc
  30. 2
      chinese/libpinyin/Makefile
  31. 1
      comms/aprsd/Makefile
  32. 17
      comms/usbmuxd/files/patch-src_usb.c
  33. 2
      databases/arrow/Makefile
  34. 8
      databases/clickhouse/Makefile
  35. 11
      databases/clickhouse/files/clickhouse.in
  36. 2
      databases/couchdb3/Makefile
  37. 1
      databases/foundationdb-devel/Makefile
  38. 1
      databases/foundationdb/Makefile
  39. 1
      databases/gnats4/Makefile
  40. 13
      databases/iowow/files/patch-src_platform_unix_unix.c
  41. 6
      databases/mariadb103-server/Makefile
  42. 14
      databases/mariadb103-server/files/mysql-server.in
  43. 6
      databases/mariadb104-server/Makefile
  44. 14
      databases/mariadb104-server/files/mysql-server.in
  45. 6
      databases/mariadb105-server/Makefile
  46. 14
      databases/mariadb105-server/files/mysql-server.in
  47. 2
      databases/memcached/Makefile
  48. 6
      databases/mongodb36/Makefile
  49. 11
      databases/mongodb36/files/mongod.in
  50. 6
      databases/mongodb40/Makefile
  51. 11
      databases/mongodb40/files/mongod.in
  52. 7
      databases/mongodb42/Makefile
  53. 11
      databases/mongodb42/files/mongod.in
  54. 6
      databases/mongodb44/Makefile
  55. 11
      databases/mongodb44/files/mongod.in
  56. 6
      databases/mongodb50/Makefile
  57. 11
      databases/mongodb50/files/mongod.in
  58. 2
      databases/mysql-connector-c/Makefile
  59. 6
      databases/mysql55-server/Makefile
  60. 12
      databases/mysql55-server/files/mysql-server.in
  61. 6
      databases/mysql56-server/Makefile
  62. 12
      databases/mysql56-server/files/mysql-server.in
  63. 6
      databases/mysql57-server/Makefile
  64. 12
      databases/mysql57-server/files/mysql-server.in
  65. 18
      databases/mysql80-server/Makefile
  66. 12
      databases/mysql80-server/files/mysql-server.in
  67. 6
      databases/mysqlwsrep56-server/Makefile
  68. 16
      databases/mysqlwsrep56-server/files/mysql-server.in
  69. 10
      databases/mysqlwsrep57-server/Makefile
  70. 12
      databases/mysqlwsrep57-server/files/mysql-server.in
  71. 6
      databases/percona56-server/Makefile
  72. 12
      databases/percona56-server/files/mysql-server.in
  73. 6
      databases/percona57-server/Makefile
  74. 12
      databases/percona57-server/files/mysql-server.in
  75. 1
      databases/rocksdb/Makefile
  76. 6
      deskutils/ausweisapp2/Makefile
  77. 1
      deskutils/easystroke/Makefile
  78. 4
      deskutils/nextcloudclient/Makefile
  79. 3
      deskutils/sysctlview/Makefile
  80. 1
      devel/Makefile
  81. 12
      devel/R-cran-data.table/Makefile
  82. 57
      devel/aml/files/patch-freebsd11
  83. 1
      devel/android-tools-simpleperf/files/Makefile
  84. 5
      devel/basu/Makefile
  85. 1
      devel/bazel/Makefile
  86. 1
      devel/bazel029/Makefile
  87. 7
      devel/bear/Makefile
  88. 10
      devel/bear/files/extra-patch-source_intercept_source_report_libexec_Logger.cc
  89. 1
      devel/bitkeeper/Makefile
  90. 2
      devel/concurrencpp/Makefile
  91. 1
      devel/creduce/Makefile
  92. 2
      devel/dwarves/Makefile
  93. 1
      devel/elfutils/Makefile
  94. 2
      devel/evemu/Makefile
  95. 1
      devel/folly/Makefile
  96. 2
      devel/freebsd-sysroot/Makefile
  97. 6
      devel/goredo/Makefile
  98. 4
      devel/hs-ShellCheck/Makefile
  99. 2
      devel/indi/Makefile
  100. 2
      devel/juce/Makefile

2
MOVED

@ -16498,3 +16498,5 @@ multimedia/sms1xxx-kmod|multimedia/webcamd|2021-09-30|Has expired: Supports DVB
sysutils/cfengine311|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported.
sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine311 will retire at FreeBSD 11 EOL
mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBSD 11 is EoL (Postfix >= 3.6 requires OpenSSL >= 1.1.x)
graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4
devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4

2
Mk/Scripts/rust-compat11-canary.sh

@ -3,7 +3,7 @@
set -eu
set -o pipefail
if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then
if [ "${OPSYS}" != FreeBSD ] ; then
exit 0
fi

6
Mk/Uses/qca.mk

@ -16,13 +16,7 @@ IGNORE+= USES=qca takes no arguments
_QCA_LIB= libqca-qt5.so
_QCA_DEFAULT_PORT= devel/qca
_QCA_LEGACY_PORT= devel/qca-legacy
. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
_QCA_CHOSEN_PORT= LEGACY
. else
_QCA_CHOSEN_PORT= DEFAULT
. endif
LIB_DEPENDS+= ${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT}

2
Mk/bsd.port.mk

@ -1177,7 +1177,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
.endif
_EXPORTED_VARS+= OSVERSION
.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1202000))) || \
.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \
(${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
_UNSUPPORTED_SYSTEM_MESSAGE= Ports Collection support for your ${OPSYS} version has ended, and no ports\
are guaranteed to build on this system. Please upgrade to a supported release.

8
Tools/scripts/tindex

@ -27,7 +27,6 @@ ERROR_ADDRESS=root@localhost
# Location of ports tree and source trees
export BASEDIR=/a/tindex
export PORTSDIR=${BASEDIR}/ports
export SRCDIR11=${BASEDIR}/src.11
export SRCDIR12=${BASEDIR}/src.12
export SRCDIR13=${BASEDIR}/src.13
export SRCDIR14=${BASEDIR}/src.14
@ -114,9 +113,6 @@ export INDEX_JOBS=3
export INDEX_QUIET=1
# First update the source trees to get current OSVERSION
${SVN} -q up ${SRCDIR11}/sys/sys
OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR11}/sys/sys/param.h)
${SVN} -q up ${SRCDIR12}/sys/sys
OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
@ -127,7 +123,7 @@ ${GIT} -C ${SRCDIR14} pull --rebase -q
OSVERSION14=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR14}/sys/sys/param.h)
cd ${PORTSDIR}
rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
rm -f INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
OLD_HEAD=$(${GIT} rev-parse HEAD)
if ! ${GIT} pull --ff-only > git.log 2>&1 ; then
(echo "Git update failed with conflicts:";
@ -135,7 +131,7 @@ if ! ${GIT} pull --ff-only > git.log 2>&1 ; then
exit 1
fi
for branch in 11.x 12.x 13.x 14.x; do
for branch in 12.x 13.x 14.x; do
release=$(echo $branch | sed -e 's,.x,,')
eval _osver=\$OSVERSION${release}

1
archivers/py-zstandard/Makefile

@ -9,7 +9,6 @@ COMMENT= Zstandard bindings for Python, a full-featured version
LICENSE= BSD2CLAUSE
BROKEN_FreeBSD_11_powerpc64= fails to build: cffi.error.CDefError: parse error
BROKEN_FreeBSD_12_powerpc64= fails to build: cffi.error.CDefError: parse error
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8.0:devel/py-cffi@${PY_FLAVOR}

21
astro/kosmorro/Makefile

@ -13,7 +13,8 @@ LICENSE= AGPLv3
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR} \
ronn:textproc/rubygem-ronn
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
@ -32,25 +33,9 @@ PDF_RUN_DEPENDS=pdflatex:print/tex-formats
NO_ARCH= yes
.include <bsd.port.pre.mk>
# ronn is broken on 11.x => do not build manpages
.if ${OSVERSION} < 1200000
PLIST_SUB+= MAN="@comment "
.else
BUILD_DEPENDS+= ronn:textproc/rubygem-ronn
PLIST_SUB+= MAN=""
.endif
pre-configure:
${REINPLACE_CMD} -e 's|python3|${PYTHON_CMD}|' ${WRKSRC}/Makefile
.if ${OSVERSION} < 1200000
${REINPLACE_CMD} -e 's|i18n manpages|manpages|' ${WRKSRC}/Makefile
${REINPLACE_CMD} -e '/manpage\/kosmorro/d' ${WRKSRC}/setup.py
.else
post-build:
(cd ${WRKSRC} && LC_ALL=C.UTF-8 ${MAKE} manpages)
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

4
astro/kosmorro/pkg-plist

@ -68,5 +68,5 @@ bin/kosmorro
%%PYTHON_SITELIBDIR%%/_kosmorro/locales/nl/LC_MESSAGES/messages.po
%%PYTHON_SITELIBDIR%%/_kosmorro/locales/ru/LC_MESSAGES/messages.po
%%PYTHON_SITELIBDIR%%/_kosmorro/main.py
%%MAN%%man/man1/kosmorro.1.gz
%%MAN%%man/man7/kosmorro.7.gz
man/man1/kosmorro.1.gz
man/man7/kosmorro.7.gz

2
astro/qmapshack/Makefile

@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Uses EOL Python 2.7 via www/qt5-webengine
EXPIRATION_DATE=2021-06-23
BROKEN_FreeBSD_11= Requires OpenSSL 1.1.0+
LIB_DEPENDS= libgdal.so:graphics/gdal \
libproj.so:graphics/proj \
libquazip1-qt5.so:archivers/quazip \

8
audio/csound/Makefile

@ -169,12 +169,6 @@ WIIMOTE_DESC= Build the Wiimote opcodes
WIIMOTE_CMAKE_BOOL= BUILD_WIIMOTE_OPCODES
WIIMOTE_BROKEN= Need to port wiiuse: https://github.com/rpavlik/wiiuse
.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
BROKEN_FreeBSD_11= libcsound64.so.6.0: undefined reference to `__atomic_store_8' / undefined reference to `__atomic_load_8'
.endif
post-patch:
@${REINPLACE_CMD} -e \
's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \
@ -196,4 +190,4 @@ post-install:
post-install-FLTK-on:
@${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6
.include <bsd.port.post.mk>
.include <bsd.port.mk>

2
audio/moony-lv2/Makefile

@ -10,8 +10,6 @@ PKGNAMESUFFIX= -lv2
MAINTAINER= yuri@FreeBSD.org
COMMENT= Realtime Lua as programmable glue in LV2
BROKEN_FreeBSD_11= undefined reference to `clog', see bug#237771
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/COPYING

17
audio/musicpd/files/patch-meson.build

@ -1,21 +1,6 @@
--- meson.build.orig 2021-06-23 18:56:13 UTC
+++ meson.build
@@ -28,6 +28,14 @@ elif compiler.get_id() == 'clang' and compiler.version
warning('Your clang version is too old. You need at least version 7.')
endif
+test_ldflags = [
+]
+
+if compiler.get_id() == 'clang'
+ # This can probably go away after FreeBSD 11 is EOL'd
+ test_ldflags += '-fuse-ld=%%MPD_CLANG_LD%%'
+endif
+
version_conf = configuration_data()
version_conf.set_quoted('PACKAGE', meson.project_name())
version_conf.set_quoted('PACKAGE_NAME', meson.project_name())
@@ -102,7 +110,7 @@ test_cflags = test_common_flags + [
@@ -102,7 +102,7 @@ test_cflags = test_common_flags + [
'-Wwrite-strings',
]

2
audio/surge-synthesizer-lv2/Makefile

@ -10,8 +10,6 @@ COMMENT= Surge Synthesizer LV2 and VST plug-in
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_FreeBSD_11= error: use of undeclared identifier 'getline'; did you mean 'std::getline'?
BUILD_DEPENDS= lv2>0:audio/lv2 \
${LOCALBASE}/include/nanosvg.h:graphics/nanosvg \
${LOCALBASE}/include/simde/simde-common.h:devel/simde \

5
audio/surge-synthesizer-lv2/files/patch-vstgui.surge_vstgui_lib_platform_linux_x11fileselector.cpp

@ -1,10 +1,9 @@
--- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-09-24 01:49:47 UTC
--- vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2021-04-02 18:04:51 UTC
+++ vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp
@@ -3,6 +3,8 @@
@@ -3,6 +3,7 @@
// distribution and at http://github.com/steinbergmedia/vstgui/LICENSE
#include "../../cfileselector.h"
+#define _WITH_GETLINE // for FreeBSD 11
+#include <stdio.h> // https://github.com/surge-synthesizer/vstgui/issues/7
#include <unistd.h>
#include <string>

3
audio/tagutil/Makefile

@ -19,9 +19,6 @@ GH_ACCOUNT= kAworu
CMAKE_ARGS= -DMAN_PATH=${PREFIX}/man
CMAKE_SOURCE_PATH= ${WRKSRC}/src
LDFLAGS_FreeBSD_11= -fuse-ld=lld
LDFLAGS+= ${LDFLAGS_${OPSYS}_${OSREL:R}}
PLIST_FILES= bin/tagutil \
man/man1/tagutil.1.gz

1
audio/vst3sdk/Makefile

@ -11,7 +11,6 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BROKEN_i386= fails to build: static_assert failed due to requirement 'alignof(Steinberg::Vst::ProcessContext) == (0 ? 8U : 0 ? 1U : 1 ? 8U : 8U)
BROKEN_FreeBSD_11= x11fileselector.cpp:57:9: error: use of undeclared identifier 'getline'; did you mean 'std::getline'?
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS= libexpat.so:textproc/expat2 \

3
audio/vst3sdk/files/patch-vstgui4_vstgui_lib_platform_linux_x11fileselector.cpp

@ -2,11 +2,10 @@
--- vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp.orig 2020-08-20 14:14:27 UTC
+++ vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp
@@ -6,6 +6,9 @@
@@ -6,6 +6,8 @@
#include <unistd.h>
#include <string>
+#define _WITH_GETLINE // this is still required on FreeBSD 11
+#include <stdio.h>
+
//------------------------------------------------------------------------

7
base/gcc6/Makefile

@ -49,17 +49,14 @@ CONFIGURE_ARGS+= \
--with-gxx-include-dir=/usr/include/c++/v1/ \
--with-sysroot="/" \
--with-build-sysroot=${CROSS_SYSROOT} \
-with-pkgversion="GNU Collection for FreeBSD"
-with-pkgversion="GNU Collection for FreeBSD" \
--enable-initfini-array
ALL_TARGET?= all-gcc
INSTALL_TARGET?= install-gcc
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 1200000
CONFIGURE_ARGS+= --enable-initfini-array
.endif
.if ${HOSTARCH} == "amd64"
CONFIGURE_TARGET= x86_64-unknown-${OPSYS:tl}${OSREL}
.else

1
biology/abyss/Makefile

@ -9,7 +9,6 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_i386= result of comparison of constant 18446744073709551615 with expression of type 'size_t', see https://github.com/bcgsc/abyss/issues/310
BROKEN_FreeBSD_11= error: use of undeclared identifier 'getline'; did you mean 'std::getline'?
BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:devel/boost-libs \
ghc:lang/ghc \

4
biology/ddocent/Makefile

@ -9,9 +9,7 @@ COMMENT= Bash pipeline for RAD sequencing
LICENSE= MIT
# ddocent test data do not unpack with FreeBSD 11.1 /usr/bin/unzip
RUN_DEPENDS= unzip>=0:archivers/unzip \
mawk>=0:lang/mawk \
RUN_DEPENDS= mawk>=0:lang/mawk \
gawk>=0:lang/gawk \
coreutils>=0:sysutils/coreutils \
gnuplot>=0:math/gnuplot \

2
biology/igv/Makefile

@ -13,8 +13,6 @@ COMMENT= Visualization tool for genomic datasets
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/license.txt
BROKEN_FreeBSD_11= FAILURE: Build failed with an exception.
BUILD_DEPENDS= openjfx14>0:java/openjfx14 \
gradle:devel/gradle6
RUN_DEPENDS= openjfx14>0:java/openjfx14

2
biology/jalview/Makefile

@ -14,8 +14,6 @@ COMMENT= Viewer and editor for multiple sequence alignments
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_FreeBSD_11= gradle daemon systematically fails on 11: The message received from the daemon indicates that the daemon has disappeared.
BUILD_DEPENDS= gradle:devel/gradle6
USE_JAVA= yes

2
biology/ncbi-cxx-toolkit/Makefile

@ -10,8 +10,6 @@ COMMENT= NCBI C++ Toolkit
LICENSE= PD
LICENSE_FILE= ${WRKSRC}/doc/public/LICENSE
BROKEN_FreeBSD_11= libxconnserv.so, not found (try using -rpath or -rpath-link)
LIB_DEPENDS= libcdd.so:math/cddlib \
liblmdb.so:databases/lmdb \
libpcre.so:devel/pcre

45
cad/PrusaSlicer/files/patch-src_libslic3r_Thread.cpp

@ -1,45 +0,0 @@
Note that this patch may be removed after FreeBSD 11.x EoL
as latest FreeBSD versions have proper
pthread_setname_np/pthread_getname_np support.
--- src/libslic3r/Thread.cpp.orig 2021-07-16 10:14:03 UTC
+++ src/libslic3r/Thread.cpp
@@ -9,10 +9,10 @@
#include <atomic>
#include <condition_variable>
#include <mutex>
+#include <thread>
+#include <tbb/global_control.h>
#include <tbb/parallel_for.h>
-#include <tbb/tbb_thread.h>
#include <tbb/task_arena.h>
-#include <tbb/task_scheduler_init.h>
#include "Thread.hpp"
@@ -206,13 +206,13 @@ void name_tbb_thread_pool_threads()
nthreads = 1;
#endif
- if (nthreads != nthreads_hw)
- new tbb::task_scheduler_init(int(nthreads));
+ if (nthreads != nthreads_hw)
+ tbb::global_control(tbb::global_control::max_allowed_parallelism, nthreads);
std::atomic<size_t> nthreads_running(0);
std::condition_variable cv;
std::mutex cv_m;
- auto master_thread_id = tbb::this_tbb_thread::get_id();
+ auto master_thread_id = std::this_thread::get_id();
tbb::parallel_for(
tbb::blocked_range<size_t>(0, nthreads, 1),
[&nthreads_running, nthreads, &master_thread_id, &cv, &cv_m](const tbb::blocked_range<size_t> &range) {
@@ -226,7 +226,7 @@ void name_tbb_thread_pool_threads()
std::unique_lock<std::mutex> lk(cv_m);
cv.wait(lk, [&nthreads_running, nthreads]{return nthreads_running == nthreads;});
}
- auto thread_id = tbb::this_tbb_thread::get_id();
+ auto thread_id = std::this_thread::get_id();
if (thread_id == master_thread_id) {
// The calling thread runs the 0'th task.
assert(range.begin() == 0);

3
cad/astk-serveur/Makefile

@ -61,8 +61,7 @@ conf_dir= ${WRKSRC}/etc/astkrc
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ((${OSREL:R} <= 12 && ${OSVERSION} < 1201506) \
|| (${OSREL:R} > 12 && ${OSVERSION} < 1300068))
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300068
# ASTK is not useful without french/aster
IGNORE= a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system
.endif

1
cad/openvsp/Makefile

@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BROKEN_aarch64= fails to compile: invokes x86 asm
BROKEN_FreeBSD_11= undefined reference to __atomic_load
BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \
${LOCALBASE}/include/glm/glm.hpp:math/glm \

1
cad/stepcode/Makefile

@ -10,7 +10,6 @@ COMMENT= Generates C++ and Python from ISO10303 files
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_FreeBSD_11_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1
BROKEN_FreeBSD_12_powerpc64= fails to configure: Schema scan for 15926-0002-lifecycle_integration.exp exited with error code 1
USES= cmake compiler:c++11-lang

10
chinese/fcitx-libpinyin/files/patch-src__CMakeLists.txt

@ -1,10 +0,0 @@
--- ./src/CMakeLists.txt.orig 2013-07-16 05:34:05.000000000 +0900
+++ ./src/CMakeLists.txt 2014-03-19 15:51:24.000000000 +0900
@@ -22,6 +22,7 @@
)
add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/share/locale\" )
+add_definitions( -D_WITH_GETLINE )
fcitx_add_addon_full(libpinyin DESC
SOURCES ${fcitx_libpinyin_sources}

5
chinese/ibus-libpinyin/files/patch-src_PYLibPinyin.cc

@ -1,10 +1,9 @@
--- src/PYLibPinyin.cc.orig 2015-01-23 04:57:48 UTC
--- src/PYLibPinyin.cc.orig 2018-06-27 03:08:59 UTC
+++ src/PYLibPinyin.cc
@@ -21,6 +21,8 @@
@@ -21,6 +21,7 @@
#include "PYLibPinyin.h"
+#define _WITH_GETLINE
+#include <stdio.h>
#include <string.h>
#include <pinyin.h>

2
chinese/libpinyin/Makefile

@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS+=CPPFLAGS="-I${LOCALBASE}/include \
-I${BDB_INCLUDE_DIR} -D_WITH_GETLINE" \
-I${BDB_INCLUDE_DIR}" \
LDFLAGS="-L${LOCALBASE}/lib -l${BDB_LIB_NAME}"
INSTALL_TARGET=install-strip

1
comms/aprsd/Makefile

@ -12,7 +12,6 @@ COMMENT= Server daemon providing Internet access to APRS packet data
LICENSE= GPLv2
BROKEN_FreeBSD_11_powerpc64= fails to link on powerpc64 elfv1: httpserver.o:(.text+0x1074): undefined reference to `convertUpTime(int)'
BROKEN_FreeBSD_12_powerpc64= fails to link on powerpc64 elfv1: httpserver.o:(.text+0x1074): undefined reference to `convertUpTime(int)'
GNU_CONFIGURE= yes

17
comms/usbmuxd/files/patch-src_usb.c

@ -1,17 +0,0 @@
libusb_has_capability() was implemented in r361977 and is only available on:
FreeBSD >= 1104501, 1201518, 1300098
However, libusb in all supported versions of FreeBSD supports hotplug events.
This patch can be safely removed after 11.4 and 12.1 EOL.
--- src/usb.c.orig 2021-01-21 10:10:40 UTC
+++ src/usb.c
@@ -815,7 +815,7 @@ int usb_init(void)
collection_init(&device_list);
#ifdef HAVE_LIBUSB_HOTPLUG_API
- if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
+ if (1) {
usbmuxd_log(LL_INFO, "Registering for libusb hotplug events");
res = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, VID_APPLE, LIBUSB_HOTPLUG_MATCH_ANY, 0, usb_hotplug_cb, NULL, &usb_hotplug_cb_handle);
if (res == LIBUSB_SUCCESS) {

2
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

8
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>

11
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"

2
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

1
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

1
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

1
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

13
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__)

6
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)

14
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()

6
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

14
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()

6
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

14
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

2
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

6
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

11
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"

6
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

11
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"

7
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

11
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"

6
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

11
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"

6
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

11
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"

2
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

6
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

12
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()

6
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:

12
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()

6
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

12
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()

18
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>

12
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