diff --git a/devel/libfmt/Makefile b/devel/libfmt/Makefile
index ee1293339357..75a2e71dd09f 100644
--- a/devel/libfmt/Makefile
+++ b/devel/libfmt/Makefile
@@ -1,40 +1,34 @@
 PORTNAME=	fmt
 # Make sure to check devel/spdlog consumers too
 PORTVERSION=	9.1.0
 CATEGORIES=	devel
+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/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-USES=		cmake compiler:c++11-lang cpe
+USES=		cmake:testing compiler:c++11-lang cpe zip
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	fmtlib
-
-CMAKE_OFF=	FMT_DOC FMT_FUZZ FMT_MODULE FMT_PEDANTIC FMT_SYSTEM_HEADERS FMT_TEST FMT_WERROR
+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
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
+CMAKE_TESTING_ON=	FMT_TEST
+
 # include/fmt/*
 CONFLICTS_INSTALL=	axom
 
 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
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFMT_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
-
 .include <bsd.port.mk>
diff --git a/devel/libfmt/distinfo b/devel/libfmt/distinfo
index 10656e04f033..159ebf02cd50 100644
--- a/devel/libfmt/distinfo
+++ b/devel/libfmt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669806716
-SHA256 (fmtlib-fmt-9.1.0_GH0.tar.gz) = 5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
-SIZE (fmtlib-fmt-9.1.0_GH0.tar.gz) = 837901
+TIMESTAMP = 1670181270
+SHA256 (fmt-9.1.0.zip) = cceb4cb9366e18a5742128cb3524ce5f50e88b476f1e54737a47ffdf4df4c996
+SIZE (fmt-9.1.0.zip) = 1262685