sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: drop support for FreeBSD 13.2 which reached EOL today

Browse source 
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
This commit is contained in:
Rene Ladan 2024-06-15 20:44:12 +02:00
parent 68120d81a4
commit 19d68720f1
129 changed files with 76 additions and 1011 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mk/bsd.port.mk
View file

@ -42,7 +42,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# OSREL - The release version of the operating system as a text # OSREL - The release version of the operating system as a text
# string (e.g., "12.4"). # string (e.g., "12.4").
# OSVERSION - The operating system version as a comparable integer; # 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 # 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 # 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 . endif
_EXPORTED_VARS+= OSVERSION _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\ _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. are guaranteed to build on this system. Please upgrade to a supported release.
. if defined(ALLOW_UNSUPPORTED_SYSTEM) . if defined(ALLOW_UNSUPPORTED_SYSTEM)

7
audio/audacity/Makefile
View file

@ -143,13 +143,6 @@ CMAKE_ARGS+= -DHAVE_MMX:BOOL=OFF \
-DHAVE_SSE2:BOOL=OFF -DHAVE_SSE2:BOOL=OFF
.endif .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: post-install:
@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt @${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
#delete empty directories: https://github.com/audacity/audacity/issues/808 #delete empty directories: https://github.com/audacity/audacity/issues/808

23
audio/audacity/files/extra-libraries_lib-utility_TypeList.cpp
View file

@ -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>);

39
audio/audacity/files/extra-libraries_lib-utility_TypeList.h
View file

@ -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;

20
audio/audacity/files/extra-libraries_lib-utility_TypeSwitch.h
View file

