summaryrefslogtreecommitdiff
path: root/parallel/pvm3/patches
diff options
context:
space:
mode:
Diffstat (limited to 'parallel/pvm3/patches')
-rw-r--r--parallel/pvm3/patches/patch-an30
-rw-r--r--parallel/pvm3/patches/patch-ax6
-rw-r--r--parallel/pvm3/patches/patch-ay8
-rw-r--r--parallel/pvm3/patches/patch-bm14
-rw-r--r--parallel/pvm3/patches/patch-bn17
-rw-r--r--parallel/pvm3/patches/patch-bo17
-rw-r--r--parallel/pvm3/patches/patch-bp17
-rw-r--r--parallel/pvm3/patches/patch-bt20
8 files changed, 37 insertions, 92 deletions
diff --git a/parallel/pvm3/patches/patch-an b/parallel/pvm3/patches/patch-an
index 67b878f4373..68d025162eb 100644
--- a/parallel/pvm3/patches/patch-an
+++ b/parallel/pvm3/patches/patch-an
@@ -1,22 +1,18 @@
-$NetBSD: patch-an,v 1.4 2001/05/24 19:32:32 dmcmahill Exp $
+$NetBSD: patch-an,v 1.5 2004/11/12 10:45:45 adam Exp $
-passdown {C,F}FLAGS and also quote stuff so
-CC=gcc -pipe
-works
-
---- Makefile.aimk.orig Mon Aug 11 10:38:48 1997
-+++ Makefile.aimk Tue May 15 22:29:18 2001
-@@ -34,9 +34,9 @@
+--- Makefile.aimk.orig 2003-03-28 18:29:52.000000000 +0000
++++ Makefile.aimk
+@@ -34,10 +34,9 @@ SHELL = /bin/sh
#
--PVMOPTS = CC=$(CC) \
-- F77=$(F77)
-+PVMOPTS = CC="$(CC)" \
-+ F77="$(F77)" \
-+ CFLOPTS="$(CFLAGS)" \
-+ FFLOPTS="$(FFLAGS)"
-
--# CFLOPTS=$(CFLOPTS)
--# FFLOPTS=$(FFLOPTS)
+ PVMOPTS = CC="$(CC)" \
+- F77="$(F77)"
+-
+-# CFLOPTS="$(CFLOPTS)"
+-# FFLOPTS="$(FFLOPTS)"
++ F77="$(F77)" \
++ CFLOPTS="$(CFLAGS)" \
++ FFLOPTS="$(FFLAGS)"
# PVMDIR=$(PVMDIR)
+ #
diff --git a/parallel/pvm3/patches/patch-ax b/parallel/pvm3/patches/patch-ax
index b28940c43e5..6e644d71d8f 100644
--- a/parallel/pvm3/patches/patch-ax
+++ b/parallel/pvm3/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.4 2004/03/12 01:14:00 dmcmahill Exp $
+$NetBSD: patch-ax,v 1.5 2004/11/12 10:45:45 adam Exp $
---- lib/pvmgetarch.orig Thu Sep 27 21:24:04 2001
+--- lib/pvmgetarch.orig 2004-02-03 20:12:05.000000000 +0000
+++ lib/pvmgetarch
-@@ -141,17 +141,27 @@ if [ "$ARCH" = UNKNOWN ]; then
+@@ -143,17 +143,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-ay b/parallel/pvm3/patches/patch-ay
index d641eb932cf..b313f734916 100644
--- a/parallel/pvm3/patches/patch-ay
+++ b/parallel/pvm3/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.4 2002/11/09 11:28:41 is Exp $
+$NetBSD: patch-ay,v 1.5 2004/11/12 10:45:45 adam Exp $
---- console/cmds.c.old Wed Oct 30 12:47:26 2002
-+++ console/cmds.c Wed Oct 30 12:49:37 2002
-@@ -1365,9 +1365,9 @@
+--- console/cmds.c.orig 2004-01-14 18:46:20.000000000 +0000
++++ console/cmds.c
+@@ -1419,9 +1419,9 @@ conf_cmd(ac, av)
if (!pvm_config(&nhosts, &narchs, &hostlist)) {
printf("%d host%s, %d data format%s\n",
nhosts, (nhosts > 1 ? "s" : ""), narchs, (narchs > 1 ? "s" : ""));
diff --git a/parallel/pvm3/patches/patch-bm b/parallel/pvm3/patches/patch-bm
index ae04588bd77..6340a35954c 100644
--- a/parallel/pvm3/patches/patch-bm
+++ b/parallel/pvm3/patches/patch-bm
@@ -1,16 +1,16 @@
-$NetBSD: patch-bm,v 1.1 2004/07/18 18:05:13 dmcmahill Exp $
+$NetBSD: patch-bm,v 1.2 2004/11/12 10:45:45 adam Exp $
---- conf/DARWIN.def.orig Thu Sep 27 19:56:33 2001
+--- conf/DARWIN.def.orig 2004-08-11 12:56:14.000000000 +0000
+++ conf/DARWIN.def
-@@ -1,9 +1,7 @@
+@@ -1,9 +1,8 @@
ARCHCFLAGS = -DSOCKADHASLEN -DNOREXEC \
- -DRSHCOMMAND=\"/usr/bin/rsh\" \
-+ -DRSHCOMMAND=\"${SSH}\" \
++ -DRSHCOMMAND=\"${SSH}" \
-DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
- -DFAKEXDRFLOAT -DSYSERRISCONST \
+ -I/usr/include/malloc \
- -I/System/Library/Frameworks/System.framework/Headers/bsd/sys
-- # this last -I flag needed for tracer build...
-+ -DSYSERRISCONST
++ -DSYSERRISCONST
+ # this last -I flag needed for tracer build...
ARCHDLIB =
ARCHDOBJ =
- ARCHLIB =
diff --git a/parallel/pvm3/patches/patch-bn b/parallel/pvm3/patches/patch-bn
deleted file mode 100644
index ad55f8ca1ed..00000000000
--- a/parallel/pvm3/patches/patch-bn
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bn,v 1.1 2004/07/18 18:05:13 dmcmahill Exp $
-
---- tracer/tracer.h.orig Fri May 11 21:19:43 2001
-+++ tracer/tracer.h
-@@ -40,8 +40,12 @@
- #include "pvmwin.h"
- #include <time.h>
- #endif
-+#ifdef HASSTDLIB
-+#include <stdlib.h>
-+#else
- #ifndef IMA_MACOSX
- #include <malloc.h>
-+#endif
- #endif
- #include <signal.h>
- #include <ctype.h>
diff --git a/parallel/pvm3/patches/patch-bo b/parallel/pvm3/patches/patch-bo
deleted file mode 100644
index e93b7eb9b47..00000000000
--- a/parallel/pvm3/patches/patch-bo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bo,v 1.1 2004/07/18 18:05:13 dmcmahill Exp $
-
---- tracer/trclib.h.orig Fri May 11 21:19:43 2001
-+++ tracer/trclib.h
-@@ -34,8 +34,12 @@
- #include "pvmwin.h"
- #endif
- #include <time.h>
-+#ifdef HASSTDLIB
-+#include <stdlib.h>
-+#else
- #ifndef IMA_MACOSX
- #include <malloc.h>
-+#endif
- #endif
-
-
diff --git a/parallel/pvm3/patches/patch-bp b/parallel/pvm3/patches/patch-bp
deleted file mode 100644
index 09ff3cbabb4..00000000000
--- a/parallel/pvm3/patches/patch-bp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-bp,v 1.1 2004/07/18 18:05:13 dmcmahill Exp $
-
---- tracer/trcsort.c.orig Fri May 11 21:19:44 2001
-+++ tracer/trcsort.c
-@@ -31,8 +31,12 @@ static char rcsid[] =
- #include <sys/types.h>
- #include <sys/stat.h>
-
-+#ifdef HASSTDLIB
-+#include <stdlib.h>
-+#else
- #ifndef IMA_MACOSX
- #include <malloc.h>
-+#endif
- #endif
-
- #ifdef SYSVSTR
diff --git a/parallel/pvm3/patches/patch-bt b/parallel/pvm3/patches/patch-bt
index 3c7e0bfadf3..f7cd999dad1 100644
--- a/parallel/pvm3/patches/patch-bt
+++ b/parallel/pvm3/patches/patch-bt
@@ -1,6 +1,6 @@
-$NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
+$NetBSD: patch-bt,v 1.3 2004/11/12 10:45:45 adam Exp $
---- pvmgs/Makefile.aimk.orig Wed Feb 16 21:49:03 2000
+--- pvmgs/Makefile.aimk.orig 2001-11-30 20:33:11.000000000 +0000
+++ pvmgs/Makefile.aimk
@@ -26,7 +26,7 @@ PVMXDIR = $(PVMBDIR)/$(PVM_ARCH)
PVMLDIR = $(PVMDIR)/lib/$(PVM_ARCH)
@@ -8,10 +8,10 @@ $NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
LIBPREFIX = lib
-PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).a
+PVMLIBDEP = $(PVMLDIR)/$(LIBPREFIX)$(PVMLIB).la
- CFLAGS = $(CFLOPTS) -I$(PVMIDIR) -I$(PVMSDIR) -DIMA_$(PVM_ARCH) \
- $(ARCHCFLAGS)
- LIBS = $(LOPT) -L$(PVMLDIR) -l$(PVMLIB) $(ARCHLIB)
-@@ -39,7 +39,7 @@ PROGS = $(PVMXDIR)/pvm_gstat$(EXESFX) \
+
+ # Add -DPVMGSTIMEOUT=XXX to CFLAGS to allow timeouts for PVM group
+ # server requests, where XXX is the number of seconds for the timeout.
+@@ -45,7 +45,7 @@ PROGS = $(PVMXDIR)/pvm_gstat$(EXESFX) \
LPROGS = $(PVMLDIR)/pvmgs$(EXESFX)
@@ -20,7 +20,7 @@ $NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
install: all
-@@ -57,17 +57,24 @@ $(PVMLDIR):
+@@ -63,17 +63,24 @@ $(PVMLDIR):
- mkdir $(PVMLDIR)
$(PVMXDIR)/pvm_gstat$(EXESFX): pvm_gstat$(EXESFX)
@@ -47,7 +47,7 @@ $NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
$(PVMLDIR)/$(LIBGPVM)-mpp: $(LIBGPVM)-mpp
cp $(LIBGPVM) $(PVMLDIR)
-@@ -75,18 +82,23 @@ $(PVMLDIR)/$(LIBGPVM)-mpp: $(LIBGPVM)-m
+@@ -81,18 +88,23 @@ $(PVMLDIR)/$(LIBGPVM)-mpp: $(LIBGPVM)-m
touch $(PVMLDIR)/$(LIBGPVM)-mpp
$(PVMLDIR)/pvmgs$(EXESFX): pvmgs$(EXESFX)
@@ -75,7 +75,7 @@ $NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
$(LIBGPVM)-mpp: $(LOBJ)
rm -f $(LIBGPVM)
-@@ -95,7 +107,7 @@ $(LIBGPVM)-mpp: $(LOBJ)
+@@ -101,7 +113,7 @@ $(LIBGPVM)-mpp: $(LOBJ)
touch $(LIBGPVM)-mpp
pvm_gstat$(EXESFX): pvm_gstat.o $(LIBGPVM) $(PVMLIBDEP)
@@ -84,7 +84,7 @@ $NetBSD: patch-bt,v 1.2 2004/07/30 13:07:25 dmcmahill Exp $
clean:
rm -f $(DOBJ) $(LOBJ) pvmgs$(EXESFX) $(LIBGPVM) \
-@@ -110,17 +122,17 @@ lint:
+@@ -116,17 +128,17 @@ lint:
#
pvmgsu_core.o: $(SDIR)/pvmgsu_core.c