Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165720118817050"
MIME-Version: 1.0
Date: Thu, 7 Jul 2022 13:39:48 +0000
From: "Dr. Thomas Orgis" <thor@netbsd.org>
Subject: CVS commit: pkgsrc/math/arpack-ng
To: pkgsrc-changes@NetBSD.org
Reply-To: thor@netbsd.org
Message-Id: <20220707133948.9DB83FB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_165720118817050
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	thor
Date:		Thu Jul  7 13:39:48 UTC 2022

Modified Files:
	pkgsrc/math/arpack-ng: Makefile PLIST
Added Files:
	pkgsrc/math/arpack-ng: options.mk

Log Message:
math/arpack-ng: update BLAS support for all choices and add mpi option


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/arpack-ng/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/arpack-ng/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/math/arpack-ng/options.mk

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


--_----------=_165720118817050
Content-Disposition: inline
Content-Length: 2259
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/math/arpack-ng/Makefile
diff -u pkgsrc/math/arpack-ng/Makefile:1.6 pkgsrc/math/arpack-ng/Makefile:1.7
--- pkgsrc/math/arpack-ng/Makefile:1.6	Wed Jun 23 18:10:19 2021
+++ pkgsrc/math/arpack-ng/Makefile	Thu Jul  7 13:39:48 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2021/06/23 18:10:19 thor Exp $
+# $NetBSD: Makefile,v 1.7 2022/07/07 13:39:48 thor Exp $
 
 DISTNAME=	arpack-ng-3.8.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_GITHUB:=opencollab/}
 
@@ -20,13 +20,10 @@ CONFIGURE_DIRS=	${OBJDIR}
 CMAKE_ARG_PATH=	..
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
 
-BLAS_ACCEPTED=	netlib openblas
 .include "../../mk/blas.buildlink3.mk"
-.if ${BLAS_TYPE} == "netlib"
-CMAKE_ARGS+=	-DBLA_VENDOR=Generic
-.elif ${BLAS_TYPE} == "openblas"
-CMAKE_ARGS+=	-DBLA_VENDOR=OpenBLAS
-.endif
+CMAKE_ARGS+=	-DBLA_PREFER_PKGCONFIG=true -DBLA_PKGCONFIG_BLAS=${BLAS_PC}
+
+.include "options.mk"
 
 TEST_TARGET=	test
 

Index: pkgsrc/math/arpack-ng/PLIST
diff -u pkgsrc/math/arpack-ng/PLIST:1.2 pkgsrc/math/arpack-ng/PLIST:1.3
--- pkgsrc/math/arpack-ng/PLIST:1.2	Tue May 11 10:18:37 2021
+++ pkgsrc/math/arpack-ng/PLIST	Thu Jul  7 13:39:48 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/11 10:18:37 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/07/07 13:39:48 thor Exp $
 include/arpack/arpackdef.h
 include/arpack/arpackicb.h
 include/arpack/debug.h
@@ -8,4 +8,8 @@ lib/cmake/arpack-ng/arpack-ng-config.cma
 lib/libarpack.so
 lib/libarpack.so.2
 lib/libarpack.so.2.1.0
+${PLIST.mpi}lib/libparpack.so
+${PLIST.mpi}lib/libparpack.so.2
+${PLIST.mpi}lib/libparpack.so.2.1.0
 lib/pkgconfig/arpack.pc
+${PLIST.mpi}lib/pkgconfig/parpack.pc

Added files:

Index: pkgsrc/math/arpack-ng/options.mk
diff -u /dev/null pkgsrc/math/arpack-ng/options.mk:1.1
--- /dev/null	Thu Jul  7 13:39:48 2022
+++ pkgsrc/math/arpack-ng/options.mk	Thu Jul  7 13:39:48 2022
@@ -0,0 +1,15 @@
+PKG_OPTIONS_VAR=	PKG_OPTIONS.arpack-ng
+PKG_SUPPORTED_OPTIONS=	mpi
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		mpi
+.if !empty(PKG_OPTIONS:Mmpi)
+PLIST.mpi=		yes
+CMAKE_ARGS+=	-DMPI=on
+.include "../../mk/mpi.buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DMPI=off
+.endif


--_----------=_165720118817050--