Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 18 Jun 2023 09:58:57 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7cb7d2d50a12 - main - =?utf-8?Q?math/freefem++:=20Update=204.12=20=E2=86=92=204.13?=
Message-ID:  <202306180958.35I9wvaO048226@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

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

commit 7cb7d2d50a1250c12bac0c728980ee41e1469864
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-06-18 09:58:46 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-06-18 09:58:53 +0000

    math/freefem++: Update 4.12 → 4.13
    
    Reported by:    portscout
---
 math/freefem++/Makefile                         |  5 ++--
 math/freefem++/distinfo                         |  6 ++---
 math/freefem++/files/patch-plugin_seq_metis.cpp | 31 +++++++++++++++++++++++++
 math/freefem++/pkg-plist                        |  3 +++
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 4ad0d1170861..65e59dd1e63a 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	freefem++
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.12
-PORTREVISION=	1
+DISTVERSION=	4.13
 CATEGORIES=	math science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -64,7 +63,7 @@ PORTEXAMPLES=	*
 PLIST_SUB=	VER=${PORTVERSION}
 DATADIR=	${PREFIX}/share/FreeFEM/${PORTVERSION}
 
-TEST_TARGET=	check
+TEST_TARGET=	check # 1 test fails, see https://github.com/FreeFem/FreeFem-sources/issues/281
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-llapack|${LAPACKLIB}|' ${WRKSRC}/configure.ac
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index 4dcc703bb3e3..c36323c140a4 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680064481
-SHA256 (FreeFem-FreeFem-sources-v4.12_GH0.tar.gz) = 291c5f46761711d6303914f9c4f165fd85a7b7b69141f7473e0b6484ce6ab0f5
-SIZE (FreeFem-FreeFem-sources-v4.12_GH0.tar.gz) = 12885961
+TIMESTAMP = 1687080379
+SHA256 (FreeFem-FreeFem-sources-v4.13_GH0.tar.gz) = d296adc42c6b0cc5f148c44b00bea15939d6c0dbe391613dea8a0693c2c0e3b7
+SIZE (FreeFem-FreeFem-sources-v4.13_GH0.tar.gz) = 12966789
diff --git a/math/freefem++/files/patch-plugin_seq_metis.cpp b/math/freefem++/files/patch-plugin_seq_metis.cpp
new file mode 100644
index 000000000000..c9c1bc9f8915
--- /dev/null
+++ b/math/freefem++/files/patch-plugin_seq_metis.cpp
@@ -0,0 +1,31 @@
+- from https://github.com/FreeFem/FreeFem-sources/issues/280#issuecomment-1596025016
+
+--- plugin/seq/metis.cpp.orig	2023-06-18 09:28:12 UTC
++++ plugin/seq/metis.cpp
+@@ -97,7 +97,7 @@ KN< R > *partmetis( KN< R > *const &part, FESPACE *con
+       }
+ 
+ #endif
+-  } else epart = 0;
++  } else epart = static_cast<idx_t>(0);
+   part->resize(nv);
+   *part = npart;
+   return part;
+@@ -154,7 +154,7 @@ KN< R > *partmetis(Stack s, KN< R > *const &part, Mesh
+       }
+ 
+ #endif
+-  } else epart = 0;
++  } else epart = static_cast<idx_t>(0);
+   part->resize(nt);
+   *part = epart;
+   return part;
+@@ -184,7 +184,7 @@ KN< long > *partmetisd(Stack s, KN< long > *const &par
+       printf("  %d-way Edge-Cut: %7d, Balance: %5.2f\n", nparts, nve,
+               ComputeElementBalance(nt, nparts, epart));
+ #endif
+-  } else epart = 0;
++  } else epart = static_cast<idx_t>(0);
+   part->resize(nt);
+   *part = epart;
+   return part;
diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist
index fe0640e43e90..f78e5d12e8ef 100644
--- a/math/freefem++/pkg-plist
+++ b/math/freefem++/pkg-plist
@@ -21,6 +21,7 @@ lib/ff++/%%VER%%/idp/MPIGMRESmacro.idp
 lib/ff++/%%VER%%/idp/MPIplot.idp
 lib/ff++/%%VER%%/idp/MeshSurface.idp
 lib/ff++/%%VER%%/idp/ball-buildlayer.idp
+lib/ff++/%%VER%%/idp/buildmeshS.idp
 lib/ff++/%%VER%%/idp/cobrameshcavity.idp
 lib/ff++/%%VER%%/idp/cube.idp
 lib/ff++/%%VER%%/idp/ffddm.idp
@@ -111,6 +112,7 @@ lib/ff++/%%VER%%/include/array_tlp.hpp
 lib/ff++/%%VER%%/include/assertion.hpp
 lib/ff++/%%VER%%/include/bmo.hpp
 lib/ff++/%%VER%%/include/clapack.h
+lib/ff++/%%VER%%/include/compositeFESpace.hpp
 lib/ff++/%%VER%%/include/config.h
 lib/ff++/%%VER%%/include/defs.hpp
 lib/ff++/%%VER%%/include/eigenv.h
@@ -171,6 +173,7 @@ lib/ff++/%%VER%%/lib/Element_P3.so
 lib/ff++/%%VER%%/lib/Element_P3dc.so
 lib/ff++/%%VER%%/lib/Element_P3nc.so
 lib/ff++/%%VER%%/lib/Element_P3pnc.so
+lib/ff++/%%VER%%/lib/Element_P3pnc_3d.so
 lib/ff++/%%VER%%/lib/Element_P4.so
 lib/ff++/%%VER%%/lib/Element_P4dc.so
 lib/ff++/%%VER%%/lib/Element_PkEdge.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306180958.35I9wvaO048226>