5 files changed, 421 insertions, 402 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 0d352c839ce8..39afa7d072ad 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -3,13 +3,13 @@
 
 PORTNAME=	mpich2
 DISTVERSION=	1.3.2p1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	5
 CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
 DIST_SUBDIR=	mpich
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Portable implementation of MPI-1 and MPI-2
 
 LICENSE=	MPICH
@@ -22,11 +22,10 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 GNU_CONFIGURE=	yes
-USES=		fortran perl5 pkgconfig
+USES=		libtool:keepla fortran perl5 pkgconfig python
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	build
-USE_PYTHON=	yes
 
 OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
@@ -62,7 +61,21 @@ VERSOM=		${VERSO:R}
 PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
+THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
+		test/mpi/threads/pt2pt/Makefile.in		\
+		src/mpe2/src/logging/configure			\
+		src/mpi/romio/configure src/openpa/configure	\
+		src/pm/hydra/configure
+LOCALBASE2FIX=	src/mpe2/src/slog2sdk/trace_rlog/configure	\
+		src/mpe2/src/slog2sdk/trace_sample/configure	\
+		src/mpe2/src/graphics/configure
+DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
+		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
+CONFPFX2FIX1=	src/pm/mpd/mpd.py
+CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
+		src/pm/mpd/mpdroot.c
+BIN2STRIP=	check_callstack clog2_join clog2_print clog2_repair
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
@@ -84,6 +97,7 @@ BUILD_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper
 PLIST_SUB+=	JAVA=""
 PLX11=		""
+BIN2STRIP+=	rlog_check_timeorder rlog_print
 .endif
 
 #define WITH_RECV_TIMEOUT to be an appropriate value (>20 for slow machines),
@@ -100,6 +114,7 @@ PLIST_SUB+=	PM_MPD="@comment " PM_SMPD=""
 .else
 CONFIGURE_ARGS+=	--with-pmi=simple --with-pm=mpd
 PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
