diff --git a/graphics/py-s2/Makefile b/graphics/py-s2/Makefile
index 29883bb2e5ac..920d39694398 100644
--- a/graphics/py-s2/Makefile
+++ b/graphics/py-s2/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	s2
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,13 +12,15 @@ WWW=		https://s2geometry.io/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
-BUILD_DEPENDS=	s2>=${PORTVERSION}:graphics/s2 \
+BUILD_DEPENDS=	s2>=${PORTVERSION}<${PORTVERSION}_99:graphics/s2 \
 		swig>=4:devel/swig
 LIB_DEPENDS=	libs2.so:graphics/s2
 
-USES=		cmake compiler:c++11-lang localbase:ldflags python
+USES=		cmake compiler:c++17-lang localbase:ldflags python
 
 CMAKE_ON=	WITH_PYTHON
+USE_CXXSTD=	c++17
+
 WRKSRC_SUBDIR=	src/python
 
 GH_ACCOUNT=	google