Upgrade to OpenMPI 1.3.3.

Remove the option to skip fortran support.  Some fortran files are
unconditionally installed and many if not most users will want to
support fortran numerical codes.

4 files changed, 356 insertions, 270 deletions

diff --git a/net/openmpi/Makefile b/net/openmpi/Makefile
index 03c33c83f7b5..23cb07a880c6 100644
--- a/net/openmpi/Makefile
+++ b/net/openmpi/Makefile
@@ -9,7 +9,7 @@
 #  - etc/*.sample support
 
 PORTNAME=	openmpi
-DISTVERSION=	1.3
+DISTVERSION=	1.3.3
 CATEGORIES=	net parallel
 MASTER_SITES=	http://www.open-mpi.org/software/ompi/v1.3/downloads/
 
@@ -38,8 +38,7 @@ USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib \
 MANPREFIX=	${PREFIX}/${MPIDIR}
 .include "${.CURDIR}/Makefile.man"
 
-OPTIONS=	FORTRAN "Enable Fortran support" on \
-		TORQUE "Enable Torque support" off \
+OPTIONS=	TORQUE "Enable Torque support" off \
 		SGE "Enable SGE support" off
 
 .include <bsd.port.pre.mk>
@@ -48,17 +47,11 @@ OPTIONS=	FORTRAN "Enable Fortran support" on \
 BROKEN=		Does not compile on sparc64
 .endif
 
-.if defined(WITH_FORTRAN)
 USE_FORTRAN=	yes
-PLIST_SUB+=	FORTRAN=""
-.else
-CONFIGURE_ARGS+=	--disable-mpi-f77 --disable-mpi-f90
-PLIST_SUB+=	FORTRAN="@comment "
-.endif
 
 .if defined(WITH_SGE)
-SGE_BASE?=      sge
-SGE_ROOT=       ${LOCALBASE}/${SGE_BASE}
+SGE_BASE?=	sge
+SGE_ROOT=	${LOCALBASE}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 RUN_DEPENDS+=	${SGE_ROOT}/fbsd-${ARCH}/qrsh:${PORTSDIR}/sysutils/sge62
 CONFIGURE_ARGS+=	--with-sge
@@ -90,17 +83,13 @@ CONFIGURE_ARGS+=	--without-tm
 # XXX: we should generate MLINKS programaticaly, but it would take    #
 # some effort and there's only one entry at this time.                #
 #######################################################################
-build-plist: Makefile
+build-plist:
 	${RM} -f ${PLIST}
 	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type f -print | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' \
-		-e 's|^\(.*f77.*\)|%%FORTRAN%%\1|' \
-		-e 's|^\(.*f90.*\)|%%FORTRAN%%\1|' | \
+	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${PREFIX}/${MPIDIR} -name man -prune -o -type l -print | \
-	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' \
-		-e 's|^\(.*f77.*\)|%%FORTRAN%%\1|' \
-		-e 's|^\(.*f90.*\)|%%FORTRAN%%\1|' | \
+	    ${SED} -e 's|${PREFIX}/${MPIDIR}|%%MPIDIR%%|' | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${PREFIX}/${MPIDIR} -type d | \
 	    ${EGREP} -v "${PREFIX}/${MPIDIR}$$" | \
diff --git a/net/openmpi/Makefile.man b/net/openmpi/Makefile.man
index 728ceb947580..f1ea0c51318c 100644
--- a/net/openmpi/Makefile.man
+++ b/net/openmpi/Makefile.man
@@ -2,331 +2,334 @@
 # See build-plist target in Makefile.
 #
 MLINKS=mpic++.1 mpiCC.1
+MAN7+=orte_snapc.7
 MAN7+=opal_crs.7
 MAN7+=orte_filem.7
-MAN7+=orte_snapc.7
-MAN7+=orte_hosts.7
 MAN7+=ompi_crcp.7
-MAN1+=opal_wrapper.1
+MAN7+=orte_hosts.7
 MAN1+=orte-clean.1
-MAN1+=orte-iof.1
-MAN1+=orte-ps.1
-MAN1+=orted.1
-MAN1+=orterun.1
 MAN1+=ompi_info.1
-MAN1+=mpicc.1
+MAN1+=ompi-server.1
+MAN1+=orted.1
 MAN1+=mpic++.1
 MAN1+=mpicxx.1
 MAN1+=mpif77.1
 MAN1+=mpif90.1
 MAN1+=mpirun.1
 MAN1+=mpiexec.1
+MAN1+=ompi-iof.1
 MAN1+=ompi-ps.1
+MAN1+=mpicc.1
+MAN1+=orte-iof.1
+MAN1+=orte-ps.1
+MAN1+=orterun.1
 MAN1+=ompi-clean.1
-MAN1+=ompi-server.1
+MAN1+=ompi-restart.1
+MAN1+=opal_wrapper.1
+MAN1+=ompi-checkpoint.1
 MAN3+=MPI.3
-MAN3+=MPI_Abort.3
-MAN3+=MPI_Accumulate.3
-MAN3+=MPI_Add_error_class.3
-MAN3+=MPI_Add_error_code.3
-MAN3+=MPI_Add_error_string.3
+MAN3+=MPI_Ibsend.3
+MAN3+=MPI_Alltoallw.3
+MAN3+=MPI_Comm_free.3
 MAN3+=MPI_Address.3
-MAN3+=MPI_Allgather.3
 MAN3+=MPI_Allgatherv.3
-MAN3+=MPI_Alloc_mem.3
 MAN3+=MPI_Allreduce.3
+MAN3+=MPI_Cancel.3
+MAN3+=MPI_Add_error_class.3
 MAN3+=MPI_Alltoall.3
