diff --git a/devel/fccf/Makefile b/devel/fccf/Makefile
index 224b3b6f2e64..6d391124306d 100644
--- a/devel/fccf/Makefile
+++ b/devel/fccf/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	fccf
-PORTVERSION=	0.6.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	0.6.0
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line tool that quickly searches through C/C++
 WWW=		https://github.com/p-ranav/fccf
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	argparse>0:devel/argparse \
-		llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
+BUILD_DEPENDS=	argparse>0:devel/argparse
 LIB_DEPENDS=	libfmt.so:devel/libfmt
-RUN_DEPENDS=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT}
 
-USES=		cmake
+USES=		cmake llvm:build,lib,run
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	p-ranav
 
+CMAKE_ARGS=	-DLLVM_DIR:STRING=${PREFIX}/llvm${LLVM_VERSION}/lib/cmake/llvm
 CXXFLAGS+=	-I${LOCALBASE}/include/argparse
 
 post-patch:
-	${REINPLACE_CMD} "s/llvm-config/llvm-config${LLVM_DEFAULT}/g" ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} "s/llvm-config/${LLVM_CONFIG}/g" ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/devel/fccf/files/patch-CMakeLists.txt b/devel/fccf/files/patch-CMakeLists.txt
index 60a94ebfdcbe..dc107e0cff99 100644
--- a/devel/fccf/files/patch-CMakeLists.txt
+++ b/devel/fccf/files/patch-CMakeLists.txt
@@ -1,54 +1,65 @@
 --- CMakeLists.txt.orig	2022-05-02 12:24:57 UTC
 +++ CMakeLists.txt
-@@ -22,29 +22,32 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native"
+@@ -20,31 +20,33 @@ endif()
+ 
+ set(CMAKE_CXX_FLAGS_DEBUG "-g")
  set(CMAKE_CXX_FLAGS_RELEASE "-O3")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
  
 -# ---- Argparse -------------
  
 -set(CMAKE_MODULE_PATH "")
 -set(CMAKE_LIBRARY_ARCHITECTURE "")
 +## ---- Argparse -------------
 +#
 +#set(CMAKE_MODULE_PATH "")
 +#set(CMAKE_LIBRARY_ARCHITECTURE "")
 +#
 +#include(FetchContent)
 +#
 +#FetchContent_Declare(argparse
 +#  GIT_REPOSITORY https://github.com/p-ranav/argparse.git
 +#  GIT_TAG master
 +#)
 +#FetchContent_MakeAvailable(argparse)
 +find_package(argparse)
 +find_package(fmt)
  
 -include(FetchContent)
 -
 -FetchContent_Declare(argparse
 -  GIT_REPOSITORY https://github.com/p-ranav/argparse.git
 -  GIT_TAG master
 -)
 -FetchContent_MakeAvailable(argparse)
 -
  # ---- Fmt ----------------
 +#
 +#set(FMT_HEADERS "")
 +#
 +#FetchContent_Declare(fmt
 +#  GIT_REPOSITORY https://github.com/fmtlib/fmt.git
 +#  GIT_TAG master
 +#)
 +#FetchContent_MakeAvailable(fmt)
  
 -set(FMT_HEADERS "")
 -
 -FetchContent_Declare(fmt
 -  GIT_REPOSITORY https://github.com/fmtlib/fmt.git
 -  GIT_TAG master
 -)
 -FetchContent_MakeAvailable(fmt)
 -
  # ---- LLVM ---------------
  
  find_package(LLVM REQUIRED CONFIG)
+@@ -90,7 +92,7 @@ find_package(Threads REQUIRED)
+ ## Append flags to enable exceptions and optimization
+ set(CMAKE_CXX_FLAGS_DEBUG "-g")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -std=c++17 -fexceptions")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fexceptions")
+ 
+ # ---- Declare library ----
+