diff --git a/devel/libfmt/Makefile b/devel/libfmt/Makefile
index 0417bd3dd784..b7b53eca94d1 100644
--- a/devel/libfmt/Makefile
+++ b/devel/libfmt/Makefile
@@ -1,32 +1,40 @@
 PORTNAME=	fmt
-DISTVERSION=	11.2.0
+PORTVERSION=	11.2.0
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/fmtlib/${PORTNAME}/releases/download/${DISTVERSION}/
+MASTER_SITES=	https://github.com/fmtlib/fmt/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	lib
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Formatting library for C++
 WWW=		https://fmt.dev/ \
 		https://github.com/fmtlib/fmt
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing compiler:c++11-lang cpe pathfix zip
-USE_LDCONFIG=	yes
-
-PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-CMAKE_TESTING_ON=	FMT_TEST
-
-CMAKE_OFF=	FMT_DOC FMT_TEST
-CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	FMT_CUDA_TEST \
+		FMT_DOC \
+		FMT_FUZZ \
+		FMT_MODULE \
+		FMT_PEDANTIC \
+		FMT_SYSTEM_HEADERS \
+		FMT_TEST \
+		FMT_WERROR
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		FMT_OS
+CMAKE_TESTING_ON=	\
+		FMT_FUZZ_LINKMAIN \
+		FMT_TEST
+USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		FULL_CACHE_DRAGONBOX
-OPTIONS_DEFAULT=	FULL_CACHE_DRAGONBOX
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
+OPTIONS_DEFINE=	FULL_CACHE_DRAGONBOX
+OPTIONS_DEFAULT=FULL_CACHE_DRAGONBOX
 FULL_CACHE_DRAGONBOX_DESC=	Use larger binary size for better performance
 
 FULL_CACHE_DRAGONBOX_CXXFLAGS=	-DFMT_USE_FULL_CACHE_DRAGONBOX=1
 
 .include <bsd.port.mk>
diff --git a/devel/libfmt/pkg-plist b/devel/libfmt/pkg-plist
index c1fccf19a22a..623e91f8d534 100644
--- a/devel/libfmt/pkg-plist
+++ b/devel/libfmt/pkg-plist
@@ -1,22 +1,22 @@
 include/fmt/args.h
 include/fmt/base.h
 include/fmt/chrono.h
 include/fmt/color.h
 include/fmt/compile.h
 include/fmt/core.h
 include/fmt/format-inl.h
 include/fmt/format.h
 include/fmt/os.h
 include/fmt/ostream.h
 include/fmt/printf.h
 include/fmt/ranges.h
 include/fmt/std.h
 include/fmt/xchar.h
 lib/cmake/fmt/fmt-config-version.cmake
 lib/cmake/fmt/fmt-config.cmake
 lib/cmake/fmt/fmt-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/fmt/fmt-targets.cmake
 lib/libfmt.so
 lib/libfmt.so.11
-lib/libfmt.so.%%DISTVERSION%%
+lib/libfmt.so.%%PORTVERSION%%
 libdata/pkgconfig/fmt.pc