diff --git a/math/libxlsxwriter/Makefile b/math/libxlsxwriter/Makefile
index 4a6331f9a524..7894210895a9 100644
--- a/math/libxlsxwriter/Makefile
+++ b/math/libxlsxwriter/Makefile
@@ -1,19 +1,36 @@
 PORTNAME=	libxlsxwriter
-PORTVERSION=	1.1.8
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.8
+PORTREVISION=	1
 CATEGORIES=	math devel
 
+PATCH_SITES=	https://github.com/jmcnamara/libxlsxwriter/commit/
+PATCHFILES=	5af9c1fd3e330a6a4aeaba58599e2c5294c521ab.patch:-p1
+
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	C library for creating Excel XLSX files
 WWW=		https://libxlsxwriter.github.io/
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/License.txt
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+
+USES=		cmake:testing compiler:c11 localbase:ldflags minizip pathfix \
+		pkgconfig python:test ssl
+USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jmcnamara
-MAKE_ARGS=	INSTALL_DIR=${STAGEDIR}${PREFIX}
 
-USE_LDCONFIG=	yes
-USES=		compiler:c11 gmake
+EXTRACT_AFTER_ARGS=	--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/third_party/md5 \
+			--exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/third_party/minizip \
+			--no-same-owner --no-same-permissions
+
+CMAKE_TESTING_ON=	BUILD_TESTS
+
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		USE_OPENSSL_MD5 \
+		USE_SYSTEM_MINIZIP
 
 .include <bsd.port.mk>
diff --git a/math/libxlsxwriter/distinfo b/math/libxlsxwriter/distinfo
index 1cfeb170499f..94ae562def03 100644
--- a/math/libxlsxwriter/distinfo
+++ b/math/libxlsxwriter/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1724058226
+TIMESTAMP = 1725056181
 SHA256 (jmcnamara-libxlsxwriter-v1.1.8_GH0.tar.gz) = 122c98353e5b69284a1cd782be7ae67bdefde2146f8197ef89a1aaf886058e86
 SIZE (jmcnamara-libxlsxwriter-v1.1.8_GH0.tar.gz) = 21840785
+SHA256 (5af9c1fd3e330a6a4aeaba58599e2c5294c521ab.patch) = b5b9d12c52bb6640c5399967360f9d1cd7a31a7c15bd2a6d3226d8c50b445074
+SIZE (5af9c1fd3e330a6a4aeaba58599e2c5294c521ab.patch) = 3271
diff --git a/math/libxlsxwriter/files/patch-src_Makefile b/math/libxlsxwriter/files/patch-src_Makefile
deleted file mode 100644
index 16df7eece123..000000000000
--- a/math/libxlsxwriter/files/patch-src_Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.orig	2021-07-12 22:30:20 UTC
-+++ src/Makefile
-@@ -159,11 +159,11 @@ $(LIBXLSXWRITER_A) : $(OBJS)
- 
- # The dynamic library.
- ifeq ($(findstring m32,$(CFLAGS)),m32)
--ARCH = -m32
-+XSLX_ARCH = -m32
- endif
- 
- $(LIBXLSXWRITER_SO) : $(SOBJS)
--	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $(DTOA_LIB_SO) $^ $(LIBS)
-+	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(XSLX_ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $(DTOA_LIB_SO) $^ $(LIBS)
- 
- # The test library.
- $(LIBXLSXWRITER_TO) : $(TOBJS)
diff --git a/math/libxlsxwriter/pkg-plist b/math/libxlsxwriter/pkg-plist
index fe2b4a09efe2..55e069be4b40 100644
--- a/math/libxlsxwriter/pkg-plist
+++ b/math/libxlsxwriter/pkg-plist
@@ -1,39 +1,38 @@
 include/xlsxwriter.h
 include/xlsxwriter/app.h
 include/xlsxwriter/chart.h
 include/xlsxwriter/chartsheet.h
 include/xlsxwriter/comment.h
 include/xlsxwriter/common.h
 include/xlsxwriter/content_types.h
 include/xlsxwriter/core.h
 include/xlsxwriter/custom.h
 include/xlsxwriter/drawing.h
 include/xlsxwriter/format.h
 include/xlsxwriter/hash_table.h
 include/xlsxwriter/metadata.h
 include/xlsxwriter/packager.h
 include/xlsxwriter/relationships.h
 include/xlsxwriter/rich_value.h
 include/xlsxwriter/rich_value_rel.h
 include/xlsxwriter/rich_value_structure.h
 include/xlsxwriter/rich_value_types.h
 include/xlsxwriter/shared_strings.h
 include/xlsxwriter/styles.h
 include/xlsxwriter/table.h
 include/xlsxwriter/theme.h
 include/xlsxwriter/third_party/emyg_dtoa.h
 include/xlsxwriter/third_party/ioapi.h
 include/xlsxwriter/third_party/md5.h
 include/xlsxwriter/third_party/queue.h
 include/xlsxwriter/third_party/tmpfileplus.h
 include/xlsxwriter/third_party/tree.h
 include/xlsxwriter/third_party/zip.h
 include/xlsxwriter/utility.h
 include/xlsxwriter/vml.h
 include/xlsxwriter/workbook.h
 include/xlsxwriter/worksheet.h
 include/xlsxwriter/xmlwriter.h
-lib/libxlsxwriter.a
 lib/libxlsxwriter.so
 lib/libxlsxwriter.so.7
 libdata/pkgconfig/xlsxwriter.pc