svn commit: r563570 - in head: archivers/gtar/files comms/usbmuxd/files emulators/i386-wine emulators/i386-wine-devel emulators/rpcs3 emulators/yuzu graphics/linux-c7-libdrm graphics/rawtherapee gr...

Mon Feb 1 12:43:00 UTC 2021

Author: rene
Date: Mon Feb  1 12:42:53 2021
New Revision: 563570
URL: https://svnweb.freebsd.org/changeset/ports/563570

Log:
  Remove support for FreeBSD 12.1 from various ports.
  
  FreeBSD 12.1 reached end-of-life today. Adjust the message
  for the wine ports while here, since stable/13 has branched.
  
  Submitted by:	rene
  Reviewed by:	jbeich, mandree, mat, osa
  Approved by:	portmgr (mat)
  Differential Revision:	https://reviews.freebsd.org/D28406

Deleted:
  head/archivers/gtar/files/patch-tests_multiv01.at
  head/archivers/gtar/files/patch-tests_multiv03.at
  head/archivers/gtar/files/patch-tests_multiv05.at
  head/comms/usbmuxd/files/patch-src_usb.c
Modified:
  head/emulators/i386-wine-devel/Makefile.amd64
  head/emulators/i386-wine/Makefile.amd64
  head/emulators/rpcs3/Makefile
  head/emulators/yuzu/Makefile
  head/graphics/linux-c7-libdrm/Makefile
  head/graphics/rawtherapee/Makefile
  head/graphics/waifu2x-converter-cpp/Makefile
  head/lang/luajit/Makefile
  head/lang/v8/Makefile
  head/www/deno/Makefile
  head/x11/fnott/Makefile
  head/x11/foot/Makefile
  head/x11/fuzzel/Makefile

Modified: head/emulators/i386-wine-devel/Makefile.amd64
==============================================================================

--- head/emulators/i386-wine-devel/Makefile.amd64	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/emulators/i386-wine-devel/Makefile.amd64	Mon Feb  1 12:42:53 2021	(r563570)
@@ -32,8 +32,8 @@ PLIST_SUB+=	NOOSREL${osrel}=""
 .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

Modified: head/emulators/i386-wine/Makefile.amd64
==============================================================================
--- head/emulators/i386-wine/Makefile.amd64	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/emulators/i386-wine/Makefile.amd64	Mon Feb  1 12:42:53 2021	(r563570)
@@ -33,8 +33,8 @@ PLIST_SUB+=	NOOSREL${osrel}=""
 .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

Modified: head/emulators/rpcs3/Makefile
==============================================================================
--- head/emulators/rpcs3/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/emulators/rpcs3/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -92,12 +92,4 @@ CC=		clang${LLVM_DEFAULT}
 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>

Modified: head/emulators/yuzu/Makefile
==============================================================================
--- head/emulators/yuzu/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/emulators/yuzu/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -93,25 +93,4 @@ post-patch:
 		-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>

Modified: head/graphics/linux-c7-libdrm/Makefile
==============================================================================
--- head/graphics/linux-c7-libdrm/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/graphics/linux-c7-libdrm/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -20,8 +20,7 @@ OPTIONS_DEFINE=	DOCS
 .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
 

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/graphics/rawtherapee/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -37,7 +37,7 @@ DOS2UNIX_REGEX=	.*\.(cc|h)
 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

Modified: head/graphics/waifu2x-converter-cpp/Makefile
==============================================================================
--- head/graphics/waifu2x-converter-cpp/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/graphics/waifu2x-converter-cpp/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -30,11 +30,6 @@ PLIST_FILES=	bin/${PORTNAME} \
 		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
 

Modified: head/lang/luajit/Makefile
==============================================================================
--- head/lang/luajit/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/lang/luajit/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -32,19 +32,6 @@ PLIST_SUB+=	VERSION=${DISTVERSION}
 
 .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:

Modified: head/lang/v8/Makefile
==============================================================================
--- head/lang/v8/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/lang/v8/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -47,13 +47,6 @@ BUILD_DEPENDS=	binutils>0:devel/binutils \
 		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 @@ post-patch:
 	${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

Modified: head/www/deno/Makefile
==============================================================================
--- head/www/deno/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/www/deno/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -17,13 +17,6 @@ BUILD_DEPENDS=	binutils>0:devel/binutils \
 		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 @@ post-patch:
 	${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

Modified: head/x11/fnott/Makefile
==============================================================================
--- head/x11/fnott/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/x11/fnott/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -25,12 +25,6 @@ USES=		compiler:c11 meson pkgconfig xorg
 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

Modified: head/x11/foot/Makefile
==============================================================================
--- head/x11/foot/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/x11/foot/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -26,10 +26,4 @@ USE_XORG=	pixman
 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>

Modified: head/x11/fuzzel/Makefile
==============================================================================
--- head/x11/fuzzel/Makefile	Mon Feb  1 12:37:51 2021	(r563569)
+++ head/x11/fuzzel/Makefile	Mon Feb  1 12:42:53 2021	(r563570)
@@ -26,12 +26,6 @@ PLIST_FILES=	bin/${PORTNAME} \
 		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
 