-MAN3+=MPI_Alltoallv.3
-MAN3+=MPI_Alltoallw.3
-MAN3+=MPI_Attr_delete.3
-MAN3+=MPI_Attr_get.3
-MAN3+=MPI_Attr_put.3
-MAN3+=MPI_Barrier.3
+MAN3+=MPI_Buffer_detach.3
 MAN3+=MPI_Bcast.3
 MAN3+=MPI_Bsend.3
-MAN3+=MPI_Bsend_init.3
+MAN3+=MPI_Issend.3
+MAN3+=MPI_Accumulate.3
 MAN3+=MPI_Buffer_attach.3
-MAN3+=MPI_Buffer_detach.3
-MAN3+=MPI_Cancel.3
+MAN3+=MPI_Barrier.3
+MAN3+=MPI_Cart_sub.3
+MAN3+=MPI_Group_f2c.3
+MAN3+=MPI_Group_free.3
+MAN3+=MPI_File_read.3
+MAN3+=MPI_Comm_dup.3
+MAN3+=MPI_Bsend_init.3
 MAN3+=MPI_Cart_coords.3
 MAN3+=MPI_Cart_create.3
-MAN3+=MPI_Cartdim_get.3
-MAN3+=MPI_Cart_get.3
-MAN3+=MPI_Cart_map.3
-MAN3+=MPI_Cart_rank.3
-MAN3+=MPI_Cart_shift.3
-MAN3+=MPI_Cart_sub.3
+MAN3+=MPI_Comm_compare.3
+MAN3+=MPI_Comm_c2f.3
+MAN3+=MPI_Win_get_attr.3
 MAN3+=MPI_Close_port.3
 MAN3+=MPI_Comm_accept.3
-MAN3+=MPI_Comm_c2f.3
-MAN3+=MPI_Comm_call_errhandler.3
-MAN3+=MPI_Comm_compare.3
-MAN3+=MPI_Comm_connect.3
-MAN3+=MPI_Comm_create.3
-MAN3+=MPI_Comm_create_errhandler.3
-MAN3+=MPI_Comm_create_keyval.3
-MAN3+=MPI_Comm_delete_attr.3
-MAN3+=MPI_Comm_disconnect.3
-MAN3+=MPI_Comm_dup.3
+MAN3+=MPI_Attr_get.3
+MAN3+=MPI_File_get_atomicity.3
+MAN3+=MPI_Get_version.3
+MAN3+=MPI_Alloc_mem.3
 MAN3+=MPI_Comm_f2c.3
-MAN3+=MPI_Comm_free.3
-MAN3+=MPI_Comm_free_keyval.3
-MAN3+=MPI_Comm_get_attr.3
-MAN3+=MPI_Comm_get_errhandler.3
-MAN3+=MPI_Comm_get_name.3
-MAN3+=MPI_Comm_get_parent.3
+MAN3+=MPI_File_call_errhandler.3
+MAN3+=MPI_File_get_size.3
+MAN3+=MPI_File_close.3
+MAN3+=MPI_Cartdim_get.3
+MAN3+=MPI_File_f2c.3
+MAN3+=MPI_Comm_set_attr.3
 MAN3+=MPI_Comm_group.3
+MAN3+=MPI_Comm_spawn_multiple.3
+MAN3+=MPI_Win_unlock.3
 MAN3+=MPI_Comm_join.3
-MAN3+=MPI_Comm_rank.3
-MAN3+=MPI_Comm_remote_group.3
-MAN3+=MPI_Comm_remote_size.3
-MAN3+=MPI_Comm_set_attr.3
-MAN3+=MPI_Comm_set_errhandler.3
-MAN3+=MPI_Comm_set_name.3
-MAN3+=MPI_Comm_size.3
+MAN3+=MPI_Get_address.3
+MAN3+=MPI_File_get_type_extent.3
+MAN3+=MPI_Error_string.3
+MAN3+=MPI_Cart_rank.3
+MAN3+=MPI_Add_error_string.3
+MAN3+=MPI_Win_wait.3
 MAN3+=MPI_Comm_spawn.3
-MAN3+=MPI_Comm_spawn_multiple.3
-MAN3+=MPI_Comm_split.3
-MAN3+=MPI_Comm_test_inter.3
-MAN3+=MPI_Dims_create.3
-MAN3+=MPI_Errhandler_create.3
-MAN3+=MPI_Errhandler_free.3
+MAN3+=MPI_Exscan.3
+MAN3+=MPI_File_read_ordered_begin.3
+MAN3+=MPI_Waitsome.3
+MAN3+=MPI_File_iread.3
 MAN3+=MPI_Errhandler_get.3
 MAN3+=MPI_Errhandler_set.3
 MAN3+=MPI_Error_class.3
-MAN3+=MPI_Error_string.3
-MAN3+=MPI_Exscan.3
 MAN3+=MPI_File_c2f.3
-MAN3+=MPI_File_call_errhandler.3
-MAN3+=MPI_File_close.3
-MAN3+=MPI_File_create_errhandler.3
-MAN3+=MPI_File_delete.3
-MAN3+=MPI_File_f2c.3
+MAN3+=MPI_Comm_test_inter.3
+MAN3+=MPI_Errhandler_create.3
+MAN3+=MPI_Errhandler_free.3
 MAN3+=MPI_File_get_amode.3
-MAN3+=MPI_File_get_atomicity.3
+MAN3+=MPI_Group_compare.3
+MAN3+=MPI_Comm_get_attr.3
+MAN3+=MPI_Comm_rank.3
+MAN3+=MPI_Comm_size.3
+MAN3+=MPI_Comm_get_name.3
 MAN3+=MPI_File_get_byte_offset.3
 MAN3+=MPI_File_get_errhandler.3
 MAN3+=MPI_File_get_group.3
 MAN3+=MPI_File_get_info.3
