Index: head/cad/scotch/Makefile =================================================================== --- head/cad/scotch/Makefile (revision 557365) +++ head/cad/scotch/Makefile (revision 557366) @@ -1,95 +1,101 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= scotch DISTVERSION= 6.0.4-aster7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad science MAINTAINER= thierry@FreeBSD.org COMMENT= Package for graph and mesh partitioning and sparse matrix ordering LICENSE= CeCILL_C 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 CONFLICTS= gbase-0.* gmap-2015.* USES= bison:alias gmake localbase MAKE_JOBS_UNSAFE=yes OPTIONS_DEFINE= DOCS EXAMPLES WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} BUILD_WRKSRC= ${WRKSRC}/src INSTALL_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC} ALL_TARGET= esmumps TEST_TARGET= check MAKE_ENV= prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${PREFIX}/share/man \ -DSCOTCH_PTHREAD_NUMBER=2 +USE_LDCONFIG= yes DOCVER= ${PORTVERSION:R:R} PORTDOCS= ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f -EXAMPLES= scotch_example.f +LIBS= esmumps scotch scotcherr scotcherrexit scotchmetis .if !defined(WITHOUT_MPI) LIB_DEPENDS+= libmpi.so:net/mpich ALL_TARGET+= ptesmumps TEST_TARGET+= ptcheck +LIBS+= ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis + PLIST_SUB+= MPI="" .else PLIST_SUB+= MPI="@comment " .endif .include .if ${ARCH} == "i386" MF= i686 .else MF= x86-64 .endif pre-everything:: .if !defined(WITHOUT_MPI) @${ECHO_MSG} @${ECHO_MSG} "Define WITHOUT_MPI if PT-Scotch is not wanted." @${ECHO_MSG} .endif pre-configure: ${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/'\ - -e 's/CLIBFLAGS =/CLIBFLAGS = -fPIC/' \ ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd ${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd \ ${WRKSRC}/src/Makefile.inc ${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|' \ -e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile post-stage: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib* +.for l in ${LIBS} + ${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 do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} do-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt ${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 Index: head/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64_pc_freebsd =================================================================== --- head/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64_pc_freebsd (revision 557365) +++ head/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64_pc_freebsd (revision 557366) @@ -1,11 +1,32 @@ ---- src/Make.inc/Makefile.inc.x86-64_pc_freebsd.orig 2011-01-06 22:39:49.000000000 +0100 -+++ src/Make.inc/Makefile.inc.x86-64_pc_freebsd 2012-04-14 12:13:39.000000000 +0200 -@@ -9,7 +9,7 @@ - CCS = cc +--- 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 +@@ -1,21 +1,21 @@ + EXE = +-LIB = .a ++LIB = .so + OBJ = .o + + MAKE = gmake +-AR = ar +-ARFLAGS = -ruv ++AR = $(CC) ++ARFLAGS = -shared -Wl,-soname,$@ -o + CAT = cat +-CCS = cc ++CCS = $(CC) CCP = mpicc - CCD = cc +-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 +-CLIBFLAGS = ++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 - CLIBFLAGS = ++CLIBFLAGS = -fPIC LDFLAGS += -lz -lm -lthread CP = cp + LEX = flex -Pscotchyy -olex.yy.c + LN = ln + MKDIR = mkdir + MV = mv +-RANLIB = ranlib ++RANLIB = echo + YACC = bison -pscotchyy -y -b y Index: head/cad/scotch/pkg-plist =================================================================== --- head/cad/scotch/pkg-plist (revision 557365) +++ head/cad/scotch/pkg-plist (revision 557366) @@ -1,153 +1,163 @@ bin/acpl bin/amk_ccc bin/amk_fft2 bin/amk_grf bin/amk_hy bin/amk_m2 bin/amk_p2 bin/atst %%MPI%%bin/dggath %%MPI%%bin/dgmap %%MPI%%bin/dgord %%MPI%%bin/dgpart %%MPI%%bin/dgscat %%MPI%%bin/dgtst bin/gbase bin/gcv bin/gmap bin/gmk_hy bin/gmk_m2 bin/gmk_m3 bin/gmk_msh bin/gmk_ub2 bin/gmtst bin/gord bin/gotst bin/gout bin/gpart bin/gscat bin/gtst bin/mcv bin/mmk_m2 bin/mmk_m3 bin/mord bin/mtst -%%MPI%%include/ptscotch.h -%%MPI%%include/ptscotchf.h +include/ptscotch.h +include/ptscotchf.h include/scotch.h include/scotchf.h -lib/libesmumps.a -%%MPI%%lib/libptesmumps.a -%%MPI%%lib/libptscotch.a -%%MPI%%lib/libptscotcherr.a -%%MPI%%lib/libptscotcherrexit.a -%%MPI%%lib/libptscotchparmetis.a -lib/libscotch.a -lib/libscotcherr.a -lib/libscotcherrexit.a -lib/libscotchmetis.a -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/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/gcv.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/mmk_m2.1.gz -share/man/man1/mmk_m3.1.gz -share/man/man1/mord.1.gz -share/man/man1/mtst.1.gz +lib/libesmumps.so +lib/libesmumps.so.0 +%%MPI%%lib/libptesmumps.so +%%MPI%%lib/libptesmumps.so.0 +%%MPI%%lib/libptscotch.so +%%MPI%%lib/libptscotch.so.0 +%%MPI%%lib/libptscotcherr.so +%%MPI%%lib/libptscotcherr.so.0 +%%MPI%%lib/libptscotcherrexit.so +%%MPI%%lib/libptscotcherrexit.so.0 +%%MPI%%lib/libptscotchparmetis.so +%%MPI%%lib/libptscotchparmetis.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 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.xyz.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.grf.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h10.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h2.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h3.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h4.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h5.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h6.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h7.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h9.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k1.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k12.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k128.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k16.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k2.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k24.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k256.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k32.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k4.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k48.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k512.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k6.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k64.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k7.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k96.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x10.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x20.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m11x13.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x16.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x32.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m17x19.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x21.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x31.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m21x23.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m23x25.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m24x24.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m25x27.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m27x29.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m29x31.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x2.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x4x8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m32x32.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m3x3.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x4.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x5.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x7.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m64x64.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x16.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x11.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x7.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p128.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p16.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p2.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p256.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p32.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p4.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p512.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p64.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t2x4x8.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t4x4x4.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt +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/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/gcv.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/mmk_m2.1.gz +share/man/man1/mmk_m3.1.gz +share/man/man1/mord.1.gz +share/man/man1/mtst.1.gz Index: head/french/aster/Makefile =================================================================== --- head/french/aster/Makefile (revision 557365) +++ head/french/aster/Makefile (revision 557366) @@ -1,449 +1,449 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} +PORTREVISION= 1 CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org COMMENT= Code_Aster finite element method solver LICENSE= GPLv2 NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc NOT_FOR_ARCHS_REASON= ARG_MAX is too small for Code_Aster on 32 bits systems #----------------------------------------------------------------------- # You may define these options: # # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among # zsh (default), bash or ksh; # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit); # - WITH_ATLAS: replace blas; # - WITH_BLAS: don't link with atlas, even if present, but with blas; # (blas might be slower, but is lighter) # - WITHOUT_ASTK_CLI: won't use the GUI from this machine; # - WITHOUT_GMSH: don't install GMSH (a mesh generator); # - WITHOUT_GRACE: don't install Grace (used to create 2D graph); # - WITHOUT_MACR_RECAL: don't install Numerical Python # (required by the macro MACR_RECAL); -# - WITHOUT_SCOTCH: don't install Scotch. # - WITH_MUMPS: install the interface between Code_Aster and MUMPS (experimental) # #----------------------------------------------------------------------- BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \ ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ - ${LOCALBASE}/lib/libscotch.a:cad/scotch \ gnproc:sysutils/coreutils \ bash:shells/bash \ getopt>0:misc/getopt \ xterm:x11/xterm \ ${PYNUMPY} # pylupdate5:textproc/py-qt5-xml LIB_DEPENDS+= libhdf5.so:science/hdf5 \ + libscotch.so:cad/scotch \ libmetis.so:math/metis \ libmed.so:french/med \ libAsterInterface.so:science/tfel-edf RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur \ xterm:x11/xterm \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} USES= bison fortran gettext python:3.6+ qt:5 tk # Note 1: compile fine with clang but segfault when sharing args between C and Fortran # Note 2: tfel/mfront must be compiled with the same compiler, else it does not link USE_GCC= yes USE_BINUTILS= yes USE_QT= linguisttools_build -#CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.* +CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.* .if defined(WITH_ATLAS) USES+= blaslapack:atlas .else USES+= blaslapack:netlib .endif HAS_CONFIGURE= yes MAKE_ENV= INCLUDES="${LOCALBASE}/include" \ INCLUDEDIR="${LOCALBASE}/include" \ LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1" \ PYTHONPATH="${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV" \ PYTHONIOENCODING="utf-8" LANG=C LC_ALL="en_US.UTF-8" \ LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}" REINPLACE_ARGS= -i "" BINARY_ALIAS= python=${PYTHON_CMD} VER= ${PORTVERSION:R} VE= ${VER:R} WRKSRC= ${WRKDIR}/${PORTNAME}-full-src-${VER} PLIST_SUB= VE=${VE} .if defined(WITHOUT_ASTK_CLI) SUB_FILES= pkg-message.sans-astk .else SUB_FILES= pkg-message .endif SUB_LIST= tools_dir=${tools_dir} INTERACTIVE_SCRIPTS= check_compilers.py setup.py .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .include .if ${OPSYS} == FreeBSD && ((${OSREL:R} <= 12 && ${OSVERSION} < 1201506) \ || (${OSREL:R} > 12 && ${OSVERSION} < 1300068)) BROKEN= a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system .endif .if ${ARCH} == "i386" FLAGARCH= -DP_LINUX -DLINUX .else FLAGARCH= -DLINUX64 .endif .if defined(WITH_DEBUG) DEBUG_FLAGS= --debug CFLAGS+= -D__DEBUG_ALLOCATE__ FFLAGS+= -D__DEBUG_ALLOCATE__ MAKE_ENV+= FCFLAGS="-g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}" .else MAKE_ENV+= FCFLAGS="${FFLAGS} -fno-tree-dse ${FLAGARCH}" .endif .if !defined(WITHOUT_ASTK_CLI) RUN_DEPENDS+= astk-client>0:cad/astk-client PLIST_SUB+= ASTK_CLIENT="" ASTKDIR=${ASTKDIR} .else PLIST_SUB+= ASTK_CLIENT="@comment " ASTKDIR="" .endif .if !defined(WITHOUT_GMSH) RUN_DEPENDS+= ${LOCALBASE}/bin/gmsh:cad/gmsh PLIST_SUB+= GMSH="" .else PLIST_SUB+= GMSH="@comment " .endif .if !defined(WITHOUT_GRACE) RUN_DEPENDS+= xmgrace:math/grace PLIST_SUB+= GRACE="" .else PLIST_SUB+= GRACE="@comment " .endif .if !defined(WITHOUT_MACR_RECAL) RUN_DEPENDS+= ${PYNUMPY} .endif .if !defined(WITH_MPI) MPISEQ= -lmpiseq MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ} LIB_DEPENDS+= libmpiseq.so.5:math/mumps .else BUILD_DEPENDS+= ${LOCALBASE}/lib/libscalapack.a:math/scalapack MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lexecinfo -L${LOCALBASE}/lib -lmpi LIB_DEPENDS+= libcmumps.so.5:math/mumps .endif .if defined(WITH_MPI) LIB_DEPENDS+= libmpi.so:net/mpich HOME_MPI= ${LOCALBASE} .endif .if defined(WITH_ZSH) SHIA= zsh .elif defined(WITH_BASH) SHIA= bash .elif defined(WITH_KSH) SHIA= ksh93 .elif exists(${LOCALBASE}/bin/zsh) SHIA= zsh .elif exists(${LOCALBASE}/bin/bash) SHIA= bash .elif exists(${LOCALBASE}/bin/ksh93) SHIA= ksh93 .else SHIA= zsh .endif SHIADEP= ${SHIA} .if !defined(WITH_ED) . if exists(${LOCALBASE}/bin/nedit) WITH_ED= nedit RUN_DEPENDS+= ${LOCALBASE}/bin/nedit:editors/nedit . elif exists(${LOCALBASE}/bin/gvim) WITH_ED= gvim RUN_DEPENDS+= ${LOCALBASE}/bin/gvim:editors/vim . elif exists(${LOCALBASE}/bin/emacs) WITH_ED= emacs RUN_DEPENDS+= ${LOCALBASE}/bin/emacs:editors/emacs . elif exists(${LOCALBASE}/bin/gedit) WITH_ED= gedit RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:editors/gedit . elif exists(${LOCALBASE}/bin/xedit) WITH_ED= xedit RUN_DEPENDS+= ${LOCALBASE}/bin/xedit:x11/xedit . else WITH_ED= vi . endif .endif INST_DAT= elements INST_SH= as_run parallel_cp PFX2FIX= bin/as_run etc/codeaster/aster etc/codeaster/profile.sh \ ${VE}/aster.conf ${VE}/lib/aster/aster_pkginfo.py \ ${VE}/share/aster/CTestTestfile.cmake \ ${VE}/include/aster/asterf_config.h \ ${VE}/include/aster/asterc_config.h \ ${VE}/share/aster/execute_codeaster \ ${VE}/share/aster/config.txt ${VE}/share/aster/profile.sh POSTPY2FIX= post-patch-waf.engine post-patch-data__post_install POSTBASH2FIX= execute_codeaster create_install_script inst_dir= ${PREFIX}/${PORTNAME} tools_dir= ${PREFIX}/${PORTNAME}/outils tools= cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot .if !defined(WITHOUT_GMSH) tools+= gmsh .endif .if !defined(WITHOUT_GRACE) tools+= gracebat xmgrace .endif v_ifdef= ${OPSYS:tu} SHELL_INSTALL_ASTER= ${LOCALBASE}/bin/${SHIA} tcl_dir= ${LOCALBASE} hdf_dir= ${LOCALBASE} -lib_math= "-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} ${ATLASLIB}" +lib_math= "-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} ${ATLASLIB} -lscotch -lscotcherr" LASTKDIR?= ${PORTNAME}/ASTK/ASTK_CLIENT ASTKDIR= ${LOCALBASE}/${LASTKDIR} BASH2RC= products_data.py ExportPATH?= /tmp/maillages pre-configure: ${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' \ -e 's|/opt/aster|${STAGEDIR}${inst_dir}|' ${WRKSRC}/setup.cfg ${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|' \ ${WRKSRC}/products.py ${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g" \ -e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \ -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|" \ -e "s|%%WRKDIR%%|${WRKDIR}|" ${WRKSRC}/as_setup.py .for sh in ${BASH2RC} ${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh} .endfor ${REINPLACE_CMD} -e 's|%%PYTHON_ABIVER%%|${PYTHON_ABIVER}|' ${WRKSRC}/setup.py .if defined(WITH_ATLAS) ${REINPLACE_CMD} -e "s|cfg\['BLASLIB'\]|cfg['BLASLIB'], cfg['ATLASLIB']|" \ ${WRKSRC}/products.py .endif ${ECHO_CMD} "_install_hdf5 = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_med = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_tcl = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_tk = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_Pmw = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_Numeric = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_gmsh = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_gmsh2 = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_gibi = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_grace = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "XMGRACE = 'xmgrace'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_homard = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_eficas = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_astk = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_astk_serv = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_metis = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_mfront = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_mumps = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_omniORB = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_omniORBpy = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_pylotage = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_crpcrs = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_aster_Linux = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_scotch = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "OPT_ENV = 'verbose=True'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "PYTHONPATH = '${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV'"\ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "PYTHON_INCLUDE = '${PYTHON_INCLUDEDIR}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_PYTHON = '${PYTHONBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_GMSH = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_GIBI = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_HOMARD = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CC='${CC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "gcc='${CC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CXX='${CXX}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "LD='${LD}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90='${FC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lc++ -lexecinfo -lutil -lpthread -lz'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "SYSLIB='-lpthread -lz'" >> ${WRKSRC}/setup.cfg .if defined(WITH_MPI) ${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MPIRUN = 'mpirun'" >> ${WRKSRC}/setup.cfg .else ${ECHO_CMD} "HOME_MPI = ''" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MPIRUN = ''" >> ${WRKSRC}/setup.cfg .endif ${ECHO_CMD} "HOME_ZMAT = ''" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_HDF='${hdf_dir}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_MED='${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'" >> ${WRKSRC}/setup.cfg .if defined(WITH_ATLAS) ${ECHO_CMD} "ATLASLIB='${_ATLASLIB}'" >> ${WRKSRC}/setup.cfg .endif ${ECHO_CMD} "BLASLIB='${_BLASLIB}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "LAPACKLIB='lapack'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "GZIP='/usr/bin/gzip'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "TERMINAL='xterm'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "EDITOR='${WITH_ED}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CXXFLAGS='${CXXFLAGS}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CXXFLAGS_DBG='${CXXFLAGS:C|-O2|--debug|}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "LDFLAGS='${LDFLAGS}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg .if defined(WITH_MPI) ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg .else ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg .endif .for is in ${INTERACTIVE_SCRIPTS} ${REINPLACE_CMD} -e '/should_continue()/d' \ ${WRKSRC}/${is} .endfor ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} do-configure: (cd ${CONFIGURE_WRKSRC} \ && TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} \ --prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG}) @${ECHO_MSG} "---------------- Debug ------------------" ${CAT} ${CONFIGURE_WRKSRC}/setup.log @${ECHO_MSG} "------------ Fin debug ------------------" post-configure: ${MKDIR} ${STAGEDIR}${inst_dir}/etc ${CP} -R ${LOCALBASE}/aster/etc/codeaster ${STAGEDIR}${inst_dir}/etc/ ${ECHO_CMD} "#?vers : VVV?" >> ${STAGEDIR}${inst_dir}/etc/codeaster/aster ${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin \ ${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun \ ${LOCALBASE}/aster/ASTK/ASTK_SERV/share \ ${STAGEDIR}${inst_dir} ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|' \ ${STAGEDIR}${inst_dir}/bin/as_run ${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/profile_astk.sh \ ${STAGEDIR}${inst_dir}/etc/codeaster/profile.sh .for sf in etc/codeaster/profile.sh asrun/installation.py ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g' \ -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g' \ ${STAGEDIR}${inst_dir}/${sf} .endfor pre-build: ${MKDIR} ${WRKDIR}/post_patches ${CP} ${FILESDIR}/post-patch-* ${WRKDIR}/post_patches/ .for pp in ${POSTPY2FIX} ${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKDIR}/post_patches/${pp} .endfor do-build: (cd ${BUILD_WRKSRC} && \ TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} install aster \ --prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log) do-install: # build: already did the installation @${DO_NADA} post-install: .for f in ${PFX2FIX} ${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f} .endfor .for f in ${POSTBASH2FIX} ${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \ ${STAGEDIR}${inst_dir}/${VE}/share/aster/${f} .endfor ${REINPLACE_CMD} -e 's|LINUX64|LINUX64, FREEBSD|' \ ${STAGEDIR}${inst_dir}/asrun/core/default_configuration.py (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||}) (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||}) ${CP} -p ${STAGEDIR}${inst_dir}/${VE}/bin/aster \ ${STAGEDIR}${inst_dir}/${VE}/bin/asterd ${STRIP_CMD} ${STAGEDIR}${inst_dir}/${VE}/bin/aster ${SED} -e 's|%%VER%%|${VE}|' < ${FILESDIR}/astout.export \ > ${STAGEDIR}${inst_dir}/${VE}/astout.export (cd ${STAGEDIR}${inst_dir} && \ ${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE}) .for conf in config.txt profile.sh (cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf} \ ${STAGEDIR}${inst_dir}/STA${VE}/${conf}) .endfor ${MKDIR} ${STAGEDIR}${tools_dir} .for outil in ${tools} ${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil} .endfor .if !defined(WITHOUT_ASTK_CLI) ${MKDIR} ${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc ${LN} -fs ${ASTKDIR}/etc/astkrc/* \ ${STAGEDIR}${PREFIX}/aster/ASTK/ASTK_SERV/etc/codeaster/astkrc . for outil in astk bsf ${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil} . endfor .endif ${MKDIR} ${WRKDIR}/AvoidConflictWithASTK .for f in aster.install_${VE} profile.sh ${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/${f} ${WRKDIR}/AvoidConflictWithASTK/ .endfor ${RM} -r ${STAGEDIR}${inst_dir}/etc/codeaster/* .for f in aster.install_${VE} profile.sh ${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/ .endfor .for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc ${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f} .endfor ${FIND} ${STAGEDIR}${PREFIX} -name "*.bak" -delete .if defined(MAINTAINER_MODE) regression-test: install @${ECHO_MSG} "Note: homard must be installed to run some steps succesfully." ${MKDIR} ${ExportPATH} ${CP} ${inst_dir}/${VE}/astout.export /tmp/ (cd ${inst_dir}/${VE} && \ ${LOCALBASE}/aster/bin/as_run --list --all --vers=${VE} \ --filter='"I" not in testlist' -o /tmp/list_seq ) (cd /tmp && \ ${LOCALBASE}/aster/bin/as_run astout.export) || ${TRUE} @${ECHO_MSG} "Check /tmp/resu_test/NOOK" .endif .include Index: head/math/freefem++/Makefile =================================================================== --- head/math/freefem++/Makefile (revision 557365) +++ head/math/freefem++/Makefile (revision 557366) @@ -1,67 +1,68 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= freefem++ PORTVERSION= 4.6 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= math science MAINTAINER= kh@mogami.com COMMENT= Partial differential equation solver LICENSE= LGPL3 -BUILD_DEPENDS= amk_fft2:cad/scotch \ - bash:shells/bash \ +BUILD_DEPENDS= bash:shells/bash \ gmm++>0:math/gmm++ \ pipe:misc/pipe \ tetgen:math/tetgen LIB_DEPENDS= libhdf5.so:science/hdf5 \ libamd.so:math/suitesparse \ libarpack.so:math/arpack-ng \ libfftw3.so:math/fftw3 \ libgsl.so:math/gsl \ libipopt.so:math/ipopt \ libmetis.so:math/metis \ + libscotch.so:cad/scotch \ libcmumps.so:math/mumps \ libnlopt.so:math/nlopt \ libsuperlu.so:math/superlu \ libsz.so:science/szip RUN_DEPENDS= bash:shells/bash \ pipe:misc/pipe USE_GITHUB= yes GH_ACCOUNT= FreeFem GH_PROJECT= FreeFem-sources USES= autoreconf bison blaslapack:openblas compiler:c++11-lib fortran \ gl gmake localbase perl5 pkgconfig shebangfix xorg SHEBANG_GLOB= ff-pkg-download.in SHEBANG_FILES= examples/CheckAllEdp ./examples/misc/speedtest.sh CPPFLAGS+= -I${LOCALBASE}/include/superlu .if !defined{WITH_DEBUG} LDFLAGS+= -s .endif GNU_CONFIGURE= yes -CONFIGURE_ENV= CNOFLAGS="${CFLAGS}" +CONFIGURE_ENV= CNOFLAGS="${CFLAGS}" LIBS=-lz CONFIGURE_ARGS= --disable-download \ --without-mpi \ --with-blas=${BLASLIB} \ --with-lapack=${LAPACKLIB} USE_GL= gl glu glut OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT=EXAMPLES PLIST_SUB= VER=${PORTVERSION} DATADIR= ${PREFIX}/share/FreeFEM/${PORTVERSION} TEST_TARGET= check pre-configure: ${REINPLACE_CMD} -e 's|-llapack|${LAPACKLIB}|' ${WRKSRC}/configure.ac .include Index: head/math/freefem++/files/patch-configure.ac =================================================================== --- head/math/freefem++/files/patch-configure.ac (revision 557365) +++ head/math/freefem++/files/patch-configure.ac (revision 557366) @@ -1,38 +1,40 @@ --- configure.ac.orig 2020-04-02 12:11:06 UTC +++ configure.ac @@ -65,7 +65,7 @@ m4_define([AC_FF_WHERELIB], AC_MSG_CHECKING(check $1) ff_save_libs=$LIBS LIBS="$LIBS $2 $4" - AC_LINK_IFELSE([AC_LANG_PROGRAM([m4_if($3,,,[#include <$3>])],[])], [ff_WHERE=yes],[ff_WHERE=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([m4_if($3,,,[#include <$3>],[#include ],[#include ])],[])], [ff_WHERE=yes],[ff_WHERE=no]) if test "$ff_WHERE" = "yes" ; then echo "$1 LD $2" >>$ff_where_lib_conf ff_WHERE_INC=`AS_DIRNAME(["$3"])` @@ -674,7 +674,7 @@ ff_prefix_dir_data="$datadir/$PACKAGE_NAME" ff_prefix_dir_include="$ff_prefix_dir/include" ff_prefix_dir_etc="$ff_prefix_dir/etc" ff_prefix_dir_lib_mpi="$ff_prefix_dir/lib/mpi" -ff_prefix_dir_example="$ff_prefix_dir_data/$PACKAGE_VERSION" +ff_prefix_dir_example="${prefix}/share/examples/freefem++" AC_SUBST(ff_prefix_dir_lib,$ff_prefix_dir_lib) AC_SUBST(ff_prefix_dir_include,$ff_prefix_dir_include) AC_SUBST(ff_prefix_dir_etc,$ff_prefix_dir_etc) @@ -2084,7 +2084,7 @@ fi m4_map([AC_FF_WHERELIB],[ [[mumps],[-ldmumps -lzmumps -lmumps_common -lpord],[dmumps_c.h],[]], - [[mumps_seq],[-ldmumps_seq -lzmumps_seq -lmumps_common_seq -lpord_seq -lmpiseq_seq],[dmumps_c.h],[]], + [[mumps_seq],[$ff_blas_libs $ff_lapack_lib -ldmumps_seq -lzmumps_seq -lmumps_common_seq -lpord_seq -lmpiseq_seq],[dmumps_c.h],[]], [[libseq],[-lmpiseq_seq],[${inc_usr_include}mumps_seq/mpi.h]], [[mumps_ptscotch],[-lpord_ptscotch -lmumps_common_ptscotch -ldmumps_ptscotch -lzmumps_ptscotch -lpord_ptscotch],[dmumps_c.h]], [[mumps_scotch],[-lpord_scotch -lmumps_common_scotch -ldmumps_scotch -lzmumps_scotch -lpord_scotch],[dmumps_c.h]], -@@ -2092,7 +2092,7 @@ m4_map([AC_FF_WHERELIB],[ +@@ -2092,8 +2092,8 @@ m4_map([AC_FF_WHERELIB],[ [[superlu],[-lsuperlu],[${inc_usr_include}superlu/superlu_enum_consts.h],[]], [[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]], [[scalapack],[-lscalapack$ff_with_mpi],[]], - [[scotch],[-lscotch -lscotcherr],[scotch.h]], +- [[ptscotch],[-lptscotch -lptscotcherr],[ptscotch.h]], + [[scotch],[-lscotch -lscotcherr], [scotch.h]], - [[ptscotch],[-lptscotch -lptscotcherr],[ptscotch.h]], ++ [[ptscotch],[-lscotch -lscotcherr -lptscotch -lptscotcherr],[ptscotch.h]], [[metis],[-lmetis],[${inc_usr_include}metis/metis.h],[]], [[metis],[-lmetis],[metis.h],[]], + [[parmetis],[-lparmetis -lmetis],[],[]], Index: head/math/mumps/Makefile =================================================================== --- head/math/mumps/Makefile (revision 557365) +++ head/math/mumps/Makefile (revision 557366) @@ -1,134 +1,141 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= mumps DISTVERSION= 5.1.2-aster7 +PORTREVISION= 1 CATEGORIES= math PKGNAMESUFFIX= -edf MAINTAINER= thierry@FreeBSD.org COMMENT= MUltifrontal Massively Parallel sparse direct Solver for Code_Aster LICENSE= CeCILL_C LICENSE_NAME= CeCILL-C LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libmetis.so:math/metis USES= blaslapack fortran WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} FORTRANLIBS= -lgfortran GCCLIBDIR= ${LDFLAGS} USE_LDCONFIG= yes VEM= ${PORTVERSION:R:R:R} MUMPSVERSION= ${PORTVERSION:R} LIBS= cmumps dmumps mumps_common pord smumps zmumps PLIST_SUB= VE=${VEM} MUMPSVERSION=${MUMPSVERSION} OPTIONS_DEFINE= DOCS EXAMPLES MPI -MPI_BUILD_DEPENDS_OFF= ${LOCALBASE}/lib/libscotch.a:cad/scotch -MPI_BUILD_DEPENDS= ${LOCALBASE}/lib/libptscotch.a:cad/scotch +MPI_LIB_DEPENDS_OFF= libscotch.so:cad/scotch MPI_LIB_DEPENDS= libmpi.so:net/mpich \ libparmetis.so:math/parmetis \ + libptscotch.so:cad/scotch \ libscalapack.so:math/scalapack MPI_PLIST_SUB= WITH_LIBSEQ="@comment " MPI_PLIST_SUB_OFF= WITH_LIBSEQ="" MPI_LIBS_OFF= mpiseq MAKE_JOBS_UNSAFE=yes .include .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .ifdef WITH_MPI PKGNAMESUFFIX+= -mpich .endif .if ${FORTRAN_DEFAULT} == gfortran && ${GCC_DEFAULT} >= 10 FCFLAGS+= -fallow-argument-mismatch .endif post-patch-MPI-on: ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.PAR \ ${WRKSRC}/Makefile.inc post-patch-MPI-off: ${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.SEQ \ ${WRKSRC}/Makefile.inc pre-configure: ${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR .for MF in Makefile Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile ${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \ s+/usr/local+${LOCALBASE}+; \ s+@CFLAGS@+${CFLAGS} -fPIC+g; \ s+@FCFLAGS@+${FCFLAGS} -fPIC+g; \ s+@SOVER@+${VEM}+g; \ s+@GCCLIBDIR@+${GCCLIBDIR}+g; \ s+@FORTRANLIBS@+${FORTRANLIBS}+g; \ s+@BLAS_LIBS@+${BLASLIB}+ ; \ s+@LAPACK_LIBS@+${LAPACKLIB}+ ; \ s+@LOCALBASE@+${LOCALBASE}+g;' \ ${WRKSRC}/${MF} .endfor +.ifdef WITH_MPI + ${REINPLACE_CMD} -e '/lptscotch/s|#LSCOTCH|LSCOTCH|' \ + -e 's|^LMETIS|##LMETIS|;s|^#LMETIS|LMETIS|' ${WRKSRC}/Makefile.inc +.else + ${REINPLACE_CMD} -e '/lscotch/s|#LSCOTCH|LSCOTCH|' ${WRKSRC}/Makefile.inc +.endif do-install: ${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib .for lib in ${LIBS} (cd ${STAGEDIR}${PREFIX}/lib && \ ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so) .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/userguide_${MUMPSVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for ex in Makefile README *.c *.F input_simpletest_* ${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} .endfor .for ex in c_example *simpletest ${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} .endfor do-install-MPI-off: ${MKDIR} ${STAGEDIR}${PREFIX}/include/mumps_seq ${INSTALL_DATA} ${WRKSRC}/libseq/mpi.h ${STAGEDIR}${PREFIX}/include/mumps_seq/mpi.h ${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib .for lib in ${LIBS} . for ext in a so so.${VEM} (cd ${STAGEDIR}${PREFIX}/lib && \ ${LN} -sf lib${lib}.${ext} ${STAGEDIR}${PREFIX}/lib/lib${lib}_seq.${ext}) . endfor .endfor regression-test: install .if defined (WITH_MPI) && defined(MAINTAINER_MODE) . 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 (cd ${WRKSRC}/examples && \ ${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ; \ ${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ; \ ${LOCALBASE}/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ; \ ${LOCALBASE}/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ; \ ${ECHO_MSG} "The solution should be (1,2,3,4,5)" ; \ ${LOCALBASE}/bin/mpirun -np 3 ./c_example ; \ ${ECHO_MSG} "The solution should be (1,2)") .else (cd ${WRKSRC}/examples && \ ./ssimpletest < input_simpletest_real ; \ ./dsimpletest < input_simpletest_real ; \ ./csimpletest < input_simpletest_cmplx ; \ ./zsimpletest < input_simpletest_cmplx ; \ ${ECHO_MSG} "The solution should be (1,2,3,4,5)" ; \ ./c_example ; \ ${ECHO_MSG} "The solution should be (1,2)") .endif .include Index: head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR =================================================================== --- head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR (revision 557365) +++ head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR (revision 557366) @@ -1,89 +1,89 @@ --- Make.inc/Makefile.FREEBSD10.PAR.orig 2019-04-03 14:40:12 UTC +++ Make.inc/Makefile.FREEBSD10.PAR @@ -20,7 +20,7 @@ # #SCOTCHDIR = ${HOME}/scotch_6.0 -#ISCOTCH = -I$(SCOTCHDIR)/include +ISCOTCH = -I@LOCALBASE@/include # # You have to choose one among the following two lines depending on # the type of analysis you want to perform. If you want to perform only @@ -28,16 +28,16 @@ # variable below); for both parallel and sequential analysis choose the second # line (remember to add -Dptscotch in the ORDERINGSF variable below) -#LSCOTCH = -L$(SCOTCHDIR)/lib -lesmumps -lscotch -lscotcherr -#LSCOTCH = -L$(SCOTCHDIR)/lib -lptesmumps -lptscotch -lptscotcherr -+#LSCOTCH = -L@LOCALBASE@/lib -lesmumps -lscotch -lscotcherr -+LSCOTCH = -L@LOCALBASE@/lib -lptesmumps -lptscotch -lptscotcherr ++#LSCOTCH = -L@LOCALBASE@/lib -lesmumps -lscotch -lscotcherr -lz ++LSCOTCH = -L@LOCALBASE@/lib -lptesmumps -lscotch -lptscotch -lptscotcherr -lz LPORDDIR = $(topdir)/PORD/lib/ IPORD = -I$(topdir)/PORD/include/ LPORD = -L$(LPORDDIR) -lpord -#LMETISDIR = /opt/metis-5.1.0/build/Linux-x86_64/libmetis -#IMETIS = /opt/metis-5.1.0/include +LMETISDIR = @LOCALBASE@/lib/parmetis +IMETIS = @LOCALBASE@/include/parmetis # You have to choose one among the following two lines depending on # the type of analysis you want to perform. If you want to perform only @@ -46,7 +46,7 @@ LPORD = -L$(LPORDDIR) -lpord # line (remember to add -Dparmetis in the ORDERINGSF variable below) #LMETIS = -L$(LMETISDIR) -lmetis -#LMETIS = -L$(LMETISDIR) -lparmetis -lmetis +LMETIS = -L$(LMETISDIR) -lparmetis -lmetis # The following variables will be used in the compilation process. # Please note that -Dptscotch and -Dparmetis imply -Dscotch and -Dmetis respectively. @@ -66,34 +66,34 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOTCH) PLAT = LIBEXT = .a -OUTC = -o "" -OUTF = -o "" +OUTC = -o +OUTF = -o RM = /bin/rm -f -CC = cc -FC = gfortran48 -FL = gfortran48 +CC = @CC@ +FC = @FC@ +FL = @FC@ # keep a space at the end if options have to be separated from lib name -AR = ar -vr "" +AR = ar -vr RANLIB = ranlib LAPACK = -llapack -SCALAP = -lscalapack -lblacs +SCALAP = -L@LOCALBASE@/lib -lscalapack -lexecinfo INCPAR = -I/usr/local/include -LIBPAR = $(SCALAP) $(LAPACK) -L/usr/local/lib -lmpi +LIBPAR = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(SCALAP) INCSEQ = -I$(topdir)/libseq LIBSEQ = $(LAPACK) -L$(topdir)/libseq -lmpiseq -LIBBLAS = -lblas -LIBOTHERS = -lpthread +LIBBLAS = -L@LOCALBASE@/lib @LAPACK_LIBS@ @BLAS_LIBS@ +LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ #Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER) -CDEFS = -DAdd_ +CDEFS ?= -DAdd_ #Begin Optimized options # uncomment -fopenmp in lines below to benefit from OpenMP -OPTF = -O #-fopenmp +OPTF = @FCFLAGS@ #-fopenmp OPTL = -O #-fopenmp -OPTC = -O -I. #-fopenmp +OPTC = @CFLAGS@ -I. #-fopenmp #End Optimized options Index: head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ =================================================================== --- head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ (revision 557365) +++ head/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ (revision 557366) @@ -1,73 +1,83 @@ ---- Make.inc/Makefile.FREEBSD10.SEQ.orig 2019-04-03 14:40:12 UTC +--- Make.inc/Makefile.FREEBSD10.SEQ.orig 2020-10-23 09:16:48 UTC +++ Make.inc/Makefile.FREEBSD10.SEQ @@ -20,7 +20,7 @@ # #SCOTCHDIR = ${HOME}/scotch_6.0 -#ISCOTCH = -I$(SCOTCHDIR)/include +ISCOTCH = -I@LOCALBASE@/include # # You have to choose one among the following two lines depending on # the type of analysis you want to perform. If you want to perform only -@@ -36,8 +36,8 @@ LPORDDIR = $(topdir)/PORD/lib/ +@@ -28,16 +28,16 @@ + # variable below); for both parallel and sequential analysis choose the second + # line (remember to add -Dptscotch in the ORDERINGSF variable below) + +-#LSCOTCH = -L$(SCOTCHDIR)/lib -lesmumps -lscotch -lscotcherr +-#LSCOTCH = -L$(SCOTCHDIR)/lib -lptesmumps -lptscotch -lptscotcherr ++#LSCOTCH = -L$(SCOTCHDIR)/lib -lesmumps -lscotch -lscotcherr -lz ++#LSCOTCH = -L$(SCOTCHDIR)/lib -lptesmumps -lptscotch -lptscotcherr -lz + + + LPORDDIR = $(topdir)/PORD/lib/ IPORD = -I$(topdir)/PORD/include/ LPORD = -L$(LPORDDIR) -lpord -#LMETISDIR = /opt/metis-5.1.0/build/Linux-x86_64/libmetis -#IMETIS = /opt/metis-5.1.0/include +LMETISDIR = @LOCALBASE@/lib +IMETIS = @LOCALBASE@/include # You have to choose one among the following two lines depending on # the type of analysis you want to perform. If you want to perform only @@ -45,7 +45,7 @@ LPORD = -L$(LPORDDIR) -lpord # variable below); for both parallel and sequential analysis choose the second # line (remember to add -Dparmetis in the ORDERINGSF variable below) -#LMETIS = -L$(LMETISDIR) -lmetis +LMETIS = -L$(LMETISDIR) -lmetis #LMETIS = -L$(LMETISDIR) -lparmetis -lmetis # The following variables will be used in the compilation process. @@ -66,14 +66,14 @@ IORDERINGSC = $(IMETIS) $(IPORD) $(ISCOTCH) PLAT = LIBEXT = .a -OUTC = -o "" -OUTF = -o "" +OUTC = -o +OUTF = -o RM = /bin/rm -f -CC = cc -FC = gfortran48 -FL = gfortran48 +CC = @CC@ +FC = @FC@ +FL = @FC@ # keep a space at the end if options have to be separated from lib name -AR = ar -vr "" +AR = ar -vr RANLIB = ranlib LAPACK = -llapack @@ -81,16 +81,16 @@ LAPACK = -llapack INCSEQ = -I$(topdir)/libseq LIBSEQ = $(LAPACK) -L$(topdir)/libseq -lmpiseq LIBBLAS = -lblas -LIBOTHERS = -lpthread +LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ #Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER) -CDEFS = -DAdd_ +CDEFS ?= -DAdd_ #Begin Optimized options # uncomment -fopenmp in lines below to benefit from OpenMP -OPTF = -O #-fopenmp +OPTF = @FCFLAGS@ #-fopenmp OPTL = -O #-fopenmp -OPTC = -O -I. #-fopenmp +OPTC = @CFLAGS@ -I. #-fopenmp #End Optimized options Index: head/science/code_saturne/Makefile =================================================================== --- head/science/code_saturne/Makefile (revision 557365) +++ head/science/code_saturne/Makefile (revision 557366) @@ -1,113 +1,113 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= code_saturne PORTVERSION= 6.1.2 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= science parallel MAINTAINER= thierry@FreeBSD.org COMMENT= EDF's general purpose Computational Fluid Dynamics (CFD) software LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gsed:textproc/gsed LIB_DEPENDS= libsysinfo.so:devel/libsysinfo \ libcgns.so:science/cgnslib \ libhdf5.so:science/hdf5 \ libmedC.so:french/med RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ xmgrace:math/grace \ bash:shells/bash \ xterm:x11/xterm USE_GITHUB= yes GH_ACCOUNT= code-saturne USES= autoreconf bison compiler:c11 fortran gettext gnome gmake \ iconv libtool pyqt:5 python:3.6+ shebangfix USE_GNOME= libxml2 USE_PYQT= core gui sip widgets xml_build SHEBANG_FILES= install_saturne.py tests/unittests.py bin/*.py build-aux/*.py CFLAGS+= -D__XSI_VISIBLE CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-salome --without-salome-yacs --without-salome-kernel \ --without-salome-gui CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed USE_LDCONFIG= yes BINARY_ALIAS= python=${PYTHON_CMD} \ pyrcc5=pyrcc5-${PYTHON_VER} \ pyuic5=pyuic5-${PYTHON_VER} OPTIONS_DEFINE= DOCS EXAMPLES BATCH BLAS MPI SCOTCH OPTIONS_DEFAULT= BATCH BLAS MPI SCOTCH METIS OPTIONS_RADIO= METIS OPTIONS_RADIO_METIS= METIS PARMETIS BLAS_DESC= Support of OpenBLAS BLAS_USES= blaslapack BLAS_CONFIGURE_ON= --with-blas=yes --with-blas-lib=${LOCALBASE}/lib --with-blas-libs=-lopenblas BLAS_LIB_DEPENDS= libopenblas.so:math/openblas BATCH_DESC= Use Torque to submit batches BATCH_RUN_DEPENDS= pbs-config:sysutils/torque MPI_LIB_DEPENDS= libmpi.so:net/mpich MPI_CONFIGURE_WITH= mpi METIS_DESC= Support of METIS METIS_LIB_DEPENDS= libmetis.so:math/metis METIS_CONFIGURE_ON= --with-metis-include="${LOCALBASE}/include" PARMETIS_DESC= Support of ParMETIS PARMETIS_LIB_DEPENDS= libparmetis.so:math/parmetis PARMETIS_CONFIGURE_ON= --with-metis-include="${LOCALBASE}/include/parmetis" \ --with-metis-lib="${LOCALBASE}/lib/parmetis" PARMETIS_CONFIGURE_ENV= LIBS=-lexecinfo SCOTCH_DESC= Support of Scotch -SCOTCH_BUILD_DEPENDS= scotch>0:cad/scotch +SCOTCH_LIB_DEPENDS= libscotch.so:cad/scotch SCOTCH_CONFIGURE_ON= --with-scotch-include="${LOCALBASE}/include" TEST_TARGET= check .if defined(PACKAGE_BUILDING) TERM= vt100 # Force for pointyhat to override su .else TERM?= vt100 # Default value needed for tput in jail or tinderbox .endif .include .if ${ARCH} == "i386" # /wrkdirs/usr/ports/science/code_saturne/work/code_saturne-5.3.0/src/apps/.libs # /libsaturne.so: # undefined reference to `__atomic_compare_exchange' CONFIGURE_ARGS+= --disable-openmp .endif .if ${PORT_OPTIONS:MDOCS} USE_TEX= tex:build -BUILD_DEPENDS+= fig2dev:print/transfig \ +BUILD_DEPENDS+= fig2dev:print/fig2dev \ doxygen:devel/doxygen \ dot:graphics/graphviz \ ${PY_SPHINX} BINARY_ALIAS+= sphinx-build=sphinx-build-${PYTHON_VER} ALL_TARGET= all pdf DOCS= AUTHORS ChangeLog README .endif pre-configure: ${FLEX} -o ${WRKSRC}/src/mei/mei_scanner.c ${WRKSRC}/src/mei/mei_scanner.l ${LOCALBASE}/bin/bison --defines=${WRKSRC}/src/mei/mei_parser.h \ -o ${WRKSRC}/src/mei/mei_parser.c ${WRKSRC}/src/mei/mei_parser.y ${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ ${WRKSRC}/Makefile.am post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Index: head/science/libgeodecomp/Makefile =================================================================== --- head/science/libgeodecomp/Makefile (revision 557365) +++ head/science/libgeodecomp/Makefile (revision 557366) @@ -1,41 +1,41 @@ # Created by: Kurt Kanzenbach # $FreeBSD$ PORTNAME= libgeodecomp PORTVERSION= 0.4.0 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= science devel MASTER_SITES= http://www.libgeodecomp.org/archive/ MAINTAINER= kurt@kmk-computers.de COMMENT= LibGeoDecomp is an auto-parallelizing library for computer simulations LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_system.so:devel/boost-libs libboost_date_time.so:devel/boost-libs \ libboost_filesystem.so:devel/boost-libs USES= cmake compiler:c++11-lib USE_GCC= yes USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_CUDA:BOOL=FALSE -DWITH_VISIT:BOOL=FALSE \ -DWITH_HPX:BOOL=FALSE -DWITH_OPENCL:BOOL=FALSE \ -DWITH_OPENCV:BOOL=FALSE -DWITH_TYPEMAPS=FALSE OPTIONS_DEFINE= MPI SILO SCOTCH OPTIONS_DEFAULT= MPI SILO SCOTCH MPI_LIB_DEPENDS= libmpich.so:net/mpich MPI_CMAKE_BOOL= WITH_MPI SILO_DESC= Enable Silo dependend output SILO_LIB_DEPENDS= libsiloh5.so:science/silo SILO_CMAKE_BOOL= WITH_SILO SCOTCH_DESC= Enable graph partitioning based on Scotch/Scotch-PT -SCOTCH_BUILD_DEPENDS= ${LOCALBASE}/lib/libscotch.a:cad/scotch +SCOTCH_LIB_DEPENDS= libscotch.so:cad/scotch SCOTCH_CMAKE_BOOL= WITH_SCOTCH .include Index: head/science/libgeodecomp/files/patch-CMakeModules_FindSCOTCH.cmake =================================================================== --- head/science/libgeodecomp/files/patch-CMakeModules_FindSCOTCH.cmake (revision 557365) +++ head/science/libgeodecomp/files/patch-CMakeModules_FindSCOTCH.cmake (revision 557366) @@ -1,10 +1,18 @@ ---- CMakeModules/FindSCOTCH.cmake.orig 2020-09-20 01:42:12 UTC +--- CMakeModules/FindSCOTCH.cmake.orig 2014-10-28 09:12:48 UTC +++ CMakeModules/FindSCOTCH.cmake -@@ -121,6 +121,7 @@ endif() +@@ -114,13 +114,14 @@ find_library(PTSCOTCHERR_LIBRARY + ) + + #set(SCOTCH_DEBUG 1) +-set(SCOTCH_LIBRARIES ${PTSCOTCH_LIBRARY}) ++set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARY} ${SCOTCHERR_LIBRARY} ${PTSCOTCH_LIBRARY}) + if (PTESMUMPS_LIBRARY) + set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${PTESMUMPS_LIBRARY}) + endif() set(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${PTSCOTCHERR_LIBRARY}) # Try compiling and running test program +set(DOLFIN_SKIP_BUILD_TESTS 1) if (DOLFIN_SKIP_BUILD_TESTS) set(SCOTCH_TEST_RUNS TRUE) elseif (SCOTCH_INCLUDE_DIRS AND SCOTCH_LIBRARIES)