Change 20 ports from net/mpich2 to net/mpich

mpich2 is the obsolete version 2.x, mpich is at the current version 3.x Ports: math/scalapack science/nwchem science/quantum-espresso science/qmcpack science/madness science/qbox science/openmx science/jdftx science/fleur science/libgridxc science/mdynamix science/lm science/dftbplus science/py-gpaw devel/ga math/elpa net/charm science/gromacs math/pari math/arpack-ng-mpich
svn path=/head/; revision=480395
2018-09-22 16:36:38 +00:00 · 2018-09-22 16:36:38 +00:00 · 5f341a2ffb · 2021-03-31 03:12:20 +00:00
commit 5f341a2ffb
parent f88a88fd5e
21 changed files with 54 additions and 41 deletions
--- a/devel/ga/Makefile
+++ b/devel/ga/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	ga
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel

 MAINTAINER=	yuri@FreeBSD.org
@ -16,7 +16,7 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich2
+		libmpich.so:net/mpich

 USES=		autoreconf fortran gmake libtool localbase
 USE_GITHUB=	yes
--- a/math/arpack-ng-mpich/Makefile
+++ b/math/arpack-ng-mpich/Makefile
@ -2,12 +2,12 @@
 # $FreeBSD$

 PORTNAME=	arpack-ng
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-mpich

 COMMENT=	Revised Argand library for solving large-scale eigenvalue problems with MPI support

-LIB_DEPENDS+=	libmpich.so.8:net/mpich2
+LIB_DEPENDS+=	libmpich.so:net/mpich

 MASTERDIR=	${.CURDIR}/../../math/arpack-ng

--- a/math/elpa/Makefile
+++ b/math/elpa/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	elpa
 DISTVERSION=	2018.05.001
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://elpa.mpcdf.mpg.de/html/Releases/${DISTVERSION}/

@ -31,7 +32,7 @@ OPTIONS_DEFAULT_amd64=		SSE
 SSE_CFLAGS=			-msse3
 OPENMP_CONFIGURE_ENABLE=	openmp
 MPI_CONFIGURE_WITH=		mpi
-MPI_LIB_DEPENDS=		libmpich.so:net/mpich2 \
+MPI_LIB_DEPENDS=		libmpich.so:net/mpich \
 				libscalapack.so:math/scalapack

 PORTDOCS=	*
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	pari
 DISTVERSION=	2.11.0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/ \
@ -43,8 +44,8 @@ OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fno-strict-aliasing -fomit-frame-pointer
 X11_CONFIGURE_ON=	--graphic=X11
 X11_CONFIGURE_OFF=	--graphic=none
 X11_USE=		xorg=x11
-MPI_RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:net/mpich2
-MPI_BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:net/mpich2
+MPI_RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:net/mpich
+MPI_BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:net/mpich
 MPI_LIB_DEPENDS=	libgmp.so:math/gmp
 PTHREADS_LIB_DEPENDS=	libgmp.so:math/gmp
 PTHREADS_CONFIGURE_ON=	--mt=pthread --with-gmp=${LOCALBASE}
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	scalapack
 PORTVERSION=	2.0.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
@ -64,9 +64,8 @@ WITH_OPENMPI=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
 .else
-#LIB_DEPENDS+=	libmpich.so:net/mpich2
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:net/mpich
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich
 .endif

 .if ${ARCH} == "sparc64" || ${ARCH} == "amd64"
--- a/net/charm/Makefile
+++ b/net/charm/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	charm
 DISTVERSION=	6.8.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://charm.cs.illinois.edu/distrib/
 PKGNAMESUFFIX=	-uiuc
