diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2006-02-18 09:04:52 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2006-02-18 09:04:52 +0000 |
commit | d09598917e1ce7b954d1eff55b61371c67e8ef63 (patch) | |
tree | 347259180abc69a20e587050848a183f959910a9 /math | |
parent | - update from v0.38 to v0.39 (diff) |
Upgrade to PETSc-2.3.1 patchlevel 7.
Changelog at
<http://www-unix.mcs.anl.gov/petsc/petsc-as/documentation/changes/231.html>.
Notes
Notes:
svn path=/head/; revision=156265
Diffstat (limited to 'math')
-rw-r--r-- | math/petsc/Makefile | 109 | ||||
-rw-r--r-- | math/petsc/distinfo | 6 | ||||
-rw-r--r-- | math/petsc/pkg-plist | 69 |
3 files changed, 94 insertions, 90 deletions
diff --git a/math/petsc/Makefile b/math/petsc/Makefile index f3cd78eb3030..0a12aae1af15 100644 --- a/math/petsc/Makefile +++ b/math/petsc/Makefile @@ -6,28 +6,28 @@ # PORTNAME= petsc -PORTVERSION= 2.3.0 -PORTREVISION= 3 +PORTVERSION= 2.3.1 CATEGORIES= math parallel MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/ -DISTNAME= v${PORTVERSION}-${PATCHLEVEL}.${PORTNAME} +DISTNAME= ${PORTNAME}-${PORTVERSION}-p${PATCHLEVEL} MAINTAINER= ports@FreeBSD.org COMMENT= Portable, Extensible Toolkit for Scientific computation -PATCHLEVEL= 36 +RUN_DEPENDS= ksh93:${PORTSDIR}/shells/ksh93 + +PATCHLEVEL= 7 HAS_CONFIGURE= yes USE_PYTHON= yes -USE_REINPLACE= yes CONFIGURE_SCRIPT= config/configure.py CONFIGURE_LOG= configure.log CONFIGURE_ENV= PETSC_ARCH=${TARGET} \ PETSC_DIR=${WRKSRC} -CONFIGURE_ARGS= --prefix=${PREFIX} --CFLAGS="${CFLAGS}" \ - --CXX_CXXFLAGS="${CXXFLAGS}" --FFLAGS="${FFLAGS}" \ - --with-python=1 ---with-shared=1 -ALL_TARGET= all python +CONFIGURE_ARGS= --prefix=${PREFIX}/${PFX} --COPTFLAGS="${CFLAGS}" \ + --CXXOPTFLAGS="${CXXFLAGS}" --FOPTFLAGS="${FFLAGS}" \ + --with-shared=1 +ALL_TARGET= all MAKEFILE= makefile MAKE_ENV= PETSC_DIR=${WRKSRC} @@ -37,13 +37,12 @@ PKGMESSAGE= ${WRKDIR}/pkg-message .if !defined(WITHOUT_X11) USE_XLIB= yes -CONFIGURE_ARGS+= --with-x-include=${X11BASE}/include \ +CONFIGURE_ARGS+= --with-x-include=${X11BASE}/include \ --with-x-library=${X11BASE}/lib/libX11.so .endif FFLAGS?= -O2 -PFX= ${PORTNAME}-${PORTVERSION} -WRKSRC= ${WRKDIR}/${PFX} +PFX= ${PORTNAME} TARGET= ${OPSYS:L} PLIST_SUB= PFX=${PFX} TARGET=${TARGET} @@ -53,12 +52,6 @@ LIBBLASLAPACK= "-L${LOCALBASE}/lib -lalapack -lf77blas -lcblas -latlas -lg2c -lm CONFIGURE_ARGS+= --with-blas-lapack-lib=${LIBBLASLAPACK} .endif -.if !defined(WITHOUT_SUPERLU) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libsuperlu.a:${PORTSDIR}/math/superlu -CONFIGURE_ARGS+= --with-superlu-include=${LOCALBASE}/include/superlu \ - --with-superlu-lib=${LOCALBASE}/lib/libsuperlu.a -.endif - .if !defined(WITHOUT_UMFPACK) BUILD_DEPENDS+= ${LOCALBASE}/lib/libumfpack.a:${PORTSDIR}/math/umfpack CONFIGURE_ARGS+= --with-umfpack-include="${LOCALBASE}/include/UMFPACK" \ @@ -78,23 +71,33 @@ MPIDIR= ${LOCALBASE}/mpich .include <bsd.port.pre.mk> -.if exists(${MPIDIR}/bin/mpiCC) +.if exists(${MPIDIR}/bin/mpiCC) && !defined(WITHOUT_MPI) WITH_MPI= yes .endif .if defined(WITH_MPI) +. if exists(${LOCALBASE}/include/mpi.h) +BROKEN= Cannot build with mpich when lam7 is installed - set WITHOUT_MPI or deinstall lam7 +. endif PKGNAMESUFFIX+= -mpich BUILD_DEPENDS+= ${MPIDIR}/bin/mpiCC:${PORTSDIR}/net/mpich RUN_DEPENDS+= ${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich CONFIGURE_ARGS+= --with-mpi-dir=${LOCALBASE}/mpich CONFLICTS= petsc-2* -PLIST_SUB+= MPI="" +PLIST_SUB+= MPIUNI="@comment " .else CONFIGURE_ARGS+= --with-mpi=0 CONFLICTS= petsc-mpich-2* WITHOUT_BS95= yes WITHOUT_PARMETIS= yes WITHOUT_SPOOLES= yes -PLIST_SUB+= MPI="@comment " +WITHOUT_SUPERLU= yes +PLIST_SUB+= MPIUNI="" +.endif + +.if !defined(WITHOUT_SUPERLU) && !defined(WITHOUT_BLASLAPACK) +BUILD_DEPENDS+= ${LOCALBASE}/lib/libsuperlu.a:${PORTSDIR}/math/superlu +CONFIGURE_ARGS+= --with-superlu-include=${LOCALBASE}/include/superlu \ + --with-superlu-lib=${LOCALBASE}/lib/libsuperlu.a .endif .if defined(WITHOUT_BS95) @@ -109,27 +112,27 @@ CONFIGURE_ARGS+= --with-blocksolve95-include=${LOCALBASE}/include \ CONFIGURE_ARGS+= --with-parmetis=0 .else BUILD_DEPENDS+= ${LOCALBASE}/lib/parmetis/libparmetis.a:${PORTSDIR}/math/parmetis -LIBPARMETIS= "${LOCALBASE}/lib/parmetis/libparmetis.a ${LOCALBASE}/lib/parmetis/libmetis.a" CONFIGURE_ARGS+= --with-parmetis=1 \ --with-parmetis-include=${LOCALBASE}/include/parmetis \ - --with-parmetis-lib=[${LOCALBASE}/lib/parmetis/libparmetis.a,${LOCALBASE}/lib/parmetis/libmetis.a,${LIBDIR}/libm.a] + --with-parmetis-lib=[${LOCALBASE}/lib/parmetis/libparmetis.a,${LOCALBASE}/lib/parmetis/libmetis.a] .endif -#.if exists(${LIBBLACS}) -#WITH_BLACS= yes -#.endif -#.if defined(WITH_BLACS) -#BUILD_DEPENDS+= ${LIBBLACS}:${PORTSDIR}/math/blacs -#CONFIGURE_ARGS+= --with_mumps=1 \ -# --with-blacs-lib=1 -#. if exists(${LIBSCALAPACK}) -#WITH_SCALAPACK= yes -#. endif -#. if defined(WITH_SCALAPACK) -#BUILD_DEPENDS+= ${LIBSCALAPACK}:${PORTSDIR}/math/scalapack -#CONFIGURE_ARGS+= --with-scalapack-lib=1 -#. endif -#.endif +.if exists(${LIBBLACS}) +WITH_BLACS= yes +.endif +.if defined(WITH_BLACS) && !defined(WITH_MPI) +BUILD_DEPENDS+= ${LIBBLACS}:${PORTSDIR}/math/blacs +CONFIGURE_ARGS+= --with_mumps=0 \ + --with-blacs-include=${LOCALBASE}/include \ + --with-blacs-lib=[${LOCALBASE}/lib/libblacs.a,${LOCALBASE}/lib/libblacsc.a,${LOCALBASE}/lib/libblacsf77.a] +. if exists(${LIBSCALAPACK}) +WITH_SCALAPACK= yes +. endif +. if defined(WITH_SCALAPACK) +BUILD_DEPENDS+= ${LIBSCALAPACK}:${PORTSDIR}/math/scalapack +CONFIGURE_ARGS+= --with-scalapack-dir=${LOCALBASE} +. endif +.endif #.if exists(${LOCALBASE}/bin/lgrind) #WITH_LGRIND= yes @@ -139,14 +142,14 @@ CONFIGURE_ARGS+= --with-parmetis=1 \ #RUN_DEPENDS+= lgrind:${PORTSDIR}/print/lgrind #.endif -#.if exists(${LOCALBASE}/lib/libnetcdf.so) -#WITH_NETCDF= yes -#.endif -#.if defined(WITH_NETCDF) -#LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf -#CONFIGURE_ENV+= NETCDF_INCLUDE=${LOCALBASE}/include \ -# NETCDF_LIB=${LOCALBASE}/lib -#.endif +.if exists(${LOCALBASE}/lib/libnetcdf.so) +WITH_NETCDF= yes +.endif +.if defined(WITH_NETCDF) +LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf +CONFIGURE_ENV+= PNETCDF_INCLUDE=${LOCALBASE}/include \ + PNETCDF_LIB=${LOCALBASE}/lib +.endif .if exists(${LOCALBASE}/bin/svn) WITH_SVN= yes @@ -167,7 +170,7 @@ RUN_DEPENDS+= svn:${PORTSDIR}/devel/subversion .if !defined(WITHOUT_SPOOLES) . if exists(${LOCALBASE}/lib/libspooles.a) \ && !exists(${LOCALBASE}/include/spooles/MPI/spoolesMPI.h) -BROKEN= "Please deinstall spooles and reinstall spooles-mpich" +BROKEN= Please deinstall spooles and reinstall spooles-mpich . else BUILD_DEPENDS+= ${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles-mpich . endif @@ -179,6 +182,9 @@ pre-everything:: @${ECHO_MSG} .if !defined (WITH_MPI) @${ECHO_MSG} "Define WITH_MPI to use mpich." + @${ECHO_MSG} "Note: this is not compatible with Python bindings!" +.elif !defined (WITHOUT_MPI) + @${ECHO_MSG} "Define WITHOUT_MPI to not use mpich." .endif .if !defined (WITH_SVN) @${ECHO_MSG} "Define WITH_SVN to use subversion." @@ -198,9 +204,9 @@ pre-everything:: .if !defined (WITHOUT_SPOOLES) @${ECHO_MSG} "Define WITHOUT_SPOOLES to remove SPOOLES support." .endif -.if !defined (WITHOUT_SUPERLU) - @${ECHO_MSG} "Define WITHOUT_SUPERLU to remove SuperLU support." -.endif +#.if !defined (WITHOUT_SUPERLU) +# @${ECHO_MSG} "Define WITHOUT_SUPERLU to remove SuperLU support." +#.endif .if !defined (WITHOUT_UMFPACK) @${ECHO_MSG} "Define WITHOUT_UMFPACK to remove UMFPACK support." .endif @@ -211,6 +217,9 @@ pre-configure: @${REINPLACE_CMD} -e "s|AMD/Include|include/AMD|" \ -e "s|AMD/Lib|${LOCALBASE}/lib|" \ ${WRKSRC}/python/PETSc/packages/UMFPACK.py + @${REINPLACE_CMD} -e "s|/bin/ksh|${LOCALBASE}/bin/ksh93|" \ + ${WRKSRC}/bin/popup + @${RM} ${WRKSRC}/bin/popup.bak post-install: ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${PFX}/bin diff --git a/math/petsc/distinfo b/math/petsc/distinfo index aaae37949150..ce72e73af231 100644 --- a/math/petsc/distinfo +++ b/math/petsc/distinfo @@ -1,3 +1,3 @@ -MD5 (v2.3.0-36.petsc.tar.gz) = 848dd31deaf52447998e2d4c9d1e3f39 -SHA256 (v2.3.0-36.petsc.tar.gz) = 31c7d61d846120e4e89dc708cdadd10e41106c81c2256b5fd05c17edf52d79d6 -SIZE (v2.3.0-36.petsc.tar.gz) = 9404277 +MD5 (petsc-2.3.1-p7.tar.gz) = 2d2a15d0ad066a48e14ac11d6f082b3f +SHA256 (petsc-2.3.1-p7.tar.gz) = 80e429fbcd5564b5086aecb559a0618f7551ea2891fce5f413bb1368194dca3d +SIZE (petsc-2.3.1-p7.tar.gz) = 10278608 diff --git a/math/petsc/pkg-plist b/math/petsc/pkg-plist index 68b080bb67a9..0a683581c299 100644 --- a/math/petsc/pkg-plist +++ b/math/petsc/pkg-plist @@ -1,3 +1,9 @@ +%%PFX%%/bin/TOPSGenerator.py +%%PFX%%/bin/TOPSGenerator.pyc +%%PFX%%/bin/TOPSGenerator.pyo +%%PFX%%/bin/TOPSInstaller.py +%%PFX%%/bin/TOPSInstaller.pyc +%%PFX%%/bin/TOPSInstaller.pyo %%PFX%%/bin/adiforfix.py %%PFX%%/bin/adiforfix.pyc %%PFX%%/bin/adiforfix.pyo @@ -16,6 +22,10 @@ %%PFX%%/bin/matlab/PetscBagRead.m %%PFX%%/bin/matlab/PetscBinaryRead.m %%PFX%%/bin/matlab/PetscBinaryWrite.m +%%PFX%%/bin/matlab/closeport.m +%%PFX%%/bin/matlab/launch.m +%%PFX%%/bin/matlab/openport.m +%%PFX%%/bin/matlab/receive.m %%PFX%%/bin/mpiexec.valgrind %%PFX%%/bin/mpirun.chiba %%PFX%%/bin/mpirun.gmalloc @@ -43,6 +53,7 @@ %%PFX%%/bin/win32fe/win32feutils.dll %%PFX%%/bmake/adic.init %%PFX%%/bmake/adicmf.init +%%PFX%%/bmake/adicmfb.init %%PFX%%/bmake/common/base %%PFX%%/bmake/common/rules %%PFX%%/bmake/common/rules.fortran.cpp @@ -59,6 +70,7 @@ %%PFX%%/bmake/%%TARGET%%/jobs %%PFX%%/bmake/%%TARGET%%/petscconf %%PFX%%/bmake/%%TARGET%%/petscconf.h +%%PFX%%/bmake/%%TARGET%%/petscconfiginfo.h %%PFX%%/bmake/%%TARGET%%/petscfix.h %%PFX%%/bmake/%%TARGET%%/petscmachineinfo.h %%PFX%%/bmake/%%TARGET%%/petscrules @@ -88,34 +100,6 @@ %%PFX%%/include/adic/run-alloc.h.html %%PFX%%/include/adic/run-map.h %%PFX%%/include/adic/run-map.h.html -%%PFX%%/include/f90impl/f90_IRIX.h -%%PFX%%/include/f90impl/f90_IRIX.h.html -%%PFX%%/include/f90impl/f90_absoft.h -%%PFX%%/include/f90impl/f90_absoft.h.html -%%PFX%%/include/f90impl/f90_alpha.h -%%PFX%%/include/f90impl/f90_alpha.h.html -%%PFX%%/include/f90impl/f90_cray_x1.h -%%PFX%%/include/f90impl/f90_g95.h -%%PFX%%/include/f90impl/f90_hpux.h -%%PFX%%/include/f90impl/f90_hpux.h.html -%%PFX%%/include/f90impl/f90_intel.h -%%PFX%%/include/f90impl/f90_intel8.h -%%PFX%%/include/f90impl/f90_nag.h -%%PFX%%/include/f90impl/f90_nag.h.html -%%PFX%%/include/f90impl/f90_pgi.h -%%PFX%%/include/f90impl/f90_rs6000.h -%%PFX%%/include/f90impl/f90_rs6000.h.html -%%PFX%%/include/f90impl/f90_solaris.h -%%PFX%%/include/f90impl/f90_solaris.h.html -%%PFX%%/include/f90impl/f90_solaris_old.h -%%PFX%%/include/f90impl/f90_solaris_old.h.html -%%PFX%%/include/f90impl/f90_t3e.h -%%PFX%%/include/f90impl/f90_t3e.h.html -%%PFX%%/include/f90impl/f90_win32.h -%%PFX%%/include/f90impl/f90_win32.h.html -%%PFX%%/include/f90impl/index.html -%%PFX%%/include/f90impl/makefile -%%PFX%%/include/f90impl/makefile.html %%PFX%%/include/finclude/index.html %%PFX%%/include/finclude/makefile %%PFX%%/include/finclude/makefile.html @@ -193,10 +177,6 @@ %%PFX%%/include/petscdraw.h.html %%PFX%%/include/petscerror.h %%PFX%%/include/petscerror.h.html -%%PFX%%/include/petscf90.h -%%PFX%%/include/petscf90.h.html -%%PFX%%/include/petschead.h -%%PFX%%/include/petschead.h.html %%PFX%%/include/petscis.h %%PFX%%/include/petscis.h.html %%PFX%%/include/petscksp.h @@ -209,6 +189,7 @@ %%PFX%%/include/petscmath.h.html %%PFX%%/include/petscmatlab.h %%PFX%%/include/petscmatlab.h.html +%%PFX%%/include/petscmesh.h %%PFX%%/include/petscmg.h %%PFX%%/include/petscmg.h.html %%PFX%%/include/petscoptions.h @@ -221,6 +202,8 @@ %%PFX%%/include/petscsnes.h.html %%PFX%%/include/petscsys.h %%PFX%%/include/petscsys.h.html +%%PFX%%/include/petsctime.h +%%PFX%%/include/petsctime.h.html %%PFX%%/include/petscts.h %%PFX%%/include/petscts.h.html %%PFX%%/include/petscvec.h @@ -229,23 +212,35 @@ %%PFX%%/include/petscversion.h.html %%PFX%%/include/petscviewer.h %%PFX%%/include/petscviewer.h.html -%%PFX%%/include/vecimpl.h -%%PFX%%/include/vecimpl.h.html -%%PFX%%/lib/%%TARGET%%/libmpiuni.a +%%PFX%%/include/private/pcimpl.h +%%PFX%%/include/private/pcimpl.h.html +%%PFX%%/include/private/petscimpl.h +%%PFX%%/include/private/petscimpl.h.html +%%PFX%%/include/private/vecimpl.h +%%PFX%%/include/private/vecimpl.h.html +%%PFX%%/include/zpetsc.h +%%PFX%%/include/zpetsc.h.html +%%MPIUNI%%%%PFX%%/lib/%%TARGET%%/libmpiuni.a %%PFX%%/lib/%%TARGET%%/libpetsc.a +%%PFX%%/lib/%%TARGET%%/libpetsc.so %%PFX%%/lib/%%TARGET%%/libpetscdm.a -%%MPI%%%%PFX%%/lib/%%TARGET%%/libpetscfortran.a +%%PFX%%/lib/%%TARGET%%/libpetscdm.so %%PFX%%/lib/%%TARGET%%/libpetscksp.a +%%PFX%%/lib/%%TARGET%%/libpetscksp.so %%PFX%%/lib/%%TARGET%%/libpetscmat.a +%%PFX%%/lib/%%TARGET%%/libpetscmat.so %%PFX%%/lib/%%TARGET%%/libpetscsnes.a +%%PFX%%/lib/%%TARGET%%/libpetscsnes.so %%PFX%%/lib/%%TARGET%%/libpetscts.a +%%PFX%%/lib/%%TARGET%%/libpetscts.so %%PFX%%/lib/%%TARGET%%/libpetscvec.a +%%PFX%%/lib/%%TARGET%%/libpetscvec.so @dirrm %%PFX%%/lib/%%TARGET%% @dirrm %%PFX%%/lib +@dirrm %%PFX%%/include/private @dirrm %%PFX%%/include/petsc @dirrm %%PFX%%/include/mpiuni @dirrm %%PFX%%/include/finclude -@dirrm %%PFX%%/include/f90impl @dirrm %%PFX%%/include/adic @dirrm %%PFX%%/include @dirrm %%PFX%%/bmake/%%TARGET%% |