@ -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&&...>
> {

2
audio/denemo/Makefile
View file

@ -68,7 +68,7 @@ LIB_DEPENDS+= libatrilview.so:graphics/atril
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
audio/ncmpc/Makefile
View file

@ -49,7 +49,7 @@ PORTDOCS= *
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CPPFLAGS+= -Wno-error=enum-constexpr-conversion CPPFLAGS+= -Wno-error=enum-constexpr-conversion
.endif .endif

2
audio/ocp/Makefile
View file

@ -95,7 +95,7 @@ TIMIDITY_CFG= ${LOCALBASE}/share/timidity/timidity.cfg
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
audio/openal-soft/Makefile
View file

@ -63,7 +63,7 @@ UTILS_CMAKE_BOOL= ALSOFT_UTILS
# The following is actually meant for lld 15.0 and later, but the ports # The following is actually meant for lld 15.0 and later, but the ports
# framework does not support LINKER_TYPE and LINKER_VERSION yet. # 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 # Turn off checking of dynamic relocations, to avoid lld diagnostics about
# possibly incorrect addend values. # possibly incorrect addend values.
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations

6
biology/py-macs3/Makefile
View file

@ -35,12 +35,6 @@ GH_ACCOUNT= macs3-project
GH_PROJECT= MACS GH_PROJECT= MACS
SHEBANG_FILES= test/cmdlinetest* test/prockreport test/*.py test/pyprofile* 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: post-stage:
${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/MACS3/*/*.so ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/MACS3/*/*.so

2
chinese/libime/Makefile
View file

@ -38,7 +38,7 @@ TABLE_DICT_TAR= table-20240108.tar.gz
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
post-patch: post-patch:
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \ @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
${WRKSRC}/src/libime/core/kenlm/lm/trie_sort.hh \ ${WRKSRC}/src/libime/core/kenlm/lm/trie_sort.hh \
${WRKSRC}/src/libime/core/kenlm/util/joint_sort.hh \ ${WRKSRC}/src/libime/core/kenlm/util/joint_sort.hh \

7
databases/arrow/Makefile
View file

@ -179,13 +179,6 @@ TESTING_DESC= Arrow testing libraries
TESTING_CMAKE_BOOL= ARROW_TESTING TESTING_CMAKE_BOOL= ARROW_TESTING
TESTING_LIB_DEPENDS= libgtest.so:devel/googletest 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 # form OPTIONS_DEFAULT
.for opt in ${OPTIONS_GROUP_COMPONENTS} .for opt in ${OPTIONS_GROUP_COMPONENTS}
. if "${${opt}_BROKEN}" == "" . if "${${opt}_BROKEN}" == ""

2
databases/xtrabackup80/Makefile
View file

@ -104,7 +104,7 @@ post-patch:
.for d in storage/innobase/xtrabackup/src sql/protobuf .for d in storage/innobase/xtrabackup/src sql/protobuf
${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
.endfor .endfor
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp ${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
.endif .endif

2
databases/xtrabackup81/Makefile
View file

@ -68,7 +68,7 @@ post-patch:
.for d in storage/innobase/xtrabackup/src sql/protobuf .for d in storage/innobase/xtrabackup/src sql/protobuf
${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
.endfor .endfor
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp ${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
.endif .endif

2
deskutils/kdepim-runtime/Makefile
View file

@ -44,7 +44,7 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-error=enum-constexpr-conversion CXXFLAGS+= -Wno-error=enum-constexpr-conversion
.endif .endif

19
deskutils/plasma6-xdg-desktop-portal-kde/files/patch-src_session.h
View file

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

2
devel/cjose/Makefile
View file

@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-jansson=${PREFIX} --with-openssl=${OPENSSLBASE}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=strict-prototypes CFLAGS+= -Wno-error=strict-prototypes
.endif .endif

2
devel/corrade/Makefile
View file

@ -30,7 +30,7 @@ TEST_CMAKE_BOOL= CORRADE_BUILD_TESTS
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
post-patch: post-patch:
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|#include <__tuple>|#include <tuple>|g' \ @${REINPLACE_CMD} -e 's|#include <__tuple>|#include <tuple>|g' \
${WRKSRC}/src/Corrade/Utility/StlForwardArray.h \ ${WRKSRC}/src/Corrade/Utility/StlForwardArray.h \
${WRKSRC}/src/Corrade/Utility/StlForwardTuple.h ${WRKSRC}/src/Corrade/Utility/StlForwardTuple.h

11
devel/electron27/Makefile
View file

@ -246,19 +246,8 @@ YARN_TIMESTAMP= 61171200
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif .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 \ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm nm=/usr/bin/llvm-nm
.endif
CFLAGS+= -Wno-error=implicit-function-declaration CFLAGS+= -Wno-error=implicit-function-declaration
.if ${ARCH} == "aarch64" .if ${ARCH} == "aarch64"

18
devel/electron28/Makefile
View file

@ -239,30 +239,12 @@ YARN_TIMESTAMP= 61171200
.include "Makefile.version" .include "Makefile.version"
.include <bsd.port.pre.mk> .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) .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif .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 \ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm nm=/usr/bin/llvm-nm
.endif
CFLAGS+= -Wno-error=implicit-function-declaration CFLAGS+= -Wno-error=implicit-function-declaration
.if ${ARCH} == "aarch64" .if ${ARCH} == "aarch64"

64
devel/electron28/files/extra-patch-electron_shell_browser_electron__browser__context.h
View file

@ -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 =

11
devel/electron28/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h
View file

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

10
devel/electron28/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h
View file

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

7
devel/electron29/Makefile
View file

@ -243,13 +243,6 @@ YARN_TIMESTAMP= 61171200
.include "Makefile.version" .include "Makefile.version"
.include <bsd.port.pre.mk> .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) .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif .endif

64
devel/electron29/files/extra-patch-electron_shell_browser_electron__browser__context.h
View file

@ -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 =

11
devel/electron29/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h
View file

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

10
devel/electron29/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h
View file

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

7
devel/electron30/Makefile
View file

@ -243,13 +243,6 @@ YARN_TIMESTAMP= 61171200
.include "Makefile.version" .include "Makefile.version"
.include <bsd.port.pre.mk> .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) .if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
.endif .endif

64
devel/electron30/files/extra-patch-electron_shell_browser_electron__browser__context.h
View file

@ -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 =

11
devel/electron30/files/extra-patch-electron_shell_browser_ui_gtk_menu__gtk.h
View file

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

10
devel/electron30/files/extra-patch-electron_shell_browser_ui_status__icon__gtk.h
View file

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

23
devel/hyprlang/Makefile
View file

@ -25,27 +25,4 @@ PLIST_FILES= include/${PORTNAME}.hpp \
CXXFLAGS+= -fexperimental-library CXXFLAGS+= -fexperimental-library
.endif .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> .include <bsd.port.mk>

2
devel/hyprlang/distinfo
View file

@ -1,5 +1,3 @@
TIMESTAMP = 1716458409 TIMESTAMP = 1716458409
SHA256 (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 66a1f87634c8ecdeb67d7ccc499a3fc1c19b064a098b103be042751e7430b5cc SHA256 (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 66a1f87634c8ecdeb67d7ccc499a3fc1c19b064a098b103be042751e7430b5cc
SIZE (hyprwm-hyprlang-v0.5.2_GH0.tar.gz) = 56383 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

23
devel/hyprutils/Makefile
View file

@ -22,27 +22,4 @@ PLIST_SUB= VERSION=${DISTVERSION:C/-.*//}
CXXFLAGS+= -fexperimental-library CXXFLAGS+= -fexperimental-library
.endif .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> .include <bsd.port.mk>

