Update to version 1.2.0.

PR:		15686
Submitted by:	maintainer

4 files changed, 244 insertions, 252 deletions

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 4341450429c7..9adb75296381 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	mpich (portable mpi standard imp.)
-# Version required:	1.1.2
+# Version required:	1.2.0
 # Date created:		2 May 1998
 # Whom:                 dbader@eece.unm.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mpich-1.1.2
+DISTNAME=	mpich-1.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
 
-PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/patch/1.1.2/
-PATCHFILES=	4152 4165 4169 4180 4224
+PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/patch/1.2.0/
+PATCHFILES=	4885 4889
 
 MAINTAINER=	dbader@eece.unm.edu
 
@@ -21,7 +21,7 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-cflags="${CFLAGS}" -prefix=${PREFIX}/mpich
 
 # Include support for ssh client
-USE_SSH?= YES
+USE_SSH?=       YES
 # Use ssh instead of rsh
 .if defined(USE_SSH) && ${USE_SSH} == YES || \
     exists(${PREFIX}/bin/ssh) && \
@@ -30,153 +30,152 @@ RUN_DEPENDS+=   ssh:${PORTSDIR}/security/ssh
 CONFIGURE_ARGS+= -rsh="${PREFIX}/bin/ssh"
 .endif
 
-WRKSRC=		${WRKDIR}/mpich
 ALL_TARGET=
 MANPREFIX=	${PREFIX}/mpich
-MAN1=		Jumpshot.1 MPI.1 chp4_servs.1 mpiCC.1 mpicc.1 mpif77.1 \
-		mpif90.1 mpiman.1 mpireconfig.1 mpirun.1 tstmachines.1
-MAN3=		Constants.3 MPIO_Request_c2f.3 MPIO_Request_f2c.3 \
-		MPIO_Test.3 MPIO_Wait.3 MPI_2COMPLEX.3 \
-		MPI_2DOUBLE_COMPLEX.3 MPI_2DOUBLE_PRECISION.3 MPI_2INT.3 \
-		MPI_2INTEGER.3 MPI_2REAL.3 MPI_ANY_SOURCE.3 \
-		MPI_ANY_TAG.3 MPI_Abort.3 MPI_Address.3 MPI_Aint.3 \
-		MPI_Allgather.3 MPI_Allgatherv.3 MPI_Allreduce.3 \
-		MPI_Alltoall.3 MPI_Alltoallv.3 MPI_Attr_delete.3 \
-		MPI_Attr_get.3 MPI_Attr_put.3 MPI_BAND.3 MPI_BOR.3 \
-		MPI_BOTTOM.3 MPI_BSEND_OVERHEAD.3 MPI_BXOR.3 \
-		MPI_BYTE.3 MPI_Barrier.3 MPI_Bcast.3 \
-		MPI_Bsend.3 MPI_Bsend_init.3 MPI_Buffer_attach.3 \
-		MPI_Buffer_detach.3 MPI_CART.3 MPI_CHAR.3 \
-		MPI_COMM_NULL.3 MPI_COMM_SELF.3 MPI_COMM_WORLD.3 \
-		MPI_COMPLEX.3 MPI_CONGRUENT.3 MPI_Cancel.3 \
+MAN1=		Jumpshot.1 MPI.1 chp4_servs.1 cleanipcs.1 mpiCC.1 mpicc.1 \
+		mpif77.1 mpif90.1 mpiman.1 mpireconfig.1 mpirun.1 \
+		tstmachines.1
+MAN3=		Constants.3 MPI_2COMPLEX.3 MPI_2DOUBLE_COMPLEX.3 \
+		MPI_2DOUBLE_PRECISION.3 MPI_2INT.3 MPI_2INTEGER.3 \
+		MPI_2REAL.3 MPI_ANY_SOURCE.3 MPI_ANY_TAG.3 MPI_Abort.3 \
+		MPI_Address.3 MPI_Aint.3 MPI_Allgather.3 MPI_Allgatherv.3 \
+		MPI_Allreduce.3 MPI_Alltoall.3 MPI_Alltoallv.3 \
+		MPI_Attr_delete.3 MPI_Attr_get.3 MPI_Attr_put.3 MPI_BAND.3 \
+		MPI_BOR.3 MPI_BOTTOM.3 MPI_BSEND_OVERHEAD.3 MPI_BXOR.3 \
+		MPI_BYTE.3 MPI_Barrier.3 MPI_Bcast.3 MPI_Bsend.3 \
+		MPI_Bsend_init.3 MPI_Buffer_attach.3 MPI_Buffer_detach.3 \
+		MPI_CART.3 MPI_CHAR.3 MPI_COMM_NULL.3 MPI_COMM_SELF.3 \
+		MPI_COMM_WORLD.3 MPI_COMPLEX.3 MPI_CONGRUENT.3 MPI_Cancel.3 \
 		MPI_Cart_coords.3 MPI_Cart_create.3 MPI_Cart_get.3 \
 		MPI_Cart_map.3 MPI_Cart_rank.3 MPI_Cart_shift.3 \
 		MPI_Cart_sub.3 MPI_Cartdim_get.3 MPI_Comm_compare.3 \
 		MPI_Comm_create.3 MPI_Comm_dup.3 MPI_Comm_free.3 \
