From 62866c56e3eaa8dee7854c6cc39b5caa8a30a370 Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 3 Nov 2006 08:29:00 +0000 Subject: [PATCH] do not reference PKGNAME in other vars pointed out by naddy --- math/amd/Makefile | 7 ++++--- math/blas/Makefile | 7 ++++--- math/blas/distinfo | 16 ++++++++-------- math/cblas/Makefile | 7 ++++--- math/lapack/Makefile | 9 +++++---- math/umfpack/Makefile | 7 ++++--- 6 files changed, 29 insertions(+), 24 deletions(-) diff --git a/math/amd/Makefile b/math/amd/Makefile index 9333b0300de..f122d2981b6 100644 --- a/math/amd/Makefile +++ b/math/amd/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/10/21 16:58:00 steven Exp $ +# $OpenBSD: Makefile,v 1.2 2006/11/03 08:29:00 steven Exp $ COMMENT= "order a sparse matrix prior to Cholesky factorization" +VERSION= 2.0 DISTNAME= AMD -PKGNAME= ${DISTNAME:L}-2.0 +PKGNAME= ${DISTNAME:L}-${VERSION} SHARED_LIBS= amd 0.0 \ amdf77 0.0 @@ -22,7 +23,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}/current/ MASTER_SITES0= ${HOMEPAGE}../UFconfig/current/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} UFconfig.tar.gz:0 -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${DISTNAME:L}-${VERSION} WRKSRC= ${WRKDIST}/Source MAKE_FILE= ${FILESDIR}/Makefile diff --git a/math/blas/Makefile b/math/blas/Makefile index 2289531e51d..edf4121fee7 100644 --- a/math/blas/Makefile +++ b/math/blas/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2006/10/03 06:00:03 ckuethe Exp $ +# $OpenBSD: Makefile,v 1.6 2006/11/03 08:29:00 steven Exp $ COMMENT= "Basic Linear Algebra Subprograms" +VERSION= 1.0 DISTNAME= blas -PKGNAME= ${DISTNAME}-${LIBblas_VERSION}p0 +PKGNAME= ${DISTNAME}-${VERSION}p0 SHARED_LIBS= blas 1.0 CATEGORIES= math @@ -24,7 +25,7 @@ MASTER_SITES= ftp://ftp.netlib.org/blas/ \ http://www.netlib.no/netlib/blas/ MASTER_SITES0= ${MASTER_SITES:S/blas/lapack/} EXTRACT_SUFX= .tgz -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${DISTNAME}-${VERSION} WRKDIST= ${WRKDIR} MAKE_FILE= ${FILESDIR}/Makefile diff --git a/math/blas/distinfo b/math/blas/distinfo index 135713d25af..43798b403d2 100644 --- a/math/blas/distinfo +++ b/math/blas/distinfo @@ -1,8 +1,8 @@ -MD5 (blas-1.0p0/blas.tgz) = 5811e4b3dffa7a10956abf923cec1bd4 -MD5 (blas-1.0p0/manpages.tgz) = 50efab6cd73a9429584f7f1537f1727f -RMD160 (blas-1.0p0/blas.tgz) = d2cea3ae6156b6f583fae5e590695ffb306abb80 -RMD160 (blas-1.0p0/manpages.tgz) = 9704d46c17a328c66907c2b873d6df24e42d0f25 -SHA1 (blas-1.0p0/blas.tgz) = ab73fcc69d0c74888aea67a698f60cd91b0d3af2 -SHA1 (blas-1.0p0/manpages.tgz) = 73975c2d9dd0f00f24a8aef5f5a6e667527d2fd3 -SIZE (blas-1.0p0/blas.tgz) = 94981 -SIZE (blas-1.0p0/manpages.tgz) = 721308 +MD5 (blas-1.0/blas.tgz) = 5811e4b3dffa7a10956abf923cec1bd4 +MD5 (blas-1.0/manpages.tgz) = 50efab6cd73a9429584f7f1537f1727f +RMD160 (blas-1.0/blas.tgz) = d2cea3ae6156b6f583fae5e590695ffb306abb80 +RMD160 (blas-1.0/manpages.tgz) = 9704d46c17a328c66907c2b873d6df24e42d0f25 +SHA1 (blas-1.0/blas.tgz) = ab73fcc69d0c74888aea67a698f60cd91b0d3af2 +SHA1 (blas-1.0/manpages.tgz) = 73975c2d9dd0f00f24a8aef5f5a6e667527d2fd3 +SIZE (blas-1.0/blas.tgz) = 94981 +SIZE (blas-1.0/manpages.tgz) = 721308 diff --git a/math/cblas/Makefile b/math/cblas/Makefile index 57d01494e72..9918fc11b46 100644 --- a/math/cblas/Makefile +++ b/math/cblas/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/10/02 21:58:25 steven Exp $ +# $OpenBSD: Makefile,v 1.2 2006/11/03 08:29:00 steven Exp $ COMMENT= "C interface to the BLAS library" +VERSION= 1.0 DISTNAME= cblas -PKGNAME= ${DISTNAME}-${LIBcblas_VERSION} +PKGNAME= ${DISTNAME}-${VERSION} SHARED_LIBS= cblas 1.0 CATEGORIES= math @@ -22,7 +23,7 @@ MASTER_SITES= http://www.netlib.org/blas/blast-forum/ \ ftp://netlib.bell-labs.com/netlib/blas/blast-forum/ \ http://www.netlib.no/netlib/blas/blast-forum/ EXTRACT_SUFX= .tgz -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${DISTNAME}-${VERSION} WRKDIST= ${WRKDIR}/CBLAS WRKSRC= ${WRKDIST}/src diff --git a/math/lapack/Makefile b/math/lapack/Makefile index 3202fc109ef..161cfbdc089 100644 --- a/math/lapack/Makefile +++ b/math/lapack/Makefile @@ -1,12 +1,13 @@ -# $OpenBSD: Makefile,v 1.3 2006/10/03 10:26:49 steven Exp $ +# $OpenBSD: Makefile,v 1.4 2006/11/03 08:29:00 steven Exp $ COMMENT= "library of Fortran 77 linear algebra subroutines" +VERSION= 3.0 DISTNAME= LAPACK -PKGNAME= lapack-3.0 +PKGNAME= ${DISTNAME:L}-${VERSION} SHARED_LIBS= lapack 3.0 CATEGORIES= math -DISTFILES= lapack.tgz manpages.tgz +DISTFILES= ${DISTNAME:L}.tgz manpages.tgz HOMEPAGE= http://www.netlib.org/lapack/ @@ -24,7 +25,7 @@ MASTER_SITES= ftp://ftp.netlib.org/lapack/ \ LIB_DEPENDS= blas.>=1::math/blas -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${DISTNAME:L}-${VERSION} WRKDIST= ${WRKDIR} WRKSRC= ${WRKDIR}/${DISTNAME}/SRC MAKE_FILE= ${FILESDIR}/Makefile diff --git a/math/umfpack/Makefile b/math/umfpack/Makefile index 214ff64649b..c59fb12a3a2 100644 --- a/math/umfpack/Makefile +++ b/math/umfpack/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2006/10/21 17:22:47 steven Exp $ +# $OpenBSD: Makefile,v 1.2 2006/11/03 08:29:00 steven Exp $ COMMENT= "unsymmetric multifrontal sparse LU factorization package" +VERSION= 5.0.1 DISTNAME= UMFPACK -PKGNAME= ${DISTNAME:L}-5.0.1 +PKGNAME= ${DISTNAME:L}-${VERSION} SHARED_LIBS= umfpack 0.0 CATEGORIES= math @@ -25,7 +26,7 @@ RUN_DEPENDS= ::${AMD_DIR} MASTER_SITES= ${HOMEPAGE}/current/ MASTER_SITES0= ${HOMEPAGE}../UFconfig/current/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} UFconfig.tar.gz:0 -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${DISTNAME:L}-${VERSION} WRKSRC= ${WRKDIST}/Source MAKE_FILE= ${FILESDIR}/Makefile