Index: head/devel/ga/Makefile
===================================================================
--- head/devel/ga/Makefile	(revision 480394)
+++ head/devel/ga/Makefile	(revision 480395)
@@ -1,29 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	ga
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Partitioned Global Address Space (PGAS) library for distributed arrays
 
 LICENSE=	BMIL
 LICENSE_NAME=	Battelle Memorial Institute License
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 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
 GH_ACCOUNT=	GlobalArrays
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-peigs --enable-shared --disable-static --with-blas4
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
Index: head/math/arpack-ng-mpich/Makefile
===================================================================
--- head/math/arpack-ng-mpich/Makefile	(revision 480394)
+++ head/math/arpack-ng-mpich/Makefile	(revision 480395)
@@ -1,22 +1,22 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $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
 
 MPICH_ARG=	--enable-mpi
 CONFLICTS_INSTALL=	arpack-ng-3.*
 
 PLIST_FILES+=	lib/libparpack.a \
 		lib/libparpack.so \
 		lib/libparpack.so.2 \
 		lib/libparpack.so.2.0.0
 
 .include "${MASTERDIR}/Makefile"
Index: head/math/elpa/Makefile
===================================================================
--- head/math/elpa/Makefile	(revision 480394)
+++ head/math/elpa/Makefile	(revision 480395)
@@ -1,48 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	elpa
 DISTVERSION=	2018.05.001
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://elpa.mpcdf.mpg.de/html/Releases/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Eigenvalue soLver for Petaflop Applications
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING/gpl.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING/lgpl.txt
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		fortran gmake libtool localbase perl5 shebangfix
 SHEBANG_GLOB=	*.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-avx --disable-avx2 --disable-static
 USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	make=gmake gcc=gcc${GCC_DEFAULT} g++=g++${GCC_DEFAULT} # build fails with clang: recursively calls cc
 FCFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=			OPENMP MPI DOCS
 OPTIONS_DEFINE_amd64=		SSE
 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=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:NSSE}
 CONFIGURE_ARGS+=	--disable-sse --disable-sse-assembly
 .endif
 
 post-install-DOCS-on:
 	@cd ${STAGEDIR}${DOCSDIR} && ${RM} *gpl* COPYING LICENSE
 
 .include <bsd.port.mk>
Index: head/math/pari/Makefile
===================================================================
--- head/math/pari/Makefile	(revision 480394)
+++ head/math/pari/Makefile	(revision 480395)
@@ -1,79 +1,80 @@
 # Created by: Yoshiaki UCHIKAWA <yoshiaki@kt.rim.or.jp>
 # $FreeBSD$
 
 PORTNAME=	pari
 DISTVERSION=	2.11.0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/ \
 		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Mathematics library and advanced calculator package
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_mips64=		fails to link: mpker.c:(.text+0x33bc): relocation truncated to fit: R_MIPS_TLS_GD against 'PARI_SIGINT_block'
 BROKEN_powerpc64=	fails to link: intnum.o: relocation truncated to fit: R_PPC64_GOT_TLSGD16 against symbol 'avma' defined in .tbss section in init.o
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		perl5 readline
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
 		--prefix=${PREFIX} \
 		--with-readline
 ALL_TARGET=	gp
 
 OPTIONS_DEFINE=		DOCS EXAMPLES OPTIMIZED_CFLAGS X11
 OPTIONS_RADIO=		THREADS
 OPTIONS_RADIO_THREADS=	PTHREADS MPI
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS X11 PTHREADS
 THREADS_DESC=		Thread engine (single-threaded when none is selected)
 PTHREADS_DESC=		Enable pthread thread engine
 MPI_DESC=		Enable MPI thread engine
 MPI_BUILD_ENV=		CC=mpicc
 .ifndef WITH_DEBUG
 OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fno-strict-aliasing -fomit-frame-pointer
 .endif
 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}
 MPI_CONFIGURE_ON=	--mt=mpi --with-gmp=${LOCALBASE}
 MPI_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc
 OPTIONS_SUB=	yes
 
 PLIST_SUB=	GP_VERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-patch:
 	@${REINPLACE_CMD} -E '/libpari_base\=/s/-tls|-gmp//' \
 		${WRKSRC}/Configure
 	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \
 		${WRKSRC}/config/get_cc
 	@${REINPLACE_CMD} -e 's|-lX11|-L${LOCALBASE}/lib -lX11|' \
 		${WRKSRC}/config/get_X11
 	@${REINPLACE_CMD} -e 's|-lreadline|-L${LOCALBASE}/lib -lreadline|' \
 		${WRKSRC}/config/get_readline
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari.so.${PORTVERSION}
 
 do-test-PTHREADS-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel
 
 do-test-MPI-on:
 	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel RUNTEST="mpirun -np 3"
 
 .include <bsd.port.mk>