-		MPI_Comm_group.3 MPI_Comm_rank.3 \
-		MPI_Comm_remote_group.3 MPI_Comm_remote_size.3 \
-		MPI_Comm_size.3 MPI_Comm_split.3 MPI_Comm_test_inter.3 \
-		MPI_Copy_function.3 MPI_DATATYPE_NULL.3 MPI_DOUBLE.3 \
-		MPI_DOUBLE_COMPLEX.3 MPI_DOUBLE_INT.3 \
-		MPI_DOUBLE_PRECISION.3 MPI_DUP_FN.3 \
+		MPI_Comm_group.3 MPI_Comm_rank.3 MPI_Comm_remote_group.3 \
+		MPI_Comm_remote_size.3 MPI_Comm_size.3 MPI_Comm_split.3 \
+		MPI_Comm_test_inter.3 MPI_Copy_function.3 \
+		MPI_DATATYPE_NULL.3 MPI_DOUBLE.3 MPI_DOUBLE_COMPLEX.3 \
+		MPI_DOUBLE_INT.3 MPI_DOUBLE_PRECISION.3 MPI_DUP_FN.3 \
 		MPI_Delete_function.3 MPI_Dims_create.3 \
-		MPI_ERRHANDLER_NULL.3 MPI_ERROR.3 \
-		MPI_ERRORS_ARE_FATAL.3 MPI_ERRORS_RETURN.3 \
-		MPI_ERR_ARG.3 MPI_ERR_BAD_ARGS.3 MPI_ERR_BUFFER.3 \
-		MPI_ERR_BUFFER_EXISTS.3 MPI_ERR_COMM.3 \
+		MPI_ERRHANDLER_NULL.3 MPI_ERROR.3 MPI_ERRORS_ARE_FATAL.3 \
+		MPI_ERRORS_RETURN.3 MPI_ERR_ARG.3 MPI_ERR_BAD_ARGS.3 \
+		MPI_ERR_BUFFER.3 MPI_ERR_BUFFER_EXISTS.3 MPI_ERR_COMM.3 \
 		MPI_ERR_COMM_INTER.3 MPI_ERR_COMM_INTRA.3 \
 		MPI_ERR_COMM_NULL.3 MPI_ERR_COUNT.3 MPI_ERR_DIMS.3 \
-		MPI_ERR_ERRORCODE.3 MPI_ERR_EXHAUSTED.3 \
-		MPI_ERR_GROUP.3 MPI_ERR_INIT.3 MPI_ERR_INTERN.3 \
-		MPI_ERR_IN_STATUS.3 MPI_ERR_LASTCODE.3 MPI_ERR_LIMIT.3 \
-		MPI_ERR_NOMATCH.3 MPI_ERR_NULL.3 MPI_ERR_OP.3 \
-		MPI_ERR_OTHER.3 MPI_ERR_PERM_KEY.3 MPI_ERR_PERM_OP.3 \
-		MPI_ERR_PERM_TYPE.3 MPI_ERR_PRE_INIT.3 MPI_ERR_RANK.3 \
-		MPI_ERR_REQUEST.3 MPI_ERR_ROOT.3 MPI_ERR_TAG.3 \
-		MPI_ERR_TOPOLOGY.3 MPI_ERR_TRUNCATE.3 MPI_ERR_TYPE.3 \
-		MPI_ERR_UNKNOWN.3 MPI_Errhandler_create.3 \
-		MPI_Errhandler_free.3 MPI_Errhandler_get.3 \
-		MPI_Errhandler_set.3 MPI_Error_class.3 \
+		MPI_ERR_ERRORCODE.3 MPI_ERR_EXHAUSTED.3 MPI_ERR_GROUP.3 \
+		MPI_ERR_INIT.3 MPI_ERR_INTERN.3 MPI_ERR_IN_STATUS.3 \
+		MPI_ERR_LASTCODE.3 MPI_ERR_LIMIT.3 MPI_ERR_NOMATCH.3 \
+		MPI_ERR_NULL.3 MPI_ERR_OP.3 MPI_ERR_OTHER.3 \
+		MPI_ERR_PERM_KEY.3 MPI_ERR_PERM_OP.3 MPI_ERR_PERM_TYPE.3 \
+		MPI_ERR_PRE_INIT.3 MPI_ERR_RANK.3 MPI_ERR_REQUEST.3 \
+		MPI_ERR_ROOT.3 MPI_ERR_TAG.3 MPI_ERR_TOPOLOGY.3 \
+		MPI_ERR_TRUNCATE.3 MPI_ERR_TYPE.3 MPI_ERR_UNKNOWN.3 \
+		MPI_Errhandler_create.3 MPI_Errhandler_free.3 \
+		MPI_Errhandler_get.3 MPI_Errhandler_set.3 MPI_Error_class.3 \
 		MPI_Error_string.3 MPI_FLOAT.3 MPI_FLOAT_INT.3 \
