Fix build with gcc4, based on suggestions by Hans Rosenfeld on tech-pkg.

While here: remove some extra spaces and use PKGMANDIR.

24 files changed, 102 insertions, 86 deletions

diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index 6541bb40e6f..fa7dfc9d9dd 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/10/04 21:54:05 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/12/12 19:29:13 wiz Exp $
 
 DISTNAME=	pvm3.4.5
 PKGNAME=	pvm-3.4.5
@@ -84,30 +84,30 @@ do-install:
 		${PVM_DIR}/bin/${PVM_ARCH}/ ; done
 
 	${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} ${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} ${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} ${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_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
-	${RM} ${PREFIX}/man/man1/PVM.1
-	${LN} -s ${PREFIX}/man/man1/pvm_intro.1 ${PREFIX}/man/man1/PVM.1
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
+	${RM} ${PREFIX}/${PKGMANDIR}/man1/PVM.1
+	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/pvm_intro.1 ${PREFIX}/${PKGMANDIR}/man1/PVM.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index 4743848f2b9..6becb7c62f8 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,47 +1,48 @@
-$NetBSD: distinfo,v 1.20 2006/06/14 16:57:52 joerg Exp $
+$NetBSD: distinfo,v 1.21 2006/12/12 19:29:13 wiz Exp $
 
 SHA1 (pvm3.4.5.tgz) = c14946a4591c4f258380a20b478ee837ad69d985
 RMD160 (pvm3.4.5.tgz) = 22244c42a964d74ada43fb1379d7b4179afc7f9e
 Size (pvm3.4.5.tgz) = 979201 bytes
-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-aa) = 01eb70804ffa50549ef2a9fd1d6d7417438053c6
+SHA1 (patch-ab) = bb34608cab2b1bf0c1a03c3626376ef3fb97627f
+SHA1 (patch-ac) = e1f512152bfb67c9ebdcb10127c906b27c6c684a
+SHA1 (patch-ad) = 3ae745dc17dc8647110fc5f4571badc0bd21e5ae
+SHA1 (patch-ae) = 8b1cd6765adcf86c0e50e8663c3eadac2c43065c
+SHA1 (patch-af) = 6cfe6f2b279efea00b6a4588b51a9833e1d5106e
+SHA1 (patch-ag) = 55545a6ba3c09f27502f44404ac419509ac6ea4e
+SHA1 (patch-ah) = 923137a50581fd376a75571a5db48fb9085f3571
+SHA1 (patch-ai) = 9110c92e7c7ed743c8e869346639792dbbf3b820
+SHA1 (patch-aj) = 9ee59ba6dfb5bff2b2ade6dfd91041af8f93a733
+SHA1 (patch-ak) = f9161b173975625021cdb2612e6748d937ed2864
+SHA1 (patch-al) = 64e8161fc96d1b4390dece60dbd5b11a37dc755d
 SHA1 (patch-am) = d006193cdd138fdae3cff9d0621b04839c38c676
 SHA1 (patch-an) = 767ea8a9a5e0c5fb96b25c29f93d24d4d34b48a4
 SHA1 (patch-ao) = 2b29a5d04774d1c796fe8adf28d385a148504c2d
 SHA1 (patch-ap) = 6a3e8d80e45484e991cbefa9cdb64b23761434b9
 SHA1 (patch-aq) = 6bedbe1d3cb3d7cf7b61a4e6233ac7601173d9f8
-SHA1 (patch-ar) = 463a95e74c76f5ffd1efe22c985eb0513ea0da15
+SHA1 (patch-ar) = bc9951cb567cb92d8c978e1ce003855d554eb74e
 SHA1 (patch-as) = 2e7cd28b4526e3ef3f3bcf3e9f0446ee3a09c891
-SHA1 (patch-at) = 4afe071e3b286efc40c12f2e2e21304d190abde8
+SHA1 (patch-at) = f3dbe98951722d41756b36e8e08bc5b25e0733df
 SHA1 (patch-au) = 4c560b4b3c90088e2dc471951f696a1c5f4ef8dd
-SHA1 (patch-av) = 4aa08bfe0f8e8e02762db9d8aff452bdc0805825
+SHA1 (patch-av) = d6fb408d0c0237b503c9d58ebee17b6ca4d55d24
 SHA1 (patch-aw) = a97cdb684b24d7a4b0bcaea0814ebebfb9687b7d
 SHA1 (patch-ax) = fe4208c9f89399be830cdd2a09c987551868e742
 SHA1 (patch-ay) = 5006d9f76dbb536f3d1280dda92920a790d90da1
 SHA1 (patch-az) = 8f3879e1c734406ae4d6752c025d42925a56893a
-SHA1 (patch-ba) = b61612bc5375426abeb9aa5b527cfc0b892c4720
+SHA1 (patch-ba) = c89743b7d09ce32700a1a3c1c2c0735962523416
 SHA1 (patch-bb) = 4e563c280e4bcf94e546797c1d99248ab1ad5008
