5 files changed, 173 insertions, 4 deletions

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index c9bdf672bd72..ce6e6f0e0ae1 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mpich
 DISTVERSION=	1.2.7p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net parallel
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
 DIST_SUBDIR=	mpich
@@ -17,8 +17,17 @@ DIST_SUBDIR=	mpich
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Message Passing Interface (MPI) Library
 
+LIB_DEPENDS=	f2c.2:${PORTSDIR}/lang/f2c
+
 USE_BZIP2=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-prefix=${PREFIX}/mpich
+USE_FORTRAN=	yes
+F90FLAGS+=	${FFLAGS}
+FORTRANLIBDIR=	`${DIRNAME} \`gfortran42 -print-libgcc-file-name\``
+FORTRANLIBDIR2=	`${DIRNAME} \`gfortran42 -print-libgcc-file-name\``/../../../
+CONFIGURE_ENV+=	F90=${FC} F90FLAGS=${F90FLAGS} F77=${FC}	\
+		LIBS="-L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} -lgfortranbegin  -lgfortran -L${LOCALBASE}/lib -lf2c"
 
 OPTIONS=	X11	"Enable MPE graphics" on \
 		TK	"Build with TK support" on \
@@ -32,6 +41,8 @@ WITHOUT_TK=	yes
 CONFIGURE_ARGS+=--disable-mpe_graphics
 PLIST_SUB+=	X11="@comment "
 .else
+BUILD_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
+RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 USE_XLIB=	yes
 CONFIGURE_ARGS+=--enable-mpe_graphics
 PLIST_SUB+=	X11=""
@@ -58,8 +69,6 @@ BUILD_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 PLIST_SUB+=	JAVA=""
 .endif
 
-HAS_CONFIGURE=	yes
-
 ALL_TARGET=
 
 MANPREFIX=	${TARGETDIR}/mpich
@@ -198,6 +207,9 @@ pre-configure:
 .for fic in mpe/configure mpe/src/Makefile.in
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${fic}
 .endfor
+.for fic in examples/basic/Makefile.in installtest/Makefile.in
+	${REINPLACE_CMD} -e 's|@F90_SUFFIX@|f90|' ${WRKSRC}/${fic}
+.endfor
 
 post-install:
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/mpich/bin ${PREFIX}/mpich/lib
diff --git a/net/mpich/files/patch-examples_basic_hello++.cc b/net/mpich/files/patch-examples_basic_hello++.cc
new file mode 100644
index 000000000000..dd6b7896a914
--- /dev/null
+++ b/net/mpich/files/patch-examples_basic_hello++.cc
@@ -0,0 +1,13 @@
+--- examples/basic/hello++.cc.orig	Wed Jul 12 22:23:29 2000
++++ examples/basic/hello++.cc	Fri Jul 27 23:01:44 2007
+@@ -26,7 +26,9 @@
+ // OR OTHER RIGHTS.
+ //
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
++
+ #include "mpi.h"
+ 
+ int
diff --git a/net/mpich/files/patch-examples_test_configure b/net/mpich/files/patch-examples_test_configure
new file mode 100644
index 000000000000..27ba1e089a8a
--- /dev/null
+++ b/net/mpich/files/patch-examples_test_configure
@@ -0,0 +1,15 @@
+--- ./examples/test/configure.orig	Mon Oct 10 15:27:36 2005
++++ ./examples/test/configure	Thu Jul 26 20:52:13 2007
+@@ -1017,9 +1017,9 @@
+ else
+ echo "$ac_t""$ac_cv_prog_g77" 1>&1
+ fi
+-    if test $ac_cv_prog_g77 = "yes" ; then
+-        FFLAGS="$FFLAGS -Wno-globals"
+-    fi
++    #if test $ac_cv_prog_g77 = "yes" ; then
++    #    FFLAGS="$FFLAGS -Wno-globals"
++    #fi
+ fi
+ # Fixup for make
+ 
diff --git a/net/mpich/files/patch-installtest_hello++.cc b/net/mpich/files/patch-installtest_hello++.cc
new file mode 100644
index 000000000000..4a8a6221490f
--- /dev/null
+++ b/net/mpich/files/patch-installtest_hello++.cc
@@ -0,0 +1,13 @@
+--- installtest/hello++.cc.orig	Fri May 26 23:28:29 2000
++++ installtest/hello++.cc	Fri Jul 27 23:02:01 2007
+@@ -26,7 +26,9 @@
+ // OR OTHER RIGHTS.
+ //
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
++
+ // modified to reference the master mpi.h file, to meet the MPI standard spec.
+ #include "mpi.h"
+ 
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index a58269efbb53..7b3e8a9f637a 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -195,6 +195,118 @@ mpich/examples/pi3f90.f90
 mpich/examples/pi3p.f
 mpich/examples/simpleio.c
 mpich/include/basex11.h
