CVS commit: pkgsrc/math

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Sun Oct 15 22:08:51 UTC 2023

Modified Files:
        pkgsrc/math/openblas: Makefile distinfo
        pkgsrc/math/openblas/patches: patch-Makefile.install
        pkgsrc/math/openblas64: Makefile
        pkgsrc/math/openblas64_openmp: Makefile
        pkgsrc/math/openblas64_pthread: Makefile
        pkgsrc/math/openblas_openmp: Makefile
        pkgsrc/math/openblas_pthread: Makefile

Log Message:
math/openblas*: more portable sed for .pc modification

The old path added \b, which is not POSIX BRE. [:space:] works better with
differing seds. It removes more than \b, but in our installs, the following
suffix variable is emtpy, anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/openblas/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/openblas/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/openblas/patches/patch-Makefile.install
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/openblas64/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/openblas64_openmp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/openblas64_pthread/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/openblas_openmp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/math/openblas_pthread/Makefile

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

Modified files:

Index: pkgsrc/math/openblas/Makefile
diff -u pkgsrc/math/openblas/Makefile:1.7 pkgsrc/math/openblas/Makefile:1.8
--- pkgsrc/math/openblas/Makefile:1.7   Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas/Makefile       Sun Oct 15 22:08:50 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2023/10/08 15:41:33 thor Exp $
+# $NetBSD: Makefile,v 1.8 2023/10/15 22:08:50 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
+PKGREVISION=   2
 
 OPENBLAS_VARIANT=      openblas
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas/distinfo
diff -u pkgsrc/math/openblas/distinfo:1.9 pkgsrc/math/openblas/distinfo:1.10
--- pkgsrc/math/openblas/distinfo:1.9   Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas/distinfo       Sun Oct 15 22:08:50 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2023/10/08 15:41:33 thor Exp $
+$NetBSD: distinfo,v 1.10 2023/10/15 22:08:50 thor Exp $
 
 BLAKE2s (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = 38e4cee9b05aaa4d2f90682c609f3d93a802a594920240fefa808bf3323f593c
 SHA512 (openblas-0.3.24/OpenBLAS-0.3.24.tar.gz) = fe66e3a258ca1720764ed243f6d61017d6ef14bd33b76f20b19b34754096ec2be9fbeb1a78743f38ee71381746d6af9a1c16a8f3982e423afec422fcb50852d0
@@ -10,7 +10,7 @@ BLAKE2s (openblas-0.3.24/timing.tgz) = d
 SHA512 (openblas-0.3.24/timing.tgz) = be0abfcfffdf0e118ed7e25a8451639833cf0ad6bb04d101bbe194c16f656b6ce509b2f76acf4ad626d1fb5b126bd5498cfea262f2946c2d077751112a2906af
 Size (openblas-0.3.24/timing.tgz) = 1059485 bytes
 SHA1 (patch-Makefile) = 6b1db300b5487fca53e7c41c27b64017658e6375
-SHA1 (patch-Makefile.install) = b197262f61bd5b1c28ff856b0a54227ab6bee6e8
+SHA1 (patch-Makefile.install) = 3e15dc3674285b5b6b014e8ab17f77f60cf7ac61
 SHA1 (patch-Makefile.rule) = 45b6b4576fb521fa093252c63b899d4178a516b6
 SHA1 (patch-Makefile.system) = 6dc9fd85731ca88cb1fdb9063ba3baa31edbcfb8
 SHA1 (patch-common__arm.h) = f08ec61bee8317daac267e90a79f46097b3431c9

Index: pkgsrc/math/openblas/patches/patch-Makefile.install
diff -u pkgsrc/math/openblas/patches/patch-Makefile.install:1.6 pkgsrc/math/openblas/patches/patch-Makefile.install:1.7
--- pkgsrc/math/openblas/patches/patch-Makefile.install:1.6     Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas/patches/patch-Makefile.install Sun Oct 15 22:08:50 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile.install,v 1.6 2023/10/08 15:41:33 thor Exp $
+$NetBSD: patch-Makefile.install,v 1.7 2023/10/15 22:08:50 thor Exp $
 
 Second part of removing the special library names.
 Separate options for "install" (needed at least on Darwin).
@@ -91,7 +91,7 @@ Separate options for "install" (needed a
        @echo 'version='$(VERSION) >> "$(PKGFILE)"
        @echo 'extralib='$(PKG_EXTRALIB) >> "$(PKGFILE)"
 -      @cat openblas.pc.in >> "$(PKGFILE)"
-+      @cat openblas.pc.in | sed -e 's,-lopenblas\b,-l$(LIBNAMEBASE),' >> "$(PKGFILE)"
++      @cat openblas.pc.in | sed -e 's,-lopenblas[^[:space:]]*,-l$(LIBNAMEBASE),' >> "$(PKGFILE)"
  
  
  #Generating OpenBLASConfig.cmake

Index: pkgsrc/math/openblas64/Makefile
diff -u pkgsrc/math/openblas64/Makefile:1.2 pkgsrc/math/openblas64/Makefile:1.3
--- pkgsrc/math/openblas64/Makefile:1.2 Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas64/Makefile     Sun Oct 15 22:08:50 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/10/08 15:41:33 thor Exp $
+# $NetBSD: Makefile,v 1.3 2023/10/15 22:08:50 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
+PKGREVISION=   2
 
 OPENBLAS_VARIANT= openblas64
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas64_openmp/Makefile
diff -u pkgsrc/math/openblas64_openmp/Makefile:1.2 pkgsrc/math/openblas64_openmp/Makefile:1.3
--- pkgsrc/math/openblas64_openmp/Makefile:1.2  Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas64_openmp/Makefile      Sun Oct 15 22:08:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/10/08 15:41:33 thor Exp $
+# $NetBSD: Makefile,v 1.3 2023/10/15 22:08:51 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
+PKGREVISION=   2
 
 OPENBLAS_VARIANT= openblas64_openmp
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas64_pthread/Makefile
diff -u pkgsrc/math/openblas64_pthread/Makefile:1.2 pkgsrc/math/openblas64_pthread/Makefile:1.3
--- pkgsrc/math/openblas64_pthread/Makefile:1.2 Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas64_pthread/Makefile     Sun Oct 15 22:08:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2023/10/08 15:41:33 thor Exp $
+# $NetBSD: Makefile,v 1.3 2023/10/15 22:08:51 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
+PKGREVISION=   2
 
 OPENBLAS_VARIANT= openblas64_pthread
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas_openmp/Makefile
diff -u pkgsrc/math/openblas_openmp/Makefile:1.5 pkgsrc/math/openblas_openmp/Makefile:1.6
--- pkgsrc/math/openblas_openmp/Makefile:1.5    Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas_openmp/Makefile        Sun Oct 15 22:08:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2023/10/08 15:41:33 thor Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/15 22:08:51 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
+PKGREVISION=   2
 
 OPENBLAS_VARIANT= openblas_openmp
 .include "../../math/openblas/Makefile.common"

Index: pkgsrc/math/openblas_pthread/Makefile
diff -u pkgsrc/math/openblas_pthread/Makefile:1.5 pkgsrc/math/openblas_pthread/Makefile:1.6
--- pkgsrc/math/openblas_pthread/Makefile:1.5   Sun Oct  8 15:41:33 2023
+++ pkgsrc/math/openblas_pthread/Makefile       Sun Oct 15 22:08:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2023/10/08 15:41:33 thor Exp $
+# $NetBSD: Makefile,v 1.6 2023/10/15 22:08:51 thor Exp $
 
 MAINTAINER=    thomas.orgis%uni-hamburg.de@localhost
-PKGREVISION=   1
+PKGREVISION=   2
 
 OPENBLAS_VARIANT= openblas_pthread
 .include "../../math/openblas/Makefile.common"