- add -DCTIMEISTIMET to all the NetBSD arch definition files. This just

  says to use type time_t for ctime(3).

- Fix some format strings for 64 bit systems.

- use '?=' instead of '='when setting the command used for rsh/ssh so the
  user can set it in mk.conf (PVM_SSH).

14 files changed, 44 insertions, 41 deletions

diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index f7e1fad560b..1a1b202ee88 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2001/02/17 17:53:00 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/05/24 19:51:07 dmcmahill Exp $
 
 DISTNAME=		pvm3.4.3
 PKGNAME=		pvm-3.4.3
@@ -11,10 +11,10 @@ HOMEPAGE=		http://www.epm.ornl.gov/pvm/pvm_home.html
 COMMENT=		Parallel Virtual Machine libraries and environment
 
 .if exists(/usr/bin/ssh)
-SSH=		/usr/bin/ssh
+PVM_SSH?=		/usr/bin/ssh
 .else
 DEPENDS+=		{openssh-*,ssh{,6}-1.2.27*}:../../security/ssh
-SSH=		${LOCALBASE}/bin/ssh
+PVM_SSH?=		${LOCALBASE}/bin/ssh
 .endif
 
 USE_FORTRAN=		yes
@@ -22,7 +22,7 @@ USE_X11=		yes
 WRKSRC=			${WRKDIR}/pvm3
 MAKE_ENV+=		PVM_ROOT=${WRKSRC}
 MAKE_ENV+=		PVM_ARCH=
-MAKE_ENV+=		SSH=${SSH}
+MAKE_ENV+=		SSH=${PVM_SSH}
 ALL_TARGET=		all install
 PLIST_SRC=		${WRKDIR}/PLIST-src
 
diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index 2c553c23e0f..481f6fa3a19 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,18 +1,21 @@
-$NetBSD: distinfo,v 1.3 2001/05/24 19:32:32 dmcmahill Exp $
+$NetBSD: distinfo,v 1.4 2001/05/24 19:51:07 dmcmahill Exp $
 
 SHA1 (pvm3.4.3.tgz) = 77d2e51f42316c0a04f9bfc2a9bb20676f4fd087
 Size (pvm3.4.3.tgz) = 946076 bytes
-SHA1 (patch-aa) = 91b62b0b9cb541c5d0021ae4e4a1f2047655c34a
-SHA1 (patch-ab) = 4026b11d86eb2ba66ace1774a99f51c56bcc4b34
-SHA1 (patch-ac) = 953733fa2f1e41f2588ae71eae3ce70dc064a7c8
-SHA1 (patch-ad) = af899abbc2ee96d0d85f5133c0fb0bafccd01570
-SHA1 (patch-ae) = 5b7c2e0bd622529fdacb0b5b040da902992b722e
-SHA1 (patch-af) = cef251f0b542e12a46f6695c32289f0f1643a83f
-SHA1 (patch-ag) = 37c0340aef007543f0faae275d4317ad22632c5b
-SHA1 (patch-ah) = ea433b7e542844766f53137c71d103f73ca67e9c
-SHA1 (patch-ai) = b92a38791630dc6c0a7b93fc76891902b8876dea
-SHA1 (patch-aj) = faf239140e89495bb344e0b9be8f6e832673b1ba
-SHA1 (patch-ak) = c17cd124fbafaa87b31b844c656da7a1ecc036c5
-SHA1 (patch-al) = 519c3ef6439ad52c0a8b6290c3bfeae4e2d55be5
+SHA1 (patch-aa) = 15bd164f59bd90f4c90d23ce0a6bb0935486f652
+SHA1 (patch-ab) = 2e26b6ff866d960dfcbc41a7560dc46d1f3da755
+SHA1 (patch-ac) = 92cc54018684918913f7fecaa1cf2ee43bfebe98
+SHA1 (patch-ad) = f62fa1fbbe5d3d004eb7e61478e4556036bf7f9b
+SHA1 (patch-ae) = 3f2ccec4e446238d3a703a947099bc5442cdbaa3
+SHA1 (patch-af) = c855409b329da1394d6a223fd2ffecf16c176c80
+SHA1 (patch-ag) = ea8f243e79ea5b65d7c285d128dab73336c7ea3e
+SHA1 (patch-ah) = cebc163179950286c2ba56892319b0e61d1e5e30
+SHA1 (patch-ai) = d44e1b5f28dfa7d626895994fca79109239ee856
+SHA1 (patch-aj) = 4245e2a742022a0465015027361cae847cd6cbd6
+SHA1 (patch-ak) = 9c5115017a05e184221de465ac8d9dad636f9c45
+SHA1 (patch-al) = 7d5e0aa7e2c7177493fcfb7e799c7538143911a9
 SHA1 (patch-am) = 6fb271beb230e5fc5d5f0d720ba098b3b4352501
 SHA1 (patch-an) = 7b0ba18a78a649a3ca20e17bc4a61e3b558b6ced
+SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d
+SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9
+SHA1 (patch-aq) = 6bedbe1d3cb3d7cf7b61a4e6233ac7601173d9f8
diff --git a/parallel/pvm3/patches/patch-aa b/parallel/pvm3/patches/patch-aa
index f8ace57e9dd..b5e4dd58728 100644
--- a/parallel/pvm3/patches/patch-aa
+++ b/parallel/pvm3/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.4 2000/10/10 19:26:15 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
 
 --- conf/NETBSDALPHA.def.orig	Wed Feb 16 16:19:20 2000
 +++ conf/NETBSDALPHA.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ab b/parallel/pvm3/patches/patch-ab
index fa56adeb456..67e417f8a54 100644
--- a/parallel/pvm3/patches/patch-ab
+++ b/parallel/pvm3/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
 
 --- conf/NETBSDARM32.def.orig	Wed Feb 16 16:19:21 2000
 +++ conf/NETBSDARM32.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ac b/parallel/pvm3/patches/patch-ac
index e860ac67608..177970b9702 100644
--- a/parallel/pvm3/patches/patch-ac
+++ b/parallel/pvm3/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
 
 --- conf/NETBSDI386.def.orig	Wed Feb 16 16:17:48 2000
 +++ conf/NETBSDI386.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ad b/parallel/pvm3/patches/patch-ad
index c4a083df1c6..41340c34427 100644
--- a/parallel/pvm3/patches/patch-ad
+++ b/parallel/pvm3/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
 
 --- conf/NETBSDM68K.def.orig	Wed Feb 16 16:19:22 2000
 +++ conf/NETBSDM68K.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ae b/parallel/pvm3/patches/patch-ae
index e170b0a3c46..94d7f5d3ffe 100644
--- a/parallel/pvm3/patches/patch-ae
+++ b/parallel/pvm3/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
 
 --- conf/NETBSDMIPSEB.def.orig	Wed Feb 16 16:19:24 2000
 +++ conf/NETBSDMIPSEB.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-af b/parallel/pvm3/patches/patch-af
index 6680ef701c3..91577f3dea1 100644
--- a/parallel/pvm3/patches/patch-af
+++ b/parallel/pvm3/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-af,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDMIPSEL.def.orig	Wed Feb 16 16:19:27 2000
 +++ conf/NETBSDMIPSEL.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ag b/parallel/pvm3/patches/patch-ag
index 49cf81cb1c8..170565706bb 100644
--- a/parallel/pvm3/patches/patch-ag
+++ b/parallel/pvm3/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDNS32K.def.orig	Wed Feb 16 16:19:34 2000
 +++ conf/NETBSDNS32K.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ah b/parallel/pvm3/patches/patch-ah
index ef5ba44fe03..ba522f45e17 100644
--- a/parallel/pvm3/patches/patch-ah
+++ b/parallel/pvm3/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDPOWERPC.def.orig	Wed Feb 16 16:19:37 2000
 +++ conf/NETBSDPOWERPC.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ai b/parallel/pvm3/patches/patch-ai
index 2db22498b08..430aaab6d94 100644
--- a/parallel/pvm3/patches/patch-ai
+++ b/parallel/pvm3/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDSH3.def.orig	Wed Feb 16 16:20:10 2000
 +++ conf/NETBSDSH3.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-aj b/parallel/pvm3/patches/patch-aj
index 51fd833b40b..139bfcb4a1e 100644
--- a/parallel/pvm3/patches/patch-aj
+++ b/parallel/pvm3/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDSPARC.def.orig	Wed Feb 16 16:17:49 2000
 +++ conf/NETBSDSPARC.def	Fri Jun 30 17:05:55 2000
@@ -8,7 +8,7 @@ $NetBSD: patch-aj,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
  #
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
 -				-DHASERRORVARS -DNOREXEC -DSYSERRISCONST
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ak b/parallel/pvm3/patches/patch-ak
index 766bdf29856..173ea8ffe9b 100644
--- a/parallel/pvm3/patches/patch-ak
+++ b/parallel/pvm3/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-ak,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDSPARC64.def.orig	Wed Feb 16 16:20:11 2000
 +++ conf/NETBSDSPARC64.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-al b/parallel/pvm3/patches/patch-al
index aa655c6f3a4..75252d0b49e 100644
--- a/parallel/pvm3/patches/patch-al
+++ b/parallel/pvm3/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.4 2000/10/10 19:26:16 dmcmahill Exp $
+$NetBSD: patch-al,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
 
 --- conf/NETBSDVAX.def.orig	Wed Feb 16 16:20:12 2000
 +++ conf/NETBSDVAX.def	Fri Jun 30 16:55:52 2000
 @@ -1,4 +1,4 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=