git: 54b0b4f006fc - main - cad/horizon-eda: fix with OpenCascade 7.8.0

The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54b0b4f006fc9df6a76baa40eb23d746b4ae1f2d

commit 54b0b4f006fc9df6a76baa40eb23d746b4ae1f2d
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2024-03-11 20:04:45 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-03-21 18:01:18 +0000

    cad/horizon-eda: fix with OpenCascade 7.8.0
---
 cad/horizon-eda/Makefile             |  6 +++---
 cad/horizon-eda/files/patch-Makefile | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

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,7 +1,7 @@
 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/
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		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
@@ -39,7 +39,7 @@ 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 \
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,6 +1,15 @@
---- 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 > $@
  
@@ -12,7 +21,7 @@
  
  $(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 $@