From f9ae9acc6e7c6c3dc3979ebc25f27d20a72d0f12 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 14 Jun 2006 16:57:52 +0000
Subject: Fix build with GNU make 3.81. Improve some Solaris/x86 flags.

From Gilles Dauphin in PR 33730.
---
 parallel/pvm3/distinfo         |  5 +++--
 parallel/pvm3/patches/patch-bq |  4 ++--
 parallel/pvm3/patches/patch-bz | 12 ++++++++++++
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 parallel/pvm3/patches/patch-bz

(limited to 'parallel/pvm3')

diff --git a/parallel/pvm3/distinfo b/parallel/pvm3/distinfo
index 6a578a5f680..4743848f2b9 100644
--- a/parallel/pvm3/distinfo
+++ b/parallel/pvm3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2006/01/27 16:34:36 joerg Exp $
+$NetBSD: distinfo,v 1.20 2006/06/14 16:57:52 joerg Exp $
 
 SHA1 (pvm3.4.5.tgz) = c14946a4591c4f258380a20b478ee837ad69d985
 RMD160 (pvm3.4.5.tgz) = 22244c42a964d74ada43fb1379d7b4179afc7f9e
@@ -43,7 +43,7 @@ SHA1 (patch-bk) = 753d265149b704e88e2906dedcc9e9ae5a00800f
 SHA1 (patch-bl) = 5faec2ed16c8711da93ad487c301558d36bc7ed8
 SHA1 (patch-bm) = 71a5bccf0a6e7f28b20bcc9835bc4ba7c39f5af7
 SHA1 (patch-bo) = 237a14c583e10752ba546605aaeb2007a5a62e55
-SHA1 (patch-bq) = 5fd3027d3fe2815e9f9555e8c238dcd819978045
+SHA1 (patch-bq) = 404d9b54968945019767bd299f40e69eb6a7f624
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
 SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
 SHA1 (patch-bt) = aa57072e31b8c717eff64b57a5332b58f214b109
@@ -52,3 +52,4 @@ SHA1 (patch-bv) = 70e40116da06dcd3ef8cc939c2f885c16fe0c45c
 SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
 SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
 SHA1 (patch-by) = b01936f9edc789d3a64ca9c56835a68ea3f07ea2
+SHA1 (patch-bz) = 7897552eac06d9be4807b098ed79571906776549
diff --git a/parallel/pvm3/patches/patch-bq b/parallel/pvm3/patches/patch-bq
index 8940253a8cb..4212b86db91 100644
--- a/parallel/pvm3/patches/patch-bq
+++ b/parallel/pvm3/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
+$NetBSD: patch-bq,v 1.2 2006/06/14 16:57:52 joerg Exp $
 
 --- src/Makefile.aimk.orig	Fri May 11 18:58:10 2001
 +++ src/Makefile.aimk	Wed Mar 24 18:42:04 2004
@@ -27,7 +27,7 @@ $NetBSD: patch-bq,v 1.1 2004/07/19 22:41:16 dmcmahill Exp $
 -	rm -f $(LIBPVM).a
 -	$(AR) cr $(LIBPVM).a $(LOBJ) $(LPVMSOCK) $(SOCKLOBJ)
 -	case x$(HASRANLIB) in xt ) echo ranlib; ranlib $(LIBPVM).a ;; esac
-+	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${.TARGET:.a=.la} ${LOBJ:.o=.lo} \
++	${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} -o ${@:.a=.la} ${LOBJ:.o=.lo} \
 +		${LPVMSOCK:.o=.lo} ${SOCKLOBJ:.o=.lo} \
 +		-rpath ${PVM_DIR}/lib/$(PVM_ARCH) \
 +		-version-info ${PVMLIB_VER}
diff --git a/parallel/pvm3/patches/patch-bz b/parallel/pvm3/patches/patch-bz
new file mode 100644
index 00000000000..35635198460
--- /dev/null
+++ b/parallel/pvm3/patches/patch-bz
@@ -0,0 +1,12 @@
+$NetBSD: patch-bz,v 1.1 2006/06/14 16:57:52 joerg Exp $
+
+--- conf/X86SOL2.def.orig	2006-06-14 16:52:38.000000000 +0000
++++ conf/X86SOL2.def
+@@ -1,5 +1,6 @@
+ ARCHCFLAGS	=	-DSYSVBFUNC -DSYSVSTR -DNOGETDTBLSIZ -DSYSVSIGNAL \
+-				-DNOWAIT3 -DNOUNIXDOM -DRSHCOMMAND=\"/usr/bin/rsh\"
++				-DNOWAIT3 -DHASERRORVARS -DRSHCOMMAND=\"/usr/bin/rsh\" -DUSESTRERROR \
++				-DHASSTDLIB -KPIC
+ ARCHDLIB	=	-lnsl -lsocket
+ ARCHDOBJ	=
+ ARCHLIB		=	-lnsl -lsocket
-- 
cgit v1.2.3