Update to OpenMPI 1.4.2

Changes in v1.4.2 as compared to v1.4.1:

- Fixed problem when running in heterogeneous environments.
- Update LSF support to ensure that the path is passed correctly.
- Fixed some miscellaneous oversubscription detection bugs.
- IBM re-licensed its LoadLeveler code to be BSD-compliant.
- Various fixes for multithreading deadlocks, race conditions, and
  other nefarious things.
- Fixed ROMIO's handling of "nearly" contiguous issues (e.g., with
  non-zero true_lb).
- Bunches of Windows build fixes.
- Now allow the graceful failover from MTLs to BTLs if no MTLs can
  initialize successfully.
- Added "clobber" information to various atomic operations, fixing
  erroneous behavior in some newer versions of the GNU compiler suite.
- Update various iWARP and InfiniBand device specifications in the
  OpenFabrics .ini support file.
- Fix the use of hostfiles when a username is supplied.
- Various fixes for rankfile support.
- Updated the internal version of VampirTrace to 5.4.12.
- Fixed OS X TCP wireup issues having to do with IPv4/IPv6 confusion
  (see https://svn.open-mpi.org/trac/ompi/changeset/22788 for more
  details).
- Fixed some problems in processor affinity support, including when
  there are "holes" in the processor namespace (e.g., offline
  processors).
- Ensure that Open MPI's "session directory" (usually located in /tmp)
  is cleaned up after process termination.
- Fixed some problems with the collective "hierarch" implementation
  that could occur in some obscure conditions.
- Various MPI_REQUEST_NULL, API parameter checking, and attribute
  error handling fixes.
- Fix case where MPI_GATHER erroneously used datatypes on non-root nodes.
- Patched ROMIO support for PVFS2 > v2.7 (patch taken from MPICH2
  version of ROMIO).
- Fixed "mpirun --report-bindings" behavior when used with
  mpi_paffinity_alone=1.  Also fixed mpi_paffinity_alone=1 behavior
  with non-MPI applications.
- Ensure that all OpenFabrics devices have compatible receive_queues
  specifications before allowing them to communicate.  See the lengthy
  comment in https://svn.open-mpi.org/trac/ompi/changeset/22592 for details.
- Fix some issues with checkpoint/restart.
- Improve the pre-MPI_INIT/post-MPI_FINALIZE error messages.
- Ensure that loopback addresses are never advertised to peer
  processes for RDMA/OpenFabrics support.
- Fixed a CSUM PML false positive.
- Various fixes for Catamount support.
- Minor update to wrapper compilers in how user-specific argv is
  ordered on the final command line.  Thanks to Jed Brown for the
  suggestions.

4 files changed, 31 insertions, 8 deletions

diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile
index be7c8825755..1e639807955 100644
--- a/parallel/openmpi/Makefile
+++ b/parallel/openmpi/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2010/01/19 00:45:58 asau Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/14 20:12:58 asau Exp $
 
-DISTNAME=	openmpi-1.4.1
+DISTNAME=	openmpi-1.4.2
 CATEGORIES=	parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.4/downloads/
 EXTRACT_SUFX=	.tar.bz2
@@ -20,6 +20,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 SHLIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool.m4
 
+CONFIGURE_ARGS+=	--with-ft=cr	# for compatibility with OpenMPI 1.4.1 package
 CONFIGURE_ARGS+=	--disable-mpi-f90
 CONFIGURE_ARGS+=	--with-wrapper-ldflags="-L${PREFIX}/lib ${LINKER_RPATH_FLAG}${PREFIX}/lib"
 CONFIGURE_ENV+=		ompi_cv_f77_have_INTEGERp8=no	# no "INTEGER*8"??
diff --git a/parallel/openmpi/PLIST b/parallel/openmpi/PLIST
index e849d8d03c4..7c3c4ebce82 100644
--- a/parallel/openmpi/PLIST
+++ b/parallel/openmpi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/19 00:45:58 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/05/14 20:12:58 asau Exp $
 bin/mpiCC
 bin/mpic++
 bin/mpicc
@@ -14,10 +14,14 @@ bin/ompi-ps
 bin/ompi-restart
 bin/ompi-server
 bin/ompi_info
+bin/opal-checkpoint
+bin/opal-restart
 bin/opal_wrapper
