7 files changed, 161 insertions, 439 deletions

diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 2a568cb99bad..539eaf315a62 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpich2
-DISTVERSION=	1.4.1p1
+DISTVERSION=	1.5
 PORTEPOCH=	5
 CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
@@ -55,8 +55,8 @@ NOCCACHE=	yes
 CONFLICTS=	lam-7.* mpd-[0-9]* mpiexec-0.*
 MAKE_JOBS_UNSAFE=	yes
 
-VERSO=		3.3
-VERSOM=		${VERSO:R}
+VERSO=		8.0.1
+VERSOM=		${VERSO:R:R}
 PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
 SUB_FILES=	pkg-message
 
diff --git a/net/mpich2/distinfo b/net/mpich2/distinfo
index 018697f621fa..1a6def9bf5cb 100644
--- a/net/mpich2/distinfo
+++ b/net/mpich2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpich/mpich2-1.4.1p1.tar.gz) = a20f798ceaad6b0161ddecac98623b65d6a4033072f39ced13b9043916e3d1ee
-SIZE (mpich/mpich2-1.4.1p1.tar.gz) = 19502854
+SHA256 (mpich/mpich2-1.5.tar.gz) = 7175926fc2e4230f00201e880318c08de4f949c0dbe167fe1b2e256ac79d5f66
+SIZE (mpich/mpich2-1.5.tar.gz) = 22826035
diff --git a/net/mpich2/files/patch-Makefile.in b/net/mpich2/files/patch-Makefile.in
index 2d393ec56a98..d4de96233d19 100644
--- a/net/mpich2/files/patch-Makefile.in
+++ b/net/mpich2/files/patch-Makefile.in
@@ -1,24 +1,11 @@
---- Makefile.in.orig	2011-09-01 20:55:44.000000000 +0200
-+++ Makefile.in	2014-08-25 19:43:34.000000000 +0200
-@@ -202,16 +202,16 @@
- 	if [ -s $(srcdir)/doc/installguide/install.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/installguide/install.pdf ${DESTDIR}${docdir}/install.pdf ; fi
- 	if [ -s $(srcdir)/doc/smpd/smpd_pmi.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/smpd/smpd_pmi.pdf ${DESTDIR}${docdir}/smpd_pmi.pdf ; fi
- 	if [ -s $(srcdir)/doc/logging/logging.pdf ] ; then $(INSTALL_DATA)  $(srcdir)/doc/logging/logging.pdf ${DESTDIR}${docdir}/logging.pdf ; fi
--	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
--	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
--	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install)
-+	(cd src/env && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) install)
-+	(cd src/packaging/pkgconfig && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) install)
-+	(cd src/packaging/envmods && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) install)
- 	for dir in @bindings_dirs@ - ; do \
- 		if [ "$$dir" = "-" ] ; then break ; fi ;\
--		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install) ;\
-+		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) install) ;\
- 	done
- 	for dir in @other_install_dirs@ - ; do \
- 		if [ "$$dir" = "-" ] ; then break ; fi ;\
--		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) prefix=${DESTDIR}${prefix} exec_prefix=${DESTDIR}${exec_prefix} bindir=${DESTDIR}${bindir} libdir=${DESTDIR}${libdir} includedir=${DESTDIR}${includedir} install) ;\
-+		(cd $$dir && $(MAKE) INSTALL_STRIP_FLAG=$(INSTALL_STRIP_FLAG) PACKAGE=$(PACKAGE) install) ;\
- 	done
+--- Makefile.in.orig	2012-10-08 21:02:46.000000000 +0200
++++ Makefile.in	2014-08-31 22:55:10.000000000 +0200
+@@ -6153,7 +6153,7 @@
+ CLEAN_LOCAL_TARGETS = test-clean $(am__append_125)
  
- install-strip:
+ # used by nodist_pkgconfig_DATA
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(libdir)data/pkgconfig
+ 
+ # contains all of the "errnames.txt" files that are used by maint/extracterrmsgs
+ # to build src/mpi/errhan/defmsg.h
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 80c96bad63f4..a391604385d8 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-10-16 01:50:22.000000000 +0200
-+++ src/mpe2/sbin/mpeinstall.in	2014-08-20 22:43:03.000000000 +0200
-@@ -529,7 +529,7 @@
+--- src/mpe2/sbin/mpeinstall.in.orig	2012-04-30 22:12:21.000000000 +0200
++++ src/mpe2/sbin/mpeinstall.in	2014-08-31 12:34:38.000000000 +0200
+@@ -531,7 +531,7 @@
      # so $docdir (with NULL PACKAGE) is appended to dirlist for removal.
      savedPACKAGE=$PACKAGE
      PACKAGE=""
