diff --git a/cad/gdstk/Makefile b/cad/gdstk/Makefile
index 12f83e6efe47..9dacf2408354 100644
--- a/cad/gdstk/Makefile
+++ b/cad/gdstk/Makefile
@@ -1,24 +1,24 @@
 PORTNAME=	gdstk
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.53
+DISTVERSION=	0.9.55
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library for creation and manipulation of GDSII and OASIS files
 WWW=		https://heitzmann.github.io/gdstk/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libqhull_r.so:math/qhull
 
-USES=		cmake compiler:c++11-lang
+USES=		cmake compiler:c++17-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	heitzmann
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 CONFLICTS_INSTALL=	misc/vxl # both install lib/libclipper.so
 
 .include <bsd.port.mk>
diff --git a/cad/gdstk/distinfo b/cad/gdstk/distinfo
index 40306c73a88f..b2008d0f1c68 100644
--- a/cad/gdstk/distinfo
+++ b/cad/gdstk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720985146
-SHA256 (heitzmann-gdstk-v0.9.53_GH0.tar.gz) = 8fdf85e9e90838720ff1d3555e5b880868cbc18a919261f317772b0327457be0
-SIZE (heitzmann-gdstk-v0.9.53_GH0.tar.gz) = 365722
+TIMESTAMP = 1725176242
+SHA256 (heitzmann-gdstk-v0.9.55_GH0.tar.gz) = 55bcedc73f4da02cccdcc82dee6b704035c196acc6f56fd36e950a91ccde48d7
+SIZE (heitzmann-gdstk-v0.9.55_GH0.tar.gz) = 365716
diff --git a/cad/py-gdstk/Makefile b/cad/py-gdstk/Makefile
index 5713a2143acf..bcb6787f3046 100644
--- a/cad/py-gdstk/Makefile
+++ b/cad/py-gdstk/Makefile
@@ -1,29 +1,33 @@
 PORTNAME=	gdstk
-DISTVERSION=	0.9.53
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.9.55
 CATEGORIES=	cad
-MASTER_SITES=	PYPI
+#MASTER_SITES=	PYPI # some test files are missing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for creation and manipulation of GDSII and OASIS files
 WWW=		https://heitzmann.github.io/gdstk/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	cmake:devel/cmake-core \
 		${PYTHON_PKGNAMEPREFIX}pyproject-metadata>0:devel/py-pyproject-metadata@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-build-core>0:devel/py-scikit-build-core@${PY_FLAVOR} \
 		${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYNUMPY}
 LIB_DEPENDS=	libqhull_r.so:math/qhull
 RUN_DEPENDS=	${PYNUMPY}
 
-USES=		compiler:c++11-lang python
-USE_PYTHON=	pep517 autoplist pytest # tests crash, see https://github.com/heitzmann/gdstk/issues/263
+USES=		compiler:c++17-lang python
+USE_PYTHON=	pep517 autoplist pytest
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	heitzmann
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 TEST_WRKSRC=	${WRKSRC}/tests
 
 .include <bsd.port.mk>
diff --git a/cad/py-gdstk/distinfo b/cad/py-gdstk/distinfo
index 8bff318c279e..11e533a5bb68 100644
--- a/cad/py-gdstk/distinfo
+++ b/cad/py-gdstk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1720985236
-SHA256 (gdstk-0.9.53.tar.gz) = 73c87e2e3d43911b09f2a10c90359426bd15dcdeb799606bbc1e93e49acacd90
-SIZE (gdstk-0.9.53.tar.gz) = 315746
+TIMESTAMP = 1725176520
+SHA256 (heitzmann-gdstk-v0.9.55_GH0.tar.gz) = 55bcedc73f4da02cccdcc82dee6b704035c196acc6f56fd36e950a91ccde48d7
+SIZE (heitzmann-gdstk-v0.9.55_GH0.tar.gz) = 365716
diff --git a/cad/py-gdstk/files/patch-pyproject.toml b/cad/py-gdstk/files/patch-pyproject.toml
index 58a748ace137..06f4e7fe0066 100644
--- a/cad/py-gdstk/files/patch-pyproject.toml
+++ b/cad/py-gdstk/files/patch-pyproject.toml
@@ -1,20 +1,11 @@
---- pyproject.toml.orig	2024-07-04 23:14:49 UTC
+--- pyproject.toml.orig	2024-08-31 19:01:18 UTC
 +++ pyproject.toml
 @@ -1,7 +1,7 @@ requires = [
  [build-system]
  requires = [
      "scikit_build_core",
 -    "numpy >= 2.0"
 +    "numpy"
  ]
  build-backend = "scikit_build_core.build"
  
-@@ -29,7 +29,7 @@ dependencies = [
- license = {file = "LICENSE"}
- dependencies = [
-     "numpy; platform_system=='Darwin'",
--    "oldest-supported-numpy; platform_system!='Darwin'",
-+    "numpy; platform_system!='Darwin'",
-     "typing_extensions; python_version < '3.11'"
- ]
- requires-python = ">=3.9"