Add patch file 5996. I also fixed/sorted pkg-plist.

PR:		28483
Submitted by:	David A. Bader <dbader@eece.unm.edu>

1 files changed, 78 insertions, 79 deletions

diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index 69d72c555cf2..a1af206fd6fa 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -1,28 +1,11 @@
-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
-mpich/examples/cpi.c
-mpich/examples/cpilog.c
-mpich/examples/cpip.c
-mpich/examples/hello++.cc
-mpich/examples/mpirun
-mpich/examples/pi3.f
-mpich/examples/pi3f90.f90
-mpich/examples/pi3p.f
-mpich/examples/simpleio.c
+mpich/bin/clog2alog
+mpich/bin/clog2slog
+mpich/bin/clog_print
 mpich/bin/execer
+mpich/bin/logviewer
 mpich/bin/mpereconfig
 mpich/bin/mpereconfig.dat
+mpich/bin/mpereconfig.in
 mpich/bin/mpiCC
 mpich/bin/mpicc
 mpich/bin/mpif77
@@ -36,24 +19,45 @@ mpich/bin/mpirun.ch_p4
 mpich/bin/mpirun.ch_p4.args
 mpich/bin/mpirun.p4shmem
 mpich/bin/mpirun.pg
-mpich/bin/mpirun_dbg.totalview.in.orig
-mpich/bin/serv_p4
-mpich/bin/tarch
-mpich/bin/tdevice
-mpich/bin/clog2alog
-mpich/bin/clog2slog
-mpich/bin/clog_print
-mpich/bin/logviewer
-mpich/bin/mpereconfig.in
 mpich/bin/mpirun.rand
 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
+mpich/bin/tarch
+mpich/bin/tdevice
 mpich/doc/guide.ps.gz
 mpich/doc/install.ps.gz
+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
+mpich/examples/cpi.c
+mpich/examples/cpilog.c
+mpich/examples/cpip.c
+mpich/examples/hello++.cc
+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/mpe.h
 mpich/include/mpe_graphics.h
@@ -61,13 +65,6 @@ mpich/include/mpe_log.h
 mpich/include/mpeexten.h
 mpich/include/mpetools.h
 mpich/include/mpi.h
-mpich/include/mpi_errno.h
-mpich/include/mpi_fortdefs.h
-mpich/include/mpidefs.h
-mpich/include/mpif.h
-mpich/include/mpio.h
-mpich/include/mpiof.h
-mpich/include/protofix.h
 mpich/include/mpi2c++/comm.h
 mpich/include/mpi2c++/comm_inln.h
 mpich/include/mpi2c++/constants.h
@@ -85,6 +82,9 @@ mpich/include/mpi2c++/intercomm_inln.h
 mpich/include/mpi2c++/intracomm.h
 mpich/include/mpi2c++/intracomm_inln.h
 mpich/include/mpi2c++/mpi++.h
+mpich/include/mpi2c++/mpi2c++_config.h
+mpich/include/mpi2c++/mpi2c++_list.h
+mpich/include/mpi2c++/mpi2c++_map.h
 mpich/include/mpi2c++/op.h
 mpich/include/mpi2c++/op_inln.h
 mpich/include/mpi2c++/pcomm.h
@@ -109,18 +109,22 @@ mpich/include/mpi2c++/status.h
 mpich/include/mpi2c++/status_inln.h
 mpich/include/mpi2c++/topology.h
 mpich/include/mpi2c++/topology_inln.h
-mpich/include/mpi2c++/mpi2c++_config.h
-mpich/include/mpi2c++/mpi2c++_list.h
-mpich/include/mpi2c++/mpi2c++_map.h
-mpich/lib/libfmpich.a
-mpich/lib/libmpe.a
-mpich/lib/libmpich.a
-mpich/lib/libpmpich.a
+mpich/include/mpi_errno.h
+mpich/include/mpi_fortdefs.h
+mpich/include/mpidefs.h
+mpich/include/mpif.h
+mpich/include/mpio.h
+mpich/include/mpiof.h
+mpich/include/protofix.h
 mpich/lib/libampe.a
+mpich/lib/libfmpich.a
 mpich/lib/liblmpe.a
+mpich/lib/libmpe.a
 mpich/lib/libmpe_nompi.a
+mpich/lib/libmpich.a
 mpich/lib/libmpichfsup.a
 mpich/lib/libpmpich++.a
+mpich/lib/libpmpich.a
 mpich/lib/libtmpe.a
 mpich/lib/mpe_prof.o
 mpich/man/mandesc
@@ -130,8 +134,6 @@ mpich/sbin/cleanipcs
 mpich/sbin/mpiuninstall
 mpich/sbin/tstmachines
 mpich/share/Makefile.sample
-mpich/share/machines.freebsd
-mpich/share/machines.sample
 mpich/share/examples/Makefile
 mpich/share/examples/Makefile.in
 mpich/share/examples/cpi.c
@@ -139,6 +141,8 @@ mpich/share/examples/cpilog.c
 mpich/share/examples/fpi.f
 mpich/share/examples/mpirun
 mpich/share/examples/srtest.c
+mpich/share/machines.freebsd
+mpich/share/machines.sample
 mpich/share/upshot/bin/upshot
 mpich/share/upshot/bitmaps/2x2
 mpich/share/upshot/bitmaps/black
@@ -161,10 +165,6 @@ mpich/share/upshot/bitmaps/vlines4
 mpich/share/upshot/bitmaps/white
 mpich/share/upshot/logfiles/fft.trf
 mpich/share/upshot/logfiles/sam_hyp.16.log
-mpich/etc/mpichconf.h.dat
-mpich/etc/mpichlib.conf
-mpich/etc/mpif77.conf
-mpich/etc/mpif90.conf
 mpich/www/index.html
 mpich/www/www1/Jumpshots.html
 mpich/www/www1/MPI.html
@@ -196,7 +196,6 @@ mpich/www/www3/MPI_Attr_get.html
 mpich/www/www3/MPI_Attr_put.html
 mpich/www/www3/MPI_Barrier.html
 mpich/www/www3/MPI_Bcast.html
-mpich/www/www3/index.html
 mpich/www/www3/MPI_Bsend.html
 mpich/www/www3/MPI_Bsend_init.html
 mpich/www/www3/MPI_Buffer_attach.html
@@ -274,7 +273,6 @@ mpich/www/www3/MPI_File_set_size.html
 mpich/www/www3/MPI_File_set_view.html
 mpich/www/www3/MPI_File_sync.html
 mpich/www/www3/MPI_File_write.html
-mpich/www/www3/MPI_Gather.html
 mpich/www/www3/MPI_File_write_all.html
 mpich/www/www3/MPI_File_write_all_begin.html
 mpich/www/www3/MPI_File_write_all_end.html
@@ -288,6 +286,7 @@ mpich/www/www3/MPI_File_write_ordered_end.html
 mpich/www/www3/MPI_File_write_shared.html
 mpich/www/www3/MPI_Finalize.html
 mpich/www/www3/MPI_Finalized.html
+mpich/www/www3/MPI_Gather.html
 mpich/www/www3/MPI_Gatherv.html
 mpich/www/www3/MPI_Get_count.html
 mpich/www/www3/MPI_Get_elements.html
@@ -356,10 +355,10 @@ mpich/www/www3/MPI_Scan.html
 mpich/www/www3/MPI_Scatter.html
 mpich/www/www3/MPI_Scatterv.html
 mpich/www/www3/MPI_Send.html
-mpich/www/www3/MPI_Ssend.html
 mpich/www/www3/MPI_Send_init.html
 mpich/www/www3/MPI_Sendrecv.html
 mpich/www/www3/MPI_Sendrecv_replace.html
+mpich/www/www3/MPI_Ssend.html
 mpich/www/www3/MPI_Ssend_init.html
 mpich/www/www3/MPI_Start.html
 mpich/www/www3/MPI_Startall.html
@@ -373,11 +372,11 @@ mpich/www/www3/MPI_Testany.html
 mpich/www/www3/MPI_Testsome.html
 mpich/www/www3/MPI_Topo_test.html
 mpich/www/www3/MPI_Type_commit.html
-mpich/www/www3/MPI_Type_extent.html
 mpich/www/www3/MPI_Type_contiguous.html
 mpich/www/www3/MPI_Type_create_darray.html
 mpich/www/www3/MPI_Type_create_indexed_block.html
 mpich/www/www3/MPI_Type_create_subarray.html
+mpich/www/www3/MPI_Type_extent.html
 mpich/www/www3/MPI_Type_free.html
 mpich/www/www3/MPI_Type_get_contents.html
 mpich/www/www3/MPI_Type_get_envelope.html
@@ -396,6 +395,7 @@ mpich/www/www3/MPI_Waitany.html
 mpich/www/www3/MPI_Waitsome.html
 mpich/www/www3/MPI_Wtick.html
 mpich/www/www3/MPI_Wtime.html
+mpich/www/www3/index.html
 mpich/www/www4/CLOG_Finalize.html
 mpich/www/www4/CLOG_Init.html
 mpich/www/www4/CLOG_Output.html
@@ -429,7 +429,6 @@ mpich/www/www4/MPE_Describe_state.html
 mpich/www/www4/MPE_Draw_circle.html
 mpich/www/www4/MPE_Draw_line.html
 mpich/www/www4/MPE_Draw_logic.html
-mpich/www/www4/MPE_Update.html
 mpich/www/www4/MPE_Draw_point.html
 mpich/www/www4/MPE_Draw_points.html
 mpich/www/www4/MPE_Draw_string.html
@@ -445,7 +444,6 @@ mpich/www/www4/MPE_Initialized_logging.html
 mpich/www/www4/MPE_Line_thickness.html
 mpich/www/www4/MPE_Log_event.html
 mpich/www/www4/MPE_Log_get_event_number.html
-mpich/www/www4/index.html
 mpich/www/www4/MPE_Log_receive.html
 mpich/www/www4/MPE_Log_send.html
 mpich/www/www4/MPE_Make_color_array.html
@@ -459,30 +457,31 @@ mpich/www/www4/MPE_Seq_end.html
 mpich/www/www4/MPE_Start_log.html
 mpich/www/www4/MPE_Stop_log.html
 mpich/www/www4/MPE_TagsEnd.html
-@dirrm mpich/bin
-@dirrm mpich/doc
-@dirrm mpich/etc
-@dirrm mpich/examples/MPI-2-C++
-@dirrm mpich/examples
-@dirrm mpich/include/mpi2c++
-@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/sbin
-@dirrm mpich/share/examples
+mpich/www/www4/MPE_Update.html
+mpich/www/www4/index.html
+@dirrm mpich/www/www4
+@dirrm mpich/www/www3
+@dirrm mpich/www/www1
+@dirrm mpich/www
+@dirrm mpich/share/upshot/sbin
+@dirrm mpich/share/upshot/logfiles
 @dirrm mpich/share/upshot/bitmaps
 @dirrm mpich/share/upshot/bin
-@dirrm mpich/share/upshot/logfiles
-@dirrm mpich/share/upshot/sbin
 @dirrm mpich/share/upshot
+@dirrm mpich/share/examples
 @dirrm mpich/share
-@dirrm mpich/www/www1
-@dirrm mpich/www/www3
-@dirrm mpich/www/www4
-@dirrm mpich/www
+@dirrm mpich/sbin
+@dirrm mpich/man/man4
+@dirrm mpich/man/man3
+@dirrm mpich/man/man1
+@dirrm mpich/man
+@dirrm mpich/lib/shared
+@dirrm mpich/lib
+@dirrm mpich/include/mpi2c++
+@dirrm mpich/include
+@dirrm mpich/examples/MPI-2-C++
+@dirrm mpich/examples
+@dirrm mpich/etc
+@dirrm mpich/doc
+@dirrm mpich/bin
 @dirrm mpich
-