Index: head/math/scalapack/Makefile
===================================================================
--- head/math/scalapack/Makefile	(revision 480394)
+++ head/math/scalapack/Makefile	(revision 480395)
@@ -1,165 +1,164 @@
 # Created by: NAKATA, Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	scalapack
 PORTVERSION=	2.0.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	math
 MASTER_SITES=	NL
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
 DIST_SUBDIR=	scalapack
 EXTRACT_ONLY=	scalapack-${PORTVERSION}.tgz manpages.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The ScaLAPACK Scalable LAPACK library
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS=	elmer-mathlibs-1*
 
 USE_LDCONFIG=	yes
 USES=		cmake fortran pathfix
 CMAKE_ARGS_ST=	-DBUILD_STATIC_LIBS:BOOL=ON
 CMAKE_ARGS_SH=	-DBUILD_SHARED_LIBS:BOOL=ON
 CMAKE_ARGS=	${CMAKE_ARGS_ST}
 
 ARCH2FIX=	PBLAS/SRC PBLAS/SRC/PBBLAS PBLAS/SRC/PTOOLS PBLAS/SRC/PTZBLAS \
 		REDIST/SRC SRC TOOLS TOOLS/LAPACK
 
 DATADIR=	${PREFIX}/share/${PORTNAME:tu}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:tu}
 SUB_FILES=	pkg-message
 PLIST_SUB=	SVERSION=${SVERSION} PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	scalapack_install.ps scalapackqref.ps  \
 		lawn100.ps pblasqref.ps manual.ps design.ps \
 		pumma_refmanual.ps trans.ps
 .endif
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=		yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS=		-lf77blas
 LAPACK=		-lalapack -lcblas
 .else
 LIB_DEPENDS+=	libblas.so:math/blas
 LIB_DEPENDS+=	liblapack.so:math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .endif
 
 .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
 WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
 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"
 FPIC=	-fPIC
 .else
 FPIC=	-fpic
 .endif
 
 CFLAGS+=	${FPIC}
 FFLAGS+=	${FPIC}
 SVERSION=	2
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 .if ${ARCH} == "amd64"
 FFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 CFLAGS+=	-pipe -O3 -ffast-math -funroll-all-loops -fpeel-loops -ftracer -funswitch-loops -funit-at-a-time
 .elif ${ARCH} == "i386"
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -mcpu=i686 -march=i686 -mfancy-math-387 -mpreferred-stack-boundary=3
 .else
 FFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 .endif
 .endif
 
 NOOPT=	-O0
 .if defined(WITH_OPENMPI)
 MPIF77=	${LOCALBASE}/mpi/openmpi/bin/mpif77
 MPICC=	${LOCALBASE}/mpi/openmpi/bin/mpicc
 .else
 MPIF77=	${LOCALBASE}/bin/mpif77
 MPICC=	${LOCALBASE}/bin/mpicc
 .endif
 
 # USES=fortran already forces FC to a supported fortran compiler;
 # assume mpicc points to a compatible compiler and force that, too.
 CC=	${MPICC}
 
 pre-configure:
 	${CP} -p ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	${CP} ${WRKSRC}/SLmake.inc.example ${WRKSRC}/SLmake.inc
 	${REINPLACE_CMD} -e 's|@BLAS@|${BLAS}|g; s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g;s|@LAPACK@|${LAPACK}|g; s|@WRKSRC@|${WRKSRC}|g ; s|@LOCALBASE@|${LOCALBASE}|g ; s|@CC@|${CC}|g ; s|@CFLAGS@|${CFLAGS}|g ; s|@F77@|${F77}|g ; s|@MPIF77@|${MPIF77}|g ; s|@MPICC@|${MPICC}|g ; s|@FFLAGS@|${FFLAGS}|g ; s|@NOOPT@|${NOOPT}|g ; s|@F77EXTRAFLAGS@|${F77EXTRAFLAGS}|g ; s|^ARCH *.= ar|ARCMD = ar|' ${WRKSRC}/SLmake.inc
 .for mkf in ${ARCH2FIX}
 	${REINPLACE_CMD} -e 's|\$$(ARCH)|$$(ARCMD)|' ${WRKSRC}/${mkf}/Makefile
 .endfor
 
 post-build:
 	${RM} -r ${WRKSRC}/CMakeFiles ${WRKSRC}/CMakeCache.txt
 	${CP} -p ${WRKSRC}/Makefile.dist ${WRKSRC}/Makefile
 	(cd ${WRKSRC} &&	\
 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:C|BUILD_STATIC_LIBS|BUILD_SHARED_LIBS|} ${CMAKE_SOURCE_PATH})
 	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/libscalapack.a ${STAGEDIR}${PREFIX}/lib
 	${MV} ${STAGEDIR}${PREFIX}/lib/libscalapack.so ${STAGEDIR}${PREFIX}/lib/libscalapack.so.${SVERSION}
 	${LN} -sf libscalapack.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libscalapack.so
 	${INSTALL_MAN}  ${WRKDIR}/MANPAGES/man/manl/*.l ${STAGEDIR}${PREFIX}/man/manl
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING
 	(cd ${WRKSRC}/TESTING/ ;\
 	${INSTALL_PROGRAM} x* ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING ;\
 	${INSTALL_DATA} *.dat ${STAGEDIR}${PREFIX}/share/SCALAPACK/TESTING)
 	${INSTALL_DATA} ${FILESDIR}/scalapack.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/PBLAS/SRC/*.h ${STAGEDIR}${PREFIX}/include
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/Makefile    ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/example1.cc ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 	${INSTALL_DATA} ${FILESDIR}/example1.f  ${STAGEDIR}${PREFIX}/share/examples/SCALAPACK
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/design.ps    | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/design.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/lawn100.ps   | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/lawn100.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/manual.ps    | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/manual.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/pblasqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/pblasqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/pumma_refmanual.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/pumma_refmanual.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/scalapack_install.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/scalapack_install.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/scalapackqref.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/scalapackqref.ps.gz
 	${CAT} ${DISTDIR}/${DIST_SUBDIR}/trans.ps | ${GZIP_CMD} > ${STAGEDIR}${DOCSDIR}/trans.ps.gz
 .endif
 
 .if defined(MAINTAINER_MODE)
 do-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
 	${LOCALBASE}/bin/mpd &
 	(sleep 5 && cd ${BUILD_WRKSRC}/TESTING && ${MAKE_CMD} test)
 	${LOCALBASE}/bin/mpdallexit
 
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net/charm/Makefile
===================================================================
--- head/net/charm/Makefile	(revision 480394)
+++ head/net/charm/Makefile	(revision 480395)
@@ -1,71 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	charm
 DISTVERSION=	6.8.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://charm.cs.illinois.edu/distrib/
 PKGNAMESUFFIX=	-uiuc
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Message-passing parallel language and runtime system
 
 LICENSE=	CHARMPP_CONVERSE_LICENSE
 LICENSE_NAME=	Charm++/Converse License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	none # No redistribution is allowed, no commercial use: commercial use requires a commercial license
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Not clear if it can be built on other architectures
 
 FETCH_DEPENDS=	git:devel/git
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		fortran gmake localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	src/scripts/*
 USE_LDCONFIG=	yes
 
 #ARCH_STR=	linux${ARCH:S/amd64/64/:S/i386/32/}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${DISTVERSION}
 INSTALL_WRKSRC=	${WRKSRC}/${VERSION}-${ARCH_STR}-gfortran-clang/tmp
 
 BINARY_ALIAS=	gfortran=gfortran${GCC_DEFAULT}
 
 OPTIONS_SINGLE=		MULTIPROCESSING
 OPTIONS_SINGLE_MULTIPROCESSING=	MULTICORE ETHERNET MPI
 OPTIONS_DEFAULT=	MULTICORE
 MULTIPROCESSING_DESC=	Multiprocessing
 OPTIONS_SUB=		yes
 
 MULTICORE_DESC=		Single-node multicore version
 MULTICORE_VARS=		VERSION=multicore ARCH_STR=linux${ARCH:S/amd64/64/:S/i386/32/}
 
 ETHERNET_DESC=		Ethernet version
 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
 	@${FIND} ${WRKSRC} -name conv-mach.h | ${XARGS} ${REINPLACE_CMD} 's|CMK_THREADS_ARE_WIN32_FIBERS *1|CMK_THREADS_ARE_WIN32_FIBERS 0|'
 	@${FIND} ${WRKSRC} -name "*.c" -o -name "*.C" -o -name "*.h" -o -name "configure" | \
 		${XARGS} ${REINPLACE_CMD} -i '' 's|include <malloc\.h>|include <stdlib.h>|; s|include "malloc\.h"|include <stdlib.h>|'
 	@${REINPLACE_CMD} -E 's|(CMK_CC)="(.*)"|\1="\2 ${CFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|(CMK_CXX)="(.*)"|\1="\2 ${CXXFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|(CMK_LD)="(.*)"|\1="\2 ${LDFLAGS} "|' ${WRKSRC}/src/arch/common/cc-clang.sh
 	@${REINPLACE_CMD} -E 's|-shared -o libqt\.so|-shared -o libqt.so -Wl,-soname,libqt.so|' ${WRKSRC}/src/QuickThreads/mkfiles/*
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build charm++ ${VERSION}-${ARCH_STR} clang gfortran --build-shared -j${MAKE_JOBS_NUMBER} ${CFLAGS}
 
 post-install:
 .for d in bin include lib
 	@cd ${STAGEDIR} && ${MV} ${d}/* ./${PREFIX}/${d} && ${RMDIR} $d
 .endfor
 	@cd ${STAGEDIR} && ${MV} lib_so/* ./${PREFIX}/lib && ${RMDIR} lib_so
 
 .include <bsd.port.mk>
Index: head/science/dftbplus/Makefile
===================================================================
--- head/science/dftbplus/Makefile	(revision 480394)
+++ head/science/dftbplus/Makefile	(revision 480395)
@@ -1,69 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	dftbplus
 DISTVERSION=	18.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DFTB+: Package for performing fast atomistic simulations
 
 LICENSE=	GPLv3 # main code is under LGPL3+, the bundled dftd3-lib is under GPLv1+, this makes the result GPLv3 (based on https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility)
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
 		libomp.so:devel/openmp
 RUN_DEPENDS=	${PYNUMPY}
 
 USES=		fortran gmake python shebangfix
 SHEBANG_FILES=	tools/dptools/bin/* tools/misc/* utils/srcmanip/* utils/build/* external/fypp/bin/* utils/get_opt_externals \
 		external/fypp/bin/fypp utils/test/testlist_to_fypp test/prog/dftb+/bin/tagdiff
 SHEBANG_GLOB=	*.py
 USE_GITHUB=	yes
 GH_TUPLE=	dftbplus:mpifx:099ff75:mpifx/external/mpifx/origin \
 		dftbplus:scalapackfx:86cd6e4:scalapackfx/external/scalapackfx/origin \
 		dftbplus:dftd3-lib:00504a9:dftd3/external/dftd3/origin \
 		dftbplus:testparams:1601609:testparams/external/slakos/origin
 MAKEFILE=	makefile
 TEST_TARGET=	test
 
 FFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-llapack -lblas ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgfortran.so -lm ${LOCALBASE}/lib/libomp.so
 
 MAKE_ARGS=	PYTHON=${PYTHON_CMD} FC=${FC} FXX=${FC} LN=${CC} \
 		INSTALLDIR=${STAGEDIR}${PREFIX} FREEBSD_PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS} --root=${STAGEDIR}"
 
 OPTIONS_DEFINE=		DFTD3 MPI SOCKETS ARPACK
 OPTIONS_DEFAULT=	DFTD3 MPI SOCKETS
 
 DFTD3_DESC=		Build with libdft3
 DFTD3_MAKE_ARGS=	WITH_DFTD3=1
 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
 SOCKETS_MAKE_ARGS_OFF=	WITH_SOCKETS=0
 SOCKETS_BINARY_ALIAS=	gcc=${CC}
 
 ARPACK_DESC=		Build with ARPACK for large eigenvalue problems
 ARPACK_MAKE_ARGS=	WITH_ARPACK=1
 ARPACK_MAKE_ARGS_OFF=	WITH_ARPACK=0
 ARPACK_LIB_DEPENDS=	libarpack.so:math/arpack
 ARPACK_PREVENTS=	MPI # ARPACK is only used in a single-core application
 
 MAKE_JOBS_UNSAFE=	yes # race conditions when some options are ON
 
 post-extract:
 	@${RM} ${WRKSRC}/external/scalapackfx/origin/test/psyr_result.dat.orig
 	@cd ${WRKSRC} && ${CP} sys/make.x86_64-linux-gnu make.arch
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} dftb+ modes waveplot
 
 .include <bsd.port.mk>
Index: head/science/fleur/Makefile
===================================================================
--- head/science/fleur/Makefile	(revision 480394)
+++ head/science/fleur/Makefile	(revision 480395)
@@ -1,63 +1,63 @@
 # $FreeBSD$
 
 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/.*-//}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	FLAPW code for atomic computations in quantum chemistry and physics
 
 LICENSE=	MIT
 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
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=		HDF5 MPI SCALAPACK ELPA WANNIER
 OPTIONS_DEFAULT=	MPI SCALAPACK ELPA WANNIER
 
 HDF5_CONFIGURE_ENV=	FLEUR_USE_HDF5=1 HDF5_ROOT=${LOCALBASE}/lib
 HDF5_CONFIGURE_ENV_OFF=	FLEUR_USE_HDF5=0
 HDF5_CMAKE_ARGS=	-DHDF5_INCLUDE_DIRS=${LOCALBASE}/include
 HDF5_LDFLAGS=		-lhdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 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
 SCALAPACK_CMAKE_BOOL=	FREEBSD_USE_SCALAPACK
 SCALAPACK_LDFLAGS=	-lscalapack
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 SCALAPACK_IMPLIES=	MPI
 
 ELPA_DESC=		Use libelpa, Eigenvalue SoLver for Petaflop Applications
 ELPA_CMAKE_BOOL=	FREEBSD_USE_ELPA
 ELPA_VARS=		FFLAGS+=-I${LOCALBASE}/include/elpa-2018.05.001/modules
 ELPA_LDFLAGS=		-lelpa
 ELPA_LIB_DEPENDS=	libelpa.so:math/elpa
 ELPA_IMPLIES=		MPI
 
 WANNIER_DESC=		Use Wannier library
 WANNIER_CONFIGURE_ENV=	FLEUR_USE_WANNIER=1
 WANNIER_CONFIGURE_ENV_OFF=	FLEUR_USE_WANNIER=0
 WANNIER_LDFLAGS=	-lwannier
 WANNIER_LIB_DEPENDS=	libwannier.so:science/wannier90
 
 PLIST_FILES=	bin/fleur \
 		bin/inpgen
 
 .include <bsd.port.mk>
Index: head/science/fleur/files/patch-cmake_tests_test__MPI.cmake
===================================================================
--- head/science/fleur/files/patch-cmake_tests_test__MPI.cmake	(revision 480394)
+++ head/science/fleur/files/patch-cmake_tests_test__MPI.cmake	(revision 480395)
@@ -1,17 +1,17 @@
 --- cmake/tests/test_MPI.cmake.orig	2018-07-03 14:37:33 UTC
 +++ cmake/tests/test_MPI.cmake
 @@ -1,12 +1,12 @@
  #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}")
  
  if (DEFINED ENV{FLEUR_USE_MPI})
 -   if (ENV{FLEUR_USE_MPI})
 +   if ($ENV{FLEUR_USE_MPI})
         if (NOT FLEUR_USE_MPI)
             message(FATAL_ERROR "You asked for MPI but cmake couldn't find it. Please check your Fortran compiler settings")
         endif()
Index: head/science/gromacs/Makefile
===================================================================
--- head/science/gromacs/Makefile	(revision 480394)
+++ head/science/gromacs/Makefile	(revision 480395)
@@ -1,92 +1,94 @@
 # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
 
 PORTNAME=	gromacs
 DISTVERSION=	2018.3
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	ftp://ftp.gromacs.org/pub/gromacs/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Compute molecular dynamics
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>=1.44:devel/boost-libs
 LIB_DEPENDS=	libhwloc.so:devel/hwloc
 
 USES=		cmake:outsource fortran perl5 pkgconfig shebangfix
 SHEBANG_FILES=	admin/*.sh scripts/*.pl scripts/*.sh src/gromacs/selection/*.sh
 bash_CMD=	${SH}
 USE_GNOME=	libxml2
 CMAKE_OFF=	GMX_USE_RDTSCP \
 		USE_PYTHON_SCRIPTS
 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
 
 ATLAS_DESC=		Use ATLAS for BLAS and LAPACK
 ATLAS_USES=		blaslapack:atlas
 ATLAS_USES_OFF=		blaslapack
 ATLAS_CMAKE_ON=		-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so;${LOCALBASE}/lib/libf77blas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so"
 ATLAS_CMAKE_OFF=	-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libblas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/liblapack.so"
 
 FLOAT_DESC=		Use single instead of double precision
 FLOAT_BUILD_DEPENDS=	fftw3>0:math/fftw3
 FLOAT_LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 FLOAT_LIB_DEPENDS_OFF=	libfftw3.so:math/fftw3
 FLOAT_CMAKE_ON=		-DGMX_DOUBLE:BOOL=OFF
 FLOAT_CMAKE_OFF=	-DGMX_DOUBLE:BOOL=ON
 FLOAT_PLIST_SUB=	SUFFIX_D=""
 FLOAT_PLIST_SUB_OFF=	SUFFIX_D="_d"
 
 OPENCL_CMAKE_BOOL=	GMX_USE_OPENCL GMX_GPU
 OPENCL_LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 
 OPENMP_USES=		compiler:openmp
 OPENMP_CMAKE_ON=	-DGMX_CXX11:BOOL=OFF
 OPENMP_CMAKE_OFF=	-DGMX_OPENMP:BOOL=OFF
 
 SIMD_CMAKE_OFF=		-DGMX_SIMD:STRING="None"
 
 X11_USE=		XORG=ice,sm,xext,x11
 X11_CMAKE_BOOL=		GMX_X11
 
 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
 OPENMPI_CMAKE_ON=	-DGMX_MPI:BOOL=ON \
 			-DMPI_C_COMPILER:FILEPATH="${LOCALBASE}/mpi/openmpi/bin/mpicc"
 OPENMPI_PLIST_SUB=	SUFFIX_MPI="_mpi"
 
 THREAD_MPI_DESC=	Build a thread-MPI-based multithreaded version of GROMACS
 THREAD_MPI_CMAKE_BOOL=	GMX_THREAD_MPI
 THREAD_MPI_PLIST_SUB=	SUFFIX_MPI=""
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "CMakeLists.txt" | ${XARGS} \
 		${REINPLACE_CMD} -e \
 		's|share/man|man| ; \
 		 /pkgconfig/s|LIB_INSTALL_DIR}|CMAKE_INSTALL_PREFIX}/libdata|'
 	@${FIND} ${WRKSRC} -name "GMXRC.*" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|LDLIB/pkgconfig|LDLIB/../libdata/pkgconfig| ; \
 		 s|LDLIB}/pkgconfig|LDLIB}/../libdata/pkgconfig|'
 	@${REINPLACE_CMD} -e '/CMAKE_REQUIRED_LIBRARIES/d' \
 		${WRKSRC}/cmake/gmxTestdlopen.cmake
 
 .include <bsd.port.mk>
Index: head/science/jdftx/Makefile
===================================================================
--- head/science/jdftx/Makefile	(revision 480394)
+++ head/science/jdftx/Makefile	(revision 480395)
@@ -1,58 +1,60 @@
 # $FreeBSD$
 
 PORTNAME=	jdftx
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.4.2-74
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-gba743849
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 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 \
 		libgsl.so:math/gsl \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	bash:shells/bash
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake:outsource fortran localbase:ldflags shebangfix
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	scripts/*
 SHEBANG_LANG=	octave
 USE_GITHUB=	yes
 GH_ACCOUNT=	shankar1729
 USE_LDCONFIG=	yes
 
 TEST_TARGET=	test
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ARGS=	-DLAPACK_LIBRARIES:STRING="-llapack -lblas"
 
 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
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 
 HDF5_CMAKE_BOOL=	EnableHDF5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_BROKEN=		use of undeclared identifier 'H5Pset_dxpl_mpio' # https://github.com/shankar1729/jdftx/issues/37
 
 SCALAPACK_DESC=		Enable ScaLAPACK support
 SCALAPACK_CMAKE_BOOL=	EnableScaLAPACK
 SCALAPACK_LIB_DEPENDS=	libscalapack.so:math/scalapack
 
 OCTAVE_DESC=		With Octave support (only for one script: dryRunToPDB)
 OCTAVE_USES=		octave
 
 .include <bsd.port.mk>
Index: head/science/libgridxc/Makefile
===================================================================
--- head/science/libgridxc/Makefile	(revision 480394)
+++ head/science/libgridxc/Makefile	(revision 480395)
@@ -1,57 +1,58 @@
 # $FreeBSD$
 
 PORTNAME=	libgridxc
 DISTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	science
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION:R}/+download/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to compute the exchange and correlation energy and potentials
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../BSD_LICENSE
 
 USES=		fortran gmake tar:tgz
 USE_LDCONFIG=	yes
 
 MAKEFILE=	makefile
 ALL_TARGET=	default
 
 WRKSRC_SUBDIR=	src
 
 BUILD_WRKSRC=	${WRKSRC}/../build
 TMP_STAGEDIR=	${WRKDIR}/tmp_stage
 MAKE_ENV=	INSTALL_DIR=${TMP_STAGEDIR}${PREFIX} FREEBSD_LOCALBASE=${LOCALBASE}
 
 BINARY_ALIAS=	make=${GMAKE}
 
 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
 LIBXC_LIB_DEPENDS=	libxc.so:science/libxc
 
 post-patch:
 	@${MKDIR} ${BUILD_WRKSRC}
 	@${CAT} ${WRKSRC}/../extra/fortran.mk \
 		| ${SED} '\
 			s|FC_SERIAL=gfortran|&${GCC_DEFAULT}|; \
 			s|LIBXC_ROOT=/usr/local|LIBXC_ROOT=${LOCALBASE}|; \
 			s|FFLAGS= -O2|& -fPIC|' \
 		> ${BUILD_WRKSRC}/fortran.mk
 
 do-configure:
 	@cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${SH} ../src/config.sh
 
 do-build:
 	@cd ${BUILD_WRKSRC} && ${MKDIR} ${TMP_STAGEDIR} && ${SETENV} ${MAKE_ENV} ${SH} ../src/build.sh
 
 do-install:
 	cd ${TMP_STAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/mk && ${MV} ${STAGEDIR}${PREFIX}/*.mk ${STAGEDIR}${PREFIX}/share/mk
 
 .include <bsd.port.mk>
Index: head/science/lm/Makefile
===================================================================
--- head/science/lm/Makefile	(revision 480394)
+++ head/science/lm/Makefile	(revision 480395)
@@ -1,80 +1,81 @@
 # $FreeBSD$
 
 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/.//}/
 PKGNAMESUFFIX=	-uiuc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software for sampling trajectories of the reaction-diffusion equations
 
 LICENSE=	UIUC_OPEN_SOURCE_LICENSE
 LICENSE_NAME=	University of Illinois Open Source License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 BUILD_DEPENDS=	swig3.0:devel/swig30
 LIB_DEPENDS=	libhdf5.so:science/hdf5 \
 		libprotobuf.so:devel/protobuf \
 		libsz.so:science/szip
 
 USES=		gettext-runtime gmake
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 CXXFLAGS+=	-DLINUX
 MAKE_ENV=	BUILD_DIR=${WRKSRC} PROTOBUF_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=		MPI PYTHON VMD
 OPTIONS_DEFAULT=	MPI PYTHON # VMD can't be default because VMD requires manual tarball fetch
 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
 PYTHON_VARS_OFF=	XUSE_PYTHON=0
 PYTHON_CXXFLAGS=	-I${PYTHON_SITELIBDIR}/numpy/core/include
 PYTHON_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/include/numpy/arrayobject.h:math/py-numpy@${PY_FLAVOR}
 
 VMD_DESC=		Build the VMD plugin
 VMD_VARS=		XUSE_VMD=1
 VMD_VARS_OFF=		XUSE_VMD=0
 VMD_VARS=		VMD_ARCH=${ARCH:S/amd64/FREEBSDAMD64/:S/${ARCH}/FREEBSD/}
 VMD_BUILD_DEPENDS=	${LOCALBASE}/vmd/plugins/${VMD_ARCH}/molfile/libmolfile_plugin.h:science/vmd
 VMD_PLIST_SUB=		VMD_ARCH=${VMD_ARCH}
 
 post-patch:
 	@${CP} ${WRKSRC}/docs/config/local.mk.linux ${WRKSRC}/local.mk
 	@${REINPLACE_CMD} -i '' ' \
 		s|USE_MPI := 0|USE_MPI := ${XUSE_MPI}|; \
 		s|USE_PYTHON := 1|USE_PYTHON := ${XUSE_PYTHON}|; \
 		s|USE_VMD := 1|USE_VMD := ${XUSE_VMD}|; \
 		s|USE_CUDA := 1|USE_CUDA := 0|; \
 		s|swig|swig3.0|; \
 		s|/usr/local|${LOCALBASE}|; \
 		s|INSTALL_PREFIX := /opt/lm|INSTALL_PREFIX := ${STAGEDIR}${PREFIX}|; \
 		s|BUILD_DIR := Build-linux|BUILD_DIR := Build-freebsd|; \
 		s|CCFLAGS := -m64 -O2|CCFLAGS := $$(CXXFLAGS)|; \
 		s|gcc|${CC}|; \
 		s|g++|${CXX}|; \
 		s| -lrt||' \
 		${WRKSRC}/local.mk
 
 post-patch-MPI-on:
 	@${REINPLACE_CMD} -i '' ' \
 		s|MPI_COMPILE_FLAGS = .*|MPI_COMPILE_FLAGS =|; \
 		s|MPI_LINK_FLAGS = .*|MPI_LINK_FLAGS = -lmpich ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so|' \
 		${WRKSRC}/local.mk
 
 post-patch-PYTHON-on:
 	@${REINPLACE_CMD} -i '' 's|python-config|${PYTHON_CMD}-config|' ${WRKSRC}/local.mk
 
 post-patch-VMD-on:
 	@${REINPLACE_CMD} -i '' 's|LINUXAMD64|${VMD_ARCH}|' ${WRKSRC}/local.mk
 
 .include <bsd.port.mk>
Index: head/science/madness/Makefile
===================================================================
--- head/science/madness/Makefile	(revision 480394)
+++ head/science/madness/Makefile	(revision 480395)
@@ -1,29 +1,30 @@
 # $FreeBSD$
 
 PORTNAME=	madness
 DISTVERSION=	0.10.1.20180823
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiresolution adaptive numeric environment for scientific simulation
 
 LICENSE=	GPLv2
 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>
Index: head/science/mdynamix/Makefile
===================================================================
--- head/science/mdynamix/Makefile	(revision 480394)
+++ head/science/mdynamix/Makefile	(revision 480395)
@@ -1,28 +1,29 @@
 # $FreeBSD$
 
 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}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	General purpose molecular dynamics code
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libmpich.so:net/mpich2
+LIB_DEPENDS=	libmpich.so:net/mpich
 
 USES=		fortran gmake
 
 ALL_TARGET=	default mpi
 MAKE_ARGS=	FFLAGS="${FFLAGS} -ffast-math" LDFLAGS="${LDFLAGS}"
 BINARY_ALIAS=	make=gmake gfortran=gfortran${GCC_DEFAULT}
 
 PLIST_FILES=	bin/md bin/mdp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/md ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mdp ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/science/nwchem/Makefile
===================================================================
--- head/science/nwchem/Makefile	(revision 480394)
+++ head/science/nwchem/Makefile	(revision 480395)
@@ -1,63 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	nwchem
 DISTVERSION=	6.8.1-release-94
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g1a262862b
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-performance computational chemistry software
 
 LICENSE=	ECL20
 LICENSE_NAME=	Educational Community License (ECL) 2.0
 LICENSE_FILE=	${WRKSRC}/../LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_i386=	Compiling basis.F...  f951: sorry, unimplemented: 64-bit mode not compiled in
 
 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_*
 SHEBANG_GLOB=	*.sh
 USE_GITHUB=	yes
 GH_ACCOUNT=	nwchemgit
 USE_PERL5=	build
 
 MAKEFILE=	GNUmakefile
 MAKE_ENV=	NWCHEM_TOP=${WRKSRC}/.. NWCHEM_MODULES=all NWCHEM_LONG_PATHS=Y NWCHEM_TARGET=LINUX64 USE_MPI=Y USE_INTERNALBLAS=Y EXTERNAL_GA_PATH=${LOCALBASE} \
 		BLAS_SIZE=4 USE_64TO32=y
 
 SUB_FILES=	nwchemrc
 
 WRKSRC_SUBDIR=	src
 BINARY_ALIAS=	gcc=${CC}
 
 post-patch:
 	@${REINPLACE_CMD} 's|nwchrc="/etc/nwchemrc"|nwchrc="${PREFIX}/etc/nwchemrc"|' ${WRKSRC}/util/util_nwchemrc.F
 
 pre-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} nwchem_config && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} 64_to_32
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/nwchemrc ${STAGEDIR}${PREFIX}/etc/nwchemrc
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/LINUX64/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.shadow
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "LD_PRELOAD=${PREFIX}/lib/gcc${GCC_DEFAULT}/libgcc_s.so ${PREFIX}/bin/${PORTNAME}.shadow \""$$"@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	cd ${WRKSRC}/basis && ${COPYTREE_SHARE} libraries ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/libraryps
 .for d in development_psps HGH_LDA library1 library2 ofpw_default paw_default pspw_default pspw_new pspw_old Spin_Orbit TETER TM
 	cd ${WRKSRC}/nwpw/libraryps && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/libraryps/
 .endfor
 
 .include <bsd.port.mk>
Index: head/science/openmx/Makefile
===================================================================
--- head/science/openmx/Makefile	(revision 480394)
+++ head/science/openmx/Makefile	(revision 480395)
@@ -1,71 +1,72 @@
 # $FreeBSD$
 
 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
 DISTFILES=	${PORTNAME}${DISTVERSION:R}${EXTRACT_SUFX} \
 		patch${DISTVERSION}${EXTRACT_SUFX}:patch # this patch isn't a patch, but a set of file updates
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${PORTNAME}${DISTVERSION:R}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Nanoscale material simulations using density functional theories (DFT)
 
 LICENSE=	GPLv2
 
 BROKEN_i386=	undefined reference to `__atomic_load', see bug#229605 and https://reviews.llvm.org/D42154
 
 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
 DOS2UNIX_FILES=	openmx_common.h
 USE_CXXSTD=	c++11
 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
 
 MAKE_ENV=	MPICH_CC=${CC}
 MAKE_ARGS+=	CFLAGS="${CFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" GCC_LIB=${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgfortran.so
 
 BINARY_ALIAS=	gcc=${CXX} gcc7=${CXX}
 
 UTIL_PROGS=	DosMain jx analysis_example esp polB bandgnu13 bin2txt cube2xsf intensity_map md2axsf
 
 PLIST_FILES=	bin/${PORTNAME} ${UTIL_PROGS:C/^/bin\//}
 
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 OPTIONS_DEFAULT_i386=	SIMD
 
 SIMD_CFLAGS=		-msse -msse2 -mfpmath=sse
 SIMD_CFLAGS_OFF=	-Dnosse
 CFLAGS+=		${ARCH:S/amd64//:S/i386//:S/${ARCH}/-Dnosse/}
 
 pre-patch: # overlay files before patching
 	@cd ${WRKSRC} && ${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/patch${DISTVERSION}${EXTRACT_SUFX}
 
 post-patch:
 	@cd ${WRKSRC} && ${REINPLACE_CMD} 's|DFT_DATA_PATH|"${DATADIR}/DFT_DATA13"|' Input_std.c check_lead.c SetPara_DFT.c OutData.c OutData_Binary.c
 
 post-install:
 .for u in ${UTIL_PROGS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${u} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	cd ${WRKSRC}/.. && ${COPYTREE_SHARE} DFT_DATA13 ${STAGEDIR}${DATADIR}
 	# autoplist for potentials: about 500 files in DATADIR
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${DATADIR:S/^${PREFIX}\///} -type f >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/science/py-gpaw/Makefile
===================================================================
--- head/science/py-gpaw/Makefile	(revision 480394)
+++ head/science/py-gpaw/Makefile	(revision 480395)
@@ -1,30 +1,31 @@
 # $FreeBSD$
 
 PORTNAME=	gpaw
 DISTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 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} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYNUMPY}
 
 USES=		gettext-runtime localbase python shebangfix
 GH_ACCOUNT=	psychopy
 USE_PYTHON=	distutils concurrent autoplist
 SHEBANG_FILES=	tools/*
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gpaw-python ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_gpaw.so
 
 .include <bsd.port.mk>
Index: head/science/qbox/Makefile
===================================================================
--- head/science/qbox/Makefile	(revision 480394)
+++ head/science/qbox/Makefile	(revision 480395)
@@ -1,42 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	qbox
 DISTVERSIONPREFIX=	rel
 DISTVERSION=	1_66_2
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	First-principles molecular dynamics code
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		libcurl.so:ftp/curl \
 		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
 
 USES=		gmake iconv:wchar_t localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	qboxcode
 GH_PROJECT=	qbox-public
 ALL_TARGET=	qb
 
 WRKSRC_SUBDIR=	src
 
 MAKE_ARGS=	TARGET=freebsd
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
 
 PLIST_FILES=	bin/qb
 
 post-extract:
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|; s|%%CXXFLAGS%%|${CXXFLAGS}|; s|%%LDFLAGS%%|${LDFLAGS}|' < ${FILESDIR}/freebsd.mk.in > ${WRKSRC}/freebsd.mk
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qb ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/science/qmcpack/Makefile
===================================================================
--- head/science/qmcpack/Makefile	(revision 480394)
+++ head/science/qmcpack/Makefile	(revision 480395)
@@ -1,39 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	qmcpack
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Many-body ab initio Quantum Monte Carlo code for quantum chemstry
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_10=	error: use of undeclared identifier '__builtin_assume_aligned'
 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
 
 USES=		cmake:outsource compiler:c++11-lang fortran localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PORTNAME:tu}
 USE_GNOME=	libxml2
 
 PROGS=		convert4qmc extract-eshdf-kvectors getSupercell qmcpack
 PLIST_FILES=	${PROGS:C/^/bin\//}
 
 do-install:
 .for p in ${PROGS}
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/bin/${p} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 .include <bsd.port.mk>
Index: head/science/quantum-espresso/Makefile
===================================================================
--- head/science/quantum-espresso/Makefile	(revision 480394)
+++ head/science/quantum-espresso/Makefile	(revision 480395)
@@ -1,75 +1,75 @@
 # $FreeBSD$
 
 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}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Package for research in electronic structure, simulation, optimization
 
 LICENSE=	GPLv2
 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
 
 USES=		fortran gmake python shebangfix
 SHEBANG_FILES=	configure PW/tools/cell2ibrav.py
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	QEF
 GH_PROJECT=	q-e
 
 MAKE_ARGS=	TOPDIR=${WRKSRC}
 BINARY_ALIAS=	make=gmake cpp=/usr/local/bin/cpp${GCC_DEFAULT}
 FFLAGS+=	-x f95-cpp-input
 LDFLAGS+=	${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgfortran.so -lm
 
 MAKE_JOBS_UNSAFE=	yes # https://github.com/QEF/q-e/issues/9
 
 # pseudo potentials used in calculations
 PSEUDO_LIST=	Al.pbe-n-rrkjus_psl.0.1.UPF Al.pbe-n-van.UPF Al.pbe-rrkj.UPF Al.pz-vbc.UPF As.pz-bhs.UPF Au.rel-pz-kjpaw.UPF \
 		B.pbe-n-kjpaw_psl.0.1.UPF B.pbe-n-kjpaw_psl.0.1.upf B.pz-vbc.UPF C.pbe-hgh.UPF C.pbe-n-rrkjus_psl.0.1.UPF C.pbe-rrkjus.UPF \
 		C.pz-kjpaw.UPF C.pz-rrkjus.UPF C.pz-van_ak.UPF C.pz-vbc.UPF C.tpss-mt.UPF Co.pbe-nd-rrkjus.UPF Cu.pbe-kjpaw.UPF \
 		Cu.pz-d-rrkjus.UPF Fe.pz-nd-rrkjus.UPF Fe.rel-pbe-kjpaw.UPF Fe.rel-pbe-spn-rrkjus_psl.0.2.1.UPF H.blyp-vbc.UPF H.pbe-kjpaw.UPF \
 		H.pbe-rrkjus.UPF H.pbe-van_ak.UPF H.pz-kjpaw.UPF H.pz-vbc.UPF H.tpss-mt.UPF Mg.pbe-n-kjpaw_psl.0.3.0.upf \
 		Mg.pz-n-vbc.UPF N.blyp-mt.UPF N.pbe-kjpaw.UPF N.pbe-n-kjpaw_psl.0.1.UPF N.pz-vbc.UPF Ni.pbe-nd-rrkjus.UPF Ni.pz-nd-rrkjus.UPF \
 		O.blyp-mt.UPF O.pbe-hgh.UPF O.pbe-kjpaw.UPF O.pbe-rrkjus.UPF O.pbe-van_ak.UPF O.pz-rrkjus.UPF O.pz-van_ak.UPF \
 		Pb.pz-d-van.UPF Pt.rel-pz-n-rrkjus.UPF Si.pbe-rrkj.UPF \
 		Si.pz-vbc.UPF Ti.pz-sp-van_ak.UPF Zn.pbe-d-hgh.UPF
 
 .for pp in ${PSEUDO_LIST}
 DISTFILES+=	${pp}:pp
 .endfor
 
 post-extract:
 	@${RM} ${WRKSRC}/archive/lapack-3.6.1.tgz
 	@cd ${WRKSRC} && ${MKDIR} FoX && ${LN} -s ${LOCALBASE}/include FoX/finclude
 
 pre-build:
 	@${REINPLACE_CMD} -i '' -e ' \
 		s|$$(CPP) $$(CPPFLAGS)|$$(CPP) -P -traditional $$(CPPFLAGS)| ; \
 		s|LD *=.*|LD=${CC}| ; \
 		s|LAPACK_LIBS *=.*|LAPACK_LIBS=-L${LOCALBASE}/lib -llapack -lblas|' \
 		${WRKSRC}/make.inc
 
 post-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} pseudo ${STAGEDIR}${DATADIR}
 .for pp in ${PSEUDO_LIST}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${pp} ${STAGEDIR}${DATADIR}/pseudo
 .endfor
 
 run-examples: build
 .for c in PP PW PWCOND PHonon
 	@cd ${WRKSRC}/$c/examples && PREFIX=${STAGEDIR}${PREFIX} ./run_all_examples
 .endfor
 
 .include <bsd.port.mk>