CVS commit: pkgsrc/parallel/pvm3

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Jul 22 09:03:16 UTC 2022

Modified Files:
        pkgsrc/parallel/pvm3: Makefile distinfo
        pkgsrc/parallel/pvm3/patches: patch-bu patch-bv

Log Message:
parallel/pvm3: use -fallow-argument-mismatch for fortran sources.

Respect passed LDFLAGS.  Add comments to a couple of patches.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/parallel/pvm3/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/parallel/pvm3/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/parallel/pvm3/patches/patch-bu \
    pkgsrc/parallel/pvm3/patches/patch-bv

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/pvm3/Makefile
diff -u pkgsrc/parallel/pvm3/Makefile:1.65 pkgsrc/parallel/pvm3/Makefile:1.66
--- pkgsrc/parallel/pvm3/Makefile:1.65  Wed Mar 20 10:55:21 2019
+++ pkgsrc/parallel/pvm3/Makefile       Fri Jul 22 09:03:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2019/03/20 10:55:21 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2022/07/22 09:03:16 he Exp $
 
 DISTNAME=      pvm3.4.6
 PKGNAME=       pvm-3.4.6
@@ -37,6 +37,8 @@ MAKE_ENV+=            PVMLIB_VER=3:4
 MAKE_ENV+=             PVM_DIR=${PVM_DIR:Q}
 BUILD_TARGET=          all install
 
+FFLAGS+=               -fallow-argument-mismatch
+
 REPLACE_CSH=           ${WRKSRC}/lib/debugger ${WRKSRC}/lib/debugger2
 
 # Set PVM_ARCH to the correct value for this machine platform.

Index: pkgsrc/parallel/pvm3/distinfo
diff -u pkgsrc/parallel/pvm3/distinfo:1.33 pkgsrc/parallel/pvm3/distinfo:1.34
--- pkgsrc/parallel/pvm3/distinfo:1.33  Tue Oct 26 11:10:38 2021
+++ pkgsrc/parallel/pvm3/distinfo       Fri Jul 22 09:03:16 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 11:10:38 nia Exp $
+$NetBSD: distinfo,v 1.34 2022/07/22 09:03:16 he Exp $
 
 BLAKE2s (pvm3.4.6.tgz) = 209e125d5af842efc70571602849d054770dabc0d7d7761325ef4b2b8c25c4d6
 SHA512 (pvm3.4.6.tgz) = a8ddb8fc944bbe64d185eeffba0e020f28af4c8175a446511deca55d7c4f5cf62884c8c5dcb03dd9700bcc48368c8dab353e45656094d139385d88fdf34dd78a
@@ -48,8 +48,8 @@ SHA1 (patch-bq) = 404d9b54968945019767bd
 SHA1 (patch-br) = bb3431cd07153d9a8d42ca0fed8c55282a21977e
 SHA1 (patch-bs) = 0f982d32bc145aae66fcae721c21560417ed304f
 SHA1 (patch-bt) = aa57072e31b8c717eff64b57a5332b58f214b109
-SHA1 (patch-bu) = a8410e44d6d18949fde5afa57780adc8e168d559
-SHA1 (patch-bv) = faff2d0c965ece536942e97c12fad47a42253d3e
+SHA1 (patch-bu) = 1a713e9e59071fdd1776a5c9fd677ab33ed282c0
+SHA1 (patch-bv) = 92944d99a638312c77ba24af6c221790486e33cd
 SHA1 (patch-bw) = 2dd00c3b3cebc8dfc926429648a6f9a3d314d041
 SHA1 (patch-bx) = a8e538ec5bf5f0c6bba76a136186430a72e480fa
 SHA1 (patch-by) = bb381baef296a792b01bacacbaa54710736ffd8f

Index: pkgsrc/parallel/pvm3/patches/patch-bu
diff -u pkgsrc/parallel/pvm3/patches/patch-bu:1.3 pkgsrc/parallel/pvm3/patches/patch-bu:1.4
--- pkgsrc/parallel/pvm3/patches/patch-bu:1.3   Sat Jan 29 20:37:35 2011
+++ pkgsrc/parallel/pvm3/patches/patch-bu       Fri Jul 22 09:03:16 2022
@@ -1,15 +1,30 @@
-$NetBSD: patch-bu,v 1.3 2011/01/29 20:37:35 markd Exp $
+$NetBSD: patch-bu,v 1.4 2022/07/22 09:03:16 he Exp $
+
+Use libtool for linking.
+Also respect passed LDFLAGS.
 
 --- examples/Makefile.aimk.orig        Wed Feb 16 21:49:35 2000
 +++ examples/Makefile.aimk     Thu Mar 25 03:43:25 2004
