o Update to 1.2.2

o Remove patch-aa (no longer necessary)
o Add patch-mpid::ch2::chtick.c which fixes a missing header file include

PR:		30102
Submitted by:	MAINTAINER

5 files changed, 141 insertions, 198 deletions

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index ede235545378..02d7bb806b67 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -6,22 +6,19 @@
 #
 
 PORTNAME=	mpich
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.2.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/
+DIST_SUBDIR=	mpich
 
-PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/patch/1.2.1/
-PATCHFILES=	5487 5524 5542 5543 5594 5597 5613 5655 5687 5700 5776 \
-		5800 5810 5831 5832 5841 5848 5899 5906 5996
+PATCH_SITES=	ftp://ftp.mcs.anl.gov/pub/mpi/patch/${PORTVERSION}/
+PATCHFILES=	6187
 
 MAINTAINER=	dbader@eece.unm.edu
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 BUILD_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
-DIST_SUBDIR=	mpich
-
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-cflags="${CFLAGS}" -prefix=${PREFIX}/mpich \
 		-mpe_opts="--with-wishloc=wish8.0"
@@ -41,151 +38,126 @@ CONFIGURE_ARGS+= -rsh="${LOCALBASE}/bin/ssh"
 
 ALL_TARGET=
 MANPREFIX=	${PREFIX}/mpich
