- Chase relocation of net/mpich2

- Bump PORTREVISION if needed

- Fix some portlint errors.

15 files changed, 67 insertions, 67 deletions

diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index 98832be54db6..e5bc8879dc28 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blacs
 PORTVERSION=	1.7
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/blacs/
 DISTNAME=	BLACS
@@ -28,7 +28,7 @@ SUB_FILES=	pkg-message
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
-WITH_OPENMPI=   yes
+WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
@@ -37,7 +37,7 @@ RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-openmpi.diff
 .else
 LIB_DEPENDS=	mpich:${PORTSDIR}/net/mpich2
-RUN_DEPENDS=	${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2
+RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-mpich.diff
 .endif
 
diff --git a/math/blacs/files/Bmake.inc-mpich.diff b/math/blacs/files/Bmake.inc-mpich.diff
index c4d362b8d6b0..b3efd0032202 100644
--- a/math/blacs/files/Bmake.inc-mpich.diff
+++ b/math/blacs/files/Bmake.inc-mpich.diff
@@ -31,7 +31,7 @@
  #  Name and location of the MPI library.
  #  -------------------------------------
 -   MPIdir = /usr/local/mpich
-+   MPIdir = @LOCALBASE@/mpich2
++   MPIdir = @LOCALBASE@
     MPILIBdir = $(MPIdir)/lib/
     MPIINCdir = $(MPIdir)/include
 -   MPILIB = $(MPILIBdir)/libmpich.a
diff --git a/math/blacs/files/pkg-message.in b/math/blacs/files/pkg-message.in
index 1c08c8429a88..bd2426b21079 100644
--- a/math/blacs/files/pkg-message.in
+++ b/math/blacs/files/pkg-message.in
@@ -4,10 +4,10 @@
 
  Example:
   % cd %%PREFIX%%/share/BLACS/TESTING
-  % %%LOCALBASE%%/mpich2/bin/mpd &
-  % %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./xCbtest_MPI-FreeBSD
-  % %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./xFbtest_MPI-FreeBSD
-  % %%LOCALBASE%%/mpich2/bin/mpdallexit
+  % %%LOCALBASE%%/bin/mpd &
+  % %%LOCALBASE%%/bin/mpirun -np 4 ./xCbtest_MPI-FreeBSD
+  % %%LOCALBASE%%/bin/mpirun -np 4 ./xFbtest_MPI-FreeBSD
+  % %%LOCALBASE%%/bin/mpdallexit
 
  Or, if you're using OpenMPI:
   % cd %%PREFIX%%/share/BLACS/TESTING
diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile
index bc2716f68b94..eea1bd0fbca5 100644
--- a/math/blocksolve95/Makefile
+++ b/math/blocksolve95/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blocksolve95
 PORTVERSION=	3.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://info.mcs.anl.gov/pub/BlockSolve95/	\
 		ftp://ftp.irisa.fr/pub/mirrors/BlockSolve95/
@@ -27,7 +27,7 @@ MAKEFILE=	makefile
 MAKE_ARGS=	GMAKE=${GMAKE} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT}	\
 		BLAS_LIB=${BLAS_LIB} LAPACK_LIB=${LAPACK_LIB}
 
-MPIDIR=		${LOCALBASE}/mpich2
+MPIDIR=		${LOCALBASE}
 PETSC_ARCH=	freebsd
 BOPT?=		O
 
@@ -73,10 +73,10 @@ regression-test:	build
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 . endif
-	${LOCALBASE}/mpich2/bin/mpd &
+	${LOCALBASE}/bin/mpd &
 	@(cd ${BUILD_WRKSRC}/examples;	\
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} bsrunexamples clean)
-	${LOCALBASE}/mpich2/bin/mpdallexit
+	${LOCALBASE}/bin/mpdallexit
 .endif
 
 .include "${FILESDIR}/BSman3.inc"
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index 3647575bb100..5b4736b4a79b 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mumps
 PORTVERSION=	4.8.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
@@ -66,12 +66,12 @@ LAPACK_LIBS=	-llapack
 
 .ifdef WITH_MPI
 PKGNAMESUFFIX+=		-mpich
-BUILD_DEPENDS+=	${LOCALBASE}/mpich2/include/mpif.h:${PORTSDIR}/net/mpich2 \
+BUILD_DEPENDS+=	${LOCALBASE}/include/mpif.h:${PORTSDIR}/net/mpich2 \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 LIB_DEPENDS+=	lapack:${PORTSDIR}/math/lapack
 # Note: -l?mumps still requires to be linked with -lblacs + -lscalapack
