Chase the upgrade of MPICH2.

9 files changed, 28 insertions, 15 deletions

diff --git a/devel/valgrind/Makefile b/devel/valgrind/Makefile
index d1cb9ad07210..4d9003f0578b 100644
--- a/devel/valgrind/Makefile
+++ b/devel/valgrind/Makefile
@@ -44,7 +44,7 @@ IGNORE=	your FreeBSD version is not supported
 .endif
 
 .if defined(WITH_MPI) || exists(${LOCALBASE}/bin/mpicc)
-LIB_DEPENDS+=	mpich.1:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
 PLIST_SUB+=	MPI=""
 .else
 PLIST_SUB+=	MPI="@comment "
diff --git a/french/aster/Makefile b/french/aster/Makefile
index 5371fa4a6ccb..3e98b7239766 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		aster
 DISTVERSION=		${ASTER_DISTVERSION}
+PORTREVISION=		1
 CATEGORIES=		french cad
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -131,13 +132,13 @@ MUMPS_PORT=	mumps
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs	\
 		${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack
 MUMPS_PORT=	mumps-mpich
-MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich
+MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl
 . endif
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT}
 .endif
 
 .if defined(WITH_MPI)
-BUILD_DEPENDS+=	${HOME_MPI}/include/mpif.h:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
 HOME_MPI=	${LOCALBASE}
 .endif
 
@@ -220,7 +221,7 @@ ${WRKSRC}/instdir/${vaster}/elements:	build
 
 pre-everything::
 .if defined(WITH_MPI)