-@@ -85,5 +85,5 @@
+@@ -63,7 +63,7 @@ FFLOPTS              =       -g
+ FFLAGS                =       $(FFLOPTS) $(ARCHFFLAGS)
+ FLIBS         =       -lfpvm3
+ 
+-LDFLAGS               =       $(LOPT) -L$(PVMDIR)/lib/$(PVM_ARCH)
++LDFLAGS               +=      $(LOPT) -L$(PVMDIR)/lib/$(PVM_ARCH)
+ 
+ CPROGS                =       hello$(EXESFX) hello_other$(EXESFX) \
+                               gexample$(EXESFX) \
+@@ -84,7 +84,7 @@ HOSTFPROGS   =       fmaster1h hitch
+ CTXPROGS      =       inherita$(EXESFX) inheritb$(EXESFX) inherit1$(EXESFX) \
                                inherit2$(EXESFX) inherit3$(EXESFX)
  
 -MBPROGS               =       taskf.o task0$(EXESFX) task1$(EXESFX) \
 +MBPROGS               =       taskf.lo task0$(EXESFX) task1$(EXESFX) \
                                task_end$(EXESFX) rme$(EXESFX) \
                                lmbi$(EXESFX) gmbi$(EXESFX)
-@@ -108,172 +108,177 @@
+ 
+@@ -107,173 +107,178 @@ $(XDIR):
+       - mkdir $(BDIR)
        - mkdir $(XDIR)
  
 +LTCC=         ${LIBTOOL} --mode=compile ${CC}
Index: pkgsrc/parallel/pvm3/patches/patch-bv
diff -u pkgsrc/parallel/pvm3/patches/patch-bv:1.3 pkgsrc/parallel/pvm3/patches/patch-bv:1.4
--- pkgsrc/parallel/pvm3/patches/patch-bv:1.3   Sat Jan 29 20:37:35 2011
+++ pkgsrc/parallel/pvm3/patches/patch-bv       Fri Jul 22 09:03:16 2022
@@ -1,14 +1,18 @@
-$NetBSD: patch-bv,v 1.3 2011/01/29 20:37:35 markd Exp $
+$NetBSD: patch-bv,v 1.4 2022/07/22 09:03:16 he Exp $
+
+Use libtool for linking.
+Also, respect passed LDFLAGS.
 
 --- gexamples/Makefile.aimk.orig       Wed Feb 16 21:48:37 2000
 +++ gexamples/Makefile.aimk    Thu Mar 25 02:04:18 2004
-@@ -38,48 +38,53 @@
+@@ -37,50 +37,55 @@ PROGS      =       joinleave$(EXESFX) gexamp$(EXESF
+                       thb$(EXESFX) tnb$(EXESFX) ge$(EXESFX) tjl$(EXESFX) \
                        tjf$(EXESFX) trsg$(EXESFX) frsg$(EXESFX) gs$(EXESFX)
  
 +LTCC=         ${LIBTOOL} --mode=compile ${CC}
 +LTCC_LINK=    ${LIBTOOL} --mode=link ${CC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
 +LTFORT=               ${LIBTOOL} --mode=compile --tag=F77 ${FC}
-+LTFORT_LINK=  ${LIBTOOL} --mode=link --tag=F77 ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH}
++LTFORT_LINK=  ${LIBTOOL} --mode=link --tag=F77 ${FC} ${PVM_STATIC} ${COMPILER_RPATH_FLAG}${PVM_DIR}/lib/${PVM_ARCH} ${LDFLAGS}
 +
  all:  $(PROGS)
  
@@ -67,3 +71,4 @@ $NetBSD: patch-bv,v 1.3 2011/01/29 20:37
 +      $(LTFORT_LINK) $(FFLAGS) -o $@ $(SDIR)/frsg.f $(PVMFLIB)
        cp frsg$(EXESFX) $(XDIR)
  
+ clean: