parallels/pvm3: Add support for DragonFly64

Include string.h unconditionally and update the configuration to
recognize DragonFly x86_64.

3 files changed, 39 insertions, 12 deletions

diff --git a/parallel/pvm3/patches/patch-ax b/parallel/pvm3/patches/patch-ax
index 5ef4e7f28ce..867e087f57e 100644
--- a/parallel/pvm3/patches/patch-ax
+++ b/parallel/pvm3/patches/patch-ax
@@ -1,16 +1,17 @@
-$NetBSD: patch-ax,v 1.7 2008/01/31 21:06:22 is Exp $
+$NetBSD: patch-ax,v 1.8 2011/11/27 00:28:29 marino Exp $
 
---- lib/pvmgetarch.orig	2004-02-03 20:12:05.000000000 +0000
-+++ lib/pvmgetarch	2008-01-31 14:49:48.000000000 +0000
-@@ -78,6 +78,7 @@
+--- lib/pvmgetarch.orig	2007-11-29 21:17:02.000000000 +0000
++++ lib/pvmgetarch
+@@ -78,6 +78,8 @@ 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 ;;
++	DragonFly,x86_64 )	ARCH=DRAGONFLY ;;
  	FreeBSD,alpha )         ARCH=FREEBSD ;;
  	SUPER-UX,SX-3 )         ARCH=SX3 ;;
  	uts,* )                 ARCH=UTS2 ;;
-@@ -87,6 +88,37 @@
+@@ -87,6 +89,37 @@ if [ -f /bin/uname -o -f /usr/bin/uname
  	CYGWIN*,i[3456]86 )     ARCH=CYGWIN ;;
  	Darwin,* )              ARCH=DARWIN ;;
  	Rhapsody,"Power Macintosh" )    ARCH=MACOSX ;;
@@ -48,7 +49,7 @@ $NetBSD: patch-ax,v 1.7 2008/01/31 21:06:22 is Exp $
  	esac
  fi
  
-@@ -135,27 +167,7 @@
+@@ -135,27 +168,7 @@ if [ "$ARCH" = UNKNOWN ]; then
  	if [ -f /dynix ]; then ARCH=SYMM; fi
  	if [ -f /bin/titan ]; then ARCH=TITN; fi
  
diff --git a/parallel/pvm3/patches/patch-bo b/parallel/pvm3/patches/patch-bo
index 24469595725..2e0eba326b3 100644
--- a/parallel/pvm3/patches/patch-bo
+++ b/parallel/pvm3/patches/patch-bo
@@ -1,8 +1,19 @@
-$NetBSD: patch-bo,v 1.5 2009/05/19 23:44:55 asau Exp $
+$NetBSD: patch-bo,v 1.6 2011/11/27 00:28:29 marino Exp $
 
---- src/host.c.orig	2004-01-14 19:50:55.000000000 +0100
-+++ src/host.c	2007-10-14 13:31:44.000000000 +0200
-@@ -978,7 +978,7 @@ iflist(alp, np)
+--- src/host.c.orig	2005-08-22 15:13:17.000000000 +0000
++++ src/host.c
+@@ -217,9 +217,8 @@ static char rcsid[] =
+ 
+ #include <stdio.h>
+ 
+-#ifdef	SYSVSTR
+ #include <string.h>
+-#else
++#ifndef SYSVSTR
+ #include <strings.h>
+ #endif
+ #include <ctype.h>
+@@ -984,7 +983,7 @@ iflist(alp, np)
  #ifdef OSIOCGIFCONF
  #if defined(IMA_RS6K) || defined(IMA_RS6KMP) || defined(IMA_SP2MPI) \
  			|| defined(IMA_AIX4SP2) || defined(IMA_AIX5SP2) \
@@ -11,7 +22,7 @@ $NetBSD: patch-bo,v 1.5 2009/05/19 23:44:55 asau Exp $
  		SIOCGIFCONF
  #else
  		OSIOCGIFCONF
-@@ -992,7 +992,7 @@ iflist(alp, np)
+@@ -998,7 +997,7 @@ iflist(alp, np)
  	}
  
  	for (cp = sif.ifc_ifcu.ifcu_buf;
@@ -20,7 +31,7 @@ $NetBSD: patch-bo,v 1.5 2009/05/19 23:44:55 asau Exp $
  			cp += sizeof(*reqp) - sizeof(struct sockaddr) + SIZ(reqp->ifr_addr))
  	{
  		reqp = (struct ifreq*)cp;
-@@ -1005,7 +1005,11 @@ iflist(alp, np)
+@@ -1011,7 +1010,11 @@ iflist(alp, np)
  		}
  		/* On some FreeBSD systems: */
  		/* if (IFF_UP & req.ifr_flags) { */
diff --git a/parallel/pvm3/patches/patch-cb b/parallel/pvm3/patches/patch-cb
new file mode 100644
index 00000000000..0fc411f59b8
--- /dev/null
+++ b/parallel/pvm3/patches/patch-cb
@@ -0,0 +1,15 @@
+$NetBSD: patch-cb,v 1.1 2011/11/27 00:28:29 marino Exp $
+
+--- src/ddpro.c.orig	2004-01-14 18:50:55.000000000 +0000
++++ src/ddpro.c
+@@ -411,9 +411,8 @@ static char rcsid[] =
+ #include <netdb.h>
+ #endif
+ 
+-#ifdef	SYSVSTR
+ #include <string.h>
+-#else
++#ifndef SYSVSTR
+ #include <strings.h>
+ #endif
+