@@ -9,7 +9,7 @@
      PACKAGE=$savedPACKAGE
  fi
  
-@@ -577,15 +577,15 @@
+@@ -579,15 +579,15 @@
  # ie INSTALL $top_srcdir/doc  $docdir
  #    INSTALL $top_srcdir/man  $mandir
  #    INSTALL $top_srcdir/html $htmldir
@@ -34,15 +34,7 @@
  
  # 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 @@
+@@ -649,8 +649,8 @@
  if [ "$appendUninstall" = 0 ] ; then
      cp $UNINSTALLFILE $sbinbuild_dir/mpeuninstall
  #
diff --git a/net/mpich2/files/patch-src_openpa_Makefile.in b/net/mpich2/files/patch-src_openpa_Makefile.in
index c7e4975efbe7..f8008ca54f2a 100644
--- a/net/mpich2/files/patch-src_openpa_Makefile.in
+++ b/net/mpich2/files/patch-src_openpa_Makefile.in
@@ -1,7 +1,7 @@
---- ./src/openpa/Makefile.in.orig	2010-02-22 23:22:28.000000000 +0100
-+++ ./src/openpa/Makefile.in	2010-03-10 21:36:17.000000000 +0100
-@@ -229,7 +229,7 @@
- EXTRA_DIST = COPYRIGHT CHANGELOG openpa.pc.in
+--- ./src/openpa/Makefile.in.orig	2012-10-08 21:02:13.000000000 +0200
++++ ./src/openpa/Makefile.in	2014-08-31 18:17:46.000000000 +0200
+@@ -316,7 +316,7 @@
+ EXTRA_DIST = COPYRIGHT CHANGELOG openpa.pc.in VERSION
  
  # pkgconfig files
 -pkgconfigdir = $(libdir)/pkgconfig
@@ -9,30 +9,3 @@
  pkgconfig_DATA = openpa.pc
  all: all-recursive
  
