1 files changed, 21 insertions, 27 deletions
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index 165a5f8bcc56..3b718377d84d 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -1,4 +1,3 @@
-@comment "PREFIX set to %D/mpich2."
 bin/check_callstack
 @comment SLOG-2 tools are not installed if NOPORTDOCS is set
 %%JAVA%%bin/clog2TOslog2
@@ -75,8 +74,6 @@ bin/clog2_repair
 %%PM_MPD%%bin/mpdtrace.py
 %%PM_MPD%%bin/mpdtrace.pyc
 %%PM_MPD%%bin/mpdtrace.pyo
-bin/mpecc.in
-bin/mpefc.in
 bin/mpic++
 bin/mpicc
 bin/mpich2version
@@ -100,8 +97,10 @@ bin/parkill
 %%JAVA%%bin/slog2navigator
 %%JAVA%%bin/slog2print
 %%JAVA%%bin/slog2updater
-%%JAVA%%bin/traceTOslog2.in
-%%JAVA%%bin/traceprint.in
+bin/smtpd.pyc
+bin/smtpd.pyo
+bin/smtpd2.6.pyc
+bin/smtpd2.6.pyo
 etc/mpe_callstack_ldflags.conf
 etc/mpe_f77env.conf
 etc/mpe_graphics.conf
@@ -130,7 +129,6 @@ include/mpe_log.h
 include/mpe_log_thread.h
 include/mpe_logf.h
 include/mpe_misc.h
-include/mpe_thread.h
 include/mpi.h
 include/mpi.mod
 include/mpi_base.mod
@@ -157,6 +155,7 @@ include/primitives/opa_gcc_ppc.h
 include/primitives/opa_gcc_sicortex.h
 include/primitives/opa_nt_intrinsics.h
 include/primitives/opa_sun_atomic_ops.h
+include/primitives/opa_unsafe.h
 %%JAVA%%lib/clog2TOdrawable.jar
 %%JAVA%%lib/clog2TOslog2.jar
 %%JAVA%%lib/clog2print.jar
@@ -169,7 +168,7 @@ include/primitives/opa_sun_atomic_ops.h
 lib/libfmpich.a
 lib/libfmpich.so
 lib/libfmpich.so.1
-lib/libfmpich.so.1.1
+lib/libfmpich.so.%%VER%%
 lib/liblmpe.a
 lib/libmpe.a
 lib/libmpe_collchk.a
@@ -180,15 +179,15 @@ lib/libmpe_null.a
 lib/libmpich.a
 lib/libmpich.so
 lib/libmpich.so.1
-lib/libmpich.so.1.1
+lib/libmpich.so.%%VER%%
 lib/libmpichcxx.a
 lib/libmpichcxx.so
 lib/libmpichcxx.so.1
-lib/libmpichcxx.so.1.1
+lib/libmpichcxx.so.%%VER%%
 lib/libmpichf90.a
 lib/libmpichf90.so
 lib/libmpichf90.so.1
-lib/libmpichf90.so.1.1
+lib/libmpichf90.so.%%VER%%
 lib/libopa.a
 lib/libtmpe.a
 %%JAVA%%lib/logconvertor.jar
@@ -207,6 +206,7 @@ sbin/mpetestexec
 sbin/mpetestexeclog
 sbin/mpetestlink
 sbin/mpeuninstall
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/install.pdf
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/About24.png
@@ -353,11 +353,10 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/up_g.png
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/usersguide.css
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/usersguide.html
-%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/usersguide.pdf
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/yaxis_label_panel_expanded.png
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/yaxis_label_panel_simple.png
+%%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/usersguide.pdf
 %%PORTDOCS%%%%DOCSDIR%%/logging.pdf
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/smpd_pmi.pdf
 %%PORTDOCS%%%%DOCSDIR%%/user.pdf
 %%PORTDOCS%%%%DOCSDIR%%/www1/MPI.html
@@ -429,6 +428,10 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_split.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_test_inter.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Dims_create.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Dist_graph_create.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Dist_graph_create_adjacent.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Dist_graph_neighbors.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Dist_graph_neighbors_count.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Errhandler_create.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Errhandler_free.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Errhandler_get.html
@@ -548,6 +551,7 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Keyval_create.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Keyval_free.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Lookup_name.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Op_commute.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Op_create.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Op_free.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Open_port.html
@@ -563,7 +567,9 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Recv.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Recv_init.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Reduce.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Reduce_local.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Reduce_scatter.html
+%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Reduce_scatter_block.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Register_datarep.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Request_free.html
 %%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Request_get_status.html
@@ -708,7 +714,6 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%DOCSDIR%%/www4/MPE_Update.html
 %%PORTDOCS%%%%DOCSDIR%%/www4/libmpe.cit
 %%DATADIR%%/examples_collchk/Makefile
-%%DATADIR%%/examples_collchk/Makefile.in
 %%DATADIR%%/examples_collchk/composite.c
 %%DATADIR%%/examples_collchk/scatterv.c
 %%DATADIR%%/examples_collchk/time_allreduce.c
@@ -721,12 +726,10 @@ sbin/mpeuninstall
 %%DATADIR%%/examples_collchk/wrong_root.c
 %%DATADIR%%/examples_collchk/wrong_scatterv.c
 %%X11%%%%DATADIR%%/examples_graphics/Makefile
-%%X11%%%%DATADIR%%/examples_graphics/Makefile.in
 %%X11%%%%DATADIR%%/examples_graphics/cpi.c
 %%X11%%%%DATADIR%%/examples_graphics/cxgraphics.c
 %%X11%%%%DATADIR%%/examples_graphics/fxgraphics.f
 %%DATADIR%%/examples_logging/Makefile
-%%DATADIR%%/examples_logging/Makefile.in
 %%DATADIR%%/examples_logging/comm1_isr.c
 %%DATADIR%%/examples_logging/comm1_isr_loop.c
 %%DATADIR%%/examples_logging/comm2_connect_accept.c
@@ -749,6 +752,9 @@ sbin/mpeuninstall
 %%JAVA%%%%DATADIR%%/logfiles/barrier.rlog
 %%JAVA%%%%DATADIR%%/logfiles/fpilog.clog
 %%JAVA%%%%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
 %%X11%%@dirrm %%DATADIR%%/examples_graphics
@@ -760,19 +766,7 @@ sbin/mpeuninstall
 %%JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/jumpshot-4/html
 %%JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/jumpshot-4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm share/doc
-@dirrm share
-@dirrm sbin
-%%PORTDOCS%%@dirrm man/man4
-%%PORTDOCS%%@dirrm man/man3
-%%PORTDOCS%%@dirrm man/man1
-%%PORTDOCS%%@dirrm man
 %%JAVA%%@dirrm lib/trace_rlog
-@dirrm lib
 @dirrm include/primitives
-@dirrm include
-@dirrm etc
-@dirrm bin
-@unexec rmdir %D 2>/dev/null || true
 @cwd %%LOCALBASE%%
 libdata/pkgconfig/mpich2-ch3.pc