diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index cd4ce2aeef61..b2c3906c302b 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	1efad3028a1953af2cf62b518a54ffeb309977bc.patch:-p1 # https://github.com/horizon-eda/horizon/issues/727
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	EDA package for printed circuit board design
 WWW=		https://horizon-eda.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \
 		cppzmq>0:net/cppzmq \
 		glm>0:math/glm
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libepoxy.so:graphics/libepoxy \
 		libgit2.so:devel/libgit2 \
 		libharfbuzz.so:print/harfbuzz \
 		libpng16.so:graphics/png \
 		libpodofo09.so:graphics/podofo09 \
-		libTKSTEP.so:cad/opencascade \
+		libTKDESTEP.so:cad/opencascade \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libzip.so:archivers/libzip \
 		libzmq.so:net/libzmq4
 
 USES=		desktop-file-utils gmake gnome libarchive llvm:15 localbase pkgconfig python:build sqlite # compiler:c++17-lang; llvm:15 is a workaround for bug#263870
 USE_GNOME=	atkmm gdkpixbuf2 gtkmm30 librsvg2
 
 USE_GITHUB=	yes
 GH_PROJECT=	horizon
 
 MAKE_ARGS=	DEBUGFLAGS= OPTIMIZE=
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 # Patch sources to force using include files installed by graphics/podofo09
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e '/^#include/s|podofo/podofo.h|podofo09/podofo.h|' \
 		${WRKSRC}/src/export_pdf/export_pdf.cpp \
 		${WRKSRC}/src/export_pdf/export_pdf_board.cpp \
 		${WRKSRC}/src/python_module/board.cpp \
 		${WRKSRC}/src/python_module/schematic.cpp \
 		${WRKSRC}/src/imp/pdf_export_window.cpp \
 		${WRKSRC}/src/export_pdf/export_pdf_util.hpp \
 		${WRKSRC}/src/export_pdf/canvas_pdf.hpp
 
 post-install: # https://github.com/horizon-eda/horizon/issues/558
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} horizon-eda horizon-imp
 
 .include <bsd.port.mk>
diff --git a/cad/horizon-eda/files/patch-Makefile b/cad/horizon-eda/files/patch-Makefile
index f683e29eb4b2..ab36a628a416 100644
--- a/cad/horizon-eda/files/patch-Makefile
+++ b/cad/horizon-eda/files/patch-Makefile
@@ -1,26 +1,35 @@
---- Makefile.orig	2022-10-15 16:47:51 UTC
+--- Makefile.orig	2023-06-18 14:18:38 UTC
 +++ Makefile
-@@ -1071,9 +1071,10 @@ $(BUILDDIR)/gen/help_texts.hpp: scripts/make_help.py s
+@@ -1037,7 +1037,7 @@ OCE_LIBDIRS = -L/opt/opencascade/lib/ -L${CASROOT}/lib
+ INC_OCE ?= -isystem /opt/opencascade/inc/ -isystem /mingw64/include/oce/ -isystem /usr/include/oce -isystem /usr/include/opencascade -isystem ${CASROOT}/include/opencascade -isystem ${CASROOT}/include/oce -isystem /usr/local/include/OpenCASCADE
+ INC_PYTHON = $(shell $(PKG_CONFIG) --cflags python3 py3cairo)
+ OCE_LIBDIRS = -L/opt/opencascade/lib/ -L${CASROOT}/lib
+-LDFLAGS_OCE = $(OCE_LIBDIRS) -lTKSTEP  -lTKernel  -lTKXCAF -lTKXSBase -lTKBRep -lTKCDF -lTKXDESTEP -lTKLCAF -lTKMath -lTKMesh -lTKTopAlgo -lTKPrim -lTKBO -lTKShHealing -lTKBRep -lTKG3d
++LDFLAGS_OCE = $(OCE_LIBDIRS) -lTKDESTEP  -lTKernel  -lTKXCAF -lTKXSBase -lTKBRep -lTKCDF -lTKXSDRAWSTEP -lTKLCAF -lTKMath -lTKMesh -lTKTopAlgo -lTKPrim -lTKBO -lTKShHealing -lTKBRep -lTKG3d
+ ifeq ($(OS),Windows_NT)
+ 	LDFLAGS_OCE += -lTKV3d
+ endif
+@@ -1084,9 +1084,10 @@ $(BUILDDIR)/gen/help_texts.hpp: scripts/make_help.py s
  	$(ECHO) " $@"
  	$(QUIET)python3 scripts/make_help.py h src/help_texts.txt > $@
  
 +# Force linking to podofo09 library provided by the graphics/podofo09 port
  $(BUILDDIR)/horizon-imp: $(OBJ_COMMON) $(OBJ_ROUTER) $(OBJ_OCE) $(OBJ_IMP)
  	$(ECHO) " $@"
 -	$(QUIET)$(CXX) $^ $(LDFLAGS) $(LDFLAGS_GUI) $(LDFLAGS_OCE) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) gtkmm-3.0 epoxy cairomm-pdf-1.0 librsvg-2.0 libzmq libcurl libpng libarchive) -lpodofo -lTKHLR -lTKGeomBase $(EXTRA_LIBS) -o $@
 +	$(QUIET)$(CXX) $^ $(LDFLAGS) $(LDFLAGS_GUI) $(LDFLAGS_OCE) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) gtkmm-3.0 epoxy cairomm-pdf-1.0 librsvg-2.0 libzmq libcurl libpng libarchive) -lpodofo09 -lTKHLR -lTKGeomBase $(EXTRA_LIBS) -o $@
  
  $(BUILDDIR)/horizon-pool: $(OBJ_COMMON) $(OBJ_POOL_UTIL)
  	$(ECHO) " $@"
-@@ -1103,9 +1104,10 @@ $(BUILDDIR)/horizon-pr-review: $(OBJ_COMMON) $(OBJ_PR_
+@@ -1116,9 +1117,10 @@ $(BUILDDIR)/horizon-pr-review: $(OBJ_COMMON) $(OBJ_PR_
  	$(ECHO) " $@"
  	$(QUIET)$(CXX) $^ $(LDFLAGS) $(INC) $(CXXFLAGS) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) glibmm-2.4 giomm-2.4 cairomm-1.0 libgit2 libpng) -lOSMesa $(LDFLAGS_OCE) -o $@
  
 +# Force linking to podofo09 library provided by the graphics/podofo09 port
  $(BUILDDIR)/horizon.so: $(OBJ_PYTHON) $(OBJ_SHARED) $(OBJ_SHARED_OCE)
  	$(ECHO) " $@"
 -	$(QUIET)$(CXX) $^ $(LDFLAGS) $(INC) $(CXXFLAGS) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) python3 glibmm-2.4 giomm-2.4 cairomm-1.0 py3cairo libpng libarchive) -lpodofo  $(OCE_LIBDIRS) -lTKXDESTEP -lOSMesa -shared -o $@
 +	$(QUIET)$(CXX) $^ $(LDFLAGS) $(INC) $(CXXFLAGS) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) python3 glibmm-2.4 giomm-2.4 cairomm-1.0 py3cairo libpng libarchive) -lpodofo09  $(OCE_LIBDIRS) -lTKXDESTEP -lOSMesa -shared -o $@
  
  $(OBJDIR)/%.o: %.c
  	$(QUIET)$(MKDIR) $(dir $@)