pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lapack: Clean up pkglint issues



Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Fri Aug 16 10:16:44 2019 -0500
Changeset:	2cb7d4c9135cd5c69d12762628c06881550d8f43

Modified Files:
	lapack/Makefile
	lapack/Makefile.common
	lapack/distinfo
	lapack/patches/patch-CBLAS_cblas.pc.in
	lapack/patches/patch-LAPACKE_lapacke.pc.in

Log Message:
lapack: Clean up pkglint issues

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2cb7d4c9135cd5c69d12762628c06881550d8f43

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

diffstat:
 lapack/Makefile                            |  2 +-
 lapack/Makefile.common                     | 12 ++++--------
 lapack/distinfo                            |  4 ++--
 lapack/patches/patch-CBLAS_cblas.pc.in     |  2 ++
 lapack/patches/patch-LAPACKE_lapacke.pc.in |  2 ++
 5 files changed, 11 insertions(+), 11 deletions(-)

diffs:
diff --git a/lapack/Makefile b/lapack/Makefile
index 6a67c959ba..e21246335f 100644
--- a/lapack/Makefile
+++ b/lapack/Makefile
@@ -7,4 +7,4 @@ LAPACK_PART_CMAKE_ARGS= \
 	-DUSE_OPTIMIZED_LAPACK=OFF \
 	-DCBLAS=OFF -DLAPACKE=OFF
 
-.include	"../lapack/Makefile.common"
+.include	"../../wip/lapack/Makefile.common"
diff --git a/lapack/Makefile.common b/lapack/Makefile.common
index 4c871b7aff..799e80873c 100644
--- a/lapack/Makefile.common
+++ b/lapack/Makefile.common
@@ -10,24 +10,21 @@
 PORTVERSION=	3.8.0
 DISTNAME=	lapack-${PORTVERSION}
 PKGNAME=	${LAPACK_PART}-${PORTVERSION}
-PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_NETLIB:=lapack/}
-EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	thomas.orgis%uni-hamburg.de@localhost
 HOMEPAGE=	http://www.netlib.org/lapack/
 LICENSE=	modified-bsd
 
 # All parts are in the same section (now wip, later math).
-PATCHDIR=	${.CURDIR}/../lapack/patches
-DISTINFO_FILE=	${.CURDIR}/../lapack/distinfo
+PATCHDIR=	${.CURDIR}/../../wip/lapack/patches
+DISTINFO_FILE=	${.CURDIR}/../../wip/lapack/distinfo
 
 USE_LANGUAGES=		c fortran
 USE_CMAKE=		yes
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
-CONFIGURE_DIRS=		${WRKDIR}/build
+CONFIGURE_DIRS=		build
 CMAKE_ARG_PATH=		${WRKSRC}
 
 # Note: We patch the build to install both static and
@@ -38,7 +35,6 @@ CMAKE_ARGS=	-DBUILD_DEPRECATED=ON \
 		${LAPACK_PART_CMAKE_ARGS}
 
 post-extract:
-	${RUN} mkdir -p ${WRKDIR}/build
+	${RUN} mkdir -p ${WRKSRC}/build
 
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/lapack/distinfo b/lapack/distinfo
index f906c0e369..77419495f4 100644
--- a/lapack/distinfo
+++ b/lapack/distinfo
@@ -5,10 +5,10 @@ RMD160 (lapack-3.8.0.tar.gz) = ff306181c4c125e7594c57c1eeece8b0aa8f8523
 SHA512 (lapack-3.8.0.tar.gz) = 17786cb7306fccdc9b4a242de7f64fc261ebe6a10b6ec55f519deb4cb673cb137e8742aa5698fd2dc52f1cd56d3bd116af3f593a01dcf6770c4dcc86c50b2a7f
 Size (lapack-3.8.0.tar.gz) = 7426094 bytes
 SHA1 (patch-BLAS_SRC_CMakeLists.txt) = c8c69e6e0c67337af999863c4f5c64618d1374d7
-SHA1 (patch-CBLAS_cblas.pc.in) = 8291c46327766fea702c3cb533555311c6a5e97e
+SHA1 (patch-CBLAS_cblas.pc.in) = 3befb18c1b7f2f82c6da83ea10f913c817acf09f
 SHA1 (patch-CBLAS_src_CMakeLists.txt) = faa1ad6c322830cb62e0f5bdab33732c0372cce3
 SHA1 (patch-CMakeLists.txt) = 3f93b4745b1e64fb248249b845c0a44761c382d6
 SHA1 (patch-LAPACKE_CMakeLists.txt) = 1d26a94cbbd92a29b4e750a079add13de1d94d1e
-SHA1 (patch-LAPACKE_lapacke.pc.in) = c8d48afdd9da3f6a8bc05d83a43626e01322cf91
+SHA1 (patch-LAPACKE_lapacke.pc.in) = 7f0d91aaceac7f9980650ec90dbda95cf09b768f
 SHA1 (patch-SRC_CMakeLists.txt) = a667a733298c25ed63e653e44390b4600725609e
 SHA1 (patch-TESTING_MATGEN_CMakeLists.txt) = 84d4cde8fef49c6efc9f50a3219b0299375934d5
diff --git a/lapack/patches/patch-CBLAS_cblas.pc.in b/lapack/patches/patch-CBLAS_cblas.pc.in
index a44182e4eb..3ee816653f 100644
--- a/lapack/patches/patch-CBLAS_cblas.pc.in
+++ b/lapack/patches/patch-CBLAS_cblas.pc.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Install BLAS libs here rather than from a separate package
+
 --- CBLAS/cblas.pc.in.orig	2019-03-27 14:34:40.823289167 +0000
 +++ CBLAS/cblas.pc.in
 @@ -6,5 +6,5 @@ Description: C Standard Interface to BLA
diff --git a/lapack/patches/patch-LAPACKE_lapacke.pc.in b/lapack/patches/patch-LAPACKE_lapacke.pc.in
index ec0ac57641..8fafc0e18b 100644
--- a/lapack/patches/patch-LAPACKE_lapacke.pc.in
+++ b/lapack/patches/patch-LAPACKE_lapacke.pc.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Install libs here rather than from a separate package
+
 --- LAPACKE/lapacke.pc.in.orig	2019-03-27 14:35:14.016006535 +0000
 +++ LAPACKE/lapacke.pc.in
 @@ -6,5 +6,5 @@ Description: C Standard Interface to LAP


Home | Main Index | Thread Index | Old Index