-MAN1=		Jumpshots.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_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_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_Error_string.3 MPI_FLOAT.3 MPI_FLOAT_INT.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_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_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_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 \
-		MPI_File_get_errhandler.3 MPI_File_set_errhandler.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_mergelogs.4 CLOG_mergend.4 CLOG_nodebuffer2disk.4 \
-		CLOG_msgtype.4 CLOG_newbuff.4 CLOG_procbuf.4 CLOG_reclen.4 \
-		CLOG_rectype.4 CLOG_reinit_buff.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_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_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
+
+MAN1= 		MPI.1 cleanipcs.1 mpiCC.1 mpicc.1 mpif77.1 mpif90.1 mpiman.1		\
+		mpireconfig.1 mpirun.1 Jumpshots.1 chp4_servs.1 tstmachines.1
+MAN3= 		MPI_File_get_position.3 MPI_File_preallocate.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_Allgatherv.3 MPI_Allreduce.3 MPI_Alltoall.3 MPI_Alltoallv.3		\
+		MPI_ERR_REQUEST.3 MPIO_Wait.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_init.3 MPI_Buffer_attach.3		\
+		MPI_Buffer_detach.3 MPI_CART.3 MPI_CHAR.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_Comm_compare.3	\
+		MPI_Comm_create.3 MPI_Comm_dup.3 MPI_Comm_free.3 MPI_Comm_group.3	\
+		MPI_Comm_get_name.3 MPI_Comm_rank.3 MPI_Comm_remote_size.3		\
+		MPI_Comm_size.3 MPI_Comm_split.3 MPI_Comm_set_name.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_ERROR.3 MPI_ERRORS_ARE_FATAL.3			\
+		MPI_ERRORS_RETURN.3 MPI_ERR_ARG.3 MPI_IO.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_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_OP.3 MPI_ERR_NULL.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_ROOT.3 MPI_ERR_TAG.3		\
+		MPI_ERR_TOPOLOGY.3 MPI_ERR_TRUNCATE.3 MPI_ERR_TYPE.3 MPI_ERR_UNKNOWN.3	\
+		MPI_Errhandler_free.3 MPI_Errhandler_get.3 MPI_Errhandler_set.3		\
+		MPI_FLOAT.3 MPI_GRAPH.3 MPI_Error_class.3 MPI_FLOAT_INT.3		\
+		MPI_Finalize.3 MPI_Gather.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_set_errhandler.3 MPI_File_get_info.3 MPI_File_iread.3		\
+		MPI_File_set_size.3 MPI_File_get_size.3 MPI_File_read.3			\
+		MPI_File_get_view.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_all.3 MPI_File_read_at_all_begin.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_ordered.3 MPI_Info_get_nthkey.3	\
+		MPI_File_read_ordered_begin.3 MPI_File_read_ordered_end.3		\
+		MPI_File_read_shared.3 MPI_File_seek.3 MPI_File_set_atomicity.3		\
+		MPI_File_set_info.3 MPI_File_write.3 MPI_File_sync.3			\
+		MPI_File_write_all.3 MPI_File_write_all_begin.3				\
+		MPI_File_write_all_end.3 MPI_HOST.3 MPI_File_write_at.3			\
+		MPI_File_write_at_all.3 MPI_File_write_at_all_end.3			\
+		MPI_Type_create_subarray.3 MPI_File_write_ordered.3			\
+		MPI_File_write_ordered_end.3 MPI_File_write_shared.3 MPI_Info_c2f.3	\
+		MPI_Info_create.3 MPI_GROUP_EMPTY.3 MPI_GROUP_NULL.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_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_Handler_function.3	\
+		MPI_IDENT.3 MPI_INT.3 MPI_INTEGER.3 MPI_INTEGER1.3 MPI_INTEGER2.3	\
+		MPI_INTEGER4.3 MPI_Ibsend.3 MPI_Info_delete.3 MPI_Info_dup.3		\
+		MPIO_Request_c2f.3 MPI_Info_f2c.3 MPI_Info_free.3 MPI_LB.3		\
+		MPI_Info_get_nkeys.3 MPI_Info_get_valuelen.3 MPI_File_get_errhandler.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_LOGICAL.3		\
+		MPI_LONG.3 MPI_LONG_DOUBLE.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_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_REAL8.3 MPI_REQUEST_NULL.3 MPI_Recv.3	\
+		MPI_Recv_init.3 MPI_Reduce.3 MPI_Rsend.3 MPI_Request_c2f.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_Status_c2f.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_contiguous.3	\
+		MPI_Type_create_indexed_block.3 MPI_Init_thread.3 MPI_UB.3		\
+		MPI_Unpack.3 MPI_Type_free.3 MPI_Type_get_envelope.3			\
+		MPI_Type_hindexed.3 MPI_Type_hvector.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_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 Constants.3		\
+		MPI_2COMPLEX.3 MPI_2DOUBLE_COMPLEX.3 MPI_Allgather.3 MPI_Attr_delete.3	\
+		MPI_Bsend.3 MPI_COMM_NULL.3 MPI_Cartdim_get.3 MPI_Comm_remote_group.3	\
+		MPI_ERRHANDLER_NULL.3 MPI_ERR_BAD_ARGS.3 MPI_ERR_EXHAUSTED.3		\
+		MPI_ERR_OTHER.3 MPI_Errhandler_create.3 MPI_Error_string.3		\
+		MPI_Finalized.3 MPI_Graph_neighbors_count.3 MPI_Info_get.3		\
+		MPI_Type_create_darray.3 MPI_LONG_DOUBLE_INT.3 MPI_Op_free.3		\
+		MPI_REAL4.3 MPI_Reduce_scatter.3 MPI_Request_free.3 MPI_Startall.3	\
+		MPI_Type_commit.3 MPI_Type_extent.3 MPI_Type_get_contents.3		\
+		MPI_Type_indexed.3 MPI_File_c2f.3 MPI_File_close.3			\
+		MPI_File_get_position_shared.3 MPI_File_get_type_extent.3		\
+		MPI_File_read_at_all_end.3 MPI_File_seek_shared.3 MPI_File_set_view.3	\
+		MPI_File_write_ordered_begin.3 MPIO_Request_f2c.3			\
+		MPI_File_write_at_all_begin.3
+MAN4= 		CLOG_Init.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_mergelogs.4 CLOG_mergend.4 CLOG_msgtype.4 CLOG_procbuf.4 MPE.4	\
+		CLOG_newbuff.4 CLOG_reclen.4 CLOG_reinit_buff.4 CLOG_treesetup.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_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_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_Log_send.4		\
+		MPE_Num_colors.4 MPE_Open_graphics.4 MPE_Print_datatype_pack_action.4	\
+		MPE_Seq_begin.4 MPE_Update.4 MPE_ReturnTags.4 MPE_Seq_end.4		\
+		MPE_Start_log.4 MPE_Stop_log.4 MPE_TagsEnd.4 CLOG_Finalize.4		\
+		CLOG_Output.4 CLOG_nodebuffer2disk.4 CLOG_rectype.4			\
+		MPE_Describe_event.4 MPE_Get_mouse_press.4 MPE_Make_color_array.4	\
+		MPE_Print_datatype_unpack_action.4
 INSTALL_TARGET=	install
 
 .include <bsd.port.post.mk>
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index ea832dd94942..b0ed6e6b8ea2 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,21 +1,2 @@
-MD5 (mpich/mpich-1.2.1.tar.gz) = d5efae9f23df2aa6f0f28492a7697c35
-MD5 (mpich/5487) = 42461c77193e018853da18315e44b559
-MD5 (mpich/5524) = 09f2a64db538ca237a63fec28359aa38
-MD5 (mpich/5542) = f7fa831eac2a8c289a8254080d3b2e58
-MD5 (mpich/5543) = 1d2db0f034f263fe94dd20079ac8fef2
-MD5 (mpich/5594) = 6c2982030bcb4d3d0fd001cc8b54e405
-MD5 (mpich/5597) = c14b42d99a40455ae37d21b0b51a6d70
-MD5 (mpich/5613) = cb555c9fc26beb1b5452514cdb398c99
-MD5 (mpich/5655) = 1d3df6c333217da09552fe4bc6df1f25
-MD5 (mpich/5687) = 9e41a26b4262cfb5cab498fb5850d336
-MD5 (mpich/5700) = 6924b27ef00b010b1ca3d436c7258feb
-MD5 (mpich/5776) = b72ffa908eae3272c2c28e003ca58e71
-MD5 (mpich/5800) = 1437cab91f5ff473d54019ddd0c5a3ee
-MD5 (mpich/5810) = 5e8ade426dc5ac743cff2acf9e9d98e7
-MD5 (mpich/5831) = 9b0483c1b210321f07c913f0345d0edb
-MD5 (mpich/5832) = 2de5e9077ab0acde3fa944836db2cda0
-MD5 (mpich/5841) = 3488a72c62020d269cb90b6ffce1b9ec
-MD5 (mpich/5848) = 9d98faa3345aab3b5f8510faee67e5bc
-MD5 (mpich/5899) = 51271838513f7939a85363fc9a78cff8
-MD5 (mpich/5906) = 6349b7b0611efb899ef904e688b9204e
-MD5 (mpich/5996) = 3aa53a047ec5f08f8231f846071aa9b0
+MD5 (mpich/mpich-1.2.2.tar.gz) = 9e9062a016f14af1560f55150761f0a0
+MD5 (mpich/6187) = 8a2f5fc104b3946ca713a08ce5d587b8
diff --git a/net/mpich/files/patch-aa b/net/mpich/files/patch-aa
deleted file mode 100644
index 6159ecbb0edf..000000000000
--- a/net/mpich/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- romio/adio/common/ad_fstype.c-orig	Wed Jul 19 16:38:31 2000
-+++ romio/adio/common/ad_fstype.c	Thu Sep  7 18:47:44 2000
-@@ -26,8 +26,10 @@
- #ifdef SX4
- #include <sys/stat.h>
- #endif
-+#ifndef FREEBSD
- #ifdef PVFS
- #include "pvfs_config.h"
-+#endif
- #endif
- 
- void ADIO_FileSysType(char *filename, int *fstype, int *error_code)
diff --git a/net/mpich/files/patch-mpid::ch2::chtick.c b/net/mpich/files/patch-mpid::ch2::chtick.c
new file mode 100644
index 000000000000..a12aee39f11f
--- /dev/null
+++ b/net/mpich/files/patch-mpid::ch2::chtick.c
@@ -0,0 +1,10 @@
+--- mpid/ch2/chtick.c-orig	Wed Apr  4 09:16:05 2001
++++ mpid/ch2/chtick.c	Sat Aug 25 08:49:10 2001
+@@ -14,6 +14,7 @@
+       !defined(MPID_CH_Wtime)
+ #define USING_POSIX_CLOCK
+ #include <time.h>
++#include <sys/time.h>
+ #endif
+ /* 
+    This returns a value that is correct but not the best value that
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index a1af206fd6fa..8f9929976123 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -1,7 +1,6 @@
 mpich/bin/clog2alog
 mpich/bin/clog2slog
 mpich/bin/clog_print
-mpich/bin/execer
 mpich/bin/logviewer
 mpich/bin/mpereconfig
 mpich/bin/mpereconfig.dat
@@ -24,7 +23,6 @@ mpich/bin/mpirun_dbg.dbx
 mpich/bin/mpirun_dbg.ddd
 mpich/bin/mpirun_dbg.gdb
 mpich/bin/mpirun_dbg.totalview
-mpich/bin/mpirun_dbg.totalview.in.orig
 mpich/bin/mpirun_dbg.xxgdb
 mpich/bin/serv_p4
 mpich/bin/slog_print
@@ -36,16 +34,6 @@ mpich/etc/mpichconf.h.dat
 mpich/etc/mpichlib.conf
 mpich/etc/mpif77.conf
 mpich/etc/mpif90.conf
-mpich/examples/MPI-2-C++/Makefile
-mpich/examples/MPI-2-C++/Makefile.in
-mpich/examples/MPI-2-C++/README
-mpich/examples/MPI-2-C++/chapter_10_mpi2.cc
-mpich/examples/MPI-2-C++/hello_world.cc
-mpich/examples/MPI-2-C++/mpirun
-mpich/examples/MPI-2-C++/pi.cc
-mpich/examples/MPI-2-C++/ring.cc
-mpich/examples/MPI-2-C++/topology.cc
-mpich/examples/MPI-2-C++/user_bcast.cc
 mpich/examples/Makefile
 mpich/examples/Makefile.in
 mpich/examples/README
@@ -63,6 +51,7 @@ mpich/include/mpe.h
 mpich/include/mpe_graphics.h
 mpich/include/mpe_log.h
 mpich/include/mpeexten.h
+mpich/include/mpef.h
 mpich/include/mpetools.h
 mpich/include/mpi.h
 mpich/include/mpi2c++/comm.h
@@ -138,7 +127,9 @@ mpich/share/examples/Makefile
 mpich/share/examples/Makefile.in
 mpich/share/examples/cpi.c
 mpich/share/examples/cpilog.c
+mpich/share/examples/cxgraphics.c
 mpich/share/examples/fpi.f
+mpich/share/examples/fxgraphics.f
 mpich/share/examples/mpirun
 mpich/share/examples/srtest.c
 mpich/share/machines.freebsd
@@ -214,10 +205,12 @@ mpich/www/www3/MPI_Comm_compare.html
 mpich/www/www3/MPI_Comm_create.html
 mpich/www/www3/MPI_Comm_dup.html
 mpich/www/www3/MPI_Comm_free.html
+mpich/www/www3/MPI_Comm_get_name.html
 mpich/www/www3/MPI_Comm_group.html
 mpich/www/www3/MPI_Comm_rank.html
 mpich/www/www3/MPI_Comm_remote_group.html
 mpich/www/www3/MPI_Comm_remote_size.html
+mpich/www/www3/MPI_Comm_set_name.html
 mpich/www/www3/MPI_Comm_size.html
 mpich/www/www3/MPI_Comm_split.html
 mpich/www/www3/MPI_Comm_test_inter.html