-MAN3+=MPI_File_get_position.3
-MAN3+=MPI_File_get_position_shared.3
-MAN3+=MPI_File_get_size.3
 MAN3+=MPI_File_get_view.3
-MAN3+=MPI_File_get_type_extent.3
-MAN3+=MPI_File_iread.3
-MAN3+=MPI_File_iread_at.3
-MAN3+=MPI_File_iread_shared.3
-MAN3+=MPI_File_iwrite.3
+MAN3+=MPI_Graph_create.3
+MAN3+=MPI_Comm_create.3
+MAN3+=MPI_Comm_free_keyval.3
 MAN3+=MPI_File_iwrite_at.3
-MAN3+=MPI_File_iwrite_shared.3
-MAN3+=MPI_File_open.3
-MAN3+=MPI_File_preallocate.3
-MAN3+=MPI_File_read.3
-MAN3+=MPI_File_read_all.3
-MAN3+=MPI_File_read_all_begin.3
-MAN3+=MPI_File_read_all_end.3
 MAN3+=MPI_File_read_at.3
-MAN3+=MPI_File_read_at_all.3
-MAN3+=MPI_File_read_at_all_begin.3
-MAN3+=MPI_File_read_at_all_end.3
-MAN3+=MPI_File_read_ordered.3
-MAN3+=MPI_File_read_ordered_begin.3
-MAN3+=MPI_File_read_ordered_end.3
-MAN3+=MPI_File_read_shared.3
+MAN3+=MPI_Comm_set_errhandler.3
+MAN3+=MPI_Comm_connect.3
+MAN3+=MPI_Add_error_code.3
+MAN3+=MPI_Dims_create.3
+MAN3+=MPI_File_sync.3
 MAN3+=MPI_File_seek.3
-MAN3+=MPI_File_seek_shared.3
-MAN3+=MPI_File_set_atomicity.3
-MAN3+=MPI_File_set_errhandler.3
-MAN3+=MPI_File_set_info.3
+MAN3+=MPI_File_read_all.3
+MAN3+=MPI_File_read_at_all_end.3
+MAN3+=MPI_Is_thread_main.3
+MAN3+=MPI_File_write_all_end.3
+MAN3+=MPI_File_write_ordered.3
+MAN3+=MPI_Get_processor_name.3
+MAN3+=MPI_Graph_neighbors.3
+MAN3+=MPI_Comm_set_name.3
+MAN3+=MPI_Win_free_keyval.3
+MAN3+=MPI_File_iwrite.3
+MAN3+=MPI_File_read_at_all_begin.3
+MAN3+=MPI_Type_hvector.3
+MAN3+=MPI_File_write_at_all_end.3
+MAN3+=MPI_Pack_external.3
+MAN3+=MPI_Graph_map.3
+MAN3+=MPI_Waitany.3
+MAN3+=MPI_Free_mem.3
 MAN3+=MPI_File_set_size.3
 MAN3+=MPI_File_set_view.3
-MAN3+=MPI_File_sync.3
+MAN3+=MPI_File_iread_at.3
 MAN3+=MPI_File_write.3
 MAN3+=MPI_File_write_all.3
-MAN3+=MPI_File_write_all_begin.3
-MAN3+=MPI_File_write_all_end.3
-MAN3+=MPI_File_write_at.3
-MAN3+=MPI_File_write_at_all.3
-MAN3+=MPI_File_write_at_all_begin.3
-MAN3+=MPI_File_write_at_all_end.3
-MAN3+=MPI_File_write_ordered.3
+MAN3+=MPI_File_iread_shared.3
+MAN3+=MPI_File_read_ordered_end.3
+MAN3+=MPI_Win_create_errhandler.3
+MAN3+=MPI_File_set_errhandler.3
+MAN3+=MPI_File_set_atomicity.3
+MAN3+=MPI_Request_c2f.3
+MAN3+=MPI_File_read_at_all.3
+MAN3+=MPI_Group_range_excl.3
+MAN3+=MPI_Get_count.3
+MAN3+=MPI_Get_elements.3
 MAN3+=MPI_File_write_ordered_begin.3
-MAN3+=MPI_File_write_ordered_end.3
+MAN3+=MPI_Cart_map.3
+MAN3+=MPI_Group_incl.3
+MAN3+=MPI_File_write_all_begin.3
+MAN3+=MPI_Info_get_nkeys.3
 MAN3+=MPI_File_write_shared.3
-MAN3+=MPI_Finalize.3
-MAN3+=MPI_Finalized.3
-MAN3+=MPI_Free_mem.3
-MAN3+=MPI_Gather.3
-MAN3+=MPI_Gatherv.3
+MAN3+=MPI_Comm_get_parent.3
 MAN3+=MPI_Get.3
-MAN3+=MPI_Get_address.3
-MAN3+=MPI_Get_count.3
-MAN3+=MPI_Get_elements.3
-MAN3+=MPI_Get_processor_name.3
-MAN3+=MPI_Get_version.3
-MAN3+=MPI_Graph_create.3
-MAN3+=MPI_Graphdims_get.3
-MAN3+=MPI_Graph_get.3
-MAN3+=MPI_Graph_map.3
-MAN3+=MPI_Graph_neighbors.3
-MAN3+=MPI_Graph_neighbors_count.3
+MAN3+=MPI_File_write_ordered_end.3
+MAN3+=MPI_Info_get.3
+MAN3+=MPI_Pack.3
+MAN3+=MPI_Rsend_init.3
+MAN3+=MPI_Send_init.3
+MAN3+=MPI_Finalized.3
+MAN3+=MPI_Rsend.3
+MAN3+=MPI_Test_cancelled.3
 MAN3+=MPI_Grequest_complete.3
 MAN3+=MPI_Grequest_start.3
 MAN3+=MPI_Group_c2f.3
