Update to OpenMPI 1.5.1

Changes in 1.5.1

- Fixes for the Oracle Studio 12.2 Fortran compiler.
- Fix SPARC and SPARCv9 atomics.  Thanks to Nicola Stange for the
  initial patch.
- Fix Libtool issues with the IBM XL compiler in 64-bit mode.
- Restore the reset of the libevent progress counter to avoid
  over-sampling the event library.
- Update memory barrier support.
- Use memmove (instead of memcpy) when necessary (e.g., source and
  destination overlap).
- Fixed ompi-top crash.
- Fix to handle Autoconf --program-transforms properly and other
  m4/configury updates.  Thanks to the GASNet project for the
  --program transforms fix.
- Allow hostfiles to specify usernames on a per-host basis.
- Update wrapper compiler scripts to search for perl during configure,
  per request from the BSD maintainers.
- Minor man page fixes.
- Added --with-libltdl option to allow building Open MPI with an
  external installation of libltdl.
- Fixed various issues with -D_FORTIFY_SOURCE=2.
- Various VT fixes and updates.


Notable changes in 1.5

- Added "knem" support: direct process-to-process copying for shared
  memory message passing.  See http://runtime.bordeaux.inria.fr/knem/
  and the README file for more details.
- Updated shared library versioning scheme and linking style of MPI
  applications.  The MPI application ABI has been broken from the
  v1.3/v1.4 series.  MPI applications compiled against any prior
  version of Open MPI will need to, at a minimum, re-link.  See the
  README file for more details.
- Added "fca" collective component, enabling MPI collective offload
  support for Voltaire switches.
- Fixed MPI one-sided operations with large target displacements.
  Thanks to Brian Price and Jed Brown for reporting the issue.
- Fixed MPI_GET_COUNT when used with large counts.  Thanks to Jed
  Brown for reporting the issue.
- Made the openib BTL safer if extremely low SRQ settings are used.
- Fixed handling of the array_of_argv parameter in the Fortran
  binding of MPI_COMM_SPAWN_MULTIPLE (** also to appear: 1.4.3).
- Fixed malloc(0) warnings in some collectives.
- Fixed a problem with the Fortran binding for
  MPI_FILE_CREATE_ERRHANDLER.  Thanks to Secretan Yves for identifying
  the issue (** also to appear: 1.4.3).
- Updates to the LSF PLM to ensure that the path is correctly passed.
  Thanks to Teng Lin for the patch (** also to appear: 1.4.3).
- Fixes for the F90 MPI_COMM_SET_ERRHANDLER and MPI_WIN_SET_ERRHANDLER
  bindings.  Thanks to Paul Kapinos for pointing out the issue
  (** also to appear: 1.4.3).
- Fixed extra_state parameter types in F90 prototypes for
  MPI_COMM_CREATE_KEYVAL, MPI_GREQUEST_START, MPI_REGISTER_DATAREP,
  MPI_TYPE_CREATE_KEYVAL, and MPI_WIN_CREATE_KEYVAL.
- Fixes for Solaris oversubscription detection.
- If the PML determines it can't reach a peer process, print a
  slightly more helpful message.  Thanks to Nick Edmonds for the
  suggestion.
- Make btl_openib_if_include/exclude function the same way
  btl_tcp_if_include/exclude works (i.e., supplying an _include list
  overrides supplying an _exclude list).
- Apply more scalable reachability algorithm on platforms with more
  than 8 TCP interfaces.
- Various assembly code updates for more modern platforms / compilers.
- Relax restrictions on using certain kinds of MPI datatypes with
  one-sided operations.  Users beware; not all MPI datatypes are valid
  for use with one-sided operations!
- Improve behavior of MPI_COMM_SPAWN with regards to --bynode.
- Various threading fixes in the openib BTL and other core pieces of
  Open MPI.
- Various help file and man pages updates.
- Various FreeBSD and NetBSD updates and fixes.  Thanks to Kevin
  Buckley and Aleksej Saushev for their work.
- Fix case where freeing communicators in MPI_FINALIZE could cause
  process failures.
- Print warnings if shared memory state files are opened on what look
  like networked filesystems.
- Update libevent to v1.4.13.
- Allow propagating signals to processes that call fork().
- Fix bug where MPI_GATHER was sometimes incorrectly examining the
  datatype on non-root processes.  Thanks to Michael Hofmann for
  investigating the issue.
- Various Microsoft Windows fixes.
- Various Catamount fixes.
- Various checkpoint / restart fixes.
- Xgrid support has been removed until it can be fixed (patches
  would be welcome).
- Added simplistic "libompitrace" contrib package.  Using the MPI
  profiling interface, it essentially prints out to stderr when select
  MPI functions are invoked.
- Update bundled VampirTrace to v5.8.2.
- Add pkg-config(1) configuration files for ompi, ompi-c, ompi-cxx,
  ompi-f77, ompi-f90.  See the README for more details.
- Removed the libopenmpi_malloc library (added in the v1.3 series)
  since it is no longer necessary
- Add several notifier plugins (generally used when Open MPI detects
  system/network administrator-worthy problems); each have their own
  MCA parameters to govern their usage.  See "ompi_info --param
  notifier <name>" for more details.
  - command to execute arbitrary commands (e.g., run a script).
  - file to send output to a file.
  - ftb to send output to the Fault Tolerant Backplane (see
    http://wiki.mcs.anl.gov/cifts/index.php/CIFTS)
  - hnp to send the output to mpirun.
  - smtp (requires libesmtp) to send an email.

15 files changed, 141 insertions, 200 deletions

diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile
index 25298e9455c..33e5bf613d1 100644
--- a/parallel/openmpi/Makefile
+++ b/parallel/openmpi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/11/24 01:56:13 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/12/16 21:00:53 asau Exp $
 
-DISTNAME=	openmpi-1.4.3
+DISTNAME=	openmpi-1.5.1
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.4/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.5/downloads/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	asau@inbox.ru
@@ -17,19 +17,31 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++ fortran77
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool.m4
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool \
+			${WRKSRC}/ompi/contrib/vt/vt/extlib/otf/libtool \
+			${WRKSRC}/ompi/contrib/vt/vt/libtool \
+			${WRKSRC}/ompi/mca/io/romio/romio/libtool
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool.m4 \
+			${WRKSRC}/opal/libltdl/m4/libtool.m4
 
-CONFIGURE_ARGS+=	--with-ft=cr	# for compatibility with OpenMPI 1.4.1 package
 CONFIGURE_ARGS+=	--disable-mpi-f90
+CONFIGURE_ARGS+=	--with-libltdl=external # use our libltdl
 CONFIGURE_ARGS+=	--with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib"
 CONFIGURE_ENV+=		ompi_cv_f77_have_INTEGERp8=no	# no "INTEGER*8"??
-BUILD_MAKE_FLAGS=	LIBLTDL=$(BUILDLINK_PREFIX.libltdl)/lib/libltdl.la # configure doesn't allow overriding it
 CONFIGURE_ARGS+=	OPAL_HAVE_LTDL_ADVISE=0
 
+USE_TOOLS+=		perl:run
+
 .include "options.mk"
 
 TEST_TARGET=	check
 
+## Just in case you'll need it...
+# USE_TOOLS+=	aclocal autoconf automake bash perl
+# REPLACE_BASH=	autogen.sh
+
+# pre-configure:	replace-interpreter
+# 	cd $(WRKSRC) && $(BASH) autogen.sh
+
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/openmpi/PLIST b/parallel/openmpi/PLIST
index 7c3894a259c..bb5774b0b58 100644
--- a/parallel/openmpi/PLIST
+++ b/parallel/openmpi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/11/24 01:56:13 asau Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/12/16 21:00:53 asau Exp $
 bin/mpiCC
 bin/mpic++
 bin/mpicc
@@ -7,24 +7,29 @@ bin/mpiexec
 bin/mpif77
 bin/mpif90
 bin/mpirun
-bin/ompi-checkpoint
 bin/ompi-clean
 bin/ompi-iof
+bin/ompi-probe
+bin/ompi-profiler
 bin/ompi-ps
-bin/ompi-restart
 bin/ompi-server
+bin/ompi-top
 bin/ompi_info
-bin/opal-checkpoint
-bin/opal-restart
 bin/opal_wrapper
-bin/orte-checkpoint
+bin/orte-bootproxy.sh
 bin/orte-clean
 bin/orte-iof
 bin/orte-ps
-bin/orte-restart
+bin/orte-top
+bin/orteCC
+bin/orte_wrapper_script
+bin/ortec++
+bin/ortecc
 bin/orted
 bin/orterun
+include/mpi-ext.h
 include/mpi.h
+include/mpi_portable_platform.h
 include/mpif-common.h
 include/mpif-config.h
 include/mpif-mpi-io.h
@@ -64,6 +69,7 @@ lib/libmca_common_sm.la
 lib/libmpi.la
 lib/libmpi_cxx.la
 lib/libmpi_f77.la
+lib/libompitrace.la
 lib/libopen-pal.la
 lib/libopen-rte.la
 lib/openmpi/libompi_dbg_msgq.la
@@ -82,18 +88,19 @@ lib/openmpi/mca_coll_self.la
 lib/openmpi/mca_coll_sm.la
 lib/openmpi/mca_coll_sync.la
 lib/openmpi/mca_coll_tuned.la
-lib/openmpi/mca_crcp_bkmrk.la
 lib/openmpi/mca_crs_none.la
-lib/openmpi/mca_crs_self.la
 lib/openmpi/mca_dpm_orte.la
 lib/openmpi/mca_errmgr_default.la
+lib/openmpi/mca_ess_cm.la
 lib/openmpi/mca_ess_env.la
 lib/openmpi/mca_ess_hnp.la
 lib/openmpi/mca_ess_singleton.la
+lib/openmpi/mca_ess_slave.la
 lib/openmpi/mca_ess_tool.la
 lib/openmpi/mca_filem_rsh.la
 lib/openmpi/mca_grpcomm_bad.la
 lib/openmpi/mca_grpcomm_basic.la
+lib/openmpi/mca_grpcomm_hier.la
 lib/openmpi/mca_io_romio.la
 lib/openmpi/mca_iof_hnp.la
 lib/openmpi/mca_iof_orted.la
@@ -102,6 +109,7 @@ lib/openmpi/mca_maffinity_first_use.la
 lib/openmpi/mca_mpool_fake.la
 lib/openmpi/mca_mpool_rdma.la
 lib/openmpi/mca_mpool_sm.la
+lib/openmpi/mca_notifier_command.la
 lib/openmpi/mca_notifier_syslog.la
 lib/openmpi/mca_odls_default.la
 lib/openmpi/mca_oob_tcp.la
@@ -109,25 +117,38 @@ lib/openmpi/mca_osc_pt2pt.la
 lib/openmpi/mca_osc_rdma.la
 lib/openmpi/mca_paffinity_posix.la
 lib/openmpi/mca_plm_rsh.la
+lib/openmpi/mca_plm_rshd.la
 lib/openmpi/mca_pml_cm.la
-lib/openmpi/mca_pml_crcpw.la
 lib/openmpi/mca_pml_csum.la
 lib/openmpi/mca_pml_ob1.la
 lib/openmpi/mca_pml_v.la
 lib/openmpi/mca_pubsub_orte.la
+lib/openmpi/mca_ras_cm.la
 lib/openmpi/mca_rcache_vma.la
 lib/openmpi/mca_rmaps_load_balance.la
 lib/openmpi/mca_rmaps_rank_file.la
+lib/openmpi/mca_rmaps_resilient.la
 lib/openmpi/mca_rmaps_round_robin.la
 lib/openmpi/mca_rmaps_seq.la
-lib/openmpi/mca_rml_ftrm.la
+lib/openmpi/mca_rmaps_topo.la
+lib/openmpi/mca_rmcast_tcp.la
+lib/openmpi/mca_rmcast_udp.la
 lib/openmpi/mca_rml_oob.la
 lib/openmpi/mca_routed_binomial.la
+lib/openmpi/mca_routed_cm.la
 lib/openmpi/mca_routed_direct.la
 lib/openmpi/mca_routed_linear.la
-lib/openmpi/mca_snapc_full.la
+lib/openmpi/mca_routed_radix.la
+lib/openmpi/mca_routed_slave.la
+lib/openmpi/mca_sysinfo_linux.la
 lib/openmpi/mca_topo_unity.la
 lib/openmpi/mca_vprotocol_pessimist.la
+lib/pkgconfig/ompi-c.pc
+lib/pkgconfig/ompi-cxx.pc
+lib/pkgconfig/ompi-f77.pc
+lib/pkgconfig/ompi-f90.pc
+lib/pkgconfig/ompi.pc
+lib/pkgconfig/orte.pc
 man/man1/mpiCC.1
 man/man1/mpic++.1
 man/man1/mpicc.1
@@ -136,21 +157,20 @@ man/man1/mpiexec.1
 man/man1/mpif77.1
 man/man1/mpif90.1
 man/man1/mpirun.1
-man/man1/ompi-checkpoint.1
 man/man1/ompi-clean.1
 man/man1/ompi-iof.1
+man/man1/ompi-probe.1
+man/man1/ompi-profiler.1
 man/man1/ompi-ps.1
-man/man1/ompi-restart.1
 man/man1/ompi-server.1
+man/man1/ompi-top.1
 man/man1/ompi_info.1
-man/man1/opal-checkpoint.1
-man/man1/opal-restart.1
 man/man1/opal_wrapper.1
-man/man1/orte-checkpoint.1
 man/man1/orte-clean.1
 man/man1/orte-iof.1
 man/man1/orte-ps.1
-man/man1/orte-restart.1
+man/man1/orte-top.1
+man/man1/orteCC.1
 man/man1/orted.1
 man/man1/orterun.1
 man/man3/MPI.3
@@ -358,6 +378,7 @@ man/man3/MPI_Query_thread.3
 man/man3/MPI_Recv.3
 man/man3/MPI_Recv_init.3
 man/man3/MPI_Reduce.3
+man/man3/MPI_Reduce_local.3
 man/man3/MPI_Reduce_scatter.3
 man/man3/MPI_Register_datarep.3
 man/man3/MPI_Request_c2f.3
@@ -465,7 +486,6 @@ man/man7/orte_filem.7
 man/man7/orte_hosts.7
 man/man7/orte_snapc.7
 share/openmpi/amca-param-sets/example.conf
-share/openmpi/amca-param-sets/ft-enable-cr
 share/openmpi/examples/openmpi-default-hostfile
 share/openmpi/examples/openmpi-mca-params.conf
 share/openmpi/examples/openmpi-totalview.tcl
@@ -476,52 +496,61 @@ share/openmpi/help-hostfile.txt
 share/openmpi/help-mca-base.txt
 share/openmpi/help-mca-bml-r2.txt
 share/openmpi/help-mca-coll-base.txt
+share/openmpi/help-mca-op-base.txt
 share/openmpi/help-mca-param.txt
 share/openmpi/help-mpi-api.txt
 share/openmpi/help-mpi-btl-base.txt
+share/openmpi/help-mpi-btl-sm.txt
 share/openmpi/help-mpi-btl-tcp.txt
+share/openmpi/help-mpi-coll-sm.txt
 share/openmpi/help-mpi-common-sm.txt
 share/openmpi/help-mpi-errors.txt
+share/openmpi/help-mpi-pml-csum.txt
+share/openmpi/help-mpi-pml-ob1.txt
 share/openmpi/help-mpi-runtime.txt
 share/openmpi/help-mpool-base.txt
 share/openmpi/help-odls-default.txt
 share/openmpi/help-ompi-crcp-base.txt
-share/openmpi/help-ompi-crcp-bkmrk.txt
 share/openmpi/help-ompi-dpm-base.txt
 share/openmpi/help-ompi-dpm-orte.txt
+share/openmpi/help-ompi-probe.txt
+share/openmpi/help-ompi-profiler.txt
 share/openmpi/help-ompi-pubsub-orte.txt
 share/openmpi/help-ompi-server.txt
 share/openmpi/help-ompi_info.txt
+share/openmpi/help-oob-tcp.txt
 share/openmpi/help-opal-carto-file.txt
-share/openmpi/help-opal-checkpoint.txt
 share/openmpi/help-opal-crs-base.txt
 share/openmpi/help-opal-crs-none.txt
-share/openmpi/help-opal-crs-self.txt
-share/openmpi/help-opal-restart.txt
 share/openmpi/help-opal-runtime.txt
 share/openmpi/help-opal-util.txt
 share/openmpi/help-opal-wrapper.txt
-share/openmpi/help-orte-checkpoint.txt
 share/openmpi/help-orte-clean.txt
 share/openmpi/help-orte-filem-base.txt
 share/openmpi/help-orte-filem-rsh.txt
 share/openmpi/help-orte-iof.txt
+share/openmpi/help-orte-notifier-command.txt
 share/openmpi/help-orte-odls-base.txt
 share/openmpi/help-orte-ps.txt
-share/openmpi/help-orte-restart.txt
 share/openmpi/help-orte-rmaps-base.txt
 share/openmpi/help-orte-rmaps-lb.txt
+share/openmpi/help-orte-rmaps-resilient.txt
 share/openmpi/help-orte-rmaps-rr.txt
 share/openmpi/help-orte-rmaps-seq.txt
+share/openmpi/help-orte-rmaps-topo.txt
+share/openmpi/help-orte-rmcast-udp.txt
 share/openmpi/help-orte-runtime.txt
 share/openmpi/help-orte-snapc-base.txt
-share/openmpi/help-orte-snapc-full.txt
+share/openmpi/help-orte-top.txt
 share/openmpi/help-orted.txt
 share/openmpi/help-orterun.txt
 share/openmpi/help-plm-base.txt
 share/openmpi/help-plm-rsh.txt
+share/openmpi/help-plm-rshd.txt
 share/openmpi/help-ras-base.txt
+share/openmpi/help-regex.txt
 share/openmpi/help-rmaps_rank_file.txt
+share/openmpi/help-rmcast-base.txt
 share/openmpi/mpiCC-wrapper-data.txt
 share/openmpi/mpic++-wrapper-data.txt
 share/openmpi/mpicc-wrapper-data.txt
@@ -529,3 +558,6 @@ share/openmpi/mpicxx-wrapper-data.txt
 share/openmpi/mpif77-wrapper-data.txt
 share/openmpi/mpif90-wrapper-data.txt
 share/openmpi/openmpi-valgrind.supp
+share/openmpi/orteCC-wrapper-data.txt
+share/openmpi/ortec++-wrapper-data.txt
+share/openmpi/ortecc-wrapper-data.txt
diff --git a/parallel/openmpi/PLIST.vt b/parallel/openmpi/PLIST.vt
index 7eb030bb44f..9952fd967f1 100644
--- a/parallel/openmpi/PLIST.vt
+++ b/parallel/openmpi/PLIST.vt
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST.vt,v 1.2 2010/01/19 00:45:58 asau Exp $
+@comment $NetBSD: PLIST.vt,v 1.3 2010/12/16 21:00:53 asau Exp $
 bin/mpiCC-vt
 bin/mpic++-vt
 bin/mpicc-vt
 bin/mpicxx-vt
 bin/mpif77-vt
 bin/mpif90-vt
-bin/opari
 bin/otfaux
 bin/otfcompress
 bin/otfconfig
@@ -13,14 +12,22 @@ bin/otfdecompress
 bin/otfdump
 bin/otfinfo
 bin/otfmerge
+bin/otfprofile
+bin/otfshrink
+bin/vtCC
+bin/vtc++
 bin/vtcc
 bin/vtcxx
 bin/vtf77
 bin/vtf90
 bin/vtfilter
 bin/vtunify
+bin/vtunify-mpi
+bin/vtwrapper
+etc/vt-java-default-filter.spec
 include/vampirtrace/OTF_CopyHandler.h
 include/vampirtrace/OTF_Definitions.h
+include/vampirtrace/OTF_Errno.h
 include/vampirtrace/OTF_File.h
 include/vampirtrace/OTF_FileManager.h
 include/vampirtrace/OTF_Filenames.h
@@ -29,24 +36,31 @@ include/vampirtrace/OTF_MasterControl.h
 include/vampirtrace/OTF_RBuffer.h
 include/vampirtrace/OTF_RStream.h
 include/vampirtrace/OTF_Reader.h
+include/vampirtrace/OTF_Version.h
 include/vampirtrace/OTF_WBuffer.h
 include/vampirtrace/OTF_WStream.h
 include/vampirtrace/OTF_Writer.h
 include/vampirtrace/OTF_inttypes.h
 include/vampirtrace/OTF_inttypes_unix.h
-include/vampirtrace/opari_omp.h
 include/vampirtrace/otf.h
-include/vampirtrace/pomp_lib.h
 include/vampirtrace/vt_user.h
 include/vampirtrace/vt_user.inc
 include/vampirtrace/vt_user_comment.h
 include/vampirtrace/vt_user_comment.inc
+include/vampirtrace/vt_user_control.h
+include/vampirtrace/vt_user_control.inc
 include/vampirtrace/vt_user_count.h
 include/vampirtrace/vt_user_count.inc
+include/vampirtrace/vt_user_marker.h
+include/vampirtrace/vt_user_marker.inc
+include/vampirtrace/vt_user_region.h
+include/vampirtrace/vt_user_region.inc
+include/vampirtrace/vt_wrap_pthread.h
 lib/libotf.la
-lib/libvt.a
-lib/libvt.fmpi.a
-lib/libvt.mpi.a
+lib/libvt-hyb.la
+lib/libvt-mpi.la
+lib/libvt-mt.la
+lib/libvt.la
 share/openmpi/mpiCC-vt-wrapper-data.txt
 share/openmpi/mpic++-vt-wrapper-data.txt
 share/openmpi/mpicc-vt-wrapper-data.txt
@@ -60,15 +74,13 @@ share/vampirtrace/doc/ChangeLog
 share/vampirtrace/doc/LICENSE
 share/vampirtrace/doc/UserManual.html
 share/vampirtrace/doc/UserManual.pdf
-share/vampirtrace/doc/opari/ChangeLog
-share/vampirtrace/doc/opari/LICENSE
-share/vampirtrace/doc/opari/Readme.html
-share/vampirtrace/doc/opari/lacsi01.pdf
-share/vampirtrace/doc/opari/opari-logo-100.gif
 share/vampirtrace/doc/otf/ChangeLog
 share/vampirtrace/doc/otf/LICENSE
 share/vampirtrace/doc/otf/otftools.pdf
 share/vampirtrace/doc/otf/specification.pdf
+share/vampirtrace/libtool
+share/vampirtrace/vtCC-wrapper-data.txt
+share/vampirtrace/vtc++-wrapper-data.txt
 share/vampirtrace/vtcc-wrapper-data.txt
 share/vampirtrace/vtcxx-wrapper-data.txt
 share/vampirtrace/vtf77-wrapper-data.txt
diff --git a/parallel/openmpi/buildlink3.mk b/parallel/openmpi/buildlink3.mk
index 0a23a2e8b51..711e4e4d6f7 100644
--- a/parallel/openmpi/buildlink3.mk
+++ b/parallel/openmpi/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/12/16 21:00:53 asau Exp $
 
 BUILDLINK_TREE+=	openmpi
 
 .if !defined(OPENMPI_BUILDLINK3_MK)
 OPENMPI_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.openmpi+=	openmpi>=1.2.6
+BUILDLINK_API_DEPENDS.openmpi+=	openmpi>=1.5.1
 BUILDLINK_PKGSRCDIR.openmpi?=	../../parallel/openmpi
 .endif # OPENMPI_BUILDLINK3_MK
 
diff --git a/parallel/openmpi/distinfo b/parallel/openmpi/distinfo
index 433ab18abee..0ed6cad71f5 100644
--- a/parallel/openmpi/distinfo
+++ b/parallel/openmpi/distinfo
@@ -1,15 +1,9 @@
-$NetBSD: distinfo,v 1.5 2010/11/24 01:57:29 asau Exp $
+$NetBSD: distinfo,v 1.6 2010/12/16 21:00:53 asau Exp $
 
-SHA1 (openmpi-1.4.3.tar.bz2) = 9d24b6969d73605904855eb32d40d6b07e231932
-RMD160 (openmpi-1.4.3.tar.bz2) = 087532de57244c03941421162caa9e5537b4eba1
-Size (openmpi-1.4.3.tar.bz2) = 6626909 bytes
-SHA1 (patch-aa) = dfc2eb59ea592823d93a7ae3e223e703450201ad
-SHA1 (patch-ab) = c4be561af983b38803ba1f76a4ff5a6646072c3a
-SHA1 (patch-ac) = 2eb37bf842278c712561e30457d7e00889d12dcd
-SHA1 (patch-ad) = ee74acac5c7a7b022ee9a03957f8f3d71c2579fd
-SHA1 (patch-ae) = a4848899dcd0413caa1c99832477a4bd86b51112
-SHA1 (patch-af) = 812e623c39235098565762c098a40c1cb4f51f23
-SHA1 (patch-ag) = fc29742c423d2376893d4d5c3da7a0514f311262
-SHA1 (patch-ai) = e341eefb09df978cf1d43c2176f5f8c6d09f703e
-SHA1 (patch-aj) = 4521e29de16a6cd5bf1a9ea7677b51cd0e6eb86c
-SHA1 (patch-ak) = d9a10360eec6dab95e08d4ac0a4d7da603ac4737
+SHA1 (openmpi-1.5.1.tar.bz2) = fe21acc211fe60e30dc6bef1c83a70c34e093998
+RMD160 (openmpi-1.5.1.tar.bz2) = 25b5b6e68c28eb406bee148d65908f876e7bd35b
+Size (openmpi-1.5.1.tar.bz2) = 7410701 bytes
+SHA1 (patch-aa) = 90f74e14eb686cd68bf29ea28cfb9818984f6408
+SHA1 (patch-ai) = 0b03f80d15b176e10d804132b20cff835aa11566
+SHA1 (patch-aj) = dc85e6c9eb6db0eb40bb896a11c223afeda63c2f
+SHA1 (patch-ak) = f6ea4220d51dd0c84ac2067d695c265f00904a0f
diff --git a/parallel/openmpi/patches/patch-aa b/parallel/openmpi/patches/patch-aa
index 10bcc72d104..3852da2142c 100644
--- a/parallel/openmpi/patches/patch-aa
+++ b/parallel/openmpi/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+$NetBSD: patch-aa,v 1.2 2010/12/16 21:00:54 asau Exp $
 
 Missing RPATH support.
 
---- opal/tools/wrappers/opal_wrapper.c.orig	2008-08-25 23:16:48.000000000 +0400
-+++ opal/tools/wrappers/opal_wrapper.c	2008-09-04 11:41:17.000000000 +0400
-@@ -57,6 +57,7 @@
+--- opal/tools/wrappers/opal_wrapper.c.orig	2009-11-04 17:57:36.000000000 +0300
++++ opal/tools/wrappers/opal_wrapper.c	2010-01-12 20:48:26.000000000 +0300
+@@ -58,6 +58,7 @@
  #if !defined(__WINDOWS__)
  #define OPAL_INCLUDE_FLAG  "-I"
  #define OPAL_LIBDIR_FLAG   "-L"
@@ -12,7 +12,7 @@ Missing RPATH support.
  #else
  #define OPAL_INCLUDE_FLAG  "/I"
  #define OPAL_LIBDIR_FLAG   "/LIBPATH:"
-@@ -301,6 +302,8 @@
+@@ -357,6 +358,8 @@
  #else
              asprintf(&line, OPAL_LIBDIR_FLAG"%s", 
                       options_data[parse_options_idx].path_libdir);
diff --git a/parallel/openmpi/patches/patch-ab b/parallel/openmpi/patches/patch-ab
deleted file mode 100644
index 9d59443edb7..00000000000
--- a/parallel/openmpi/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
-
-Force our libltdl.
-
---- opal/Makefile.in.orig	2009-01-19 20:24:00.000000000 +0300
-+++ opal/Makefile.in	2009-02-05 13:23:01.000000000 +0300
-@@ -568,7 +568,7 @@
- LEXLIB = @LEXLIB@
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LIBLTDL = @LIBLTDL@
--LIBLTDL_SUBDIR = @LIBLTDL_SUBDIR@
-+LIBLTDL_SUBDIR =
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/parallel/openmpi/patches/patch-ac b/parallel/openmpi/patches/patch-ac
deleted file mode 100644
index 4e71ac06953..00000000000
--- a/parallel/openmpi/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
-
-Force our libltdl.
-
---- configure.orig	2009-01-19 20:23:17.000000000 +0300
-+++ configure	2009-02-06 01:59:45.000000000 +0300
-@@ -163871,9 +163871,10 @@
-   "") enable_ltdl_convenience=yes
-       ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
- esac
--LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
-+#LIBLTDL='${top_build_prefix}'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
-+#LIBLTDL=libltdl.la
- LTDLDEPS=$LIBLTDL
--LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
-+#LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
- 
- 
- 
-@@ -180176,7 +180177,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <opal/libltdl/ltdl.h>
-+#include <ltdl.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
diff --git a/parallel/openmpi/patches/patch-ad b/parallel/openmpi/patches/patch-ad
deleted file mode 100644
index 068f949ded0..00000000000
--- a/parallel/openmpi/patches/patch-ad
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
-
-Force our libltdl.
-
---- opal/mca/base/mca_base_component_find.c.orig	2009-10-21 04:05:57.000000000 +0400
-+++ opal/mca/base/mca_base_component_find.c	2009-10-27 11:46:51.000000000 +0300
-@@ -41,11 +41,7 @@
- #endif
- 
- #if OMPI_WANT_LIBLTDL
--  #ifndef __WINDOWS__ 
--    #include "opal/libltdl/ltdl.h" 
--  #else 
-     #include "ltdl.h" 
--  #endif 
- #endif
- 
- #include "opal/util/output.h"
diff --git a/parallel/openmpi/patches/patch-ae b/parallel/openmpi/patches/patch-ae
deleted file mode 100644
index 4067c5e7da3..00000000000
--- a/parallel/openmpi/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
-
-Force our libltdl.
-
---- opal/mca/base/mca_base_component_repository.c.orig	2009-10-21 04:05:57.000000000 +0400
-+++ opal/mca/base/mca_base_component_repository.c	2009-10-27 11:47:50.000000000 +0300
-@@ -27,11 +27,7 @@
- #include <stdio.h>
- 
- #if OMPI_WANT_LIBLTDL
--  #ifndef __WINDOWS__ 
--    #include "opal/libltdl/ltdl.h" 
--  #else 
-     #include "ltdl.h" 
--  #endif 
- #endif
- 
- #include "opal/class/opal_list.h"
diff --git a/parallel/openmpi/patches/patch-af b/parallel/openmpi/patches/patch-af
deleted file mode 100644
index 4085637c9de..00000000000
--- a/parallel/openmpi/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
-
-Force our libltdl.
-
---- test/support/components.h.orig	2008-11-04 23:56:21.000000000 +0300
-+++ test/support/components.h	2009-02-15 04:08:24.000000000 +0300
-@@ -20,7 +20,7 @@
- #ifndef OMPI_SUPPORT_COMPONENTS_H
- #define OMPI_SUPPORT_COMPONENTS_H
- 
--#include "opal/libltdl/ltdl.h"
-+#include "ltdl.h"
- #include "opal/mca/mca.h"
- 
- #if defined(c_plusplus) || defined(__cplusplus)
diff --git a/parallel/openmpi/patches/patch-ag b/parallel/openmpi/patches/patch-ag
deleted file mode 100644
index dd39ea7a0d0..00000000000
--- a/parallel/openmpi/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
-
-Force our libltdl.
-
---- test/support/components.c.orig	2008-11-04 23:56:21.000000000 +0300
-+++ test/support/components.c	2009-02-15 04:08:30.000000000 +0300
-@@ -23,7 +23,7 @@
- #include "ompi/constants.h"
- #include "opal/constants.h"
- #include "opal/mca/mca.h"
--#include "opal/libltdl/ltdl.h"
-+#include "ltdl.h"
- 
- #include "components.h"
- 
diff --git a/parallel/openmpi/patches/patch-ai b/parallel/openmpi/patches/patch-ai
index b56ec992f00..72158838a8a 100644
--- a/parallel/openmpi/patches/patch-ai
+++ b/parallel/openmpi/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+$NetBSD: patch-ai,v 1.2 2010/12/16 21:00:54 asau Exp $
 
 Install configuration files into example directory.
 