-		MPI_File_c2f.3 MPI_File_close.3 MPI_File_delete.3 \
-		MPI_File_f2c.3 MPI_File_get_amode.3 MPI_File_get_atomicity.3 \
-		MPI_File_get_byte_offset.3 MPI_File_get_group.3 \
-		MPI_File_get_info.3 MPI_File_get_position.3 \
-		MPI_File_get_size.3 MPI_File_get_type_extent.3 \
-		MPI_File_get_view.3 MPI_File_iread.3 MPI_File_iread_at.3 \
-		MPI_File_iwrite.3 MPI_File_iwrite_at.3 MPI_File_open.3 \
-		MPI_File_preallocate.3 MPI_File_read.3 MPI_File_read_all.3 \
-		MPI_File_read_at.3 MPI_File_read_at_all.3 MPI_File_seek.3 \
-		MPI_File_set_atomicity.3 MPI_File_set_info.3 \
-		MPI_File_set_size.3 MPI_File_set_view.3 MPI_File_sync.3 \
-		MPI_File_write.3 MPI_File_write_all.3 MPI_File_write_at.3 \
-		MPI_File_write_at_all.3 \
-		MPI_Finalize.3 MPI_Finalized.3 MPI_GRAPH.3 \
-		MPI_GROUP_EMPTY.3 MPI_GROUP_NULL.3 MPI_Gather.3 \
-		MPI_Gatherv.3 MPI_Get_count.3 MPI_Get_elements.3 \
-		MPI_Get_processor_name.3 MPI_Get_version.3 \
-		MPI_Graph_create.3 MPI_Graph_get.3 MPI_Graph_map.3 \
-		MPI_Graph_neighbors.3 MPI_Graph_neighbors_count.3 \
-		MPI_Graphdims_get.3 MPI_Group_compare.3 \
-		MPI_Group_difference.3 MPI_Group_excl.3 \
-		MPI_Group_free.3 MPI_Group_incl.3 \
-		MPI_Group_intersection.3 MPI_Group_range_excl.3 \
-		MPI_Group_range_incl.3 MPI_Group_rank.3 \
-		MPI_Group_size.3 MPI_Group_translate_ranks.3 \
-		MPI_Group_union.3 MPI_HOST.3 MPI_Handler_function.3 \
-		MPI_IDENT.3 MPI_INT.3 MPI_INTEGER.3 MPI_INTEGER1.3 \
-		MPI_INTEGER2.3 MPI_INTEGER4.3 MPI_IO.3 MPI_Ibsend.3 \
-		MPI_Info_c2f.3 MPI_Info_create.3 MPI_Info_delete.3 \
-		MPI_Info_dup.3 MPI_Info_f2c.3 MPI_Info_free.3 \
-		MPI_Info_get.3 MPI_Info_get_nkeys.3 \
-		MPI_Info_get_nthkey.3 MPI_Info_get_valuelen.3 \
-		MPI_Info_set.3 MPI_Init.3 MPI_Initialized.3 \
-		MPI_Int2handle.3 MPI_Intercomm_create.3 \
-		MPI_Intercomm_merge.3 MPI_Iprobe.3 MPI_Irecv.3 \
-		MPI_Irsend.3 MPI_Isend.3 MPI_Issend.3 \
-		MPI_KEYVAL_INVALID.3 MPI_Keyval_create.3 \
-		MPI_Keyval_free.3 MPI_LAND.3 MPI_LB.3 MPI_LOGICAL.3 \
-		MPI_LONG.3 MPI_LONG_DOUBLE.3 MPI_LONG_DOUBLE_INT.3 \
-		MPI_LONG_INT.3 MPI_LONG_LONG_INT.3 MPI_LOR.3 \
-		MPI_LXOR.3 MPI_MAX.3 MPI_MAXLOC.3 \
-		MPI_MAX_ERROR_STRING.3 MPI_MAX_PROCESSOR_NAME.3 \
+		MPI_Finalize.3 MPI_Finalized.3 MPI_GRAPH.3 MPI_GROUP_EMPTY.3 \
+		MPI_GROUP_NULL.3 MPI_Gather.3 MPI_Gatherv.3 MPI_Get_count.3 \
+		MPI_Get_elements.3 MPI_Get_processor_name.3 \
+		MPI_Get_version.3 MPI_Graph_create.3 MPI_Graph_get.3 \
+		MPI_Graph_map.3 MPI_Graph_neighbors.3 \
+		MPI_Graph_neighbors_count.3 MPI_Graphdims_get.3 \
+		MPI_Group_compare.3 MPI_Group_difference.3 MPI_Group_excl.3 \
+		MPI_Group_free.3 MPI_Group_incl.3 MPI_Group_intersection.3 \
+		MPI_Group_range_excl.3 MPI_Group_range_incl.3 \
+		MPI_Group_rank.3 MPI_Group_size.3 \
+		MPI_Group_translate_ranks.3 MPI_Group_union.3 MPI_HOST.3 \
+		MPI_Handler_function.3 MPI_IDENT.3 MPI_INT.3 MPI_INTEGER.3 \
+		MPI_INTEGER1.3 MPI_INTEGER2.3 MPI_INTEGER4.3 MPI_IO.3 \
+		MPI_Ibsend.3 MPI_Info_delete.3 MPI_Info_dup.3 \
+		MPI_Info_f2c.3 MPI_Info_free.3 MPI_Info_get.3 \
+		MPI_Info_get_nkeys.3 MPI_Info_get_valuelen.3 \
+		MPI_Info_set.3 MPI_Type_create_darray.3 MPI_Init.3 \
+		MPI_Init_thread.3 MPI_Initialized.3 MPI_Int2handle.3 \
+		MPI_Intercomm_create.3 MPI_Intercomm_merge.3 MPI_Iprobe.3 \
+		MPI_Irecv.3 MPI_Irsend.3 MPI_Isend.3 MPI_Issend.3 \
+		MPI_KEYVAL_INVALID.3 MPI_Keyval_create.3 MPI_Keyval_free.3 \
+		MPI_LAND.3 MPI_LB.3 MPI_LOGICAL.3 MPI_LONG.3 \
+		MPI_LONG_DOUBLE.3 MPI_LONG_DOUBLE_INT.3 MPI_LONG_INT.3 \
+		MPI_LONG_LONG_INT.3 MPI_LOR.3 MPI_LXOR.3 MPI_MAX.3 \
+		MPI_MAXLOC.3 MPI_MAX_ERROR_STRING.3 MPI_MAX_PROCESSOR_NAME.3 \
 		MPI_MIN.3 MPI_MINLOC.3 MPI_NULL_COPY_FN.3 \
 		MPI_NULL_DELETE_FN.3 MPI_OP_NULL.3 MPI_Op_create.3 \
 		MPI_Op_free.3 MPI_PACKED.3 MPI_PROC_NULL.3 MPI_PROD.3 \
 		MPI_Pack.3 MPI_Pack_size.3 MPI_Pcontrol.3 MPI_Probe.3 \
 		MPI_REAL.3 MPI_REAL4.3 MPI_REAL8.3 MPI_REQUEST_NULL.3 \
