From 10f6d30bc36c881377b15f511c6ce2c6a0829289 Mon Sep 17 00:00:00 2001 From: marino Date: Sun, 27 Nov 2011 00:28:29 +0000 Subject: parallels/pvm3: Add support for DragonFly64 Include string.h unconditionally and update the configuration to recognize DragonFly x86_64. --- parallel/pvm3/distinfo | 7 ++++--- parallel/pvm3/patches/patch-ax | 13 +++++++------ parallel/pvm3/patches/patch-bo | 23 +++++++++++++++++------ parallel/pvm3/patches/patch-cb | 15 +++++++++++++++ 4 files changed, 43 insertions(+), 15 deletions(-) create mode 100644 parallel/pvm3/patches/patch-cb (limited to 'parallel') diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo index 157390e3aad..1bc196d74a5 100644 --- a/parallel/pvm3/distinfo +++ b/parallel/pvm3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.29 2011/02/03 10:02:38 wiz Exp $ +$NetBSD: distinfo,v 1.30 2011/11/27 00:28:29 marino Exp $ SHA1 (pvm3.4.6.tgz) = dc22bb3a592bb37ab86f0de8d867f67949d12e91 RMD160 (pvm3.4.6.tgz) = fa38e35d1d7a8e31b9c2baeb486a7371d6162378 @@ -26,7 +26,7 @@ SHA1 (patch-at) = f3dbe98951722d41756b36e8e08bc5b25e0733df SHA1 (patch-au) = 4c560b4b3c90088e2dc471951f696a1c5f4ef8dd SHA1 (patch-av) = d6fb408d0c0237b503c9d58ebee17b6ca4d55d24 SHA1 (patch-aw) = a97cdb684b24d7a4b0bcaea0814ebebfb9687b7d -SHA1 (patch-ax) = 68cf11ac97845e4cc03ca8b091663a7068e13227 +SHA1 (patch-ax) = 0cbe380151203ff917c2e9bb208f57c1c2155a4f SHA1 (patch-ay) = 5006d9f76dbb536f3d1280dda92920a790d90da1 SHA1 (patch-az) = 8f3879e1c734406ae4d6752c025d42925a56893a SHA1 (patch-ba) = c89743b7d09ce32700a1a3c1c2c0735962523416 @@ -43,7 +43,7 @@ SHA1 (patch-bk) = a05a60b81c5f02e6998cf8b85a1b5ccb814a13db SHA1 (patch-bl) = 5faec2ed16c8711da93ad487c301558d36bc7ed8 SHA1 (patch-bm) = c50c1b7c78bb511e3c5c45648dfc2022e97e7108 SHA1 (patch-bn) = 9e36274f1aedaba3586bab5def88db561d0066d4 -SHA1 (patch-bo) = 0682d1f7a7870ebe8b6d8f7faa238a8d4d4f6a3e +SHA1 (patch-bo) = b31cbd934cc732bc8bc9263e57c4d19a49434195 SHA1 (patch-bq) = 404d9b54968945019767bd299f40e69eb6a7f624 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f @@ -55,3 +55,4 @@ SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa SHA1 (patch-by) = bb381baef296a792b01bacacbaa54710736ffd8f SHA1 (patch-bz) = 5c2a9d5c05ab21974c55f8c973cfbe1177146d5f SHA1 (patch-ca) = 5f1c3b1525c11732c32ee4a9d41f10478b87071d +SHA1 (patch-cb) = 1db5e4aecec7b35dc488ad478fd6de5e1c640623 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 + +-#ifdef SYSVSTR + #include +-#else ++#ifndef SYSVSTR + #include + #endif + #include +@@ -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 + #endif + +-#ifdef SYSVSTR + #include +-#else ++#ifndef SYSVSTR + #include + #endif + -- cgit v1.2.3