-Update from 3.4beta7 to 3.4.2.

-Add USE_FORTRAN to the package Makefile for correct handling of the
 required fortran compiler.

-Fix the .m4 files which control how fortran symbols are handled.

-Rework package to use a different PVM_ARCH for each MACHINE_ARCH.  As
 opposed to a single PVM_ARCH.  This addresses PR pkg/6890 (Thanks to
 Ignatios Souvatzis for the PR).

-Rework package to install missing programs including: pvmgetarch, aimk
 debugger, debugger2, and the configuration stubs (*.def, *.m4).  This
 address part of PR pkg/6924 (Thanks to Ignatios Souvatzis for the PR).

-Rework package to maintain the normal pvm3 directory layout so that only
 one variable (PVM_ROOT) has to be set to a non-traditional value.  This
 address the remainder of PR pkg/6924 (Thanks again Ig!).

3 files changed, 148 insertions, 65 deletions

diff --git a/parallel/pvm3/pkg/DESCR b/parallel/pvm3/pkg/DESCR
index 7e8ff50ab9f..2aee3f6b023 100644
--- a/parallel/pvm3/pkg/DESCR
+++ b/parallel/pvm3/pkg/DESCR
@@ -11,5 +11,3 @@ PCs.
 
 PVM is a byproduct of ongoing research at several institutions, and is
 made available to the public free of charge. 
-
-http://www.epm.ornl.gov/pvm/pvm_home.html
diff --git a/parallel/pvm3/pkg/MESSAGE b/parallel/pvm3/pkg/MESSAGE
index 641174b8b9c..a74155b2724 100644
--- a/parallel/pvm3/pkg/MESSAGE
+++ b/parallel/pvm3/pkg/MESSAGE
@@ -1,12 +1,9 @@
-You must set the environment variables:
-PVM_ROOT to /usr/pkg
-PVM_ARCH to NETBSD
+You must set the environment variable PVM_ROOT to ${PREFIX}/pvm3 in your
+startup files (.cshrc, .profile) on all machines in the cluster.  In 
+addition, you may want to add the lines contained in 
+${PREFIX}/pvm3/lib/cshrc.stub to the system .cshrc.
 
-in your startup files (.cshrc, .profile) on all machines
-in the cluster.
-
-In addition, you can specify each host's run path in your pvmhosts file
-like so:
+You can specify each host's run path in your pvmhosts file like so:
 hostname ep=/usr/pkg/bin
 This allows you to point different achitecture types to various sets of