-MAN3+=MPI_Group_compare.3
-MAN3+=MPI_Group_difference.3
 MAN3+=MPI_Group_excl.3
-MAN3+=MPI_Group_f2c.3
-MAN3+=MPI_Group_free.3
-MAN3+=MPI_Init.3
-MAN3+=MPI_Group_incl.3
-MAN3+=MPI_Group_intersection.3
-MAN3+=MPI_Group_range_excl.3
-MAN3+=MPI_Group_range_incl.3
-MAN3+=MPI_Group_rank.3
-MAN3+=MPI_Group_size.3
-MAN3+=MPI_Group_translate_ranks.3
-MAN3+=MPI_Group_union.3
-MAN3+=MPI_Ibsend.3
+MAN3+=MPI_Finalize.3
+MAN3+=MPI_Intercomm_merge.3
+MAN3+=MPI_File_read_all_end.3
+MAN3+=MPI_Gather.3
+MAN3+=MPI_Scatterv.3
+MAN3+=MPI_Sendrecv_replace.3
+MAN3+=MPI_Graphdims_get.3
+MAN3+=MPI_Info_set.3
+MAN3+=MPI_Win_f2c.3
+MAN3+=MPI_Isend.3
+MAN3+=MPI_Scatter.3
+MAN3+=MPI_File_read_all_begin.3
 MAN3+=MPI_Info_c2f.3
+MAN3+=MPI_Info_dup.3
+MAN3+=MPI_Intercomm_create.3
+MAN3+=MPI_Graph_neighbors_count.3
+MAN3+=MPI_File_get_position.3
 MAN3+=MPI_Info_create.3
 MAN3+=MPI_Info_delete.3
-MAN3+=MPI_Info_dup.3
 MAN3+=MPI_Info_f2c.3
 MAN3+=MPI_Info_free.3
-MAN3+=MPI_Info_get.3
-MAN3+=MPI_Info_get_nkeys.3
-MAN3+=MPI_Info_get_nthkey.3
-MAN3+=MPI_Info_get_valuelen.3
-MAN3+=MPI_Info_set.3
-MAN3+=MPI_Initialized.3
-MAN3+=MPI_Init_thread.3
-MAN3+=MPI_Intercomm_create.3
-MAN3+=MPI_Intercomm_merge.3
-MAN3+=MPI_Iprobe.3
+MAN3+=MPI_Type_free.3
+MAN3+=MPI_Unpack.3
+MAN3+=MPI_Send.3
+MAN3+=MPI_Group_translate_ranks.3
+MAN3+=MPI_File_write_at.3
+MAN3+=MPI_Type_c2f.3
 MAN3+=MPI_Irecv.3
-MAN3+=MPI_Irsend.3
-MAN3+=MPI_Isend.3
-MAN3+=MPI_Issend.3
-MAN3+=MPI_Is_thread_main.3
-MAN3+=MPI_Keyval_create.3
-MAN3+=MPI_Keyval_free.3
-MAN3+=MPI_Lookup_name.3
-MAN3+=MPI_Op_c2f.3
-MAN3+=MPI_Op_create.3
-MAN3+=MPI_Open_port.3
-MAN3+=MPI_Op_f2c.3
+MAN3+=MPI_Graph_get.3
+MAN3+=MPI_File_set_info.3
+MAN3+=MPI_Win_test.3
 MAN3+=MPI_Op_free.3
-MAN3+=MPI_Pack.3
-MAN3+=MPI_Pack_external.3
-MAN3+=MPI_Pack_external_size.3
-MAN3+=MPI_Pack_size.3
-MAN3+=MPI_Pcontrol.3
-MAN3+=MPI_Probe.3
+MAN3+=MPI_File_preallocate.3
+MAN3+=MPI_Type_create_keyval.3
 MAN3+=MPI_Publish_name.3
-MAN3+=MPI_Put.3
-MAN3+=MPI_Query_thread.3
-MAN3+=MPI_Recv.3
-MAN3+=MPI_Recv_init.3
-MAN3+=MPI_Reduce.3
-MAN3+=MPI_Reduce_scatter.3
+MAN3+=MPI_Probe.3
+MAN3+=MPI_File_open.3
 MAN3+=MPI_Register_datarep.3
-MAN3+=MPI_Request_c2f.3
-MAN3+=MPI_Request_f2c.3
-MAN3+=MPI_Request_free.3
-MAN3+=MPI_Request_get_status.3
-MAN3+=MPI_Rsend.3
-MAN3+=MPI_Rsend_init.3
+MAN3+=MPI_Unpublish_name.3
+MAN3+=MPI_Irsend.3
+MAN3+=MPI_Testsome.3
+MAN3+=MPI_Sizeof.3
 MAN3+=MPI_Scan.3
-MAN3+=MPI_Scatter.3
-MAN3+=MPI_Scatterv.3
-MAN3+=MPI_Send.3
-MAN3+=MPI_Send_init.3
+MAN3+=MPI_Put.3
+MAN3+=MPI_Recv.3
+MAN3+=MPI_Pcontrol.3
+MAN3+=MPI_Group_rank.3
 MAN3+=MPI_Sendrecv.3
-MAN3+=MPI_Sendrecv_replace.3
-MAN3+=MPI_Sizeof.3
-MAN3+=MPI_Ssend.3
-MAN3+=MPI_Ssend_init.3
+MAN3+=MPI_Type_commit.3
+MAN3+=MPI_Group_range_incl.3
+MAN3+=MPI_Query_thread.3
+MAN3+=MPI_Recv_init.3
+MAN3+=MPI_Type_match_size.3
+MAN3+=MPI_Info_get_valuelen.3
+MAN3+=MPI_Iprobe.3
+MAN3+=MPI_Init.3
+MAN3+=MPI_Keyval_free.3
+MAN3+=MPI_Initialized.3
+MAN3+=MPI_Group_union.3
+MAN3+=MPI_Wtime.3
+MAN3+=MPI_Type_create_darray.3
 MAN3+=MPI_Start.3
 MAN3+=MPI_Startall.3
 MAN3+=MPI_Status_c2f.3
 MAN3+=MPI_Status_f2c.3
