git: 74e45c0fc665 - main - cad/scotch: upgrade to v7.0.16

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Wed, 07 Oct 2026 10:26:13 UTC
The branch main has been updated by thierry:

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

commit 74e45c0fc665a1c47f51c25cb874da4970a500af
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2026-10-04 14:07:55 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2026-10-07 10:26:02 +0000

    cad/scotch: upgrade to v7.0.16
    
    This port now contains the official releases of Scotch, not the Code_Aster
    ones.
---
 cad/scotch/Makefile                                | 37 ++++++++++------------
 cad/scotch/distinfo                                |  3 ++
 ...tch-src_Make.inc_Makefile.inc.i686__pc__freebsd | 29 +++++++++--------
 ...h-src_Make.inc_Makefile.inc.x86-64__pc__freebsd | 26 +++++++++------
 cad/scotch/files/patch-src_libscotch_library.h     |  8 ++---
 cad/scotch/pkg-plist                               | 28 ++++++++--------
 6 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 73e9ad06b4b0..aab6a228898c 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	scotch
-DISTVERSION=	6.0.4-aster7
-PORTREVISION=	7
+DISTVERSIONPREFIX=	v
+DISTVERSION=	7.0.16
 CATEGORIES=	cad science
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -12,35 +12,42 @@ LICENSE_NAME=	CeCILL-C
 LICENSE_FILE=	${WRKSRC}/doc/CeCILL-C_V1-en.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		bison:alias gmake localbase
+USES=		bison:alias fortran gmake localbase tar:bz2
 
-CONFLICTS_INSTALL=	gbase gmap # bin/gbase bin/gmap
+CONFLICTS_BUILD=	scotch-edf
+CONFLICTS_INSTALL=	gbase gmap scotch-edf	# bin/gbase bin/gmap
 
+USE_GITLAB=	yes
+GL_SITE=	https://gitlab.inria.fr
+
+BINARY_ALIAS=	f77=${FC}
 MAKE_JOBS_UNSAFE=yes
 
+# TODO: flavorize with MPICH / OMPI / NOMPI
 OPTIONS_DEFINE=	DOCS EXAMPLES MPICH
 OPTIONS_DEFAULT=MPICH
 OPTIONS_SUB=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 ALL_TARGET=	esmumps
 TEST_TARGET=	check
-CFLAGS=		-Wno-implicit-function-declaration
+CFLAGS+=	-Wno-implicit-function-declaration
 MAKE_ENV=	prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${PREFIX}/share/man	\
 		-DSCOTCH_PTHREAD_NUMBER=2
 USE_LDCONFIG=	yes
 
-DOCVER=		${PORTVERSION:R:R}
+DOCVER=		${PORTVERSION:R}
 PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f
-LIBS=		esmumps scotch scotcherr scotcherrexit scotchmetis
+LIBRS=		esmumps scotch scotcherr scotcherrexit scotchmetisv3 scotchmetisv5
 
 MPICH_USES=		mpi:mpich
 MPICH_ALL_TARGET=	ptesmumps
+MPICH_MAKE_ENV=		MPICC=${MPICC}
 MPICH_TEST_TARGET=	ptcheck
-MPICH_LIBS+=	ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis
+MPICH_VARS+=		LIBRS+="ptesmumps ptscotch ptscotcherr ptscotcherrexit \
+			ptscotchparmetisv3"
 
 .include <bsd.port.options.mk>
 
@@ -67,7 +74,7 @@ pre-configure:
 
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*
-.for l in ${LIBS}
+.for l in ${LIBRS}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib${l}.so ${STAGEDIR}${PREFIX}/lib/lib${l}.so.0
 	${LN} -sf lib${l}.so.0 ${STAGEDIR}${PREFIX}/lib/lib${l}.so
 .endfor
@@ -81,14 +88,4 @@ do-install-EXAMPLES-on:
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt
 
-.if !defined(WITHOUT_MPI)
-pre-test:
-. if !exists(${HOME}/.mpd.conf)
-	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
-	${CHMOD} go-r ${HOME}/.mpd.conf
-	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
-. endif
-.endif
-
-.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/cad/scotch/distinfo b/cad/scotch/distinfo
new file mode 100644
index 000000000000..0c4232d24b66
--- /dev/null
+++ b/cad/scotch/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1791119048
+SHA256 (scotch-v7.0.16.tar.bz2) = 2927a7e574f90d9f54a59390e63cffec0c3ec3d31e0959fab88591f7da0fcbc8
+SIZE (scotch-v7.0.16.tar.bz2) = 8089215
diff --git a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd
index 53ddec35d372..bcbfc845b246 100644
--- a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd
+++ b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd
@@ -1,6 +1,8 @@
---- src/Make.inc/Makefile.inc.i686_pc_freebsd.orig	2017-02-22 07:20:57 UTC
+--- src/Make.inc/Makefile.inc.i686_pc_freebsd.orig	2026-09-29 10:12:17 UTC
 +++ src/Make.inc/Makefile.inc.i686_pc_freebsd
