Page MenuHomeFreeBSD
Files F138866246

D38664.diff
No OneTemporary
Actions

D38664.diff
View Options

diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -81,8 +81,7 @@
BROKEN= ${USE_CABAL:Mbasement-0.0.1[4-5]} package doesn't compile on i386
. endif
-. if ((${OSVERSION} >= 1301000 && ${OSVERSION} < 1302000) \
- || ${OSVERSION} < 1204000) && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
+. if ${OSVERSION} >= 1301000 && ${OSVERSION} < 1302000 && defined(USE_CABAL) && ${USE_CABAL:Mtext-2.*}
# Band-aids for a Clang bug that is shipped with FreeBSD 13.1
BUILD_DEPENDS+= clang15:devel/llvm15
BUILD_ARGS+= --ghc-options='-pgmc clang++15'
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -40,9 +40,9 @@
# makefile is being used on. Automatically set to
# "FreeBSD," "NetBSD," or "OpenBSD" as appropriate.
# OSREL - The release version of the operating system as a text
-# string (e.g., "12.3").
+# string (e.g., "12.4").
# OSVERSION - The operating system version as a comparable integer;
-# the value of __FreeBSD_version (e.g., 1203000).
+# the value of __FreeBSD_version (e.g., 1204000).
#
# 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
@@ -1180,7 +1180,7 @@
. endif
_EXPORTED_VARS+= OSVERSION
-. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1203000 || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1301000))
+. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1204000 || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1301000))
_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/biology/wfa2-lib/files/patch-system_profiler__timer.h b/biology/wfa2-lib/files/patch-system_profiler__timer.h
deleted file mode 100644
--- a/biology/wfa2-lib/files/patch-system_profiler__timer.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- system/profiler_timer.h.orig 2023-01-30 14:47:11 UTC
-+++ system/profiler_timer.h
-@@ -33,6 +33,7 @@
- #ifndef PROFILER_TIMER_H
- #define PROFILER_TIMER_H
-
-+#include <time.h> // Required on FreeBSD 12.3
- #include "profiler_counter.h"
-
- /*
diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
--- a/databases/mongodb60/Makefile
+++ b/databases/mongodb60/Makefile
@@ -93,10 +93,6 @@
.include <bsd.port.pre.mk>
-.if ${OSREL} == "12.3"
-IGNORE= does not compile on 12.3, libc++ too old
-.endif
-
ALL_TARGET= install-core
# This ports is only following the Major Release.
diff --git a/devel/concurrencpp/Makefile b/devel/concurrencpp/Makefile
--- a/devel/concurrencpp/Makefile
+++ b/devel/concurrencpp/Makefile
@@ -10,11 +10,6 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/semaphore)
-BROKEN_FreeBSD_12= fatal error: 'semaphore' file not found (missing C++ include <semaphore>)
-.endif
-
USES= cmake compiler:c++20-lang
USE_GITHUB= yes
diff --git a/devel/electron22/Makefile b/devel/electron22/Makefile
--- a/devel/electron22/Makefile
+++ b/devel/electron22/Makefile
@@ -224,11 +224,7 @@
YARN_TIMESTAMP= 1679622751
.include "Makefile.version"
-.include <bsd.port.pre.mk>
-
-.if ${OSREL} == "12.3"
-IGNORE= does not compile, libc++ too old
-.endif
+.include <bsd.port.pre.mk> # required for COMPILER_VERSION
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
diff --git a/devel/malloy/Makefile b/devel/malloy/Makefile
--- a/devel/malloy/Makefile
+++ b/devel/malloy/Makefile
@@ -9,9 +9,6 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/license.txt
-BROKEN_FreeBSD_12= some C++20 STL headers are missing on 12.3,\
- see https://bugs.freebsd.org/255374
-
BUILD_DEPENDS= boost-libs>1.74.0:devel/boost-libs
LIB_DEPENDS= libfmt.so:devel/libfmt \
libspdlog.so:devel/spdlog
diff --git a/devel/qcoro/Makefile b/devel/qcoro/Makefile
--- a/devel/qcoro/Makefile
+++ b/devel/qcoro/Makefile
@@ -27,9 +27,4 @@
PLIST_SUB= QT_VER=${FLAVOR:S/qt//}
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/concepts)
-BROKEN_FreeBSD_12= requires recent C++ compiler
-.endif
-
.include <bsd.port.mk>
diff --git a/devel/root/Makefile b/devel/root/Makefile
--- a/devel/root/Makefile
+++ b/devel/root/Makefile
@@ -82,15 +82,4 @@
PLIST_SUB+= ONLY_INSTALLED_WITH_LLVM_CLANG_13="@comment "
.endif
-.include <bsd.port.pre.mk>
-
-# In LLVM/Clang 10.0.1 (used on FreeBSD 12.3), the cstdalign header is missing from the std modulemap, but it is declared included in ROOT's std modulemap - this has to be removed.
-# See https://github.com/llvm/llvm-project/blob/main/libcxx/include/module.modulemap.in#L181
-# The same seems to be the case for the other headers defined in the variable "modules" below.
-.if ${OSVERSION} < 1204000
-modules= cstdalign cuchar "ext\/functional" "ext\/numeric" "bits\/allocator.h" "bits\/basic_ios.h" "bits\/cpp_type_traits.h" "bits\/exception_defines.h" "bits\/ios_base.h" "bits\/locale_facets.h" "bits\/stl_algobase.h" "bits\/stl_map.h" "bits\/stl_pair.h" bits_stl_tree_h
-post-patch:
- MODULEMAP=${WRKSRC}/interpreter/cling/include/cling/std.modulemap ${SH} ${SCRIPTDIR}/remove-modules-from-modulemap.sh ${modules}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
--- a/editors/imhex/Makefile
+++ b/editors/imhex/Makefile
@@ -76,16 +76,6 @@
OPTIONS_DEFINE= DOCS NLS
NLS_USES= gettext
-.include <bsd.port.pre.mk>
-
-OSMAJOR=${OSVERSION:C/([0-9]*)[0-9]{5}/\1/}
-
-# Before LLVM13 import to the base system
-.if (${OSMAJOR} == 12 && ${OSVERSION} < 1203505) \
- || (${OSMAJOR} == 14 && ${OSVERSION} < 1400042)
-IGNORE= will not build due to C++20 API functions unavailable in old libc++
-.endif
-
post-extract:
${CP} ${DISTDIR}/${DIST_SUBDIR}/xdg.hpp ${WRKSRC}/lib/external/xdgpp
${CP} -R ${WRKSRC_capstone}/* ${WRKSRC}/lib/external/capstone
@@ -103,4 +93,4 @@
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -84,12 +84,6 @@
${WRKSRC}/UI/NativeApp.cpp
@${REINPLACE_CMD} -e 's/"unknown"/"${DISTVERSIONFULL}"/' \
${WRKSRC}/git-version.cmake
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-# https://cgit.freebsd.org/src/commit/?id=773538247007
- @if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1203501 ]; then \
- ${REINPLACE_CMD} -e '/if.*__STDC_/,/XXH/s/static_assert/_Static_assert/' \
- ${WRKSRC}/ext/xxhash.h; \
- fi
do-install-QT5-on do-install-SDL-on:
${MV} ${STAGEDIR}${PREFIX}/bin/${EXENAME} \
diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile
--- a/emulators/rpcs3/Makefile
+++ b/emulators/rpcs3/Makefile
@@ -117,24 +117,4 @@
CPP= clang-cpp${LLVM_VERSION}
.endif
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31 (don't forget distinfo)
-.if !exists(/usr/include/c++/v1/concepts) || make(makesum) || make(fetch)
-USES+= llvm:13,build
-CC= clang${LLVM_VERSION}
-CXX= clang++${LLVM_VERSION}
-CPP= clang-cpp${LLVM_VERSION}
-
-# XXX Move into separate port and standardize via USES
-GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1:libcxx
-CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
-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*} \
- -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/Makefile b/emulators/yuzu/Makefile
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -22,10 +22,6 @@
ONLY_FOR_ARCHS= aarch64 amd64
ONLY_FOR_ARCHS_REASON= requires int128 and dynarmic backend
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-.if !exists(/usr/include/c++/v1/concepts)
-BROKEN_FreeBSD_12= base libc++ is too old
-.endif
BUILD_DEPENDS= boost-libs>0:devel/boost-libs \
nlohmann-json>0:devel/nlohmann-json \
diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile
--- a/games/aquaria/Makefile
+++ b/games/aquaria/Makefile
@@ -44,11 +44,6 @@
PLIST_FILES= bin/aquaria
PORTDATA= *
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-.if !exists(/usr/include/c++/v1/concepts)
-LDFLAGS_i386:= ${LDFLAGS_i386:N*no-check-dynamic-relocations*}
-.endif
-
DESKTOP_ENTRIES="${GH_PROJECT}" \
"" \
"${DATADIR}/${PORTNAME}.png" \
diff --git a/games/punchy/Makefile b/games/punchy/Makefile
--- a/games/punchy/Makefile
+++ b/games/punchy/Makefile
@@ -33,12 +33,6 @@
# Search assets under PREFIX instead of current directory
@${REINPLACE_CMD} 's,assets",../${DATADIR_REL}/&,' \
${WRKSRC}/cargo-crates/bevy_asset-*/src/lib.rs
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-# https://cgit.freebsd.org/src/commit/?id=98a049f22ef3
-.if !exists(/usr/bin/llvm-readelf)
- @${REINPLACE_CMD} '/readelf/s/llvm-//' \
- ${WRKSRC}/cargo-crates/v8-*/build/toolchain/gcc_toolchain.gni
-.endif
post-install:
(cd ${WRKSRC} && ${COPYTREE_SHARE} "assets" ${STAGEDIR}${DATADIR})
diff --git a/graphics/cxxplot/Makefile b/graphics/cxxplot/Makefile
--- a/graphics/cxxplot/Makefile
+++ b/graphics/cxxplot/Makefile
@@ -10,11 +10,6 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/license.txt
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-.if exists(/usr/include/c++/v1) && !exists(/usr/include/c++/v1/concepts)
-BROKEN_FreeBSD_12= build error: 'concepts' file not found
-.endif
-
USES= cmake:testing compiler:c++20-lang gl qt:6
USE_QT= base tools:build
USE_GL= gl opengl
diff --git a/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
--- a/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
+++ b/lang/gcc11-devel/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
@@ -8,7 +8,7 @@
-else version (FreeBSD_12) enum __FreeBSD_version = 1202000;
+ version (FreeBSD_14) enum __FreeBSD_version = 1400000;
+else version (FreeBSD_13) enum __FreeBSD_version = 1301000;
-+else version (FreeBSD_12) enum __FreeBSD_version = 1203000;
++else version (FreeBSD_12) enum __FreeBSD_version = 1204000;
else version (FreeBSD_11) enum __FreeBSD_version = 1104000;
else version (FreeBSD_10) enum __FreeBSD_version = 1004000;
else version (FreeBSD_9) enum __FreeBSD_version = 903000;
diff --git a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
--- a/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
+++ b/lang/gcc11/files/patch-libphobos_libdruntime_core_sys_freebsd_config.d
@@ -8,7 +8,7 @@
-else version (FreeBSD_12) enum __FreeBSD_version = 1202000;
+ version (FreeBSD_14) enum __FreeBSD_version = 1400000;
+else version (FreeBSD_13) enum __FreeBSD_version = 1301000;
-+else version (FreeBSD_12) enum __FreeBSD_version = 1203000;
++else version (FreeBSD_12) enum __FreeBSD_version = 1204000;
else version (FreeBSD_11) enum __FreeBSD_version = 1104000;
else version (FreeBSD_10) enum __FreeBSD_version = 1004000;
else version (FreeBSD_9) enum __FreeBSD_version = 903000;
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -137,9 +137,7 @@
# anyway...
.if exists(${PATCHDIR}/no-hardlinks)
_KERN_OSRELDATE!= ${SYSCTL} -n kern.osreldate 2>/dev/null || echo 0
-. if ${_KERN_OSRELDATE} >= 1400040
-. elif ${_KERN_OSRELDATE} >= 1300521
-. else
+. if ${_KERN_OSRELDATE} < 1300521
EXTRA_PATCHES+= ${PATCHDIR}/no-hardlinks
. endif
.endif
diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -31,12 +31,6 @@
MHASH_RUN_DEPENDS= mhash>=0.9.9.9_5:security/mhash
RHASH_RUN_DEPENDS= rhash>=1.3.5:security/rhash
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == aarch64 && ${OSVERSION} < 1300000
-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-12.3
-.endif
-
post-patch:
${REINPLACE_CMD} \
-e 's@bash@sh@' ${WRKSRC}/Makefile.in
@@ -46,4 +40,4 @@
${MV} ${STAGEDIR}${PREFIX}/etc/mbuffer.rc \
${STAGEDIR}${PREFIX}/etc/mbuffer.rc.sample
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/mbuffer/files/extra-patch-12.3 b/misc/mbuffer/files/extra-patch-12.3
deleted file mode 100644
--- a/misc/mbuffer/files/extra-patch-12.3
+++ /dev/null
@@ -1,61 +0,0 @@
-- cc(1) crashes with "-g" on FreeBSD 12.3-RELEASE aarch64
-
- cc: error: unable to execute command: Abort trap (core dumped)
- cc: error: clang frontend command failed due to signal (use -v to see invocation)
- FreeBSD clang version 10.0.1 (git@github.com:llvm/llvm-project.git llvmorg-10.0.1-0-gef32c611aa2)
- Target: aarch64-unknown-freebsd12.3
- Thread model: posix
- InstalledDir: /usr/bin
- cc: note: diagnostic msg: PLEASE submit a bug report to https://bugs.freebsd.org/submit/ and include the crash backtrace, preprocessed source, and associated run script.
- cc: note: diagnostic msg:
- ********************
-
- PLEASE ATTACH THE FOLLOWING FILES TO THE BUG REPORT:
- Preprocessed source(s) and associated run script(s) are located at:
- cc: note: diagnostic msg: /tmp/idev-47a323.c
- cc: note: diagnostic msg: /tmp/idev-47a323.sh
- cc: note: diagnostic msg:
-
- ********************
- gmake[1]: *** [Makefile:197: idev.so] Error 254
- gmake[1]: Leaving directory '/usr/ports/misc/mbuffer/work/mbuffer-20211018'
-
-- llvm-objdump(1) does not support "-T" on FreeBSD 12.3-RELEASE aarch64
-
---- Makefile.in.orig 2022-05-14 11:38:27 UTC
-+++ Makefile.in
-@@ -194,7 +194,7 @@ tapetest.so: tapetest.c config.h
- $(CC) $(CFLAGS) -shared -fPIC tapetest.c -o $@ $(LIBS)
-
- idev.so: idev.c config.h
-- $(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
-+ $(CC) $(CFLAGS) -shared -fPIC idev.c -o $@ $(LIBS)
-
- $(DEPS): | build
-
---- configure.in.orig 2022-05-14 11:37:04 UTC
-+++ configure.in
-@@ -173,19 +173,19 @@ else
- ]])],[
- AC_MSG_RESULT([OK])
- AC_MSG_CHECKING([name of open() in C library])
-- libc_open=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^open/ { print $NF }'`
-+ libc_open=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^open/ { print $NF }'`
- AC_DEFINE_UNQUOTED([LIBC_OPEN], $libc_open, [name of open() in libc])
- AC_MSG_RESULT($libc_open)
- AC_MSG_CHECKING([name of read() in C library])
-- libc_read=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^read/ { print $NF }'`
-+ libc_read=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^read/ { print $NF }'`
- AC_DEFINE_UNQUOTED([LIBC_READ], $libc_read, [name of write() in libc])
- AC_MSG_RESULT($libc_read)
- AC_MSG_CHECKING([name of write() in C library])
-- libc_write=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^write/ { print $NF }'`
-+ libc_write=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^write/ { print $NF }'`
- AC_DEFINE_UNQUOTED([LIBC_WRITE], $libc_write, [name of write() in libc])
- AC_MSG_RESULT($libc_write)
- AC_MSG_CHECKING([name of fstat() in C library])
-- libc_fstat=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^_*fstat/ { print $NF }'`
-+ libc_fstat=`$OBJDUMP -t conftest | $AWK '/\*UND\*/ && $NF ~ /^_*fstat/ { print $NF }'`
- AC_DEFINE_UNQUOTED([LIBC_FSTAT], $libc_fstat, [name of fstat() in libc])
- AC_MSG_RESULT($libc_fstat)
- ],
diff --git a/sysutils/libdisplay-info/Makefile b/sysutils/libdisplay-info/Makefile
--- a/sysutils/libdisplay-info/Makefile
+++ b/sysutils/libdisplay-info/Makefile
@@ -19,14 +19,6 @@
GL_COMMIT= 92b031749c0fe84ef5cdf895067b84a829920e25
SHEBANG_FILES= tool/*.py
-post-patch:
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-# https://cgit.freebsd.org/src/commit/?id=773538247007
- @if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1203501 ]; then \
- ${REINPLACE_CMD} -e 's/static_assert/_Static_assert/' \
- ${WRKSRC}/edid.c; \
- fi
-
pre-test:
@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -209,11 +209,7 @@
TEST_ALL_TARGET= ${TEST_TARGETS}
.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if ${OSREL} == "12.3"
-IGNORE= does not compile, libc++ too old
-.endif
+.include <bsd.port.pre.mk> # for COMPILER_VERSION
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -198,11 +198,7 @@
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if ${OSREL} == "12.3"
-IGNORE= does not compile, libc++ too old
-.endif
+.include <bsd.port.pre.mk> # for COMPILER_VERSION
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -224,11 +224,7 @@
TEST_ALL_TARGET= ${TEST_TARGETS}
.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if ${OSREL} == "12.3"
-IGNORE= does not compile, libc++ too old
-.endif
+.include <bsd.port.pre.mk> # for COMPILER_VERSION
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile
--- a/x11-wm/kwinft/Makefile
+++ b/x11-wm/kwinft/Makefile
@@ -68,28 +68,4 @@
@${REINPLACE_CMD} -e '/mounts/s,/proc,/compat/linux&,' \
${WRKSRC}/debug/perf/ftrace_impl.cpp
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31 (don't forget distinfo)
-.if ${CXX} == c++ && exists(/usr/lib/libc++.so)
-.if !exists(/usr/include/c++/v1/concepts) || make(makesum) || make(fetch)
-USES+= llvm:13,build
-CC= clang${LLVM_VERSION}
-CXX= clang++${LLVM_VERSION}
-CPP= clang-cpp${LLVM_VERSION}
-
-# XXX Move into separate port and standardize via USES
-USE_GITHUB= nodefault
-GH_TUPLE+= llvm:llvm-project:llvmorg-13.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*} \
- -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/kwinft/distinfo b/x11-wm/kwinft/distinfo
--- a/x11-wm/kwinft/distinfo
+++ b/x11-wm/kwinft/distinfo
@@ -1,5 +1,3 @@
TIMESTAMP = 1676645458
-SHA256 (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 09c50d558bd975c41157364421820228df66632802a4a6a7c9c17f86a7340802
-SIZE (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 147290251
SHA256 (kwinft-kwinft-6d47e3aebd58ea1e7556c67e0f7870e874922f7c_GL0.tar.gz) = ac43fed49afeb5966199d1ce317b00d5c62c0a92271e5a40f7d7c2d6d325d7dc
SIZE (kwinft-kwinft-6d47e3aebd58ea1e7556c67e0f7870e874922f7c_GL0.tar.gz) = 5026514
diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -61,10 +61,5 @@
# Respect hier(7) for examples
@${REINPLACE_CMD} '/datadir/s/doc/examples/' \
${WRKSRC}/docs/meson.build
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31
-# https://cgit.freebsd.org/src/commit/?id=773538247007
- @if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1203501 ]; then \
- ${REINPLACE_CMD} -e '/_POSIX_C_SOURCE/d' ${WRKSRC}/src/cursor.c; \
- fi
.include <bsd.port.mk>
diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile
--- a/x11/hyprpaper/Makefile
+++ b/x11/hyprpaper/Makefile
@@ -48,27 +48,4 @@
${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \
${STAGEDIR}${PREFIX}/bin
-# XXX Drop after FreeBSD 12.3 EOL around 2023-03-31 (don't forget distinfo)
-.if ${CXX} == c++ && exists(/usr/lib/libc++.so)
-.if !exists(/usr/include/c++/v1/concepts) || make(makesum) || make(fetch)
-USES+= llvm:min=12,build
-CC= clang${LLVM_VERSION}
-CXX= clang++${LLVM_VERSION}
-CPP= clang-cpp${LLVM_VERSION}
-
-# XXX Move into separate port and standardize via USES
-GH_TUPLE+= llvm:llvm-project:llvmorg-13.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:M*Ninja*} \
- -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/hyprpaper/distinfo b/x11/hyprpaper/distinfo
--- a/x11/hyprpaper/distinfo
+++ b/x11/hyprpaper/distinfo
@@ -1,5 +1,3 @@
TIMESTAMP = 1678893556
SHA256 (hyprwm-hyprpaper-s20230315-6196197_GH0.tar.gz) = e26ae7458ea550d08bbfc96dbfb8c145bfa5d45354a335be10631b8db45e9782
SIZE (hyprwm-hyprpaper-s20230315-6196197_GH0.tar.gz) = 25348
-SHA256 (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 09c50d558bd975c41157364421820228df66632802a4a6a7c9c17f86a7340802
-SIZE (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 147290251

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 12:50 PM (3 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26721161
Default Alt Text
D38664.diff (21 KB)

Event Timeline