-RUN_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2 \
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2 \
 		${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 CONFLICTS=	mumps-4*
@@ -142,16 +142,16 @@ regression-test:
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .  endif
-	${LOCALBASE}/mpich2/bin/mpd &
+	${LOCALBASE}/bin/mpd &
 	(cd ${WRKSRC}/examples &&	\
-	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ;	\
-	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ;	\
-	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ;	\
-	${LOCALBASE}/mpich2/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ;	\
+	${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ;	\
+	${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ;	\
+	${LOCALBASE}/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ;	\
+	${LOCALBASE}/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ;	\
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
-	${LOCALBASE}/mpich2/bin/mpirun -np 3 ./c_example ;	\
+	${LOCALBASE}/bin/mpirun -np 3 ./c_example ;	\
 	${ECHO_MSG} "The solution should be (1,2)")
-	${LOCALBASE}/mpich2/bin/mpdallexit
+	${LOCALBASE}/bin/mpdallexit
 .else
 	(cd ${WRKSRC}/examples &&	\
 	./ssimpletest < input_simpletest_real ;			\
diff --git a/math/mumps/files/patch-Make.inc+Makefile.inc.generic b/math/mumps/files/patch-Make.inc+Makefile.inc.generic
index 0381879259af..7421456b4d47 100644
--- a/math/mumps/files/patch-Make.inc+Makefile.inc.generic
+++ b/math/mumps/files/patch-Make.inc+Makefile.inc.generic
@@ -48,11 +48,11 @@
  
  # INCLUDE DIRECTORY FOR MPI
 -INCPAR  = -I/usr/include
-+INCPAR  = -I@LOCALBASE@/mpich2/include
++INCPAR  = -I@LOCALBASE@/include
  
  # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI
 -LIBPAR  = $(SCALAP) -L/usr/lib -lmpi
-+LIBPAR  = -L@LOCALBASE@/mpich2/lib -lfmpich -lmpich $(SCALAP)
++LIBPAR  = -L@LOCALBASE@/lib -lfmpich -lmpich $(SCALAP)
  
  # The parallel version is not concerned by the next two lines.
  # They are related to the sequential library provided by MUMPS,
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index 9fbf1d0d0398..601c8d5e024c 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	ParMetis
 PORTVERSION=	3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A package for parallel (mpi) unstructured graph partitioning
 
-RUN_DEPENDS=	${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2
-BUILD_DEPENDS=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
+RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
 
 ALL_TARGET=
 
diff --git a/math/parmetis/files/patch-ab b/math/parmetis/files/patch-ab
index 568b3698917b..09756660bccf 100644
--- a/math/parmetis/files/patch-ab
+++ b/math/parmetis/files/patch-ab
@@ -4,7 +4,7 @@
  
  # Which compiler to use
 -CC = mpicc
-+CC = ${LOCALBASE}/mpich2/bin/mpicc
++CC = ${LOCALBASE}/bin/mpicc
  
  
  # What optimization level to use
@@ -13,7 +13,7 @@
  
  # Which loader to use
 -LD = mpicc
-+LD = ${LOCALBASE}/mpich2/bin/mpicc
++LD = ${LOCALBASE}/bin/mpicc
  
  # In which directories to look for any additional libraries
  LIBDIR = 
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index 2fec4ee29837..80ba614cb627 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	petsc
 DISTVERSION=	2.3.3-p0
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
@@ -65,7 +65,7 @@ PORTDOCS=	*
 
 LIBSCALAPACK=	${LOCALBASE}/lib/libscalapack.a
 LIBBLACS=	${LOCALBASE}/lib/libblacs.a
-MPIDIR=		${LOCALBASE}/mpich2
+MPIDIR=		${LOCALBASE}
 
 .include <bsd.port.pre.mk>
 
@@ -82,7 +82,7 @@ WITHOUT_SUPERLU=	yes
 WITH_MPI=	yes
 .endif
 .if defined(WITH_MPI)
-. if exists(${LOCALBASE}/include/mpi.h)
+. if exists(${LOCALBASE}/bin/lamboot)
 BROKEN=		Cannot build with MPI when lam-7 is installed - set WITHOUT_MPI or deinstall net/lam
 . endif
 .if defined(WITH_OPENMPI)
@@ -97,8 +97,8 @@ WITHOUT_SPOOLES=	yes
 WITHOUT_PARMETIS=	yes
 CONFIGURE_ARGS+=	--with-cc=${MPIDIR}/bin/mpicc --with-fc=${MPIDIR}/bin/mpif77
 .else
-BUILD_DEPENDS+=		${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=		${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS+=		${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
+RUN_DEPENDS+=		${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 PKGNAMESUFFIX+=		-mpich
 WITHOUT_SPOOLES=	yes
 .endif
@@ -139,7 +139,7 @@ CONFIGURE_ARGS+=	--with-superlu-include=${LOCALBASE}/include/superlu	\
 CONFIGURE_ARGS+=	--with-blocksolve95=0
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libBS95.a:${PORTSDIR}/math/blocksolve95
-CONFIGURE_ARGS+=	--with-blocksolve95-include=${LOCALBASE}/mpich2/include	\
+CONFIGURE_ARGS+=	--with-blocksolve95-include=${LOCALBASE}/include	\
 			--with-blocksolve95-lib=${LOCALBASE}/lib/libBS95.a
 .endif
 
@@ -288,12 +288,12 @@ regression-test:
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .  endif
-	${LOCALBASE}/mpich2/bin/mpd &
+	${LOCALBASE}/bin/mpd &
 . endif
 	(cd ${BUILD_WRKSRC};	\
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 . if defined (WITH_MPI) && !defined(WITH_OPENMPI)
-	${LOCALBASE}/mpich2/bin/mpdallexit
+	${LOCALBASE}/bin/mpdallexit
 . endif
 .endif
 
diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile
index 8e16690b938e..ea5070e3ef80 100644
--- a/math/scalapack/Makefile
+++ b/math/scalapack/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scalapack
 PORTVERSION=	1.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/scalapack/
 DISTFILES=	scalapack-${PORTVERSION}.tgz manpages.tgz
@@ -57,7 +57,7 @@ LAPACK=		-llapack
 .endif
 
 .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
-WITH_OPENMPI=   yes
+WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
@@ -66,8 +66,8 @@ RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 EXTRA_PATCHES+=	${FILESDIR}/SLmake.inc-openmpi.diff
 .else
 #LIB_DEPENDS+=	mpich:${PORTSDIR}/net/mpich2
-BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 EXTRA_PATCHES+=	${FILESDIR}/SLmake.inc-mpich.diff
 .endif
 
@@ -100,8 +100,8 @@ NOOPT=	-O0
 MPIF77=	${LOCALBASE}/mpi/openmpi/bin/mpif77
 MPICC=	${LOCALBASE}/mpi/openmpi/bin/mpicc
 .else
-MPIF77=	${LOCALBASE}/mpich2/bin/mpif77
-MPICC=	${LOCALBASE}/mpich2/bin/mpicc
+MPIF77=	${LOCALBASE}/bin/mpif77
+MPICC=	${LOCALBASE}/bin/mpicc
 .endif
 
 post-patch:
diff --git a/math/scalapack/files/SLmake.inc-mpich.diff b/math/scalapack/files/SLmake.inc-mpich.diff
index e24f66bd150a..3a35693d450c 100644
--- a/math/scalapack/files/SLmake.inc-mpich.diff
+++ b/math/scalapack/files/SLmake.inc-mpich.diff
@@ -27,7 +27,7 @@
 -BLACSFINIT    = $(BLACSdir)/libmpiblacsF77init-p4.a
 -BLACSCINIT    = $(BLACSdir)/libmpiblacsCinit-p4.a
 -BLACSLIB      = $(BLACSdir)/libmpiblacs-p4.a
-+SMPLIB        = -L@LOCALBASE@/mpich2 -lmpich
++SMPLIB        = -L@LOCALBASE@ -lmpich
 +BLACSFINIT    = $(BLACSdir)/libblacsf77.a #-L$(BLACSdir) -lblacsf77
 +BLACSCINIT    = $(BLACSdir)/libblacsc.a   #-L$(BLACSdir) -lblacsc
 +BLACSLIB      = $(BLACSdir)/libblacs.a    #-L$(BLACSdir) -lblacs
diff --git a/math/scalapack/files/pkg-message.in b/math/scalapack/files/pkg-message.in
index 28d99c43a274..74b24ecc5d10 100644
--- a/math/scalapack/files/pkg-message.in
+++ b/math/scalapack/files/pkg-message.in
@@ -6,19 +6,19 @@
 
  Example:
   % cd %%DATADIR%%/TESTING
-  % %%LOCALBASE%%/mpich2/bin/mpd &
-  % %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./xcbrd
-  % %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./xcdblu
+  % %%LOCALBASE%%/bin/mpd &
+  % %%LOCALBASE%%/bin/mpirun -np 4 ./xcbrd
+  % %%LOCALBASE%%/bin/mpirun -np 4 ./xcdblu
    etc., etc. ...
 
   to perform all the tests,
   % cd %%DATADIR%%/TESTING
-  % %%LOCALBASE%%/mpich2/bin/mpd &
+  % %%LOCALBASE%%/bin/mpd &
   % csh
   % foreach i (x*)
-  ? %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./$i >& ~/$i.log
+  ? %%LOCALBASE%%/bin/mpirun -np 4 ./$i >& ~/$i.log
   ? end
-  % %%LOCALBASE%%/mpich2/bin/mpdallexit
+  % %%LOCALBASE%%/bin/mpdallexit
 
  If you're using OpenMPI, use this instead:
   % cd %%DATADIR%%/TESTING
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index fa704eca7ae3..6858dc0713dd 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	sdpara
 PORTVERSION=	7.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math parallel
-MASTER_SITES=   http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/
+MASTER_SITES=	http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/
 DISTFILES=	${SRCFILE}#${MANUALFILE}
 DIST_SUBDIR=	sdpa
 EXTRACT_ONLY=	${SRCFILE}
@@ -34,9 +34,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 USE_BLAS?=	reference
 
 .if exists(${LOCALBASE}/lib/libgoto.so)
-USE_BLAS=     gotoblas
+USE_BLAS=	gotoblas
 .elif exists(${LOCALBASE}/lib/libatlas_r.so)
-USE_BLAS=     atlas
+USE_BLAS=	atlas
 .endif
 
 . if ${USE_BLAS} == reference
@@ -50,21 +50,21 @@ LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 BLAS=		-lgotop
 LAPACK=		-lgotop -llapack
 .elif ${USE_BLAS} == atlas
-LIB_DEPENDS+=   atlas:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	atlas:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas -lptcblas -latlas_r
 LAPACK=		-lalapack_r
 .endif
 
 #PLIST_SUB+=	MANUALFILE=${MANUALFILE}
 
-SCALAPACK = -L/usr/local/lib -lscalapack -lblacs -lblacsc
-FORTRAN_LIBS= -lgfortran
-GCCLIBDIR = -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
+SCALAPACK=	-L/usr/local/lib -lscalapack -lblacs -lblacsc
+FORTRAN_LIBS=	-lgfortran
+GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/mpich2/bin/mpicc|g ; \
-				s|%%MPICXX%%|${LOCALBASE}/mpich2/bin/mpicxx|g ; \
-				s|%%MPIF77%%|${LOCALBASE}/mpich2/bin/mpif77|g ; \
+	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \
+				s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \
+				s|%%MPIF77%%|${LOCALBASE}/bin/mpif77|g ; \
 				s|%%CFLAGS%%|${CFLAGS}|g ; \
 				s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
 				s|%%FFLAGS%%|${FFLAGS}|g ; \
@@ -73,9 +73,9 @@ post-patch:
 				s|%%SCALAPACK%%|${SCALAPACK}|g ; \
 				s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; \
 				s|%%FORTRAN_LIBS%%|${GCCLIBDIR} ${FORTRAN_LIBS}|g '  ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/mpich2/bin/mpicc|g ; \
-				s|%%MPICXX%%|${LOCALBASE}/mpich2/bin/mpicxx|g ; \
-				s|%%MPIF77%%|${LOCALBASE}/mpich2/bin/mpif77|g ; \
+	@${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \
+				s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \
+				s|%%MPIF77%%|${LOCALBASE}/bin/mpif77|g ; \
 				s|%%CFLAGS%%|${CFLAGS}|g ; \
 				s|%%CXXFLAGS%%|${CXXFLAGS}|g ; \
 				s|%%FFLAGS%%|${FFLAGS}|g ; \
diff --git a/math/spooles/Makefile b/math/spooles/Makefile
index 80e0b1e8cce8..2242f34da39c 100644
--- a/math/spooles/Makefile
+++ b/math/spooles/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spooles
 PORTVERSION=	2.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	http://www.netlib.org/linalg/spooles/
 .ifdef WITH_MPI
@@ -27,7 +27,7 @@ MAINTAINER=	maho@FreeBSD.org
 COMMENT=	SParse Object Oriented Linear Equations Solver
 
 .if defined(WITH_MPI)
-BUILD_DEPENDS=	${LOCALBASE}/mpich2/lib/libmpich.a:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmpich.a:${PORTSDIR}/net/mpich2
 .endif
 
 USE_GMAKE=	yes	#BSD make gives problems here
diff --git a/math/spooles/files/patch-Make.inc b/math/spooles/files/patch-Make.inc
index cd0ad9f78e57..142e44598f05 100644
--- a/math/spooles/files/patch-Make.inc
+++ b/math/spooles/files/patch-Make.inc
@@ -72,7 +72,7 @@
  #
  # MPI_INSTALL_DIR = 
 -  MPI_INSTALL_DIR = /usr/local/mpich-1.0.13
-+MPI_INSTALL_DIR = %%LOCALBASE%%/mpich2
++MPI_INSTALL_DIR = %%LOCALBASE%%
  #
  #---------------------------------------------------------------------
  #