7 files changed, 110 insertions, 11 deletions
diff --git a/parallel/mpi-ch/patches/patch-ax b/parallel/mpi-ch/patches/patch-ax
index a1c3410262c..336b9eaa21e 100644
--- a/parallel/mpi-ch/patches/patch-ax
+++ b/parallel/mpi-ch/patches/patch-ax
@@ -1,19 +1,17 @@
-$NetBSD: patch-ax,v 1.1 2003/11/27 17:02:25 wennmach Exp $
+$NetBSD: patch-ax,v 1.2 2003/12/03 21:06:17 jschauma Exp $
 
-Correct syntax error in configure.
-
---- src/fortran/configure.orig	Wed Nov 26 23:05:27 2003
-+++ src/fortran/configure	Wed Nov 26 23:06:09 2003
-@@ -4601,12 +4601,12 @@
+--- src/fortran/configure.orig	2003-09-11 12:19:17.000000000 -0400
++++ src/fortran/configure	2003-12-02 22:42:57.000000000 -0500
+@@ -4620,12 +4620,12 @@
      ac_fcompileforlib='${F77-f77} -c $FFLAGS conftest1.f 1>&5'
-     if { (eval echo configure:4603: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
+     if { (eval echo configure:4622: \"$ac_fcompileforlib\") 1>&5; (eval $ac_fcompileforlib) 2>&5; } && test -s conftest1.o ; then
          if test ! -d conftest ; then mkdir conftest2 ; fi
--	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-+	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
-         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+-	        { ac_try='${ARCMD-"ar"} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
++	        { ac_try='${ARCMD-ar} cr conftest2/libconftest.a conftest1.o'; { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+         { ac_try='${RANLIB-ranlib} conftest2/libconftest.a'; { (eval echo configure:4625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
          ac_fcompileldtest='${F77-f77} -o conftest $FFLAGS ${ldir}conftest2 conftest.f -lconftest $LDFLAGS 1>&5'
          for ldir in "-L" "-Wl,-L," ; do
-             if { (eval echo configure:4609: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
+             if { (eval echo configure:4628: \"$ac_fcompileldtest\") 1>&5; (eval $ac_fcompileldtest) 2>&5; } && test -s conftest ; then
 -	        pac_cv_prog_f77_library_dir_flag="$ldir"
 +	        pac_cv_prog_f77_library_dir_flag="${ldir}"
  	        break
diff --git a/parallel/mpi-ch/patches/patch-az b/parallel/mpi-ch/patches/patch-az
new file mode 100644
index 00000000000..af7e49c40fc
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-az
@@ -0,0 +1,17 @@
+$NetBSD: patch-az,v 1.1 2003/12/03 21:06:17 jschauma Exp $
+
+--- ./MPI-2-C++/contrib/examples/hello_world.cc.orig	2003-12-02 22:56:44.000000000 -0500
++++ ./MPI-2-C++/contrib/examples/hello_world.cc	2003-12-02 22:57:04.000000000 -0500
+@@ -27,9 +27,11 @@
+ // Additional copyrights may follow.
+ //
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include "mpi++.h"
+ 
++using namespace std;
++
+ int
+ main(int argc, char *argv[])
+ {
diff --git a/parallel/mpi-ch/patches/patch-ba b/parallel/mpi-ch/patches/patch-ba
new file mode 100644
index 00000000000..2f85e95f6ab
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-ba
@@ -0,0 +1,16 @@
+$NetBSD: patch-ba,v 1.1 2003/12/03 21:06:17 jschauma Exp $
+
+--- ./MPI-2-C++/contrib/examples/ring.cc.orig	2003-12-02 23:04:51.000000000 -0500
++++ ./MPI-2-C++/contrib/examples/ring.cc	2003-12-02 23:05:08.000000000 -0500
+@@ -27,9 +27,10 @@
+ // Additional copyrights may follow.
+ //
+ 
+-#include <iostream.h> 
++#include <iostream> 
+ #include <mpi++.h>
+ 
++using namespace std;
+ 
+ int
+ main(int argc, char *argv[])
diff --git a/parallel/mpi-ch/patches/patch-bb b/parallel/mpi-ch/patches/patch-bb
new file mode 100644
index 00000000000..b14f5de67bf
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-bb
@@ -0,0 +1,18 @@
+$NetBSD: patch-bb,v 1.1 2003/12/03 21:06:17 jschauma Exp $
+
+--- MPI-2-C++/contrib/examples/topology.cc.orig	2003-12-02 23:07:49.000000000 -0500
++++ MPI-2-C++/contrib/examples/topology.cc	2003-12-02 23:08:04.000000000 -0500
+@@ -27,10 +27,12 @@
+ // Additional copyrights may follow.
+ //
+ 
+-#include <iostream.h> 
++#include <iostream> 
+ #include <mpi++.h>
+ #include <assert.h>
+ 
++using namespace std;
++
+ void cartesian();
+ void graph();
+ 
diff --git a/parallel/mpi-ch/patches/patch-bc b/parallel/mpi-ch/patches/patch-bc
new file mode 100644
index 00000000000..a1925ee76e7
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-bc
@@ -0,0 +1,16 @@
+$NetBSD: patch-bc,v 1.1 2003/12/03 21:06:17 jschauma Exp $
+
+--- MPI-2-C++/contrib/examples/user_bcast.cc.orig	2003-12-02 23:09:27.000000000 -0500
++++ MPI-2-C++/contrib/examples/user_bcast.cc	2003-12-02 23:09:38.000000000 -0500
+@@ -27,9 +27,10 @@
+ // Additional copyrights may follow.
+ //
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <mpi++.h>
+ 
++using namespace std;
+ 
+ void user_bcast(int buffer[], int count, MPI::Intracomm comm);
+ 
diff --git a/parallel/mpi-ch/patches/patch-bd b/parallel/mpi-ch/patches/patch-bd
new file mode 100644
index 00000000000..760bb1a0aae
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-bd
@@ -0,0 +1,17 @@
+$NetBSD: patch-bd,v 1.1 2003/12/03 21:06:17 jschauma Exp $
+
+--- MPI-2-C++/contrib/examples/chapter_10_mpi2.cc.orig	2003-12-02 23:10:53.000000000 -0500
++++ MPI-2-C++/contrib/examples/chapter_10_mpi2.cc	2003-12-02 23:11:08.000000000 -0500
+@@ -27,9 +27,11 @@
+ // Additional copyrights may follow.
+ // 
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <mpi++.h>
+ 
++using namespace std;
++
+ void example10_2(void);
+ void example10_3(void);
+ void example10_4(void);
diff --git a/parallel/mpi-ch/patches/patch-be b/parallel/mpi-ch/patches/patch-be
new file mode 100644
index 00000000000..d515f66dc1f
--- /dev/null
+++ b/parallel/mpi-ch/patches/patch-be
@@ -0,0 +1,17 @@
+$NetBSD: patch-be,v 1.1 2003/12/03 21:06:17 jschauma Exp $
+
+--- MPI-2-C++/contrib/examples/pi.cc.orig	2003-12-02 23:11:55.000000000 -0500
++++ MPI-2-C++/contrib/examples/pi.cc	2003-12-02 23:12:15.000000000 -0500
+@@ -28,9 +28,11 @@
+ //
+ 
+ #include <math.h>
+-#include <iostream.h>
++#include <iostream>
+ #include "mpi++.h"
+ 
++using namespace std;
++
+ int
+ main(int argc, char *argv[])
+ {