-@@ -1,21 +1,21 @@
+@@ -4,24 +4,24 @@ EXE		=
+ #   https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259787#c3
+ 
  EXE		=
 -LIB		= .a
 +LIB		= .so
@@ -13,21 +15,22 @@
 +ARFLAGS		= -shared -Wl,-soname,$@ -o
  CAT		= cat
 -CCS		= cc
-+CCS		= $(CC)
- CCP		= mpicc
+-CCP		= mpicc
 -CCD		= mpicc
--CFLAGS		+= -std=c99 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER
--CLIBFLAGS	=
--LDFLAGS		+= -lz -lm -lpthread
+-FCS		= gfortran
++CCS		= $(CC)
++CCP		= $(MPICC)
 +CCD		= $(CC)
-+CFLAGS		+= -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DIDXSIZE64 -DINTSIZE64
-+CLIBFLAGS	= -fPIC
-+LDFLAGS		+= -lz -lm -lthread
++FCS		= $(FC)
+ CFLAGS		+= -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_MPI_ASYNC_COLL -DSCOTCH_PTHREAD -DSCOTCH_PTHREAD_MPI -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -Dcpu_set_t=cpuset_t -D__BSD_VISIBLE
+ CLIBFLAGS	=
+-LDFLAGS		+= -lz -lm -lpthread
++LDFLAGS		+= -lz -lm -pthread
  CP		= cp
- LEX		= flex -Pscotchyy -olex.yy.c
+ FLEX		= flex
  LN		= ln
- MKDIR		= mkdir
+ MKDIR		= mkdir -p
  MV		= mv
 -RANLIB		= ranlib
 +RANLIB		= echo
- YACC		= bison -pscotchyy -y -b y
+ BISON		= bison
diff --git a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd
index 578e412980de..8ddc74f16c91 100644
--- a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd
+++ b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd
@@ -1,6 +1,8 @@
---- src/Make.inc/Makefile.inc.x86-64_pc_freebsd.orig	2017-02-22 07:20:57 UTC
+--- src/Make.inc/Makefile.inc.x86-64_pc_freebsd.orig	2026-09-29 10:12:17 UTC
 +++ src/Make.inc/Makefile.inc.x86-64_pc_freebsd
-@@ -1,21 +1,21 @@
+@@ -4,24 +4,24 @@ EXE		=
+ #   https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259787#c3
+ 
  EXE		=
 -LIB		= .a
 +LIB		= .so
@@ -13,20 +15,24 @@
 +ARFLAGS		= -shared -Wl,-soname,$@ -o
  CAT		= cat
 -CCS		= cc
-+CCS		= $(CC)
- CCP		= mpicc
+-CCP		= mpicc
 -CCD		= cc
--CFLAGS		+= -std -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64
+-FCS		= gfortran
+-CFLAGS		+= -std -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_MPI_ASYNC_COLL -DSCOTCH_PTHREAD -DSCOTCH_PTHREAD_MPI -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DIDXSIZE64 -Dcpu_set_t=cpuset_t -D__BSD_VISIBLE
 -CLIBFLAGS	=
+-LDFLAGS		+= -lz -lm -lthread
++CCS		= $(CC)
++CCP		= $(MPICC)
 +CCD		= $(CC)
-+CFLAGS		+= -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 -DINTSIZE64
++FCS		= $(FC)
++CFLAGS		+= -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_MPI_ASYNC_COLL -DSCOTCH_PTHREAD -DSCOTCH_PTHREAD_MPI -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -Dcpu_set_t=cpuset_t -D__BSD_VISIBLE
 +CLIBFLAGS	= -fPIC
- LDFLAGS		+= -lz -lm -lthread
++LDFLAGS		+= -lz -lm -pthread
  CP		= cp
- LEX		= flex -Pscotchyy -olex.yy.c
+ FLEX		= flex
  LN		= ln
- MKDIR		= mkdir
+ MKDIR		= mkdir -p
  MV		= mv
 -RANLIB		= ranlib
 +RANLIB		= echo
