Index: branches/2020Q2/math/combblas/Makefile
===================================================================
--- branches/2020Q2/math/combblas/Makefile	(revision 533562)
+++ branches/2020Q2/math/combblas/Makefile	(revision 533563)
@@ -1,27 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	CombBLAS
 DISTVERSION=	1.6.2
 PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	https://people.eecs.berkeley.edu/~aydin/${PORTNAME}_FILES/
 DISTNAME=	${PORTNAME}_beta_${DISTVERSION:S/.//:S/./_/}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Combinatorial BLAS library: an extensible parallel graph library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmpi.so:net/mpich
 RUN_DEPENDS=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so.1:lang/gcc${GCC_DEFAULT} # because of the link flags induced by mpich
 
 USES=		cmake compiler:c++14-lang localbase:ldflags tar:tgz
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
+EXTRA_PATCHES=	${EXTRA_PATCHES_${CHOSEN_COMPILER_TYPE}}
+EXTRA_PATCHES_clang=	${FILESDIR}/extra-patch-CMakeLists.txt
 
 post-extract:
 	@cd ${WRKSRC}/include && ${RM} .DS_Store ._.DS_Store CombBLAS/._CombBLAS.h
 
 .include <bsd.port.mk>
Index: branches/2020Q2/math/combblas/files/patch-CMakeLists.txt
===================================================================
--- branches/2020Q2/math/combblas/files/patch-CMakeLists.txt	(revision 533562)
+++ branches/2020Q2/math/combblas/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,24 +0,0 @@
---- CMakeLists.txt.orig	2018-12-16 07:56:08 UTC
-+++ CMakeLists.txt
-@@ -23,7 +23,11 @@ target_include_directories(CombBLAS PRIV
- 
- # MPI and OpenMP dependencies
- find_package(MPI REQUIRED)
--find_package(OpenMP REQUIRED)
-+#find_package(OpenMP REQUIRED)
-+set(OPENMP_FOUND TRUE)
-+set(OpenMP_CXX_FOUND TRUE)
-+set(OpenMP_CXX_FLAGS "")
-+set(OpenMP_LINK_FLAGS "-lomp")
- 
- if(TARGET MPI::MPI_CXX) # Use target if available (cmake >= 3.9)
-   target_link_libraries(CombBLAS PUBLIC MPI::MPI_CXX)
-@@ -40,7 +44,7 @@ if(OPENMP_FOUND OR OpenMP_CXX_FOUND)
-     target_link_libraries(CombBLAS PUBLIC OpenMP::OpenMP_CXX)
-   else()
-     target_compile_options(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}")
--    target_link_libraries(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}")
-+    target_link_libraries(CombBLAS PUBLIC "${OpenMP_LINK_FLAGS}")
-   endif()
- endif()
- 

Property changes on: branches/2020Q2/math/combblas/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt
===================================================================
--- branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt	(nonexistent)
+++ branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt	(revision 533563)
@@ -0,0 +1,24 @@
+--- CMakeLists.txt.orig	2018-12-16 07:56:08 UTC
++++ CMakeLists.txt
+@@ -23,7 +23,11 @@ target_include_directories(CombBLAS PRIV
+ 
+ # MPI and OpenMP dependencies
+ find_package(MPI REQUIRED)
+-find_package(OpenMP REQUIRED)
++#find_package(OpenMP REQUIRED)
++set(OPENMP_FOUND TRUE)
++set(OpenMP_CXX_FOUND TRUE)
++set(OpenMP_CXX_FLAGS "")
++set(OpenMP_LINK_FLAGS "-lomp")
+ 
+ if(TARGET MPI::MPI_CXX) # Use target if available (cmake >= 3.9)
+   target_link_libraries(CombBLAS PUBLIC MPI::MPI_CXX)
+@@ -40,7 +44,7 @@ if(OPENMP_FOUND OR OpenMP_CXX_FOUND)
+     target_link_libraries(CombBLAS PUBLIC OpenMP::OpenMP_CXX)
+   else()
+     target_compile_options(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}")
+-    target_link_libraries(CombBLAS PUBLIC "${OpenMP_CXX_FLAGS}")
++    target_link_libraries(CombBLAS PUBLIC "${OpenMP_LINK_FLAGS}")
+   endif()
+ endif()
+ 

Property changes on: branches/2020Q2/math/combblas/files/extra-patch-CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 533562)
+++ branches/2020Q2	(revision 533563)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r533561