@ -47,7 +48,7 @@ ETHERNET_VARS=		VERSION=netlrts ARCH_STR=linux${ARCH:S/amd64/-x86_64/:S/i386//}

 MPI_VARS=		VERSION=mpi ARCH_STR=linux${ARCH:S/amd64/-x86_64/:S/i386//}
 MPI_LDFLAGS=		-lmpich
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich

 post-patch:
 	@${REINPLACE_CMD} 's|which gfortran |which gfortran${GCC_DEFAULT} |' ${WRKSRC}/src/arch/common/conv-mach-gfortran.sh
--- a/science/dftbplus/Makefile
+++ b/science/dftbplus/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	dftbplus
 DISTVERSION=	18.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science

 MAINTAINER=	yuri@FreeBSD.org
@ -42,9 +42,9 @@ DFTD3_MAKE_ARGS_OFF=	WITH_DFTD3=0

 MPI_MAKE_ARGS=		WITH_MPI=1
 MPI_MAKE_ARGS_OFF=	WITH_MPI=0
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2 \
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich \
 			libscalapack.so:math/scalapack
-MPI_LDFLAGS=		${LOCALBASE}/lib/libmpich.so
+MPI_LDFLAGS=		${LOCALBASE}/lib/libmpich.so ${LOCALBASE}/lib/libmpifort.so ${LOCALBASE}/lib/libmpi.so

 SOCKETS_DESC=		Build with sockets library
 SOCKETS_MAKE_ARGS=	WITH_SOCKETS=1
--- a/science/fleur/Makefile
+++ b/science/fleur/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	fleur
 DISTVERSION=	0.27-3 # Release 3 of Version 0.27
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.flapw.de/pm/uploads/FLEUR/
 DISTNAME=	fleurMaXR${DISTVERSION:C/.*-//}
@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE

 LIB_DEPENDS=	libopenblas.so:math/openblas

-USES=		cmake:outsource,noninja fortran localbase:ldflags tar:tgz
+USES=		cmake:outsource,noninja fortran gnome localbase:ldflags tar:tgz
 USE_GNOME=	libxml2

 FFLAGS=		-I${LOCALBASE}/include
@ -34,8 +34,8 @@ HDF5_BROKEN=		Missing hdf5.mod in hdf5

 MPI_CONFIGURE_ENV=	FLEUR_USE_MPI=1
 MPI_CONFIGURE_ENV_OFF=	FLEUR_USE_MPI=0
-MPI_LDFLAGS=		-lmpich
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_LDFLAGS=		-lmpich -lmpifort
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 MPI_PLIST_FILES=	bin/fleur_MPI

 SCALAPACK_DESC=		Use the ScaLAPACK Scalable LAPACK library
--- a/science/fleur/files/patch-cmake_tests_test__MPI.cmake
+++ b/science/fleur/files/patch-cmake_tests_test__MPI.cmake
@ -4,7 +4,7 @@
 #Check if we can compile with MPI
 try_compile(FLEUR_USE_MPI ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/cmake/tests/test_MPI.f90
 -LINK_LIBRARIES ${FLEUR_LIBRARIES}
-+LINK_LIBRARIES ${FLEUR_LIBRARIES} -lmpich
+LINK_LIBRARIES ${FLEUR_LIBRARIES} -lmpich -lmpifort
             )
 
 message("MPI Library found:${FLEUR_USE_MPI}")
--- a/science/gromacs/Makefile
+++ b/science/gromacs/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	gromacs
 DISTVERSION=	2018.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/

@ -25,7 +26,7 @@ USE_LDCONFIG=	yes

 OPTIONS_DEFINE=		ATLAS FLOAT OPENCL OPENMP SIMD X11
 OPTIONS_SINGLE=		MP
-OPTIONS_SINGLE_MP=	NOMP MPICH2 OPENMPI THREAD_MPI
+OPTIONS_SINGLE_MP=	NOMP MPICH OPENMPI THREAD_MPI
 OPTIONS_DEFAULT=	FLOAT OPENMP THREAD_MPI X11
 OPTIONS_SUB=		yes

@ -63,10 +64,11 @@ MP_DESC=		Multiprocessing
 NOMP_DESC=		No multiprocessing support
 NOMP_PLIST_SUB=		SUFFIX_MPI=""

-MPICH2_LIB_DEPENDS=	libmpich.so:net/mpich2
-MPICH2_CMAKE_ON=	-DGMX_MPI:BOOL=ON \
+MPICH_DESC=		Parallel processing support via MPICH
+MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
+MPICH_CMAKE_ON=		-DGMX_MPI:BOOL=ON \
 			-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/bin/mpicc"
-MPICH2_PLIST_SUB=	SUFFIX_MPI="_mpi"
+MPICH_PLIST_SUB=	SUFFIX_MPI="_mpi"

 OPENMPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=	openmpi>0:net/openmpi
--- a/science/jdftx/Makefile
+++ b/science/jdftx/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	jdftx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.2-74
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gba743849
 CATEGORIES=	science

@ -12,6 +13,7 @@ COMMENT=	Software for joint density functional theory in chemistry
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING

+BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libcblas.so:math/cblas \
 		libfftw3.so:math/fftw3 \
@ -38,7 +40,7 @@ OPTIONS_DEFINE=		MPI LIBXC HDF5 SCALAPACK OCTAVE
 OPTIONS_DEFAULT=	MPI LIBXC

 MPI_CMAKE_BOOL=		EnableMPI
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich

 LIBXC_DESC=		Use LibXC for additional exchange-correlation functionals
 LIBXC_CMAKE_BOOL=	EnableLibXC
--- a/science/libgridxc/Makefile
+++ b/science/libgridxc/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	libgridxc
 DISTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION:R}/+download/

@ -29,7 +30,7 @@ OPTIONS_DEFINE=		MPI LIBXC
 OPTIONS_DEFAULT=	MPI LIBXC

 MPI_MAKE_ENV=		WITH_MPI=1
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich

 LIBXC_DESC=		Use libxc for exchange-correlation functionals for DFT
 LIBXC_MAKE_ENV=		WITH_LIBXC=1
--- a/science/lm/Makefile
+++ b/science/lm/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	lm
 DISTVERSION=	2.3.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-src
 CATEGORIES=	science
 MASTER_SITES=	http://scs.illinois.edu/schulten/${PORTNAME}/download/${PORTNAME}${DISTVERSION:R:S/.//}/
@ -33,7 +34,7 @@ OPTIONS_SUB=		yes
 MPI_USES=		fortran
 MPI_VARS=		XUSE_MPI=1
 MPI_VARS_OFF=		XUSE_MPI=0
-MPI_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPI_LIB_DEPENDS=	libmpich.so:net/mpich

 PYTHON_USES=		python
 PYTHON_VARS=		XUSE_PYTHON=1
--- a/science/madness/Makefile
+++ b/science/madness/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	madness
 DISTVERSION=	0.10.1.20180823
+PORTREVISION=	1
 CATEGORIES=	science

 MAINTAINER=	yuri@FreeBSD.org
@ -13,17 +14,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	libsysinfo>0:devel/libsysinfo
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich2 \
+		libmpich.so:net/mpich \
 		libtbb.so:devel/tbb \
 		libtcmalloc.so:devel/google-perftools \
 		libxc.so:science/libxc

-USES=		cmake:outsource compiler:c++14-lang fortran localbase:ldflags
+USES=		cmake:outsource compiler:c++14-lang fortran localbase:ldflags python:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	m-a-d-n-e-s-s
 GH_TAGNAME=	ebb3fd7
 USE_LDCONFIG=	yes

-CMAKE_ARGS=	-DLAPACK_LIBRARIES:STRING="-L${LOCALBASE}/lib -llapack -lblas -L${LOCALBASE}/lib/gcc${GCC_DEFAULT} -lgcc_s"
+CMAKE_ARGS=	-DLAPACK_LIBRARIES:STRING="-L${LOCALBASE}/lib -llapack -lblas -L${LOCALBASE}/lib/gcc${GCC_DEFAULT} -lgcc_s" -DPYTHON_EXECUTABLE=${PYTHON_CMD}

 .include <bsd.port.mk>
--- a/science/mdynamix/Makefile
+++ b/science/mdynamix/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	mdynamix
 DISTVERSION=	5.2.8
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.fos.su.se/~sasha/${PORTNAME}/versions/
 DISTNAME=	md${DISTVERSION:S/.//g}
@ -11,7 +12,7 @@ COMMENT=	General purpose molecular dynamics code

 LICENSE=	GPLv2+

-LIB_DEPENDS=	libmpich.so:net/mpich2
+LIB_DEPENDS=	libmpich.so:net/mpich

 USES=		fortran gmake

--- a/science/nwchem/Makefile
+++ b/science/nwchem/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	nwchem
 DISTVERSION=	6.8.1-release-94
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g1a262862b
 CATEGORIES=	science

@ -19,7 +19,7 @@ BROKEN_i386=	Compiling basis.F...  f951: sorry, unimplemented: 64-bit mode not c
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libga.so:devel/ga \
-		libmpich.so:net/mpich2
+		libmpich.so:net/mpich

 USES=		fortran gmake shebangfix
 SHEBANG_FILES=	../contrib/distro-tools/build_* ../contrib/add_*
--- a/science/openmx/Makefile
+++ b/science/openmx/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	openmx
 DISTVERSION=	3.8.5 # the 18June12 patch upgrades 3.8 -> 3.8.5
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	http://www.openmx-square.org/ \
 		http://www.openmx-square.org/bugfixed/18June12/:patch
@ -20,7 +21,7 @@ BROKEN_i386=	undefined reference to `__atomic_load', see bug#229605 and https://
 LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich2 \
+		libmpich.so:net/mpich \
 		libomp.so:devel/openmp

 USES=		dos2unix fortran gmake localbase:ldflags
@ -31,7 +32,7 @@ MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/${PORTNAME}${DISTVERSION:R}

 CFLAGS+=	-Dkcomp
-LDFLAGS+=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
+LDFLAGS+=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${LOCALBASE}/lib/libmpifort.so

 WRKSRC_SUBDIR=	source

--- a/science/py-gpaw/Makefile
+++ b/science/py-gpaw/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	gpaw
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,7 +13,7 @@ COMMENT=	DFT and beyond within the projector-augmented wave method in chemistry
 LICENSE=	GPLv3+

 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libmpich.so:net/mpich2 \
+LIB_DEPENDS=	libmpich.so:net/mpich \
 		libopenblas.so:math/openblas \
 		libxc.so:science/libxc
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ase>0:science/py-ase@${PY_FLAVOR} \
--- a/science/qbox/Makefile
+++ b/science/qbox/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	qbox
 DISTVERSIONPREFIX=	rel
 DISTVERSION=	1_66_2
+PORTREVISION=	1
 CATEGORIES=	science

 MAINTAINER=	yuri@FreeBSD.org
@ -15,7 +16,7 @@ LIB_DEPENDS=	libblas.so:math/blas \
 		libfftw3.so:math/fftw3 \
 		libgcc_s.so:lang/gcc${GCC_DEFAULT} \
 		liblapack.so:math/lapack \
-		libmpich.so:net/mpich2 \
+		libmpich.so:net/mpich \
 		libscalapack.so:math/scalapack \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libxerces-c.so:textproc/xerces-c3
--- a/science/qmcpack/Makefile
+++ b/science/qmcpack/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	qmcpack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science

 MAINTAINER=	yuri@FreeBSD.org
@ -18,7 +18,7 @@ BROKEN_i386=	undefined reference to `__atomic_load'
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libfftw3.so:math/fftw3 \
 		libhdf5.so:science/hdf5 \
-		libmpich.so:net/mpich2 \
+		libmpich.so:net/mpich \
 		libomp.so:devel/openmp \
 		libopenblas.so:math/openblas \
 		libsz.so:science/szip
--- a/science/quantum-espresso/Makefile
+++ b/science/quantum-espresso/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	quantum-espresso
 DISTVERSIONPREFIX=	qe-
 DISTVERSION=	6.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science
 MASTER_SITES=	http://www.quantum-espresso.org/wp-content/uploads/upf_files/:pp
 DIST_SUBDIR=	${PORTNAME}
@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/License

 BUILD_DEPENDS=	fox-xml>0:textproc/fox-xml \
 		bash:shells/bash
-LIB_DEPENDS=	libmpich.so:net/mpich2 \
+LIB_DEPENDS=	libmpich.so:net/mpich \
 		libblas.so:math/blas \
 		liblapack.so:math/lapack