Add DragonFly support. Fix errno.

8 files changed, 96 insertions, 6 deletions

diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index feaf264e663..84ca659163b 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:51 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2006/01/27 16:34:36 joerg Exp $
 
 DISTNAME=	pvm3.4.5
 PKGNAME=	pvm-3.4.5
@@ -38,6 +38,9 @@ BUILDLINK_PASSTHRU_RPATHDIRS+=	${PVM_DIR}/lib/${PVM_ARCH}
 
 .include "../../mk/x11.buildlink3.mk"
 
+post-extract:
+	${CP} ${FILESDIR}/DRAGONFLY.m4 ${FILESDIR}/DRAGONFLY.def ${WRKSRC}/conf
+
 post-build:
 	${CP} ${WRKSRC}/examples/${PVM_ARCH}/.libs/* \
 		${WRKSRC}/bin/${PVM_ARCH}/.libs
diff --git a/parallel/pvm3/arch.mk b/parallel/pvm3/arch.mk
index bb1edd0018c..6062fed8d4d 100644
--- a/parallel/pvm3/arch.mk
+++ b/parallel/pvm3/arch.mk
@@ -1,4 +1,4 @@
-# $NetBSD: arch.mk,v 1.8 2005/12/05 20:50:51 rillig Exp $
+# $NetBSD: arch.mk,v 1.9 2006/01/27 16:34:36 joerg Exp $
 #
 
 .include "../../mk/bsd.prefs.mk"
@@ -28,6 +28,12 @@ _PVM_ARCH=	SOL2	# Solaris (SunOS 5.*)
 .elif ${OPSYS} == "Darwin"
 _PVM_OPSYS=    DARWIN
 _PVM_ARCH=     # empty
+.elif ${OPSYS} == "DragonFly" 
+_PVM_OPSYS=	DRAGONFLY
+_PVM_ARCH=	# empty
+.elif ${OPSYS} == "FreeBSD"
+_PVM_OPSYS=	FREEBSD
+_PVM_ARCH=	# empty
 .else
 _PVM_OPSYS=	UNKNOWN
 _PVM_ARCH=	# empty
diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index 872ced6985e..6a578a5f680 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2005/02/24 12:23:31 agc Exp $
+$NetBSD: distinfo,v 1.19 2006/01/27 16:34:36 joerg Exp $
 
 SHA1 (pvm3.4.5.tgz) = c14946a4591c4f258380a20b478ee837ad69d985
 RMD160 (pvm3.4.5.tgz) = 22244c42a964d74ada43fb1379d7b4179afc7f9e
@@ -26,7 +26,7 @@ SHA1 (patch-at) = 4afe071e3b286efc40c12f2e2e21304d190abde8
 SHA1 (patch-au) = 4c560b4b3c90088e2dc471951f696a1c5f4ef8dd
 SHA1 (patch-av) = 4aa08bfe0f8e8e02762db9d8aff452bdc0805825
 SHA1 (patch-aw) = a97cdb684b24d7a4b0bcaea0814ebebfb9687b7d
-SHA1 (patch-ax) = fdea171835f13e4e5205ffb71a70ba37ba1219bc
+SHA1 (patch-ax) = fe4208c9f89399be830cdd2a09c987551868e742
 SHA1 (patch-ay) = 5006d9f76dbb536f3d1280dda92920a790d90da1
 SHA1 (patch-az) = 8f3879e1c734406ae4d6752c025d42925a56893a
 SHA1 (patch-ba) = b61612bc5375426abeb9aa5b527cfc0b892c4720
@@ -42,6 +42,7 @@ SHA1 (patch-bj) = 1c2817c77e7acf7876625e4b9989982bb80e345e
 SHA1 (patch-bk) = 753d265149b704e88e2906dedcc9e9ae5a00800f
 SHA1 (patch-bl) = 5faec2ed16c8711da93ad487c301558d36bc7ed8
 SHA1 (patch-bm) = 71a5bccf0a6e7f28b20bcc9835bc4ba7c39f5af7
+SHA1 (patch-bo) = 237a14c583e10752ba546605aaeb2007a5a62e55
 SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
 SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
@@ -50,3 +51,4 @@ SHA1 (patch-bu) = 952c6f9c7657447809698950f01ca88784792df6
 SHA1 (patch-bv) = 70e40116da06dcd3ef8cc939c2f885c16fe0c45c
 SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
 SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
+SHA1 (patch-by) = b01936f9edc789d3a64ca9c56835a68ea3f07ea2
diff --git a/parallel/pvm3/files/DRAGONFLY.def b/parallel/pvm3/files/DRAGONFLY.def
new file mode 100644
index 00000000000..56ed3b1f1f5
--- /dev/null
+++ b/parallel/pvm3/files/DRAGONFLY.def
@@ -0,0 +1,10 @@
+ARCHCFLAGS	=	-DSOCKADHASLEN -DNOREXEC -DRSHCOMMAND=\"/usr/bin/rsh\" \
+				-DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
+				-DFAKEXDRFLOAT -DSYSERRISCONST
+ARCHDLIB	=
+ARCHDOBJ	=
+ARCHLIB		=	-lrpcsvc
+HASRANLIB	=	t
+AR			=	ar
+PVM_ARCH	=	DRAGONFLY
+MAKE		=	make
diff --git a/parallel/pvm3/files/DRAGONFLY.m4 b/parallel/pvm3/files/DRAGONFLY.m4
new file mode 100644
index 00000000000..db2fbc14746
--- /dev/null
+++ b/parallel/pvm3/files/DRAGONFLY.m4
@@ -0,0 +1,10 @@
+divert(-1)
+undefine(`len')
+define(`FUNCTION',`$1_')
+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-ax b/parallel/pvm3/patches/patch-ax
index 6e644d71d8f..ec8d7a05f39 100644
--- a/parallel/pvm3/patches/patch-ax
+++ b/parallel/pvm3/patches/patch-ax
@@ -1,8 +1,16 @@
-$NetBSD: patch-ax,v 1.5 2004/11/12 10:45:45 adam Exp $
+$NetBSD: patch-ax,v 1.6 2006/01/27 16:34:36 joerg Exp $
 
 --- lib/pvmgetarch.orig	2004-02-03 20:12:05.000000000 +0000
 +++ lib/pvmgetarch
-@@ -143,17 +143,27 @@ if [ "$ARCH" = UNKNOWN ]; then
+@@ -78,6 +78,7 @@ if [ -f /bin/uname -o -f /usr/bin/uname 
+ 	Linux,m68k )            ARCH=LINUXATARI ;;
+ 	BSD/OS,i[3456]86 )      ARCH=BSD386 ;;
+ 	FreeBSD,i[3456]86 )     ARCH=FREEBSD ;;
++	DragonFly,i[3456]86 )   ARCH=DRAGONFLY ;;
+ 	FreeBSD,alpha )         ARCH=FREEBSD ;;
+ 	SUPER-UX,SX-3 )         ARCH=SX3 ;;
+ 	uts,* )                 ARCH=UTS2 ;;
+@@ -143,17 +144,27 @@ if [ "$ARCH" = UNKNOWN ]; then
  		# sun3)   ARCH=NETBSDSUN3 ;;  --> NETBSDM68K
  		case "`/usr/bin/uname -p`" in
  		alpha)   ARCH=NETBSDALPHA ;;
diff --git a/parallel/pvm3/patches/patch-bo b/parallel/pvm3/patches/patch-bo
new file mode 100644
index 00000000000..f8cd6024778
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bo
@@ -0,0 +1,25 @@
+$NetBSD: patch-bo,v 1.3 2006/01/27 16:34:36 joerg Exp $
+
+--- src/host.c.orig	2004-01-14 18:50:55.000000000 +0000
++++ src/host.c
+@@ -978,7 +978,7 @@ iflist(alp, np)
+ #ifdef OSIOCGIFCONF
+ #if defined(IMA_RS6K) || defined(IMA_RS6KMP) || defined(IMA_SP2MPI) \
+ 			|| defined(IMA_AIX4SP2) || defined(IMA_AIX5SP2) \
+-			|| defined(IMA_FREEBSD)
++			|| defined(IMA_FREEBSD) || defined(IMA_DRAGONFLY)
+ 		SIOCGIFCONF
+ #else
+ 		OSIOCGIFCONF
+@@ -1005,7 +1005,11 @@ iflist(alp, np)
+ 		}
+ 		/* On some FreeBSD systems: */
+ 		/* if (IFF_UP & req.ifr_flags) { */
++#ifdef IMA_DRAGONFLY
++		if (IFF_UP & req.ifr_flags) {
++#else
+ 		if (IFF_UP & req.ifr_ifru.ifru_flags) {
++#endif
+ 			if (nip > 0 && !(nip % 10))
+ 				iplist = TREALLOC(iplist, (nip + 10), struct in_addr);
+ 			iplist[nip++] =
diff --git a/parallel/pvm3/patches/patch-by b/parallel/pvm3/patches/patch-by
new file mode 100644
index 00000000000..e101ca0475b
--- /dev/null
+++ b/parallel/pvm3/patches/patch-by
@@ -0,0 +1,26 @@
+$NetBSD: patch-by,v 1.1 2006/01/27 16:34:36 joerg Exp $
+
+--- examples/mhf_tickle.c.orig	2006-01-27 16:02:43.000000000 +0000
++++ examples/mhf_tickle.c
+@@ -49,11 +49,7 @@ static char rcsid[] =
+ ***************************************************************/
+ 
+ #include "stdio.h"
+-#ifndef WIN32
+-#include <sys/errno.h>
+-#else
+ #include <errno.h>
+-#endif
+ #include "pvm3.h"
+ 
+ /* #define NOISE1 1	 sets level of program noise  - minimum noise */
+@@ -89,9 +85,6 @@ static char rcsid[] =
+ #endif
+ #define FAILED -1
+ 
+-extern int errno;
+-
+-
+ /***************************************************************/
+ 
+ void eat_line( c )