From e76c3137d0dc704cf66c758a906a5be85b715a3b Mon Sep 17 00:00:00 2001 From: bf Date: Tue, 22 Nov 2011 11:14:10 +0000 Subject: adjust linking and comments in dependent ports after the math/atlas update; math/atlas-devel will be updated to use the same constructs at a later date PR: 162706 Approved by: miwi (portmgr) Feature safe: yes --- cad/calculix/Makefile | 4 ++-- cad/pdnmesh/Makefile | 4 ++-- cad/tochnog/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cad') diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile index 5df49fd..3537b2d 100644 --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -54,12 +54,12 @@ PSVIEWER?= gv .include -.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) +.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS_LIBS= -lf77blas -latlas +BLAS_LIBS= -lf77blas LAPACK_LIBS= -lalapack -lcblas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile index 10d7b1c..b3577d2 100644 --- a/cad/pdnmesh/Makefile +++ b/cad/pdnmesh/Makefile @@ -18,12 +18,12 @@ LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext .include -.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) +.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS= -lf77blas -latlas +BLAS= -lf77blas LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile index 346f712..7929dd0 100644 --- a/cad/tochnog/Makefile +++ b/cad/tochnog/Makefile @@ -40,9 +40,9 @@ GID_PTYPES= ${PREFIX}/${GIDDIR}/problemtypes .ifdef WITH_ATLAS .ifdef WITH_THREADS -BLAS_LIBS= -lptf77blas -latlas_r +BLAS_LIBS= -lptf77blas .else -BLAS_LIBS= -lf77blas -latlas +BLAS_LIBS= -lf77blas .endif .else #BLAS BLAS_LIBS?= -lblas -- cgit v1.1