MFH: r485187

cad/openvsp: Unbreak port

Port was broken after last compilers updates in 11 and 12.
Clang is now able to compile the port but we need to patch as_callfunc_x86.cpp
unconditionally, otherwise clang complains (or dies, depending on the version)
with:

this directive must appear between .cfi_startproc and .cfi_endproc directives

Also use localbase to simplify flags handling.

Reported by:	pkg-fallout

Approved by:	portmgr@

cad/openvsp/Makefile

@@ -30,22 +30,15 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:graphics/opennurbs \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 
-CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
-CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
-
-USES=		cmake:outsource,noninja jpeg
+USES=		compiler:c++11-lang cmake:outsource,noninja localbase\
+		gl gnome jpeg
 
 USE_GITHUB=	yes
 GH_PROJECT=	OpenVSP
 GH_ACCOUNT=	${GH_PROJECT}
 
-# On FreeBSD < 11 libc++ lacks support for sized delete operators.
-# GCC dropped the builtin version of these operators in 6+ by
-# defaulting to gnu++14. Force c++11 instead.
-# For a more detailed discussion see:
-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484
-USE_CXXSTD=	gnu++11
-
+CMAKE_SOURCE_PATH=	${WRKSRC}/SuperProject
+CMAKE_INSTALL_PREFIX=	${STAGEDIR}${PREFIX}
 CMAKE_ARGS=	-DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \
 		-DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \
@@ -60,24 +53,9 @@ USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
 USE_GL=		gl glu
 
 USE_GNOME=	libxml2
-CFLAGS+=	-I${LOCALBASE}/include/openNURBS
 
 .include <bsd.port.options.mk>
 
-# In 12 gcc can not compile the port so switch to clang 5.0.0 in base.
-# But wait! It crashes while compiling so apply a patch to avoid weird asm code
-# that makes clang die
-# For details see:
-# https://lists.freebsd.org/pipermail/freebsd-hackers/2017-August/051352.html
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000
-USES+=	compiler:c++11-lib
-EXTRA_PATCHES=	${FILESDIR}/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp
-CFLAGS+=	-I${LOCALBASE}/include
-.else
-USES+=	compiler:gcc-c++11-lib
-.endif
-
 BUILD_PREFIX=	OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD
 
 do-install: