Index: head/cad/gmsh/Makefile =================================================================== --- head/cad/gmsh/Makefile (revision 494833) +++ head/cad/gmsh/Makefile (revision 494834) @@ -1,69 +1,70 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= gmsh DISTVERSION= 4.1.3 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://gmsh.info/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source DIST_SUBDIR= gmsh MAINTAINER= ports@FreeBSD.org COMMENT= Automatic 3D finite element mesh generator LICENSE= AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21 LICENSE_COMB= multi LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libgmp.so:math/gmp \ libhdf5.so:science/hdf5 \ libpng.so:graphics/png \ libsz.so:science/szip RUN_DEPENDS= getdp:science/getdp USES= blaslapack compiler:c++11-lang cmake fortran gl jpeg tar:tgz USE_GL= gl glu USE_XORG= x11 xcursor xext xinerama xfixes xft xrender CMAKE_ARGS= -DCMAKE_SKIP_RPATH:BOOL=YES OPTIONS_DEFINE= CGNS DOCS MED OCC SHARED STATIC OPTIONS_DEFAULT= CGNS MED OCC OPTIONS_SUB= yes CGNS_DESC= Enable CGNS mesh import MED_DESC= Enable MED mesh and post file formats OCC_DESC= Enable OpenCASCADE geometrical models SHARED_DESC= Build shared library and install header files STATIC_DESC= Build static library PLIST_SUB= VER=${PORTVERSION} VE=${PORTVERSION:R} # TODO # Dependencies against PythonLibs, swig and petsc are found and registered if # installed # => add knobs to handle them. CGNS_CMAKE_BOOL= ENABLE_CGNS CGNS_LIB_DEPENDS= libcgns.so:science/cgnslib DOCS_CMAKE_BOOL= INSTALL_DOCS MED_CMAKE_BOOL= ENABLE_MED MED_LIB_DEPENDS= libmed.so:french/med OCC_CMAKE_BOOL= ENABLE_OCC OCC_CMAKE_ON= -DOCC_INC=${LOCALBASE}/include/OpenCASCADE OCC_LIB_DEPENDS= libopenblas.so:math/openblas libTKernel.so:cad/opencascade OCC_USES= gnome OCC_USE= gnome=cairo SHARED_CMAKE_BOOL= ENABLE_BUILD_SHARED SHARED_USE= LDCONFIG=yes STATIC_CMAKE_BOOL= ENABLE_BUILD_LIB post-patch: @${REINPLACE_CMD} -e "s|share/doc/gmsh|${DOCSDIR_REL}|" \ -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt post-install-SHARED-on: ${RM} -r ${STAGEDIR}/wrkdirs .include Index: head/science/cgnslib/Makefile =================================================================== --- head/science/cgnslib/Makefile (revision 494833) +++ head/science/cgnslib/Makefile (revision 494834) @@ -1,56 +1,53 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= cgnslib DISTVERSIONPREFIX= v -DISTVERSION= 3.3.1 -PORTREVISION= 2 +DISTVERSION= 3.4.0 PORTEPOCH= 1 CATEGORIES= science MAINTAINER= thierry@FreeBSD.org COMMENT= CFD General Notation System library code LICENSE= AS-IS LICENSE_NAME= AS-IS LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cmake USE_GITHUB= yes GH_ACCOUNT= CGNS GH_PROJECT= CGNS USE_LDCONFIG= yes -OPTIONS_DEFINE= HDF5 TESTS TOOLS -OPTIONS_DEFAULT= HDF5 TESTS TOOLS +TEST_TARGET= test + +OPTIONS_DEFINE= FORTRAN HDF5 TESTS TOOLS +OPTIONS_DEFAULT= FORTRAN HDF5 TESTS TOOLS OPTIONS_SUB= yes HDF5_DESC= Enable HDF5 interface TESTS_DESC= Enable test programs TOOLS_DESC= Build the CGNSTools package -SZIP_DESC= SZIP support in HDF5 +FORTRAN_USES= fortran +FORTRAN_CMAKE_BOOL= CGNS_ENABLE_FORTRAN + HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 libsz.so:science/szip HDF5_CMAKE_BOOL= CGNS_ENABLE_HDF5 HDF5_CMAKE_ON= -DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include" -TESTS_USES= fortran -TESTS_CMAKE_BOOL= ENABLE_TESTS CGNS_ENABLE_FORTRAN +TESTS_CMAKE_BOOL= CGNS_ENABLE_TESTS TOOLS_USES= gl localbase tk -TOOLS_USE= GL=gl,glu XORG=x11,xmu +TOOLS_USE= GL=gl,glu XORG=ice,xext,x11,xmu TOOLS_CMAKE_BOOL= CGNS_BUILD_CGNSTOOLS TOOLS_CMAKE_ON= -DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \ -DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}" - -do-test-TESTS-on: -.for pg in cgwrite cgread test_partial - @(cd ${BUILD_WRKSRC}/src/tests; ./${pg}) -.endfor post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${DISTVERSION:R} \ ${STAGEDIR}${PREFIX}/lib/libcgns.so.${DISTVERSION:R:R} .include Index: head/science/cgnslib/distinfo =================================================================== --- head/science/cgnslib/distinfo (revision 494833) +++ head/science/cgnslib/distinfo (revision 494834) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538602109 -SHA256 (CGNS-CGNS-v3.3.1_GH0.tar.gz) = 81093693b2e21a99c5640b82b267a495625b663d7b8125d5f1e9e7aaa1f8d469 -SIZE (CGNS-CGNS-v3.3.1_GH0.tar.gz) = 3340675 +TIMESTAMP = 1551816418 +SHA256 (CGNS-CGNS-v3.4.0_GH0.tar.gz) = 6372196caf25b27d38cf6f056258cb0bdd45757f49d9c59372b6dbbddb1e05da +SIZE (CGNS-CGNS-v3.4.0_GH0.tar.gz) = 3393312 Index: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c =================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c (revision 494833) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c (nonexistent) @@ -1,13 +0,0 @@ ---- src/cgnstools/cgnscalc/calcwish.c.orig 2017-07-17 21:51:06 UTC -+++ src/cgnstools/cgnscalc/calcwish.c -@@ -20,8 +20,10 @@ - * Sun shared libraries to be used for Tcl. - */ - -+#ifndef __FreeBSD__ - extern int matherr(); - int *tclDummyMathPtr = (int *) matherr; -+#endif /* FreeBSD test */ - - #ifdef TK_TEST - extern int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp)); Property changes on: head/science/cgnslib/files/patch-src_cgnstools_cgnscalc_calcwish.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c =================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c (revision 494833) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c (nonexistent) @@ -1,13 +0,0 @@ ---- src/cgnstools/cgnsplot/plotwish.c.orig 2017-07-17 21:51:06 UTC -+++ src/cgnstools/cgnsplot/plotwish.c -@@ -20,8 +20,10 @@ - * Sun shared libraries to be used for Tcl. - */ - -+#ifndef __FreeBSD__ - extern int matherr(); - int *tclDummyMathPtr = (int *) matherr; -+#endif /* FreeBSD test */ - - extern int Cgnstcl_Init _ANSI_ARGS_((Tcl_Interp *interp)); - extern int Tkogl_Init _ANSI_ARGS_((Tcl_Interp *interp)); Property changes on: head/science/cgnslib/files/patch-src_cgnstools_cgnsplot_plotwish.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c =================================================================== --- head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c (revision 494833) +++ head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c (nonexistent) @@ -1,13 +0,0 @@ ---- src/cgnstools/cgnsview/cgiowish.c.orig 2017-07-17 21:51:06 UTC -+++ src/cgnstools/cgnsview/cgiowish.c -@@ -20,8 +20,10 @@ - * Sun shared libraries to be used for Tcl. - */ - -+#ifndef __FreeBSD__ - extern int matherr(); - int *tclDummyMathPtr = (int *) matherr; -+#endif /* FreeBSD test */ - - #ifdef TK_TEST - extern int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp)); Property changes on: head/science/cgnslib/files/patch-src_cgnstools_cgnsview_cgiowish.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/cgnslib/pkg-plist =================================================================== --- head/science/cgnslib/pkg-plist (revision 494833) +++ head/science/cgnslib/pkg-plist (revision 494834) @@ -1,102 +1,103 @@ %%HDF5%%bin/adf2hdf %%HDF5%%bin/hdf2adf %%TOOLS%%bin/cgconfig %%TOOLS%%bin/cgnscalc %%TOOLS%%bin/cgnsnodes %%TOOLS%%bin/cgnsplot %%TOOLS%%bin/cgnstools/aflr3_to_cgns %%TOOLS%%bin/cgnstools/calcwish %%TOOLS%%bin/cgnstools/cgiowish %%TOOLS%%bin/cgnstools/cgns_to_aflr3 %%TOOLS%%bin/cgnstools/cgns_to_fast %%TOOLS%%bin/cgnstools/cgns_to_plot3d %%TOOLS%%bin/cgnstools/cgns_to_tecplot %%TOOLS%%bin/cgnstools/cgns_to_vtk %%TOOLS%%bin/cgnstools/convert_dataclass %%TOOLS%%bin/cgnstools/convert_location %%TOOLS%%bin/cgnstools/convert_variables %%TOOLS%%bin/cgnstools/extract_subset %%TOOLS%%bin/cgnstools/fast_to_cgns %%TOOLS%%bin/cgnstools/interpolate_cgns %%TOOLS%%bin/cgnstools/patran_to_cgns %%TOOLS%%bin/cgnstools/plot3d_to_cgns %%TOOLS%%bin/cgnstools/plotwish %%TOOLS%%bin/cgnstools/tecplot_to_cgns %%TOOLS%%bin/cgnstools/tetgen_to_cgns +%%TOOLS%%bin/cgnstools/update_ngon %%TOOLS%%bin/cgnstools/vgrid_to_cgns %%TOOLS%%bin/cgnsview %%TOOLS%%bin/unitconv bin/cgnscheck bin/cgnscompress bin/cgnsconvert bin/cgnsdiff bin/cgnslist bin/cgnsnames bin/cgnsupdate -%%TESTS%%include/cgns.mod +%%FORTRAN%%include/cgns.mod include/cgnsBuild.defs include/cgns_io.h include/cgnsconfig.h include/cgnslib.h include/cgnstypes.h include/cgnstypes_f.h include/cgnstypes_f03.h include/cgnswin_f.h lib/libcgns.a lib/libcgns.so lib/libcgns.so.3 -lib/libcgns.so.3.3 +lib/libcgns.so.3.4 %%TOOLS%%share/cgnstools/aflr3.tcl %%TOOLS%%share/cgnstools/balloon.tcl %%TOOLS%%share/cgnstools/cgns-icon.xbm %%TOOLS%%share/cgnstools/cgns-mask.xbm %%TOOLS%%share/cgnstools/cgns.ico %%TOOLS%%share/cgnstools/cgns.png %%TOOLS%%share/cgnstools/cgns.tcl %%TOOLS%%share/cgnstools/cgnscalc-icon.xbm %%TOOLS%%share/cgnstools/cgnscalc-mask.xbm %%TOOLS%%share/cgnstools/cgnscalc.ico %%TOOLS%%share/cgnstools/cgnscalc.png %%TOOLS%%share/cgnstools/cgnscalc.tcl %%TOOLS%%share/cgnstools/cgnsnodes.tcl %%TOOLS%%share/cgnstools/cgnsplot-icon.xbm %%TOOLS%%share/cgnstools/cgnsplot-mask.xbm %%TOOLS%%share/cgnstools/cgnsplot.ico %%TOOLS%%share/cgnstools/cgnsplot.png %%TOOLS%%share/cgnstools/cgnsplot.tcl %%TOOLS%%share/cgnstools/cgnsview.tcl %%TOOLS%%share/cgnstools/color.tcl %%TOOLS%%share/cgnstools/combobox.tcl %%TOOLS%%share/cgnstools/config.tcl %%TOOLS%%share/cgnstools/conserved.cnv %%TOOLS%%share/cgnstools/convert.tcl %%TOOLS%%share/cgnstools/dialog.tcl %%TOOLS%%share/cgnstools/dimensional.cnv %%TOOLS%%share/cgnstools/editfile.tcl %%TOOLS%%share/cgnstools/export.tcl %%TOOLS%%share/cgnstools/fast.tcl %%TOOLS%%share/cgnstools/filesel.tcl %%TOOLS%%share/cgnstools/findfile.tcl %%TOOLS%%share/cgnstools/frame.tcl %%TOOLS%%share/cgnstools/help.tcl %%TOOLS%%share/cgnstools/import.tcl %%TOOLS%%share/cgnstools/menubar.tcl %%TOOLS%%share/cgnstools/patran.tcl %%TOOLS%%share/cgnstools/plot3d.tcl %%TOOLS%%share/cgnstools/primitive.cnv %%TOOLS%%share/cgnstools/tclIndex %%TOOLS%%share/cgnstools/tclreg.tcl %%TOOLS%%share/cgnstools/tecplot.tcl %%TOOLS%%share/cgnstools/tetgen.tcl %%TOOLS%%share/cgnstools/tkdir.tcl %%TOOLS%%share/cgnstools/tools.tcl %%TOOLS%%share/cgnstools/tree.tcl %%TOOLS%%share/cgnstools/unitconv.ico %%TOOLS%%share/cgnstools/unitconv.png %%TOOLS%%share/cgnstools/unitconv.tcl %%TOOLS%%share/cgnstools/unitconv.xbm %%TOOLS%%share/cgnstools/units.tcl %%TOOLS%%share/cgnstools/util.tcl %%TOOLS%%share/cgnstools/utilities.mnu %%TOOLS%%share/cgnstools/vgrid.tcl %%TOOLS%%share/cgnstools/vtk.tcl Index: head/science/code_saturne/Makefile =================================================================== --- head/science/code_saturne/Makefile (revision 494833) +++ head/science/code_saturne/Makefile (revision 494834) @@ -1,103 +1,104 @@ # Created by: thierry@pompo.net # $FreeBSD$ PORTNAME= code_saturne PORTVERSION= 5.3.2 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= science parallel MAINTAINER= thierry@FreeBSD.org COMMENT= EDF's general purpose Computational Fluid Dynamics (CFD) software LICENSE= GPLv2 LIB_DEPENDS= libsysinfo.so:devel/libsysinfo \ libcgns.so:science/cgnslib \ libhdf5.so:science/hdf5 \ libomp.so:devel/openmp \ libmedC.so:french/med RUN_DEPENDS= xmgrace:math/grace \ bash:shells/bash \ xterm:x11/xterm USE_GITHUB= yes GH_ACCOUNT= code-saturne USES= autoreconf bison fortran gettext gnome gmake iconv libtool \ pyqt:5 python:2.7 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 CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2 GNU_CONFIGURE= yes USE_LDCONFIG= yes BINARY_ALIAS= python=${PYTHON_CMD} \ pyrcc5=pyrcc5-${PYTHON_VER} \ pyuic5=pyuic5-${PYTHON_VER} OPTIONS_DEFINE= DOCS EXAMPLES ATLAS BATCH MPI OPTIONS_DEFAULT= BATCH MPI METIS OPTIONS_RADIO= METIS OPTIONS_RADIO_METIS= METIS PARMETIS ATLAS_USES= blaslapack:atlas ATLAS_CONFIGURE_ON= --with-blas=yes --with-blas-type=ATLAS 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_LIB_DEPENDS= libmetis.so:math/metis METIS_CONFIGURE_ON= --with-metis-include="${LOCALBASE}/include" 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 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 \ doxygen:devel/doxygen \ dot:graphics/graphviz \ sphinx-build-${PYTHON_VER}:textproc/py-sphinx@${PY_FLAVOR} BINARY_ALIAS+= sphinx-build=sphinx-build-${PYTHON_VER} ALL_TARGET= all pdf DOCS= AUTHORS ChangeLog README .endif pre-configure: (cd ${WRKSRC} && ${LS} preprocessor/*/*.c src/*/*.c* | \ ${GREP} -v user_examples > po/POTFILES.in) ${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: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:C|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .endif .include