-MAN3+=MPI_Status_set_cancelled.3
 MAN3+=MPI_Status_set_elements.3
+MAN3+=MPI_Type_create_indexed_block.3
 MAN3+=MPI_Test.3
 MAN3+=MPI_Testall.3
 MAN3+=MPI_Testany.3
-MAN3+=MPI_Test_cancelled.3
-MAN3+=MPI_Testsome.3
-MAN3+=MPI_Topo_test.3
-MAN3+=MPI_Type_c2f.3
-MAN3+=MPI_Type_commit.3
-MAN3+=MPI_Type_contiguous.3
-MAN3+=MPI_Type_create_darray.3
-MAN3+=MPI_Type_create_f90_complex.3
-MAN3+=MPI_Type_create_f90_integer.3
-MAN3+=MPI_Type_create_f90_real.3
-MAN3+=MPI_Type_create_hindexed.3
+MAN3+=MPI_File_seek_shared.3
+MAN3+=MPI_Reduce.3
+MAN3+=MPI_Open_port.3
+MAN3+=MPI_Type_free_keyval.3
+MAN3+=MPI_Request_f2c.3
+MAN3+=MPI_Init_thread.3
+MAN3+=MPI_Ssend_init.3
+MAN3+=MPI_Pack_size.3
+MAN3+=MPI_Type_create_struct.3
 MAN3+=MPI_Type_create_hvector.3
-MAN3+=MPI_Type_create_indexed_block.3
-MAN3+=MPI_Type_create_keyval.3
-MAN3+=MPI_Type_dup.3
+MAN3+=MPI_Type_get_envelope.3
+MAN3+=MPI_Type_get_contents.3
 MAN3+=MPI_Type_create_resized.3
-MAN3+=MPI_Type_create_struct.3
-MAN3+=MPI_Type_create_subarray.3
+MAN3+=MPI_Comm_remote_size.3
+MAN3+=MPI_Type_get_extent.3
+MAN3+=MPI_Status_set_cancelled.3
+MAN3+=MPI_Win_set_errhandler.3
 MAN3+=MPI_Type_delete_attr.3
+MAN3+=MPI_Pack_external_size.3
 MAN3+=MPI_Type_extent.3
-MAN3+=MPI_Type_f2c.3
-MAN3+=MPI_Type_free.3
-MAN3+=MPI_Type_free_keyval.3
-MAN3+=MPI_Type_get_attr.3
-MAN3+=MPI_Type_get_contents.3
-MAN3+=MPI_Type_get_envelope.3
-MAN3+=MPI_Type_get_extent.3
-MAN3+=MPI_Type_get_name.3
-MAN3+=MPI_Type_get_true_extent.3
+MAN3+=MPI_Win_post.3
+MAN3+=MPI_Op_c2f.3
 MAN3+=MPI_Type_hindexed.3
-MAN3+=MPI_Type_hvector.3
-MAN3+=MPI_Wait.3
-MAN3+=MPI_Type_indexed.3
-MAN3+=MPI_Type_lb.3
-MAN3+=MPI_Type_match_size.3
-MAN3+=MPI_Type_set_attr.3
+MAN3+=MPI_Type_struct.3
+MAN3+=MPI_Type_get_name.3
+MAN3+=MPI_Win_create_keyval.3
+MAN3+=MPI_Win_fence.3
+MAN3+=MPI_Type_create_f90_integer.3
 MAN3+=MPI_Type_set_name.3
+MAN3+=MPI_Unpack_external.3
+MAN3+=MPI_Ssend.3
+MAN3+=OpenMPI.3
+MAN3+=MPI_Type_set_attr.3
+MAN3+=MPI_Type_lb.3
 MAN3+=MPI_Type_size.3
-MAN3+=MPI_Type_struct.3
+MAN3+=MPI_Win_c2f.3
 MAN3+=MPI_Type_ub.3
-MAN3+=MPI_Type_vector.3
-MAN3+=MPI_Unpack.3
-MAN3+=MPI_Unpack_external.3
-MAN3+=MPI_Unpublish_name.3
 MAN3+=MPI_Waitall.3
-MAN3+=MPI_Waitany.3
-MAN3+=MPI_Waitsome.3
-MAN3+=MPI_Win_c2f.3
-MAN3+=MPI_Win_call_errhandler.3
-MAN3+=MPI_Win_complete.3
+MAN3+=MPI_Op_f2c.3
 MAN3+=MPI_Wtick.3
+MAN3+=MPI_Reduce_scatter.3
 MAN3+=MPI_Win_create.3
-MAN3+=MPI_Win_create_errhandler.3
-MAN3+=MPI_Win_create_keyval.3
-MAN3+=MPI_Win_delete_attr.3
-MAN3+=MPI_Win_f2c.3
-MAN3+=MPI_Win_fence.3
-MAN3+=MPI_Win_free.3
-MAN3+=MPI_Win_free_keyval.3
-MAN3+=MPI_Win_get_attr.3
+MAN3+=MPI_Abort.3
+MAN3+=MPI_Type_indexed.3
+MAN3+=MPI_Type_get_attr.3
+MAN3+=MPI_Type_vector.3
+MAN3+=MPI_File_read_ordered.3
+MAN3+=MPI_Comm_call_errhandler.3
+MAN3+=MPI_Group_difference.3
+MAN3+=MPI_File_iwrite_shared.3
+MAN3+=MPI_Win_complete.3
+MAN3+=MPI_Wait.3
+MAN3+=MPI_Comm_split.3
+MAN3+=MPI_Op_create.3
 MAN3+=MPI_Win_get_errhandler.3
 MAN3+=MPI_Win_get_group.3
 MAN3+=MPI_Win_get_name.3
 MAN3+=MPI_Win_lock.3