+BIN2STRIP+=	mpdroot
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
@@ -113,24 +128,6 @@ PLIST_SUB+=	X11=${PLX11}
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-.include "${FILESDIR}/manpages"
-.endif
-
-THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
-		test/mpi/threads/pt2pt/Makefile.in		\
-		src/mpe2/src/logging/configure			\
-		src/mpi/romio/configure src/openpa/configure	\
-		src/pm/hydra/configure
-LOCALBASE2FIX=	src/mpe2/src/slog2sdk/trace_rlog/configure	\
-		src/mpe2/src/slog2sdk/trace_sample/configure	\
-		src/mpe2/src/graphics/configure
-DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
-		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
-CONFPFX2FIX1=	src/pm/mpd/mpd.py
-CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
-		src/pm/mpd/mpdroot.c
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${THREAD2FIX:S|^|${WRKSRC}/|}
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
@@ -163,15 +160,20 @@ pre-install:
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py  ${WRKSRC}/bin
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyc ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyo ${PREFIX}/bin
+	(cd ${STAGEDIR}${PREFIX}/bin && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
+		-d ${PREFIX} -f bin)
+	(cd ${STAGEDIR}${PREFIX}/bin && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
+		-d ${PREFIX} -f bin)
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pyo ${STAGEDIR}${PREFIX}/bin
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
-	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/
-	if [ ! -e ${PREFIX}/etc/mpd.conf ]; then \
-		${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${PREFIX}/etc/mpd.conf ; \
-	fi
-	${CHMOD} 600 ${PREFIX}/etc/mpd.conf ${PREFIX}/etc/mpd.conf.dist
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${STAGEDIR}${PREFIX}/etc/
+	${REINPLACE_CMD} -e '/${STAGEDIR:C|/|\/|g}/s|${STAGEDIR}||'	\
+		${STAGEDIR}${PREFIX}/sbin/mpeuninstall
+	${RM} ${STAGEDIR}${PREFIX}/sbin/mpeuninstall.bak
+.for pg in ${BIN2STRIP}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pg}
+.endfor
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
diff --git a/net/mpich2/files/manpages b/net/mpich2/files/manpages
deleted file mode 100644
index 5696290d2f41..000000000000
--- a/net/mpich2/files/manpages
+++ /dev/null
@@ -1,356 +0,0 @@
-MAN1= \
-MPI.1 \
-mpicc.1 \
-mpicxx.1 \
-mpiexec.1 \
-mpif77.1 \
-mpif90.1
-
-MAN3= \
-MPI_Abort.3 \
-MPI_Accumulate.3 \
-MPI_Add_error_class.3 \
-MPI_Add_error_code.3 \
-MPI_Add_error_string.3 \
-MPI_Address.3 \
-MPI_Allgather.3 \
-MPI_Allgatherv.3 \
-MPI_Alloc_mem.3 \
-MPI_Allreduce.3 \
-MPI_Alltoall.3 \
-MPI_Alltoallv.3 \
-MPI_Alltoallw.3 \
-MPI_Attr_delete.3 \
-MPI_Attr_get.3 \
-MPI_Attr_put.3 \
-MPI_Barrier.3 \
-MPI_Bcast.3 \
-MPI_Bsend.3 \
-MPI_Bsend_init.3 \
-MPI_Buffer_attach.3 \
-MPI_Buffer_detach.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_Close_port.3 \
-MPI_Comm_accept.3 \
-MPI_Comm_call_errhandler.3 \
-MPI_Comm_compare.3 \
-MPI_Comm_connect.3 \
-MPI_Comm_create.3 \
-MPI_Comm_create_errhandler.3 \
-MPI_Comm_create_keyval.3 \
-MPI_Comm_delete_attr.3 \
-MPI_Comm_disconnect.3 \
-MPI_Comm_dup.3 \
-MPI_Comm_free.3 \
-MPI_Comm_free_keyval.3 \
-MPI_Comm_get_attr.3 \
-MPI_Comm_get_errhandler.3 \
-MPI_Comm_get_name.3 \
-MPI_Comm_get_parent.3 \
-MPI_Comm_group.3 \
-MPI_Comm_join.3 \
-MPI_Comm_rank.3 \
-MPI_Comm_remote_group.3 \
-MPI_Comm_remote_size.3 \
-MPI_Comm_set_attr.3 \
-MPI_Comm_set_errhandler.3 \
-MPI_Comm_set_name.3 \
-MPI_Comm_size.3 \
-MPI_Comm_spawn.3 \
-MPI_Comm_spawn_multiple.3 \
-MPI_Comm_split.3 \
-MPI_Comm_test_inter.3 \
-MPI_Dims_create.3 \
-MPI_Dist_graph_create.3 \
-MPI_Dist_graph_create_adjacent.3 \
-MPI_Dist_graph_neighbors.3 \
-MPI_Dist_graph_neighbors_count.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_Exscan.3 \
-MPI_File_c2f.3 \
-MPI_File_call_errhandler.3 \
-MPI_File_close.3 \
-MPI_File_create_errhandler.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_errhandler.3 \
-MPI_File_get_group.3 \
-MPI_File_get_info.3 \
-MPI_File_get_position.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_preallocate.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_begin.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_errhandler.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_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_begin.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_Finalize.3 \
-MPI_Finalized.3 \
-MPI_Free_mem.3 \
-MPI_Gather.3 \
-MPI_Gatherv.3 \
-MPI_Get.3 \
-MPI_Get_address.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_Grequest_complete.3 \
-MPI_Grequest_start.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_Ibsend.3 \
-MPI_Info_create.3 \
-MPI_Info_delete.3 \
-MPI_Info_dup.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_Init_thread.3 \
-MPI_Initialized.3 \
-MPI_Intercomm_create.3 \
-MPI_Intercomm_merge.3 \
-MPI_Iprobe.3 \
-MPI_Irecv.3 \
-MPI_Irsend.3 \
-MPI_Is_thread_main.3 \
-MPI_Isend.3 \
-MPI_Issend.3 \
-MPI_Keyval_create.3 \
-MPI_Keyval_free.3 \
-MPI_Lookup_name.3 \
-MPI_Op_commute.3 \
-MPI_Op_create.3 \
-MPI_Op_free.3 \
-MPI_Open_port.3 \
-MPI_Pack.3 \
-MPI_Pack_external.3 \
-MPI_Pack_external_size.3 \
-MPI_Pack_size.3 \
-MPI_Pcontrol.3 \
-MPI_Probe.3 \
-MPI_Publish_name.3 \
-MPI_Put.3 \
-MPI_Query_thread.3 \
-MPI_Recv.3 \
-MPI_Recv_init.3 \
-MPI_Reduce.3 \
-MPI_Reduce_local.3 \
-MPI_Reduce_scatter.3 \
-MPI_Reduce_scatter_block.3 \
-MPI_Register_datarep.3 \
-MPI_Request_free.3 \
-MPI_Request_get_status.3 \
-MPI_Rsend.3 \
-MPI_Rsend_init.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_set_cancelled.3 \
-MPI_Status_set_elements.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_darray.3 \
-MPI_Type_create_hindexed.3 \
-MPI_Type_create_hvector.3 \
-MPI_Type_create_indexed_block.3 \
-MPI_Type_create_keyval.3 \
-MPI_Type_create_resized.3 \
-MPI_Type_create_struct.3 \
-MPI_Type_create_subarray.3 \
-MPI_Type_delete_attr.3 \
-MPI_Type_dup.3 \
-MPI_Type_extent.3 \
-MPI_Type_free.3 \
-MPI_Type_free_keyval.3 \
-MPI_Type_get_attr.3 \
-MPI_Type_get_contents.3 \
-MPI_Type_get_envelope.3 \
-MPI_Type_get_extent.3 \
-MPI_Type_get_name.3 \
-MPI_Type_get_true_extent.3 \
-MPI_Type_hindexed.3 \
-MPI_Type_hvector.3 \
-MPI_Type_indexed.3 \
-MPI_Type_lb.3 \
-MPI_Type_match_size.3 \
-MPI_Type_set_attr.3 \
-MPI_Type_set_name.3 \
-MPI_Type_size.3 \
-MPI_Type_struct.3 \
-MPI_Type_ub.3 \
-MPI_Type_vector.3 \
-MPI_Unpack.3 \
-MPI_Unpack_external.3 \
-MPI_Unpublish_name.3 \
-MPI_Wait.3 \
-MPI_Waitall.3 \
-MPI_Waitany.3 \
-MPI_Waitsome.3 \
-MPI_Win_call_errhandler.3 \
-MPI_Win_complete.3 \
-MPI_Win_create.3 \
-MPI_Win_create_errhandler.3 \
-MPI_Win_create_keyval.3 \
-MPI_Win_delete_attr.3 \
-MPI_Win_fence.3 \
-MPI_Win_free.3 \
-MPI_Win_free_keyval.3 \
-MPI_Win_get_attr.3 \
-MPI_Win_get_errhandler.3 \
-MPI_Win_get_group.3 \
-MPI_Win_get_name.3 \
-MPI_Win_lock.3 \
-MPI_Win_post.3 \
-MPI_Win_set_attr.3 \
-MPI_Win_set_errhandler.3 \
-MPI_Win_set_name.3 \
-MPI_Win_start.3 \
-MPI_Win_test.3 \
-MPI_Win_unlock.3 \
-MPI_Win_wait.3 \
-MPI_Wtick.3 \
-MPI_Wtime.3
-
-MAN4= \
-MPE_Add_RGB_color.4 \
-MPE_CaptureFile.4 \
-MPE_Close_graphics.4 \
-MPE_Comm_global_rank.4 \
-MPE_Decomp1d.4 \
-MPE_Describe_comm_event.4 \
-MPE_Describe_comm_state.4 \
-MPE_Describe_event.4 \
-MPE_Describe_info_event.4 \
-MPE_Describe_info_state.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_Errors_call_debugger.4 \
-MPE_Fill_circle.4 \
-MPE_Fill_rectangle.4 \
-MPE_Finish_log.4 \
-MPE_GetHostName.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_bare_event.4 \
-MPE_Log_comm_event.4 \
-MPE_Log_comm_receive.4 \
-MPE_Log_comm_send.4 \
-MPE_Log_event.4 \
-MPE_Log_get_event_number.4 \
-MPE_Log_get_solo_eventID.4 \
-MPE_Log_get_state_eventIDs.4 \
-MPE_Log_info_event.4 \
-MPE_Log_merged_logfilename.4 \
-MPE_Log_pack.4 \
-MPE_Log_receive.4 \
-MPE_Log_send.4 \
-MPE_Log_sync_clocks.4 \
-MPE_Make_color_array.4 \
-MPE_Num_colors.4 \
-MPE_Open_graphics.4 \
-MPE_ReturnTags.4 \
-MPE_Seq_begin.4 \
-MPE_Seq_end.4 \
-MPE_Signals_call_debugger.4 \
-MPE_Start_log.4 \
-MPE_Stop_log.4 \
-MPE_TagsEnd.4 \
-MPE_Update.4
diff --git a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in b/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
index 8a29b247fb4e..80c96bad63f4 100644
--- a/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
+++ b/net/mpich2/files/patch-src_mpe2_src_sbin_mpeinstall.in
@@ -1,6 +1,6 @@
---- src/mpe2/sbin/mpeinstall.in.orig	2009-01-31 00:56:35.000000000 +0100
-+++ src/mpe2/sbin/mpeinstall.in	2009-06-24 18:32:04.000000000 +0200
-@@ -522,7 +522,7 @@
+--- src/mpe2/sbin/mpeinstall.in.orig	2009-10-16 01:50:22.000000000 +0200
++++ src/mpe2/sbin/mpeinstall.in	2014-08-20 22:43:03.000000000 +0200
+@@ -529,7 +529,7 @@
      # so $docdir (with NULL PACKAGE) is appended to dirlist for removal.
      savedPACKAGE=$PACKAGE
      PACKAGE=""