-	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run `mpd &'"
+	@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'"
 .endif
 
 pre-configure:
@@ -337,6 +338,7 @@ pre-build:
 	${ECHO_CMD} "#?vers : VVV?" >> ${WRKSRC}/instdir/etc/codeaster/aster
 	${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin		\
 		${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun		\
+		${LOCALBASE}/aster/ASTK/ASTK_SERV/share		\
 		${WRKSRC}/instdir/
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|'	\
 		${WRKSRC}/instdir/bin/as_run
diff --git a/french/aster/files/patch-products.py b/french/aster/files/patch-products.py
index f5519abafd7c..c1942733412d 100644
--- a/french/aster/files/patch-products.py
+++ b/french/aster/files/patch-products.py
@@ -1,5 +1,5 @@
---- products.py.orig	2010-07-07 18:18:13.000000000 +0200
-+++ products.py	2010-08-12 19:08:43.000000000 +0200
+--- products.py.orig	2010-09-14 10:48:26.000000000 +0200
++++ products.py	2010-10-25 22:53:13.000000000 +0200
 @@ -907,16 +907,19 @@
             'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
             'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
@@ -40,7 +40,7 @@
 +      opt['FINCLUDE']   = ''
 +      cxxlibs.extend(['stdc++', 'supc++'])
 +      zmat_platform=''
-+      mpilibs.extend(['mpich'])
++      mpilibs.extend(['mpich', 'mpl'])
     elif cfg['IFDEF'] == 'LINUX64':
        opt['SYSLIB']     = '-Wl,--allow-multiple-definition -Wl,--export-dynamic -lieee -ldl -lutil -lm'
        opt['LDFLAGS']    = '-v'
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index 3574b1aa89f2..348cc029f41f 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mumps
 PORTVERSION=	4.8.4
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
diff --git a/math/mumps/files/patch-Make.inc+Makefile.inc.generic b/math/mumps/files/patch-Make.inc+Makefile.inc.generic
index 7421456b4d47..464e45902abe 100644
--- a/math/mumps/files/patch-Make.inc+Makefile.inc.generic
+++ b/math/mumps/files/patch-Make.inc+Makefile.inc.generic
@@ -52,7 +52,7 @@
  
  # LIBRARIES USED BY THE PARALLEL VERSION OF MUMPS: $(SCALAP) and MPI
 -LIBPAR  = $(SCALAP) -L/usr/lib -lmpi
-+LIBPAR  = -L@LOCALBASE@/lib -lfmpich -lmpich $(SCALAP)
++LIBPAR  = -L@LOCALBASE@/lib -lfmpich -lmpich -lmpl $(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/petsc/Makefile b/math/petsc/Makefile
index 80ba614cb627..dbcc84d68456 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	petsc
 DISTVERSION=	2.3.3-p0
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	math parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
@@ -28,8 +28,8 @@ CONFIGURE_ENV=		PETSC_ARCH=${TARGET}	\
 			PETSC_DIR=${WRKSRC}
 CONFIGURE_ARGS=		--prefix=${PREFIX}/${PFX} --COPTFLAGS="${CFLAGS}"	\
 			--CXXOPTFLAGS="${CXXFLAGS}" --FOPTFLAGS="${FFLAGS}"	\
-			--with-shared=1 --with-cc=${CC} --with-fc=${FC}	\
-			--CPPFLAGS="-I${LOCALBASE}/include"
+			--with-shared=1 --with-cc=${CC} --with-fc=${FC}		\
+			--CPPFLAGS="-I${LOCALBASE}/include" --LDFLAGS=${PTHREAD_LIBS}
 ALL_TARGET=		all
 MAKEFILE=		makefile
 MAKE_ENV=		PETSC_DIR=${WRKSRC}
@@ -258,6 +258,14 @@ pre-configure:
 	${REINPLACE_CMD} -e "s|/bin/ksh|${LOCALBASE}/bin/ksh|"	\
 		${WRKSRC}/bin/popup
 	@${RM} ${WRKSRC}/bin/popup.bak
+.if defined (WITH_MPI)
+. for ps in ml.py MPE.py
+	${REINPLACE_CMD} -e "s|-lpmpich|-lmpl|"	\
+		${WRKSRC}/python/PETSc/packages/${ps}
+. endfor
+	${REINPLACE_CMD} -e "s|libpmpich|libmpl|"	\
+		${WRKSRC}/python/BuildSystem/config/packages/MPI.py
+.endif
 .if defined(PACKAGE_BUILDING)
 	${REINPLACE_CMD} -e "s|%%PACKAGE%%exit 1; ||"		\
 		-e "s|%%PACKAGE%%sys.exit(3)||"			\
diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile
index fc9ba3bf166d..10ab164c1aeb 100644
--- a/math/sdpara/Makefile
+++ b/math/sdpara/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdpara
 PORTVERSION=	7.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math parallel
 MASTER_SITES=	http://sdpa.indsys.chuo-u.ac.jp/sdpa/files/
 DISTFILES=	${SRCFILE}#${MANUALFILE}
diff --git a/science/fvm/Makefile b/science/fvm/Makefile
index 9c539f5a1115..b927bbc962f1 100644
--- a/science/fvm/Makefile
+++ b/science/fvm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fvm
 PORTVERSION=	0.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science parallel
 MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -52,6 +52,8 @@ CONFIGURE_ARGS+=	--enable-debug
 TESTSBIN=	fvm_file_test fvm_interface_test fvm_selector_postfix_test fvm_selector_test
 
 pre-configure:
+	${REINPLACE_CMD} -e 's|-lmpich|-lmpich -lmpl|'	\
+		${WRKSRC}/${CONFIGURE_SCRIPT}
 	# No useful doc there
 	${REINPLACE_CMD} -e 's|tests doc|tests|' ${WRKSRC}/Makefile.in
 
diff --git a/science/ncs/Makefile b/science/ncs/Makefile
index 2623fcf21b7c..03daf953b549 100644
--- a/science/ncs/Makefile
+++ b/science/ncs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ncs
 PORTVERSION=	1.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science parallel
 MASTER_SITES=	http://rd.edf.com/fichiers/fckeditor/File/EDF%20RD/Code_Saturne/Fichiers/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
@@ -67,7 +67,7 @@ MPI_LIBS=	-lmpi -lorte -lopal
 MPI_HOME=	${LOCALBASE}
 BUILD_DEPENDS+=	${MPI_HOME}/bin/mpicc:${PORTSDIR}/net/mpich2
 RUN_DEPENDS+=	${MPI_HOME}/bin/mpirun:${PORTSDIR}/net/mpich2
-MPI_LIBS=	-lmpich
+MPI_LIBS=	-lmpich -lmpl ${PTHREAD_LIBS}
 .endif
 
 .if !defined(NOPORTDOCS)