diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile index 356e4e3d1739..59b37c568bfc 100644 --- a/databases/mongodb50/Makefile +++ b/databases/mongodb50/Makefile @@ -1,118 +1,115 @@ PORTNAME= mongodb DISTVERSIONPREFIX= r DISTVERSION= 5.0.14 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases net MASTER_SITES= https://fastdl.mongodb.org/src/ \ http://fastdl.mongodb.org/src/ PKGNAMESUFFIX= ${DISTVERSION:R:S/.//} DISTNAME= mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION} MAINTAINER= ronald@FreeBSD.org COMMENT= Distributed document-oriented "NoSQL" database (5.0.x Branch) WWW= https://docs.mongodb.com/v5.0/ LICENSE= APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20 LICENSE_COMB= multi LICENSE_NAME_SSPLv1= Server Side Public License Version 1 LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le ONLY_FOR_ARCHS_REASON= only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} -LIB_DEPENDS= libboost_log.so:devel/boost-libs \ - libcurl.so:ftp/curl \ +LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libstemmer.so:textproc/snowballstemmer \ libunwind.so:devel/libunwind \ libyaml-cpp.so:devel/yaml-cpp \ libzstd.so:archivers/zstd USES= compiler:c++17-lang cpe python:3.5+,build scons shebangfix USE_RC_SUBR= mongod SHEBANG_FILES= buildscripts/scons.py python_OLD_CMD= @python_interpreter@ MAKE_ARGS= --cxx-std=17 \ --disable-warnings-as-errors \ --libc++ \ --runtime-hardening=on \ - --use-system-boost \ --use-system-libunwind \ --use-system-pcre \ --use-system-snappy \ --use-system-stemmer \ --use-system-yaml \ --use-system-zlib \ --use-system-zstd \ -j ${MAKE_JOBS_NUMBER} \ AR=llvm-ar \ VERBOSE=on CONFLICTS_INSTALL= mongodb[0-9][0-9] # etc/mongodb.conf.sample USERS= mongodb GROUPS= mongodb OPTIONS_DEFINE= LTO SASL SSL NOAVX OPTIONS_DEFAULT= LTO SASL SSL NOAVX_DESC= "Disable AVX instructions on amd64 (Sandybridge+)" LTO_MAKE_ARGS= --lto=on NOAVX_MAKE_ARGS= --experimental-optimization="-sandybridge" SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SASL_MAKE_ARGS= --use-sasl-client SSL_USES= ssl SSL_MAKE_ARGS= --ssl .include .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le EXTRA_PATCHES= ${FILESDIR}/${ARCH} .endif ALL_TARGET= install-core # This ports is only following the Major Release. # https://docs.mongodb.com/manual/reference/versioning/ PORTSCOUT= limit:^5\.0\. CPE_PRODUCT= mongodb pre-patch: ${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S post-patch: - ${RM} -rf ${WRKSRC}/src/third_party/boost ${RM} -rf ${WRKSRC}/src/third_party/pcre-* ${RM} -rf ${WRKSRC}/src/third_party/snappy-* ${RM} -rf ${WRKSRC}/src/third_party/unwind ${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp ${RM} -rf ${WRKSRC}/src/third_party/zlib-* ${RM} -rf ${WRKSRC}/src/third_party/zstandard-* do-build: ${WRKSRC}/buildscripts/scons.py -C ${WRKSRC} ${MAKE_ARGS} do-install: .for f in mongo mongod mongos ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor ${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES ${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/ .endfor ${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py .include diff --git a/databases/mongodb50/files/patch-boost-179-compat b/databases/mongodb50/files/patch-boost-179-compat deleted file mode 100644 index 8135db48dd3c..000000000000 --- a/databases/mongodb50/files/patch-boost-179-compat +++ /dev/null @@ -1,70 +0,0 @@ ---- src/mongo/db/auth/security_key_test.cpp -+++ src/mongo/db/auth/security_key_test.cpp -@@ -30,6 +30,7 @@ - #include "mongo/platform/basic.h" - - #include -+#include - - #include "mongo/base/string_data.h" - #include "mongo/db/auth/authorization_manager.h" ---- src/mongo/db/storage/storage_repair_observer.cpp -+++ src/mongo/db/storage/storage_repair_observer.cpp -@@ -41,6 +41,7 @@ - #include - #endif - -+#include - #include - - #include "mongo/db/dbhelpers.h" ---- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -+++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp -@@ -34,6 +34,7 @@ - #include "mongo/db/storage/kv/kv_engine_test_harness.h" - - #include -+#include - #include - #include - ---- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -+++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp -@@ -36,6 +36,7 @@ - #include - - #include -+#include - #include - - #include "mongo/base/simple_string_data_comparator.h" ---- src/mongo/shell/shell_utils_extended.cpp -+++ src/mongo/shell/shell_utils_extended.cpp -@@ -37,6 +37,7 @@ - #endif - - #include -+#include - #include - #include - ---- src/mongo/util/stacktrace_threads.cpp -+++ src/mongo/util/stacktrace_threads.cpp -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- src/mongo/util/processinfo_linux.cpp -+++ src/mongo/util/processinfo_linux.cpp -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/databases/mongodb50/files/patch-boost-179-link-fix b/databases/mongodb50/files/patch-boost-179-link-fix deleted file mode 100644 index 157ebaaf0221..000000000000 --- a/databases/mongodb50/files/patch-boost-179-link-fix +++ /dev/null @@ -1,21 +0,0 @@ ---- SConstruct -+++ SConstruct -@@ -3511,17 +3511,11 @@ def doConfigure(myenv): - "BOOST_LOG_NO_SHORTHAND_NAMES", - "BOOST_LOG_USE_NATIVE_SYSLOG", - "BOOST_LOG_WITHOUT_THREAD_ATTR", -+ "BOOST_LOG_DYN_LINK", - "ABSL_FORCE_ALIGNED_ACCESS", - ] - ) - -- if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk': -- conf.env.AppendUnique( -- CPPDEFINES=[ -- "BOOST_LOG_DYN_LINK", -- ] -- ) -- - if use_system_version_of_library("boost"): - if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): - myenv.ConfError("can't find boost headers")