@@ -9,7 +9,7 @@
      PACKAGE=$savedPACKAGE
  fi
  
-@@ -570,15 +570,15 @@
+@@ -577,15 +577,15 @@
  # ie INSTALL $top_srcdir/doc  $docdir
  #    INSTALL $top_srcdir/man  $mandir
  #    INSTALL $top_srcdir/html $htmldir
@@ -34,3 +34,22 @@
  
  # Remove old uninstall file
  if [ "$appendUninstall" = 0 -a -f $UNINSTALLFILE ] ; then
+@@ -632,7 +632,6 @@
+ 
+ if [ "$appendUninstall" = 0 ] ; then
+     echo "$RM -f $sbindir/mpeuninstall" >> $UNINSTALLFILE
+-    echo "$RM -f $UNINSTALLFILE" >> $UNINSTALLFILE
+ fi
+ 
+ # Add the directory removes to the UNINSTALL file
+@@ -643,8 +642,8 @@
+ if [ "$appendUninstall" = 0 ] ; then
+     cp $UNINSTALLFILE $sbinbuild_dir/mpeuninstall
+ #
+-    echo "Installed $pkgname in $DESTDIR$prefix"
+-    echo "$UNINSTALLFILE may be used to remove the installation"
++    echo "Installed $pkgname in $prefix"
++    echo "${sbindir}/${UNINSTALL_base} may be used to remove the installation"
+ fi
+ 
+ if [ $errs -gt 0 ] ; then
diff --git a/net/mpich2/files/patch-src_openpa_Makefile.in b/net/mpich2/files/patch-src_openpa_Makefile.in
index a6188cf07f06..c7e4975efbe7 100644
--- a/net/mpich2/files/patch-src_openpa_Makefile.in
+++ b/net/mpich2/files/patch-src_openpa_Makefile.in
@@ -5,7 +5,7 @@
  
  # pkgconfig files
 -pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = libdata/pkgconfig
