Index: head/science/elmer-fem/Makefile =================================================================== --- head/science/elmer-fem/Makefile (revision 186664) +++ head/science/elmer-fem/Makefile (revision 186665) @@ -1,79 +1,83 @@ # New ports collection makefile for: elmer-fem # Date created: 5 Jan 2006 # Whom: Pedro Giffuni # # $FreeBSD$ # PORTNAME= fem PORTVERSION= 5.3.1 CATEGORIES= science tk84 MASTER_SITES= ftp://ftp.funet.fi/pub/sci/physics/elmer/src/ PKGNAMEPREFIX= elmer- MAINTAINER= ports@FreeBSD.org COMMENT= FEM solver for use in the ELMER FEM package BUILD_DEPENDS= ${LOCALBASE}/lib/libmatc.a:${PORTSDIR}/science/elmer-matc \ ${LOCALBASE}/lib/libeiof.a:${PORTSDIR}/science/elmer-eio \ ${LOCALBASE}/lib/libhuti.a:${PORTSDIR}/science/elmer-hutiter \ ${LOCALBASE}/lib/libumfpack_elmer.a:${PORTSDIR}/math/elmer-umfpack - RUN_DEPENDS= ElmerGrid:${PORTSDIR}/science/elmergrid \ Mesh2D:${PORTSDIR}/science/elmer-meshgen2d WANT_FORTRAN=yes #dummy but future use BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42 FC= gfortran42 F77= gfortran42 .ifdef WITH_OPTIMIZED_FLAGS FCFLAGS+= -O3 -ffast-math .endif USE_AUTOTOOLS= autoconf:259 GNU_CONFIGURE= yes USE_GMAKE= yes ALL_TARGET= USE_LDCONFIG= yes TEST_ENV= ELMER_HOME=${PREFIX} DATADIR= ${PREFIX}/share/elmersolver PLIST_SUB= ARCH=${MACHINE_ARCH} .include .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas BLAS= -lf77blas -latlas LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS= -lblas LAPACK= -llapack .endif .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC FCFLAGS+= -fPIC FFLAGS+= -fPIC ${FCFLAGS} .endif -CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FCFLAGS="${FCFLAGS}" -CONFIGURE_ARGS+= --with-umfpack="-L${LOCALBASE}/lib -lumfpack_elmer" \ - --with-blas="-L${LOCALBASE}/lib ${BLAS}" \ - --with-lapack="-L${LOCALBASE}/lib ${LAPACK}" \ - --with-eiof="-L${LOCALBASE}/lib -leiof" +LDFLAGS+= -L${LOCALBASE}/lib +CPPFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include +CXXFLAGS+= -I${LOCALBASE}/include +CONFIGURE_ENV+= FC="${FC}" F77="${F77}" FCFLAGS="${FCFLAGS}" LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" CFLAGS="${CFLAGS}" +CONFIGURE_ARGS+= --with-umfpack="-lumfpack_elmer" \ + --with-blas="${BLAS}" \ + --with-lapack="${LAPACK}" \ + --with-eiof="-leiof" \ + --with-matc="-lmatc -lm" pre-configure: ${REINPLACE_CMD} -e 's|make|${GMAKE}|g' ${WRKSRC}/tests/runtests.in .if defined(MAINTAINER_MODE) regression-test: install @(cd ${BUILD_WRKSRC}; ${SETENV} ${TEST_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) .endif .include Property changes on: head/science/elmer-fem/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.13 \ No newline at end of property +1.14 \ No newline at end of property Index: head/science/elmer-fem/files/patch-configure.in =================================================================== --- head/science/elmer-fem/files/patch-configure.in (revision 186664) +++ head/science/elmer-fem/files/patch-configure.in (revision 186665) @@ -1,11 +1,11 @@ --- configure.in.orig Wed Feb 15 18:56:07 2006 +++ configure.in Wed Feb 15 18:56:45 2006 -@@ -68,7 +68,7 @@ - FCFLAGS="$FCFLAGS -I." - FFLAGS="$FCFLAGS -I." +@@ -69,7 +69,7 @@ + FCFLAGS="$FCFLAGS -I. ${INCLUDE_MODULE_FLAG}binio" + FFLAGS="$FFLAGS -I." ELMER_HOME="$prefix" -FCPPFLAGS="-P $TRADITIONAL_CPP_FLAGS -I. -I$prefix/include -DFULL_INDUCTION -DUSE_ARPACK" -+FCPPFLAGS="-P -traditional -I. -I$prefix/include -DFULL_INDUCTION -DUSE_ARPACK" ++FCPPFLAGS="-P -traditional -I. $CPPFLAGS -I$prefix/include -DFULL_INDUCTION -DUSE_ARPACK" TESTS_FCFLAGS="" ELMER_LIBERRORMSG="wasn't found, make sure it is in the prefix, or CFLAGS and LIBS are correct if they are somewhere else." Property changes on: head/science/elmer-fem/files/patch-configure.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/science/elmer-fem/pkg-plist =================================================================== --- head/science/elmer-fem/pkg-plist (revision 186664) +++ head/science/elmer-fem/pkg-plist (revision 186665) @@ -1,100 +1,110 @@ bin/%%ARCH%%-portbld-freebsd%%OSREL%%-SC2Elmer bin/ElmerSolver bin/GebhardtFactors bin/ViewFactors bin/elmerf90 lib/libelmersolver.so +include/binio.mod %%DATADIR%%/include/adaptive.mod %%DATADIR%%/include/bandmatrix.mod %%DATADIR%%/include/bandwidthoptimize.mod %%DATADIR%%/include/coordinatesystems.mod %%DATADIR%%/include/crsmatrix.mod %%DATADIR%%/include/defutils.mod %%DATADIR%%/include/differentials.mod %%DATADIR%%/include/diffuseconvective.mod %%DATADIR%%/include/diffuseconvectivegeneral.mod %%DATADIR%%/include/directsolve.mod %%DATADIR%%/include/eigensolve.mod %%DATADIR%%/include/elementdescription.mod %%DATADIR%%/include/elementutils.mod %%DATADIR%%/include/freesurface.mod %%DATADIR%%/include/gebhardtfactorglobals.mod %%DATADIR%%/include/generalutils.mod %%DATADIR%%/include/globmat.mod %%DATADIR%%/include/hashtable.mod %%DATADIR%%/include/integration.mod %%DATADIR%%/include/interpolation.mod %%DATADIR%%/include/itersolve.mod %%DATADIR%%/include/linearalgebra.mod %%DATADIR%%/include/lists.mod %%DATADIR%%/include/ludecomposition.mod %%DATADIR%%/include/mainutils.mod %%DATADIR%%/include/materialmodels.mod %%DATADIR%%/include/maxwell.mod %%DATADIR%%/include/maxwellaxis.mod %%DATADIR%%/include/maxwellgeneral.mod %%DATADIR%%/include/meshutils.mod %%DATADIR%%/include/messages.mod %%DATADIR%%/include/modeldescription.mod %%DATADIR%%/include/multigrid.mod %%DATADIR%%/include/navierstokes.mod %%DATADIR%%/include/navierstokescylindrical.mod %%DATADIR%%/include/navierstokesgeneral.mod %%DATADIR%%/include/paralleleigensolve.mod %%DATADIR%%/include/parallelutils.mod %%DATADIR%%/include/pelementbase.mod %%DATADIR%%/include/pelementmaps.mod %%DATADIR%%/include/radiation.mod %%DATADIR%%/include/radiationfactorglobals.mod %%DATADIR%%/include/solverutils.mod %%DATADIR%%/include/sparitercomm.mod %%DATADIR%%/include/spariterglobals.mod %%DATADIR%%/include/spariterprecond.mod %%DATADIR%%/include/sparitersolve.mod %%DATADIR%%/include/stressgeneral.mod %%DATADIR%%/include/stresslocal.mod %%DATADIR%%/include/timeintegrate.mod %%DATADIR%%/include/types.mod %%DATADIR%%/include/viewfactorglobals.mod +%%DATADIR%%/include/dxfile.mod +%%DATADIR%%/include/exchangecorrelations.mod +%%DATADIR%%/include/harmonicsolve.mod +%%DATADIR%%/include/vtklegacyfile.mod %%DATADIR%%/lib/AdvectionDiffusion.so %%DATADIR%%/lib/ArteryOutlet.so %%DATADIR%%/lib/ArtificialCompressibility.so %%DATADIR%%/lib/DCRComplexSolve.so %%DATADIR%%/lib/ElasticSolve.so %%DATADIR%%/lib/ElectricForce.so %%DATADIR%%/lib/Electrokinetics.so %%DATADIR%%/lib/EliminateDirichlet.so %%DATADIR%%/lib/EliminatePeriodic.so %%DATADIR%%/lib/EnergyRelease.so %%DATADIR%%/lib/FDiffusion.so %%DATADIR%%/lib/FDiffusion3D.so %%DATADIR%%/lib/FluidicForce.so %%DATADIR%%/lib/FreeSurfaceReduced.so %%DATADIR%%/lib/FreeSurfaceSolver.so %%DATADIR%%/lib/HelmholtzBEM.so %%DATADIR%%/lib/HelmholtzSolve.so %%DATADIR%%/lib/KESolver.so %%DATADIR%%/lib/LevelSet.so %%DATADIR%%/lib/MagneticSolve.so %%DATADIR%%/lib/MovingElstatSolver.so %%DATADIR%%/lib/PoissonBEM.so %%DATADIR%%/lib/PoissonBoltzmannSolve.so %%DATADIR%%/lib/RateOfChange.so %%DATADIR%%/lib/ReloadInput.so %%DATADIR%%/lib/ResultOutputSolve.so %%DATADIR%%/lib/RigidBodyReduction.so %%DATADIR%%/lib/SOLVER.KEYWORDS %%DATADIR%%/lib/SaveData.so %%DATADIR%%/lib/Smitc.so %%DATADIR%%/lib/StatCurrentSolve.so %%DATADIR%%/lib/StatElecSolve.so %%DATADIR%%/lib/StatMagSolve.so %%DATADIR%%/lib/Stokes.so %%DATADIR%%/lib/StreamSolver.so %%DATADIR%%/lib/StressSolve.so %%DATADIR%%/lib/TransportEquation.so %%DATADIR%%/lib/elements.def %%DATADIR%%/lib/libelmersolver.so +%%DATADIR%%/lib/DFTSolver.so +%%DATADIR%%/lib/FlowSolve.so +%%DATADIR%%/lib/HeatSolve.so +%%DATADIR%%/lib/MeshSolve.so +%%DATADIR%%/lib/ShellSolve.so @dirrm %%DATADIR%%/lib @dirrm %%DATADIR%%/include @dirrm %%DATADIR%% Property changes on: head/science/elmer-fem/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property