Index: head/math/suitesparse/Makefile
===================================================================
--- head/math/suitesparse/Makefile	(revision 541336)
+++ head/math/suitesparse/Makefile	(revision 541337)
@@ -1,96 +1,96 @@
 # Created by: Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	suitesparse
 PORTVERSION=	5.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	Set of packages for sparse matrix calculation
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libmetis.so:math/metis
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	DrTimothyAldenDavis
 GH_PROJECT=	SuiteSparse
 
 USES=		cmake:insource fortran gmake localbase:ldflags
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install # skip USES=cmake
 MAKE_ENV=	BLAS="${BLASLIB}" LAPACK="${LAPACKLIB}" \
 		MY_METIS_LIB="-lmetis" \
 		JOBS="${MAKE_JOBS_NUMBER}" \
 		CMAKE_OPTIONS='${CMAKE_ARGS}' \
 		INSTALL="${STAGEDIR}${PREFIX}" \
 		INSTALL_DOC="${STAGEDIR}${DOCSDIR}" \
 		INSTALL_INCLUDE="${STAGEDIR}${PREFIX}/include/${PORTNAME}"
 CMAKE_ARGS=	-DCMAKE_INSTALL_INCLUDEDIR:PATH="include/${PORTNAME}"	\
 		-DBUILD_GRB_STATIC_LIBRARY:BOOL=ON
 LDFLAGS+=	-L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions
 
 CONFLICTS_INSTALL=	mongoose plinkseq # bin/mongoose
 
 OPTIONS_DEFINE=		DEMOS DOCS OPENMP TBB
 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	ATLAS GOTOBLAS NETLIB OPENBLAS
 OPTIONS_DEFAULT=	OPENBLAS OPENMP TBB
 
 ATLAS_USES=		blaslapack:atlas
 GOTOBLAS_DESC=		Goto blas implementation
 GOTOBLAS_USES=		blaslapack:gotoblas
 NETLIB_USES=		blaslapack:netlib
 OPENBLAS_USES=		blaslapack:openblas
 
 OPENMP_MAKE_ENV_OFF=	CFOPENMP=
 .if !exists(/usr/include/omp.h)
 # XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet
 OPENMP_VARS=		OPENMP=gcc-
 .endif
 
 DEMOS_DESC=		Install the demonstrations
 DEMOS_ALL_TARGET=	go
 DEMOS_ALL_TARGET_OFF=	library
 
 TBB_DESC=		Intel threading building blocks
 TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
 TBB_MAKE_ENV=		TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB"
 
 MODULES=	AMD CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse_newfiles	\
 		CXSparse GPUQREngine KLU LDL RBio SPQR UMFPACK
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386
 # See PR 230888 : Missing 64 bit atomic functions for i386
-USES+=		compiler:gcc-c++11-lib
+USE_GCC=	yes
 LDFLAGS+=	-latomic
 .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv1
 USE_GCC=	yes
 .else
 USES+=	compiler:c++11-lib
 .endif
 
 post-extract:
 	${RM} -r ${WRKSRC}/metis-*
 
 post-patch-OPENMP-off:
 	@${REINPLACE_CMD} -e '/find_package.*OpenMP/d' \
 		${WRKSRC}/GraphBLAS/CMakeLists.txt
 
 pre-configure:
 .for m in ${MODULES}
 	${REINPLACE_CMD} -e 's|-I../../include|-I${STAGEDIR}${PREFIX}/include/suitesparse|;\
 		s|-lsuitesparseconfig|-lsuitesparseconfig -L${LOCALBASE}/lib|'	\
 		${WRKSRC}/${m}/Demo/Makefile
 .endfor
 
 do-configure: # skip USES=cmake
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>