-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!).

40 files changed, 804 insertions, 308 deletions

diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index 47f22e436e7..561cf8a6563 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,47 +1,60 @@
-# $NetBSD: Makefile,v 1.8 1999/10/06 16:49:21 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.9 1999/11/23 16:05:28 dmcmahill Exp $
 
-DISTNAME=		pvm3.4.beta7
-PKGNAME=		pvm-3.4.7
+DISTNAME=		pvm3.4.2
+PKGNAME=		pvm-3.4.2
 CATEGORIES=		parallel
 MASTER_SITES=		http://www.netlib.org/pvm3/
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://www.netlib.org/
+HOMEPAGE=		http://www.epm.ornl.gov/pvm/pvm_home.html
 
-#DEPENDS+=		ssh-1.2.26:../../security/ssh
+DEPENDS+=		ssh-*:../../security/ssh
 
+USE_FORTRAN=		yes
 USE_X11=		yes
 WRKSRC=			${WRKDIR}/pvm3
 MAKE_ENV+=		PVM_ROOT=${WRKSRC}
+MAKE_ENV+=		PVM_ARCH=
 ALL_TARGET=		all install
+PLIST_SRC=		${WRKDIR}/PLIST-src
 
-.if exists(/usr/bin/f77)
-F77=			/usr/bin/f77
-.else
-F77=			f2c-f77
-BUILD_DEPENDS+=		f2c-f77:../../lang/f2c
-.endif
-MAKE_FLAGS+=		F77=${F77}
-
-post-patch:
-	@${MV} ${WRKSRC}/lib/pvm ${WRKSRC}/lib/pvm.in
-	@${SED} -e 's@XXPKGXX@${LOCALBASE}@g' < ${WRKSRC}/lib/pvm.in > ${WRKSRC}/lib/pvm
-	@${MV} ${WRKSRC}/lib/pvmd ${WRKSRC}/lib/pvmd.in
-	@${SED} -e 's@XXPKGXX@${LOCALBASE}@g' < ${WRKSRC}/lib/pvmd.in > ${WRKSRC}/lib/pvmd
+PVM_DIR=		${PREFIX}/pvm3
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/NETBSD/* ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/NETBSD/pvmd3 ${PREFIX}/libexec
-	${INSTALL_PROGRAM} ${WRKSRC}/lib/NETBSD/pvm ${PREFIX}/libexec
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/pvm ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/lib/pvmd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/lib/NETBSD/libpvm3.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/NETBSD/libfpvm3.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/NETBSD/libgpvm3.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/NETBSD/libpvmtrc.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1
+	PVM_ARCH=`${PVM_ROOT}/lib/pvmgetarch` ; export PVM_ARCH ;\
+	${INSTALL_PROGRAM_DIR} ${PVM_DIR}/bin/$$PVM_ARCH ;\
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/$$PVM_ARCH/* ${PVM_DIR}/bin/$$PVM_ARCH  ;\
+	${INSTALL_DATA_DIR} ${PVM_DIR}/conf ;\
+	${INSTALL_DATA} ${WRKSRC}/conf/$$PVM_ARCH.def  ${PVM_DIR}/conf ;\
+	${INSTALL_DATA} ${WRKSRC}/conf/$$PVM_ARCH.m4  ${PVM_DIR}/conf ;\
+	${INSTALL_DATA_DIR} ${PVM_DIR}/examples ;\
+	${INSTALL_DATA} ${WRKSRC}/examples/*.c  ${PVM_DIR}/examples ;\
+	${INSTALL_DATA} ${WRKSRC}/examples/*.f  ${PVM_DIR}/examples ;\
+	${INSTALL_DATA} ${WRKSRC}/examples/Readme  ${PVM_DIR}/examples ;\
+	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.aimk  ${PVM_DIR}/examples ;\
+	${INSTALL_DATA_DIR} ${PVM_DIR}/gexamples ;\
+	${INSTALL_DATA} ${WRKSRC}/gexamples/*.c  ${PVM_DIR}/gexamples ;\
+	${INSTALL_DATA} ${WRKSRC}/gexamples/*.f  ${PVM_DIR}/gexamples ;\
+	${INSTALL_DATA} ${WRKSRC}/gexamples/Readme  ${PVM_DIR}/gexamples ;\
+	${INSTALL_DATA} ${WRKSRC}/gexamples/Makefile.aimk  ${PVM_DIR}/gexamples ;\
+	${INSTALL_DATA} ${WRKSRC}/gexamples/Makefile  ${PVM_DIR}/gexamples ;\
+	${INSTALL_DATA_DIR} ${PVM_DIR}/include ;\
+	${INSTALL_DATA} ${WRKSRC}/include/* ${PVM_DIR}/include ;\
+	${INSTALL_PROGRAM_DIR} ${PVM_DIR}/lib/$$PVM_ARCH ;\
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/$$PVM_ARCH/pvm* ${PVM_DIR}/lib/$$PVM_ARCH ;\
+	${INSTALL_DATA} ${WRKSRC}/lib/$$PVM_ARCH/*.a ${PVM_DIR}/lib/$$PVM_ARCH ;\
+	for f in `ls ${WRKSRC}/lib` ; do \
+	  if [ -f ${WRKSRC}/lib/$$f ]; then \
+	    ${INSTALL_SCRIPT} ${WRKSRC}/lib/$$f ${PVM_DIR}/lib ;\
+	  fi ;\
+	done ;\
+	${INSTALL_MAN_DIR}  ${PREFIX}/man/man1 ;\
+	${INSTALL_MAN_DIR}  ${PREFIX}/man/man3 ;\
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/man/man1 ;\
 	${INSTALL_MAN} ${WRKSRC}/man/man3/* ${PREFIX}/man/man3
 
+post-install:
+	${SED} "s/@pvmarch@/`${PVM_ROOT}/lib/pvmgetarch`/g" < ${PKGDIR}/PLIST > ${PLIST_SRC}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/pvm3/files/md5 b/parallel/pvm3/files/md5
index 205ff565a52..0056a1c01a8 100644
--- a/parallel/pvm3/files/md5
+++ b/parallel/pvm3/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/10/16 10:14:56 agc Exp $
+$NetBSD: md5,v 1.4 1999/11/23 16:05:29 dmcmahill Exp $
 
-MD5 (pvm3.4.beta7.tgz) = 0a8d7aa3ff85f37a3b6a5cd0a3876440
+MD5 (pvm3.4.2.tgz) = d9e8e6de55a720940704aa9793e607f0
diff --git a/parallel/pvm3/files/patch-sum b/parallel/pvm3/files/patch-sum
index 485b4b66121..513be233691 100644
--- a/parallel/pvm3/files/patch-sum
+++ b/parallel/pvm3/files/patch-sum
@@ -1,17 +1,36 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:14:55 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
 
-MD5 (patch-aa) = 4b11596397f3a227f66ba8cc5721fcdd
-MD5 (patch-ab) = bea485d25af143a8e10c4b33e46725e6
-MD5 (patch-ac) = c187438b9741e1ff292bbe899426a3a0
-MD5 (patch-ad) = a26a0172f3d2a9b477158bdbc7ce7dc8
-MD5 (patch-ae) = 0ca5f5aef84f3eb7e0672c69ba83c025
-MD5 (patch-af) = 34158516d506ec2519b3ac902430962e
-MD5 (patch-ag) = 6b68db4b8daa858abc960167f350d387
-MD5 (patch-ah) = 69f87f511117f995a6d36066905ad42d
-MD5 (patch-ai) = bd1f2241a08b7759aaf70731582f2c6b
-MD5 (patch-aj) = 2041b0634f7a0ee9625a0ee13c754d91
-MD5 (patch-ak) = b37b292edec206df7418c53192801752
-MD5 (patch-al) = 14a6f0364ff66d3f1da1e4e8cf2a08d4
-MD5 (patch-am) = d94ec2056a2e92e840da3aa7ef917f33
-MD5 (patch-an) = 3329415c68de676ba115d7ef00538ec6
-MD5 (patch-ao) = 35aeea201dd7ce1f24bba90cb2577c67
+MD5 (patch-aa) = 7629d57786765601f25e6167ad624eac
+MD5 (patch-ab) = 17e8590efcbde1cf1b27541e73392306
+MD5 (patch-ac) = 1c0d55bfdc426593fa357cdb6a3237b4
+MD5 (patch-ad) = d8604f01117491b6e883748775aac877
+MD5 (patch-ae) = 47a1f295a76d8bb08916f628de51c3eb
+MD5 (patch-af) = 4a8e5eb215e68d30428a3cfe7fe0dfd7
+MD5 (patch-ag) = 0cc1ccbbc8765ebeb65f057bafec08ec
+MD5 (patch-ah) = 87d09a86b9831c4fe659b867c76e74de
+MD5 (patch-ai) = 303da7649cee6bc70788091d10e69f49
+MD5 (patch-aj) = 874c6323516778afc6746f759a837725
+MD5 (patch-ak) = 094061a95751d0edfe0adfd6e0563ba3
+MD5 (patch-al) = d92fda7b7c46da9da9d3b5a75a8f262a
+MD5 (patch-am) = b60c93d3dc586d4139377d47a28e5ce6
+MD5 (patch-an) = 5f97214ff97cc725308c07ae69a74477
+MD5 (patch-ao) = 0a11a570ca00346871b0a693dc882d0e
+MD5 (patch-ap) = 2e31bd5aac855c6ebd79f367f41c4208
+MD5 (patch-aq) = fd45aa726e7531a3620b1611708891d6
+MD5 (patch-ar) = f78375ac65cf65740145d1ba3a462dc5
+MD5 (patch-as) = 6339b2fbc8a10a8f0be766bc91adb701
+MD5 (patch-at) = f74ef6f89a574c14c2fcd6a5c0cb9867
+MD5 (patch-au) = 8dbd5803792951b97a32a3e0793ca62f
+MD5 (patch-av) = df9ab52371a1d20c5974d0aaec4c7f4d
+MD5 (patch-aw) = 521b13b6f08db34c24aa0bea21052fb2
+MD5 (patch-ax) = 1e798398fd8b03a9aef3a478073f691a
+MD5 (patch-ay) = 940fea933756ffd65688b5ff234c3aa0
+MD5 (patch-az) = 74c461500e09fb6cf178ef8f0fcce13c
+MD5 (patch-ba) = 90b1ff3626986e64e5a7eb5617c70f19
+MD5 (patch-bb) = f98664f95396fcbc1023ed1840c8032c
+MD5 (patch-bc) = c5aef3efef9b051401d98c727708ee7a
+MD5 (patch-bd) = b56b2a8f3c99f3652e4a4e3c9f75fca1
+MD5 (patch-be) = 091f7d863933f38235bed2b9b6d34ef2
+MD5 (patch-bf) = 75f2057fca7987dc3df8db4a5de494a3
+MD5 (patch-bg) = bfbdd91125e5e7b055fcfcb50104d474
+MD5 (patch-bh) = 806b93a50dc3a68b9d6a5a8bb37d8cc4
diff --git a/parallel/pvm3/patches/patch-aa b/parallel/pvm3/patches/patch-aa
index a7b510ad774..75647042ecb 100644
--- a/parallel/pvm3/patches/patch-aa
+++ b/parallel/pvm3/patches/patch-aa
@@ -1,7 +1,32 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/ddpro.c.orig	Fri Aug  7 00:37:07 1998
-+++ src/ddpro.c	Fri Aug  7 00:37:25 1998
-@@ -234,2 +234,3 @@
- #ifdef NEEDMENDIAN
-+#include <sys/types.h>
- #include <machine/endian.h>
+$NetBSD: patch-aa,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
+
+--- ./lib/pvmgetarch.orig	Wed Jul  7 15:54:41 1999
++++ ./lib/pvmgetarch	Mon Nov  1 19:57:42 1999
+@@ -128,12 +128,19 @@
+ 
+ 	if [ -f /netbsd ]; then
+-		case "`/usr/bin/machine`" in
+-		i386)   ARCH=NETBSDI386 ;;
+-		amiga)  ARCH=NETBSDAMIGA ;;
+-		hp300)  ARCH=NETBSDHP300 ;;
+-		mac68k) ARCH=NETBSDMAC68K ;;
+-		pmax)   ARCH=NETBSDPMAX ;;
+-		sparc)  ARCH=NETBSDSPARC ;;
+-		sun3)   ARCH=NETBSDSUN3 ;;
++		# use the processor type for NetBSD because machines with
++		# the same processor are binary compatible.
++		case "`/usr/bin/uname -p`" in
++		alpha)   ARCH=NETBSDALPHA ;;
++		arm32)   ARCH=NETBSDARM32 ;;
++		i386)    ARCH=NETBSDI386 ;;
++		m68k)    ARCH=NETBSDM68K ;;
++		mipseb)  ARCH=NETBSDMIPSEB ;;
++		mipsel)  ARCH=NETBSDMIPSEL ;;
++		ns32k)   ARCH=NETBSDNS32K ;;
++		powerpc) ARCH=NETBSDPOWERPC ;;
++		sh3)     ARCH=NETBSDSH3 ;;
++		sparc)   ARCH=NETBSDSPARC ;;
++		sparc64) ARCH=NETBSDSPARC64 ;;
++		vax)     ARCH=NETBSDVAX ;;
+ 		esac
+ 	elif [ -f /usr/bin/machine ]; then
diff --git a/parallel/pvm3/patches/patch-ab b/parallel/pvm3/patches/patch-ab
index 8e0c681be94..ddffafe79e6 100644
--- a/parallel/pvm3/patches/patch-ab
+++ b/parallel/pvm3/patches/patch-ab
@@ -1,7 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/hoster.c.orig	Fri Aug  7 00:37:49 1998
-+++ src/hoster.c	Fri Aug  7 00:38:11 1998
-@@ -142,2 +142,3 @@
- #ifdef NEEDMENDIAN
-+#include <sys/types.h>
- #include <machine/endian.h>
+$NetBSD: patch-ab,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
+
+--- ./xep/imp.c.orig	Tue Mar 16 11:01:44 1999
++++ ./xep/imp.c	Mon Nov  1 09:39:01 1999
+@@ -73,4 +73,5 @@
+ #define	byteswide(w) (((w)+7)/8)
+ 
++static int mkrbow(unsigned int *,unsigned int *,unsigned int *,int,int);
+ 
+ /***************
diff --git a/parallel/pvm3/patches/patch-ac b/parallel/pvm3/patches/patch-ac
index 3c4f14bdc36..31abc84ffd9 100644
--- a/parallel/pvm3/patches/patch-ac
+++ b/parallel/pvm3/patches/patch-ac
@@ -1,7 +1,10 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/pvmdpack.c.orig	Fri Aug  7 00:39:13 1998
-+++ src/pvmdpack.c	Fri Aug  7 00:39:27 1998
-@@ -66,2 +66,3 @@
+$NetBSD: patch-ac,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
+ 
+--- ./src/ddpro.c.orig	Thu Aug 19 11:39:22 1999
++++ ./src/ddpro.c	Sun Oct 31 11:41:54 1999
+@@ -278,4 +278,5 @@
+ 
  #ifdef NEEDMENDIAN
 +#include <sys/types.h>
  #include <machine/endian.h>
+ #endif
diff --git a/parallel/pvm3/patches/patch-ad b/parallel/pvm3/patches/patch-ad
index b6ecf774090..88bfde866a3 100644
--- a/parallel/pvm3/patches/patch-ad
+++ b/parallel/pvm3/patches/patch-ad
@@ -1,7 +1,10 @@
-$NetBSD: patch-ad,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/sdpro.c.orig	Fri Aug  7 00:39:58 1998
-+++ src/sdpro.c	Fri Aug  7 00:40:27 1998
-@@ -75,2 +75,3 @@
+$NetBSD: patch-ad,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
+ 
+--- ./src/hoster.c.orig	Thu Aug 19 11:39:24 1999
++++ ./src/hoster.c	Sun Oct 31 11:43:48 1999
+@@ -171,4 +171,5 @@
+ 
  #ifdef NEEDMENDIAN
 +#include <sys/types.h>
  #include <machine/endian.h>
+ #endif
diff --git a/parallel/pvm3/patches/patch-ae b/parallel/pvm3/patches/patch-ae
index e5d1baf31bc..76cea1fc933 100644
--- a/parallel/pvm3/patches/patch-ae
+++ b/parallel/pvm3/patches/patch-ae
@@ -1,7 +1,10 @@
-$NetBSD: patch-ae,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/task.c.orig	Fri Aug  7 00:41:01 1998
-+++ src/task.c	Fri Aug  7 00:41:17 1998
-@@ -145,2 +145,3 @@
+$NetBSD: patch-ae,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
+ 
+--- ./src/pvmdpack.c.orig	Thu Jul  8 15:00:10 1999
++++ ./src/pvmdpack.c	Sun Oct 31 11:44:18 1999
+@@ -75,4 +75,5 @@
+ 
  #ifdef NEEDMENDIAN
 +#include <sys/types.h>
  #include <machine/endian.h>
+ #endif
diff --git a/parallel/pvm3/patches/patch-af b/parallel/pvm3/patches/patch-af
index 9a10650ec36..7950864765a 100644
--- a/parallel/pvm3/patches/patch-af
+++ b/parallel/pvm3/patches/patch-af
@@ -1,7 +1,10 @@
-$NetBSD: patch-af,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/tdpro.c.orig	Fri Aug  7 00:43:15 1998
-+++ src/tdpro.c	Fri Aug  7 00:43:37 1998
-@@ -207,2 +207,3 @@
+$NetBSD: patch-af,v 1.2 1999/11/23 16:05:30 dmcmahill Exp $
+ 
+--- ./src/sdpro.c.orig	Thu Jul  8 15:00:15 1999
++++ ./src/sdpro.c	Sun Oct 31 11:44:40 1999
+@@ -84,4 +84,5 @@
+ 
  #ifdef NEEDMENDIAN
 +#include <sys/types.h>
  #include <machine/endian.h>
+ #endif
diff --git a/parallel/pvm3/patches/patch-ag b/parallel/pvm3/patches/patch-ag
index 0de7f4d998c..a25b3330acc 100644
--- a/parallel/pvm3/patches/patch-ag
+++ b/parallel/pvm3/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- xep/Makefile.aimk.orig	Fri Aug  7 00:47:14 1998
-+++ xep/Makefile.aimk	Fri Aug  7 00:48:49 1998
-@@ -26,4 +26,4 @@
- XLIBS		=	-lXaw -lXmu -lXext -lXt -lX11
--XCFLAGS		=	-I/usr/local/X11R5/include -I/usr/local/X11/include \
--				-L/usr/local/X11R5/lib -L/usr/local/X11/lib
-+XCFLAGS		=	-I$(X11BASE)/include -Wl,-R$(X11BASE)/lib \
-+				-L$(X11BASE)/lib
+$NetBSD: patch-ag,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
  
+--- ./src/task.c.orig	Thu Jul  8 15:00:15 1999
++++ ./src/task.c	Sun Oct 31 11:45:04 1999
+@@ -165,4 +165,5 @@
+ 
+ #ifdef NEEDMENDIAN
++#include <sys/types.h>
+ #include <machine/endian.h>
+ #endif
diff --git a/parallel/pvm3/patches/patch-ah b/parallel/pvm3/patches/patch-ah
index 8907a25231a..0a8f81a2140 100644
--- a/parallel/pvm3/patches/patch-ah
+++ b/parallel/pvm3/patches/patch-ah
@@ -1,26 +1,10 @@
-$NetBSD: patch-ah,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- lib/pvmgetarch.orig	Fri Aug  7 00:50:47 1998
-+++ lib/pvmgetarch	Fri Aug  7 00:53:48 1998
-@@ -120,11 +120,13 @@
- 	if [ -f /netbsd ]; then
--		case "`/usr/bin/machine`" in
--		i386)   ARCH=NETBSDI386 ;;
--		amiga)  ARCH=NETBSDAMIGA ;;
--		hp300)  ARCH=NETBSDHP300 ;;
--		mac68k) ARCH=NETBSDMAC68K ;;
--		pmax)   ARCH=NETBSDPMAX ;;
--		sparc)  ARCH=NETBSDSPARC ;;
--		sun3)   ARCH=NETBSDSUN3 ;;
--		esac
-+		ARCH=NETBSD
-+#		case "`/usr/bin/machine`" in
-+#		i386)   ARCH=NETBSDI386 ;;
-+#		alpha)  ARCH=NETBSDALPHA ;;
-+#		amiga)  ARCH=NETBSDAMIGA ;;
-+#		hp300)  ARCH=NETBSDHP300 ;;
-+#		mac68k) ARCH=NETBSDMAC68K ;;
-+#		pmax)   ARCH=NETBSDPMAX ;;
-+#		sparc)  ARCH=NETBSDSPARC ;;
-+#		sun3)   ARCH=NETBSDSUN3 ;;
-+#		esac
- 	elif [ -f /usr/bin/machine ]; then
+$NetBSD: patch-ah,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
+ 
+--- ./src/tdpro.c.orig	Thu Jul  8 15:00:16 1999
++++ ./src/tdpro.c	Sun Oct 31 11:45:28 1999
+@@ -223,4 +223,5 @@
+ 
+ #ifdef NEEDMENDIAN
++#include <sys/types.h>
+ #include <machine/endian.h>
+ #endif
diff --git a/parallel/pvm3/patches/patch-ai b/parallel/pvm3/patches/patch-ai
index 9f825ed3eff..4eca27166b5 100644
--- a/parallel/pvm3/patches/patch-ai
+++ b/parallel/pvm3/patches/patch-ai
@@ -1,11 +1,31 @@
-$NetBSD: patch-ai,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- /dev/null	Fri Aug  7 01:41:07 1998
-+++ conf/NETBSD.def	Fri Aug  7 01:46:28 1998
-@@ -0,0 +1,7 @@
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"$(LOCALBASE)/bin/ssh\" -DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DLOCALBASE=\"$(LOCALBASE)\"
-+ARCHDLIB	=
-+ARCHDOBJ	=
-+ARCHLIB		=
-+HASRANLIB	=	t
-+AR		= 	ar
-+PVM_ARCH	=	NETBSD
+$NetBSD: patch-ai,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
+ 
+--- ./src/pmsg.c.orig	Thu Jul  8 15:00:05 1999
++++ ./src/pmsg.c	Sun Oct 31 11:56:52 1999
+@@ -269,4 +269,18 @@
+ 
+ 			for (j = 0; j < n; j++)
++				if (j < n/2) {
++					if (p[n/2 - 1 - j ]
++					    != thesigs[i].bytes[j])
++						break;
++				} else {
++					if (p[n + n/2 - 1 - j ]
++					    != thesigs[i].bytes[j])
++						break;
++				}
++
++			if (j == n)
++				return ((1 << 4) | i) << o;
++
++			for (j = 0; j < n; j++)
+ 				if (p[n - 1 - j] != thesigs[i].bytes[j])
+ 					break;
+@@ -275,5 +289,6 @@
+ 		}
+ 	}
+-	fprintf(stderr, "can't generate signature for my integer byte order\n");
++	fprintf(stderr,
++		"can't generate signature for my floating point byte order\n");
+ 	abort();
+ 	return 0;
diff --git a/parallel/pvm3/patches/patch-aj b/parallel/pvm3/patches/patch-aj
index c13c367c6bf..840430420fd 100644
--- a/parallel/pvm3/patches/patch-aj
+++ b/parallel/pvm3/patches/patch-aj
@@ -1,24 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- /dev/null	Fri Aug  7 00:35:18 1998
-+++ conf/NETBSD.m4	Fri Aug  7 00:56:51 1998
-@@ -0,0 +1,20 @@
-+divert(-1)
-+undefine(`len')
-+#
-+# FORTRAN function names are in upper case
-+#
-+define(`FUNCTION',`translit($1,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ)')
-+#
-+# FORTRAN character strings are passed as follows:
-+#   XXX is this right?
-+# a pointer to the base of the string is passed in the normal
-+# argument list, and the length is passed by value as an extra
-+# argument, after all of the other arguments.
-+#
-+define(`ARGS',`($1`'undivert(1))')
-+define(`SAVE',`divert(1)$1`'divert(0)')
-+define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
-+define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
-+define(`STRING_LEN',`$1_len')
-+define(`STRING_PTR',`$1_ptr')
-+divert(0)
+$NetBSD: patch-aj,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
+ 
+--- ./xep/Makefile.aimk.orig	Fri Aug 29 10:17:48 1997
++++ ./xep/Makefile.aimk	Sun Oct 31 11:47:13 1999
+@@ -25,6 +25,6 @@
+ LIBS		=	-l$(PVMLIB) $(ARCHLIB) $(OS2XEPLIBS)
+ XLIBS		=	-lXaw -lXmu -lXext -lXt -lX11
+-XCFLAGS		=	-I/usr/local/X11R5/include -I/usr/local/X11/include \
+-				-L/usr/local/X11R5/lib -L/usr/local/X11/lib
++XCFLAGS		=	-I${X11BASE}/include  \
++				-L${X11BASE}/lib -Wl,-R$(X11BASE)/lib
+ 
+ HEADERS		=	$(SDIR)/hostc.h $(SDIR)/imp.h $(SDIR)/myalloc.h \
diff --git a/parallel/pvm3/patches/patch-ak b/parallel/pvm3/patches/patch-ak
index 007cd7a6173..b08a3f65387 100644
--- a/parallel/pvm3/patches/patch-ak
+++ b/parallel/pvm3/patches/patch-ak
@@ -1,20 +1,11 @@
-$NetBSD: patch-ak,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- lib/pvm.orig	Thu Aug 28 13:12:35 1997
-+++ lib/pvm	Fri Aug  7 03:31:05 1998
-@@ -14,2 +14,4 @@
- #
-+PVM_ROOT=XXPKGXX
-+PVM_ARCH=NETBSD
- 
-@@ -60,4 +62,4 @@
- 
--if [ ! -f $PVM_ROOT/lib/$PVM_ARCH/pvm$sfx ]; then
--	echo "pvm: $PVM_ROOT/lib/$PVM_ARCH/pvm$sfx doesn't exist." >&2
-+if [ ! -f $PVM_ROOT/libexec/pvm$sfx ]; then
-+	echo "pvm: $PVM_ROOT/libexec/pvm$sfx doesn't exist." >&2
- 	echo "Make sure PVM is built and PVM_ROOT is set correctly" >&2
-@@ -66,3 +68,3 @@
- export PVM_ARCH
--exec $PVM_ROOT/lib/$PVM_ARCH/pvm$sfx $@
-+exec $PVM_ROOT/libexec/pvm$sfx $@
- exit 1
+$NetBSD: patch-ak,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
+
+--- ./conf/NETBSDSPARC.def.orig	Wed Oct  7 11:48:38 1998
++++ ./conf/NETBSDSPARC.def	Mon Nov  8 08:25:25 1999
+@@ -1,4 +1,4 @@
+-ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
+-				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
+ ARCHDLIB	=
+ ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-al b/parallel/pvm3/patches/patch-al
index 8e472050943..c6efd8d6cfc 100644
--- a/parallel/pvm3/patches/patch-al
+++ b/parallel/pvm3/patches/patch-al
@@ -1,19 +1,17 @@
-$NetBSD: patch-al,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- lib/pvmd.orig	Thu Aug 28 13:13:16 1997
-+++ lib/pvmd	Fri Aug  7 03:31:27 1998
-@@ -15,2 +15,5 @@
- 
-+PVM_ROOT=XXPKGXX
-+PVM_ARCH=NETBSD
-+
- case "x$PVM_ROOT" in x )
-@@ -81,3 +84,3 @@
- 
--if [ ! -f $PVM_ROOT/lib/$PVM_ARCH/pvmd3$sfx ]; then
-+if [ ! -f $PVM_ROOT/libexec/pvmd3$sfx ]; then
- 	echo "pvmd: $PVM_ROOT/lib/$PVM_ARCH/pvmd3$sfx doesn't exist." >&2
-@@ -86,3 +89,3 @@
- fi
--exec $PVM_ROOT/lib/$PVM_ARCH/pvmd3$sfx $@
-+exec $PVM_ROOT/libexec/pvmd3$sfx $@
- exit 1
+$NetBSD: patch-al,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
+
+--- ./conf/NETBSDSPARC.m4.orig	Mon Sep 23 16:18:02 1996
++++ ./conf/NETBSDSPARC.m4	Mon Nov  1 08:58:05 1999
+@@ -2,10 +2,9 @@
+ undefine(`len')
+ #
+-# FORTRAN function names are in upper case
++# append an underscore to FORTRAN function names
+ #
+-define(`FUNCTION',`translit($1,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ)')
++define(`FUNCTION',`$1_')
+ #
+ # FORTRAN character strings are passed as follows:
+-#   XXX is this right?
+ # a pointer to the base of the string is passed in the normal
+ # argument list, and the length is passed by value as an extra
diff --git a/parallel/pvm3/patches/patch-am b/parallel/pvm3/patches/patch-am
index 2ef9830e670..b60ad225f21 100644
--- a/parallel/pvm3/patches/patch-am
+++ b/parallel/pvm3/patches/patch-am
@@ -1,18 +1,15 @@
-$NetBSD: patch-am,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/global.h.orig	Fri Aug  7 01:36:40 1998
-+++ src/global.h	Fri Aug  7 01:38:54 1998
-@@ -232,3 +232,3 @@
- #ifndef	DEFBINDIR
--#define	DEFBINDIR	"$HOME/pvm3/bin/$PVM_ARCH:$PVM_ROOT/bin/$PVM_ARCH"
-+#define	DEFBINDIR	LOCALBASE "/libexec"
- #endif
-@@ -243,3 +243,3 @@
- #else
--#define	PVMDFILE	"lib/pvmd"
-+#define	PVMDFILE	LOCALBASE "/bin/pvmd"
- #endif
-@@ -248,3 +248,3 @@
- #ifndef	PVMDPATH
--#define	PVMDPATH	"$PVM_ROOT/lib/pvmd"
-+#define	PVMDPATH	LOCALBASE "/bin/pvmd"
- #endif
+$NetBSD: patch-am,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDALPHA.def	Mon Nov  1 16:54:59 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDALPHA
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-an b/parallel/pvm3/patches/patch-an
index 981c70704ac..42fe10ce507 100644
--- a/parallel/pvm3/patches/patch-an
+++ b/parallel/pvm3/patches/patch-an
@@ -1,8 +1,24 @@
-$NetBSD: patch-an,v 1.1.1.1 1998/10/13 23:31:04 garbled Exp $
---- src/host.c.orig	Fri Aug  7 03:15:36 1998
-+++ src/host.c	Fri Aug  7 03:16:05 1998
-@@ -877,3 +877,3 @@
- 
--#ifdef	SIOCGIFCONF
-+#if defined(SIOCGIFCONF) && !defined(__NetBSD__)
+$NetBSD: patch-an,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
  
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDALPHA.m4	Mon Nov  1 16:55:01 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-ao b/parallel/pvm3/patches/patch-ao
index 9d47abb1b19..cb12a86930d 100644
--- a/parallel/pvm3/patches/patch-ao
+++ b/parallel/pvm3/patches/patch-ao
@@ -1,33 +1,15 @@
-$NetBSD: patch-ao,v 1.1 1998/10/29 05:15:10 garbled Exp $
---- src/pmsg.c.orig	Tue Mar 10 12:32:31 1998
-+++ src/pmsg.c	Wed Oct 28 11:23:53 1998
-@@ -252,13 +252,28 @@
- 				return ((3 << 4) | i) << o;
+$NetBSD: patch-ao,v 1.2 1999/11/23 16:05:31 dmcmahill Exp $
  
- 			for (j = 0; j < n; j++)
-+				if (j < n/2) {
-+					if (p[n/2 - 1 - j ]
-+					    != thesigs[i].bytes[j])
-+						break;
-+				} else {
-+					if (p[n + n/2 - 1 - j ]
-+					    != thesigs[i].bytes[j])
-+						break;
-+				}
-+
-+			if (j == n)
-+				return ((1 << 4) | i) << o;
-+
-+			for (j = 0; j < n; j++)
- 				if (p[n - 1 - j] != thesigs[i].bytes[j])
- 					break;
- 			if (j == n)
- 				return i << o;
- 		}
- 	}
--	fprintf(stderr, "can't generate signature for my integer byte order\n");
-+	fprintf(stderr,
-+		"can't generate signature for my floating point byte order\n");
- 	abort();
- 	return 0;
- }
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDARM32.def	Mon Nov  1 16:55:03 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDARM32
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-ap b/parallel/pvm3/patches/patch-ap
new file mode 100644
index 00000000000..c30d75a3608
--- /dev/null
+++ b/parallel/pvm3/patches/patch-ap
@@ -0,0 +1,24 @@
+$NetBSD: patch-ap,v 1.1 1999/11/23 16:05:31 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDARM32.m4	Mon Nov  1 16:55:05 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-aq b/parallel/pvm3/patches/patch-aq
new file mode 100644
index 00000000000..c06ba090577
--- /dev/null
+++ b/parallel/pvm3/patches/patch-aq
@@ -0,0 +1,11 @@
+$NetBSD: patch-aq,v 1.1 1999/11/23 16:05:32 dmcmahill Exp $
+
+--- ./conf/NETBSDI386.def.orig  Wed Oct  7 11:48:36 1998
++++ ./conf/NETBSDI386.def       Mon Nov  1 16:55:07 1999
+@@ -1,4 +1,4 @@
+-ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
+-				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
+ ARCHDLIB	=
+ ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ar b/parallel/pvm3/patches/patch-ar
new file mode 100644
index 00000000000..acf62a54777
--- /dev/null
+++ b/parallel/pvm3/patches/patch-ar
@@ -0,0 +1,17 @@
+$NetBSD: patch-ar,v 1.1 1999/11/23 16:05:32 dmcmahill Exp $
+ 
+--- ./conf/NETBSDI386.m4.orig	Mon Sep 23 16:17:58 1996
++++ ./conf/NETBSDI386.m4	Mon Nov  1 16:55:09 1999
+@@ -2,10 +2,9 @@
+ undefine(`len')
+ #
+-# FORTRAN function names are in upper case
++# append an underscore to FORTRAN function names
+ #
+-define(`FUNCTION',`translit($1,abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ)')
++define(`FUNCTION',`$1_')
+ #
+ # FORTRAN character strings are passed as follows:
+-#   XXX is this right?
+ # a pointer to the base of the string is passed in the normal
+ # argument list, and the length is passed by value as an extra
diff --git a/parallel/pvm3/patches/patch-as b/parallel/pvm3/patches/patch-as
new file mode 100644
index 00000000000..8838a292d9c
--- /dev/null
+++ b/parallel/pvm3/patches/patch-as
@@ -0,0 +1,15 @@
+$NetBSD: patch-as,v 1.1 1999/11/23 16:05:32 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDM68K.def	Mon Nov  1 16:55:11 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDM68K
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-at b/parallel/pvm3/patches/patch-at
new file mode 100644
index 00000000000..7e5bd26909d
--- /dev/null
+++ b/parallel/pvm3/patches/patch-at
@@ -0,0 +1,24 @@
+$NetBSD: patch-at,v 1.1 1999/11/23 16:05:32 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDM68K.m4	Mon Nov  1 16:55:13 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-au b/parallel/pvm3/patches/patch-au
new file mode 100644
index 00000000000..0e62d070920
--- /dev/null
+++ b/parallel/pvm3/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.1 1999/11/23 16:05:32 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDMIPSEB.def	Mon Nov  1 16:55:15 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDMIPSEB
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-av b/parallel/pvm3/patches/patch-av
new file mode 100644
index 00000000000..fc7721da4fb
--- /dev/null
+++ b/parallel/pvm3/patches/patch-av
@@ -0,0 +1,24 @@
+$NetBSD: patch-av,v 1.1 1999/11/23 16:05:32 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDMIPSEB.m4	Mon Nov  1 16:55:17 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-aw b/parallel/pvm3/patches/patch-aw
new file mode 100644
index 00000000000..484c11e9505
--- /dev/null
+++ b/parallel/pvm3/patches/patch-aw
@@ -0,0 +1,15 @@
+$NetBSD: patch-aw,v 1.1 1999/11/23 16:05:33 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDMIPSEL.def	Mon Nov  1 16:55:19 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDMIPSEL
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-ax b/parallel/pvm3/patches/patch-ax
new file mode 100644
index 00000000000..7f7588b21e3
--- /dev/null
+++ b/parallel/pvm3/patches/patch-ax
@@ -0,0 +1,24 @@
+$NetBSD: patch-ax,v 1.1 1999/11/23 16:05:33 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDMIPSEL.m4	Mon Nov  1 16:55:21 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-ay b/parallel/pvm3/patches/patch-ay
new file mode 100644
index 00000000000..4d81c1a5b3f
--- /dev/null
+++ b/parallel/pvm3/patches/patch-ay
@@ -0,0 +1,15 @@
+$NetBSD: patch-ay,v 1.1 1999/11/23 16:05:33 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDNS32K.def	Mon Nov  1 16:55:23 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDNS32K
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-az b/parallel/pvm3/patches/patch-az
new file mode 100644
index 00000000000..e35f4ec1b87
--- /dev/null
+++ b/parallel/pvm3/patches/patch-az
@@ -0,0 +1,24 @@
+$NetBSD: patch-az,v 1.1 1999/11/23 16:05:34 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDNS32K.m4	Mon Nov  1 16:55:25 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-ba b/parallel/pvm3/patches/patch-ba
new file mode 100644
index 00000000000..acf8a177bbd
--- /dev/null
+++ b/parallel/pvm3/patches/patch-ba
@@ -0,0 +1,15 @@
+$NetBSD: patch-ba,v 1.1 1999/11/23 16:05:34 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDPOWERPC.def	Mon Nov  1 16:55:27 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDPOWERPC
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-bb b/parallel/pvm3/patches/patch-bb
new file mode 100644
index 00000000000..7faa3604baf
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bb
@@ -0,0 +1,24 @@
+$NetBSD: patch-bb,v 1.1 1999/11/23 16:05:36 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDPOWERPC.m4	Mon Nov  1 16:55:29 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-bc b/parallel/pvm3/patches/patch-bc
new file mode 100644
index 00000000000..5857024d97b
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 1999/11/23 16:05:36 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDSH3.def	Mon Nov  1 16:55:31 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDSH3
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-bd b/parallel/pvm3/patches/patch-bd
new file mode 100644
index 00000000000..5099bf7a742
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bd
@@ -0,0 +1,24 @@
+$NetBSD: patch-bd,v 1.1 1999/11/23 16:05:37 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDSH3.m4	Mon Nov  1 16:55:33 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-be b/parallel/pvm3/patches/patch-be
new file mode 100644
index 00000000000..946b57d0170
--- /dev/null
+++ b/parallel/pvm3/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 1999/11/23 16:05:37 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDSPARC64.def	Mon Nov  1 16:55:35 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDSPARC64
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-bf b/parallel/pvm3/patches/patch-bf
new file mode 100644
index 00000000000..2fcbad09d91
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bf
@@ -0,0 +1,24 @@
+$NetBSD: patch-bf,v 1.1 1999/11/23 16:05:37 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDSPARC64.m4	Mon Nov  1 16:55:37 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
diff --git a/parallel/pvm3/patches/patch-bg b/parallel/pvm3/patches/patch-bg
new file mode 100644
index 00000000000..6c9a4a2cc19
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bg
@@ -0,0 +1,15 @@
+$NetBSD: patch-bg,v 1.1 1999/11/23 16:05:37 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDVAX.def	Mon Nov  1 16:55:39 1999
+@@ -0,0 +1,10 @@
++ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${LOCALBASE}/bin/ssh\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHDLIB	=
++ARCHDOBJ	=
++ARCHLIB		=
++HASRANLIB	=	t
++AR			=	ar
++PVM_ARCH	=	NETBSDVAX
++MAKE		=	make
++#MAKE		=	gmake
diff --git a/parallel/pvm3/patches/patch-bh b/parallel/pvm3/patches/patch-bh
new file mode 100644
index 00000000000..edca0f9c394
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bh
@@ -0,0 +1,24 @@
+$NetBSD: patch-bh,v 1.1 1999/11/23 16:05:37 dmcmahill Exp $
+ 
+--- /dev/null	Mon Nov  1 14:10:37 1999
++++ ./conf/NETBSDVAX.m4	Mon Nov  1 16:55:41 1999
+@@ -0,0 +1,19 @@
++divert(-1)
++undefine(`len')
++#
++# append an underscore to FORTRAN function names
++#
++define(`FUNCTION',`$1_')
++#
++# FORTRAN character strings are passed as follows:
++# a pointer to the base of the string is passed in the normal
++# argument list, and the length is passed by value as an extra
++# argument, after all of the other arguments.
++#
++define(`ARGS',`($1`'undivert(1))')
++define(`SAVE',`divert(1)$1`'divert(0)')
++define(`STRING_ARG',`$1_ptr`'SAVE(`, $1_len')')
++define(`STRING_ARG_DECL',`char * $1_ptr; int $1_len')
++define(`STRING_LEN',`$1_len')
++define(`STRING_PTR',`$1_ptr')
++divert(0)
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