-		MPI_Recv.3 MPI_Recv_init.3 MPI_Reduce.3 \
-		MPI_Reduce_scatter.3 MPI_Request_c2f.3 \
-		MPI_Request_free.3 MPI_Rsend.3 MPI_Rsend_init.3 \
-		MPI_SHORT.3 MPI_SHORT_INT.3 MPI_SIMILAR.3 MPI_SOURCE.3 \
-		MPI_SUCCESS.3 MPI_SUM.3 MPI_Scan.3 MPI_Scatter.3 \
-		MPI_Scatterv.3 MPI_Send.3 MPI_Send_init.3 \
+		MPI_Recv.3 MPI_Recv_init.3 MPI_Reduce.3 MPI_Rsend.3 \
+		MPI_Reduce_scatter.3 MPI_Request_c2f.3 MPI_Request_free.3 \
+		MPI_Rsend_init.3 MPI_SHORT.3 MPI_SHORT_INT.3 MPI_SIMILAR.3 \
+		MPI_SOURCE.3 MPI_SUCCESS.3 MPI_SUM.3 MPI_Scan.3 \
+		MPI_Scatter.3 MPI_Scatterv.3 MPI_Send.3 MPI_Send_init.3 \
 		MPI_Sendrecv.3 MPI_Sendrecv_replace.3 MPI_Ssend.3 \
-		MPI_Ssend_init.3 MPI_Start.3 MPI_Startall.3 \
-		MPI_Status_c2f.3 MPI_Status_f2c.3 MPI_TAG.3 \
-		MPI_TAG_UB.3 MPI_Test.3 MPI_Test_cancelled.3 \
-		MPI_Testall.3 MPI_Testany.3 MPI_Testsome.3 \
-		MPI_Topo_test.3 MPI_Type_commit.3 \
-		MPI_Type_contiguous.3 MPI_Type_count.3 \
-		MPI_Type_create_darray.3 \
-		MPI_Type_create_indexed_block.3 \
-		MPI_Type_create_subarray.3 MPI_Type_extent.3 \
-		MPI_Type_free.3 MPI_Type_get_contents.3 \
-		MPI_Type_get_envelope.3 MPI_Type_hindexed.3 \
-		MPI_Type_hvector.3 MPI_Type_indexed.3 MPI_Type_lb.3 \
-		MPI_Type_size.3 MPI_Type_struct.3 MPI_Type_ub.3 \
-		MPI_Type_vector.3 MPI_UB.3 MPI_UNDEFINED.3 \
+		MPI_Ssend_init.3 MPI_Start.3 MPI_Startall.3 MPI_Status_c2f.3 \
+		MPI_Status_f2c.3 MPI_Status_set_cancelled.3 \
+		MPI_Status_set_elements.3 MPI_TAG.3 MPI_TAG_UB.3 MPI_Test.3 \
+		MPI_Test_cancelled.3 MPI_Testall.3 MPI_Testany.3 \
+		MPI_Testsome.3 MPI_Topo_test.3 MPI_Type_commit.3 \
+		MPI_Type_contiguous.3 MPI_Type_create_indexed_block.3 \
+		MPI_UB.3 MPI_Type_extent.3 MPI_Type_free.3 \
+		MPI_Type_get_contents.3 MPI_Type_get_envelope.3 \
+		MPI_Type_hindexed.3 MPI_Type_hvector.3 MPI_Type_indexed.3 \
+		MPI_Type_lb.3 MPI_Type_size.3 MPI_Type_struct.3 \
+		MPI_Type_ub.3 MPI_Type_vector.3 MPI_UNDEFINED.3 \
 		MPI_UNDEFINED_RANK.3 MPI_UNEQUAL.3 MPI_UNSIGNED.3 \