-MAN3+=MPI_Win_post.3
 MAN3+=MPI_Win_set_attr.3
-MAN3+=MPI_Win_set_errhandler.3
-MAN3+=MPI_Win_set_name.3
-MAN3+=MPI_Wtime.3
+MAN3+=MPI_Type_get_true_extent.3
+MAN3+=MPI_Win_free.3
+MAN3+=MPI_Request_free.3
 MAN3+=MPI_Win_start.3
-MAN3+=MPI_Win_test.3
-MAN3+=MPI_Win_unlock.3
-MAN3+=MPI_Win_wait.3
-MAN3+=OpenMPI.3
+MAN3+=MPI_Type_f2c.3
+MAN3+=MPI_Keyval_create.3
+MAN3+=MPI_Attr_delete.3
+MAN3+=MPI_File_write_at_all.3
+MAN3+=MPI_Cart_get.3
+MAN3+=MPI_Allgather.3
+MAN3+=MPI_Comm_remote_group.3
+MAN3+=MPI_Attr_put.3
+MAN3+=MPI_Cart_shift.3
+MAN3+=MPI_Comm_create_keyval.3
+MAN3+=MPI_File_get_position_shared.3
+MAN3+=MPI_File_create_errhandler.3
+MAN3+=MPI_File_delete.3
+MAN3+=MPI_Comm_disconnect.3
+MAN3+=MPI_Comm_delete_attr.3
+MAN3+=MPI_Group_intersection.3
+MAN3+=MPI_Win_delete_attr.3
+MAN3+=MPI_Gatherv.3
+MAN3+=MPI_File_write_at_all_begin.3
+MAN3+=MPI_Info_get_nthkey.3
+MAN3+=MPI_Group_size.3
+MAN3+=MPI_File_read_shared.3
+MAN3+=MPI_Lookup_name.3
+MAN3+=MPI_Type_create_f90_complex.3
+MAN3+=MPI_Topo_test.3
+MAN3+=MPI_Type_create_subarray.3
+MAN3+=MPI_Type_contiguous.3
+MAN3+=MPI_Request_get_status.3
+MAN3+=MPI_Type_create_f90_real.3
+MAN3+=MPI_Type_create_hindexed.3
+MAN3+=MPI_Type_dup.3
+MAN3+=MPI_Win_call_errhandler.3
+MAN3+=MPI_Win_set_name.3
+MAN3+=MPI_Alltoallv.3
+MAN3+=MPI_Comm_create_errhandler.3
+MAN3+=MPI_Comm_get_errhandler.3
diff --git a/net/openmpi/distinfo b/net/openmpi/distinfo
index 3db933de9ef3..ce6d114c3d65 100644
--- a/net/openmpi/distinfo
+++ b/net/openmpi/distinfo
@@ -1,3 +1,3 @@
-MD5 (openmpi-1.3.tar.bz2) = efbba7d652d1e430d456f65d7a2e339b
-SHA256 (openmpi-1.3.tar.bz2) = 864706d88d28b586a045461a828962c108f5912671071bc3ef0ca187f115e47b
-SIZE (openmpi-1.3.tar.bz2) = 6430688
+MD5 (openmpi-1.3.3.tar.bz2) = f6cdc9c195daa8571b2e509e952d6755
+SHA256 (openmpi-1.3.3.tar.bz2) = e1425853282da9237f5b41330207e54da1dc803a2e19a93dacc3eca1d083e422
+SIZE (openmpi-1.3.3.tar.bz2) = 6695647
diff --git a/net/openmpi/pkg-plist b/net/openmpi/pkg-plist
index 5ffcd619320a..f59981e6afab 100644
--- a/net/openmpi/pkg-plist
+++ b/net/openmpi/pkg-plist
@@ -1,17 +1,24 @@
-%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f77.la
-%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f77.so.0
-%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f90.la
-%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f90.so.0
-%%FORTRAN%%%%MPIDIR%%/share/openmpi/mpif77-wrapper-data.txt
-%%FORTRAN%%%%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
+%%MPIDIR%%/bin/amd64-portbld-freebsd8.0-otfaux
+%%MPIDIR%%/bin/amd64-portbld-freebsd8.0-otfcompress
+%%MPIDIR%%/bin/amd64-portbld-freebsd8.0-otfconfig
+%%MPIDIR%%/bin/amd64-portbld-freebsd8.0-otfdump
+%%MPIDIR%%/bin/amd64-portbld-freebsd8.0-otfinfo
+%%MPIDIR%%/bin/amd64-portbld-freebsd8.0-otfmerge
 %%MPIDIR%%/bin/ompi-server
 %%MPIDIR%%/bin/ompi_info
 %%MPIDIR%%/bin/opal_wrapper
+%%MPIDIR%%/bin/opari
 %%MPIDIR%%/bin/orte-clean
 %%MPIDIR%%/bin/orte-iof
 %%MPIDIR%%/bin/orte-ps
 %%MPIDIR%%/bin/orted
 %%MPIDIR%%/bin/orterun
+%%MPIDIR%%/bin/vtcc
+%%MPIDIR%%/bin/vtcxx
+%%MPIDIR%%/bin/vtf77
+%%MPIDIR%%/bin/vtf90
+%%MPIDIR%%/bin/vtfilter
+%%MPIDIR%%/bin/vtunify
 %%MPIDIR%%/etc/openmpi-default-hostfile
 %%MPIDIR%%/etc/openmpi-mca-params.conf
 %%MPIDIR%%/etc/openmpi-totalview.tcl
