Update mpi-ch to 1.2.5.2, released on September 11th, 2003.

An extensive list of changes since the last release is available online
at http://www-unix.mcs.anl.gov/mpi/mpich/r1_2_5changes.html
(It's difficult to destill the important changes from that file, which
is why I'm not pasting the entire collection in here.)

10 files changed, 141 insertions, 29 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 8d661692e24..c3916460898 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,9 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2003/12/02 20:13:38 wennmach Exp $
+# $NetBSD: Makefile,v 1.25 2003/12/03 21:06:17 jschauma Exp $
 
-DISTNAME=		mpich-1.2.5-1a
-PKGNAME=		mpich-1.2.5.1.1
-PKGREVISION=		3
-WRKSRC=			${WRKDIR}/${DISTNAME:C/-1a//}
+DISTNAME=		mpich-1.2.5.2
 CATEGORIES=		parallel
 MASTER_SITES=		ftp://ftp.mcs.anl.gov/pub/mpi/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} mpich-docs.tgz
@@ -22,6 +19,7 @@ INSTALL_TARGET=		install-all
 USE_PERL5=		yes
 HAS_CONFIGURE=		yes
 USE_X11=		yes
+USE_FORTRAN=		yes
 
 MPI_RSH?=		ssh
 
@@ -43,6 +41,10 @@ CONFIGURE_ARGS+=	--disable-weak-symbols
 
 MAKE_ENV+=		RSHCOMMAND="${MPI_RSH}"
 
+BUILD_DEFS+=		MPI_RSH
+
+.include "../../mk/bsd.prefs.mk"
+
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 .if ${MPI_RSH} == "rsh"
@@ -62,6 +64,9 @@ post-build:
 			${WRKSRC}/man/man1/MPI.1.tmp
 	${MV} ${WRKSRC}/man/man1/MPI.1.tmp ${WRKSRC}/man/man1/MPI.1
 
+post-patch:
+	${RM} -f ${WRKSRC}/man/man1/MPI.1.orig
+
 post-install:
 	cd ${WRKDIR}/docs && ${PAX} -rw . ${PREFIX}/share/doc/html/mpi-ch/
 	@${RM} ${PREFIX}/man/mandesc
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 5ceec11eaf1..a3a6b18d99d 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/27 21:07:05 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/12/03 21:06:17 jschauma Exp $
 bin/clog2alog
 bin/clog2slog
 bin/clog_print
@@ -1069,20 +1069,20 @@ share/examples/mpi-ch/io/excl
 share/examples/mpi-ch/io/excl.c
 share/examples/mpi-ch/io/excl.o
 share/examples/mpi-ch/io/fcoll_test
+share/examples/mpi-ch/io/fcoll_test.o
 share/examples/mpi-ch/io/fcoll_test.f
 share/examples/mpi-ch/io/fcoll_test.f.in
-share/examples/mpi-ch/io/fcoll_test.o
 share/examples/mpi-ch/io/file_info
 share/examples/mpi-ch/io/file_info.c
 share/examples/mpi-ch/io/file_info.o
 share/examples/mpi-ch/io/fmisc
+share/examples/mpi-ch/io/fmisc.o
 share/examples/mpi-ch/io/fmisc.f
 share/examples/mpi-ch/io/fmisc.f.in
-share/examples/mpi-ch/io/fmisc.o
-share/examples/mpi-ch/io/fperf
 share/examples/mpi-ch/io/fperf.f
 share/examples/mpi-ch/io/fperf.f.in
 share/examples/mpi-ch/io/fperf.o
+share/examples/mpi-ch/io/fperf
 share/examples/mpi-ch/io/i_noncontig
 share/examples/mpi-ch/io/i_noncontig.c
 share/examples/mpi-ch/io/i_noncontig.o
@@ -1105,14 +1105,15 @@ share/examples/mpi-ch/io/noncontig_coll.c
 share/examples/mpi-ch/io/noncontig_coll.o
 share/examples/mpi-ch/io/noncontig_coll2
 share/examples/mpi-ch/io/noncontig_coll2.c
+share/examples/mpi-ch/io/noncontig_coll2.c.rej
 share/examples/mpi-ch/io/noncontig_coll2.o
 share/examples/mpi-ch/io/perf
 share/examples/mpi-ch/io/perf.c
 share/examples/mpi-ch/io/perf.o
 share/examples/mpi-ch/io/pfcoll_test
+share/examples/mpi-ch/io/pfcoll_test.o
 share/examples/mpi-ch/io/pfcoll_test.f
 share/examples/mpi-ch/io/pfcoll_test.f.in
-share/examples/mpi-ch/io/pfcoll_test.o
 share/examples/mpi-ch/io/psimple
 share/examples/mpi-ch/io/psimple.c
 share/examples/mpi-ch/io/psimple.o
@@ -1563,19 +1564,19 @@ share/examples/mpi-ch/test/io/excl
 share/examples/mpi-ch/test/io/excl.c
 share/examples/mpi-ch/test/io/excl.o
 share/examples/mpi-ch/test/io/fcoll_test
+share/examples/mpi-ch/test/io/fcoll_test.o
 share/examples/mpi-ch/test/io/fcoll_test.f
 share/examples/mpi-ch/test/io/fcoll_test.f.in
-share/examples/mpi-ch/test/io/fcoll_test.o
 share/examples/mpi-ch/test/io/file_info
 share/examples/mpi-ch/test/io/file_info.c
 share/examples/mpi-ch/test/io/file_info.o
 share/examples/mpi-ch/test/io/fmisc
+share/examples/mpi-ch/test/io/fmisc.o
 share/examples/mpi-ch/test/io/fmisc.f
 share/examples/mpi-ch/test/io/fmisc.f.in
-share/examples/mpi-ch/test/io/fmisc.o
-share/examples/mpi-ch/test/io/fperf
 share/examples/mpi-ch/test/io/fperf.f
 share/examples/mpi-ch/test/io/fperf.f.in
+share/examples/mpi-ch/test/io/fperf
 share/examples/mpi-ch/test/io/fperf.o
 share/examples/mpi-ch/test/io/i_noncontig
 share/examples/mpi-ch/test/io/i_noncontig.c
@@ -1599,14 +1600,15 @@ share/examples/mpi-ch/test/io/noncontig_coll.c
 share/examples/mpi-ch/test/io/noncontig_coll.o
 share/examples/mpi-ch/test/io/noncontig_coll2
 share/examples/mpi-ch/test/io/noncontig_coll2.c
+share/examples/mpi-ch/test/io/noncontig_coll2.c.rej
 share/examples/mpi-ch/test/io/noncontig_coll2.o
 share/examples/mpi-ch/test/io/perf
 share/examples/mpi-ch/test/io/perf.c
 share/examples/mpi-ch/test/io/perf.o
 share/examples/mpi-ch/test/io/pfcoll_test
+share/examples/mpi-ch/test/io/pfcoll_test.o
 share/examples/mpi-ch/test/io/pfcoll_test.f
 share/examples/mpi-ch/test/io/pfcoll_test.f.in
-share/examples/mpi-ch/test/io/pfcoll_test.o
 share/examples/mpi-ch/test/io/psimple
 share/examples/mpi-ch/test/io/psimple.c
 share/examples/mpi-ch/test/io/psimple.o
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index a707be81497..b526e3eab17 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2003/11/27 17:02:25 wennmach Exp $
+$NetBSD: distinfo,v 1.6 2003/12/03 21:06:17 jschauma Exp $
 
-SHA1 (mpich-1.2.5-1a.tar.gz) = 28d9316601196169a8576ace94daf23f1b673c01
-Size (mpich-1.2.5-1a.tar.gz) = 12381275 bytes
+SHA1 (mpich-1.2.5.2.tar.gz) = a767e56bab24d08a13903493e627e987e1685f50
+Size (mpich-1.2.5.2.tar.gz) = 12383519 bytes
 SHA1 (mpich-docs.tgz) = fb7a9c7459998b9b74584d2afc4553027d94ad10
 Size (mpich-docs.tgz) = 326405 bytes
 SHA1 (patch-aa) = fa6d5f16cbc88b850906a7cc970ad73e62bee50d
@@ -16,5 +16,11 @@ SHA1 (patch-at) = faeec80f8e35546e830873886d00e4332444a29a
 SHA1 (patch-au) = 00a6f439d2bb65269780f2141dbd588b147e890d
 SHA1 (patch-av) = 5d4330ea9ff8e4fe09879f092b0e4032fba54c13
 SHA1 (patch-aw) = a1a98f08743cd1d33187b37ceb24ff5c4fcd731a
-SHA1 (patch-ax) = 4f11502bf24b69f3aa8994a175529dd5cfda3be1
+SHA1 (patch-ax) = ceffb118aa3ca151dcf387c000895f7405472f87
 SHA1 (patch-ay) = 72ac437696041c4771913e8f36a6b379c9e1057a
+SHA1 (patch-az) = b81cb18c7c9f52d60dd540d1a47f16297e618a10
+SHA1 (patch-ba) = b20d05026031fd5a86c78f6bb9cdfdf821f10543
+SHA1 (patch-bb) = 7f399ed3d4bbaf00b75ec3a5ce8f114e4c6bbd23
+SHA1 (patch-bc) = e89bbf9e1ef9f2aaa6b8000d170c5a158408988d
+SHA1 (patch-bd) = 7c96f575263fbe9adc0514ed64452db04cc68212
+SHA1 (patch-be) = d21a703dbe17a48fb940ce65fd232284a57ff3cf
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[])
+ {