-SHA1 (patch-bc) = 7eec4f89255c3d5c64e5ec03574af77aa11a1347
+SHA1 (patch-bc) = 56cc87dfb11f9a8d4cd93acac3b13643b4eb9fb3
 SHA1 (patch-bd) = cf7b76748d17a2ee8f9872b45d35e6ab6429f875
-SHA1 (patch-be) = 911a3774d749b6bd3f598000018c959b5bb588f5
+SHA1 (patch-be) = 16643c0d2257fac2e3c1957df9fafa59b9030264
 SHA1 (patch-bf) = ca5dceb87f9dcba715f4b01982924267e1eb5b0d
-SHA1 (patch-bg) = 418fbcf8b02aa04ea3041190828475ca931ae591
+SHA1 (patch-bg) = 8dba3b19231a69bd8fc892cc64e91dfdc457d6d6
 SHA1 (patch-bh) = 16533fdec088fc575c829ed7e09a8647bd17e322
-SHA1 (patch-bi) = ba5b187647797cf7eec35e0dcb53fe1d4c64cead
+SHA1 (patch-bi) = bc5f70135f581d79e27c6da2d3834b9f1efb9fe0
 SHA1 (patch-bj) = 1c2817c77e7acf7876625e4b9989982bb80e345e
-SHA1 (patch-bk) = 753d265149b704e88e2906dedcc9e9ae5a00800f
+SHA1 (patch-bk) = a05a60b81c5f02e6998cf8b85a1b5ccb814a13db
 SHA1 (patch-bl) = 5faec2ed16c8711da93ad487c301558d36bc7ed8
 SHA1 (patch-bm) = 71a5bccf0a6e7f28b20bcc9835bc4ba7c39f5af7
+SHA1 (patch-bn) = 9e36274f1aedaba3586bab5def88db561d0066d4
 SHA1 (patch-bo) = 237a14c583e10752ba546605aaeb2007a5a62e55
 SHA1 (patch-bq) = 404d9b54968945019767bd299f40e69eb6a7f624
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
diff --git a/parallel/pvm3/patches/patch-aa b/parallel/pvm3/patches/patch-aa
index b5e4dd58728..f77828881ce 100644
--- a/parallel/pvm3/patches/patch-aa
+++ b/parallel/pvm3/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 67e417f8a54..a02de977476 100644
--- a/parallel/pvm3/patches/patch-ab
+++ b/parallel/pvm3/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 177970b9702..610e3ab60ae 100644
--- a/parallel/pvm3/patches/patch-ac
+++ b/parallel/pvm3/patches/patch-ac
@@ -1,10 +1,12 @@
-$NetBSD: patch-ac,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2006/12/12 19:29:13 wiz 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 @@
+--- conf/NETBSDI386.def.orig	2000-02-16 22:17:48.000000000 +0100
++++ conf/NETBSDI386.def
+@@ -1,5 +1,5 @@
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
- 				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
+-				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST -DHASSTDLIB
  ARCHDLIB	=
  ARCHDOBJ	=
+ ARCHLIB		=
diff --git a/parallel/pvm3/patches/patch-ad b/parallel/pvm3/patches/patch-ad
index 41340c34427..b4caf3f54ee 100644
--- a/parallel/pvm3/patches/patch-ad
+++ b/parallel/pvm3/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 94d7f5d3ffe..a3909be0ec0 100644
--- a/parallel/pvm3/patches/patch-ae
+++ b/parallel/pvm3/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.5 2001/05/24 19:51:07 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 91577f3dea1..e16709a0ace 100644
--- a/parallel/pvm3/patches/patch-af
+++ b/parallel/pvm3/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-af,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 170565706bb..95746fa07c4 100644
--- a/parallel/pvm3/patches/patch-ag
+++ b/parallel/pvm3/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-ag,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 ba522f45e17..aacf260fe81 100644
--- a/parallel/pvm3/patches/patch-ah
+++ b/parallel/pvm3/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 430aaab6d94..6227ab00810 100644
--- a/parallel/pvm3/patches/patch-ai
+++ b/parallel/pvm3/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-ai,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 139bfcb4a1e..30d15795775 100644
--- a/parallel/pvm3/patches/patch-aj
+++ b/parallel/pvm3/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.6 2006/12/12 19:29:13 wiz 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.5 2001/05/24 19:51:08 dmcmahill Exp $
  #
 -ARCHCFLAGS	=	-DSOCKADHASLEN -DRSHCOMMAND=\"/usr/bin/rsh\" \
 -				-DHASERRORVARS -DNOREXEC -DSYSERRISCONST
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 173ea8ffe9b..e3c8a95edfc 100644
--- a/parallel/pvm3/patches/patch-ak
+++ b/parallel/pvm3/patches/patch-ak
@@ -1,10 +1,10 @@
-$NetBSD: patch-ak,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-ak,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -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 75252d0b49e..04b8a1db7b2 100644
--- a/parallel/pvm3/patches/patch-al
+++ b/parallel/pvm3/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.5 2001/05/24 19:51:08 dmcmahill Exp $
+$NetBSD: patch-al,v 1.6 2006/12/12 19:29:13 wiz 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	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
  				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
  ARCHDLIB	=
  ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ar b/parallel/pvm3/patches/patch-ar