-		MPI_UNSIGNED_CHAR.3 MPI_UNSIGNED_LONG.3 \
-		MPI_UNSIGNED_SHORT.3 MPI_Unpack.3 MPI_User_function.3 \
-		MPI_WTIME_IS_GLOBAL.3 MPI_Wait.3 MPI_Waitall.3 \
-		MPI_Waitany.3 MPI_Waitsome.3 MPI_Wtick.3 MPI_Wtime.3
-MAN4=		CLOG_Finalize.4 CLOG_Init.4 CLOG_Output.4 \
-		CLOG_commtype.4 CLOG_cput.4 CLOG_csync.4 \
-		CLOG_get_new_event.4 CLOG_get_new_state.4 \
-		CLOG_mergelogs.4 CLOG_mergend.4 CLOG_msgtype.4 \
-		CLOG_newbuff.4 CLOG_procbuf.4 CLOG_reclen.4 \
-		CLOG_rectype.4 CLOG_treesetup.4 \
-		MPE.4 MPE_Add_RGB_color.4 \
-		MPE_CaptureFile.4 MPE_Close_graphics.4 \
-		MPE_Comm_global_rank.4 MPE_Counter_create.4 \
-		MPE_Counter_free.4 MPE_Counter_nxtval.4 MPE_Decomp1d.4 \
-		MPE_Describe_event.4 MPE_Describe_state.4 \
+		MPI_UNSIGNED_CHAR.3 MPI_UNSIGNED_LONG.3 MPI_Unpack.3 \
+		MPI_UNSIGNED_SHORT.3 MPI_User_function.3 \
+		MPI_WTIME_IS_GLOBAL.3 MPI_Wait.3 MPI_Waitall.3 MPI_Waitany.3 \
+		MPI_Waitsome.3 MPI_Wtick.3 MPI_Wtime.3 MPIO_Test.3 \
+		MPIO_Wait.3 MPI_File_c2f.3 MPI_File_close.3 \
+		MPI_File_delete.3 MPI_File_f2c.3 \
+		MPI_File_get_amode.3 MPI_File_get_atomicity.3 \
+		MPI_File_get_byte_offset.3 MPI_File_get_group.3 \
+		MPI_File_get_info.3 MPI_File_get_position_shared.3 \
+		MPI_File_get_size.3 MPI_File_get_type_extent.3 \
+		MPI_File_get_view.3 MPI_File_iread.3 \
+		MPI_File_iread_at.3 MPI_File_iread_shared.3 \
+		MPI_File_iwrite.3 MPI_File_iwrite_at.3 \
+		MPI_File_iwrite_shared.3 MPI_File_open.3 \
+		MPI_File_read.3 MPI_File_read_all.3 \
+		MPI_File_read_all_begin.3 MPI_File_read_all_end.3 \
+		MPI_File_read_at.3 MPI_File_read_at_all.3 \
+		MPI_File_read_at_all_end.3 MPI_File_read_ordered.3 \
+		MPI_File_read_ordered_begin.3 \
+		MPI_File_read_ordered_end.3 MPI_File_read_shared.3 \
+		MPI_File_seek.3 MPI_File_seek_shared.3 \
+		MPI_File_set_atomicity.3 MPI_File_set_info.3 \
+		MPI_File_write.3 MPI_File_set_view.3 \
+		MPI_File_sync.3 MPI_File_write_all.3 \
+		MPI_File_write_all_begin.3 MPI_File_write_all_end.3 \
+		MPI_File_write_at.3 MPI_File_write_at_all.3 \
+		MPI_File_write_at_all_end.3 MPI_File_write_ordered.3 \
+		MPI_File_write_ordered_begin.3 \
+		MPI_File_write_ordered_end.3 MPI_File_write_shared.3 \
+		MPI_Info_c2f.3 MPI_Info_create.3 MPIO_Request_c2f.3 \
+		MPIO_Request_f2c.3 MPI_File_get_position.3 \
+		MPI_File_preallocate.3 MPI_File_read_at_all_begin.3 \
+		MPI_File_set_size.3 MPI_File_write_at_all_begin.3 \
+		MPI_Info_get_nthkey.3 MPI_Type_create_subarray.3
+MAN4=		CLOG_Finalize.4 CLOG_Init.4 CLOG_Output.4 CLOG_commtype.4 \
+		CLOG_cput.4 CLOG_csync.4 CLOG_get_new_event.4 \
+		CLOG_get_new_state.4 CLOG_init_buffers.4 \
+		CLOG_init_tmpfilename.4 CLOG_mergelogs.4 CLOG_mergend.4 \
+		CLOG_msgtype.4 CLOG_newbuff.4 CLOG_procbuf.4 CLOG_reclen.4 \
+		CLOG_rectype.4 CLOG_reinit_buff.4 CLOG_temp_log.4 \
+		CLOG_treesetup.4 MPE.4 MPE_Add_RGB_color.4 MPE_CaptureFile.4 \
+		MPE_Close_graphics.4 MPE_Comm_global_rank.4 \
+		MPE_Counter_create.4 MPE_Counter_free.4 MPE_Counter_nxtval.4 \
+		MPE_Decomp1d.4 MPE_Describe_event.4 MPE_Describe_state.4 \
 		MPE_Draw_circle.4 MPE_Draw_line.4 MPE_Draw_logic.4 \
 		MPE_Draw_point.4 MPE_Draw_points.4 MPE_Draw_string.4 \
-		MPE_Fill_circle.4 \
-		MPE_Fill_rectangle.4 MPE_Finish_log.4 MPE_GetTags.4 \
-		MPE_Get_mouse_press.4 MPE_IO_Stdout_to_file.4 \
+		MPE_Fill_circle.4 MPE_Fill_rectangle.4 MPE_Finish_log.4 \
+		MPE_GetTags.4 MPE_Get_mouse_press.4 MPE_IO_Stdout_to_file.4 \
 		MPE_Iget_mouse_press.4 MPE_Init_log.4 \
-		MPE_Initialized_logging.4 \
-		MPE_Line_thickness.4 MPE_Log_event.4 \
-		MPE_Log_get_event_number.4 MPE_Log_receive.4 \
+		MPE_Initialized_logging.4 MPE_Line_thickness.4 \
+		MPE_Log_event.4 MPE_Log_get_event_number.4 MPE_Log_receive.4 \
 		MPE_Log_send.4 MPE_Make_color_array.4 MPE_Num_colors.4 \
 		MPE_Open_graphics.4 MPE_Print_datatype_pack_action.4 \
