D45141.id140191.diff
No OneTemporary
Actions

Size

85 KB

Referenced Files

None

Subscribers

None

D45141.id140191.diff
View Options

	diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
	--- a/Mk/bsd.port.mk
	+++ b/Mk/bsd.port.mk
	@@ -42,7 +42,7 @@
	# 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 @@
	. 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
	--- a/audio/audacity/Makefile
	+++ b/audio/audacity/Makefile
	@@ -143,13 +143,6 @@
	-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.h b/audio/audacity/files/extra-libraries_lib-utility_TypeList.h
	deleted file mode 100644
	--- 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_TypeList.cpp b/audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp
	deleted file mode 100644
	--- 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_TypeSwitch.h b/audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h
	deleted file mode 100644
	--- 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
	--- a/audio/denemo/Makefile
	+++ b/audio/denemo/Makefile
	@@ -68,7 +68,7 @@

	.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
	--- a/audio/ncmpc/Makefile
	+++ b/audio/ncmpc/Makefile
	@@ -49,7 +49,7 @@

	.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
	--- a/audio/ocp/Makefile
	+++ b/audio/ocp/Makefile
	@@ -95,7 +95,7 @@

	.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
	--- a/audio/openal-soft/Makefile
	+++ b/audio/openal-soft/Makefile
	@@ -63,7 +63,7 @@

	# 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
	--- a/biology/py-macs3/Makefile
	+++ b/biology/py-macs3/Makefile
	@@ -34,12 +34,6 @@
	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
	--- a/chinese/libime/Makefile
	+++ b/chinese/libime/Makefile
	@@ -38,7 +38,7 @@
	.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
	--- a/databases/arrow/Makefile
	+++ b/databases/arrow/Makefile
	@@ -182,9 +182,6 @@
	# 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}
	diff --git a/databases/xtrabackup80/Makefile b/databases/xtrabackup80/Makefile
	--- a/databases/xtrabackup80/Makefile
	+++ b/databases/xtrabackup80/Makefile
	@@ -104,7 +104,7 @@
	.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
	--- a/databases/xtrabackup81/Makefile
	+++ b/databases/xtrabackup81/Makefile
	@@ -68,7 +68,7 @@
	.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
	--- a/deskutils/kdepim-runtime/Makefile
	+++ b/deskutils/kdepim-runtime/Makefile
	@@ -44,7 +44,7 @@

	.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/devel/cjose/Makefile b/devel/cjose/Makefile
	--- a/devel/cjose/Makefile
	+++ b/devel/cjose/Makefile
	@@ -24,7 +24,7 @@

	.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
	--- a/devel/corrade/Makefile
	+++ b/devel/corrade/Makefile
	@@ -30,7 +30,7 @@
	.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
	--- a/devel/electron27/Makefile
	+++ b/devel/electron27/Makefile
	@@ -246,19 +246,8 @@
	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
	--- a/devel/electron28/Makefile
	+++ b/devel/electron28/Makefile
	@@ -239,30 +239,12 @@
	.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
	--- 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
	--- 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
	--- 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
	--- a/devel/electron29/Makefile
	+++ b/devel/electron29/Makefile
	@@ -243,13 +243,6 @@
	.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
	--- 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
	--- 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
	--- 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
	--- a/devel/electron30/Makefile
	+++ b/devel/electron30/Makefile
	@@ -243,13 +243,6 @@
	.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
	--- 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
	--- 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
	--- 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
	--- a/devel/hyprlang/Makefile
	+++ b/devel/hyprlang/Makefile
	@@ -25,27 +25,4 @@
	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
	--- 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/ptlib/Makefile b/devel/ptlib/Makefile
	--- a/devel/ptlib/Makefile
	+++ b/devel/ptlib/Makefile
	@@ -119,13 +119,13 @@

	.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\|' \
	diff --git a/devel/py-threadpoolctl/Makefile b/devel/py-threadpoolctl/Makefile
	--- a/devel/py-threadpoolctl/Makefile
	+++ b/devel/py-threadpoolctl/Makefile
	@@ -18,10 +18,4 @@

	NO_ARCH= yes

	-.include <bsd.port.options.mk>
	-
	-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302509
	-IGNORE= does not run on FreeBSD 13.2 or earlier due to handling of dynamically loaded libc
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/devel/qjson/Makefile b/devel/qjson/Makefile
	--- a/devel/qjson/Makefile
	+++ b/devel/qjson/Makefile
	@@ -40,7 +40,7 @@

	# Clang 16 defaults to building in C++17, and throws an error when the
	# `register' keyword is used. Make clang just ignore the keyword instead.
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CXXFLAGS+= -Wno-register
	.endif

	diff --git a/devel/spirv-llvm-translator/Makefile b/devel/spirv-llvm-translator/Makefile
	--- a/devel/spirv-llvm-translator/Makefile
	+++ b/devel/spirv-llvm-translator/Makefile
	@@ -30,7 +30,7 @@
	GH_PROJECT= SPIRV-LLVM-Translator
	GH_TUPLE= ${${FLAVOR:S/llvm//}<13:?:KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-332-g1c6bb27:headers/projects/SPIRV-Headers}
	DISTINFO_FILE= ${.CURDIR}/distinfo.${FLAVOR}
	-CXXFLAGS+= ${${FLAVOR:S/llvm//} < 16 && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160:?-Wno-enum-constexpr-conversion:}
	+CXXFLAGS+= ${${FLAVOR:S/llvm//} < 16 && ${COMPILER_TYPE} == clang:?-Wno-enum-constexpr-conversion:}
	CMAKE_ON= BUILD_SHARED_LIBS LLVM_BUILD_TOOLS LLVM_TOOL_SPIRV_HEADERS_BUILD
	CMAKE_ARGS= -DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}"
	CMAKE_ARGS+= ${${FLAVOR:S/llvm//}==11:?-DBASE_LLVM_VERSION=11.0:}
	diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
	--- a/devel/tcl-trf/Makefile
	+++ b/devel/tcl-trf/Makefile
	@@ -48,7 +48,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == "clang"
	CFLAGS+= -Wno-deprecated-non-prototype
	.endif

	diff --git a/devel/tex-libtexluajit/Makefile b/devel/tex-libtexluajit/Makefile
	--- a/devel/tex-libtexluajit/Makefile
	+++ b/devel/tex-libtexluajit/Makefile
	@@ -29,11 +29,4 @@
	EXTRACT_FILES= build-aux libs/luajit
	WRKSRC= ${WRKDIR}/${DISTNAME}/libs/luajit

	-.include <bsd.port.pre.mk>
	-
	-.if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} < 140
	-BUILD_DEPENDS+= as:devel/binutils
	-CFLAGS+= -fno-integrated-as
	-.endif
	-
	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
	--- a/devel/ucommon/Makefile
	+++ b/devel/ucommon/Makefile
	@@ -19,7 +19,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	USE_CXXSTD= c++11
	.endif

	diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
	--- a/dns/getdns/Makefile
	+++ b/dns/getdns/Makefile
	@@ -52,7 +52,7 @@

	.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/editors/calligra/Makefile b/editors/calligra/Makefile
	--- a/editors/calligra/Makefile
	+++ b/editors/calligra/Makefile
	@@ -78,7 +78,7 @@
	.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\|g' \
	${WRKSRC}/filters/words/msword-odf/wv2/src/word97_helper.cpp
	@${REINPLACE_CMD} -e 's\|std::unary_function\|std::__unary_function\|' \
	diff --git a/editors/e93/Makefile b/editors/e93/Makefile
	--- a/editors/e93/Makefile
	+++ b/editors/e93/Makefile
	@@ -22,7 +22,7 @@

	.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/editors/imhex-current/Makefile b/editors/imhex-current/Makefile
	--- a/editors/imhex-current/Makefile
	+++ b/editors/imhex-current/Makefile
	@@ -100,8 +100,7 @@
	.include <bsd.port.pre.mk>

	# Before LLVM 17 import into the base system
	-.if (${OSVERSION} < 1302510 \
	- \|\| (${OSREL:R} == 14 && ${OSVERSION} < 1400504) \
	+.if ((${OSREL:R} == 14 && ${OSVERSION} < 1400504) \
	\|\| (${OSREL:R} == 15 && ${OSVERSION} < 1500006))
	IGNORE= requires libc++ of LLVM 17 on the base system
	.endif
	diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
	--- a/editors/libreoffice/Makefile
	+++ b/editors/libreoffice/Makefile
	@@ -374,15 +374,6 @@
	CONFIGURE_ARGS+= --enable-gtk3-kde5
	.endif

	-.if ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 130
	-LLVM_DEFAULT= 13
	-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
	-CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
	-CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
	-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	-LLD_UNSAFE= yes
	-.endif
	-
	.if ${CHOSEN_COMPILER_TYPE} == clang
	CXXFLAGS_WARN= -Woverloaded-virtual -Wno-c++11-narrowing \
	-Wno-unused-parameter -Wno-unused-local-typedefs
	diff --git a/editors/zile/Makefile b/editors/zile/Makefile
	--- a/editors/zile/Makefile
	+++ b/editors/zile/Makefile
	@@ -35,7 +35,7 @@

	.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/emulators/citra/Makefile b/emulators/citra/Makefile
	--- a/emulators/citra/Makefile
	+++ b/emulators/citra/Makefile
	@@ -100,7 +100,7 @@
	@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
	-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
	${WRKSRC}/src/common/scm_rev.cpp.in
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's\|std::unary_function\|std::__unary_function\|' \
	${WRKSRC}/externals/boost/boost/container_hash/hash.hpp
	.endif
	diff --git a/emulators/fs-uae/Makefile b/emulators/fs-uae/Makefile
	--- a/emulators/fs-uae/Makefile
	+++ b/emulators/fs-uae/Makefile
	@@ -39,7 +39,7 @@

	# 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/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
	--- a/emulators/rpcs3/Makefile
	+++ b/emulators/rpcs3/Makefile
	@@ -97,27 +97,4 @@
	-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
	${WRKSRC}/${PORTNAME}/git-version.cmake

	-# 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/__ranges/as_rvalue_view.h) \|\| 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/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
	--- a/emulators/virtualbox-ose-legacy/Makefile
	+++ b/emulators/virtualbox-ose-legacy/Makefile
	@@ -194,7 +194,7 @@
	.include <bsd.port.pre.mk>

	.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
	- (${OSVERSION} < 1302505 \|\| (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079) \|\| \
	+ ((${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079) \|\| \
	${OSVERSION} >= 1400091)
	# llvm 13, 14 and 16 included in FreeBSD fails to compile this legacy version of
	# virtualbox-ose, force llvm 15 on all versions of the FreeBSD except lastest 13
	diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
	--- a/emulators/yuzu/Makefile
	+++ b/emulators/yuzu/Makefile
	@@ -160,21 +160,4 @@
	@${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \
	${WRKSRC}/CMakeLists.txt

	-# XXX Drop after FreeBSD 13.2 EOL around 2024-07-01 (don't forget distinfo)
	-.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) \|\| make(makesum) \|\| make(fetch)
	-# 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++ to avoid ABI mismatch in Qt
	-#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
	-
	-pre-configure: bundled-libcxx
	-bundled-libcxx:
	- @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:MNinja} \
	- -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
	-
	.include <bsd.port.mk>
	diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
	--- a/emulators/yuzu/distinfo
	+++ b/emulators/yuzu/distinfo
	@@ -1,4 +1,4 @@
	-TIMESTAMP = 1709737254
	+TIMESTAMP = 1715283358
	SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac
	SIZE (yuzu-s20230424/compatibility_list.json) = 1801327
	SHA256 (yuzu-s20240301.tar.gz) = 1f343ccf09bf53513655be968749ec5aca72d33e1825b6c262979e405a06d2a1
	@@ -27,5 +27,3 @@
	SIZE (lat9nq-tzdb_to_nx-221202-15-g9792969_GH0.tar.gz) = 8413
	SHA256 (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96
	SIZE (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 1148935
	-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/games/alienarena/Makefile b/games/alienarena/Makefile
	--- a/games/alienarena/Makefile
	+++ b/games/alienarena/Makefile
	@@ -57,7 +57,7 @@

	.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/games/assaultcube/Makefile b/games/assaultcube/Makefile
	--- a/games/assaultcube/Makefile
	+++ b/games/assaultcube/Makefile
	@@ -59,7 +59,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == "clang"
	LDFLAGS_i386+=--no-check-dynamic-relocations
	.endif

	diff --git a/games/chessx/Makefile b/games/chessx/Makefile
	--- a/games/chessx/Makefile
	+++ b/games/chessx/Makefile
	@@ -34,7 +34,7 @@
	.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/database/polyglotdatabase.cpp
	.endif
	diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
	--- a/games/flightgear/Makefile
	+++ b/games/flightgear/Makefile
	@@ -59,7 +59,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == "clang"
	LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations
	.endif

	diff --git a/games/libretro-bluemsx/Makefile b/games/libretro-bluemsx/Makefile
	--- a/games/libretro-bluemsx/Makefile
	+++ b/games/libretro-bluemsx/Makefile
	@@ -19,12 +19,10 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-error=int-conversion
	-.if ${COMPILER_VERSION} >= 160
	CFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif
	-.endif

	do-install:
	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro
	diff --git a/games/libretro-pcsx_rearmed/Makefile b/games/libretro-pcsx_rearmed/Makefile
	--- a/games/libretro-pcsx_rearmed/Makefile
	+++ b/games/libretro-pcsx_rearmed/Makefile
	@@ -26,7 +26,7 @@
	.if ${ARCH:Marmv?}
	MAKE_ARGS+= DYNAREC=ari64 ARCH=arm
	.endif
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif

	diff --git a/games/megaglest/Makefile b/games/megaglest/Makefile
	--- a/games/megaglest/Makefile
	+++ b/games/megaglest/Makefile
	@@ -53,7 +53,7 @@

	# 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/games/openclonk/Makefile b/games/openclonk/Makefile
	--- a/games/openclonk/Makefile
	+++ b/games/openclonk/Makefile
	@@ -38,7 +38,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == "clang"
	LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations
	.endif

	diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
	--- a/games/trigger-rally/Makefile
	+++ b/games/trigger-rally/Makefile
	@@ -38,7 +38,7 @@

	# 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/graphics/nvidia-drm-510-kmod/Makefile b/graphics/nvidia-drm-510-kmod/Makefile
	--- a/graphics/nvidia-drm-510-kmod/Makefile
	+++ b/graphics/nvidia-drm-510-kmod/Makefile
	@@ -10,9 +10,4 @@
	.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
	.include <bsd.port.options.mk>

	-# handle incorrect get_user_pages definitions in 13.2
	-.if ${OSVERSION} < 1303000
	-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-conftest.sh
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/graphics/nvidia-drm-510-kmod/files/extra-patch-conftest.sh b/graphics/nvidia-drm-510-kmod/files/extra-patch-conftest.sh
	deleted file mode 100644
	--- a/graphics/nvidia-drm-510-kmod/files/extra-patch-conftest.sh
	+++ /dev/null
	@@ -1,83 +0,0 @@
	---- conftest.sh.orig 2024-03-14 18:29:50 UTC
	-+++ conftest.sh
	-@@ -2627,7 +2627,7 @@ compile_test() {
	- #include <linux/mm.h>
	- long get_user_pages(unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas) {
	- return 0;
	-@@ -2655,7 +2655,7 @@ compile_test() {
	- struct mm_struct *mm,
	- unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas) {
	- return 0;
	-@@ -2679,7 +2679,7 @@ compile_test() {
	- #include <linux/mm.h>
	- long get_user_pages(unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages) {
	- return 0;
	- }" > conftest$$.c
	-@@ -2852,7 +2852,7 @@ compile_test() {
	- struct mm_struct *mm,
	- unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas,
	- int *locked) {
	-@@ -2877,7 +2877,7 @@ compile_test() {
	- long get_user_pages_remote(struct mm_struct *mm,
	- unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas,
	- int *locked) {
	-@@ -2901,7 +2901,7 @@ compile_test() {
	- long get_user_pages_remote(struct mm_struct *mm,
	- unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- int *locked) {
	- return 0;
	-@@ -2969,7 +2969,7 @@ compile_test() {
	- #include <linux/mm.h>
	- long pin_user_pages(unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas) {
	- return 0;
	-@@ -3055,7 +3055,7 @@ compile_test() {
	- struct mm_struct *mm,
	- unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas,
	- int *locked) {
	-@@ -3077,7 +3077,7 @@ compile_test() {
	- long pin_user_pages_remote(struct mm_struct *mm,
	- unsigned long start,
	- unsigned long nr_pages,
	-- unsigned int gup_flags,
	-+ int gup_flags,
	- struct page **pages,
	- struct vm_area_struct **vmas,
	- int *locked) {
	diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
	--- a/java/eclipse/Makefile
	+++ b/java/eclipse/Makefile
	@@ -75,7 +75,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-deprecated-non-prototype
	.endif

	diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
	--- a/java/openjdk11/Makefile
	+++ b/java/openjdk11/Makefile
	@@ -152,13 +152,11 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	LLVM_VER= 12
	BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Marmv} \|\| ${ARCH:Mpowerpc64}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
	--- a/java/openjdk17/Makefile
	+++ b/java/openjdk17/Makefile
	@@ -139,18 +139,12 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
	-.if ${COMPILER_VERSION} >= 140
	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
	-.endif
	-.if ${COMPILER_VERSION} >= 150
	EXTRA_CFLAGS+= -Wno-deprecated-non-prototype
	-.endif
	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk18/Makefile b/java/openjdk18/Makefile
	--- a/java/openjdk18/Makefile
	+++ b/java/openjdk18/Makefile
	@@ -149,18 +149,12 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
	-.if ${COMPILER_VERSION} >= 140
	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
	-.endif
	-.if ${COMPILER_VERSION} >= 150
	EXTRA_CFLAGS+= -Wno-deprecated-non-prototype
	-.endif
	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk19/Makefile b/java/openjdk19/Makefile
	--- a/java/openjdk19/Makefile
	+++ b/java/openjdk19/Makefile
	@@ -139,18 +139,12 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
	-.if ${COMPILER_VERSION} >= 140
	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
	-.endif
	-.if ${COMPILER_VERSION} >= 160
	EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
	-.endif
	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk20/Makefile b/java/openjdk20/Makefile
	--- a/java/openjdk20/Makefile
	+++ b/java/openjdk20/Makefile
	@@ -138,18 +138,12 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
	-.if ${COMPILER_VERSION} >= 140
	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
	-.endif
	-.if ${COMPILER_VERSION} >= 160
	EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
	-.endif
	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile
	--- a/java/openjdk21/Makefile
	+++ b/java/openjdk21/Makefile
	@@ -138,18 +138,12 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
	-.if ${COMPILER_VERSION} >= 140
	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
	-.endif
	-.if ${COMPILER_VERSION} >= 160
	EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
	-.endif
	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile
	--- a/java/openjdk22/Makefile
	+++ b/java/openjdk22/Makefile
	@@ -138,18 +138,12 @@
	--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
	.else
	MAKE_ENV+= USE_CLANG=true
	-.if ${COMPILER_VERSION} >= 130
	EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
	-.if ${COMPILER_VERSION} >= 140
	EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
	-.endif
	-.if ${COMPILER_VERSION} >= 160
	EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
	-.endif
	CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
	CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
	.endif
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH:Mpowerpc64*}
	CONFIGURE_ARGS+= --disable-warnings-as-errors
	diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
	--- a/java/openjdk8/Makefile
	+++ b/java/openjdk8/Makefile
	@@ -204,7 +204,7 @@
	.if ${COMPILER_TYPE} == clang
	MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
	CONFIGURE_ENV+= LIBCXX="-lc++"
	-.if ${COMPILER_VERSION} >= 130 && ${ARCH} == aarch64
	+.if ${ARCH} == aarch64
	# PR258954: see <https://bugs.openjdk.org/browse/JDK-8247766>. Even though the
	# upstream fix has been applied to this version of the JDK, users still report
	# the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn"
	@@ -214,14 +214,12 @@
	CC= ${LOCALBASE}/bin/clang${LLVM_VER}
	CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
	.endif
	-.if ${COMPILER_VERSION} >= 160
	# clang 16 defaults to C++17, which no longer allows the 'register' keyword.
	# There is an upstream commit that removes all the individual 'register'
	# keywords, but it has not yet been backported to OpenJDK 8.
	# NOTE: passing this option via --with-extra-cflags does not work.
	CFLAGS+= -Dregister=
	.endif
	-.endif

	# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
	.if ${COMPILER_TYPE} == gcc
	diff --git a/lang/erlang-runtime21/Makefile b/lang/erlang-runtime21/Makefile
	--- a/lang/erlang-runtime21/Makefile
	+++ b/lang/erlang-runtime21/Makefile
	@@ -90,7 +90,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/erlang-runtime22/Makefile b/lang/erlang-runtime22/Makefile
	--- a/lang/erlang-runtime22/Makefile
	+++ b/lang/erlang-runtime22/Makefile
	@@ -89,7 +89,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/erlang-runtime23/Makefile b/lang/erlang-runtime23/Makefile
	--- a/lang/erlang-runtime23/Makefile
	+++ b/lang/erlang-runtime23/Makefile
	@@ -88,7 +88,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/erlang-runtime24/Makefile b/lang/erlang-runtime24/Makefile
	--- a/lang/erlang-runtime24/Makefile
	+++ b/lang/erlang-runtime24/Makefile
	@@ -87,7 +87,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/erlang-runtime25/Makefile b/lang/erlang-runtime25/Makefile
	--- a/lang/erlang-runtime25/Makefile
	+++ b/lang/erlang-runtime25/Makefile
	@@ -87,7 +87,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/erlang-runtime26/Makefile b/lang/erlang-runtime26/Makefile
	--- a/lang/erlang-runtime26/Makefile
	+++ b/lang/erlang-runtime26/Makefile
	@@ -85,7 +85,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
	--- a/lang/erlang/Makefile
	+++ b/lang/erlang/Makefile
	@@ -101,7 +101,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	# PR 258494
	CONFIGURE_ARGS+= --disable-pgo
	.endif
	diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
	--- a/lang/smlnj/Makefile
	+++ b/lang/smlnj/Makefile
	@@ -38,8 +38,7 @@

	.include <bsd.port.pre.mk>

	-# XXX see FreeBSD PR 247421
	-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100
	+.if ${COMPILER_TYPE} == "clang"
	RUNTIME_SO=
	PLIST_SUB+= RUNTIME_SO="@comment "
	.else
	@@ -47,7 +46,7 @@
	PLIST_SUB+= RUNTIME_SO=
	.endif

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif

	diff --git a/lang/spidermonkey102/Makefile b/lang/spidermonkey102/Makefile
	--- a/lang/spidermonkey102/Makefile
	+++ b/lang/spidermonkey102/Makefile
	@@ -57,21 +57,11 @@
	CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
	.endif

	-# Require newer Clang than what's in base system unless user opted out
	-# or the base system is new enough.
	.if ${CHOSEN_COMPILER_TYPE} == gcc
	CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
	LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
	BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	USE_GCC= yes
	-.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \
	- ${COMPILER_VERSION} < 80
	-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
	-CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
	-CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
	-CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
	- LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
	-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	.endif

	post-patch:
	diff --git a/lang/spidermonkey78/Makefile b/lang/spidermonkey78/Makefile
	--- a/lang/spidermonkey78/Makefile
	+++ b/lang/spidermonkey78/Makefile
	@@ -58,21 +58,11 @@
	CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
	.endif

	-# Require newer Clang than what's in base system unless user opted out
	-# or the base system is new enough.
	.if ${CHOSEN_COMPILER_TYPE} == gcc
	CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
	LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
	BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	USE_GCC= yes
	-.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \
	- ${COMPILER_VERSION} < 80
	-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
	-CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
	-CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
	-CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
	- LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
	-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	.endif

	post-patch:
	diff --git a/lang/spidermonkey91/Makefile b/lang/spidermonkey91/Makefile
	--- a/lang/spidermonkey91/Makefile
	+++ b/lang/spidermonkey91/Makefile
	@@ -66,21 +66,11 @@
	CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
	.endif

	-# Require newer Clang than what's in base system unless user opted out
	-# or the base system is new enough.
	.if ${CHOSEN_COMPILER_TYPE} == gcc
	CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
	LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
	BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	USE_GCC= yes
	-.elif ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) && \
	- ${COMPILER_VERSION} < 80
	-CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
	-CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}
	-CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
	-CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
	- LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
	-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
	.endif

	post-patch:
	diff --git a/lang/yap/Makefile b/lang/yap/Makefile
	--- a/lang/yap/Makefile
	+++ b/lang/yap/Makefile
	@@ -50,7 +50,7 @@

	.include <bsd.port.pre.mk>

	-.if ${OPSYS} == FreeBSD && ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${OPSYS} == FreeBSD && ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-incompatible-function-pointer-types
	CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
	.endif
	diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
	--- a/mail/milter-manager/Makefile
	+++ b/mail/milter-manager/Makefile
	@@ -39,7 +39,7 @@

	.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/mail/qpopper/Makefile b/mail/qpopper/Makefile
	--- a/mail/qpopper/Makefile
	+++ b/mail/qpopper/Makefile
	@@ -125,7 +125,7 @@
	# openssl-1.1.1 no longer has SSLv2 support
	.if ${OPSYS} == FreeBSD
	CFLAGS+= -DOPENSSL_NO_SSL2
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-incompatible-function-pointer-types
	.endif
	.endif
	diff --git a/math/py-fastcluster/Makefile b/math/py-fastcluster/Makefile
	--- a/math/py-fastcluster/Makefile
	+++ b/math/py-fastcluster/Makefile
	@@ -21,16 +21,7 @@
	USES= compiler python
	USE_PYTHON= autoplist concurrent pep517

	-.include <bsd.port.pre.mk>
	-
	-.if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} == 140
	-BUILD_DEPENDS+= clang15:devel/llvm15
	-CPP= clang-cpp15
	-CC= clang15
	-CXX= clang++15
	-.endif
	-
	post-install:
	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/math/scilab/Makefile b/math/scilab/Makefile
	--- a/math/scilab/Makefile
	+++ b/math/scilab/Makefile
	@@ -132,11 +132,8 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-error=int-conversion
	-.endif
	-
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	CFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif

	@@ -148,7 +145,7 @@
	post-patch:
	@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
	@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's\|std::filesystem\|std::__fs::filesystem\|g' \
	${WRKSRC}/modules/fileio/src/cpp/fullpath.cpp \
	${WRKSRC}/modules/fileio/sci_gateway/cpp/sci_get_absolute_file_path.cpp
	diff --git a/misc/ecflow/Makefile b/misc/ecflow/Makefile
	--- a/misc/ecflow/Makefile
	+++ b/misc/ecflow/Makefile
	@@ -33,7 +33,7 @@
	.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}/ACore/src/Str.cpp
	#.endif
	diff --git a/misc/rump/Makefile b/misc/rump/Makefile
	--- a/misc/rump/Makefile
	+++ b/misc/rump/Makefile
	@@ -33,7 +33,7 @@
	.endif

	CWARNFLAGS+= -Wno-address-of-packed-member
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
	+.if ${COMPILER_TYPE} == clang
	CWARNFLAGS+= -Wno-unused-but-set-variable
	.endif

	diff --git a/multimedia/bcmatroska2/Makefile b/multimedia/bcmatroska2/Makefile
	--- a/multimedia/bcmatroska2/Makefile
	+++ b/multimedia/bcmatroska2/Makefile
	@@ -22,7 +22,7 @@

	.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/multimedia/x264/Makefile b/multimedia/x264/Makefile
	--- a/multimedia/x264/Makefile
	+++ b/multimedia/x264/Makefile
	@@ -126,7 +126,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 && !${PORT_OPTIONS:MPGO}
	+.if ${COMPILER_TYPE} == clang && !${PORT_OPTIONS:MPGO}
	CFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif

	diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
	--- a/net-im/telegram-desktop/Makefile
	+++ b/net-im/telegram-desktop/Makefile
	@@ -110,7 +110,7 @@

	.include <bsd.port.options.mk>

	-.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091) \|\| ${OSVERSION} < 1302507)
	+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400091)
	#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt
	USES+= llvm:min=16,build
	USES:= ${USES:Ncompiler\:*} # XXX avoid warnings
	diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
	--- a/net-mgmt/nfdump/Makefile
	+++ b/net-mgmt/nfdump/Makefile
	@@ -68,7 +68,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CPPFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif

	diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
	--- a/net-p2p/amule/Makefile
	+++ b/net-p2p/amule/Makefile
	@@ -123,7 +123,7 @@
	# amule 2.3.3 does not work with C++17 which is the default since clang
	# 16. Change the defaults and allow the `register' keyword to be used without
	# triggering a compiler error to allow the build to work.
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CXXFLAGS+= -Wno-register
	.endif

	diff --git a/net/messagelib/Makefile b/net/messagelib/Makefile
	--- a/net/messagelib/Makefile
	+++ b/net/messagelib/Makefile
	@@ -43,7 +43,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CXXFLAGS+= -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
	.endif

	diff --git a/net/py-pyfixbuf/Makefile b/net/py-pyfixbuf/Makefile
	--- a/net/py-pyfixbuf/Makefile
	+++ b/net/py-pyfixbuf/Makefile
	@@ -21,7 +21,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CPPFLAGS+= -Wno-error=incompatible-function-pointer-types
	.endif

	diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
	--- a/print/cups-filters/Makefile
	+++ b/print/cups-filters/Makefile
	@@ -137,7 +137,7 @@
	.include <bsd.port.pre.mk>

	#.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 \|\| ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CFLAGS+= -Wno-error=dynamic-exception-spec
	.endif

	diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
	--- a/print/scribus-devel/Makefile
	+++ b/print/scribus-devel/Makefile
	@@ -62,7 +62,7 @@
	${WRKSRC}/scribus/imagedataloaders/scimgdataloader_pdf.cpp \
	${WRKSRC}/scribus/pdflib_core.h \
	${WRKSRC}/scribus/pdf_analyzer.h
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's\|std::unary_function\|std::__unary_function\|' \
	${WRKSRC}/scribus/desaxe/digester.cpp
	.endif
	diff --git a/science/py-hoomd-blue/Makefile b/science/py-hoomd-blue/Makefile
	--- a/science/py-hoomd-blue/Makefile
	+++ b/science/py-hoomd-blue/Makefile
	@@ -61,7 +61,7 @@
	.include <bsd.port.pre.mk>

	post-patch:
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's\|std::unary_function\|std::__unary_function\|' \
	${WRKSRC}/hoomd/ParticleData.cc
	.endif
	diff --git a/science/tfel/Makefile b/science/tfel/Makefile
	--- a/science/tfel/Makefile
	+++ b/science/tfel/Makefile
	@@ -44,7 +44,7 @@
	.include <bsd.port.pre.mk>

	post-patch:
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's\|std::unary_function\|std::__unary_function\|' \
	${WRKSRC}/include/NUMODIS/Math/Utilities.hxx \
	${WRKSRC}/include/TFEL/Math/General/Abs.hxx
	diff --git a/security/kleopatra/Makefile b/security/kleopatra/Makefile
	--- a/security/kleopatra/Makefile
	+++ b/security/kleopatra/Makefile
	@@ -28,7 +28,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CXXFLAGS+= -Wno-error=enum-constexpr-conversion
	.endif

	diff --git a/security/py-cryptography-legacy/Makefile b/security/py-cryptography-legacy/Makefile
	--- a/security/py-cryptography-legacy/Makefile
	+++ b/security/py-cryptography-legacy/Makefile
	@@ -40,14 +40,7 @@

	CPE_VENDOR= cryptography_project

	-.include <bsd.port.pre.mk>
	-
	-.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
	-post-patch:
	- @${REINPLACE_CMD} -e 's\|"-Wno-error=sign-conversion"\|\|' ${WRKSRC}/src/_cffi_src/build_openssl.py
	-.endif
	-
	post-install:
	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +

	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/sysutils/btop/Makefile b/sysutils/btop/Makefile
	--- a/sysutils/btop/Makefile
	+++ b/sysutils/btop/Makefile
	@@ -16,13 +16,4 @@

	MAKE_ARGS= STRIP=true ADDFLAGS="${CXXFLAGS} ${LDFLAGS}" VERBOSE=true

	-.include <bsd.port.options.mk>
	-
	-.if ${OSVERSION} < 1302507
	-USE_GCC= yes
	-.if ${ARCH} == i386 \|\| ${ARCH} == powerpc
	-LDFLAGS+= -latomic
	-.endif
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
	--- a/textproc/ibus/Makefile
	+++ b/textproc/ibus/Makefile
	@@ -98,10 +98,6 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
	-USE_GCC= yes
	-.endif
	-
	.if ${PORT_OPTIONS:MENGINE} \|\| ${PORT_OPTIONS:MGTK3} \|\| ${PORT_OPTIONS:MDCONF}
	PLIST_SUB+= COMPDIR=""
	.else
	diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
	--- a/www/nghttp2/Makefile
	+++ b/www/nghttp2/Makefile
	@@ -45,11 +45,6 @@

	.include <bsd.port.options.mk>

	-.if ${OSREL} == 13.2
	-USES+= llvm
	-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-compatibility-fix
	-.endif
	-
	.if ${OSREL} == 14.0
	EXTRA_PATCHES= ${PATCHDIR}/extra-patch-compatibility-fix
	.endif
	diff --git a/www/node18/Makefile b/www/node18/Makefile
	--- a/www/node18/Makefile
	+++ b/www/node18/Makefile
	@@ -66,7 +66,7 @@
	.include "Makefile.version"
	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 && (${ARCH} == aarch64 \|\| ${ARCH} == armv7 \|\| ${ARCH:Mpowerpc64*})
	+.if ${COMPILER_TYPE} == clang && (${ARCH} == aarch64 \|\| ${ARCH} == armv7 \|\| ${ARCH:Mpowerpc64*})
	CXXFLAGS+= -Wno-error=enum-constexpr-conversion
	.endif

	diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
	--- a/www/tclhttpd/Makefile
	+++ b/www/tclhttpd/Makefile
	@@ -46,7 +46,7 @@
	${FILESDIR}/pkgIndex.tcl >> \
	${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION}/pkgIndex.tcl

	-.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150
	+.if ${COMPILER_TYPE} == "clang"
	CFLAGS+= -std=c90 -Wno-deprecated-non-prototype
	.endif

	diff --git a/www/webkit2-gtk4/Makefile b/www/webkit2-gtk4/Makefile
	--- a/www/webkit2-gtk4/Makefile
	+++ b/www/webkit2-gtk4/Makefile
	@@ -97,7 +97,7 @@

	.include <bsd.port.pre.mk>

	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	CXXFLAGS+= -Wno-error=enum-constexpr-conversion
	.endif

	diff --git a/x11-fm/fsv2/Makefile b/x11-fm/fsv2/Makefile
	--- a/x11-fm/fsv2/Makefile
	+++ b/x11-fm/fsv2/Makefile
	@@ -36,7 +36,7 @@
	.include <bsd.port.pre.mk>

	post-patch:
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e 's\|auto_ptr\|unique_ptr\|' \
	${WRKSRC}/uilib/ColorCellRenderer.cpp
	.endif
	diff --git a/x11-toolkits/como/Makefile b/x11-toolkits/como/Makefile
	--- a/x11-toolkits/como/Makefile
	+++ b/x11-toolkits/como/Makefile
	@@ -65,27 +65,4 @@
	@${REINPLACE_CMD} -e '/mounts/s,/proc,${LINUXBASE}&,' \
	${WRKSRC}/${PORTNAME}/debug/perf/ftrace_impl.cpp

	-# 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/__ranges/as_rvalue_view.h) \|\| 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/x11-toolkits/como/distinfo b/x11-toolkits/como/distinfo
	--- a/x11-toolkits/como/distinfo
	+++ b/x11-toolkits/como/distinfo
	@@ -1,8 +1,6 @@
	TIMESTAMP = 1718820477
	SHA256 (winft-como-v0.2.0_GH0.tar.gz) = 24a43c5cb49760eb89f0414aa03f0007441fb2b8ef934e9ccb39af01646a27a9
	SIZE (winft-como-v0.2.0_GH0.tar.gz) = 4164563
	-SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
	-SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
	SHA256 (325e41b02b58.patch) = 930ee700ce7d27c9fe4dd6aa0fb4771034ae0bad072b11323f99e8fd524bebf2
	SIZE (325e41b02b58.patch) = 1462
	SHA256 (d250e3a81b91.patch) = 7ed00b787c17b9bcbc33e94162b9281dd935e541b4b88f8ed2ebdf715f7db828
	diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
	--- a/x11-wm/gamescope/Makefile
	+++ b/x11-wm/gamescope/Makefile
	@@ -77,29 +77,4 @@
	--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
	.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/__ranges/as_rvalue_view.h) \|\| make(makesum) \|\| make(fetch)
	-BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core
	-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
	-CXXFLAGS+= -D_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY
	-#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/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo
	--- a/x11-wm/gamescope/distinfo
	+++ b/x11-wm/gamescope/distinfo
	@@ -1,4 +1,4 @@
	-TIMESTAMP = 1700602830
	+TIMESTAMP = 1715283606
	SHA256 (ValveSoftware-gamescope-3.13.8_GH0.tar.gz) = 660120f41aa5fb62d4d5f467751470add3897d305dae480cf27d6d49ae2d4817
	SIZE (ValveSoftware-gamescope-3.13.8_GH0.tar.gz) = 476534
	SHA256 (nothings-stb-5736b15_GH0.tar.gz) = 8e18fa73396a3206129c55a3bc409401353991470245941d6ba7d8ce57df864f
	@@ -9,8 +9,6 @@
	SIZE (Joshua-Ashton-reshade-v4.4.2-2572-g9fdbea68_GH0.tar.gz) = 1543155
	SHA256 (Joshua-Ashton-vkroots-d5ef31a_GH0.tar.gz) = 477dd5f6f6d87e842de342d4accdecdb4742cb4c842f1b8fefd6534618614edf
	SIZE (Joshua-Ashton-vkroots-d5ef31a_GH0.tar.gz) = 333004
	-SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
	-SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
	SHA256 (a618ea074660.patch) = 346c8012489b58b1ee37e648694ca1d384de39ace61ae2771de5e166e0eec010
	SIZE (a618ea074660.patch) = 2591
	SHA256 (4a067fb4ebe2.patch) = fb12df8318e06a77ead4aa5752e32eec48efc70de43f069369a4c6a83a590152
	diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile
	--- a/x11-wm/hyprland/Makefile
	+++ b/x11-wm/hyprland/Makefile
	@@ -109,30 +109,6 @@
	)/" \
	${.CURDIR}/Makefile

	-# 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/__ranges/as_rvalue_view.h) \|\| 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
	-CXXFLAGS+= -D_LIBCPP_HAS_NO_VERBOSE_ABORT_IN_LIBRARY
	-#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>

	# XXX Work around !target(makesum)
	diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo
	--- a/x11-wm/hyprland/distinfo
	+++ b/x11-wm/hyprland/distinfo
	@@ -5,8 +5,6 @@
	SIZE (hyprwm-hyprland-protocols-v0.2-5-ge06482e_GH0.tar.gz) = 7424
	SHA256 (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 69aff959179ff6247b375b92e797221dbd8e078eabbf1366280b0532617e7fb8
	SIZE (canihavesomecoffee-udis86-1.7.2-186-g5336633_GH0.tar.gz) = 116938
	-SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
	-SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
	SHA256 (810c74372b0c.patch) = 95094a942b24ea776904e4a79f8f01d2e05cfe143e2ee613d83a76adab2d66ac
	SIZE (810c74372b0c.patch) = 1091
	SHA256 (df0c014ba0c9.patch) = c9510f881cc2c31e27e05be3d18e8cb843bca7b788be05edcafe7460495148b8
	diff --git a/x11-wm/subtle/Makefile b/x11-wm/subtle/Makefile
	--- a/x11-wm/subtle/Makefile
	+++ b/x11-wm/subtle/Makefile
	@@ -28,7 +28,7 @@
	${WRKSRC}/data/sur/server.rb
	@${REINPLACE_CMD} -e 's,/etc/xdg,${LOCALBASE}&,' \
	${WRKSRC}/src/subtle/ruby.c
	-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
	+.if ${COMPILER_TYPE} == clang
	@${REINPLACE_CMD} -e '/cflags/s/-Wall/-Wall -Wno-error=incompatible-function-pointer-types /g' \
	${WRKSRC}/Rakefile
	.endif
	diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile
	--- a/x11-wm/theseus-ship/Makefile
	+++ b/x11-wm/theseus-ship/Makefile
	@@ -42,27 +42,4 @@
	BREEZE_USE= KDE=breeze
	BREEZE_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Breeze

	-# 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/__ranges/as_rvalue_view.h) \|\| 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/x11-wm/theseus-ship/distinfo b/x11-wm/theseus-ship/distinfo
	--- a/x11-wm/theseus-ship/distinfo
	+++ b/x11-wm/theseus-ship/distinfo
	@@ -1,5 +1,3 @@
	TIMESTAMP = 1718822874
	SHA256 (winft-theseus-ship-v6.1.0_GH0.tar.gz) = dd3bb31644636e4d3e855df36b4467b20312184ac2b5462594c211107f36824c
	SIZE (winft-theseus-ship-v6.1.0_GH0.tar.gz) = 2693171
	-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/x11/hyprcursor/Makefile b/x11/hyprcursor/Makefile
	--- a/x11/hyprcursor/Makefile
	+++ b/x11/hyprcursor/Makefile
	@@ -31,27 +31,4 @@
	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
	${WRKSRC}/lib${PORTNAME}/${PORTNAME}.cpp

	-# 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/x11/hyprcursor/distinfo b/x11/hyprcursor/distinfo
	--- a/x11/hyprcursor/distinfo
	+++ b/x11/hyprcursor/distinfo
	@@ -1,5 +1,3 @@
	TIMESTAMP = 1716576411
	SHA256 (hyprwm-hyprcursor-v0.1.9_GH0.tar.gz) = 313cd91436af343918e6dec4a666d4bf3666149ac3cac6f36c683b70304eada4
	SIZE (hyprwm-hyprcursor-v0.1.9_GH0.tar.gz) = 26111
	-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/x11/hyprlock/Makefile b/x11/hyprlock/Makefile
	--- a/x11/hyprlock/Makefile
	+++ b/x11/hyprlock/Makefile
	@@ -41,27 +41,4 @@
	USES+= localbase:ldflags
	.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/x11/hyprlock/distinfo b/x11/hyprlock/distinfo
	--- a/x11/hyprlock/distinfo
	+++ b/x11/hyprlock/distinfo
	@@ -1,8 +1,6 @@
	-TIMESTAMP = 1712587141
	+TIMESTAMP = 1715283979
	SHA256 (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 5e84ac3223ea340bb3d39c22db4edefbb8364da8c3b6b3d0da1dfa45d8cc945f
	SIZE (hyprwm-hyprlock-v0.3.0_GH0.tar.gz) = 61599
	-SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
	-SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803
	SHA256 (d9a6229434fb.patch) = c50bfa1b1d69d95a6fe0ae9ab9c023ee220f8b9b535a54f1271782e33b198941
	SIZE (d9a6229434fb.patch) = 852
	SHA256 (8658386f212f.patch) = 36d0de05ba6897dc77ad2ad86ad7ffd0aae6d665dc588b931e0f86243818906d
	diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
	--- a/x11/xdg-desktop-portal-hyprland/Makefile
	+++ b/x11/xdg-desktop-portal-hyprland/Makefile
	@@ -38,27 +38,4 @@
	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/__ranges/as_rvalue_view.h) \|\| 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/x11/xdg-desktop-portal-hyprland/distinfo b/x11/xdg-desktop-portal-hyprland/distinfo
	--- a/x11/xdg-desktop-portal-hyprland/distinfo
	+++ b/x11/xdg-desktop-portal-hyprland/distinfo
	@@ -3,5 +3,3 @@
	SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.3.2_GH0.tar.gz) = 48659
	SHA256 (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 106cb189d0fbe4ec0ee11a12a17238172f4c4cd1b2b26db904df144e5c7a05f0
	SIZE (hyprwm-hyprland-protocols-v0.2_GH0.tar.gz) = 6342
	-SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
	-SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803

File Metadata

Mime Type: text/plain
Expires: Sun, Feb 23, 7:47 PM (13 h, 34 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 16804421
Default Alt Text: D45141.id140191.diff (85 KB)

D45141.id140191.diffNo OneTemporaryActions

D45141.id140191.diffView Options

File Metadata

Event Timeline

D45141.id140191.diff
No OneTemporary
Actions

D45141.id140191.diff
View Options