lapack, cblas, lapacke, mk/blas.bl3: drop the -ng suffix

diff --git a/cblas-ng/DESCR b/cblas-ng/DESCR
deleted file mode 100644 (file)
index e3232c7..0000000
--- a/cblas-ng/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the C wrapper to the Basic Linear Algebra Support library
-(CBLAS), extracted from the Netlib reference implementation of LAPACK.

diff --git a/cblas-ng/Makefile b/cblas-ng/Makefile
deleted file mode 100644 (file)
index 066ef4c..0000000
--- a/cblas-ng/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD$
-
-COMMENT=       C interface to a BLAS library
-LAPACK_PART=   cblas
-LAPACK_PART_CMAKE_ARGS=        \
-       -DUSE_OPTIMIZED_BLAS=ON \
-       -DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
-       -DUSE_OPTIMIZED_LAPACK=ON \
-       -DLAPACK_LIBRARIES=${LAPACK_LIBS:Q} \
-       -DCBLAS=ON -DLAPACKE=OFF
-
-.include "../../wip/mk/blas.buildlink3.mk"
-.include "../lapack-ng/Makefile.common"

diff --git a/cblas-ng/PLIST b/cblas-ng/PLIST
deleted file mode 100644 (file)
index f240c8b..0000000
--- a/cblas-ng/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD$
-include/cblas.h
-include/cblas_f77.h
-include/cblas_mangling.h
-include/cblas_test.h
-lib/cmake/cblas-${PKGVERSION}/cblas-config-version.cmake
-lib/cmake/cblas-${PKGVERSION}/cblas-config.cmake
-lib/libcblas.so
-lib/libcblas.so.3
-lib/libcblas.so.${PKGVERSION}
-lib/pkgconfig/cblas.pc

diff --git a/cblas-ng/buildlink3.mk b/cblas-ng/buildlink3.mk
deleted file mode 100644 (file)
index b3ec63a..0000000
--- a/cblas-ng/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=       cblas-ng
-
-.if !defined(CBLAS_NG_BUILDLINK3_MK)
-CBLAS_NG_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.cblas-ng+=       cblas-ng>=3.8.0
-BUILDLINK_PKGSRCDIR.cblas-ng?= ../../wip/cblas-ng
-
-.include       "../../wip/mk/blas.buildlink3.mk"
-.endif
-
-BUILDLINK_TREE+=       -cblas-ng

diff --git a/cblas/DESCR b/cblas/DESCR
index 69b212a33093c66201b47722a32ea75515a5157f..e3232c7f03457b8da5e9c5d7e699de56ba4eb4e6 100644 (file)
--- a/cblas/DESCR
+++ b/cblas/DESCR
@@ -1 +1,2 @@
-C bindings and headers for BLAS library.
+This is the C wrapper to the Basic Linear Algebra Support library
+(CBLAS), extracted from the Netlib reference implementation of LAPACK.

diff --git a/cblas/Makefile b/cblas/Makefile
index d5c425794a66820b222c8aad00fe5ac034777d0a..e306b6b88ae2e318a16029d996fc276a00a3f642 100644 (file)
--- a/cblas/Makefile
+++ b/cblas/Makefile
@@ -1,49 +1,13 @@
 # $NetBSD$
 
