cad/horizon-eda: update 2.5.0 → 2.6.0

Reported by:	portscout

4 files changed, 10 insertions, 50 deletions

diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile
index b2c3906c302b..3de933aafdaf 100644
--- a/cad/horizon-eda/Makefile
+++ b/cad/horizon-eda/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	horizon-eda
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.0
-PORTREVISION=	4
+DISTVERSION=	2.6.0
 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/
@@ -15,27 +11,26 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \
+		cmake:devel/cmake-core \
 		cppzmq>0:net/cppzmq \
 		glm>0:math/glm
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libepoxy.so:graphics/libepoxy \
+		libfreeimage.so:graphics/freeimage \
 		libgit2.so:devel/libgit2 \
-		libharfbuzz.so:print/harfbuzz \
 		libpng16.so:graphics/png \
 		libpodofo09.so:graphics/podofo09 \
+		libspnav.so:misc/libspnav \
 		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
+USES=		desktop-file-utils gnome libarchive localbase meson pkgconfig python:build sqlite
 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
diff --git a/cad/horizon-eda/distinfo b/cad/horizon-eda/distinfo
index ed510e2d1814..1b57d89a6c08 100644
--- a/cad/horizon-eda/distinfo
+++ b/cad/horizon-eda/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1689033060
-SHA256 (horizon-eda-horizon-v2.5.0_GH0.tar.gz) = c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4
-SIZE (horizon-eda-horizon-v2.5.0_GH0.tar.gz) = 3971079
-SHA256 (1efad3028a1953af2cf62b518a54ffeb309977bc.patch) = 38f2dad9a730e03df02bb64972b398cd5a1c92dd85a338c432d36bb78510e97f
-SIZE (1efad3028a1953af2cf62b518a54ffeb309977bc.patch) = 792
+TIMESTAMP = 1716104194
+SHA256 (horizon-eda-horizon-v2.6.0_GH0.tar.gz) = e7e680a05b92ac8ab4b6a32fb8e3b17bc298245d3d3d9224e9b3f7fb55b81256
+SIZE (horizon-eda-horizon-v2.6.0_GH0.tar.gz) = 4358268
diff --git a/cad/horizon-eda/files/patch-Makefile b/cad/horizon-eda/files/patch-Makefile
deleted file mode 100644
index ab36a628a416..000000000000
--- a/cad/horizon-eda/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig	2023-06-18 14:18:38 UTC
-+++ Makefile
-@@ -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) " $@"
-@@ -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 $@)
diff --git a/cad/horizon-eda/pkg-plist b/cad/horizon-eda/pkg-plist
index 3536617092c2..ef30c0547a16 100644
--- a/cad/horizon-eda/pkg-plist
+++ b/cad/horizon-eda/pkg-plist
@@ -6,4 +6,6 @@ share/icons/hicolor/256x256/apps/org.horizon_eda.HorizonEDA.png
 share/icons/hicolor/32x32/apps/org.horizon_eda.HorizonEDA.png
 share/icons/hicolor/64x64/apps/org.horizon_eda.HorizonEDA.png
 share/icons/hicolor/scalable/apps/org.horizon_eda.HorizonEDA.svg
+share/man/man1/horizon-eda.1.gz
+share/man/man1/horizon-imp.1.gz
 share/metainfo/org.horizon_eda.HorizonEDA.metainfo.xml