Date: Mon, 1 Jul 2024 20:32:34 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 19d68720f1da - main - all: drop support for FreeBSD 13.2 which reached EOL today Message-ID: <202407012032.461KWYcd019196@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=19d68720f1dac6176557ffa8d9c1684c4cf22608 commit 19d68720f1dac6176557ffa8d9c1684c4cf22608 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2024-06-15 18:44:12 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2024-07-01 20:27:23 +0000 all: drop support for FreeBSD 13.2 which reached EOL today Thanks again to jbeich for noticing various things I overlooked. Reviewed by: acm, ashish, eduardo, ehaupt, eugen, jbeich, martymac, mat, nobukata, sunpoet, tagattie, yuri, arrowd, kde Differential Revision: https://reviews.freebsd.org/D45141 --- Mk/bsd.port.mk | 4 +- audio/audacity/Makefile | 7 -- .../files/extra-libraries_lib-utility_TypeList.cpp | 23 ------ .../files/extra-libraries_lib-utility_TypeList.h | 39 ---------- .../files/extra-libraries_lib-utility_TypeSwitch.h | 20 ------ audio/denemo/Makefile | 2 +- audio/ncmpc/Makefile | 2 +- audio/ocp/Makefile | 2 +- audio/openal-soft/Makefile | 2 +- biology/py-macs3/Makefile | 6 -- chinese/libime/Makefile | 2 +- databases/arrow/Makefile | 7 -- databases/xtrabackup80/Makefile | 2 +- databases/xtrabackup81/Makefile | 2 +- deskutils/kdepim-runtime/Makefile | 2 +- .../files/patch-src_session.h | 19 ----- devel/cjose/Makefile | 2 +- devel/corrade/Makefile | 2 +- devel/electron27/Makefile | 11 --- devel/electron28/Makefile | 18 ----- ...tron_shell_browser_electron__browser__context.h | 64 ----------------- ...patch-electron_shell_browser_ui_gtk_menu__gtk.h | 11 --- ...h-electron_shell_browser_ui_status__icon__gtk.h | 10 --- devel/electron29/Makefile | 7 -- ...tron_shell_browser_electron__browser__context.h | 64 ----------------- ...patch-electron_shell_browser_ui_gtk_menu__gtk.h | 11 --- ...h-electron_shell_browser_ui_status__icon__gtk.h | 10 --- devel/electron30/Makefile | 7 -- ...tron_shell_browser_electron__browser__context.h | 64 ----------------- ...patch-electron_shell_browser_ui_gtk_menu__gtk.h | 11 --- ...h-electron_shell_browser_ui_status__icon__gtk.h | 10 --- devel/hyprlang/Makefile | 23 ------ devel/hyprlang/distinfo | 2 - devel/hyprutils/Makefile | 23 ------ devel/hyprutils/distinfo | 2 - devel/ptlib/Makefile | 4 +- devel/py-threadpoolctl/Makefile | 6 -- devel/qjson/Makefile | 2 +- devel/spirv-llvm-translator/Makefile | 2 +- devel/tcl-trf/Makefile | 2 +- devel/tex-libtexluajit/Makefile | 9 +-- devel/ucommon/Makefile | 2 +- dns/getdns/Makefile | 2 +- editors/calligra/Makefile | 2 +- editors/e93/Makefile | 2 +- editors/imhex-current/Makefile | 3 +- editors/libreoffice/Makefile | 9 --- editors/zile/Makefile | 2 +- emulators/citra/Makefile | 2 +- emulators/fs-uae/Makefile | 2 +- emulators/rpcs3/Makefile | 23 ------ emulators/virtualbox-ose-legacy/Makefile | 2 +- emulators/yuzu/Makefile | 17 ----- emulators/yuzu/distinfo | 4 +- games/alienarena/Makefile | 2 +- games/assaultcube/Makefile | 2 +- games/chessx/Makefile | 2 +- games/flightgear/Makefile | 2 +- games/libretro-bluemsx/Makefile | 4 +- games/libretro-pcsx_rearmed/Makefile | 2 +- games/megaglest/Makefile | 2 +- games/openclonk/Makefile | 2 +- games/trigger-rally/Makefile | 2 +- graphics/nvidia-drm-510-kmod/Makefile | 5 -- .../files/extra-patch-conftest.sh | 83 ---------------------- graphics/wrapland/Makefile | 23 ------ graphics/wrapland/distinfo | 2 - java/eclipse/Makefile | 2 +- java/openjdk11/Makefile | 2 - java/openjdk17/Makefile | 6 -- java/openjdk18/Makefile | 6 -- java/openjdk19/Makefile | 6 -- java/openjdk20/Makefile | 6 -- java/openjdk21/Makefile | 6 -- java/openjdk22/Makefile | 6 -- java/openjdk8/Makefile | 4 +- lang/erlang-runtime21/Makefile | 2 +- lang/erlang-runtime22/Makefile | 2 +- lang/erlang-runtime23/Makefile | 2 +- lang/erlang-runtime24/Makefile | 2 +- lang/erlang-runtime25/Makefile | 2 +- lang/erlang-runtime26/Makefile | 2 +- lang/erlang/Makefile | 2 +- lang/smlnj/Makefile | 5 +- lang/spidermonkey102/Makefile | 10 --- lang/spidermonkey78/Makefile | 10 --- lang/spidermonkey91/Makefile | 10 --- lang/yap/Makefile | 2 +- mail/milter-manager/Makefile | 2 +- mail/qpopper/Makefile | 2 +- math/py-fastcluster/Makefile | 11 +-- math/scilab/Makefile | 7 +- misc/ecflow/Makefile | 2 +- misc/rump/Makefile | 2 +- multimedia/bcmatroska2/Makefile | 2 +- multimedia/x264/Makefile | 2 +- net-im/telegram-desktop/Makefile | 2 +- net-mgmt/nfdump/Makefile | 2 +- net-p2p/amule/Makefile | 2 +- net/messagelib/Makefile | 2 +- net/py-pyfixbuf/Makefile | 2 +- print/cups-filters/Makefile | 2 +- print/scribus-devel/Makefile | 2 +- science/py-hoomd-blue/Makefile | 2 +- science/tfel/Makefile | 2 +- security/kleopatra/Makefile | 2 +- security/py-cryptography-legacy/Makefile | 9 +-- sysutils/btop/Makefile | 9 --- textproc/ibus/Makefile | 4 -- www/nghttp2/Makefile | 5 -- www/node18/Makefile | 2 +- www/tclhttpd/Makefile | 2 +- www/webkit2-gtk4/Makefile | 2 +- x11-fm/fsv2/Makefile | 2 +- x11-toolkits/como/Makefile | 23 ------ x11-toolkits/como/distinfo | 2 - x11-wm/gamescope/Makefile | 25 ------- x11-wm/gamescope/distinfo | 4 +- x11-wm/hyprland/Makefile | 24 ------- x11-wm/hyprland/distinfo | 2 - x11-wm/subtle/Makefile | 2 +- x11-wm/theseus-ship/Makefile | 23 ------ x11-wm/theseus-ship/distinfo | 2 - x11/hyprcursor/Makefile | 23 ------ x11/hyprcursor/distinfo | 2 - x11/hyprlock/Makefile | 23 ------ x11/hyprlock/distinfo | 4 +- x11/xdg-desktop-portal-hyprland/Makefile | 23 ------ x11/xdg-desktop-portal-hyprland/distinfo | 2 - 129 files changed, 76 insertions(+), 1011 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1604a1c7fd3d..3eb70709fd8c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -42,7 +42,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # OSREL - The release version of the operating system as a text # string (e.g., "12.4"). # OSVERSION - The operating system version as a comparable integer; -# the value of __FreeBSD_version (e.g., 1302000). +# the value of __FreeBSD_version (e.g., 1501000). # # This is the beginning of the list of all variables that need to be # defined in a port, listed in order that they should be included @@ -1179,7 +1179,7 @@ OSVERSION!= ${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC . endif _EXPORTED_VARS+= OSVERSION -. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1302000 ) +. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1303000 ) _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. . if defined(ALLOW_UNSUPPORTED_SYSTEM) diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 848085220584..48348b2aaa5f 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -143,13 +143,6 @@ CMAKE_ARGS+= -DHAVE_MMX:BOOL=OFF \ -DHAVE_SSE2:BOOL=OFF .endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302508 -# Workarounds for buggy libc++ std::conjunction -EXTRA_PATCHES= ${PATCHDIR}/extra-libraries_lib-utility_TypeList.cpp \ - ${PATCHDIR}/extra-libraries_lib-utility_TypeList.h \ - ${PATCHDIR}/extra-libraries_lib-utility_TypeSwitch.h -.endif - post-install: @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt #delete empty directories: https://github.com/audacity/audacity/issues/808 diff --git a/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp b/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp deleted file mode 100644 index 2575d8f5f745..000000000000 --- a/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- libraries/lib-utility/TypeList.cpp.orig 2023-11-16 11:58:21 UTC -+++ libraries/lib-utility/TypeList.cpp -@@ -118,16 +118,16 @@ static_assert(Is_v<NullOrStartsWithInt, Nil>); - static_assert(Is_v<NullOrStartsWithInt, Example>); - - static_assert(Every_v<Fn<is_arithmetic>, Example>); --static_assert(is_base_of_v<true_type, Every<Fn<is_arithmetic>, Example>>); -+static_assert(TypeList::is_base_of_v<true_type, Every<Fn<is_arithmetic>, Example>>); - static_assert(!Every_v<Fn<is_integral>, Example>); --static_assert(is_base_of_v<is_integral<double>, -+static_assert(TypeList::is_base_of_v<is_integral<double>, - Every<Fn<is_integral>, Example>>); - - static_assert(Some_v<Fn<is_integral>, Example>); --static_assert(is_base_of_v<is_integral<int>, -+static_assert(TypeList::is_base_of_v<is_integral<int>, - Some<Fn<is_integral>, Example>>); - static_assert(!Some_v<Fn<is_void>, Example>); --static_assert(is_base_of_v<false_type, Some<Fn<is_void>, Example>>); -+static_assert(TypeList::is_base_of_v<false_type, Some<Fn<is_void>, Example>>); - - static_assert(NotEvery_v<Fn<is_floating_point>, Example>); - static_assert(NotAny_v<Fn<is_void>, Example>); diff --git a/audio/audacity/files/extra-libraries_lib-utility_TypeList.h b/audio/audacity/files/extra-libraries_lib-utility_TypeList.h deleted file mode 100644 index dfc77dc2be3d..000000000000 --- a/audio/audacity/files/extra-libraries_lib-utility_TypeList.h +++ /dev/null @@ -1,39 +0,0 @@ ---- libraries/lib-utility/TypeList.h.orig 2023-11-16 11:58:21 UTC -+++ libraries/lib-utility/TypeList.h -@@ -54,6 +54,18 @@ namespace TypeList { - can make compound predicates out of simpler ones. - */ - -+template <class...> -+struct conjunction : std::true_type {}; -+ -+template <class _Arg> -+struct conjunction<_Arg> : _Arg {}; -+ -+template <class _Arg, class... _Args> -+struct conjunction<_Arg, _Args...> : std::conditional_t<!bool(_Arg::value), _Arg, conjunction<_Args...>> {}; -+ -+template <class _Bp, class _Dp> -+inline constexpr bool is_base_of_v = __is_base_of(_Bp, _Dp); -+ - //! standard in C++20; add a level of indirection to a type - template<typename T> struct type_identity { using type = T; }; - -@@ -429,7 +441,7 @@ struct And<Predicate, Predicates...> { (private) - static constexpr bool value = Is_v<And<Predicates...>, T>; - }; - public: -- template<typename T> using typemap = typename std::conjunction< -+ template<typename T> using typemap = typename TypeList::conjunction< - typename Predicate::template typemap<T>, Rest<T> - >; - }; -@@ -437,7 +449,7 @@ struct And<Predicate, Predicates...> { (private) - //! Derived from the Predicate, applied to the first of the types (often boolean - //! constant types), for which the value is false; or std::true_type - template<typename Predicate, typename TypeList> struct Every -- : Apply_t<std::conjunction, Map_t<Predicate, TypeList>> {}; -+ : Apply_t<conjunction, Map_t<Predicate, TypeList>> {}; - //! The constant value in the corresponding type - template<typename Predicate, typename TypeList> constexpr auto Every_v = - Every<Predicate, TypeList>::value; diff --git a/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h b/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h deleted file mode 100644 index f0291a0356a8..000000000000 --- a/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h +++ /dev/null @@ -1,20 +0,0 @@ ---- libraries/lib-utility/TypeSwitch.h.orig 2023-11-16 11:58:21 UTC -+++ libraries/lib-utility/TypeSwitch.h -@@ -127,7 +127,7 @@ struct Executor { - // Case 1: Compatible, and invocable on the next function, giving - // another function, that accepts BaseClass: - struct Case1_; -- using Case1 = std::conjunction<Compatible, curried, Case1_>; -+ using Case1 = TypeList::conjunction<Compatible, curried, Case1_>; - struct Case1_ { - static constexpr bool value = std::is_invocable_v< - std::invoke_result_t<F, Dummy &&>, BaseClass&, Args&&...>; -@@ -135,7 +135,7 @@ struct Executor { - }; - - // Case 2: Invocable directly on the object -- struct Case2 : std::conjunction< -+ struct Case2 : TypeList::conjunction< - Compatible, std::negation<curried>, - std::is_invocable<F, BaseClass&, Args&&...> - > { diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index 48d34d2a90bc..ebb3c35205a9 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -68,7 +68,7 @@ LIB_DEPENDS+= libatrilview.so:graphics/atril .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile index a0671fa1f081..d89eecc7f7a3 100644 --- a/audio/ncmpc/Makefile +++ b/audio/ncmpc/Makefile @@ -49,7 +49,7 @@ PORTDOCS= * .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CPPFLAGS+= -Wno-error=enum-constexpr-conversion .endif diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index e51bcdc97f67..cf1d7964d852 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -95,7 +95,7 @@ TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile index bff0cc015271..bbb89eb7b112 100644 --- a/audio/openal-soft/Makefile +++ b/audio/openal-soft/Makefile @@ -63,7 +63,7 @@ UTILS_CMAKE_BOOL= ALSOFT_UTILS # The following is actually meant for lld 15.0 and later, but the ports # framework does not support LINKER_TYPE and LINKER_VERSION yet. -.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 +.if ${COMPILER_TYPE} == "clang" # Turn off checking of dynamic relocations, to avoid lld diagnostics about # possibly incorrect addend values. LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations diff --git a/biology/py-macs3/Makefile b/biology/py-macs3/Makefile index 7e903866af04..56f6bdc9c904 100644 --- a/biology/py-macs3/Makefile +++ b/biology/py-macs3/Makefile @@ -35,12 +35,6 @@ GH_ACCOUNT= macs3-project GH_PROJECT= MACS SHEBANG_FILES= test/cmdlinetest* test/prockreport test/*.py test/pyprofile* -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302509 -IGNORE= does not run properly on FreeBSD 13.2 and earlier due to use of dynamically loaded libc by py-threadpoolctl. Please upgrade to a newer FreeBSD or use py-macs2 instead. See PR 276231 -.endif - post-stage: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/MACS3/*/*.so diff --git a/chinese/libime/Makefile b/chinese/libime/Makefile index 25f82cb63d47..73f7281fc0a9 100644 --- a/chinese/libime/Makefile +++ b/chinese/libime/Makefile @@ -38,7 +38,7 @@ TABLE_DICT_TAR= table-20240108.tar.gz .include <bsd.port.pre.mk> post-patch: -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \ ${WRKSRC}/src/libime/core/kenlm/lm/trie_sort.hh \ ${WRKSRC}/src/libime/core/kenlm/util/joint_sort.hh \ diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile index 72d6ebf2c4a7..29d8c3dac089 100644 --- a/databases/arrow/Makefile +++ b/databases/arrow/Makefile @@ -179,13 +179,6 @@ TESTING_DESC= Arrow testing libraries TESTING_CMAKE_BOOL= ARROW_TESTING TESTING_LIB_DEPENDS= libgtest.so:devel/googletest -# workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277953 -OPSYS!= uname -s # HACK: OPSYS is defined in bsd.port.options.mk which has to be later -OSVERSION!= awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${CROSS_SYSROOT}/usr/include/sys/param.h # HACK: same as above -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1303000 -TESTING_BROKEN= configure fails because GTest built with C++ level <17 isn't compatible with C++17 used in arrow -.endif - # form OPTIONS_DEFAULT .for opt in ${OPTIONS_GROUP_COMPONENTS} . if "${${opt}_BROKEN}" == "" diff --git a/databases/xtrabackup80/Makefile b/databases/xtrabackup80/Makefile index 47be5e87e030..6a88ca1bac51 100644 --- a/databases/xtrabackup80/Makefile +++ b/databases/xtrabackup80/Makefile @@ -104,7 +104,7 @@ post-patch: .for d in storage/innobase/xtrabackup/src sql/protobuf ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt .endfor -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ ${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp .endif diff --git a/databases/xtrabackup81/Makefile b/databases/xtrabackup81/Makefile index 75165fccc89c..ef69c294aab9 100644 --- a/databases/xtrabackup81/Makefile +++ b/databases/xtrabackup81/Makefile @@ -68,7 +68,7 @@ post-patch: .for d in storage/innobase/xtrabackup/src sql/protobuf ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt .endfor -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ ${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp .endif diff --git a/deskutils/kdepim-runtime/Makefile b/deskutils/kdepim-runtime/Makefile index 6df40d40d09e..d282025f69f5 100644 --- a/deskutils/kdepim-runtime/Makefile +++ b/deskutils/kdepim-runtime/Makefile @@ -44,7 +44,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> -.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-error=enum-constexpr-conversion .endif diff --git a/deskutils/plasma6-xdg-desktop-portal-kde/files/patch-src_session.h b/deskutils/plasma6-xdg-desktop-portal-kde/files/patch-src_session.h deleted file mode 100644 index cf5796fc5bcc..000000000000 --- a/deskutils/plasma6-xdg-desktop-portal-kde/files/patch-src_session.h +++ /dev/null @@ -1,19 +0,0 @@ -Fix build on FreeBSD 13.2 - -In file included from /wrkdirs/usr/ports/deskutils/plasma6-xdg-desktop-portal-kde/work/.build/src/xdg-desktop-portal-kde_autogen/mocs_compilation.cpp:29: -In file included from /wrkdirs/usr/ports/deskutils/plasma6-xdg-desktop-portal-kde/work/.build/src/xdg-desktop-portal-kde_autogen/EWIEGA46WW/moc_session.cpp:9: -/wrkdirs/usr/ports/deskutils/plasma6-xdg-desktop-portal-kde/work/.build/src/xdg-desktop-portal-kde_autogen/EWIEGA46WW/../../../../xdg-desktop-portal-kde-6.0.4/src/session.h:186:10: error: no template named 'unordered_map' in namespace 'std' - std::unordered_map<QString, std::unique_ptr<QAction>> m_shortcuts; - ~~~~~^ - ---- src/session.h.orig 2024-04-16 10:39:21 UTC -+++ src/session.h -@@ -9,6 +9,8 @@ - #ifndef XDG_DESKTOP_PORTAL_KDE_SESSION_H - #define XDG_DESKTOP_PORTAL_KDE_SESSION_H - -+#include <unordered_map> -+ - #include <QAction> - #include <QDBusVirtualObject> - #include <QObject> diff --git a/devel/cjose/Makefile b/devel/cjose/Makefile index c1a52369bcaf..0d651156e019 100644 --- a/devel/cjose/Makefile +++ b/devel/cjose/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-jansson=${PREFIX} --with-openssl=${OPENSSLBASE} .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-error=strict-prototypes .endif diff --git a/devel/corrade/Makefile b/devel/corrade/Makefile index 1f03632a7afc..63fd1de88131 100644 --- a/devel/corrade/Makefile +++ b/devel/corrade/Makefile @@ -30,7 +30,7 @@ TEST_CMAKE_BOOL= CORRADE_BUILD_TESTS .include <bsd.port.pre.mk> post-patch: -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|#include <__tuple>|#include <tuple>|g' \ ${WRKSRC}/src/Corrade/Utility/StlForwardArray.h \ ${WRKSRC}/src/Corrade/Utility/StlForwardTuple.h diff --git a/devel/electron27/Makefile b/devel/electron27/Makefile index fc4d263e7fe4..8ecd2cd9a490 100644 --- a/devel/electron27/Makefile +++ b/devel/electron27/Makefile @@ -246,19 +246,8 @@ YARN_TIMESTAMP= 61171200 IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 160 -LLVM_DEFAULT= 16 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ - cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ - c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ - ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ - nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ - ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} -.else BINARY_ALIAS+= ar=/usr/bin/llvm-ar \ nm=/usr/bin/llvm-nm -.endif CFLAGS+= -Wno-error=implicit-function-declaration .if ${ARCH} == "aarch64" diff --git a/devel/electron28/Makefile b/devel/electron28/Makefile index 5dfdd1230b47..7d3b58eff732 100644 --- a/devel/electron28/Makefile +++ b/devel/electron28/Makefile @@ -239,30 +239,12 @@ YARN_TIMESTAMP= 61171200 .include "Makefile.version" .include <bsd.port.pre.mk> -# libc++ < 16 needs these extra patches -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302507 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-electron_shell_browser_electron__browser__context.h \ - ${PATCHDIR}/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h \ - ${PATCHDIR}/extra-patch-electron_shell_browser_ui_status__icon__gtk.h -.endif - .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 160 -LLVM_DEFAULT= 16 -BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} -BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ - cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \ - c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \ - ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \ - nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \ - ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT} -.else BINARY_ALIAS+= ar=/usr/bin/llvm-ar \ nm=/usr/bin/llvm-nm -.endif CFLAGS+= -Wno-error=implicit-function-declaration .if ${ARCH} == "aarch64" diff --git a/devel/electron28/files/extra-patch-electron_shell_browser_electron__browser__context.h b/devel/electron28/files/extra-patch-electron_shell_browser_electron__browser__context.h deleted file mode 100644 index 945fd33f12a9..000000000000 --- a/devel/electron28/files/extra-patch-electron_shell_browser_electron__browser__context.h +++ /dev/null @@ -1,64 +0,0 @@ ---- electron/shell/browser/electron_browser_context.h.orig 2024-01-23 19:02:02 UTC -+++ electron/shell/browser/electron_browser_context.h -@@ -8,7 +8,6 @@ - #include <map> - #include <memory> - #include <string> --#include <string_view> - #include <variant> - #include <vector> - #include "base/memory/raw_ptr.h" -@@ -79,22 +78,41 @@ class ElectronBrowserContext : public content::Browser - - // partition_id => browser_context - struct PartitionKey { -- PartitionKey(const std::string_view partition, bool in_memory) -- : type_{Type::Partition}, location_{partition}, in_memory_{in_memory} {} -+ enum class KeyType { Partition, FilePath }; -+ std::string location; -+ bool in_memory; -+ KeyType partition_type; - -+ PartitionKey(const std::string& partition, bool in_memory) -+ : location(partition), -+ in_memory(in_memory), -+ partition_type(KeyType::Partition) {} - explicit PartitionKey(const base::FilePath& file_path) -- : type_{Type::Path}, -- location_{file_path.AsUTF8Unsafe()}, -- in_memory_{false} {} -+ : location(file_path.AsUTF8Unsafe()), -+ in_memory(false), -+ partition_type(KeyType::FilePath) {} - -- friend auto operator<=>(const PartitionKey&, const PartitionKey&) = default; -+ bool operator<(const PartitionKey& other) const { -+ if (partition_type == KeyType::Partition) { -+ if (location == other.location) -+ return in_memory < other.in_memory; -+ return location < other.location; -+ } else { -+ if (location == other.location) -+ return false; -+ return location < other.location; -+ } -+ } - -- private: -- enum class Type { Partition, Path }; -- -- Type type_; -- std::string location_; -- bool in_memory_; -+ bool operator==(const PartitionKey& other) const { -+ if (partition_type == KeyType::Partition) { -+ return (location == other.location) && (in_memory < other.in_memory); -+ } else { -+ if (location == other.location) -+ return true; -+ return false; -+ } -+ } - }; - - using BrowserContextMap = diff --git a/devel/electron28/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h b/devel/electron28/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h deleted file mode 100644 index 2ae6219150ae..000000000000 --- a/devel/electron28/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h +++ /dev/null @@ -1,11 +0,0 @@ ---- electron/shell/browser/ui/gtk/menu_gtk.h.orig 2023-12-20 13:32:58 UTC -+++ electron/shell/browser/ui/gtk/menu_gtk.h -@@ -5,6 +5,8 @@ - #ifndef ELECTRON_SHELL_BROWSER_UI_GTK_MENU_GTK_H_ - #define ELECTRON_SHELL_BROWSER_UI_GTK_MENU_GTK_H_ - -+#include <vector> -+ - #include "base/functional/callback.h" - #include "base/memory/raw_ptr.h" - #include "ui/base/glib/scoped_gobject.h" diff --git a/devel/electron28/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h b/devel/electron28/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h deleted file mode 100644 index 21acde5bb351..000000000000 --- a/devel/electron28/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h +++ /dev/null @@ -1,10 +0,0 @@ ---- electron/shell/browser/ui/status_icon_gtk.h.orig 2023-12-20 13:31:04 UTC -+++ electron/shell/browser/ui/status_icon_gtk.h -@@ -6,6 +6,7 @@ - #define ELECTRON_SHELL_BROWSER_UI_STATUS_ICON_GTK_H_ - - #include <memory> -+#include <vector> - - #include "ui/base/glib/glib_integers.h" - #include "ui/base/glib/scoped_gobject.h" diff --git a/devel/electron29/Makefile b/devel/electron29/Makefile index fbf19f573a10..ebfb7911b4db 100644 --- a/devel/electron29/Makefile +++ b/devel/electron29/Makefile @@ -243,13 +243,6 @@ YARN_TIMESTAMP= 61171200 .include "Makefile.version" .include <bsd.port.pre.mk> -# libc++ < 16 needs these extra patches -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302507 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-electron_shell_browser_electron__browser__context.h \ - ${PATCHDIR}/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h \ - ${PATCHDIR}/extra-patch-electron_shell_browser_ui_status__icon__gtk.h -.endif - .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif diff --git a/devel/electron29/files/extra-patch-electron_shell_browser_electron__browser__context.h b/devel/electron29/files/extra-patch-electron_shell_browser_electron__browser__context.h deleted file mode 100644 index 945fd33f12a9..000000000000 --- a/devel/electron29/files/extra-patch-electron_shell_browser_electron__browser__context.h +++ /dev/null @@ -1,64 +0,0 @@ ---- electron/shell/browser/electron_browser_context.h.orig 2024-01-23 19:02:02 UTC -+++ electron/shell/browser/electron_browser_context.h -@@ -8,7 +8,6 @@ - #include <map> - #include <memory> - #include <string> --#include <string_view> - #include <variant> - #include <vector> - #include "base/memory/raw_ptr.h" -@@ -79,22 +78,41 @@ class ElectronBrowserContext : public content::Browser - - // partition_id => browser_context - struct PartitionKey { -- PartitionKey(const std::string_view partition, bool in_memory) -- : type_{Type::Partition}, location_{partition}, in_memory_{in_memory} {} -+ enum class KeyType { Partition, FilePath }; -+ std::string location; -+ bool in_memory; -+ KeyType partition_type; - -+ PartitionKey(const std::string& partition, bool in_memory) -+ : location(partition), -+ in_memory(in_memory), -+ partition_type(KeyType::Partition) {} - explicit PartitionKey(const base::FilePath& file_path) -- : type_{Type::Path}, -- location_{file_path.AsUTF8Unsafe()}, -- in_memory_{false} {} -+ : location(file_path.AsUTF8Unsafe()), -+ in_memory(false), -+ partition_type(KeyType::FilePath) {} - -- friend auto operator<=>(const PartitionKey&, const PartitionKey&) = default; -+ bool operator<(const PartitionKey& other) const { -+ if (partition_type == KeyType::Partition) { -+ if (location == other.location) -+ return in_memory < other.in_memory; -+ return location < other.location; -+ } else { -+ if (location == other.location) -+ return false; -+ return location < other.location; -+ } -+ } - -- private: -- enum class Type { Partition, Path }; -- -- Type type_; -- std::string location_; -- bool in_memory_; -+ bool operator==(const PartitionKey& other) const { -+ if (partition_type == KeyType::Partition) { -+ return (location == other.location) && (in_memory < other.in_memory); -+ } else { -+ if (location == other.location) -+ return true; -+ return false; -+ } -+ } - }; - - using BrowserContextMap = diff --git a/devel/electron29/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h b/devel/electron29/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h deleted file mode 100644 index 2ae6219150ae..000000000000 --- a/devel/electron29/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h +++ /dev/null @@ -1,11 +0,0 @@ ---- electron/shell/browser/ui/gtk/menu_gtk.h.orig 2023-12-20 13:32:58 UTC -+++ electron/shell/browser/ui/gtk/menu_gtk.h -@@ -5,6 +5,8 @@ - #ifndef ELECTRON_SHELL_BROWSER_UI_GTK_MENU_GTK_H_ - #define ELECTRON_SHELL_BROWSER_UI_GTK_MENU_GTK_H_ - -+#include <vector> -+ - #include "base/functional/callback.h" - #include "base/memory/raw_ptr.h" - #include "ui/base/glib/scoped_gobject.h" diff --git a/devel/electron29/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h b/devel/electron29/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h deleted file mode 100644 index 21acde5bb351..000000000000 --- a/devel/electron29/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h +++ /dev/null @@ -1,10 +0,0 @@ ---- electron/shell/browser/ui/status_icon_gtk.h.orig 2023-12-20 13:31:04 UTC -+++ electron/shell/browser/ui/status_icon_gtk.h -@@ -6,6 +6,7 @@ - #define ELECTRON_SHELL_BROWSER_UI_STATUS_ICON_GTK_H_ - - #include <memory> -+#include <vector> - - #include "ui/base/glib/glib_integers.h" - #include "ui/base/glib/scoped_gobject.h" diff --git a/devel/electron30/Makefile b/devel/electron30/Makefile index f2cc8a789c57..4783af68861c 100644 --- a/devel/electron30/Makefile +++ b/devel/electron30/Makefile @@ -243,13 +243,6 @@ YARN_TIMESTAMP= 61171200 .include "Makefile.version" .include <bsd.port.pre.mk> -# libc++ < 16 needs these extra patches -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302507 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-electron_shell_browser_electron__browser__context.h \ - ${PATCHDIR}/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h \ - ${PATCHDIR}/extra-patch-electron_shell_browser_ui_status__icon__gtk.h -.endif - .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif diff --git a/devel/electron30/files/extra-patch-electron_shell_browser_electron__browser__context.h b/devel/electron30/files/extra-patch-electron_shell_browser_electron__browser__context.h deleted file mode 100644 index 945fd33f12a9..000000000000 --- a/devel/electron30/files/extra-patch-electron_shell_browser_electron__browser__context.h +++ /dev/null @@ -1,64 +0,0 @@ ---- electron/shell/browser/electron_browser_context.h.orig 2024-01-23 19:02:02 UTC -+++ electron/shell/browser/electron_browser_context.h -@@ -8,7 +8,6 @@ - #include <map> - #include <memory> - #include <string> --#include <string_view> - #include <variant> - #include <vector> - #include "base/memory/raw_ptr.h" -@@ -79,22 +78,41 @@ class ElectronBrowserContext : public content::Browser - - // partition_id => browser_context - struct PartitionKey { -- PartitionKey(const std::string_view partition, bool in_memory) -- : type_{Type::Partition}, location_{partition}, in_memory_{in_memory} {} -+ enum class KeyType { Partition, FilePath }; -+ std::string location; -+ bool in_memory; -+ KeyType partition_type; - -+ PartitionKey(const std::string& partition, bool in_memory) -+ : location(partition), -+ in_memory(in_memory), -+ partition_type(KeyType::Partition) {} - explicit PartitionKey(const base::FilePath& file_path) -- : type_{Type::Path}, -- location_{file_path.AsUTF8Unsafe()}, -- in_memory_{false} {} -+ : location(file_path.AsUTF8Unsafe()), -+ in_memory(false), -+ partition_type(KeyType::FilePath) {} - -- friend auto operator<=>(const PartitionKey&, const PartitionKey&) = default; -+ bool operator<(const PartitionKey& other) const { -+ if (partition_type == KeyType::Partition) { -+ if (location == other.location) -+ return in_memory < other.in_memory; -+ return location < other.location; -+ } else { -+ if (location == other.location) -+ return false; -+ return location < other.location; -+ } -+ } - -- private: -- enum class Type { Partition, Path }; -- -- Type type_; -- std::string location_; -- bool in_memory_; -+ bool operator==(const PartitionKey& other) const { -+ if (partition_type == KeyType::Partition) { -+ return (location == other.location) && (in_memory < other.in_memory); -+ } else { -+ if (location == other.location) -+ return true; -+ return false; -+ } -+ } - }; - - using BrowserContextMap = diff --git a/devel/electron30/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h b/devel/electron30/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h deleted file mode 100644 index 2ae6219150ae..000000000000 --- a/devel/electron30/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h +++ /dev/null @@ -1,11 +0,0 @@ ---- electron/shell/browser/ui/gtk/menu_gtk.h.orig 2023-12-20 13:32:58 UTC -+++ electron/shell/browser/ui/gtk/menu_gtk.h -@@ -5,6 +5,8 @@ - #ifndef ELECTRON_SHELL_BROWSER_UI_GTK_MENU_GTK_H_ - #define ELECTRON_SHELL_BROWSER_UI_GTK_MENU_GTK_H_ - -+#include <vector> -+ - #include "base/functional/callback.h" - #include "base/memory/raw_ptr.h" - #include "ui/base/glib/scoped_gobject.h" diff --git a/devel/electron30/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h b/devel/electron30/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h deleted file mode 100644 index 21acde5bb351..000000000000 --- a/devel/electron30/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h +++ /dev/null @@ -1,10 +0,0 @@ ---- electron/shell/browser/ui/status_icon_gtk.h.orig 2023-12-20 13:31:04 UTC -+++ electron/shell/browser/ui/status_icon_gtk.h -@@ -6,6 +6,7 @@ - #define ELECTRON_SHELL_BROWSER_UI_STATUS_ICON_GTK_H_ - - #include <memory> -+#include <vector> - - #include "ui/base/glib/glib_integers.h" - #include "ui/base/glib/scoped_gobject.h" diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile index 8c7cc69a4bcb..1c5ba4dc7cae 100644 --- a/devel/hyprlang/Makefile +++ b/devel/hyprlang/Makefile @@ -25,27 +25,4 @@ PLIST_FILES= include/${PORTNAME}.hpp \ CXXFLAGS+= -fexperimental-library .endif -# XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo) -.if ${CXX} == c++ && exists(/usr/lib/libc++.so) -.if !exists(/usr/include/c++/v1/expected) || make(makesum) || make(fetch) -USES+= llvm:min=16,build,export -PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* -CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" - -# XXX Move into separate port and standardize via USES -GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx -CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 -# Don't link against new libc++ as it's not necessary -#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt - -pre-configure: bundled-libcxx -bundled-libcxx: - @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ - -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ - -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ - -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx - @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build -.endif -.endif # exists(/usr/lib/libc++.so) - .include <bsd.port.mk> diff --git a/devel/hyprlang/distinfo b/devel/hyprlang/distinfo index bc5e5b63a339..23a75e91f0a1 100644 --- a/devel/hyprlang/distinfo +++ b/devel/hyprlang/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1716458409 SHA256 (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 66a1f87634c8ecdeb67d7ccc499a3fc1c19b064a098b103be042751e7430b5cc SIZE (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 56383 -SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 -SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 diff --git a/devel/hyprutils/Makefile b/devel/hyprutils/Makefile index 13df8f71d25d..44c42ba0021b 100644 --- a/devel/hyprutils/Makefile +++ b/devel/hyprutils/Makefile @@ -22,27 +22,4 @@ PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} CXXFLAGS+= -fexperimental-library .endif -# XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo) -.if ${CXX} == c++ && exists(/usr/lib/libc++.so) -.if !exists(/usr/include/c++/v1/expected) || make(makesum) || make(fetch) -USES+= llvm:min=16,build,export -PATH:= ${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm* -CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" - -# XXX Move into separate port and standardize via USES -GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx -CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 -# Don't link against new libc++ as it's not necessary -#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt - -pre-configure: bundled-libcxx -bundled-libcxx: - @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ - -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ - -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ - -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx - @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build -.endif -.endif # exists(/usr/lib/libc++.so) - .include <bsd.port.mk> diff --git a/devel/hyprutils/distinfo b/devel/hyprutils/distinfo index ad3ff245bc92..0195be77819e 100644 --- a/devel/hyprutils/distinfo +++ b/devel/hyprutils/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1719316102 SHA256 (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 60cce1b4160a4e5383fa0ff665c6bf49b54cfb387dc8a52229abfc367000b0be SIZE (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 17974 -SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 -SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 994d0db9beb8..06c436a44bcd 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -119,13 +119,13 @@ CONFIGURE_ARGS+= --disable-dc .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang CPPFLAGS+= -Dregister= -Wno-error=dynamic-exception-spec .endif post-patch: @${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 +.if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \ ${WRKSRC}/include/ptlib/psharedptr.h @${REINPLACE_CMD} -e 's|public binary_function|public __binary_function|' \ *** 1657 LINES SKIPPED ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407012032.461KWYcd019196>