+bin/orte-checkpoint
 bin/orte-clean
 bin/orte-iof
 bin/orte-ps
+bin/orte-restart
 bin/orted
 bin/orterun
 include/mpi.h
@@ -78,7 +82,9 @@ 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_env.la
@@ -104,6 +110,7 @@ lib/openmpi/mca_osc_rdma.la
 lib/openmpi/mca_paffinity_posix.la
 lib/openmpi/mca_plm_rsh.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
@@ -113,10 +120,12 @@ lib/openmpi/mca_rmaps_load_balance.la
 lib/openmpi/mca_rmaps_rank_file.la
 lib/openmpi/mca_rmaps_round_robin.la
 lib/openmpi/mca_rmaps_seq.la
+lib/openmpi/mca_rml_ftrm.la
 lib/openmpi/mca_rml_oob.la
 lib/openmpi/mca_routed_binomial.la
 lib/openmpi/mca_routed_direct.la
 lib/openmpi/mca_routed_linear.la
+lib/openmpi/mca_snapc_full.la
 lib/openmpi/mca_topo_unity.la
 lib/openmpi/mca_vprotocol_pessimist.la
 man/man1/mpiCC.1
@@ -134,10 +143,14 @@ man/man1/ompi-ps.1
 man/man1/ompi-restart.1
 man/man1/ompi-server.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/orted.1
 man/man1/orterun.1
 man/man3/MPI.3
@@ -452,6 +465,7 @@ 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
@@ -471,29 +485,36 @@ 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-pubsub-orte.txt
 share/openmpi/help-ompi-server.txt
 share/openmpi/help-ompi_info.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-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-rr.txt
 share/openmpi/help-orte-rmaps-seq.txt
 share/openmpi/help-orte-runtime.txt
 share/openmpi/help-orte-snapc-base.txt
+share/openmpi/help-orte-snapc-full.txt
 share/openmpi/help-orted.txt
 share/openmpi/help-orterun.txt
 share/openmpi/help-plm-base.txt
diff --git a/parallel/openmpi/distinfo b/parallel/openmpi/distinfo
index 1d08a3dc82d..ff238b9fb5a 100644
--- a/parallel/openmpi/distinfo
+++ b/parallel/openmpi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2010/01/19 00:45:58 asau Exp $
+$NetBSD: distinfo,v 1.3 2010/05/14 20:12:58 asau Exp $
 
-SHA1 (openmpi-1.4.1.tar.bz2) = c5107c03a9fc738dfb4f309b470d052becfdde19
-RMD160 (openmpi-1.4.1.tar.bz2) = c6fd5f0871eb5f963fe58270f5340a2629f5fd68
-Size (openmpi-1.4.1.tar.bz2) = 6571835 bytes
+SHA1 (openmpi-1.4.2.tar.bz2) = 3e85092433d0e399cc7a51c018f9d13562f78b80
+RMD160 (openmpi-1.4.2.tar.bz2) = 2c9fbcc8f77e7fa28e2bd062875d484548cc0b79
+Size (openmpi-1.4.2.tar.bz2) = 6630550 bytes
 SHA1 (patch-aa) = dfc2eb59ea592823d93a7ae3e223e703450201ad
 SHA1 (patch-ab) = c4be561af983b38803ba1f76a4ff5a6646072c3a
 SHA1 (patch-ac) = 2eb37bf842278c712561e30457d7e00889d12dcd
diff --git a/parallel/openmpi/options.mk b/parallel/openmpi/options.mk
index 3b72308c166..d94c48e0895 100644
--- a/parallel/openmpi/options.mk
+++ b/parallel/openmpi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/12/12 23:30:01 asau Exp $
+# $NetBSD: options.mk,v 1.2 2010/05/14 20:12:58 asau Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openmpi
 PKG_SUPPORTED_OPTIONS=	debug openmpi-vampirtrace
@@ -14,6 +14,7 @@ CONFIGURE_ARGS+=	--enable-debug
 .if !empty(PKG_OPTIONS:Mopenmpi-vampirtrace)
 CONFLICTS+=	libotf-[0-9]*
 PLIST_SRC+=	PLIST.vt
+.include "../../graphics/freetype2/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--enable-contrib-no-build=vt
 .endif