-		MPE_Print_datatype_unpack_action.4 \
-		MPE_ReturnTags.4 MPE_Seq_begin.4 MPE_Seq_end.4 \
-		MPE_Start_log.4 \
-		MPE_Stop_log.4 MPE_TagsEnd.4 MPE_Update.4
+		MPE_Print_datatype_unpack_action.4 MPE_ReturnTags.4 \
+		MPE_Seq_begin.4 MPE_Seq_end.4 MPE_Start_log.4 MPE_Stop_log.4 \
+		MPE_TagsEnd.4 MPE_Update.4
 INSTALL_TARGET=	install
 
 .include <bsd.port.mk>
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index a966659fb901..c454f85fdbf3 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,6 +1,3 @@
-MD5 (mpich/mpich-1.1.2.tar.gz) = b7d8c36c5c9fdbe7ae84c4211c55201a
-MD5 (mpich/4152) = c1c461592d7f95af566c029c78289a29
-MD5 (mpich/4165) = 1ea7d0f4a1ac6ebb69a3b1b40fbadeb0
-MD5 (mpich/4169) = a2a0fa41731d8e2aa4508466c3945fe4
-MD5 (mpich/4180) = 079920a71c102f49df3f104e8c01beb5
-MD5 (mpich/4224) = 56090011bb0ece2a88e05cf62f33bab8
+MD5 (mpich/mpich-1.2.0.tar.gz) = 0f111463139ba389b5cdc347ad4c940b
+MD5 (mpich/4885) = 3c5aa55894228ec404f77a696475838b
+MD5 (mpich/4889) = 2277c62718ea7dbd5525f4fcff5544f9
diff --git a/net/mpich/files/patch-ab b/net/mpich/files/patch-ab
new file mode 100644
index 000000000000..b2cd75491a70
--- /dev/null
+++ b/net/mpich/files/patch-ab
@@ -0,0 +1,19 @@
+--- util/mpiinstall.in.orig	Mon Nov 29 20:48:06 1999
++++ util/mpiinstall.in	Sat Dec 25 07:57:38 1999
+@@ -886,12 +886,12 @@
+     MkDir $mandir
+     CopyFile $top_srcdir/man/mandesc $mandir
+     # No files in man5 (was ADI routines)
+-    for dir in man1 man3 man4 ; do
+-       MkDir $mandir/$dir
+-        for file in $top_srcdir/man/$dir/* ; do 
++    for manxdir in man1 man3 man4 ; do
++       MkDir $mandir/$manxdir
++        for file in $top_srcdir/man/$manxdir/* ; do 
+ 	    # man5 in particular might be empty; be careful
+             if [ -f "$file" -a -s "$file" ] ; then 
+-  	        CopyFile $file $mandir/$dir
++  	        CopyFile $file $mandir/$manxdir
+ 	    fi
+         done
+     done
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index 137a8049921e..63f272571def 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -8,24 +8,25 @@ mpich/MPI-2-C++/examples/pi.cc
 mpich/MPI-2-C++/examples/ring.cc
 mpich/MPI-2-C++/examples/topology.cc
 mpich/MPI-2-C++/examples/user_bcast.cc
-mpich/bin/config.status
 mpich/bin/execer
 mpich/bin/mpereconfig
+mpich/bin/mpereconfig.dat
 mpich/bin/mpiCC
 mpich/bin/mpicc
 mpich/bin/mpif77
 mpich/bin/mpif90
 mpich/bin/mpiman
 mpich/bin/mpireconfig
+mpich/bin/mpireconfig.dat
 mpich/bin/mpirun
 mpich/bin/mpirun.args
 mpich/bin/mpirun.ch_p4
+mpich/bin/mpirun.ch_p4.args
+mpich/bin/mpirun.p4shmem
 mpich/bin/mpirun.pg
 mpich/bin/serv_p4
-mpich/bin/server
 mpich/bin/tarch
 mpich/bin/tdevice
-mpich/bin/tstmachines
 mpich/bin/upshot
 mpich/build/bitmaps/2x2
 mpich/build/bitmaps/black
@@ -46,102 +47,21 @@ mpich/build/bitmaps/vlines2
 mpich/build/bitmaps/vlines3
 mpich/build/bitmaps/vlines4
 mpich/build/bitmaps/white
-mpich/build/freebsd/ch_p4/bin/chkserv
-mpich/build/freebsd/ch_p4/bin/chp4_servs
-mpich/build/freebsd/ch_p4/bin/config.status
-mpich/build/freebsd/ch_p4/bin/mpiCC
-mpich/build/freebsd/ch_p4/bin/mpicc
-mpich/build/freebsd/ch_p4/bin/mpif77
-mpich/build/freebsd/ch_p4/bin/mpif90
-mpich/build/freebsd/ch_p4/bin/mpiman
-mpich/build/freebsd/ch_p4/bin/mpireconfig
-mpich/build/freebsd/ch_p4/bin/mpirun
-mpich/build/freebsd/ch_p4/bin/mpirun.args
-mpich/build/freebsd/ch_p4/bin/mpirun.ch_p4
-mpich/build/freebsd/ch_p4/bin/mpirun.pg
-mpich/build/freebsd/ch_p4/bin/mpiuninstall
-mpich/build/freebsd/ch_p4/bin/serv_p4
-mpich/build/freebsd/ch_p4/bin/server
-mpich/build/freebsd/ch_p4/bin/tarch
-mpich/build/freebsd/ch_p4/bin/tstmachines
-mpich/build/freebsd/ch_p4/data/Makefile.sample
-mpich/build/freebsd/ch_p4/include/c++/comm.h
-mpich/build/freebsd/ch_p4/include/c++/comm_inln.h
-mpich/build/freebsd/ch_p4/include/c++/constants.h
-mpich/build/freebsd/ch_p4/include/c++/datatype.h
-mpich/build/freebsd/ch_p4/include/c++/datatype_inln.h
-mpich/build/freebsd/ch_p4/include/c++/errhandler.h
-mpich/build/freebsd/ch_p4/include/c++/errhandler_inln.h
-mpich/build/freebsd/ch_p4/include/c++/exception.h
-mpich/build/freebsd/ch_p4/include/c++/functions.h
-mpich/build/freebsd/ch_p4/include/c++/functions_inln.h
-mpich/build/freebsd/ch_p4/include/c++/group.h
-mpich/build/freebsd/ch_p4/include/c++/group_inln.h
-mpich/build/freebsd/ch_p4/include/c++/header.h
-mpich/build/freebsd/ch_p4/include/c++/intercomm.h
-mpich/build/freebsd/ch_p4/include/c++/intercomm_inln.h
-mpich/build/freebsd/ch_p4/include/c++/intracomm.h
-mpich/build/freebsd/ch_p4/include/c++/intracomm_inln.h
-mpich/build/freebsd/ch_p4/include/c++/list.h
-mpich/build/freebsd/ch_p4/include/c++/map.h
-mpich/build/freebsd/ch_p4/include/c++/mpi++.h
-mpich/build/freebsd/ch_p4/include/c++/mpi2c++_config.h
-mpich/build/freebsd/ch_p4/include/c++/op.h
-mpich/build/freebsd/ch_p4/include/c++/op_inln.h
-mpich/build/freebsd/ch_p4/include/c++/pcomm.h
-mpich/build/freebsd/ch_p4/include/c++/pdatatype.h
-mpich/build/freebsd/ch_p4/include/c++/perrhandler.h
-mpich/build/freebsd/ch_p4/include/c++/pexception.h
-mpich/build/freebsd/ch_p4/include/c++/pgroup.h
-mpich/build/freebsd/ch_p4/include/c++/pgroup_inln.h
-mpich/build/freebsd/ch_p4/include/c++/pintercomm.h
-mpich/build/freebsd/ch_p4/include/c++/pintracomm.h
-mpich/build/freebsd/ch_p4/include/c++/pmpi++.h
-mpich/build/freebsd/ch_p4/include/c++/pop.h
-mpich/build/freebsd/ch_p4/include/c++/pop_inln.h
-mpich/build/freebsd/ch_p4/include/c++/prequest.h
-mpich/build/freebsd/ch_p4/include/c++/prequest_inln.h
-mpich/build/freebsd/ch_p4/include/c++/pstatus.h
-mpich/build/freebsd/ch_p4/include/c++/pstatus_inln.h
-mpich/build/freebsd/ch_p4/include/c++/ptopology.h
-mpich/build/freebsd/ch_p4/include/c++/request.h
-mpich/build/freebsd/ch_p4/include/c++/request_inln.h
-mpich/build/freebsd/ch_p4/include/c++/status.h
-mpich/build/freebsd/ch_p4/include/c++/status_inln.h
-mpich/build/freebsd/ch_p4/include/c++/topology.h
-mpich/build/freebsd/ch_p4/include/c++/topology_inln.h
-mpich/build/freebsd/ch_p4/include/mpichconf.h
-mpich/build/freebsd/ch_p4/include/mpidefs.h
-mpich/build/freebsd/ch_p4/include/mpif.h
-mpich/build/freebsd/ch_p4/include/mpio.h
-mpich/build/freebsd/ch_p4/include/mpiof.h
-mpich/build/freebsd/ch_p4/lib/libampi.a
-mpich/build/freebsd/ch_p4/lib/libfmpich.a
-mpich/build/freebsd/ch_p4/lib/liblmpi.a
-mpich/build/freebsd/ch_p4/lib/libmpe.a
-mpich/build/freebsd/ch_p4/lib/libmpe_nompi.a
-mpich/build/freebsd/ch_p4/lib/libmpich++.a
-mpich/build/freebsd/ch_p4/lib/libmpich.a
-mpich/build/freebsd/ch_p4/lib/libpmpich.a
-mpich/build/freebsd/ch_p4/lib/libtmpi.a
-mpich/build/freebsd/ch_p4/lib/mpe_prof.o
-mpich/build/freebsd/ch_p4/lib/mpe_proff.o
-mpich/build/freebsd/mpich.En_US.cat
-mpich/build/freebsd/mpich.cat
+mpich/doc/guide.ps.gz
+mpich/doc/install.ps.gz
 mpich/examples/Makefile
 mpich/examples/Makefile.in
 mpich/examples/README
 mpich/examples/cpi.c
 mpich/examples/cpilog.c
-mpich/examples/fibon.f
-mpich/examples/fibon.f90
+mpich/examples/cpip.c
 mpich/examples/hello++.cc
-mpich/examples/mpif.h
 mpich/examples/mpirun
 mpich/examples/pi3.f
+mpich/examples/pi3f90.f90
+mpich/examples/pi3p.f
 mpich/examples/simpleio.c
 mpich/include/basex11.h
-mpich/include/binding.h
 mpich/include/mpe.h
 mpich/include/mpe_graphics.h
 mpich/include/mpe_log.h
@@ -150,46 +70,103 @@ mpich/include/mpeexten.h
 mpich/include/mpetools.h
 mpich/include/mpi.h
 mpich/include/mpi_errno.h
-mpich/include/patchlevel.h
+mpich/include/mpichconf.h
+mpich/include/mpidefs.h
+mpich/include/mpif.h
+mpich/include/mpio.h
+mpich/include/mpiof.h
 mpich/include/protofix.h
+mpich/include/c++/comm.h
+mpich/include/c++/comm_inln.h
+mpich/include/c++/constants.h
+mpich/include/c++/datatype.h
+mpich/include/c++/datatype_inln.h
+mpich/include/c++/errhandler.h
+mpich/include/c++/errhandler_inln.h
+mpich/include/c++/exception.h
+mpich/include/c++/functions.h
+mpich/include/c++/functions_inln.h
+mpich/include/c++/group.h
+mpich/include/c++/group_inln.h
+mpich/include/c++/header.h
+mpich/include/c++/intercomm.h
+mpich/include/c++/intercomm_inln.h
+mpich/include/c++/intracomm.h
+mpich/include/c++/intracomm_inln.h
+mpich/include/c++/list.h
+mpich/include/c++/map.h
+mpich/include/c++/mpi++.h
+mpich/include/c++/mpi2c++_config.h
+mpich/include/c++/op.h
+mpich/include/c++/op_inln.h
+mpich/include/c++/pcomm.h
+mpich/include/c++/pdatatype.h
+mpich/include/c++/perrhandler.h
+mpich/include/c++/pexception.h
+mpich/include/c++/pgroup.h
+mpich/include/c++/pgroup_inln.h
+mpich/include/c++/pintercomm.h
+mpich/include/c++/pintracomm.h
+mpich/include/c++/pmpi++.h
+mpich/include/c++/pop.h
+mpich/include/c++/pop_inln.h
+mpich/include/c++/prequest.h
+mpich/include/c++/prequest_inln.h
+mpich/include/c++/pstatus.h
+mpich/include/c++/pstatus_inln.h
+mpich/include/c++/ptopology.h
+mpich/include/c++/request.h
+mpich/include/c++/request_inln.h
+mpich/include/c++/status.h
+mpich/include/c++/status_inln.h
+mpich/include/c++/topology.h
+mpich/include/c++/topology_inln.h
+mpich/lib/libampi.a
+mpich/lib/libfmpich.a
+mpich/lib/liblmpi.a
+mpich/lib/libmpe.a
+mpich/lib/libmpe_nompi.a
+mpich/lib/libmpich++.a
+mpich/lib/libmpich.a
+mpich/lib/libmpichf.a
+mpich/lib/libmpichfarg.a
+mpich/lib/libpmpich.a
+mpich/lib/libslog.a
+mpich/lib/libtmpi.a
+mpich/lib/mpe_prof.o
+mpich/lib/mpe_proff.o
 mpich/man/mandesc
-mpich/mpe_examples/C/Makefile
-mpich/mpe_examples/C/Makefile.in
-mpich/mpe_examples/C/cpi.c
-mpich/mpe_examples/C/cpilog.c
-mpich/mpe_examples/C/mpirun
-mpich/mpe_examples/Fortran/Makefile
-mpich/mpe_examples/Fortran/Makefile.in
-mpich/mpe_examples/Fortran/fpi.f
-mpich/mpe_examples/Fortran/mpirun
-mpich/mpiuninstall
-mpich/util/chkserv
-mpich/util/chp4_servs
-mpich/util/machines/machines.freebsd
-mpich/util/machines/machines.sample
+mpich/mpe_examples/Makefile
+mpich/mpe_examples/Makefile.in
+mpich/mpe_examples/cpi.c
+mpich/mpe_examples/cpilog.c
+mpich/mpe_examples/fpi.f
+mpich/mpe_examples/fpi.o
+mpich/mpe_examples/mpirun
+mpich/sbin/chkserv
+mpich/sbin/chp4_servs
+mpich/sbin/cleanipcs
+mpich/sbin/mpiuninstall
+mpich/sbin/tstmachines
+mpich/share/Makefile.sample
+mpich/share/machines.freebsd
+mpich/share/machines.sample
 @dirrm mpich/MPI-2-C++/examples
 @dirrm mpich/MPI-2-C++
 @dirrm mpich/bin
 @dirrm mpich/build/bitmaps
-@dirrm mpich/build/freebsd/ch_p4/data
-@dirrm mpich/build/freebsd/ch_p4/include/c++
-@dirrm mpich/build/freebsd/ch_p4/include
-@dirrm mpich/build/freebsd/ch_p4/bin
-@dirrm mpich/build/freebsd/ch_p4/lib/shared
-@dirrm mpich/build/freebsd/ch_p4/lib
-@dirrm mpich/build/freebsd/ch_p4
-@dirrm mpich/build/freebsd
 @dirrm mpich/build
 @dirrm mpich/doc
 @dirrm mpich/examples
+@dirrm mpich/include/c++
 @dirrm mpich/include
+@dirrm mpich/lib/shared
+@dirrm mpich/lib
 @dirrm mpich/man/man1
 @dirrm mpich/man/man3
 @dirrm mpich/man/man4
 @dirrm mpich/man
-@dirrm mpich/mpe_examples/C
-@dirrm mpich/mpe_examples/Fortran
 @dirrm mpich/mpe_examples
-@dirrm mpich/util/machines
-@dirrm mpich/util
+@dirrm mpich/sbin
+@dirrm mpich/share
 @dirrm mpich