git: e9b9b39e6a1d - main - cad/netgen: Update to 6.2.2501 and improve.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Stephen Montgomery-Smith <stephen_at_FreeBSD.org>
Date: Thu, 01 May 2025 20:02:01 UTC
The branch main has been updated by stephen:

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

commit e9b9b39e6a1df939da40730797f5afea291dc607
Author:     Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2025-05-01 19:58:35 +0000
Commit:     Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2025-05-01 19:58:35 +0000

    cad/netgen: Update to 6.2.2501 and improve.
    
    - Actualise LICENSE to LGPL21 as in upstream
    - Add patches to build with JPEG and MPEG
    - Add WWW for source code repository
    - Mark i386 as unsupported, as in upstream
    - Replace explicit include dirs with localbase:ldflags
    - Lint Makefile, sort entries for portclippy(1)
    - Replace libav with ffmpeg as a MPEG dependency (see MOVED)
    - Strip binaries and shared libraries in post-install phase.
    - Change maintainer to alster@vinterdalen.se.
    
    PR:             285491
    Reported by:    Älven <alster@vinterdalen.se>
---
 cad/netgen/Makefile | 54 ++++++++++++++++++++++++++++++++++-------------------
 cad/netgen/distinfo | 10 +++++++---
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
index ac68b82d8fe0..689133f5ff74 100644
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@@ -1,51 +1,67 @@
 PORTNAME=	netgen
-PORTVERSION=	6.2.2404
+PORTVERSION=	6.2.2501
 DISTVERSIONPREFIX=	v
 CATEGORIES=	cad
 
-MAINTAINER=	stephen@FreeBSD.org
+PATCH_SITES=	https://github.com/alexxy/netgen/commit/
+
+MAINTAINER=	alster@vinterdalen.se
 COMMENT=	Automatic 3D tetrahedral mesh generator
-WWW=		https://ngsolve.org/
+WWW=		https://ngsolve.org/ \
+		https://github.com/NGSolve/ngsolve/
 
-LICENSE=	GPLv2
+LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_i386=	compiler errors
+NOT_FOR_ARCHS=			i386
+NOT_FOR_ARCHS_REASON_i386=	unsupported CPU architecture
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		git:devel/git
 
-USES=		cmake python tcl tk gl xorg
+USES=		cmake gl localbase:ldflags python tcl tk xorg
+
+# Patch to fix build with JPEG enabled
+# Issue https://github.com/NGSolve/netgen/issues/210
+# Bug https://bugs.gentoo.org/947728
+PATCHFILES+=	3d82bf88360b9d032671a72a31cd9c351bf674f8.patch:-p1
+# Patch to fix build with MPEG enabled
+# Issue https://github.com/NGSolve/netgen/issues/192
+PATCHFILES+=	8737bff2bfec303b4affd06be9f44acd4b13f34d.patch:-p1
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	NGSolve
 GH_TUPLE=	NGSolve:pybind11:v2.11.1:pybind11/external_dependencies/pybind11
 
 USE_GL=		gl glu
-USE_XORG=	x11 xmu xi
 USE_LDCONFIG=	yes
+USE_XORG=	x11 xi xmu
 
-CFLAGS+=	-I${LOCALBASE}/include -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
-CXXFLAGS+=	-I${LOCALBASE}/include -I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
-LDFLAGS+=	-lexecinfo
-
-CMAKE_OFF=	USE_NATIVE_ARCH
+CMAKE_OFF=	USE_NATIVE_ARCH USE_OCC
 
-CMAKE_ARGS+=	-DUSE_OCC=OFF
+CFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
+CXXFLAGS+=	-I${TK_INCLUDEDIR}/generic -I${TK_INCLUDEDIR}/unix
+LDFLAGS+=	-lexecinfo
 
 CONFLICTS_INSTALL=	libvisual pybind11 # bin/netgen include/pybind11/attr.h lib/libvisual.so
 
-OPTIONS_DEFINE=	JPEG MPEG CGNS
+OPTIONS_DEFINE=	CGNS JPEG MPEG
 
+CGNS_DESC=	Enable CGNS file read/write support
 JPEG_DESC=	Enable snapshots using jpeg
 MPEG_DESC=	Enable recording with FFmpeg
-CGNS_DESC=	Enable CGNS file read/write support
 
-JPEG_CMAKE_BOOL=	USE_JPEG
+CGNS_BROKEN=	compiler errors
+CGNS_LIB_DEPENDS=	libcgns.so:science/cgnslib
+CGNS_CMAKE_BOOL=	USE_CGNS
 JPEG_USES=		jpeg
+JPEG_CMAKE_BOOL=	USE_JPEG
+MPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 MPEG_CMAKE_BOOL=	USE_MPEG
-MPEG_LIB_DEPENDS=	libavcodec.so:multimedia/libav
-CGNS_CMAKE_BOOL=	USE_CGNS
-CGNS_LIB_DEPENDS=	libcgns.so:science/cgnslib
+
+post-install:
+	(cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} netgen)
+	(cd ${STAGEDIR}${PREFIX}/lib && ${STRIP_CMD} libngcore.so libnggui.so libnglib.so)
+	(cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} && ${STRIP_CMD} libngguipy.so libngpy.so)
 
 .include <bsd.port.mk>
diff --git a/cad/netgen/distinfo b/cad/netgen/distinfo
index a309c09848e6..478be44a9c97 100644
--- a/cad/netgen/distinfo
+++ b/cad/netgen/distinfo
@@ -1,5 +1,9 @@
-TIMESTAMP = 1718381533
-SHA256 (NGSolve-netgen-v6.2.2404_GH0.tar.gz) = a5906237e4fe55ca1dbfa96bd6827cb72e908615812d252ceff658c4f94b2046
-SIZE (NGSolve-netgen-v6.2.2404_GH0.tar.gz) = 3445121
+TIMESTAMP = 1746074880
+SHA256 (NGSolve-netgen-v6.2.2501_GH0.tar.gz) = a12cf1f16a6c562134ec96cfb66e54fbb8e1faee72da52f6480e20ee896aa72c
+SIZE (NGSolve-netgen-v6.2.2501_GH0.tar.gz) = 3328069
 SHA256 (NGSolve-pybind11-v2.11.1_GH0.tar.gz) = d475978da0cdc2d43b73f30910786759d593a9d8ee05b1b6846d1eb16c6d2e0c
 SIZE (NGSolve-pybind11-v2.11.1_GH0.tar.gz) = 756445
+SHA256 (3d82bf88360b9d032671a72a31cd9c351bf674f8.patch) = 50758ed3408b745c8f701f341d31dad96b4819391e7c09aecf0b6413cbd29a97
+SIZE (3d82bf88360b9d032671a72a31cd9c351bf674f8.patch) = 825
+SHA256 (8737bff2bfec303b4affd06be9f44acd4b13f34d.patch) = c51d2445c4df1952d61c57b18b4cc32709f2f429d85afddb286fb216a16eb5a8
+SIZE (8737bff2bfec303b4affd06be9f44acd4b13f34d.patch) = 1453