+mpich/include/f90base/mpi.mod
+mpich/include/f90base/mpi1.mod
+mpich/include/f90base/mpi2.mod
+mpich/include/f90base/mpi_constants.mod
+mpich/include/f90choice/mpi.mod
+mpich/include/f90choice/mpi1.mod
+mpich/include/f90choice/mpi1__character_s.mod
+mpich/include/f90choice/mpi1__character_sv.mod
+mpich/include/f90choice/mpi1__character_v.mod
+mpich/include/f90choice/mpi1__character_v2.mod
+mpich/include/f90choice/mpi1__character_vs.mod
+mpich/include/f90choice/mpi1__complex4_s.mod
+mpich/include/f90choice/mpi1__complex4_sv.mod
+mpich/include/f90choice/mpi1__complex4_v.mod
+mpich/include/f90choice/mpi1__complex4_v2.mod
+mpich/include/f90choice/mpi1__complex4_vs.mod
+mpich/include/f90choice/mpi1__complex8_s.mod
+mpich/include/f90choice/mpi1__complex8_sv.mod
+mpich/include/f90choice/mpi1__complex8_v.mod
+mpich/include/f90choice/mpi1__complex8_v2.mod
+mpich/include/f90choice/mpi1__complex8_vs.mod
+mpich/include/f90choice/mpi1__integer1_s.mod
+mpich/include/f90choice/mpi1__integer1_sv.mod
+mpich/include/f90choice/mpi1__integer1_v.mod
+mpich/include/f90choice/mpi1__integer1_v2.mod
+mpich/include/f90choice/mpi1__integer1_vs.mod
+mpich/include/f90choice/mpi1__integer2_s.mod
+mpich/include/f90choice/mpi1__integer2_sv.mod
+mpich/include/f90choice/mpi1__integer2_v.mod
+mpich/include/f90choice/mpi1__integer2_v2.mod
+mpich/include/f90choice/mpi1__integer2_vs.mod
+mpich/include/f90choice/mpi1__integer4_s.mod
+mpich/include/f90choice/mpi1__integer4_sv.mod
+mpich/include/f90choice/mpi1__integer4_v.mod
+mpich/include/f90choice/mpi1__integer4_v2.mod
+mpich/include/f90choice/mpi1__integer4_vs.mod
+mpich/include/f90choice/mpi1__integer8_s.mod
+mpich/include/f90choice/mpi1__integer8_sv.mod
+mpich/include/f90choice/mpi1__integer8_v.mod
+mpich/include/f90choice/mpi1__integer8_v2.mod
+mpich/include/f90choice/mpi1__integer8_vs.mod
+mpich/include/f90choice/mpi1__logical1_s.mod
+mpich/include/f90choice/mpi1__logical1_sv.mod
+mpich/include/f90choice/mpi1__logical1_v.mod
+mpich/include/f90choice/mpi1__logical1_v2.mod
+mpich/include/f90choice/mpi1__logical1_vs.mod
+mpich/include/f90choice/mpi1__logical2_s.mod
+mpich/include/f90choice/mpi1__logical2_sv.mod
+mpich/include/f90choice/mpi1__logical2_v.mod
+mpich/include/f90choice/mpi1__logical2_v2.mod
+mpich/include/f90choice/mpi1__logical2_vs.mod
+mpich/include/f90choice/mpi1__logical4_s.mod
+mpich/include/f90choice/mpi1__logical4_sv.mod
+mpich/include/f90choice/mpi1__logical4_v.mod
+mpich/include/f90choice/mpi1__logical4_v2.mod
+mpich/include/f90choice/mpi1__logical4_vs.mod
+mpich/include/f90choice/mpi1__logical8_s.mod
+mpich/include/f90choice/mpi1__logical8_sv.mod
+mpich/include/f90choice/mpi1__logical8_v.mod
+mpich/include/f90choice/mpi1__logical8_v2.mod
+mpich/include/f90choice/mpi1__logical8_vs.mod
+mpich/include/f90choice/mpi1__real4_s.mod
+mpich/include/f90choice/mpi1__real4_sv.mod
+mpich/include/f90choice/mpi1__real4_v.mod
+mpich/include/f90choice/mpi1__real4_v2.mod
+mpich/include/f90choice/mpi1__real4_vs.mod
+mpich/include/f90choice/mpi1__real8_s.mod
+mpich/include/f90choice/mpi1__real8_sv.mod
+mpich/include/f90choice/mpi1__real8_v.mod
+mpich/include/f90choice/mpi1__real8_v2.mod
+mpich/include/f90choice/mpi1__real8_vs.mod
+mpich/include/f90choice/mpi2.mod
+mpich/include/f90choice/mpi2__character_s.mod
+mpich/include/f90choice/mpi2__character_v.mod
+mpich/include/f90choice/mpi2__character_v2.mod
+mpich/include/f90choice/mpi2__complex4_s.mod
+mpich/include/f90choice/mpi2__complex4_v.mod
+mpich/include/f90choice/mpi2__complex4_v2.mod
+mpich/include/f90choice/mpi2__complex8_s.mod
+mpich/include/f90choice/mpi2__complex8_v.mod
+mpich/include/f90choice/mpi2__complex8_v2.mod
+mpich/include/f90choice/mpi2__integer1_s.mod
+mpich/include/f90choice/mpi2__integer1_v.mod
+mpich/include/f90choice/mpi2__integer1_v2.mod
+mpich/include/f90choice/mpi2__integer2_s.mod
+mpich/include/f90choice/mpi2__integer2_v.mod
+mpich/include/f90choice/mpi2__integer2_v2.mod
+mpich/include/f90choice/mpi2__integer4_s.mod
+mpich/include/f90choice/mpi2__integer4_v.mod
+mpich/include/f90choice/mpi2__integer4_v2.mod
+mpich/include/f90choice/mpi2__integer8_s.mod
+mpich/include/f90choice/mpi2__integer8_v.mod
+mpich/include/f90choice/mpi2__integer8_v2.mod
+mpich/include/f90choice/mpi2__logical1_s.mod
+mpich/include/f90choice/mpi2__logical1_v.mod
+mpich/include/f90choice/mpi2__logical1_v2.mod
+mpich/include/f90choice/mpi2__logical2_s.mod
+mpich/include/f90choice/mpi2__logical2_v.mod
+mpich/include/f90choice/mpi2__logical2_v2.mod
+mpich/include/f90choice/mpi2__logical4_s.mod
+mpich/include/f90choice/mpi2__logical4_v.mod
+mpich/include/f90choice/mpi2__logical4_v2.mod
+mpich/include/f90choice/mpi2__logical8_s.mod
+mpich/include/f90choice/mpi2__logical8_v.mod
+mpich/include/f90choice/mpi2__logical8_v2.mod
+mpich/include/f90choice/mpi2__real4_s.mod
+mpich/include/f90choice/mpi2__real4_v.mod
+mpich/include/f90choice/mpi2__real4_v2.mod
+mpich/include/f90choice/mpi2__real8_s.mod
+mpich/include/f90choice/mpi2__real8_v.mod
+mpich/include/f90choice/mpi2__real8_v2.mod
+mpich/include/f90choice/mpi_constants.mod
 mpich/include/mpe.h
 mpich/include/mpe_graphics.h
 mpich/include/mpe_log.h
@@ -259,9 +371,11 @@ mpich/lib/liblmpe.a
 mpich/lib/libmpe.a
 %%X11%%mpich/lib/libmpe_nompi.a
 mpich/lib/libmpich.a
+mpich/lib/libmpichf90.a
+mpich/lib/libmpichf90nc.a
 mpich/lib/libmpichfsup.a
-mpich/lib/libpmpich++.a
 mpich/lib/libpmpich.a
+mpich/lib/libpmpich++.a
 mpich/lib/libtmpe.a
 mpich/lib/mpe_prof.o
 %%JAVA%%mpich/lib/clog2TOdrawable.jar
@@ -615,6 +729,8 @@ mpich/www/www4/index.html
 %%JAVA%%@dirrm mpich/logfiles
 @dirrm mpich/lib
 @dirrm mpich/include/mpi2c++
+@dirrm mpich/include/f90choice
+@dirrm mpich/include/f90base
 @dirrm mpich/include
 @dirrm mpich/examples
 @dirrm mpich/etc