---- orte/etc/Makefile.in.orig	2009-11-11 17:04:47.000000000 +0300
-+++ orte/etc/Makefile.in	2009-12-04 05:00:13.000000000 +0300
-@@ -899,6 +899,7 @@
+--- orte/etc/Makefile.in.orig	2009-11-04 18:01:21.000000000 +0300
++++ orte/etc/Makefile.in	2010-01-12 20:48:26.000000000 +0300
+@@ -1018,6 +1018,7 @@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
  sysconfdir = @sysconfdir@
@@ -12,7 +12,7 @@ Install configuration files into example directory.
  target_alias = @target_alias@
  timer_aix_LIBS = @timer_aix_LIBS@
  top_build_prefix = @top_build_prefix@
-@@ -1086,19 +1087,19 @@
+@@ -1223,19 +1224,19 @@
  # details why the mkdir is in install-data-local.
  
  install-data-local:
diff --git a/parallel/openmpi/patches/patch-aj b/parallel/openmpi/patches/patch-aj
index 2898bbd4d90..a8bcab1020e 100644
--- a/parallel/openmpi/patches/patch-aj
+++ b/parallel/openmpi/patches/patch-aj
@@ -1,18 +1,18 @@
-$NetBSD: patch-aj,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+$NetBSD: patch-aj,v 1.2 2010/12/16 21:00:54 asau Exp $
 
 Install configuration files into example directory.
 