index 1e1cc3600ed..7333e0f055d 100644
--- a/parallel/pvm3/patches/patch-ar
+++ b/parallel/pvm3/patches/patch-ar
@@ -1,9 +1,9 @@
-$NetBSD: patch-ar,v 1.3 2002/08/05 01:26:41 dmcmahill Exp $
+$NetBSD: patch-ar,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDARM.def	Tue Jul 30 16:50:41 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-at b/parallel/pvm3/patches/patch-at
index 8bb6197f84b..97f423ed091 100644
--- a/parallel/pvm3/patches/patch-at
+++ b/parallel/pvm3/patches/patch-at
@@ -1,9 +1,9 @@
-$NetBSD: patch-at,v 1.3 2002/08/05 01:26:41 dmcmahill Exp $
+$NetBSD: patch-at,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDHPPA.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-av b/parallel/pvm3/patches/patch-av
index 4b8475b8fd4..29f26d0c0c1 100644
--- a/parallel/pvm3/patches/patch-av
+++ b/parallel/pvm3/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.3 2002/08/05 01:26:41 dmcmahill Exp $
+$NetBSD: patch-av,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDARMEB.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-ba b/parallel/pvm3/patches/patch-ba
index 8c8daae5ae4..d3226005fa9 100644
--- a/parallel/pvm3/patches/patch-ba
+++ b/parallel/pvm3/patches/patch-ba
@@ -1,9 +1,9 @@
-$NetBSD: patch-ba,v 1.3 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-ba,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDPDP10.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-bc b/parallel/pvm3/patches/patch-bc
index 22945fa91a4..37dc6b42d3f 100644
--- a/parallel/pvm3/patches/patch-bc
+++ b/parallel/pvm3/patches/patch-bc
@@ -1,9 +1,9 @@
-$NetBSD: patch-bc,v 1.3 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-bc,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDM68000.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-be b/parallel/pvm3/patches/patch-be
index 01fd1317ed8..ba0b676049d 100644
--- a/parallel/pvm3/patches/patch-be
+++ b/parallel/pvm3/patches/patch-be
@@ -1,9 +1,9 @@
-$NetBSD: patch-be,v 1.3 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-be,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDSH3EB.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-bg b/parallel/pvm3/patches/patch-bg
index aba480e73bc..bda80ff19c6 100644
--- a/parallel/pvm3/patches/patch-bg
+++ b/parallel/pvm3/patches/patch-bg
@@ -1,9 +1,9 @@
-$NetBSD: patch-bg,v 1.3 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-bg,v 1.4 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDSH3EL.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-bi b/parallel/pvm3/patches/patch-bi
index d497dc37ec0..7a693782ffa 100644
--- a/parallel/pvm3/patches/patch-bi
+++ b/parallel/pvm3/patches/patch-bi
@@ -1,9 +1,9 @@
-$NetBSD: patch-bi,v 1.1 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-bi,v 1.2 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDSH5EL.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-bk b/parallel/pvm3/patches/patch-bk
index 2eeefdc866b..1203f23c536 100644
--- a/parallel/pvm3/patches/patch-bk
+++ b/parallel/pvm3/patches/patch-bk
@@ -1,9 +1,9 @@
-$NetBSD: patch-bk,v 1.1 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-bk,v 1.2 2006/12/12 19:29:13 wiz Exp $
 
 --- /dev/null	Tue Jul 30 16:47:47 2002
 +++ conf/NETBSDX86_64.def	Tue Jul 30 16:51:01 2002
 @@ -0,0 +1,10 @@
-+ARCHCFLAGS	=	-DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
++ARCHCFLAGS	=	-DHASSTDLIB -DCTIMEISTIMET -DSOCKADHASLEN -DRSHCOMMAND=\"${SSH}\" \
 +				-DHASERRORVARS -DNOREXEC -DNEEDMENDIAN -DSYSERRISCONST
 +ARCHDLIB	=
 +ARCHDOBJ	=
diff --git a/parallel/pvm3/patches/patch-bn b/parallel/pvm3/patches/patch-bn
new file mode 100644
index 00000000000..fd9bf718683
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bn
@@ -0,0 +1,13 @@
+$NetBSD: patch-bn,v 1.3 2006/12/12 19:29:13 wiz Exp $
+
+--- src/global.h.orig	2001-02-08 00:14:03.000000000 +0100
++++ src/global.h
+@@ -318,6 +318,8 @@ extern	struct pvmmclass *pvmmboxclasses;
+ 
+ /* General Trace Globals Declarations */
+ 
++#include <pvmtev.h>
++
+ extern	struct Pvmtevdid pvmtevdidlist[];
+ 
+ extern	struct Pvmtevinfo pvmtevinfo[];