-shared or local binaries.
+shared or local binaries.  See pvmd(1) for more information.
diff --git a/parallel/pvm3/pkg/PLIST b/parallel/pvm3/pkg/PLIST
index 0f5981edbbc..44343b40c28 100644
--- a/parallel/pvm3/pkg/PLIST
+++ b/parallel/pvm3/pkg/PLIST
@@ -1,52 +1,139 @@
-@comment $NetBSD: PLIST,v 1.3 1999/01/01 23:42:58 garbled Exp $
-libexec/pvmd3
-libexec/pvm
-bin/dbwtest
-bin/ge
-bin/gexamp
-bin/gexample
-bin/gmbi
-bin/hello
-bin/hello_other
-bin/ibwtest
-bin/inherit1
-bin/inherit2
-bin/inherit3
-bin/inherita
-bin/inheritb
-bin/joinleave
-bin/lmbi
-bin/master1
-bin/master1h
-bin/mtile
-bin/pbwtest
-bin/pvm_gstat
-bin/pvmgroups
-bin/pvmgs
-bin/rbwtest
-bin/rme
-bin/slave1
-bin/spmd
-bin/srm
-bin/task0
-bin/task1
-bin/task_end
-bin/thb
-bin/timing
-bin/timing_slave
-bin/tjf
-bin/tjl
-bin/tnb
-bin/tracer
-bin/trcsort
-bin/trsg
-bin/tst
-bin/xep
-bin/pvm
-bin/pvmd
+@comment $NetBSD: PLIST,v 1.4 1999/11/23 16:05:38 dmcmahill Exp $
+pvm3/bin/@pvmarch@/dbwtest
+pvm3/bin/@pvmarch@/fgexample
+pvm3/bin/@pvmarch@/fmaster1
+pvm3/bin/@pvmarch@/frsg
+pvm3/bin/@pvmarch@/fslave1
+pvm3/bin/@pvmarch@/fspmd
+pvm3/bin/@pvmarch@/ge
+pvm3/bin/@pvmarch@/gexamp
+pvm3/bin/@pvmarch@/gexample
+pvm3/bin/@pvmarch@/gmbi
+pvm3/bin/@pvmarch@/gs
+pvm3/bin/@pvmarch@/hello
+pvm3/bin/@pvmarch@/hello_other
+pvm3/bin/@pvmarch@/hitc
+pvm3/bin/@pvmarch@/hitc_slave
+pvm3/bin/@pvmarch@/ibwtest
+pvm3/bin/@pvmarch@/inherit1
+pvm3/bin/@pvmarch@/inherit2
+pvm3/bin/@pvmarch@/inherit3
+pvm3/bin/@pvmarch@/inherita
+pvm3/bin/@pvmarch@/inheritb
+pvm3/bin/@pvmarch@/joinleave
+pvm3/bin/@pvmarch@/lmbi
+pvm3/bin/@pvmarch@/master1
+pvm3/bin/@pvmarch@/master1h
+pvm3/bin/@pvmarch@/mhf_server
+pvm3/bin/@pvmarch@/mhf_tickle
+pvm3/bin/@pvmarch@/mtile
+pvm3/bin/@pvmarch@/pbwtest
+pvm3/bin/@pvmarch@/pvm_gstat
+pvm3/bin/@pvmarch@/pvmgroups
+pvm3/bin/@pvmarch@/pvmgs
+pvm3/bin/@pvmarch@/rbwtest
+pvm3/bin/@pvmarch@/rme
+pvm3/bin/@pvmarch@/slave1
+pvm3/bin/@pvmarch@/spmd
+pvm3/bin/@pvmarch@/srm
+pvm3/bin/@pvmarch@/task0
+pvm3/bin/@pvmarch@/task1
+pvm3/bin/@pvmarch@/task_end
+pvm3/bin/@pvmarch@/thb
+pvm3/bin/@pvmarch@/timing
+pvm3/bin/@pvmarch@/timing_slave
+pvm3/bin/@pvmarch@/tjf
+pvm3/bin/@pvmarch@/tjl
+pvm3/bin/@pvmarch@/tnb
+pvm3/bin/@pvmarch@/tracer
+pvm3/bin/@pvmarch@/trcsort
+pvm3/bin/@pvmarch@/trsg
+pvm3/bin/@pvmarch@/tst
+pvm3/bin/@pvmarch@/xep
+pvm3/conf/@pvmarch@.def
+pvm3/conf/@pvmarch@.m4
+pvm3/examples/Makefile.aimk
+pvm3/examples/Readme
+pvm3/examples/bwtest.c
+pvm3/examples/gexample.c
+pvm3/examples/gexample.f
+pvm3/examples/gmbi.c
+pvm3/examples/hello.c
+pvm3/examples/hello_other.c
+pvm3/examples/hitc.f
+pvm3/examples/hitc_slave.f
+pvm3/examples/inherit1.c
+pvm3/examples/inherit2.c
+pvm3/examples/inherit3.c
+pvm3/examples/inherita.c
+pvm3/examples/inheritb.c
+pvm3/examples/lmbi.c
+pvm3/examples/master1.c
+pvm3/examples/master1.f
+pvm3/examples/mbox.c
+pvm3/examples/mhf_server.c
+pvm3/examples/mhf_tickle.c
+pvm3/examples/ptest.c
+pvm3/examples/rme.c
+pvm3/examples/slave1.c
+pvm3/examples/slave1.f
+pvm3/examples/spmd.c
+pvm3/examples/spmd.f
+pvm3/examples/starter.c
+pvm3/examples/task0.c
+pvm3/examples/task1.c
+pvm3/examples/task_end.c
+pvm3/examples/taskf.c
+pvm3/examples/timing.c
+pvm3/examples/timing_slave.c
+pvm3/gexamples/Makefile
+pvm3/gexamples/Makefile.aimk
+pvm3/gexamples/Readme
+pvm3/gexamples/frsg.f
+pvm3/gexamples/ge.c
+pvm3/gexamples/gexamp.c
+pvm3/gexamples/gs.c
+pvm3/gexamples/joinleave.c
+pvm3/gexamples/thb.c
+pvm3/gexamples/tjf.c
+pvm3/gexamples/tjl.c
+pvm3/gexamples/tnb.c
+pvm3/gexamples/trsg.c
+pvm3/gexamples/tst.c
+pvm3/include/fpvm3.h
+pvm3/include/fpvm3_watcom.h
+pvm3/include/pvm3.h
+pvm3/include/pvmproto.h
+pvm3/include/pvmtev.h
+pvm3/lib/aimk
+pvm3/lib/bashrc.stub
+pvm3/lib/cshrc.stub
+pvm3/lib/debugger
+pvm3/lib/debugger2
+pvm3/lib/ipcfree
+pvm3/lib/kshrc.stub
+pvm3/lib/pvm
+pvm3/lib/pvm.bat
+pvm3/lib/pvm.cmd
+pvm3/lib/pvmd
+pvm3/lib/pvmd.bat
+pvm3/lib/pvmd.cmd
+pvm3/lib/pvmgetarch
+pvm3/lib/pvmgetarch.cmd
+pvm3/lib/pvmgetarch.orig
+pvm3/lib/pvmtmparch
+pvm3/lib/xpvm
+pvm3/lib/@pvmarch@/libfpvm3.a
+pvm3/lib/@pvmarch@/libgpvm3.a
+pvm3/lib/@pvmarch@/libpvm3.a
+pvm3/lib/@pvmarch@/libpvmtrc.a
+pvm3/lib/@pvmarch@/pvm
+pvm3/lib/@pvmarch@/pvmd3
+pvm3/lib/@pvmarch@/pvmgs
 man/man1/aimk.1
 man/man1/pvm.1
 man/man1/pvm_intro.1
+man/man1/pvm_shmd.1
 man/man1/pvmd.1
 man/man1/pvmd3.1
 man/man3/libfpvm.3
@@ -225,11 +312,12 @@ man/man3/pvmftidtoh.3
 man/man3/pvmftrecv.3
 man/man3/pvmfunpack.3
 man/man3/pvmfupkmesg.3
-include/fpvm3.h
-include/pvm3.h
-include/pvmproto.h
-include/pvmtev.h
-lib/libpvm3.a
-lib/libpvmtrc.a
-lib/libfpvm3.a
-lib/libgpvm3.a
+@dirrm pvm3/bin/@pvmarch@
+@dirrm pvm3/bin
+@dirrm pvm3/conf
+@dirrm pvm3/examples
+@dirrm pvm3/gexamples
+@dirrm pvm3/include
+@dirrm pvm3/lib/@pvmarch@
+@dirrm pvm3/lib
+@dirrm pvm3