2
devel/hyprutils/distinfo
View file

@ -1,5 +1,3 @@
TIMESTAMP = 1719316102 TIMESTAMP = 1719316102
SHA256 (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 60cce1b4160a4e5383fa0ff665c6bf49b54cfb387dc8a52229abfc367000b0be SHA256 (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 60cce1b4160a4e5383fa0ff665c6bf49b54cfb387dc8a52229abfc367000b0be
SIZE (hyprwm-hyprutils-v0.1.5_GH0.tar.gz) = 17974 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

4
devel/ptlib/Makefile
View file

@ -119,13 +119,13 @@ CONFIGURE_ARGS+= --disable-dc
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CPPFLAGS+= -Dregister= -Wno-error=dynamic-exception-spec CPPFLAGS+= -Dregister= -Wno-error=dynamic-exception-spec
.endif .endif
post-patch: post-patch:
@${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx @${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|' \ @${REINPLACE_CMD} -e 's|auto_ptr|unique_ptr|' \
${WRKSRC}/include/ptlib/psharedptr.h ${WRKSRC}/include/ptlib/psharedptr.h
@${REINPLACE_CMD} -e 's|public binary_function|public __binary_function|' \ @${REINPLACE_CMD} -e 's|public binary_function|public __binary_function|' \

6
devel/py-threadpoolctl/Makefile
View file

@ -18,10 +18,4 @@ USE_PYTHON= autoplist concurrent pep517 pytest
NO_ARCH= yes 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> .include <bsd.port.mk>

2
devel/qjson/Makefile
View file

@ -40,7 +40,7 @@ post-install-DOXYGEN-on:
# Clang 16 defaults to building in C++17, and throws an error when the # 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. # `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 CXXFLAGS+= -Wno-register
.endif .endif

2
devel/spirv-llvm-translator/Makefile
View file

@ -30,7 +30,7 @@ GH_ACCOUNT= KhronosGroup
GH_PROJECT= SPIRV-LLVM-Translator 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} 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} 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_ON= BUILD_SHARED_LIBS LLVM_BUILD_TOOLS LLVM_TOOL_SPIRV_HEADERS_BUILD
CMAKE_ARGS= -DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}" CMAKE_ARGS= -DLLVM_DIR:PATH="${LOCALBASE}/${FLAVOR}"
CMAKE_ARGS+= ${${FLAVOR:S/llvm//}==11:?-DBASE_LLVM_VERSION=11.0:} CMAKE_ARGS+= ${${FLAVOR:S/llvm//}==11:?-DBASE_LLVM_VERSION=11.0:}

2
devel/tcl-trf/Makefile
View file

@ -48,7 +48,7 @@ PLIST_SUB+= TCL_DVER=${TCL_VER:C/\.//} VER=${PORTVERSION}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == "clang"
CFLAGS+= -Wno-deprecated-non-prototype CFLAGS+= -Wno-deprecated-non-prototype
.endif .endif

9
devel/tex-libtexluajit/Makefile
View file

@ -29,11 +29,4 @@ EXTRACT_AFTER_ARGS= ${EXTRACT_FILES:S,^,${DISTNAME}/,}
EXTRACT_FILES= build-aux libs/luajit EXTRACT_FILES= build-aux libs/luajit
WRKSRC= ${WRKDIR}/${DISTNAME}/libs/luajit WRKSRC= ${WRKDIR}/${DISTNAME}/libs/luajit
.include <bsd.port.pre.mk> .include <bsd.port.mk>
.if ${ARCH:Mpowerpc*} && ${COMPILER_VERSION} < 140
BUILD_DEPENDS+= as:devel/binutils
CFLAGS+= -fno-integrated-as
.endif
.include <bsd.port.post.mk>

2
devel/ucommon/Makefile
View file

@ -19,7 +19,7 @@ TEST_TARGET= test
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
USE_CXXSTD= c++11 USE_CXXSTD= c++11
.endif .endif

2
dns/getdns/Makefile
View file

@ -52,7 +52,7 @@ STUBBY_VARS= USE_RC_SUBR="stubby"
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
editors/calligra/Makefile
View file

@ -78,7 +78,7 @@ PLIST_SUB+= SHLIB_VER=17.0.0
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
post-patch: post-patch:
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|g' \ @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|g' \
${WRKSRC}/filters/words/msword-odf/wv2/src/word97_helper.cpp ${WRKSRC}/filters/words/msword-odf/wv2/src/word97_helper.cpp
@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \

2
editors/e93/Makefile
View file

@ -22,7 +22,7 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

3
editors/imhex-current/Makefile
View file

@ -106,8 +106,7 @@ NLS_USES= gettext
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
# Before LLVM 17 import into the base system # Before LLVM 17 import into the base system
.if (${OSVERSION} < 1302510 \ .if ((${OSREL:R} == 14 && ${OSVERSION} < 1400504) \
|| (${OSREL:R} == 14 && ${OSVERSION} < 1400504) \
|| (${OSREL:R} == 15 && ${OSVERSION} < 1500006)) || (${OSREL:R} == 15 && ${OSVERSION} < 1500006))
IGNORE= requires libc++ of LLVM 17 on the base system IGNORE= requires libc++ of LLVM 17 on the base system
.endif .endif

9
editors/libreoffice/Makefile
View file

@ -374,15 +374,6 @@ CONFIGURE_ARGS+= --disable-skia
CONFIGURE_ARGS+= --enable-gtk3-kde5 CONFIGURE_ARGS+= --enable-gtk3-kde5
.endif .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 .if ${CHOSEN_COMPILER_TYPE} == clang
CXXFLAGS_WARN= -Woverloaded-virtual -Wno-c++11-narrowing \ CXXFLAGS_WARN= -Woverloaded-virtual -Wno-c++11-narrowing \
-Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unused-parameter -Wno-unused-local-typedefs

2
editors/zile/Makefile
View file

@ -35,7 +35,7 @@ PLIST_FILES= bin/${PORTNAME} \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
emulators/citra/Makefile
View file

@ -100,7 +100,7 @@ post-patch:
@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \ @${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
-e 's/@GIT_DESC@/${GH_TAGNAME}/' \ -e 's/@GIT_DESC@/${GH_TAGNAME}/' \
${WRKSRC}/src/common/scm_rev.cpp.in ${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|' \ @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
${WRKSRC}/externals/boost/boost/container_hash/hash.hpp ${WRKSRC}/externals/boost/boost/container_hash/hash.hpp
.endif .endif

2
emulators/fs-uae/Makefile
View file

@ -39,7 +39,7 @@ JIT_CONFIGURE_ENABLE= jit
# The following is actually meant for lld 15.0 and later, but the ports # The following is actually meant for lld 15.0 and later, but the ports
# framework does not support LINKER_TYPE and LINKER_VERSION yet. # 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 # Turn off checking of dynamic relocations, to avoid lld diagnostics about
# possibly incorrect addend values. # possibly incorrect addend values.
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations

23
emulators/rpcs3/Makefile
View file

@ -97,27 +97,4 @@ post-patch:
-e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \
${WRKSRC}/${PORTNAME}/git-version.cmake ${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> .include <bsd.port.mk>

2
emulators/virtualbox-ose-legacy/Makefile
View file

@ -191,7 +191,7 @@ KMK_FLAGS+= -j${MAKE_JOBS_NUMBER}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \ .if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && \
(${OSVERSION} < 1302505 || (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079)) ${OSVERSION} >= 1400000 && ${OSVERSION} < 1400079
# llvm before 15 included in old versions of the FreeBSD 13 and 14 fails to compile # llvm before 15 included in old versions of the FreeBSD 13 and 14 fails to compile
# this legacy version of virtualbox-ose, force llvm 15 on those versions of the # this legacy version of virtualbox-ose, force llvm 15 on those versions of the
# FreeBSD: PR#265539, 279257. # FreeBSD: PR#265539, 279257.

17
emulators/yuzu/Makefile
View file

@ -160,21 +160,4 @@ post-patch-VAAPI-off:
@${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \ @${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \
${WRKSRC}/CMakeLists.txt ${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:M*Ninja*} \
-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> .include <bsd.port.mk>

4
emulators/yuzu/distinfo
View file

@ -1,4 +1,4 @@
TIMESTAMP = 1709737254 TIMESTAMP = 1715283358
SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac
SIZE (yuzu-s20230424/compatibility_list.json) = 1801327 SIZE (yuzu-s20230424/compatibility_list.json) = 1801327
SHA256 (yuzu-s20240301.tar.gz) = 1f343ccf09bf53513655be968749ec5aca72d33e1825b6c262979e405a06d2a1 SHA256 (yuzu-s20240301.tar.gz) = 1f343ccf09bf53513655be968749ec5aca72d33e1825b6c262979e405a06d2a1
@ -27,5 +27,3 @@ SHA256 (lat9nq-tzdb_to_nx-221202-15-g9792969_GH0.tar.gz) = b661401eda279d0a3d43c
SIZE (lat9nq-tzdb_to_nx-221202-15-g9792969_GH0.tar.gz) = 8413 SIZE (lat9nq-tzdb_to_nx-221202-15-g9792969_GH0.tar.gz) = 8413
SHA256 (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96 SHA256 (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96
SIZE (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 1148935 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

2
games/alienarena/Makefile
View file

@ -57,7 +57,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME}
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
games/assaultcube/Makefile
View file

@ -59,7 +59,7 @@ DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == "clang"
LDFLAGS_i386+=--no-check-dynamic-relocations LDFLAGS_i386+=--no-check-dynamic-relocations
.endif .endif

2
games/chessx/Makefile
View file

@ -34,7 +34,7 @@ STOCKFISH_RUN_DEPENDS= stockfish:games/stockfish
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
post-patch: post-patch:
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \ @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
${WRKSRC}/src/database/polyglotdatabase.cpp ${WRKSRC}/src/database/polyglotdatabase.cpp
.endif .endif

2
games/flightgear/Makefile
View file

@ -59,7 +59,7 @@ post-patch:
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == "clang"
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations
.endif .endif

4
games/libretro-bluemsx/Makefile
View file

@ -19,12 +19,10 @@ PLIST_FILES= lib/libretro/bluemsx_libretro.so
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=int-conversion CFLAGS+= -Wno-error=int-conversion
.if ${COMPILER_VERSION} >= 160
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif
.endif
do-install: do-install:
${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro

2
games/libretro-pcsx_rearmed/Makefile
View file

@ -26,7 +26,7 @@ MAKEFILE= Makefile.libretro
.if ${ARCH:Marmv?} .if ${ARCH:Marmv?}
MAKE_ARGS+= DYNAREC=ari64 ARCH=arm MAKE_ARGS+= DYNAREC=ari64 ARCH=arm
.endif .endif
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
games/megaglest/Makefile
View file

@ -53,7 +53,7 @@ VIEWER_USE= WX=3.0
# The following is actually meant for lld 15.0 and later, but the ports # The following is actually meant for lld 15.0 and later, but the ports
# framework does not support LINKER_TYPE and LINKER_VERSION yet. # 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 # Turn off checking of dynamic relocations, to avoid lld diagnostics about
# possibly incorrect addend values. # possibly incorrect addend values.
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations

2
games/openclonk/Makefile
View file

@ -38,7 +38,7 @@ LDFLAGS_i386= -Wl,-znotext
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == "clang"
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations
.endif .endif

2
games/trigger-rally/Makefile
View file

@ -38,7 +38,7 @@ OPTIONS_DEFINE= DOCS
# The following is actually meant for lld 15.0 and later, but the ports # The following is actually meant for lld 15.0 and later, but the ports
# framework does not support LINKER_TYPE and LINKER_VERSION yet. # 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 # Turn off checking of dynamic relocations, to avoid lld diagnostics about
# possibly incorrect addend values. # possibly incorrect addend values.
LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations

5
graphics/nvidia-drm-510-kmod/Makefile
View file

@ -10,9 +10,4 @@ CONFLICTS_INSTALL= nvidia-drm-515-kmod nvidia-drm-61-kmod
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
.include <bsd.port.options.mk> .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> .include <bsd.port.mk>

83
graphics/nvidia-drm-510-kmod/files/extra-patch-conftest.sh
View file

@ -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) {

23
graphics/wrapland/Makefile
View file

@ -26,27 +26,4 @@ GH_ACCOUNT= winft
LDFLAGS+= -Wl,--as-needed # GL, xkbcommon LDFLAGS+= -Wl,--as-needed # GL, xkbcommon
PLIST_SUB= VERSION=${PORTVERSION} PLIST_SUB= VERSION=${PORTVERSION}
# 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> .include <bsd.port.mk>

2
graphics/wrapland/distinfo
View file

@ -1,5 +1,3 @@
TIMESTAMP = 1718810495 TIMESTAMP = 1718810495
SHA256 (winft-wrapland-v0.601.0_GH0.tar.gz) = 46b39f09c3fb8f3effb21955d75f26ea6f79d50f516f7116453c3bc4a3a5eb8b SHA256 (winft-wrapland-v0.601.0_GH0.tar.gz) = 46b39f09c3fb8f3effb21955d75f26ea6f79d50f516f7116453c3bc4a3a5eb8b
SIZE (winft-wrapland-v0.601.0_GH0.tar.gz) = 562166 SIZE (winft-wrapland-v0.601.0_GH0.tar.gz) = 562166
SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271
SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803

2
java/eclipse/Makefile
View file

@ -75,7 +75,7 @@ ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.rep
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-deprecated-non-prototype CFLAGS+= -Wno-deprecated-non-prototype
.endif .endif

2
java/openjdk11/Makefile
View file

@ -152,13 +152,11 @@ CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
.else .else
MAKE_ENV+= USE_CLANG=true MAKE_ENV+= USE_CLANG=true
.if ${COMPILER_VERSION} >= 130
LLVM_VER= 12 LLVM_VER= 12
BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER} BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
CC= ${LOCALBASE}/bin/clang${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER}
CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
.endif .endif
.endif
.if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*} .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH:Mpowerpc64*}
CONFIGURE_ARGS+= --disable-warnings-as-errors CONFIGURE_ARGS+= --disable-warnings-as-errors

6
java/openjdk17/Makefile
View file

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

6
java/openjdk18/Makefile
View file

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

6
java/openjdk19/Makefile
View file

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

6
java/openjdk20/Makefile
View file

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

6
java/openjdk21/Makefile
View file

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

6
java/openjdk22/Makefile
View file

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

4
java/openjdk8/Makefile
View file

@ -204,7 +204,7 @@ LIB_DEPENDS+= libffi.so:devel/libffi
.if ${COMPILER_TYPE} == clang .if ${COMPILER_TYPE} == clang
MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true MAKE_ENV+= COMPILER_WARNINGS_FATAL=false USE_CLANG=true
CONFIGURE_ENV+= LIBCXX="-lc++" 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 # 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 # 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" # the assertion "guarantee(val < (1U << nbits)) failed: Field too big for insn"
@ -214,14 +214,12 @@ BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
CC= ${LOCALBASE}/bin/clang${LLVM_VER} CC= ${LOCALBASE}/bin/clang${LLVM_VER}
CXX= ${LOCALBASE}/bin/clang++${LLVM_VER} CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
.endif .endif
.if ${COMPILER_VERSION} >= 160
# clang 16 defaults to C++17, which no longer allows the 'register' keyword. # clang 16 defaults to C++17, which no longer allows the 'register' keyword.
# There is an upstream commit that removes all the individual 'register' # There is an upstream commit that removes all the individual 'register'
# keywords, but it has not yet been backported to OpenJDK 8. # keywords, but it has not yet been backported to OpenJDK 8.
# NOTE: passing this option via --with-extra-cflags does not work. # NOTE: passing this option via --with-extra-cflags does not work.
CFLAGS+= -Dregister= CFLAGS+= -Dregister=
.endif .endif
.endif
# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html # GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html
.if ${COMPILER_TYPE} == gcc .if ${COMPILER_TYPE} == gcc

2
lang/erlang-runtime21/Makefile
View file

@ -90,7 +90,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

2
lang/erlang-runtime22/Makefile
View file

@ -89,7 +89,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

2
lang/erlang-runtime23/Makefile
View file

@ -88,7 +88,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

2
lang/erlang-runtime24/Makefile
View file

@ -87,7 +87,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

2
lang/erlang-runtime25/Makefile
View file

@ -87,7 +87,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

2
lang/erlang-runtime26/Makefile
View file

@ -84,7 +84,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

2
lang/erlang/Makefile
View file

@ -101,7 +101,7 @@ WX_VARS= USE_GL="gl glu" \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
# PR 258494 # PR 258494
CONFIGURE_ARGS+= --disable-pgo CONFIGURE_ARGS+= --disable-pgo
.endif .endif

5
lang/smlnj/Makefile
View file

@ -38,8 +38,7 @@ RECOMPILE_IMPLIES= EVERYTHING
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
# XXX see FreeBSD PR 247421 .if ${COMPILER_TYPE} == "clang"
.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100
RUNTIME_SO= RUNTIME_SO=
PLIST_SUB+= RUNTIME_SO="@comment " PLIST_SUB+= RUNTIME_SO="@comment "
.else .else
@ -47,7 +46,7 @@ RUNTIME_SO= "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so"
PLIST_SUB+= RUNTIME_SO= PLIST_SUB+= RUNTIME_SO=
.endif .endif
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

10
lang/spidermonkey102/Makefile
View file

@ -57,21 +57,11 @@ PLIST_SUB= SP_VER=${SP_VER}
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.endif .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 .if ${CHOSEN_COMPILER_TYPE} == gcc
CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
USE_GCC= yes 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 .endif
post-patch: post-patch:

10
lang/spidermonkey78/Makefile
View file

@ -58,21 +58,11 @@ PLIST_SUB= SP_VER=${SP_VER}
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.endif .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 .if ${CHOSEN_COMPILER_TYPE} == gcc
CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
USE_GCC= yes 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 .endif
post-patch: post-patch:

10
lang/spidermonkey91/Makefile
View file

@ -66,21 +66,11 @@ CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_VERSION} \
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.endif .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 .if ${CHOSEN_COMPILER_TYPE} == gcc
CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ CONFIGURE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \
LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT} LLVM_OBJDUMP=llvm-objdump${LLVM_DEFAULT}
BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BUILD_DEPENDS+= ${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
USE_GCC= yes 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 .endif
post-patch: post-patch:

2
lang/yap/Makefile
View file

@ -50,7 +50,7 @@ post-build-DOCS-off:
.include <bsd.port.pre.mk> .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 CFLAGS+= -Wno-incompatible-function-pointer-types
CONFIGURE_ENV+= CFLAGS="${CFLAGS}" CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
.endif .endif

2
mail/milter-manager/Makefile
View file

@ -39,7 +39,7 @@ OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
mail/qpopper/Makefile
View file

@ -125,7 +125,7 @@ CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
# openssl-1.1.1 no longer has SSLv2 support # openssl-1.1.1 no longer has SSLv2 support
.if ${OPSYS} == FreeBSD .if ${OPSYS} == FreeBSD
CFLAGS+= -DOPENSSL_NO_SSL2 CFLAGS+= -DOPENSSL_NO_SSL2
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-incompatible-function-pointer-types CFLAGS+= -Wno-incompatible-function-pointer-types
.endif .endif
.endif .endif

11
math/py-fastcluster/Makefile
View file

@ -21,16 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.9,1:math/py-numpy@${PY_FLAVOR}
USES= compiler python USES= compiler python
USE_PYTHON= autoplist concurrent pep517 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: post-install:
${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} + ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
.include <bsd.port.post.mk> .include <bsd.port.mk>

7
math/scilab/Makefile
View file

@ -132,11 +132,8 @@ CONFIGURE_ARGS+= --enable-debug
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=int-conversion CFLAGS+= -Wno-error=int-conversion
.endif
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif
@ -148,7 +145,7 @@ FFLAGS+= -fallow-argument-mismatch
post-patch: post-patch:
@${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml @${REINPLACE_CMD} 's,/usr/local,${LOCALBASE},' ${WRKSRC}/etc/librarypath.xml
@${REINPLACE_CMD} -e 's, gfortran, ${FC},' ${WRKSRC}/modules/dynamic_link/src/scripts/configure @${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' \ @${REINPLACE_CMD} -e 's|std::filesystem|std::__fs::filesystem|g' \
${WRKSRC}/modules/fileio/src/cpp/fullpath.cpp \ ${WRKSRC}/modules/fileio/src/cpp/fullpath.cpp \
${WRKSRC}/modules/fileio/sci_gateway/cpp/sci_get_absolute_file_path.cpp ${WRKSRC}/modules/fileio/sci_gateway/cpp/sci_get_absolute_file_path.cpp

2
misc/ecflow/Makefile
View file

@ -33,7 +33,7 @@ CONFLICTS_BUILD= python27 # build attempts to find python-2.7 and use it
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
#post-patch: #post-patch:
#.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 #.if ${COMPILER_TYPE} == clang
# @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \ # @${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
# ${WRKSRC}/ACore/src/Str.cpp # ${WRKSRC}/ACore/src/Str.cpp
#.endif #.endif

2
misc/rump/Makefile
View file

@ -33,7 +33,7 @@ PLIST_SUB+= X8664="@comment "
.endif .endif
CWARNFLAGS+= -Wno-address-of-packed-member CWARNFLAGS+= -Wno-address-of-packed-member
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130 .if ${COMPILER_TYPE} == clang
CWARNFLAGS+= -Wno-unused-but-set-variable CWARNFLAGS+= -Wno-unused-but-set-variable
.endif .endif

2
multimedia/bcmatroska2/Makefile
View file

@ -22,7 +22,7 @@ CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CFLAGS+= -Wno-error=incompatible-function-pointer-types CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
multimedia/x264/Makefile
View file

@ -126,7 +126,7 @@ pre-build:
.include <bsd.port.pre.mk> .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 CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
net-im/telegram-desktop/Makefile
View file

@ -110,7 +110,7 @@ TELEGRAM_API_ID= 601761
.include <bsd.port.options.mk> .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 #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-CMakeLists.txt
USES+= llvm:min=16,build USES+= llvm:min=16,build
USES:= ${USES:Ncompiler\:*} # XXX avoid warnings USES:= ${USES:Ncompiler\:*} # XXX avoid warnings

2
net-mgmt/nfdump/Makefile
View file

@ -68,7 +68,7 @@ GEODB_CONFIGURE_ENABLE= maxmind
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CPPFLAGS+= -Wno-error=incompatible-function-pointer-types CPPFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif .endif

2
net-p2p/amule/Makefile
View file

@ -123,7 +123,7 @@ post-install-FILEVIEW-on:
# amule 2.3.3 does not work with C++17 which is the default since clang # 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 # 16. Change the defaults and allow the `register' keyword to be used without
# triggering a compiler error to allow the build to work. # triggering a compiler error to allow the build to work.
.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 .if ${COMPILER_TYPE} == clang
CXXFLAGS+= -Wno-register CXXFLAGS+= -Wno-register
.endif .endif

2
net/messagelib/Makefile
View file

@ -43,7 +43,7 @@ INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify
.include <bsd.port.pre.mk> .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 CXXFLAGS+= -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION
.endif .endif

Some files were not shown because too many files have changed in this diff Show more