---- opal/etc/Makefile.in.orig	2009-11-11 17:04:16.000000000 +0300
-+++ opal/etc/Makefile.in	2009-12-04 04:33:04.000000000 +0300
-@@ -36,6 +36,7 @@
+--- opal/etc/Makefile.in.orig	2010-03-31 05:34:56.000000000 +0400
++++ opal/etc/Makefile.in	2010-03-31 20:54:20.000000000 +0400
+@@ -35,6 +35,7 @@
+ #
+ VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
 +exampledir = $(pkgdatadir)/examples
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -1085,24 +1086,24 @@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -1240,24 +1241,24 @@
  # details why the mkdir is in install-data-local.
  
  install-data-local:
diff --git a/parallel/openmpi/patches/patch-ak b/parallel/openmpi/patches/patch-ak
index 2e39bb51c05..fceea66decb 100644
--- a/parallel/openmpi/patches/patch-ak
+++ b/parallel/openmpi/patches/patch-ak
@@ -1,18 +1,18 @@
-$NetBSD: patch-ak,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+$NetBSD: patch-ak,v 1.2 2010/12/16 21:00:54 asau Exp $
 
 Install configuration files into example directory.
 
---- ompi/etc/Makefile.in.orig	2009-12-04 04:54:39.000000000 +0300
-+++ ompi/etc/Makefile.in	2009-12-04 05:02:08.000000000 +0300
-@@ -36,6 +36,7 @@
+--- ompi/etc/Makefile.in.orig	2010-03-31 05:34:04.000000000 +0400
++++ ompi/etc/Makefile.in	2010-03-31 20:55:04.000000000 +0400
+@@ -35,6 +35,7 @@
+ #
+ VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
 +exampledir = $(pkgdatadir)/examples
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -1086,19 +1087,19 @@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+@@ -1241,19 +1242,19 @@
  # details why the mkdir is in install-data-local.
  
  install-data-local: