diff --git a/devel/gpds/Makefile b/devel/gpds/Makefile
--- a/devel/gpds/Makefile
+++ b/devel/gpds/Makefile
@@ -1,23 +1,28 @@
 PORTNAME=	gpds
-DISTVERSION=	1.6.0
+DISTVERSION=	1.7.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbo@FreeBSD.org
 COMMENT=	General purpose data serializer library written in modern C++
-WWW=		https://gpds.simulton.com/
+WWW=		https://github.com/simulton/gpds
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/license.txt
 
-RUN_DEPENDS=	spdlog>=1.9.0:devel/spdlog
-
-USES=		cmake compiler:c++17-lang
+USES=		cmake compiler:c++20-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	simulton
 
-CMAKE_ON=	GPDS_FEATURE_SPDLOG
 CMAKE_OFF=	GPDS_BUILD_EXAMPLES GPDS_BUILD_TESTS
 
 PLIST_SUB=	SOVERSION="${DISTVERSION}"
 
+OPTIONS_DEFINE=		SPDLOG
+OPTIONS_DEFAULT=	SPDLOG
+OPTIONS_SUB=		yes
+
+SPDLOG_DESC=		Enable (de)serialization interface for spdlog
+SPDLOG_RUN_DEPENDS=	spdlog>=1.9.0:devel/spdlog
+SPDLOG_CMAKE_BOOL=	GPDS_FEATURE_SPDLOG
+
 .include <bsd.port.mk>
diff --git a/devel/gpds/distinfo b/devel/gpds/distinfo
--- a/devel/gpds/distinfo
+++ b/devel/gpds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689352101
-SHA256 (simulton-gpds-1.6.0_GH0.tar.gz) = 6e603243ce4712db22385c045f49a42d7acc38ca16cf402dd770aed676ef0e93
-SIZE (simulton-gpds-1.6.0_GH0.tar.gz) = 874971
+TIMESTAMP = 1696517047
+SHA256 (simulton-gpds-1.7.0_GH0.tar.gz) = cb8ea10ef778ebbf97fa279783a2f876363452d87a27f58d8c910b7a617d24ca
+SIZE (simulton-gpds-1.7.0_GH0.tar.gz) = 874784
diff --git a/devel/gpds/pkg-plist b/devel/gpds/pkg-plist
--- a/devel/gpds/pkg-plist
+++ b/devel/gpds/pkg-plist
@@ -4,7 +4,7 @@
 include/gpds/attributes.hpp
 include/gpds/container.hpp
 include/gpds/serialize.hpp
-include/gpds/spdlog_sink.hpp
+%%SPDLOG%%include/gpds/spdlog_sink.hpp
 include/gpds/utils.hpp
 include/gpds/value.hpp
 lib/cmake/gpds/gpds-config-version.cmake