-DISTNAME=      cblas
-PKGNAME=       cblas-1.0
-CATEGORIES=    math
-MASTER_SITES=  http://www.netlib.org/blas/blast-forum/
-EXTRACT_SUFX=  .tgz
-
-MAINTAINER=    bacon@NetBSD.org
-HOMEPAGE=      http://www.netlib.org/blas/blast-forum/
-COMMENT=       C bindings and headers for BLAS library
-# Not sure about this.  FreeBSD port has custom blas license.
-LICENSE=       modified-bsd
-
-WRKSRC=                ${WRKDIR}/CBLAS
-USE_LANGUAGES= c fortran
-
-SUBST_CLASSES+=                libblas
-SUBST_STAGE.libblas=   post-patch
-SUBST_SED.libblas=     -e 's|libblas.a|-L${PREFIX}/lib -lblas|g'
-SUBST_SED.libblas+=    -e 's|cblas_$$(PLAT)|libcblas|g'
-SUBST_SED.libblas+=    -e 's|= -O3|+=|g'
-SUBST_SED.libblas+=    -e 's|CC =|CC ?=|g'
-SUBST_SED.libblas+=    -e 's|FC =|FC ?=|g'
-SUBST_FILES.libblas=   Makefile.in
-
-# Can't find -lssp* on NetBSD 7.0.1
-PKGSRC_USE_SSP=                no
-CFLAGS+=               -fPIC
-FFLAGS+=               -fPIC
-
-INSTALLATION_DIRS=     include lib
-
-post-extract:
-       ${CP} ${WRKSRC}/Makefile.LINUX ${WRKSRC}/Makefile.in
-
-post-build:
-       ${MKDIR} ${WRKSRC}/shared-lib
-       ${CHMOD} a-x ${WRKSRC}/lib/libcblas.a
-       cd ${WRKSRC}/shared-lib && \
-               ${AR} x ../lib/libcblas.a && \
-               ${FC} ${LDFLAGS} -shared -o ../lib/libcblas.so *.o
-
-do-install:
-       ${INSTALL_LIB} ${WRKSRC}/lib/libcblas.* ${DESTDIR}${PREFIX}/lib
-       ${INSTALL_DATA} ${WRKSRC}/include/*.h ${DESTDIR}${PREFIX}/include
-
-.include "../../math/blas/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
+COMMENT=       C interface to a BLAS library
+LAPACK_PART=   cblas
+LAPACK_PART_CMAKE_ARGS=        \
+       -DUSE_OPTIMIZED_BLAS=ON \
+       -DBLAS_LIBRARIES=${BLAS_LIBS:Q} \
+       -DUSE_OPTIMIZED_LAPACK=ON \
+       -DLAPACK_LIBRARIES=${LAPACK_LIBS:Q} \
+       -DCBLAS=ON -DLAPACKE=OFF
+
+.include "../../wip/mk/blas.buildlink3.mk"
+.include "../lapack/Makefile.common"

diff --git a/cblas/PLIST b/cblas/PLIST
index 010f10c9532d038fe2984f23779f91c78cd8200e..f240c8b0806a0d4907b589c079e92047463d3850 100644 (file)
--- a/cblas/PLIST
+++ b/cblas/PLIST
@@ -1,5 +1,11 @@
 @comment $NetBSD$
 include/cblas.h
 include/cblas_f77.h
-lib/libcblas.a
+include/cblas_mangling.h
+include/cblas_test.h
+lib/cmake/cblas-${PKGVERSION}/cblas-config-version.cmake
+lib/cmake/cblas-${PKGVERSION}/cblas-config.cmake
 lib/libcblas.so
+lib/libcblas.so.3
+lib/libcblas.so.${PKGVERSION}
+lib/pkgconfig/cblas.pc

diff --git a/cblas/buildlink3.mk b/cblas/buildlink3.mk
index 060681228afe5398911771d0f24ea4179319f5ac..7b5ce9b6cb8780e6298adcbf429cec0148acb2dc 100644 (file)
--- a/cblas/buildlink3.mk
+++ b/cblas/buildlink3.mk
@@ -5,9 +5,10 @@ BUILDLINK_TREE+=       cblas
 .if !defined(CBLAS_BUILDLINK3_MK)
 CBLAS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.cblas+=  cblas>=1.0
+BUILDLINK_API_DEPENDS.cblas+=  cblas>=3.8.0
 BUILDLINK_PKGSRCDIR.cblas?=    ../../wip/cblas
-BUILDLINK_DEPMETHOD.cblas?=    full
+
+.include       "../../wip/mk/blas.buildlink3.mk"
 .endif
 
 BUILDLINK_TREE+=       -cblas

diff --git a/cblas/distinfo b/cblas/distinfo
deleted file mode 100644 (file)
index a6f8a17..0000000
--- a/cblas/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (cblas.tgz) = d6970cf52592ef67674a61c78bbd055a4e9d4680
-RMD160 (cblas.tgz) = ab908605311ad5dfe280c5fb0e6a1e94156b7a04
-SHA512 (cblas.tgz) = 1c64e6814529cd716890504d213e8cd90150348b9105e8da030718383241a5660d145a14f26e20d27b2aea72c87a9d46b754c6e48935e168d62842c04ba56401
-Size (cblas.tgz) = 197468 bytes

diff --git a/lapack-ng/buildlink3.mk b/lapack-ng/buildlink3.mk
deleted file mode 100644 (file)
index ee0a6e5..0000000
--- a/lapack-ng/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=       lapack-ng
-
-.if !defined(LAPACK_NG_BUILDLINK3_MK)
-LAPACK_NG_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.lapack-ng+=      lapack-ng>=3.8.0
-BUILDLINK_ABI_DEPENDS.lapack-ng+=      lapack-ng>=3.8.0
-BUILDLINK_PKGSRCDIR.lapack-ng?=        ../../wip/lapack-ng
-.endif # LAPACK_NG_BUILDLINK3_MK
-
-BUILDLINK_TREE+=       -lapack-ng

diff --git a/lapack-ng/DESCR b/lapack/DESCR
similarity index 100%
rename from lapack-ng/DESCR
rename to lapack/DESCR

diff --git a/lapack-ng/Makefile b/lapack/Makefile
similarity index 83%
rename from lapack-ng/Makefile
rename to lapack/Makefile
index 9e9b8826d2ab221507b2e48b836035319b871eaa..6a67c959ba8ae1f88a0e0ed29e742ec3ee568b76 100644 (file)
--- a/lapack-ng/Makefile
+++ b/lapack/Makefile
@@ -7,4 +7,4 @@ LAPACK_PART_CMAKE_ARGS= \
        -DUSE_OPTIMIZED_LAPACK=OFF \
        -DCBLAS=OFF -DLAPACKE=OFF
 
-.include       "../lapack-ng/Makefile.common"
+.include       "../lapack/Makefile.common"

diff --git a/lapack-ng/Makefile.common b/lapack/Makefile.common
similarity index 75%
rename from lapack-ng/Makefile.common
rename to lapack/Makefile.common
index 5a50d5e7ede9d1a3d7023bd50d291691f261c5cf..3b8a5d0fdf618ffabd189f8e9280c64400e9c7e0 100644 (file)
--- a/lapack-ng/Makefile.common
+++ b/lapack/Makefile.common
@@ -6,8 +6,7 @@
 
 PORTVERSION=   3.8.0
 DISTNAME=      lapack-${PORTVERSION}
-# TODO: remove the -ng once we replace the old math/lapack.
-PKGNAME=       ${LAPACK_PART}-ng-${PORTVERSION}
+PKGNAME=       ${LAPACK_PART}-${PORTVERSION}
 PKGREVISION=   1
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_NETLIB:=lapack/}
@@ -18,9 +17,8 @@ HOMEPAGE=     http://www.netlib.org/lapack/
 LICENSE=       modified-bsd
 
 # All parts are in the same section (now wip, later math).
-# TODO: remove the -ng once we replace the old math/lapack
-PATCHDIR=       ${.CURDIR}/../lapack-ng/patches
-DISTINFO_FILE=  ${.CURDIR}/../lapack-ng/distinfo
+PATCHDIR=       ${.CURDIR}/../lapack/patches
+DISTINFO_FILE=  ${.CURDIR}/../lapack/distinfo
 
 USE_LANGUAGES=         c fortran
 USE_CMAKE=             yes

diff --git a/lapack-ng/PLIST b/lapack/PLIST
similarity index 100%
rename from lapack-ng/PLIST
rename to lapack/PLIST

diff --git a/lapack/buildlink3.mk b/lapack/buildlink3.mk
new file mode 100644 (file)
index 0000000..711e7b3
--- /dev/null
+++ b/lapack/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=       lapack
+
+.if !defined(LAPACK_BUILDLINK3_MK)
+LAPACK_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.lapack+= lapack>=3.8.0
+BUILDLINK_ABI_DEPENDS.lapack+= lapack>=3.8.0
+BUILDLINK_PKGSRCDIR.lapack?=   ../../wip/lapack
+.endif # LAPACK_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -lapack

diff --git a/lapack-ng/distinfo b/lapack/distinfo
similarity index 100%
rename from lapack-ng/distinfo
rename to lapack/distinfo

diff --git a/lapack-ng/patches/patch-CMakeLists.txt b/lapack/patches/patch-CMakeLists.txt
similarity index 100%
rename from lapack-ng/patches/patch-CMakeLists.txt
rename to lapack/patches/patch-CMakeLists.txt

diff --git a/lapacke-ng/buildlink3.mk b/lapacke-ng/buildlink3.mk
deleted file mode 100644 (file)
index 0064fa9..0000000
--- a/lapacke-ng/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+=       lapacke-ng
-
-.if !defined(LAPACKE_NG_BUILDLINK3_MK)
-LAPACKE_NG_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.lapacke-ng+=     lapacke-ng>=3.8.0
-BUILDLINK_PKGSRCDIR.lapacke-ng?=       ../../wip/lapacke-ng
-
-.include       "../../wip/mk/blas.buildlink3.mk"
-.endif
-
-BUILDLINK_TREE+=       -lapacke-ng

diff --git a/lapacke-ng/DESCR b/lapacke/DESCR
similarity index 100%
rename from lapacke-ng/DESCR
rename to lapacke/DESCR

diff --git a/lapacke-ng/Makefile b/lapacke/Makefile
similarity index 88%
rename from lapacke-ng/Makefile
rename to lapacke/Makefile
index 859d5473e2ff08f306daa5ef391797454feac461..ae4e0c5044e15d12ca78f63504ea18f5ff4ccf24 100644 (file)
--- a/lapacke-ng/Makefile
+++ b/lapacke/Makefile
@@ -10,4 +10,4 @@ LAPACK_PART_CMAKE_ARGS=       \
        -DCBLAS=OFF -DLAPACKE=ON
 
 .include "../../wip/mk/blas.buildlink3.mk"
-.include "../lapack-ng/Makefile.common"
+.include "../lapack/Makefile.common"

diff --git a/lapacke-ng/PLIST b/lapacke/PLIST
similarity index 100%
rename from lapacke-ng/PLIST
rename to lapacke/PLIST

diff --git a/lapacke/buildlink3.mk b/lapacke/buildlink3.mk
new file mode 100644 (file)
index 0000000..addae08
--- /dev/null
+++ b/lapacke/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD$
+
+BUILDLINK_TREE+=       lapacke
+
+.if !defined(LAPACKE_BUILDLINK3_MK)
+LAPACKE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.lapacke+=        lapacke>=3.8.0
+BUILDLINK_PKGSRCDIR.lapacke?=  ../../wip/lapacke
+
+.include       "../../wip/mk/blas.buildlink3.mk"
+.endif
+
+BUILDLINK_TREE+=       -lapacke

diff --git a/mk/blas.buildlink3.mk b/mk/blas.buildlink3.mk
index c4237aa1c32105090b0af14c13f85f269d5c4b24..108d1b8ab9a90c002da69b40b2a5045af97b0598 100644 (file)
--- a/mk/blas.buildlink3.mk
+++ b/mk/blas.buildlink3.mk
@@ -46,7 +46,7 @@ _BLAS_TYPE=     none
 .  endif
 
 .if $(_BLAS_TYPE) == "netlib"
-_BLAS_PACKAGE= wip/lapack-ng
+_BLAS_PACKAGE= wip/lapack
 BLAS_LIBS=     -lblas
 LAPACK_LIBS=   -llapack ${BLAS_LIBS}
 .elif $(_BLAS_TYPE) == "openblas"