@@ -51,16 +58,51 @@
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/topology_inln.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win.h
 %%MPIDIR%%/include/openmpi/ompi/mpi/cxx/win_inln.h
+%%MPIDIR%%/include/vampirtrace/OTF_CopyHandler.h
+%%MPIDIR%%/include/vampirtrace/OTF_Definitions.h
+%%MPIDIR%%/include/vampirtrace/OTF_File.h
+%%MPIDIR%%/include/vampirtrace/OTF_FileManager.h
+%%MPIDIR%%/include/vampirtrace/OTF_Filenames.h
+%%MPIDIR%%/include/vampirtrace/OTF_HandlerArray.h
+%%MPIDIR%%/include/vampirtrace/OTF_MasterControl.h
+%%MPIDIR%%/include/vampirtrace/OTF_RBuffer.h
+%%MPIDIR%%/include/vampirtrace/OTF_RStream.h
+%%MPIDIR%%/include/vampirtrace/OTF_Reader.h
+%%MPIDIR%%/include/vampirtrace/OTF_WBuffer.h
+%%MPIDIR%%/include/vampirtrace/OTF_WStream.h
+%%MPIDIR%%/include/vampirtrace/OTF_Writer.h
+%%MPIDIR%%/include/vampirtrace/OTF_inttypes.h
+%%MPIDIR%%/include/vampirtrace/OTF_inttypes_unix.h
+%%MPIDIR%%/include/vampirtrace/opari_omp.h
+%%MPIDIR%%/include/vampirtrace/otf.h
+%%MPIDIR%%/include/vampirtrace/pomp_lib.h
+%%MPIDIR%%/include/vampirtrace/vt_user.h
+%%MPIDIR%%/include/vampirtrace/vt_user.inc
+%%MPIDIR%%/include/vampirtrace/vt_user_comment.h
+%%MPIDIR%%/include/vampirtrace/vt_user_comment.inc
+%%MPIDIR%%/include/vampirtrace/vt_user_count.h
+%%MPIDIR%%/include/vampirtrace/vt_user_count.inc
 %%MPIDIR%%/lib/libmca_common_sm.la
 %%MPIDIR%%/lib/libmca_common_sm.so.0
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so.0
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so.0
+%%MPIDIR%%/lib/libmpi_f77.la
+%%MPIDIR%%/lib/libmpi_f77.so.0
+%%MPIDIR%%/lib/libmpi_f90.la
+%%MPIDIR%%/lib/libmpi_f90.so.0
 %%MPIDIR%%/lib/libopen-pal.la
 %%MPIDIR%%/lib/libopen-pal.so.0
 %%MPIDIR%%/lib/libopen-rte.la
 %%MPIDIR%%/lib/libopen-rte.so.0
+%%MPIDIR%%/lib/libotf.a
+%%MPIDIR%%/lib/libotf.la
+%%MPIDIR%%/lib/libvt.a
+%%MPIDIR%%/lib/libvt.fmpi.a
+%%MPIDIR%%/lib/libvt.mpi.a
+%%MPIDIR%%/lib/libvt.omp.a
+%%MPIDIR%%/lib/libvt.ompi.a
 %%MPIDIR%%/lib/mpi.mod
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.la
 %%MPIDIR%%/lib/openmpi/libompi_dbg_msgq.so
@@ -90,6 +132,8 @@
 %%MPIDIR%%/lib/openmpi/mca_coll_self.so
 %%MPIDIR%%/lib/openmpi/mca_coll_sm.la
 %%MPIDIR%%/lib/openmpi/mca_coll_sm.so
+%%MPIDIR%%/lib/openmpi/mca_coll_sync.la
+%%MPIDIR%%/lib/openmpi/mca_coll_sync.so
 %%MPIDIR%%/lib/openmpi/mca_coll_tuned.la
 %%MPIDIR%%/lib/openmpi/mca_coll_tuned.so
 %%MPIDIR%%/lib/openmpi/mca_crs_none.la
@@ -138,10 +182,14 @@
 %%MPIDIR%%/lib/openmpi/mca_osc_pt2pt.so
 %%MPIDIR%%/lib/openmpi/mca_osc_rdma.la
 %%MPIDIR%%/lib/openmpi/mca_osc_rdma.so
+%%MPIDIR%%/lib/openmpi/mca_paffinity_posix.la
+%%MPIDIR%%/lib/openmpi/mca_paffinity_posix.so
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.la
 %%MPIDIR%%/lib/openmpi/mca_plm_rsh.so
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.la
 %%MPIDIR%%/lib/openmpi/mca_pml_cm.so
+%%MPIDIR%%/lib/openmpi/mca_pml_csum.la
+%%MPIDIR%%/lib/openmpi/mca_pml_csum.so
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.la
 %%MPIDIR%%/lib/openmpi/mca_pml_ob1.so
 %%MPIDIR%%/lib/openmpi/mca_pml_v.la
@@ -169,6 +217,7 @@
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.la
 %%MPIDIR%%/lib/openmpi/mca_vprotocol_pessimist.so
 %%MPIDIR%%/share/openmpi/amca-param-sets/example.conf
+%%MPIDIR%%/share/openmpi/help-coll-sync.txt
 %%MPIDIR%%/share/openmpi/help-dash-host.txt
 %%MPIDIR%%/share/openmpi/help-ess-base.txt
 %%MPIDIR%%/share/openmpi/help-hostfile.txt