++pkgconfigdir = $(libdir)data/pkgconfig
  pkgconfig_DATA = openpa.pc
  all: all-recursive
  
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index 6dbbf5c3f6d8..824af4cc6a10 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -98,6 +98,11 @@ bin/parkill
 %%JAVA%%bin/slog2navigator
 %%JAVA%%bin/slog2print
 %%JAVA%%bin/slog2updater
+@unexec if cmp -s %D/etc/mpd.conf %D/etc/mpd.conf.dist ; then rm -f %D/etc/mpd.conf ; fi
+@mode 600
+etc/mpd.conf.dist
+@exec if [ ! -f %D/etc/mpd.conf ]; then cp -p %D/%F %B/mpd.conf; fi
+@mode
 etc/mpe_callstack_ldflags.conf
 etc/mpe_f77env.conf
 etc/mpe_graphics.conf
@@ -164,8 +169,8 @@ include/primitives/opa_unsafe.h
 lib/libampe.a
 lib/libfmpich.a
 lib/libfmpich.so
-lib/libfmpich.so.%%VERM%%
 lib/libfmpich.so.%%VER%%
+lib/libfmpich.so.%%VERM%%
 lib/liblmpe.a
 lib/libmpe.a
 lib/libmpe_collchk.a
@@ -189,10 +194,12 @@ lib/libmpl.a
 lib/libmpl.la
 lib/libmpl.so
 lib/libmpl.so.1
+lib/libmpl.so.1.0.0
 lib/libopa.a
 lib/libopa.la
 lib/libopa.so
 lib/libopa.so.1
+lib/libopa.so.1.0.0
 lib/libtmpe.a
 %%JAVA%%lib/logconvertor.jar
 lib/mpe_prof.o
@@ -205,6 +212,362 @@ lib/mpe_prof.o
 %%JAVA%%lib/trace_rlog/libTraceInput.la
 %%JAVA%%lib/trace_rlog/libTraceInput.so
 %%JAVA%%lib/traceprint.jar
