Page MenuHomeFreeBSD
Files F148621255

D28406.diff
No OneTemporary
Actions

D28406.diff
View Options

Index: head/archivers/gtar/files/patch-tests_multiv01.at
===================================================================
--- head/archivers/gtar/files/patch-tests_multiv01.at
+++ head/archivers/gtar/files/patch-tests_multiv01.at
@@ -1,15 +0,0 @@
-# Remove after FreeBSD 12.1 EOL
-cmp(1) Capsicum error if stdin closed
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234885
-
---- tests/multiv01.at.orig 2019-01-11 20:11:26 UTC
-+++ tests/multiv01.at
-@@ -28,7 +28,7 @@ AT_KEYWORDS([multivolume multiv multiv01 chdir])
- # TRUSS=strace
-
- AT_TAR_CHECK([
--exec <&-
-+#exec <&-
- genfile --length 7168 --file file1
-
- for block in " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" \
Index: head/archivers/gtar/files/patch-tests_multiv03.at
===================================================================
--- head/archivers/gtar/files/patch-tests_multiv03.at
+++ head/archivers/gtar/files/patch-tests_multiv03.at
@@ -1,15 +0,0 @@
-# Remove after FreeBSD 12.1 EOL
-cmp(1) Capsicum error if stdin closed
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234885
-
---- tests/multiv03.at.orig 2019-01-11 20:11:26 UTC
-+++ tests/multiv03.at
-@@ -47,7 +47,7 @@ EOF
-
- genfile --length 15360 --file $AFILE
-
--exec <&-
-+#exec <&-
-
- tar -M -L 10 -c -f arch.1 -f arch.2 $AFILE || exit 1
- tar -tM -f arch.1 -f arch.2 || exit 1
Index: head/archivers/gtar/files/patch-tests_multiv05.at
===================================================================
--- head/archivers/gtar/files/patch-tests_multiv05.at
+++ head/archivers/gtar/files/patch-tests_multiv05.at
@@ -1,15 +0,0 @@
-# Remove after FreeBSD 12.1 EOL
-cmp(1) Capsicum error if stdin closed
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=234885
-
---- tests/multiv05.at.orig 2019-01-11 20:11:26 UTC
-+++ tests/multiv05.at
-@@ -28,7 +28,7 @@ AT_KEYWORDS([multivolume multiv multiv05 sync])
- m4_pushdef([FILELIST],[jeden,dwa,trzy,cztery,piec,szesc])
-
- AT_TAR_CHECK([
--exec <&-
-+#exec <&-
-
- m4_foreach([f],
- [FILELIST],
Index: head/comms/usbmuxd/files/patch-src_usb.c
===================================================================
--- head/comms/usbmuxd/files/patch-src_usb.c
+++ head/comms/usbmuxd/files/patch-src_usb.c
@@ -1,17 +0,0 @@
-libusb_has_capability() was implemented in r361977 and is only available on:
-FreeBSD >= 1104501, 1201518, 1300098
-However, libusb in all supported versions of FreeBSD supports hotplug events.
-
-This patch can be safely removed after 11.4 and 12.1 EOL.
-
---- src/usb.c.orig 2021-01-21 10:10:40 UTC
-+++ src/usb.c
-@@ -815,7 +815,7 @@ int usb_init(void)
- collection_init(&device_list);
-
- #ifdef HAVE_LIBUSB_HOTPLUG_API
-- if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) {
-+ if (1) {
- usbmuxd_log(LL_INFO, "Registering for libusb hotplug events");
- res = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, VID_APPLE, LIBUSB_HOTPLUG_MATCH_ANY, 0, usb_hotplug_cb, NULL, &usb_hotplug_cb_handle);
- if (res == LIBUSB_SUCCESS) {
Index: head/emulators/i386-wine-devel/Makefile.amd64
===================================================================
--- head/emulators/i386-wine-devel/Makefile.amd64
+++ head/emulators/i386-wine-devel/Makefile.amd64
@@ -32,8 +32,8 @@
.endif
.endfor
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
-IGNORE= binaries compiled for FreeBSD 11.4+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
+IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+ and 13.0+ only
.endif
OPTIONS_DEFINE= GECKO MONO
Index: head/emulators/i386-wine/Makefile.amd64
===================================================================
--- head/emulators/i386-wine/Makefile.amd64
+++ head/emulators/i386-wine/Makefile.amd64
@@ -33,8 +33,8 @@
.endif
.endfor
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
-IGNORE= binaries compiled for FreeBSD 11.4+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) only
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
+IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+ and 13.0+ only
.endif
OPTIONS_DEFINE= GECKO MONO
Index: head/emulators/rpcs3/Makefile
===================================================================
--- head/emulators/rpcs3/Makefile
+++ head/emulators/rpcs3/Makefile
@@ -92,12 +92,4 @@
CXX= clang++${LLVM_DEFAULT}
CPP= clang-cpp${LLVM_DEFAULT}
-# XXX Drop after FreeBSD 12.1 EOL
-.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so))
-MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
-DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx
-CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
-LLVM_VER= 10.0.1
-.endif
-
.include <bsd.port.post.mk>
Index: head/emulators/yuzu/Makefile
===================================================================
--- head/emulators/yuzu/Makefile
+++ head/emulators/yuzu/Makefile
@@ -93,25 +93,4 @@
-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
${WRKSRC}/src/common/scm_rev.cpp.in
-.include <bsd.port.pre.mk>
-
-# XXX Drop after FreeBSD 12.1 EOL
-.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 100
-. if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} < 100
-LLVM_DEFAULT= 10
-. endif
-BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CC= clang${LLVM_DEFAULT}
-CXX= clang++${LLVM_DEFAULT}
-CPP= clang-cpp${LLVM_DEFAULT}
-.endif
-
-# XXX Drop after FreeBSD 12.1 EOL
-.if make(makesum) || (!exists(/usr/include/c++/v1/fenv.h) && exists(/usr/lib/libc++.so))
-MASTER_SITES+= https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VER}/:libcxx
-DISTFILES+= libcxx-${LLVM_VER}.src.tar.xz:libcxx
-CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx-${LLVM_VER}.src/include
-LLVM_VER= 10.0.1
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/graphics/linux-c7-libdrm/Makefile
===================================================================
--- head/graphics/linux-c7-libdrm/Makefile
+++ head/graphics/linux-c7-libdrm/Makefile
@@ -20,8 +20,7 @@
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD && \
- ((${OSVERSION} >= 1200000 && ${OSVERSION} < 1201501) \
- || (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300048))
+ (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300048)
PORTVERSION= 2.4.91
DISTVERSIONSUFFIX= -3.el7
Index: head/graphics/rawtherapee/Makefile
===================================================================
--- head/graphics/rawtherapee/Makefile
+++ head/graphics/rawtherapee/Makefile
@@ -37,7 +37,7 @@
USE_BINUTILS= yes
# As of 2019-09-29, this port is known to be miscompiled by clang90
-# (SIGSEGV or SIBGUS) and 12.1's base clang.
+# (SIGSEGV or SIBGUS).
# So we shall stick to a modern GCC for now,
# XXX FIXME note that rawtherapee is somewhat sensitive
# versus compiler details so we may need to pin GCC 9.x
Index: head/graphics/waifu2x-converter-cpp/Makefile
===================================================================
--- head/graphics/waifu2x-converter-cpp/Makefile
+++ head/graphics/waifu2x-converter-cpp/Makefile
@@ -30,11 +30,6 @@
lib/libw2xc.so
PORTDATA= *
-.if exists(/usr/lib/libc++fs.a)
-# XXX Remove after FreeBSD 12.1 EOL
-CMAKE_ARGS+= -DFILE_SYSTEM_LIB:STRING=c++fs
-.endif
-
OPTIONS_DEFINE= SIMD
OPTIONS_DEFAULT=SIMD
Index: head/lang/luajit/Makefile
===================================================================
--- head/lang/luajit/Makefile
+++ head/lang/luajit/Makefile
@@ -32,19 +32,6 @@
.if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*} || ${ARCH:Msparc*}
USE_GCC=yes
-.elif ${ARCH} == amd64
-# FreeBSD 12.1 shipped LLVM 8.0.1, which links libluajit with a TLS phdr that
-# requests a 16-byte alignment but an offset that's 8 mod 16. This results in
-# hilarity when an error is raised, as luajit raises an exception (stored in a
-# static TLS variable) via libunwind. libunwind assumes proper alignment of
-# the exception and uses a movaps instruction, which throws a SIGBUS when it
-# encounters this misaligned TLS data. While the linker problem doesn't seem
-# to be specific to amd64, the effect on luajit does seem to be.
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1201000 && ${OSVERSION} < 1202000
-LLVM_MINIMUM= 10
-BUILD_DEPENDS+= llvm${LLVM_MINIMUM}>=10.0:devel/llvm${LLVM_MINIMUM}
-CC= clang10
-.endif
.endif
post-install:
Index: head/lang/v8/Makefile
===================================================================
--- head/lang/v8/Makefile
+++ head/lang/v8/Makefile
@@ -47,13 +47,6 @@
libunwind>0:devel/libunwind
LIB_DEPENDS= libicudata.so:devel/icu
-.include <bsd.port.options.mk>
-
-# clang10+ is required, this conditionnal can be dropped when 12.1 is EOL
-.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1201515
-BUILD_DEPENDS+= llvm10>0:devel/llvm10
-.endif
-
USES= pkgconfig ninja python:3.5+,build tar:xz
USE_GITHUB= yes
USE_LDCONFIG= yes
@@ -143,10 +136,6 @@
${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/build/toolchain/gcc_toolchain.gni \
${WRKSRC}/buildtools/third_party/libc++/BUILD.gn
-# clang10+ is required, this conditionnal can be dropped when 12.1 is EOL
-.if ${OSVERSION} >= 1200000 && ${OSVERSION} < 1201515
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-clang10
-.endif
# google sucks, this file is needed but absent in the build* archive
# https://github.com/klzgrad/naiveproxy/blob/master/src/build/config/gclient_args.gni
Index: head/www/deno/Makefile
===================================================================
--- head/www/deno/Makefile
+++ head/www/deno/Makefile
@@ -17,13 +17,6 @@
gn:devel/gn \
libunwind>0:devel/libunwind
-.include <bsd.port.options.mk>
-
-# clang10+ is required, this conditional can be dropped when 12.1 is EOL
-.if (${OSVERSION} >= 1200000 && ${OSVERSION} < 1201515)
-BUILD_DEPENDS+= llvm10>0:devel/llvm10
-.endif
-
USES= cargo ninja pkgconfig:build python:3.5+,build
USE_GITHUB= yes
@@ -387,10 +380,6 @@
${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/cargo-crates/rusty_v8-${RUSTY_VERS}/build/toolchain/gcc_toolchain.gni \
${WRKSRC}/cargo-crates/rusty_v8-${RUSTY_VERS}/buildtools/third_party/libc++/BUILD.gn
-# clang10+ is required, this conditional can be dropped when 12.1 is EOL
-.if (${OSVERSION} >= 1200000 && ${OSVERSION} < 1201515)
- @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-clang10
-.endif
do-install:
${INSTALL_PROGRAM} ${WRKDIR}/target/release/deno ${STAGEDIR}${LOCALBASE}/bin
Index: head/x11/fnott/Makefile
===================================================================
--- head/x11/fnott/Makefile
+++ head/x11/fnott/Makefile
@@ -25,12 +25,6 @@
USE_XORG= pixman
WRKSRC= ${WRKDIR}/${PORTNAME}
-# XXX Drop after FreeBSD 12.1 EOL
-.if exists(/usr/lib/clang/8.0.1)
-# notification.c:545:13: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
-CFLAGS+= -Wno-error=missing-braces
-.endif
-
post-patch:
@${REINPLACE_CMD} 's,/usr/local,${PREFIX},g' \
${WRKSRC}/xdg.c
Index: head/x11/foot/Makefile
===================================================================
--- head/x11/foot/Makefile
+++ head/x11/foot/Makefile
@@ -26,10 +26,4 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
MESON_ARGS= -Dterminfo=false
-# XXX Drop after FreeBSD 12.1 EOL
-.if exists(/usr/lib/clang/8.0.1)
-# prompt.c:45:21: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
-CFLAGS+= -Wno-error=missing-braces
-.endif
-
.include <bsd.port.mk>
Index: head/x11/fuzzel/Makefile
===================================================================
--- head/x11/fuzzel/Makefile
+++ head/x11/fuzzel/Makefile
@@ -26,12 +26,6 @@
man/man1/${PORTNAME}.1.gz \
share/zsh/site-functions/_${PORTNAME}
-# XXX Drop after FreeBSD 12.1 EOL
-.if exists(/usr/lib/clang/8.0.1)
-# prompt.c:45:21: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]
-CFLAGS+= -Wno-error=missing-braces
-.endif
-
OPTIONS_DEFINE= CAIRO LIBRSVG2 PNG
OPTIONS_DEFAULT=CAIRO LIBRSVG2 PNG

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 4:55 AM (13 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29999708
Default Alt Text
D28406.diff (12 KB)

Event Timeline