@@ -192,6 +241,7 @@
 %%MPIDIR%%/share/openmpi/help-opal-crs-base.txt
 %%MPIDIR%%/share/openmpi/help-opal-crs-none.txt
 %%MPIDIR%%/share/openmpi/help-opal-runtime.txt
+%%MPIDIR%%/share/openmpi/help-opal-util.txt
 %%MPIDIR%%/share/openmpi/help-opal-wrapper.txt
 %%MPIDIR%%/share/openmpi/help-orte-clean.txt
 %%MPIDIR%%/share/openmpi/help-orte-filem-base.txt
@@ -210,27 +260,70 @@
 %%MPIDIR%%/share/openmpi/help-plm-rsh.txt
 %%MPIDIR%%/share/openmpi/help-ras-base.txt
 %%MPIDIR%%/share/openmpi/help-rmaps_rank_file.txt
+%%MPIDIR%%/share/openmpi/mpic++-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpic++-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpicc-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpicc-wrapper-data.txt
-%%FORTRAN%%%%MPIDIR%%/bin/mpif77
-%%FORTRAN%%%%MPIDIR%%/bin/mpif90
-%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f77.so
-%%FORTRAN%%%%MPIDIR%%/lib/libmpi_f90.so
+%%MPIDIR%%/share/openmpi/mpif77-vt-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpif77-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpif90-vt-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpif90-wrapper-data.txt
+%%MPIDIR%%/share/vampirtrace/FILTER.SPEC
+%%MPIDIR%%/share/vampirtrace/GROUPS.SPEC
+%%MPIDIR%%/share/vampirtrace/METRICS.SPEC
+%%MPIDIR%%/share/vampirtrace/doc/ChangeLog
+%%MPIDIR%%/share/vampirtrace/doc/LICENSE
+%%MPIDIR%%/share/vampirtrace/doc/UserManual.html
+%%MPIDIR%%/share/vampirtrace/doc/UserManual.pdf
+%%MPIDIR%%/share/vampirtrace/doc/opari/ChangeLog
+%%MPIDIR%%/share/vampirtrace/doc/opari/LICENSE
+%%MPIDIR%%/share/vampirtrace/doc/opari/Readme.html
+%%MPIDIR%%/share/vampirtrace/doc/opari/lacsi01.pdf
+%%MPIDIR%%/share/vampirtrace/doc/opari/lacsi01.ps.gz
+%%MPIDIR%%/share/vampirtrace/doc/opari/opari-logo-100.gif
+%%MPIDIR%%/share/vampirtrace/doc/otf/ChangeLog
+%%MPIDIR%%/share/vampirtrace/doc/otf/LICENSE
+%%MPIDIR%%/share/vampirtrace/doc/otf/otftools.pdf
+%%MPIDIR%%/share/vampirtrace/doc/otf/specification.pdf
+%%MPIDIR%%/share/vampirtrace/vtcc-wrapper-data.txt
+%%MPIDIR%%/share/vampirtrace/vtcxx-wrapper-data.txt
+%%MPIDIR%%/share/vampirtrace/vtf77-wrapper-data.txt
+%%MPIDIR%%/share/vampirtrace/vtf90-wrapper-data.txt
 %%MPIDIR%%/bin/mpiCC
+%%MPIDIR%%/bin/mpiCC-vt
 %%MPIDIR%%/bin/mpic++
+%%MPIDIR%%/bin/mpic++-vt
 %%MPIDIR%%/bin/mpicc
+%%MPIDIR%%/bin/mpicc-vt
 %%MPIDIR%%/bin/mpicxx
+%%MPIDIR%%/bin/mpicxx-vt
 %%MPIDIR%%/bin/mpiexec
+%%MPIDIR%%/bin/mpif77
+%%MPIDIR%%/bin/mpif77-vt
+%%MPIDIR%%/bin/mpif90
+%%MPIDIR%%/bin/mpif90-vt
 %%MPIDIR%%/bin/mpirun
+%%MPIDIR%%/bin/ompi-checkpoint
 %%MPIDIR%%/bin/ompi-clean
+%%MPIDIR%%/bin/ompi-iof
 %%MPIDIR%%/bin/ompi-ps
+%%MPIDIR%%/bin/ompi-restart
+%%MPIDIR%%/bin/otfdecompress
 %%MPIDIR%%/lib/libmca_common_sm.so
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi_cxx.so
+%%MPIDIR%%/lib/libmpi_f77.so
+%%MPIDIR%%/lib/libmpi_f90.so
 %%MPIDIR%%/lib/libopen-pal.so
 %%MPIDIR%%/lib/libopen-rte.so
+%%MPIDIR%%/share/openmpi/mpiCC-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpiCC-wrapper-data.txt
+%%MPIDIR%%/share/openmpi/mpicxx-vt-wrapper-data.txt
 %%MPIDIR%%/share/openmpi/mpicxx-wrapper-data.txt
+@dirrm %%MPIDIR%%/share/vampirtrace/doc/otf
+@dirrm %%MPIDIR%%/share/vampirtrace/doc/opari
+@dirrm %%MPIDIR%%/share/vampirtrace/doc
+@dirrm %%MPIDIR%%/share/vampirtrace
 @dirrm %%MPIDIR%%/share/openmpi/amca-param-sets
 @dirrm %%MPIDIR%%/share/openmpi
 @dirrm %%MPIDIR%%/share
@@ -240,6 +333,7 @@
 @dirrm %%MPIDIR%%/man
 @dirrm %%MPIDIR%%/lib/openmpi
 @dirrm %%MPIDIR%%/lib
+@dirrm %%MPIDIR%%/include/vampirtrace
 @dirrm %%MPIDIR%%/include/openmpi/ompi/mpi/cxx
 @dirrm %%MPIDIR%%/include/openmpi/ompi/mpi
 @dirrm %%MPIDIR%%/include/openmpi/ompi