+libdata/pkgconfig/mpich2-c.pc
+libdata/pkgconfig/mpich2-cxx.pc
+libdata/pkgconfig/mpich2-f77.pc
+libdata/pkgconfig/mpich2-f90.pc
+libdata/pkgconfig/openpa.pc
+%%PORTDOCS%%man/man1/MPI.1.gz
+%%PORTDOCS%%man/man1/mpicc.1.gz
+%%PORTDOCS%%man/man1/mpicxx.1.gz
+%%PORTDOCS%%man/man1/mpiexec.1.gz
+%%PORTDOCS%%man/man1/mpif77.1.gz
+%%PORTDOCS%%man/man1/mpif90.1.gz
+%%PORTDOCS%%man/man3/MPI_Abort.3.gz
+%%PORTDOCS%%man/man3/MPI_Accumulate.3.gz
+%%PORTDOCS%%man/man3/MPI_Add_error_class.3.gz
+%%PORTDOCS%%man/man3/MPI_Add_error_code.3.gz
+%%PORTDOCS%%man/man3/MPI_Add_error_string.3.gz
+%%PORTDOCS%%man/man3/MPI_Address.3.gz
+%%PORTDOCS%%man/man3/MPI_Allgather.3.gz
+%%PORTDOCS%%man/man3/MPI_Allgatherv.3.gz
+%%PORTDOCS%%man/man3/MPI_Alloc_mem.3.gz
+%%PORTDOCS%%man/man3/MPI_Allreduce.3.gz
+%%PORTDOCS%%man/man3/MPI_Alltoall.3.gz
+%%PORTDOCS%%man/man3/MPI_Alltoallv.3.gz
+%%PORTDOCS%%man/man3/MPI_Alltoallw.3.gz
+%%PORTDOCS%%man/man3/MPI_Attr_delete.3.gz
+%%PORTDOCS%%man/man3/MPI_Attr_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Attr_put.3.gz
+%%PORTDOCS%%man/man3/MPI_Barrier.3.gz
+%%PORTDOCS%%man/man3/MPI_Bcast.3.gz
+%%PORTDOCS%%man/man3/MPI_Bsend.3.gz
+%%PORTDOCS%%man/man3/MPI_Bsend_init.3.gz
+%%PORTDOCS%%man/man3/MPI_Buffer_attach.3.gz
+%%PORTDOCS%%man/man3/MPI_Buffer_detach.3.gz
+%%PORTDOCS%%man/man3/MPI_Cancel.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_coords.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_map.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_rank.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_shift.3.gz
+%%PORTDOCS%%man/man3/MPI_Cart_sub.3.gz
+%%PORTDOCS%%man/man3/MPI_Cartdim_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Close_port.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_accept.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_call_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_compare.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_connect.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_create_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_create_keyval.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_delete_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_disconnect.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_dup.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_free_keyval.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_get_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_get_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_get_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_get_parent.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_group.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_join.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_rank.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_remote_group.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_remote_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_set_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_set_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_set_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_spawn.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_spawn_multiple.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_split.3.gz
+%%PORTDOCS%%man/man3/MPI_Comm_test_inter.3.gz
+%%PORTDOCS%%man/man3/MPI_Dims_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Dist_graph_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Dist_graph_create_adjacent.3.gz
+%%PORTDOCS%%man/man3/MPI_Dist_graph_neighbors.3.gz
+%%PORTDOCS%%man/man3/MPI_Dist_graph_neighbors_count.3.gz
+%%PORTDOCS%%man/man3/MPI_Errhandler_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Errhandler_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Errhandler_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Errhandler_set.3.gz
+%%PORTDOCS%%man/man3/MPI_Error_class.3.gz
+%%PORTDOCS%%man/man3/MPI_Error_string.3.gz
+%%PORTDOCS%%man/man3/MPI_Exscan.3.gz
+%%PORTDOCS%%man/man3/MPI_File_c2f.3.gz
+%%PORTDOCS%%man/man3/MPI_File_call_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_File_close.3.gz
+%%PORTDOCS%%man/man3/MPI_File_create_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_File_delete.3.gz
+%%PORTDOCS%%man/man3/MPI_File_f2c.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_amode.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_atomicity.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_byte_offset.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_group.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_info.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_position.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_position_shared.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_size.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_type_extent.3.gz
+%%PORTDOCS%%man/man3/MPI_File_get_view.3.gz
+%%PORTDOCS%%man/man3/MPI_File_iread.3.gz
+%%PORTDOCS%%man/man3/MPI_File_iread_at.3.gz
+%%PORTDOCS%%man/man3/MPI_File_iread_shared.3.gz
+%%PORTDOCS%%man/man3/MPI_File_iwrite.3.gz
+%%PORTDOCS%%man/man3/MPI_File_iwrite_at.3.gz
+%%PORTDOCS%%man/man3/MPI_File_iwrite_shared.3.gz
+%%PORTDOCS%%man/man3/MPI_File_open.3.gz
+%%PORTDOCS%%man/man3/MPI_File_preallocate.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_all.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_all_begin.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_all_end.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_at.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_at_all.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_at_all_begin.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_at_all_end.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_ordered.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_ordered_begin.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_ordered_end.3.gz
+%%PORTDOCS%%man/man3/MPI_File_read_shared.3.gz
+%%PORTDOCS%%man/man3/MPI_File_seek.3.gz
+%%PORTDOCS%%man/man3/MPI_File_seek_shared.3.gz
+%%PORTDOCS%%man/man3/MPI_File_set_atomicity.3.gz
+%%PORTDOCS%%man/man3/MPI_File_set_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_File_set_info.3.gz
+%%PORTDOCS%%man/man3/MPI_File_set_size.3.gz
+%%PORTDOCS%%man/man3/MPI_File_set_view.3.gz
+%%PORTDOCS%%man/man3/MPI_File_sync.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_all.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_all_begin.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_all_end.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_at.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_at_all.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_at_all_begin.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_at_all_end.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_ordered.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_ordered_begin.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_ordered_end.3.gz
+%%PORTDOCS%%man/man3/MPI_File_write_shared.3.gz
+%%PORTDOCS%%man/man3/MPI_Finalize.3.gz
+%%PORTDOCS%%man/man3/MPI_Finalized.3.gz
+%%PORTDOCS%%man/man3/MPI_Free_mem.3.gz
+%%PORTDOCS%%man/man3/MPI_Gather.3.gz
+%%PORTDOCS%%man/man3/MPI_Gatherv.3.gz
+%%PORTDOCS%%man/man3/MPI_Get.3.gz
+%%PORTDOCS%%man/man3/MPI_Get_address.3.gz
+%%PORTDOCS%%man/man3/MPI_Get_count.3.gz
+%%PORTDOCS%%man/man3/MPI_Get_elements.3.gz
+%%PORTDOCS%%man/man3/MPI_Get_processor_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Get_version.3.gz
+%%PORTDOCS%%man/man3/MPI_Graph_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Graph_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Graph_map.3.gz
+%%PORTDOCS%%man/man3/MPI_Graph_neighbors.3.gz
+%%PORTDOCS%%man/man3/MPI_Graph_neighbors_count.3.gz
+%%PORTDOCS%%man/man3/MPI_Graphdims_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Grequest_complete.3.gz
+%%PORTDOCS%%man/man3/MPI_Grequest_start.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_compare.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_difference.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_excl.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_incl.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_intersection.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_range_excl.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_range_incl.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_rank.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_translate_ranks.3.gz
+%%PORTDOCS%%man/man3/MPI_Group_union.3.gz
+%%PORTDOCS%%man/man3/MPI_Ibsend.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_delete.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_dup.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_get.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_get_nkeys.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_get_nthkey.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_get_valuelen.3.gz
+%%PORTDOCS%%man/man3/MPI_Info_set.3.gz
+%%PORTDOCS%%man/man3/MPI_Init.3.gz
+%%PORTDOCS%%man/man3/MPI_Init_thread.3.gz
+%%PORTDOCS%%man/man3/MPI_Initialized.3.gz
+%%PORTDOCS%%man/man3/MPI_Intercomm_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Intercomm_merge.3.gz
+%%PORTDOCS%%man/man3/MPI_Iprobe.3.gz
+%%PORTDOCS%%man/man3/MPI_Irecv.3.gz
+%%PORTDOCS%%man/man3/MPI_Irsend.3.gz
+%%PORTDOCS%%man/man3/MPI_Is_thread_main.3.gz
+%%PORTDOCS%%man/man3/MPI_Isend.3.gz
+%%PORTDOCS%%man/man3/MPI_Issend.3.gz
+%%PORTDOCS%%man/man3/MPI_Keyval_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Keyval_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Lookup_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Op_commute.3.gz
+%%PORTDOCS%%man/man3/MPI_Op_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Op_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Open_port.3.gz
+%%PORTDOCS%%man/man3/MPI_Pack.3.gz
+%%PORTDOCS%%man/man3/MPI_Pack_external.3.gz
+%%PORTDOCS%%man/man3/MPI_Pack_external_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Pack_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Pcontrol.3.gz
+%%PORTDOCS%%man/man3/MPI_Probe.3.gz
+%%PORTDOCS%%man/man3/MPI_Publish_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Put.3.gz
+%%PORTDOCS%%man/man3/MPI_Query_thread.3.gz
+%%PORTDOCS%%man/man3/MPI_Recv.3.gz
+%%PORTDOCS%%man/man3/MPI_Recv_init.3.gz
+%%PORTDOCS%%man/man3/MPI_Reduce.3.gz
+%%PORTDOCS%%man/man3/MPI_Reduce_local.3.gz
+%%PORTDOCS%%man/man3/MPI_Reduce_scatter.3.gz
+%%PORTDOCS%%man/man3/MPI_Reduce_scatter_block.3.gz
+%%PORTDOCS%%man/man3/MPI_Register_datarep.3.gz
+%%PORTDOCS%%man/man3/MPI_Request_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Request_get_status.3.gz
+%%PORTDOCS%%man/man3/MPI_Rsend.3.gz
+%%PORTDOCS%%man/man3/MPI_Rsend_init.3.gz
+%%PORTDOCS%%man/man3/MPI_Scan.3.gz
+%%PORTDOCS%%man/man3/MPI_Scatter.3.gz
+%%PORTDOCS%%man/man3/MPI_Scatterv.3.gz
+%%PORTDOCS%%man/man3/MPI_Send.3.gz
+%%PORTDOCS%%man/man3/MPI_Send_init.3.gz
+%%PORTDOCS%%man/man3/MPI_Sendrecv.3.gz
+%%PORTDOCS%%man/man3/MPI_Sendrecv_replace.3.gz
+%%PORTDOCS%%man/man3/MPI_Ssend.3.gz
+%%PORTDOCS%%man/man3/MPI_Ssend_init.3.gz
+%%PORTDOCS%%man/man3/MPI_Start.3.gz
+%%PORTDOCS%%man/man3/MPI_Startall.3.gz
+%%PORTDOCS%%man/man3/MPI_Status_set_cancelled.3.gz
+%%PORTDOCS%%man/man3/MPI_Status_set_elements.3.gz
+%%PORTDOCS%%man/man3/MPI_Test.3.gz
+%%PORTDOCS%%man/man3/MPI_Test_cancelled.3.gz
+%%PORTDOCS%%man/man3/MPI_Testall.3.gz
+%%PORTDOCS%%man/man3/MPI_Testany.3.gz
+%%PORTDOCS%%man/man3/MPI_Testsome.3.gz
+%%PORTDOCS%%man/man3/MPI_Topo_test.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_commit.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_contiguous.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_darray.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_hindexed.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_hvector.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_indexed_block.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_keyval.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_resized.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_struct.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_create_subarray.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_delete_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_dup.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_extent.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_free_keyval.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_get_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_get_contents.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_get_envelope.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_get_extent.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_get_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_get_true_extent.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_hindexed.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_hvector.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_indexed.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_lb.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_match_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_set_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_set_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_size.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_struct.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_ub.3.gz
+%%PORTDOCS%%man/man3/MPI_Type_vector.3.gz
+%%PORTDOCS%%man/man3/MPI_Unpack.3.gz
+%%PORTDOCS%%man/man3/MPI_Unpack_external.3.gz
+%%PORTDOCS%%man/man3/MPI_Unpublish_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Wait.3.gz
+%%PORTDOCS%%man/man3/MPI_Waitall.3.gz
+%%PORTDOCS%%man/man3/MPI_Waitany.3.gz
+%%PORTDOCS%%man/man3/MPI_Waitsome.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_call_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_complete.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_create.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_create_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_create_keyval.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_delete_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_fence.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_free.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_free_keyval.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_get_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_get_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_get_group.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_get_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_lock.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_post.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_set_attr.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_set_errhandler.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_set_name.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_start.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_test.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_unlock.3.gz
+%%PORTDOCS%%man/man3/MPI_Win_wait.3.gz
+%%PORTDOCS%%man/man3/MPI_Wtick.3.gz
+%%PORTDOCS%%man/man3/MPI_Wtime.3.gz
+%%PORTDOCS%%man/man4/MPE_Add_RGB_color.4.gz
+%%PORTDOCS%%man/man4/MPE_CaptureFile.4.gz
+%%PORTDOCS%%man/man4/MPE_Close_graphics.4.gz
+%%PORTDOCS%%man/man4/MPE_Comm_global_rank.4.gz
+%%PORTDOCS%%man/man4/MPE_Decomp1d.4.gz
+%%PORTDOCS%%man/man4/MPE_Describe_comm_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Describe_comm_state.4.gz
+%%PORTDOCS%%man/man4/MPE_Describe_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Describe_info_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Describe_info_state.4.gz
+%%PORTDOCS%%man/man4/MPE_Describe_state.4.gz
+%%PORTDOCS%%man/man4/MPE_Draw_circle.4.gz
+%%PORTDOCS%%man/man4/MPE_Draw_line.4.gz
+%%PORTDOCS%%man/man4/MPE_Draw_logic.4.gz
+%%PORTDOCS%%man/man4/MPE_Draw_point.4.gz
+%%PORTDOCS%%man/man4/MPE_Draw_points.4.gz
+%%PORTDOCS%%man/man4/MPE_Draw_string.4.gz
+%%PORTDOCS%%man/man4/MPE_Errors_call_debugger.4.gz
+%%PORTDOCS%%man/man4/MPE_Fill_circle.4.gz
+%%PORTDOCS%%man/man4/MPE_Fill_rectangle.4.gz
+%%PORTDOCS%%man/man4/MPE_Finish_log.4.gz
+%%PORTDOCS%%man/man4/MPE_GetHostName.4.gz
+%%PORTDOCS%%man/man4/MPE_GetTags.4.gz
+%%PORTDOCS%%man/man4/MPE_Get_mouse_press.4.gz
+%%PORTDOCS%%man/man4/MPE_IO_Stdout_to_file.4.gz
+%%PORTDOCS%%man/man4/MPE_Iget_mouse_press.4.gz
+%%PORTDOCS%%man/man4/MPE_Init_log.4.gz
+%%PORTDOCS%%man/man4/MPE_Initialized_logging.4.gz
+%%PORTDOCS%%man/man4/MPE_Line_thickness.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_bare_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_comm_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_comm_receive.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_comm_send.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_get_event_number.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_get_solo_eventID.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_get_state_eventIDs.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_info_event.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_merged_logfilename.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_pack.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_receive.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_send.4.gz
+%%PORTDOCS%%man/man4/MPE_Log_sync_clocks.4.gz
+%%PORTDOCS%%man/man4/MPE_Make_color_array.4.gz
+%%PORTDOCS%%man/man4/MPE_Num_colors.4.gz
+%%PORTDOCS%%man/man4/MPE_Open_graphics.4.gz
+%%PORTDOCS%%man/man4/MPE_ReturnTags.4.gz
+%%PORTDOCS%%man/man4/MPE_Seq_begin.4.gz
+%%PORTDOCS%%man/man4/MPE_Seq_end.4.gz
+%%PORTDOCS%%man/man4/MPE_Signals_call_debugger.4.gz
+%%PORTDOCS%%man/man4/MPE_Start_log.4.gz
+%%PORTDOCS%%man/man4/MPE_Stop_log.4.gz
+%%PORTDOCS%%man/man4/MPE_TagsEnd.4.gz
+%%PORTDOCS%%man/man4/MPE_Update.4.gz
 sbin/mpecheckinstall
 sbin/mpetestexec
 sbin/mpetestexeclog
@@ -756,9 +1119,6 @@ sbin/mpeuninstall
 %%X11%%%%DATADIR%%/logfiles/barrier.rlog
 %%X11%%%%DATADIR%%/logfiles/fpilog.clog
 %%X11%%%%DATADIR%%/logfiles/fpilog.slog2
-@unexec if diff -q %D/etc/mpd.conf %D/etc/mpd.conf.dist; then rm %D/etc/mpd.conf; fi
-etc/mpd.conf.dist
-@exec if [ ! -f %B/mpd.conf ]; then cp %B/mpd.conf.dist %B/mpd.conf; fi
 %%JAVA%%@dirrm %%DATADIR%%/logfiles
 @dirrm %%DATADIR%%/examples_logging
 @dirrm %%DATADIR%%/examples_graphics
@@ -772,9 +1132,3 @@ etc/mpd.conf.dist
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%JAVA%%@dirrm lib/trace_rlog
 @dirrm include/primitives
-@cwd %%LOCALBASE%%
-libdata/pkgconfig/mpich2-c.pc
-libdata/pkgconfig/mpich2-cxx.pc
-libdata/pkgconfig/mpich2-f77.pc
-libdata/pkgconfig/mpich2-f90.pc
-@comment libdata/pkgconfig/openpa.pc