-@@ -272,16 +272,16 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
- install-dist_docDATA: $(dist_doc_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
--	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
--	for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  echo "$$d$$p"; \
--	done | $(am__base_list) | \
--	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
--	done
-+%%PORTDOCS%%	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-+%%PORTDOCS%%	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-+%%PORTDOCS%%	for p in $$list; do \
-+%%PORTDOCS%%	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+%%PORTDOCS%%	  echo "$$d$$p"; \
-+%%PORTDOCS%%	done | $(am__base_list) | \
-+%%PORTDOCS%%	while read files; do \
-+%%PORTDOCS%%	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-+%%PORTDOCS%%	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-+%%PORTDOCS%%	done
- 
- uninstall-dist_docDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/net/mpich2/files/patch-src_packaging_pkgconfig_Makefile.in b/net/mpich2/files/patch-src_packaging_pkgconfig_Makefile.in
deleted file mode 100644
index 47ebfe02b049..000000000000
--- a/net/mpich2/files/patch-src_packaging_pkgconfig_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/packaging/pkgconfig/Makefile.in.orig	2009-06-03 03:49:04.000000000 +0200
-+++ ./src/packaging/pkgconfig/Makefile.in	2009-06-22 19:19:08.000000000 +0200
-@@ -18,7 +18,7 @@
- prefix          = @prefix@
- libdir          = @libdir@
- exec_prefix     = @exec_prefix@
--pkgconfigdir    = @libdir@/pkgconfig
-+pkgconfigdir    = $(LOCALBASE)/libdata/pkgconfig
- MAKE            = @MAKE@
- MPILIBNAME      = @MPILIBNAME@
- PMPILIBNAME     = @PMPILIBNAME@
diff --git a/net/mpich2/pkg-plist b/net/mpich2/pkg-plist
index 8d3a8da7007d..9b96b893a717 100644
--- a/net/mpich2/pkg-plist
+++ b/net/mpich2/pkg-plist
@@ -89,6 +89,7 @@ bin/mpif90
 %%PM_MPD%%bin/mpirun.py
 %%PM_MPD%%bin/mpirun.pyc
 %%PM_MPD%%bin/mpirun.pyo
+bin/parkill
 %%JAVA%%bin/rlogTOslog2
 %%JAVA%%bin/rlog_check_timeorder
 %%JAVA%%bin/rlog_print
@@ -117,7 +118,6 @@ etc/mpicc.conf
 etc/mpicxx.conf
 etc/mpif77.conf
 etc/mpif90.conf
-etc/mpixxx_opts.conf
 include/clog_commset.h
 include/clog_const.h
 include/clog_inttypes.h
@@ -139,7 +139,6 @@ include/mpicxx.h
 include/mpif.h
 include/mpio.h
 include/mpiof.h
-include/mpix.h
 include/opa_config.h
 include/opa_primitives.h
 include/opa_queue.h
@@ -168,6 +167,7 @@ include/primitives/opa_unsafe.h
 %%JAVA%%lib/jumpshot_launcher.jar
 lib/libampe.a
 lib/libfmpich.a
+lib/libfmpich.la
 lib/libfmpich.so
 lib/libfmpich.so.%%VER%%
 lib/libfmpich.so.%%VERM%%
@@ -179,14 +179,17 @@ lib/libmpe_nompi.a
 lib/libmpe_nompi_null.a
 lib/libmpe_null.a
 lib/libmpich.a
+lib/libmpich.la
 lib/libmpich.so
 lib/libmpich.so.%%VERM%%
 lib/libmpich.so.%%VER%%
 lib/libmpichcxx.a
+lib/libmpichcxx.la
 lib/libmpichcxx.so
 lib/libmpichcxx.so.%%VERM%%
 lib/libmpichcxx.so.%%VER%%
 lib/libmpichf90.a
+lib/libmpichf90.la
 lib/libmpichf90.so
 lib/libmpichf90.so.%%VERM%%
 lib/libmpichf90.so.%%VER%%
@@ -194,7 +197,7 @@ lib/libmpl.a
 lib/libmpl.la
 lib/libmpl.so
 lib/libmpl.so.1
-lib/libmpl.so.1.1.0
+lib/libmpl.so.1.0.0
 lib/libopa.a
 lib/libopa.la
 lib/libopa.so
@@ -212,18 +215,99 @@ 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/mpich2.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/MPIX_Group_comm_create.3.gz
+%%PORTDOCS%%man/man3/MPIX_Comm_create_group.3.gz
+%%PORTDOCS%%man/man3/MPIX_Comm_group_failed.3.gz
+%%PORTDOCS%%man/man3/MPIX_Comm_idup.3.gz
+%%PORTDOCS%%man/man3/MPIX_Comm_reenable_anysource.3.gz
+%%PORTDOCS%%man/man3/MPIX_Comm_remote_group_failed.3.gz
+%%PORTDOCS%%man/man3/MPIX_Comm_split_type.3.gz
+%%PORTDOCS%%man/man3/MPIX_Compare_and_swap.3.gz
+%%PORTDOCS%%man/man3/MPIX_Fetch_and_op.3.gz
+%%PORTDOCS%%man/man3/MPIX_Get_accumulate.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iallgather.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iallgatherv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iallreduce.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ialltoall.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ialltoallv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ialltoallw.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ibarrier.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ibcast.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iexscan.3.gz
+%%PORTDOCS%%man/man3/MPIX_Igather.3.gz
+%%PORTDOCS%%man/man3/MPIX_Igatherv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Improbe.3.gz
+%%PORTDOCS%%man/man3/MPIX_Imrecv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ineighbor_allgather.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ineighbor_allgatherv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ineighbor_alltoall.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ineighbor_alltoallv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ineighbor_alltoallw.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ireduce.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ireduce_scatter.3.gz
+%%PORTDOCS%%man/man3/MPIX_Ireduce_scatter_block.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iscan.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iscatter.3.gz
+%%PORTDOCS%%man/man3/MPIX_Iscatterv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Mprobe.3.gz
+%%PORTDOCS%%man/man3/MPIX_Mrecv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Neighbor_allgather.3.gz
+%%PORTDOCS%%man/man3/MPIX_Neighbor_allgatherv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Neighbor_alltoall.3.gz
+%%PORTDOCS%%man/man3/MPIX_Neighbor_alltoallv.3.gz
+%%PORTDOCS%%man/man3/MPIX_Neighbor_alltoallw.3.gz
+%%PORTDOCS%%man/man3/MPIX_Raccumulate.3.gz
+%%PORTDOCS%%man/man3/MPIX_Rget.3.gz
+%%PORTDOCS%%man/man3/MPIX_Rget_accumulate.3.gz
+%%PORTDOCS%%man/man3/MPIX_Rput.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_category_changed.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_category_get_categories.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_category_get_cvars.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_category_get_info.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_category_get_num.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_category_get_pvars.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_cvar_get_info.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_cvar_get_num.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_cvar_handle_alloc.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_cvar_handle_free.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_cvar_read.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_cvar_write.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_enum_get_info.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_enum_get_item.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_finalize.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_init_thread.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_get_info.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_get_num.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_handle_alloc.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_handle_free.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_read.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_readreset.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_reset.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_session_create.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_session_free.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_start.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_stop.3.gz
+%%PORTDOCS%%man/man3/MPIX_T_pvar_write.3.gz
+%%PORTDOCS%%man/man3/MPIX_Type_create_hindexed_block.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_allocate.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_allocate_shared.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_attach.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_create_dynamic.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_detach.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_flush.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_flush_all.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_flush_local.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_flush_local_all.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_lock_all.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_shared_query.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_sync.3.gz
+%%PORTDOCS%%man/man3/MPIX_Win_unlock_all.3.gz
 %%PORTDOCS%%man/man3/MPI_Abort.3.gz
 %%PORTDOCS%%man/man3/MPI_Accumulate.3.gz
 %%PORTDOCS%%man/man3/MPI_Add_error_class.3.gz
@@ -574,8 +658,6 @@ 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
 %%PORTDOCS%%%%JAVA%%%%DOCSDIR%%/jumpshot-4/html/Backward24.png
@@ -727,306 +809,6 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%DOCSDIR%%/logging.pdf
 %%PORTDOCS%%%%DOCSDIR%%/smpd_pmi.pdf
 %%PORTDOCS%%%%DOCSDIR%%/user.pdf
-%%PORTDOCS%%%%DOCSDIR%%/www1/MPI.html
-%%PORTDOCS%%%%DOCSDIR%%/www1/index.htm
-%%PORTDOCS%%%%DOCSDIR%%/www1/mpicc.html
-%%PORTDOCS%%%%DOCSDIR%%/www1/mpicxx.html
-%%PORTDOCS%%%%DOCSDIR%%/www1/mpiexec.html
-%%PORTDOCS%%%%DOCSDIR%%/www1/mpif77.html
-%%PORTDOCS%%%%DOCSDIR%%/www1/mpif90.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPIX_Group_comm_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Abort.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Accumulate.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Add_error_class.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Add_error_code.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Add_error_string.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Address.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Allgather.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Allgatherv.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Alloc_mem.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Allreduce.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Alltoall.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Alltoallv.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Alltoallw.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Attr_delete.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Attr_get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Attr_put.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Barrier.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Bcast.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Bsend.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Bsend_init.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Buffer_attach.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Buffer_detach.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cancel.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_coords.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_map.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_rank.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_shift.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cart_sub.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Cartdim_get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Close_port.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_accept.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_call_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_compare.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_connect.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_create_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_create_keyval.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_delete_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_disconnect.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_dup.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_free.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_free_keyval.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_get_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_get_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_get_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_get_parent.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_group.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_join.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_rank.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_remote_group.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_remote_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_set_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_set_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_set_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_spawn.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Comm_spawn_multiple.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Errhandler_set.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Error_class.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Error_string.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Exscan.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_c2f.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_call_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_close.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_create_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_delete.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_f2c.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_amode.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_atomicity.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_byte_offset.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_group.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_info.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_position.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_position_shared.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_type_extent.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_get_view.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_iread.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_iread_at.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_iread_shared.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_iwrite.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_iwrite_at.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_iwrite_shared.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_open.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_preallocate.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_all.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_all_begin.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_all_end.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_at.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_at_all.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_at_all_begin.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_at_all_end.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_ordered.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_ordered_begin.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_ordered_end.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_read_shared.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_seek.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_seek_shared.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_set_atomicity.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_set_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_set_info.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_set_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_set_view.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_sync.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_all.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_all_begin.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_all_end.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_at.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_at_all.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_at_all_begin.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_at_all_end.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_ordered.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_ordered_begin.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_ordered_end.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_File_write_shared.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Finalize.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Finalized.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Free_mem.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Gather.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Gatherv.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Get_address.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Get_count.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Get_elements.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Get_processor_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Get_version.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Graph_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Graph_get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Graph_map.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Graph_neighbors.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Graph_neighbors_count.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Graphdims_get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Grequest_complete.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Grequest_start.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_compare.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_difference.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_excl.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_free.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_incl.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_intersection.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_range_excl.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_range_incl.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_rank.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_translate_ranks.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Group_union.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Ibsend.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_delete.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_dup.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_free.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_get.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_get_nkeys.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_get_nthkey.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_get_valuelen.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Info_set.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Init.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Init_thread.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Initialized.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Intercomm_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Intercomm_merge.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Iprobe.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Irecv.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Irsend.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Is_thread_main.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Isend.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Issend.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Pack.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Pack_external.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Pack_external_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Pack_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Pcontrol.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Probe.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Publish_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Put.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Query_thread.html
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Rsend.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Rsend_init.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Scan.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Scatter.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Scatterv.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Send.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Send_init.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Sendrecv.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Sendrecv_replace.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Ssend.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Ssend_init.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Start.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Startall.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Status_set_cancelled.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Status_set_elements.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Test.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Test_cancelled.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Testall.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Testany.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Testsome.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Topo_test.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_commit.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_contiguous.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_darray.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_hindexed.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_hvector.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_indexed_block.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_keyval.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_resized.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_struct.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_create_subarray.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_delete_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_dup.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_extent.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_free.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_free_keyval.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_get_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_get_contents.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_get_envelope.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_get_extent.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_get_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_get_true_extent.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_hindexed.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_hvector.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_indexed.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_lb.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_match_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_set_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_set_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_size.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_struct.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_ub.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Type_vector.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Unpack.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Unpack_external.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Unpublish_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Wait.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Waitall.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Waitany.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Waitsome.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_call_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_complete.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_create.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_create_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_create_keyval.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_delete_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_fence.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_free.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_free_keyval.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_get_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_get_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_get_group.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_get_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_lock.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_post.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_set_attr.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_set_errhandler.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_set_name.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_start.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_test.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_unlock.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Win_wait.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Wtick.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/MPI_Wtime.html
-%%PORTDOCS%%%%DOCSDIR%%/www3/index.htm
 %%PORTDOCS%%%%DOCSDIR%%/www4/MPE_Add_RGB_color.html
 %%PORTDOCS%%%%DOCSDIR%%/www4/MPE_CaptureFile.html
 %%PORTDOCS%%%%DOCSDIR%%/www4/MPE_Close_graphics.html
@@ -1082,53 +864,52 @@ sbin/mpeuninstall
 %%PORTDOCS%%%%DOCSDIR%%/www4/MPE_TagsEnd.html
 %%PORTDOCS%%%%DOCSDIR%%/www4/MPE_Update.html
 %%PORTDOCS%%%%DOCSDIR%%/www4/libmpe.cit
-%%DATADIR%%/examples_collchk/Makefile
-%%DATADIR%%/examples_collchk/composite.c
-%%DATADIR%%/examples_collchk/scatterv.c
-%%DATADIR%%/examples_collchk/time_allreduce.c
-%%DATADIR%%/examples_collchk/time_alltoallv.c
-%%DATADIR%%/examples_collchk/time_alltoallv0.c
-%%DATADIR%%/examples_collchk/time_bcast.c
-%%DATADIR%%/examples_collchk/wrong_composite.c
-%%DATADIR%%/examples_collchk/wrong_int_byte.c
-%%DATADIR%%/examples_collchk/wrong_reals.f
-%%DATADIR%%/examples_collchk/wrong_root.c
-%%DATADIR%%/examples_collchk/wrong_scatterv.c
-%%DATADIR%%/examples_graphics/Makefile
-%%DATADIR%%/examples_graphics/cpi.c
-%%DATADIR%%/examples_graphics/cxgraphics.c
-%%DATADIR%%/examples_graphics/fxgraphics.f
-%%DATADIR%%/examples_logging/Makefile
-%%DATADIR%%/examples_logging/comm1_isr.c
-%%DATADIR%%/examples_logging/comm1_isr_loop.c
-%%DATADIR%%/examples_logging/comm2_connect_accept.c
-%%DATADIR%%/examples_logging/comm2_spawn_child.c
-%%DATADIR%%/examples_logging/comm2_spawn_parent.c
-%%DATADIR%%/examples_logging/cpi.c
-%%DATADIR%%/examples_logging/cpilog.c
-%%DATADIR%%/examples_logging/cpilog_pack.c
-%%DATADIR%%/examples_logging/fcomm1_isr.f
-%%DATADIR%%/examples_logging/fpilog.f
-%%DATADIR%%/examples_logging/fpilog_pack.F
-%%DATADIR%%/examples_logging/iotest.c
-%%DATADIR%%/examples_logging/log_cost.c
-%%DATADIR%%/examples_logging/openmp_mpilog.F
-%%DATADIR%%/examples_logging/openmp_sendrecv.c
-%%DATADIR%%/examples_logging/pthread_allreduce.c
-%%DATADIR%%/examples_logging/pthread_sendrecv.c
-%%DATADIR%%/examples_logging/pthread_sendrecv_user.c
-%%DATADIR%%/examples_logging/srtest.c
-%%X11%%%%DATADIR%%/logfiles/barrier.rlog
-%%X11%%%%DATADIR%%/logfiles/fpilog.clog
-%%X11%%%%DATADIR%%/logfiles/fpilog.slog2
-%%JAVA%%@dirrm %%DATADIR%%/logfiles
-@dirrm %%DATADIR%%/examples_logging
-@dirrm %%DATADIR%%/examples_graphics
-@dirrm %%DATADIR%%/examples_collchk
+%%DATADIR%%/examples/collchk/Makefile
+%%DATADIR%%/examples/collchk/composite.c
+%%DATADIR%%/examples/collchk/scatterv.c
+%%DATADIR%%/examples/collchk/time_allreduce.c
+%%DATADIR%%/examples/collchk/time_alltoallv.c
+%%DATADIR%%/examples/collchk/time_alltoallv0.c
+%%DATADIR%%/examples/collchk/time_bcast.c
+%%DATADIR%%/examples/collchk/wrong_composite.c
+%%DATADIR%%/examples/collchk/wrong_int_byte.c
+%%DATADIR%%/examples/collchk/wrong_reals.f
+%%DATADIR%%/examples/collchk/wrong_root.c
+%%DATADIR%%/examples/collchk/wrong_scatterv.c
+%%DATADIR%%/examples/graphics/Makefile
+%%DATADIR%%/examples/graphics/cpi.c
+%%DATADIR%%/examples/graphics/cxgraphics.c
+%%DATADIR%%/examples/graphics/fxgraphics.f
+%%DATADIR%%/examples/logfiles/barrier.rlog
+%%DATADIR%%/examples/logfiles/fpilog.clog
+%%DATADIR%%/examples/logfiles/fpilog.slog2
+%%DATADIR%%/examples/logging/Makefile
+%%DATADIR%%/examples/logging/comm1_isr.c
+%%DATADIR%%/examples/logging/comm1_isr_loop.c
+%%DATADIR%%/examples/logging/comm2_connect_accept.c
+%%DATADIR%%/examples/logging/comm2_spawn_child.c
+%%DATADIR%%/examples/logging/comm2_spawn_parent.c
+%%DATADIR%%/examples/logging/cpi.c
+%%DATADIR%%/examples/logging/cpilog.c
+%%DATADIR%%/examples/logging/cpilog_pack.c
+%%DATADIR%%/examples/logging/fcomm1_isr.f
+%%DATADIR%%/examples/logging/fpilog.f
+%%DATADIR%%/examples/logging/fpilog_pack.F
+%%DATADIR%%/examples/logging/iotest.c
+%%DATADIR%%/examples/logging/log_cost.c
+%%DATADIR%%/examples/logging/openmp_mpilog.F
+%%DATADIR%%/examples/logging/openmp_sendrecv.c
+%%DATADIR%%/examples/logging/pthread_allreduce.c
+%%DATADIR%%/examples/logging/pthread_sendrecv.c
+%%DATADIR%%/examples/logging/pthread_sendrecv_user.c
+%%DATADIR%%/examples/logging/srtest.c
+@dirrm %%DATADIR%%/examples/logfiles
+@dirrm %%DATADIR%%/examples/logging
+@dirrm %%DATADIR%%/examples/graphics
+@dirrm %%DATADIR%%/examples/collchk
+@dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www4
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/www3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/www1
 %%JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/jumpshot-4/html
 %%JAVA%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/jumpshot-4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%