Update to MPICH2 1.3.1

Changes in 1.3.1

 # OVERALL: MPICH2 is now fully compliant with the CIFTS FTB standard
   MPI events (based on the draft standard).

 # OVERALL: Major improvements to RMA performance for long lists of
   RMA operations.

 # OVERALL: Performance improvements for Group_translate_ranks.

 # COLLECTIVES: Collective algorithm selection thresholds can now be controlled
   at runtime via environment variables.

 # ROMIO: PVFS error codes are now mapped to MPI error codes.

 # Several other minor bug fixes, memory leak fixes, and code cleanup.
   A full list of changes is available using:

     svn log -r7350:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.3.1

     ... or at the following link:

     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.3.1?action=follow_copy&rev=HEAD&stop_rev=7350&mode=follow_copy


Changes in 1.3

 # OVERALL: Initial support for fine-grained threading in
   ch3:nemesis:tcp.

 # OVERALL: Support for Asynchronous Communication Progress.

 # OVERALL: The ssm and shm channels have been removed.

 # OVERALL: Checkpoint/restart support using BLCR.

 # OVERALL: Improved tolerance to process and communication failures
   when error handler is set to MPI_ERRORS_RETURN.  If a communication
   operation fails (e.g., due to a process failure) MPICH2 will return
   an error, and further communication to that process is not
   possible.  However, communication with other processes will still
   proceed normally.  Note, however, that the behavior collective
   operations on communicators containing the failed process is
   undefined, and may give incorrect results or hang some processes.

 # OVERALL: Experimental support for inter-library dependencies.

 # PM/PMI: Hydra is now the default process management framework
   replacing MPD.

 # PM/PMI: Added dynamic process support for Hydra.

 # PM/PMI: Added support for LSF, SGE and POE in Hydra.

 # PM/PMI: Added support for CPU and memory/cache topology aware
   process-core binding.

 # DEBUGGER: Improved support and bug fixes in the Totalview support.

 # Build system: Replaced F90/F90FLAGS by FC/FCFLAGS. F90/F90FLAGS are
   not longer supported in the configure.

 # Multi-compiler support: On systems where C compiler that is used to
   build mpich2 libraries supports multiple weak symbols and multiple aliases,
   the Fortran binding built in the mpich2 libraries can handle different
   Fortran compilers (than the one used to build mpich2).  Details in README.

 # Several other minor bug fixes, memory leak fixes, and code cleanup.
   A full list of changes is available using:

     svn log -r5762:HEAD https://svn.mcs.anl.gov/repos/mpi/mpich2/tags/release/mpich2-1.3

     ... or at the following link:

     https://trac.mcs.anl.gov/projects/mpich2/log/mpich2/tags/release/mpich2-1.3?action=follow_copy&rev=HEAD&stop_rev=5762&mode=follow_copy

10 files changed, 185 insertions, 277 deletions

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index cbe07ee23e1..6bf9a3a6464 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.65 2010/07/30 10:36:33 asau Exp $
+# $NetBSD: Makefile,v 1.66 2010/12/17 02:47:18 asau Exp $
 
-DISTNAME=	mpich2-1.2.1p1
-#PKGREVISION=	1
+DISTNAME=	mpich2-1.3.1
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.2.1p1/
+MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.3.1/
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.mcs.anl.gov/research/projects/mpich2/
 COMMENT=	Open source MPI and MPI-2 implementation from Univ. of Chicago
 
-CONFLICTS+=	musicpd-[0-9]*	# installs bin/mpd
 CONFLICTS+=	mpich-[0-9]*	# installs bin/mpicc & other wrappers
 CONFLICTS+=	openmpi-[0-9]*	# installs bin/mpicc & other wrappers
 
@@ -17,6 +15,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
+DEPENDS+=	bash-[0-9]*:../../shells/bash
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++ fortran77
 
@@ -27,14 +27,13 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/${PKGBASE}
 CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGBASE}/html
 
-CONFIGURE_ARGS+=	--disable-f90	# problems?
-CONFIGURE_ARGS+=	--without-java
-CONFIGURE_ARGS+=	--without-java2
+CONFIGURE_ARGS+=	--with-pm=hydra:gforker
+CONFIGURE_ARGS+=	--with-hydra-bindlib=plpa # problems with hwloc
+CONFIGURE_ARGS+=	--disable-fc		# problems?
+CONFIGURE_ARGS+=	--with-openpa-prefix=$(BUILDLINK_PREFIX.openpa:Q) # reuse it
 
 USE_TOOLS+=		perl:run
 