- YACC		= bison -pscotchyy -y -b y
+ BISON		= bison
diff --git a/cad/scotch/files/patch-src_libscotch_library.h b/cad/scotch/files/patch-src_libscotch_library.h
index 9af926eebfad..96591d5d735c 100644
--- a/cad/scotch/files/patch-src_libscotch_library.h
+++ b/cad/scotch/files/patch-src_libscotch_library.h
@@ -2,11 +2,11 @@
 - - https://gitlab.inria.fr/scotch/scotch/-/issues/35
 - - https://github.com/FreeFem/FreeFem-sources/issues/296
 
---- src/libscotch/library.h.orig	2017-02-22 07:20:57 UTC
+--- src/libscotch/library.h.orig	2026-09-29 10:12:17 UTC
 +++ src/libscotch/library.h
-@@ -61,6 +61,9 @@
- #ifndef SCOTCH_H
- #define SCOTCH_H
+@@ -65,6 +65,9 @@
+ #ifndef LIB_SCOTCH_H
+ #define LIB_SCOTCH_H
  
 +#include <sys/types.h>
 +#include <stdio.h>
diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist
index 3aa73ad1fb13..76d56d212993 100644
--- a/cad/scotch/pkg-plist
+++ b/cad/scotch/pkg-plist
@@ -1,4 +1,5 @@
 bin/acpl
+%%MPICH%%bin/adm2dgr
 bin/amk_ccc
 bin/amk_fft2
 bin/amk_grf
@@ -14,6 +15,7 @@ bin/atst
 %%MPICH%%bin/dgtst
 bin/gbase
 bin/gcv
+bin/gdump
 bin/gmap
 bin/gmk_hy
 bin/gmk_m2
@@ -32,6 +34,7 @@ bin/mmk_m2
 bin/mmk_m3
 bin/mord
 bin/mtst
+%%MPICH%%include/esmumps.h
 %%MPICH%%include/ptscotch.h
 %%MPICH%%include/ptscotchf.h
 include/scotch.h
@@ -46,16 +49,18 @@ lib/libesmumps.so.0
 %%MPICH%%lib/libptscotcherr.so.0
 %%MPICH%%lib/libptscotcherrexit.so
 %%MPICH%%lib/libptscotcherrexit.so.0
-%%MPICH%%lib/libptscotchparmetis.so
-%%MPICH%%lib/libptscotchparmetis.so.0
+%%MPICH%%lib/libptscotchparmetisv3.so
+%%MPICH%%lib/libptscotchparmetisv3.so.0
 lib/libscotch.so
 lib/libscotch.so.0
 lib/libscotcherr.so
 lib/libscotcherr.so.0
 lib/libscotcherrexit.so
 lib/libscotcherrexit.so.0
-lib/libscotchmetis.so
-lib/libscotchmetis.so.0
+lib/libscotchmetisv3.so
+lib/libscotchmetisv3.so.0
+lib/libscotchmetisv5.so
+lib/libscotchmetisv5.so.0
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
@@ -91,6 +96,7 @@ lib/libscotchmetis.so.0
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k7.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k9.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k96.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x10.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x20.tgt
@@ -133,31 +139,27 @@ lib/libscotchmetis.so.0
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt
+share/man/man1/acpl.1.gz
 share/man/man1/amk_ccc.1.gz
-share/man/man1/amk_fft2.1.gz
-share/man/man1/amk_hy.1.gz
-share/man/man1/amk_m2.1.gz
-share/man/man1/amk_p2.1.gz
+share/man/man1/amk_grf.1.gz
 share/man/man1/atst.1.gz
 share/man/man1/dgmap.1.gz
 share/man/man1/dgord.1.gz
-share/man/man1/dgpart.1.gz
 share/man/man1/dgscat.1.gz
 share/man/man1/dgtst.1.gz
+share/man/man1/gbase.1.gz
 share/man/man1/gcv.1.gz
+share/man/man1/gdump.1.gz
 share/man/man1/gmap.1.gz
 share/man/man1/gmk_hy.1.gz
 share/man/man1/gmk_m2.1.gz
-share/man/man1/gmk_m3.1.gz
 share/man/man1/gmk_msh.1.gz
-share/man/man1/gmk_ub2.1.gz
 share/man/man1/gmtst.1.gz
 share/man/man1/gord.1.gz
 share/man/man1/gotst.1.gz
 share/man/man1/gout.1.gz
-share/man/man1/gpart.1.gz
 share/man/man1/gtst.1.gz
+share/man/man1/mcv.1.gz
 share/man/man1/mmk_m2.1.gz
-share/man/man1/mmk_m3.1.gz
 share/man/man1/mord.1.gz
 share/man/man1/mtst.1.gz