diff --git a/math/py-spot/Makefile b/math/py-spot/Makefile
index eda5daa20cc3..6471569047e9 100644
--- a/math/py-spot/Makefile
+++ b/math/py-spot/Makefile
@@ -1,38 +1,40 @@
 PORTNAME=	spot
 DISTVERSION=	2.11.1
 CATEGORIES=	math
 MASTER_SITES=	http://www.lrde.epita.fr/dload/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for 'Spot', the library for omega automata manipulation
 WWW=		https://spot.lrde.epita.fr
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libspot.so:math/spot
 
-USES=		compiler:c++14-lang gmake libtool python:3.4+
+USES=		compiler:c++17-lang gmake libtool python:3.4+
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-python --disable-static
 
 # otherwise shared libs aren't linked to spot libs for some reason
 LDFLAGS+=	-L${LOCALBASE}/lib
 .for l in spot bddx spotgen spotltsmin
 LDFLAGS+=	-l${l}
 .endfor
 
 post-configure:
 	@${REINPLACE_CMD} ' \
 		s|^BUDDY_LDFLAGS =.*|BUDDY_LDFLAGS = ${LOCALBASE}/lib/libbddx.so|; \
 		s|$$(top_builddir)/spot/libspot.la|${LOCALBASE}/lib/libspot.so|; \
 		s|$$(top_builddir)/spot/ltsmin/libspotltsmin.la|${LOCALBASE}/lib/libspotltsmin.so|; \
 		s|$$(top_builddir)/spot/gen/libspotgen.la|${LOCALBASE}/lib/libspotgen.so|' \
 		${WRKSRC}/python/Makefile
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD}
 
+# to test: cd ../spot && make test WITH_PYTHON=yes
+
 .include <bsd.port.mk>
diff --git a/math/spot/Makefile b/math/spot/Makefile
index 5c46eacd16f0..39020795ff02 100644
--- a/math/spot/Makefile
+++ b/math/spot/Makefile
@@ -1,30 +1,34 @@
 PORTNAME=	spot
 DISTVERSION=	2.11.1
 CATEGORIES=	math
 MASTER_SITES=	http://www.lrde.epita.fr/dload/${PORTNAME}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for omega automata manipulation and model checking
 WWW=		https://spot.lrde.epita.fr
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		charsetfix compiler:c++17-lang gmake libtool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+.if !defined(WITH_PYTHON) # math/py-spot is a separate port but tests don't work there. To test run: make test WITH_PYTHON=yes
 CONFIGURE_ARGS=	--disable-python --disable-static
+.else
+CONFIGURE_ARGS=	--disable-static
+.endif
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	tl.pdf
 
 TEST_TARGET=	check # at least one test fails to run, see https://gitlab.lre.epita.fr/spot/spot/-/issues/517
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
 
 .include <bsd.port.mk>
diff --git a/math/spot/files/patch-spot_misc_tmpfile.cc b/math/spot/files/patch-spot_misc_tmpfile.cc
deleted file mode 100644
index 063d33233e71..000000000000
--- a/math/spot/files/patch-spot_misc_tmpfile.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- spot/misc/tmpfile.cc.orig	2022-10-08 19:11:32 UTC
-+++ spot/misc/tmpfile.cc
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- using namespace std::string_literals;
-