-REPLACE_PYTHON+=	src/pm/mpd/*.py src/pm/mpd/test/*.py
-
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_callstack_ldflags.conf \
 			${PKG_SYSCONFDIR}/mpe_callstack_ldflags.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_f77env.conf \
@@ -53,27 +52,20 @@ CONF_FILES+=		share/${PKGBASE}/examples/mpe_mpitrace.conf \
 			${PKG_SYSCONFDIR}/mpe_mpitrace.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpe_nolog.conf \
 			${PKG_SYSCONFDIR}/mpe_nolog.conf
-
 CONF_FILES+=		share/${PKGBASE}/examples/mpicc.conf \
 			${PKG_SYSCONFDIR}/mpicc.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpicxx.conf \
 			${PKG_SYSCONFDIR}/mpicxx.conf
 CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
 			${PKG_SYSCONFDIR}/mpif77.conf
-CONF_FILES+=		share/${PKGBASE}/examples/mpixxx_opts.conf \
-			${PKG_SYSCONFDIR}/mpixxx_opts.conf
-
-# disable bundled OpenPA:
-post-extract:
-	mv $(WRKSRC)/src/openpa $(WRKSRC)/src/openpa.off
-
-.include "../../mk/bsd.prefs.mk"
 
 # FreeBSD 6 hack:
+.include "../../mk/bsd.prefs.mk"
 .if $(OPSYS) == "FreeBSD" || $(OPSYS) == "DragonFly"
 BUILDLINK_TRANSFORM+=	rm:-lrt
 .endif
 
-.include "../../lang/python/application.mk"
+.include "options.mk"
+
 .include "../../parallel/openpa/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/mpi-ch/PLIST b/parallel/mpi-ch/PLIST
index 2f502e5efe4..af57e1c0ca6 100644
--- a/parallel/mpi-ch/PLIST
+++ b/parallel/mpi-ch/PLIST
@@ -1,39 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2009/12/13 18:38:10 asau Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/12/17 02:47:18 asau Exp $
+bin/bt2line
 bin/check_callstack
 bin/clog2_join
 bin/clog2_print
 bin/clog2_repair
-bin/mpd
-bin/mpd.py
-bin/mpdallexit
-bin/mpdallexit.py
-bin/mpdboot
-bin/mpdboot.py
-bin/mpdcheck
-bin/mpdcheck.py
-bin/mpdchkpyver.py
-bin/mpdcleanup
-bin/mpdcleanup.py
-bin/mpdexit
-bin/mpdexit.py
-bin/mpdgdbdrv.py
-bin/mpdhelp
-bin/mpdhelp.py
-bin/mpdkilljob
-bin/mpdkilljob.py
-bin/mpdlib.py
-bin/mpdlistjobs
-bin/mpdlistjobs.py
-bin/mpdman.py
-bin/mpdringtest
-bin/mpdringtest.py
-bin/mpdroot
-bin/mpdrun
-bin/mpdrun.py
-bin/mpdsigjob
-bin/mpdsigjob.py
-bin/mpdtrace
-bin/mpdtrace.py
+bin/hydra_nameserver
+bin/hydra_persist
+bin/hydra_pmi_proxy
 bin/mpic++
 bin/mpicc
 bin/mpich2version
@@ -41,12 +14,9 @@ bin/mpicxx
 bin/mpiexec
 bin/mpiexec.gforker
 bin/mpiexec.hydra
-bin/mpiexec.py
 bin/mpif77
 bin/mpirun
-bin/mpirun.py
 bin/parkill
-bin/pmi_proxy
 include/clog_commset.h
 include/clog_const.h
 include/clog_inttypes.h
@@ -73,27 +43,11 @@ lib/libmpe_nompi_null.a
 lib/libmpe_null.a
 lib/libmpich.a
 lib/libmpichcxx.a
+lib/libmpl.la
 lib/libtmpe.a
 lib/mpe_prof.o
 lib/pkgconfig/mpich2-ch3.pc
 man/man1/MPI.1
-man/man1/Zeroconf.1
-man/man1/mpd.1
-man/man1/mpdallexit.1
-man/man1/mpdboot.1
-man/man1/mpdcheck.1
-man/man1/mpdchkpyver.1
-man/man1/mpdcleanup.1
-man/man1/mpdexit.1
-man/man1/mpdgdbdrv.1
-man/man1/mpdhelp.1
-man/man1/mpdkilljob.1
-man/man1/mpdlib.1
-man/man1/mpdlistjobs.1
-man/man1/mpdman.1
-man/man1/mpdringtest.1
-man/man1/mpdsigjob.1
-man/man1/mpdtrace.1
 man/man1/mpicc.1
 man/man1/mpicxx.1
 man/man1/mpiexec.1
@@ -749,65 +703,65 @@ share/doc/mpich2/html/www3/MPI_Win_wait.html
 share/doc/mpich2/html/www3/MPI_Wtick.html
 share/doc/mpich2/html/www3/MPI_Wtime.html
 share/doc/mpich2/html/www3/index.htm
-share/doc/mpich2/html/www4/MPE_Add_RGB_color.html
-share/doc/mpich2/html/www4/MPE_CaptureFile.html
-share/doc/mpich2/html/www4/MPE_Close_graphics.html
-share/doc/mpich2/html/www4/MPE_Comm_global_rank.html
-share/doc/mpich2/html/www4/MPE_Decomp1d.html
-share/doc/mpich2/html/www4/MPE_Describe_comm_event.html
-share/doc/mpich2/html/www4/MPE_Describe_comm_state.html
-share/doc/mpich2/html/www4/MPE_Describe_event.html
-share/doc/mpich2/html/www4/MPE_Describe_info_event.html
-share/doc/mpich2/html/www4/MPE_Describe_info_state.html
-share/doc/mpich2/html/www4/MPE_Describe_state.html
-share/doc/mpich2/html/www4/MPE_Draw_circle.html
-share/doc/mpich2/html/www4/MPE_Draw_line.html
-share/doc/mpich2/html/www4/MPE_Draw_logic.html
-share/doc/mpich2/html/www4/MPE_Draw_point.html
-share/doc/mpich2/html/www4/MPE_Draw_points.html
-share/doc/mpich2/html/www4/MPE_Draw_string.html
-share/doc/mpich2/html/www4/MPE_Errors_call_debugger.html
-share/doc/mpich2/html/www4/MPE_Fill_circle.html
-share/doc/mpich2/html/www4/MPE_Fill_rectangle.html
-share/doc/mpich2/html/www4/MPE_Finish_log.html
-share/doc/mpich2/html/www4/MPE_GetHostName.html
-share/doc/mpich2/html/www4/MPE_GetTags.html
-share/doc/mpich2/html/www4/MPE_Get_mouse_press.html
-share/doc/mpich2/html/www4/MPE_IO_Stdout_to_file.html
-share/doc/mpich2/html/www4/MPE_Iget_mouse_press.html
-share/doc/mpich2/html/www4/MPE_Init_log.html
-share/doc/mpich2/html/www4/MPE_Initialized_logging.html
-share/doc/mpich2/html/www4/MPE_Line_thickness.html
-share/doc/mpich2/html/www4/MPE_Log_bare_event.html
-share/doc/mpich2/html/www4/MPE_Log_comm_event.html
-share/doc/mpich2/html/www4/MPE_Log_comm_receive.html
-share/doc/mpich2/html/www4/MPE_Log_comm_send.html
-share/doc/mpich2/html/www4/MPE_Log_event.html
-share/doc/mpich2/html/www4/MPE_Log_get_event_number.html
-share/doc/mpich2/html/www4/MPE_Log_get_solo_eventID.html
-share/doc/mpich2/html/www4/MPE_Log_get_state_eventIDs.html
-share/doc/mpich2/html/www4/MPE_Log_info_event.html
-share/doc/mpich2/html/www4/MPE_Log_merged_logfilename.html
-share/doc/mpich2/html/www4/MPE_Log_pack.html
-share/doc/mpich2/html/www4/MPE_Log_receive.html
-share/doc/mpich2/html/www4/MPE_Log_send.html
-share/doc/mpich2/html/www4/MPE_Log_sync_clocks.html
-share/doc/mpich2/html/www4/MPE_Make_color_array.html
-share/doc/mpich2/html/www4/MPE_Num_colors.html
-share/doc/mpich2/html/www4/MPE_Open_graphics.html
-share/doc/mpich2/html/www4/MPE_ReturnTags.html
-share/doc/mpich2/html/www4/MPE_Seq_begin.html
-share/doc/mpich2/html/www4/MPE_Seq_end.html
-share/doc/mpich2/html/www4/MPE_Signals_call_debugger.html
-share/doc/mpich2/html/www4/MPE_Start_log.html
-share/doc/mpich2/html/www4/MPE_Stop_log.html
-share/doc/mpich2/html/www4/MPE_TagsEnd.html
-share/doc/mpich2/html/www4/MPE_Update.html
-share/doc/mpich2/html/www4/libmpe.cit
 share/doc/mpich2/install.pdf
 share/doc/mpich2/logging.pdf
 share/doc/mpich2/smpd_pmi.pdf
 share/doc/mpich2/user.pdf
+share/mpich2/doc/www4/MPE_Add_RGB_color.html
+share/mpich2/doc/www4/MPE_CaptureFile.html
+share/mpich2/doc/www4/MPE_Close_graphics.html
+share/mpich2/doc/www4/MPE_Comm_global_rank.html
+share/mpich2/doc/www4/MPE_Decomp1d.html
+share/mpich2/doc/www4/MPE_Describe_comm_event.html
+share/mpich2/doc/www4/MPE_Describe_comm_state.html
+share/mpich2/doc/www4/MPE_Describe_event.html
+share/mpich2/doc/www4/MPE_Describe_info_event.html
+share/mpich2/doc/www4/MPE_Describe_info_state.html
+share/mpich2/doc/www4/MPE_Describe_state.html
+share/mpich2/doc/www4/MPE_Draw_circle.html
+share/mpich2/doc/www4/MPE_Draw_line.html
+share/mpich2/doc/www4/MPE_Draw_logic.html
+share/mpich2/doc/www4/MPE_Draw_point.html
+share/mpich2/doc/www4/MPE_Draw_points.html
+share/mpich2/doc/www4/MPE_Draw_string.html
+share/mpich2/doc/www4/MPE_Errors_call_debugger.html
+share/mpich2/doc/www4/MPE_Fill_circle.html
+share/mpich2/doc/www4/MPE_Fill_rectangle.html
+share/mpich2/doc/www4/MPE_Finish_log.html
+share/mpich2/doc/www4/MPE_GetHostName.html
+share/mpich2/doc/www4/MPE_GetTags.html
+share/mpich2/doc/www4/MPE_Get_mouse_press.html
+share/mpich2/doc/www4/MPE_IO_Stdout_to_file.html
+share/mpich2/doc/www4/MPE_Iget_mouse_press.html
+share/mpich2/doc/www4/MPE_Init_log.html
+share/mpich2/doc/www4/MPE_Initialized_logging.html
+share/mpich2/doc/www4/MPE_Line_thickness.html
+share/mpich2/doc/www4/MPE_Log_bare_event.html
+share/mpich2/doc/www4/MPE_Log_comm_event.html
+share/mpich2/doc/www4/MPE_Log_comm_receive.html
+share/mpich2/doc/www4/MPE_Log_comm_send.html
+share/mpich2/doc/www4/MPE_Log_event.html
+share/mpich2/doc/www4/MPE_Log_get_event_number.html
+share/mpich2/doc/www4/MPE_Log_get_solo_eventID.html
+share/mpich2/doc/www4/MPE_Log_get_state_eventIDs.html
+share/mpich2/doc/www4/MPE_Log_info_event.html
+share/mpich2/doc/www4/MPE_Log_merged_logfilename.html
+share/mpich2/doc/www4/MPE_Log_pack.html
+share/mpich2/doc/www4/MPE_Log_receive.html
+share/mpich2/doc/www4/MPE_Log_send.html
+share/mpich2/doc/www4/MPE_Log_sync_clocks.html
+share/mpich2/doc/www4/MPE_Make_color_array.html
+share/mpich2/doc/www4/MPE_Num_colors.html
+share/mpich2/doc/www4/MPE_Open_graphics.html
+share/mpich2/doc/www4/MPE_ReturnTags.html
+share/mpich2/doc/www4/MPE_Seq_begin.html
+share/mpich2/doc/www4/MPE_Seq_end.html
+share/mpich2/doc/www4/MPE_Signals_call_debugger.html
+share/mpich2/doc/www4/MPE_Start_log.html
+share/mpich2/doc/www4/MPE_Stop_log.html
+share/mpich2/doc/www4/MPE_TagsEnd.html
+share/mpich2/doc/www4/MPE_Update.html
+share/mpich2/doc/www4/libmpe.cit
 share/mpich2/examples/mpe_callstack_ldflags.conf
 share/mpich2/examples/mpe_f77env.conf
 share/mpich2/examples/mpe_help.conf
@@ -853,3 +807,4 @@ share/mpich2/examples_logging/pthread_allreduce.c
 share/mpich2/examples_logging/pthread_sendrecv.c
 share/mpich2/examples_logging/pthread_sendrecv_user.c
 share/mpich2/examples_logging/srtest.c
+@pkgdir etc/mpich
diff --git a/parallel/mpi-ch/PLIST.mpd b/parallel/mpi-ch/PLIST.mpd
new file mode 100644
index 00000000000..56459f3f496
--- /dev/null
+++ b/parallel/mpi-ch/PLIST.mpd
@@ -0,0 +1,30 @@
+bin/mpd
+bin/mpd.py
+bin/mpdallexit
+bin/mpdallexit.py
+bin/mpdboot
+bin/mpdboot.py
+bin/mpdcheck
+bin/mpdcheck.py
+bin/mpdchkpyver.py
+bin/mpdcleanup
+bin/mpdcleanup.py
+bin/mpdexit
+bin/mpdexit.py
+bin/mpdgdbdrv.py
+bin/mpdhelp
+bin/mpdhelp.py
+bin/mpdkilljob
+bin/mpdkilljob.py
+bin/mpdlib.py
+bin/mpdlistjobs
+bin/mpdlistjobs.py
+bin/mpdman.py
+bin/mpdringtest
+bin/mpdringtest.py
+bin/mpdrun
+bin/mpdsigjob
+bin/mpdsigjob.py
+bin/mpdtrace
+bin/mpdtrace.py
+bin/mpiexec.mpd
diff --git a/parallel/mpi-ch/buildlink3.mk b/parallel/mpi-ch/buildlink3.mk
index 21a2390c4ed..ad72206a648 100644
--- a/parallel/mpi-ch/buildlink3.mk
+++ b/parallel/mpi-ch/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2009/12/13 18:38:11 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/12/17 02:47:18 asau Exp $
 
 BUILDLINK_TREE+=	mpich2
 
diff --git a/parallel/mpi-ch/distinfo b/parallel/mpi-ch/distinfo
index 19aad4650ff..13e68177103 100644
--- a/parallel/mpi-ch/distinfo
+++ b/parallel/mpi-ch/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/05/17 18:27:15 asau Exp $
+$NetBSD: distinfo,v 1.17 2010/12/17 02:47:18 asau Exp $
 
-SHA1 (mpich2-1.2.1p1.tar.gz) = 26bd5620b45bc654aa3945755d11450be63d650c
-RMD160 (mpich2-1.2.1p1.tar.gz) = 810cc486b65e4bcf977ac8d96ccbbcea87e0cbaa
-Size (mpich2-1.2.1p1.tar.gz) = 18014859 bytes
-SHA1 (patch-aa) = a11348d3003c8dccc07d061019f1f754c48ddded
-SHA1 (patch-ac) = d31277411645b5c05c049a26d80f51b937fe5faf
-SHA1 (patch-ae) = c9b9d8144bbecec3b71ec0999d8f7036d6672bca
-SHA1 (patch-af) = 47ed56d04a7e196ee67d81cf27328a1f53539505
+SHA1 (mpich2-1.3.1.tar.gz) = 6fc6723d693c381b231aebc51745b73398bd37aa
+RMD160 (mpich2-1.3.1.tar.gz) = 70ea44bab15b127921b046f1b97088ac14309e8c
+Size (mpich2-1.3.1.tar.gz) = 19421084 bytes
+SHA1 (patch-aa) = 9d7f22f9401687ccf6114b915a26ad67958d8ccd
+SHA1 (patch-ac) = b956a355ef381d759077288916c40e32b022f178
diff --git a/parallel/mpi-ch/options.mk b/parallel/mpi-ch/options.mk
new file mode 100644
index 00000000000..206f759fdb5
--- /dev/null
+++ b/parallel/mpi-ch/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2010/12/17 02:47:18 asau Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mpich
+PKG_SUPPORTED_OPTIONS=	debug mpich-mpd threads
+PKG_SUGGESTED_OPTIONS=	threads
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-g=debug	# problems
+INSTALL_UNSTRIPPED=	yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mthreads)
+CONFIGURE_ARGS+=	--with-thread-package=posix # aka pthreads
+.include "../../mk/pthread.buildlink3.mk"
+.endif
+
+# Allow coexistance of MPICH2 and musicpd by disabling MPICH2 parts:
+.if !empty(PKG_OPTIONS:Mmpich-mpd)
+CONFLICTS+=	musicpd-[0-9]*	# installs bin/mpd
+REPLACE_PYTHON+=	src/pm/mpd/*.py src/pm/mpd/test/*.py
+CONFIGURE_ARGS+=	--with-pm=hydra:mpd:gforker
+PLIST_SRC+=	PLIST.mpd
+.include "../../lang/python/application.mk"
+.endif
+
+PLIST_SRC+=	PLIST
diff --git a/parallel/mpi-ch/patches/patch-aa b/parallel/mpi-ch/patches/patch-aa
index 16a13b3ec65..c840e77f3f7 100644
--- a/parallel/mpi-ch/patches/patch-aa
+++ b/parallel/mpi-ch/patches/patch-aa
@@ -1,45 +1,57 @@
-$NetBSD: patch-aa,v 1.9 2009/12/13 18:38:11 asau Exp $
+$NetBSD: patch-aa,v 1.10 2010/12/17 02:47:18 asau Exp $
 
 Install configuration files into example directory.
 
---- src/env/Makefile.in.orig	2009-11-18 19:40:34.000000000 +0300
-+++ src/env/Makefile.in	2009-12-13 20:12:58.000000000 +0300
-@@ -19,6 +19,7 @@
+--- src/env/Makefile.in.orig	2010-11-17 19:51:55.000000000 +0300
++++ src/env/Makefile.in	2010-12-17 02:06:35.000000000 +0300
+@@ -19,6 +19,8 @@
  srcdir          = @srcdir@
  abs_srcdir      = @abs_srcdir@
  sysconfdir      = @sysconfdir@
 +datadir		= @datadir@
++exampledir	= ${datadir}/examples
  DEFS            = @DEFS@ -I. -I${srcdir}
  CPPFLAGS        = @CPPFLAGS@
  LIBS            = @LIBS@
-@@ -39,6 +40,8 @@
- INCLUDES = -I../include
- doc_sources = mpicc.txt mpif77.txt mpicxx.txt mpif90.txt mpiexec.txt
- 
-+exampledir =	$(datadir)/examples
-+
- .SUFFIXES:
- .SUFFIXES: .o .lo .c .man .html .latex .txt 
- .c.o:
-@@ -135,15 +138,15 @@
- 	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) mpich2version ${DESTDIR}${bindir}/mpich2version
- 	$(INSTALL_SCRIPT) mpicc ${DESTDIR}${bindir}/mpicc
- 	$(INSTALL_SCRIPT) parkill ${DESTDIR}${bindir}/parkill
+@@ -95,15 +97,15 @@
+ 	$(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG)  mpich2version ${DESTDIR}${bindir}/mpich2version
+ 	$(INSTALL_SCRIPT)  mpicc ${DESTDIR}${bindir}/mpicc
+ 	$(INSTALL_SCRIPT)  parkill ${DESTDIR}${bindir}/parkill
 -	if [ ! -d ${DESTDIR}${sysconfdir} ] ; then $(MKDIR_P) ${DESTDIR}${sysconfdir} ; fi
--	$(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${sysconfdir}/mpixxx_opts.conf
--	$(INSTALL_DATA) mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf
+-	$(INSTALL_DATA)  mpixxx_opts.conf ${DESTDIR}${sysconfdir}/mpixxx_opts.conf
+-	$(INSTALL_DATA)  mpicc.conf ${DESTDIR}${sysconfdir}/mpicc.conf
 +	if [ ! -d ${DESTDIR}${exampledir} ] ; then $(MKDIR_P) ${DESTDIR}${exampledir} ; fi
-+	$(INSTALL_DATA) mpixxx_opts.conf ${DESTDIR}${exampledir}/mpixxx_opts.conf
-+	$(INSTALL_DATA) mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf
- 	if [ -s mpicxx ] ; then $(INSTALL_SCRIPT) mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
- 	if [ -s mpif77 ] ; then $(INSTALL_SCRIPT) mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
- 	if [ -s mpif90 ] ; then $(INSTALL_SCRIPT) mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
--	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi
--	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi
--	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi
-+	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA) mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi
-+	if [ -s mpif77.conf ] ; then $(INSTALL_DATA) mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi
-+	if [ -s mpif90.conf ] ; then $(INSTALL_DATA) mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi
++	$(INSTALL_DATA)  mpixxx_opts.conf ${DESTDIR}${exampledir}/mpixxx_opts.conf
++	$(INSTALL_DATA)  mpicc.conf ${DESTDIR}${exampledir}/mpicc.conf
+ 	if [ -s mpicxx ] ; then $(INSTALL_SCRIPT)  mpicxx ${DESTDIR}${bindir}/mpicxx ; fi
+ 	if [ -s mpif77 ] ; then $(INSTALL_SCRIPT)  mpif77 ${DESTDIR}${bindir}/mpif77 ; fi
+ 	if [ -s mpif90 ] ; then $(INSTALL_SCRIPT)  mpif90 ${DESTDIR}${bindir}/mpif90 ; fi
+-	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA)  mpicxx.conf ${DESTDIR}${sysconfdir}/mpicxx.conf ; fi
+-	if [ -s mpif77.conf ] ; then $(INSTALL_DATA)  mpif77.conf ${DESTDIR}${sysconfdir}/mpif77.conf ; fi
+-	if [ -s mpif90.conf ] ; then $(INSTALL_DATA)  mpif90.conf ${DESTDIR}${sysconfdir}/mpif90.conf ; fi
++	if [ -s mpicxx.conf ] ; then $(INSTALL_DATA)  mpicxx.conf ${DESTDIR}${exampledir}/mpicxx.conf ; fi
++	if [ -s mpif77.conf ] ; then $(INSTALL_DATA)  mpif77.conf ${DESTDIR}${exampledir}/mpif77.conf ; fi
++	if [ -s mpif90.conf ] ; then $(INSTALL_DATA)  mpif90.conf ${DESTDIR}${exampledir}/mpif90.conf ; fi
  	${MAKE} install-postamble
  
  install-strip:
+@@ -112,14 +114,14 @@
+ 	-rm -f ${DESTDIR}${bindir}/mpich2version
+ 	-rm -f ${DESTDIR}${bindir}/mpicc
+ 	-rm -f ${DESTDIR}${bindir}/parkill
+-	-rm -f ${DESTDIR}${sysconfdir}/mpixxx_opts.conf
+-	-rm -f ${DESTDIR}${sysconfdir}/mpicc.conf
++	-rm -f ${DESTDIR}${exampledir}/mpixxx_opts.conf
++	-rm -f ${DESTDIR}${exampledir}/mpicc.conf
+ 	-rm -f ${DESTDIR}${bindir}/mpicxx
+ 	-rm -f ${DESTDIR}${bindir}/mpif77
+ 	-rm -f ${DESTDIR}${bindir}/mpif90
+-	-rm -f ${DESTDIR}${sysconfdir}/mpicxx.conf
+-	-rm -f ${DESTDIR}${sysconfdir}/mpif77.conf
+-	-rm -f ${DESTDIR}${sysconfdir}/mpif90.conf
++	-rm -f ${DESTDIR}${exampledir}/mpicxx.conf
++	-rm -f ${DESTDIR}${exampledir}/mpif77.conf
++	-rm -f ${DESTDIR}${exampledir}/mpif90.conf
+ 	${MAKE} uninstall-postamble
+ installcheck: 
+ # --------------------------------------------------------------------------
diff --git a/parallel/mpi-ch/patches/patch-ac b/parallel/mpi-ch/patches/patch-ac
index ada6322ad1b..159b71275b3 100644
--- a/parallel/mpi-ch/patches/patch-ac
+++ b/parallel/mpi-ch/patches/patch-ac
@@ -1,25 +1,10 @@
-$NetBSD: patch-ac,v 1.7 2009/12/13 18:38:11 asau Exp $
+$NetBSD: patch-ac,v 1.8 2010/12/17 02:47:18 asau Exp $
 
 Install sample configuration files in example directory.
 
---- src/mpe2/sbin/mpeinstall.in.orig	2009-10-16 03:50:22.000000000 +0400
-+++ src/mpe2/sbin/mpeinstall.in	2009-12-11 12:55:38.000000000 +0300
-@@ -40,12 +40,8 @@
- mandir=@mandir@
- # Since autoconf < 2.60 does not set @docdir@ and @htmldir@,
- # If not set, docdir=@docdir@ remains, set them accordingly.
--if [ "$docdir" = "@docdir@" ] ; then
--    docdir=${datadir}/doc/${PACKAGE}
--fi
--if [ "$htmldir" = "@htmldir@" ] ; then
--    htmldir=${docdir}
--fi
-+case "$docdir" in @docdir) docdir=${datadir}/doc/${PACKAGE} ;; esac
-+case "$htmldir" in @htmldir) htmldir=${docdir} ;; esac
- 
- # Assume PROF_LIBNAME=MPE_LIBNAME.
- PROF_LIBNAME=@MPE_LIBNAME@
-@@ -494,14 +490,16 @@
+--- src/mpe2/sbin/mpeinstall.in.orig	2009-01-31 02:56:35.000000000 +0300
++++ src/mpe2/sbin/mpeinstall.in	2009-03-22 21:29:26.000000000 +0300
+@@ -487,14 +487,16 @@
      fi
  fi
  
diff --git a/parallel/mpi-ch/patches/patch-ae b/parallel/mpi-ch/patches/patch-ae
deleted file mode 100644
index 595b4b7765a..00000000000
--- a/parallel/mpi-ch/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2009/12/13 18:38:11 asau Exp $
-
-"test ==" portability fixes.
-
---- src/mpid/ch3/channels/nemesis/configure.orig	2009-11-18 19:41:17.000000000 +0300
-+++ src/mpid/ch3/channels/nemesis/configure	2009-12-11 06:15:44.000000000 +0300
-@@ -5947,7 +5947,7 @@
- 
-     fi;
- 
--    if test "${net}" == "newmad" ; then
-+    if test "${net}" = "newmad" ; then
-        if test "${ac_cv_header_nm_public_h+set}" = set; then
-   { $as_echo "$as_me:$LINENO: checking for nm_public.h" >&5
- $as_echo_n "checking for nm_public.h... " >&6; }
diff --git a/parallel/mpi-ch/patches/patch-af b/parallel/mpi-ch/patches/patch-af
deleted file mode 100644
index 3124f19a4bb..00000000000
--- a/parallel/mpi-ch/patches/patch-af
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-af,v 1.3 2009/12/13 18:38:11 asau Exp $
-
-Disable bundled OpenPA.
-
---- examples/Makefile.in.orig	2009-11-18 19:40:35.000000000 +0300
-+++ examples/Makefile.in	2009-12-11 15:41:31.000000000 +0300
-@@ -33,6 +33,8 @@
- INCLUDES = -I../src/include -I${top_srcdir}/src/include
- LIBS   =
- 
-+LIBOPA =
-+
- EXTRA_PROGRAMS = pmandel pmandel_spawn pmandel_service pmandel_spaserv 	         pmandel_fence hellow icpi parent child srtest srvec sr 		 spawn_merge_parent spawn_merge_child1 spawn_merge_child2
- 
- .SUFFIXES:
-@@ -105,47 +107,47 @@
- all-redirect: cpi
- 
- coverage: 
--parent: parent.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+parent: parent.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o parent parent.o  ${LIBS}
--hellow: hellow.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+hellow: hellow.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o hellow hellow.o  ${LIBS}
- pmandel_spawn: pmandel_spawn.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_spawn pmandel_spawn.o  -lm \
- 	${LIBS} 
--pmandel: pmandel.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+pmandel: pmandel.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel pmandel.o  -lm ${LIBS}
--icpi: icpi.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+icpi: icpi.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o icpi icpi.o  -lm ${LIBS}
--child: child.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+child: child.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o child child.o  ${LIBS}
- spawn_merge_child2: spawn_merge_child2.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o spawn_merge_child2 \
- 	spawn_merge_child2.o  ${LIBS} 
--cpi: cpi.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+cpi: cpi.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o cpi cpi.o  -lm ${LIBS}
- pmandel_fence: pmandel_fence.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_fence pmandel_fence.o  -lm \
- 	${LIBS} 
- spawn_merge_parent: spawn_merge_parent.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o spawn_merge_parent \
- 	spawn_merge_parent.o  ${LIBS} 
- spawn_merge_child1: spawn_merge_child1.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o spawn_merge_child1 \
- 	spawn_merge_child1.o  ${LIBS} 
- pmandel_spaserv: pmandel_spaserv.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_spaserv pmandel_spaserv.o  \
- 	-lm ${LIBS} 
- pmandel_service: pmandel_service.o  \
--	 ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+	 ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o pmandel_service pmandel_service.o  \
- 	-lm ${LIBS} 
--srtest: srtest.o   ../lib/lib${MPILIBNAME}.a ../src/openpa/src/libopa.a
-+srtest: srtest.o   ../lib/lib${MPILIBNAME}.a $(LIBOPA)
- 	$(C_LINK) $(CFLAGS) $(LDFLAGS) -o srtest srtest.o  ${LIBS}
- # --------------------------------------------------------------------------
- htmldoc: