diff --git a/math/cglm/Makefile b/math/cglm/Makefile
index 0ce9c0b6e527..224003824464 100644
--- a/math/cglm/Makefile
+++ b/math/cglm/Makefile
@@ -1,24 +1,26 @@
 PORTNAME=	cglm
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Highly optimized graphics math (glm) for C
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c11
+USES=		compiler:c11 meson # was cmake before
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	recp
 
-do-test:
-	@cd ${BUILD_WRKSRC} && \
-		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DCGLM_USE_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
+pre-test:
+	@if [ ! -e ${WRKDIR}/.meson_build_testing ]; then \
+		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
+		${MAKE} -C${.CURDIR} build MESON_ARGS="`make -V MESON_ARGS` --reconfigure -Dbuild_tests=true"; \
+		${TOUCH} ${WRKDIR}/.meson_build_testing; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/math/cglm/pkg-plist b/math/cglm/pkg-plist
index 2e97dea5d9d6..4b63839768f7 100644
--- a/math/cglm/pkg-plist
+++ b/math/cglm/pkg-plist
@@ -1,141 +1,139 @@
 include/cglm/affine-mat.h
 include/cglm/affine.h
 include/cglm/affine2d.h
 include/cglm/applesimd.h
 include/cglm/bezier.h
 include/cglm/box.h
 include/cglm/call.h
 include/cglm/call/affine.h
 include/cglm/call/affine2d.h
 include/cglm/call/bezier.h
 include/cglm/call/box.h
 include/cglm/call/cam.h
 include/cglm/call/clipspace/ortho_lh_no.h
 include/cglm/call/clipspace/ortho_lh_zo.h
 include/cglm/call/clipspace/ortho_rh_no.h
 include/cglm/call/clipspace/ortho_rh_zo.h
 include/cglm/call/clipspace/persp_lh_no.h
 include/cglm/call/clipspace/persp_lh_zo.h
 include/cglm/call/clipspace/persp_rh_no.h
 include/cglm/call/clipspace/persp_rh_zo.h
 include/cglm/call/clipspace/project_no.h
 include/cglm/call/clipspace/project_zo.h
 include/cglm/call/clipspace/view_lh_no.h
 include/cglm/call/clipspace/view_lh_zo.h
 include/cglm/call/clipspace/view_rh_no.h
 include/cglm/call/clipspace/view_rh_zo.h
 include/cglm/call/curve.h
 include/cglm/call/ease.h
 include/cglm/call/euler.h
 include/cglm/call/frustum.h
 include/cglm/call/io.h
 include/cglm/call/mat2.h
 include/cglm/call/mat3.h
 include/cglm/call/mat4.h
 include/cglm/call/plane.h
 include/cglm/call/project.h
 include/cglm/call/quat.h
 include/cglm/call/ray.h
 include/cglm/call/sphere.h
 include/cglm/call/vec2.h
 include/cglm/call/vec3.h
 include/cglm/call/vec4.h
 include/cglm/cam.h
 include/cglm/cglm.h
 include/cglm/clipspace/ortho_lh_no.h
 include/cglm/clipspace/ortho_lh_zo.h
 include/cglm/clipspace/ortho_rh_no.h
 include/cglm/clipspace/ortho_rh_zo.h
 include/cglm/clipspace/persp.h
 include/cglm/clipspace/persp_lh_no.h
 include/cglm/clipspace/persp_lh_zo.h
 include/cglm/clipspace/persp_rh_no.h
 include/cglm/clipspace/persp_rh_zo.h
 include/cglm/clipspace/project_no.h
 include/cglm/clipspace/project_zo.h
 include/cglm/clipspace/view_lh.h
 include/cglm/clipspace/view_lh_no.h
 include/cglm/clipspace/view_lh_zo.h
 include/cglm/clipspace/view_rh.h
 include/cglm/clipspace/view_rh_no.h
 include/cglm/clipspace/view_rh_zo.h
 include/cglm/color.h
 include/cglm/common.h
 include/cglm/curve.h
 include/cglm/ease.h
 include/cglm/euler.h
 include/cglm/frustum.h
 include/cglm/io.h
 include/cglm/mat2.h
 include/cglm/mat3.h
 include/cglm/mat4.h
 include/cglm/plane.h
 include/cglm/project.h
 include/cglm/quat.h
 include/cglm/ray.h
 include/cglm/simd/arm.h
 include/cglm/simd/avx/affine.h
 include/cglm/simd/avx/mat4.h
 include/cglm/simd/intrin.h
 include/cglm/simd/neon/affine.h
 include/cglm/simd/neon/mat2.h
 include/cglm/simd/neon/mat4.h
 include/cglm/simd/neon/quat.h
 include/cglm/simd/sse2/affine.h
 include/cglm/simd/sse2/mat2.h
 include/cglm/simd/sse2/mat3.h
 include/cglm/simd/sse2/mat4.h
 include/cglm/simd/sse2/quat.h
 include/cglm/simd/x86.h
 include/cglm/sphere.h
 include/cglm/struct.h
 include/cglm/struct/affine.h
 include/cglm/struct/affine2d.h
 include/cglm/struct/box.h
 include/cglm/struct/cam.h
 include/cglm/struct/clipspace/ortho_lh_no.h
 include/cglm/struct/clipspace/ortho_lh_zo.h
 include/cglm/struct/clipspace/ortho_rh_no.h
 include/cglm/struct/clipspace/ortho_rh_zo.h
 include/cglm/struct/clipspace/persp_lh_no.h
 include/cglm/struct/clipspace/persp_lh_zo.h
 include/cglm/struct/clipspace/persp_rh_no.h
 include/cglm/struct/clipspace/persp_rh_zo.h
 include/cglm/struct/clipspace/view_lh_no.h
 include/cglm/struct/clipspace/view_lh_zo.h
 include/cglm/struct/clipspace/view_rh_no.h
 include/cglm/struct/clipspace/view_rh_zo.h
 include/cglm/struct/color.h
 include/cglm/struct/curve.h
 include/cglm/struct/euler.h
 include/cglm/struct/frustum.h
 include/cglm/struct/io.h
 include/cglm/struct/mat2.h
 include/cglm/struct/mat3.h
 include/cglm/struct/mat4.h
 include/cglm/struct/plane.h
 include/cglm/struct/project.h
 include/cglm/struct/quat.h
 include/cglm/struct/sphere.h
 include/cglm/struct/vec2-ext.h
 include/cglm/struct/vec2.h
 include/cglm/struct/vec3-ext.h
 include/cglm/struct/vec3.h
 include/cglm/struct/vec4-ext.h
 include/cglm/struct/vec4.h
 include/cglm/types-struct.h
 include/cglm/types.h
 include/cglm/util.h
 include/cglm/vec2-ext.h
 include/cglm/vec2.h
 include/cglm/vec3-ext.h
 include/cglm/vec3.h
 include/cglm/vec4-ext.h
 include/cglm/vec4.h
 include/cglm/version.h
-lib/cmake/cglm/cglmConfig-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/cglm/cglmConfig.cmake
 lib/libcglm.so
 lib/libcglm.so.0
 lib/libcglm.so.0.8.4
 libdata/pkgconfig/cglm.pc