diff options
41 files changed, 159 insertions, 158 deletions
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile index 5df49fd6a295..3537b2d597d5 100644 --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -54,12 +54,12 @@ PSVIEWER?= gv .include <bsd.port.pre.mk> -.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 10d7b1c96cb7..b3577d2157cb 100644 --- a/cad/pdnmesh/Makefile +++ b/cad/pdnmesh/Makefile @@ -18,12 +18,12 @@ LIB_DEPENDS= gtkglext:${PORTSDIR}/x11-toolkits/gtkglext .include <bsd.port.pre.mk> -.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 346f7126ee18..7929dd0be1d3 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 diff --git a/french/aster/Makefile b/french/aster/Makefile index 8c82382dab8b..c9748b590b47 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -83,7 +83,7 @@ PYTHON_VERSION= 2.6 # Avoid renaming .f into .F #F90FLAGS= -x f77-cpp-input ${FFLAGS} -.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) @@ -212,7 +212,7 @@ tcl_dir= ${LOCALBASE} hdf_dir= ${LOCALBASE} .if defined(WITH_ATLAS) lib_blas= ptf77blas -lib_atlas= atlas_r +lib_atlas= atlas .else lib_blas= blas lib_atlas= # empty diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index a7d780896f23..24316648ae07 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -79,16 +79,16 @@ NO_BUILD= yes .if !defined(NOPORTDOCS) . if !defined(WITHOUT_LAPACK) -. 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 -LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas -lf77blas -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -lgfortran -latlas +LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas -lf77blas . else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack -LAPACK_LIB= -L${LOCALBASE}/lib -llapack -lblas -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. -lgfortran +LAPACK_LIB= -L${LOCALBASE}/lib -llapack -lblas . endif . endif .endif diff --git a/math/R/Makefile b/math/R/Makefile index c1acd3721616..3925a905c5c3 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -98,7 +98,7 @@ CONFIGURE_ENV += SHLIB_${flag}FLAGS="${PICFLAG}" .if !defined(LIBRMATH_SLAVEPORT) .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS?= -lf77blas -latlas +BLAS?= -lf77blas LAPACK?= -lalapack -lcblas .else BLAS?= no diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile index bc67167beb3d..d8e8baf05200 100644 --- a/math/arpack++/Makefile +++ b/math/arpack++/Makefile @@ -25,13 +25,13 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libsuperlu.a:${PORTSDIR}/math/superlu LIB_DEPENDS= arpack.1:${PORTSDIR}/math/arpack \ umfpack.1:${PORTSDIR}/math/suitesparse -.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 -LAPACK= -lalapack +BLAS= -lf77blas +LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas diff --git a/math/arpack/Makefile b/math/arpack/Makefile index f42ed82304f4..49ab5e162fee 100644 --- a/math/arpack/Makefile +++ b/math/arpack/Makefile @@ -79,7 +79,7 @@ WITH_BLAS?= reference .if ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS?= -lf77blas -latlas +BLAS?= -lf77blas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS?= -lblas diff --git a/math/blocksolve95/Makefile b/math/blocksolve95/Makefile index 78d769a7b762..bd8a32b623ac 100644 --- a/math/blocksolve95/Makefile +++ b/math/blocksolve95/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${MPIDIR}/bin/mpirun:${PORTSDIR}/net/mpich2 USE_GMAKE= yes MAKEFILE= makefile MAKE_ARGS= GMAKE=${GMAKE} PETSC_ARCH=${PETSC_ARCH} BOPT=${BOPT} \ - BLAS_LIB=${BLAS_LIB} LAPACK_LIB=${LAPACK_LIB} + BLAS_LIB="${BLAS_LIB}" LAPACK_LIB="${LAPACK_LIB}" MPIDIR= ${LOCALBASE} PETSC_ARCH= freebsd @@ -39,18 +39,18 @@ PORTDOCS= manual.ps .include <bsd.port.pre.mk> -.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_LIB= "-lf77blas -latlas -lm" -LAPACK_LIB= "-L${LOCALBASE}/lib -lalapack" +BLAS_LIB= -lf77blas +LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas -BLAS_LIB= "-lblas -lm" -LAPACK_LIB= "-L${LOCALBASE}/lib -llapack" +BLAS_LIB= -lblas +LAPACK_LIB= -L${LOCALBASE}/lib -llapack .endif do-install: diff --git a/math/freemat/Makefile b/math/freemat/Makefile index 2a61f0605ed4..77472ed68aeb 100644 --- a/math/freemat/Makefile +++ b/math/freemat/Makefile @@ -71,13 +71,13 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libs__libFN__CMakeLists.txt \ ${FILESDIR}/extra-patch-libs__libFN__FNFun.cpp .endif -.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 -LAPACK= -lalapack +BLAS= -lf77blas +LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas \ lapack.4:${PORTSDIR}/math/lapack diff --git a/math/gretl/Makefile b/math/gretl/Makefile index d9e07715b81b..d5a9df53e7ba 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -42,7 +42,7 @@ OPTIONS= ATLAS "Use Atlas for BLAS and LAPACK" off \ .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/math/jags/Makefile b/math/jags/Makefile index 748cf50e7900..e3b78d0ac07e 100644 --- a/math/jags/Makefile +++ b/math/jags/Makefile @@ -45,7 +45,7 @@ MAN1= jags.1 .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -CONFIGURE_ARGS= --with-lapack=-lalapack --with-blas=-lf77blas +CONFIGURE_ARGS= --with-lapack="-lalapack -lcblas" --with-blas=-lf77blas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile index 370e8b9e9fbe..a1d7a3174aba 100644 --- a/math/lapack++/Makefile +++ b/math/lapack++/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gnomehack .include <bsd.port.pre.mk> -.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) @@ -42,15 +42,15 @@ USE_FORTRAN= yes GNU_CONFIGURE= yes USE_GMAKE= yes .if defined(WITH_ATLAS) -BLAS_LIB= -L${LOCALBASE}/lib -lf77blas -latlas -LAPACK_LIB= -L${LOCALBASE}/lib -lalapack +BLAS_LIB= -L${LOCALBASE}/lib -lf77blas +LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lcblas .else BLAS_LIB= -L${LOCALBASE}/lib -lblas LAPACK_LIB= -L${LOCALBASE}/lib -llapack .endif -#BLAS_LIB= -L${LOCALBASE}/lib -lptf77blas -latlas_r ${PTHREAD_LIBS} -#LAPACK_LIB= -L${LOCALBASE}/lib -lalapack_r -lptcblas ${PTHREAD_LIBS} +#BLAS_LIB= -L${LOCALBASE}/lib -lptf77blas +#LAPACK_LIB= -L${LOCALBASE}/lib -lalapack -lptcblas #lapack++ forces to use atlas when detected, so we should disable here. CONFIGURE_ARGS+= --with-blas="${BLAS_LIB}" --with-lapack="${LAPACK_LIB}" --disable-atlas --enable-static diff --git a/math/lapack95/Makefile b/math/lapack95/Makefile index a89ba005f6d4..8adc69fef427 100644 --- a/math/lapack95/Makefile +++ b/math/lapack95/Makefile @@ -29,7 +29,7 @@ PICFLAG?= -fPIC PICFLAG?= -fpic .endif -.if exists(${LOCALBASE}/lib/libatlas_r.so) +.if exists(${LOCALBASE}/lib/libatlas.so) WITH_BLAS?= atlas .else WITH_BLAS?= reference @@ -37,7 +37,7 @@ WITH_BLAS?= reference .if ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS= -lf77blas -latlas +BLAS= -lf77blas LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= blas:${PORTSDIR}/math/blas diff --git a/math/lapacke/Makefile b/math/lapacke/Makefile index e35af056ae65..dc409bbd907e 100644 --- a/math/lapacke/Makefile +++ b/math/lapacke/Makefile @@ -54,8 +54,8 @@ WITHOUT_LAPACK_LATEST= yes CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas -LAPACK= -lalapack +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif LDFLAGS+= -L${LOCALBASE}/lib diff --git a/math/levmar/Makefile b/math/levmar/Makefile index d6349e8eb9d6..c84df644149d 100644 --- a/math/levmar/Makefile +++ b/math/levmar/Makefile @@ -49,8 +49,8 @@ LAPACK= -lgoto2p CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas -LAPACK= -lalapack +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif .if !defined(NOPORTDOCS) diff --git a/math/libtsnnls/Makefile b/math/libtsnnls/Makefile index 91a2e9cd2feb..534ac8bd468e 100644 --- a/math/libtsnnls/Makefile +++ b/math/libtsnnls/Makefile @@ -23,11 +23,10 @@ OPTIONS= GOTOBLAS "Use gotoblas (conflict with USE_ATLAS)" off \ .include <bsd.port.options.mk> -WITH_BLAS?=reference +WITH_BLAS=reference .if defined(WITH_GOTOBLAS) WITH_BLAS=gotoblas -.endif -.if defined(WITH_ATLAS) +.elif defined(WITH_ATLAS) WITH_BLAS=atlas .endif @@ -48,8 +47,8 @@ BLAS=-lgoto2p LAPACK=-lgoto2p .elif ${WITH_BLAS} == atlas LIB_DEPENDS+=atlas:${PORTSDIR}/math/atlas -BLAS=-lptf77blas -lptcblas -latlas_r -LAPACK=-lalapack_r +BLAS=-lptf77blas +LAPACK=-lalapack -lptcblas .endif CONFIGURE_ARGS= --with-blas="${BLAS}" --with-lapack="${LAPACK}" diff --git a/math/mumps/Makefile b/math/mumps/Makefile index 0e1b313b64fc..803bdad04f0a 100644 --- a/math/mumps/Makefile +++ b/math/mumps/Makefile @@ -35,7 +35,7 @@ SLAVEDIRS= math/mumps-mpich USE_FORTRAN= yes -FORTRANLIBS= -lgfortranbegin -lgfortran +FORTRANLIBS= -lgfortran GCCLIBDIR= -L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../.. .if defined(WITH_OPTIMIZED_FLAGS) @@ -51,12 +51,12 @@ PLIST_SUB+= MUMPSVERSION=${PORTVERSION} .include <bsd.port.pre.mk> -.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/math/octave-devel/Makefile b/math/octave-devel/Makefile index e25a7cfe5e67..3402f0992218 100644 --- a/math/octave-devel/Makefile +++ b/math/octave-devel/Makefile @@ -44,27 +44,27 @@ MAN1= octave.1 octave-bug.1 mkoctfile.1 octave-config.1 .include <bsd.port.pre.mk> -USE_BLAS?= reference - .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r -LAPACK= -lalapack_r +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif USE_FORTRAN= yes diff --git a/math/octave/Makefile b/math/octave/Makefile index 6e8114f453c1..9effb425c589 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -47,27 +47,27 @@ MAN1= octave.1 mkoctfile.1 octave-config.1 .include <bsd.port.pre.mk> -USE_BLAS?= reference - .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r -LAPACK= -lalapack_r +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif USE_FORTRAN= yes diff --git a/math/petsc/Makefile b/math/petsc/Makefile index ef024397f83d..a744b0758aad 100644 --- a/math/petsc/Makefile +++ b/math/petsc/Makefile @@ -118,17 +118,17 @@ WITHOUT_SUPERLU= yes PLIST_SUB+= MPIUNI="" .endif -.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 -LIBBLASLAPACK= "-L${LOCALBASE}/lib -lalapack -lf77blas -lcblas -latlas -lm" -CONFIGURE_ARGS+= --with-blas-lapack-lib=${LIBBLASLAPACK} +LIBBLASLAPACK= -L${LOCALBASE}/lib -lalapack -lcblas -lf77blas +CONFIGURE_ARGS+= --with-blas-lapack-lib="${LIBBLASLAPACK}" .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack -LIBBLASLAPACK= "-L${LOCALBASE}/lib -llapack -lblas -lm" -CONFIGURE_ARGS+= --with-blas-lapack-lib=${LIBBLASLAPACK} +LIBBLASLAPACK= -L${LOCALBASE}/lib -llapack -lblas +CONFIGURE_ARGS+= --with-blas-lapack-lib="${LIBBLASLAPACK}" .endif .if !defined(WITHOUT_SUPERLU) && !defined(WITHOUT_BLASLAPACK) diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index ce9c896e0863..82f9ab09980b 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -55,7 +55,7 @@ DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:fp ${FP_ARCH}/fenv.h?p=203441:fp .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas .if !exists(${LOCALBASE}/lib/libalapack.a) -IGNORE= atlas needs to be built with WITH_STATICLIB for numpy to function properly +IGNORE= atlas needs to be built with WITH_STATIC for numpy to function properly .endif .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack \ diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile index 26acbceecfc9..0119969db158 100644 --- a/math/py-symeig/Makefile +++ b/math/py-symeig/Makefile @@ -30,7 +30,7 @@ OPTIONS= ATLAS "Use optimized blas library" OFF .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas .if !exists(${LOCALBASE}/lib/libalapack.a) -IGNORE= atlas needs to be built with WITH_STATICLIB for scipy to function properly +IGNORE= atlas needs to be built with WITH_STATIC for symeig to function properly .endif .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack \ diff --git a/math/scalapack/Makefile b/math/scalapack/Makefile index 790aaf92a8fe..ee9e417a485e 100644 --- a/math/scalapack/Makefile +++ b/math/scalapack/Makefile @@ -42,12 +42,12 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> -.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/math/scalapack/files/Makefile b/math/scalapack/files/Makefile index b8acf5217911..711f068aaa67 100644 --- a/math/scalapack/files/Makefile +++ b/math/scalapack/files/Makefile @@ -5,7 +5,7 @@ all: densg densg2 densg: example1.f # f77 version - mpif77 -o densg example1.f -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas -latlas + mpif77 -o densg example1.f -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas densg2: example1.cc # C++ version - mpiCC -o densg2 example1.cc -I/usr/local/mpich/include -I/usr/local/include -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas -latlas -lg2c -lm + mpiCC -o densg2 example1.cc -I/usr/local/mpich/include -I/usr/local/include -L/usr/local/lib -lscalapack -lblacs -lblacsf77 -lblacs -lf77blas -lg2c -lm diff --git a/math/scilab/Makefile b/math/scilab/Makefile index eee90b70337a..3682b6686b41 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -52,7 +52,7 @@ OPTIONS= ATLAS "Use Atlas instead of Blas" OFF \ .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+= lapack.4:${PORTSDIR}/math/lapack diff --git a/math/sdpa/Makefile b/math/sdpa/Makefile index 8b5da3c04dfb..46d7aec41a9c 100644 --- a/math/sdpa/Makefile +++ b/math/sdpa/Makefile @@ -24,28 +24,29 @@ USE_FORTRAN= yes GNU_CONFIGURE= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION}.src -USE_BLAS?= reference .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lgoto2p LAPACK= -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r -LAPACK= -lalapack_r +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif CONFIGURE_ARGS+=--with-blas="-L${LOCALBASE}/lib ${BLAS}" --with-lapack="-L${LOCALBASE}/lib ${LAPACK}" diff --git a/math/sdpara/Makefile b/math/sdpara/Makefile index 77a583e077ee..3f52a1c1e430 100644 --- a/math/sdpara/Makefile +++ b/math/sdpara/Makefile @@ -31,27 +31,28 @@ SRCFILE= ${PORTNAME}.${PORTVERSION}.src.${SRCDATE}.tar.gz USE_FORTRAN= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} -USE_BLAS?= reference .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r -LAPACK= -lalapack_r +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif #PLIST_SUB+= MANUALFILE=${MANUALFILE} diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index f27467c19e5c..f73822a57e33 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -30,7 +30,7 @@ CONFLICTS= umfpack-* .if exists(${LOCALBASE}/lib/libgoto2.so) WITH_BLAS?= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) +.elif exists(${LOCALBASE}/lib/libatlas.so) WITH_BLAS?= atlas .else WITH_BLAS?= reference @@ -47,12 +47,12 @@ LAPACK= -llapack .elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack -BLAS = -lgoto2p ${PTHREAD_LIBS} -LAPACK = -lgoto2p ${PTHREAD_LIBS} +BLAS = -lgoto2p +LAPACK = -lgoto2p .elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r ${PTHREAD_LIBS} -LAPACK = -lalapack_r ${PTHREAD_LIBS} +BLAS= -lptf77blas +LAPACK = -lalapack -lptcblas .endif .if ${ARCH} == "sparc64" diff --git a/math/superlu/Makefile b/math/superlu/Makefile index d201105956db..ab77e2b44f8e 100644 --- a/math/superlu/Makefile +++ b/math/superlu/Makefile @@ -23,23 +23,23 @@ COMMENT= A library of routines for performing sparse factorization .include <bsd.port.pre.mk> -USE_BLAS?= reference - .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS= -lblas -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r +BLAS= -lptf77blas .endif USE_FORTRAN= yes diff --git a/math/superlu_mt/Makefile b/math/superlu_mt/Makefile index 14c97e8e9646..94ae9bb34331 100644 --- a/math/superlu_mt/Makefile +++ b/math/superlu_mt/Makefile @@ -25,24 +25,24 @@ USE_FORTRAN= yes .include <bsd.port.pre.mk> -USE_BLAS?= reference - .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -.if ${USE_BLAS} == reference +.if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS= -lblas -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p BROKEN= Build stops while testing -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r +BLAS= -lptf77blas .endif .if ${ARCH} == "sparc64" || ${ARCH} == "amd64" diff --git a/science/2dhf/Makefile b/science/2dhf/Makefile index 24c098eda3f2..c3b5f5626617 100644 --- a/science/2dhf/Makefile +++ b/science/2dhf/Makefile @@ -22,12 +22,12 @@ USE_FORTRAN= ifort BUILD_DEPENDS+= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc .endif -.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 .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack diff --git a/science/abinit/Makefile b/science/abinit/Makefile index e060c59a385c..644c947da830 100644 --- a/science/abinit/Makefile +++ b/science/abinit/Makefile @@ -45,13 +45,13 @@ USE_GHOSTSCRIPT_BUILD= yes MANUAL_PACKAGE_BUILD= takes a tremendous amount of time to build on pointyhat nodes .endif -.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 -LAPACK= -lalapack +BLAS= -lf77blas +LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile index d99b3f601720..f3daf4e4651e 100644 --- a/science/elmer-hutiter/Makefile +++ b/science/elmer-hutiter/Makefile @@ -22,13 +22,13 @@ USE_FORTRAN= yes .include <bsd.port.pre.mk> -.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 -LAPACK= -lalapack +BLAS= -lf77blas +LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas diff --git a/science/gamess/Makefile b/science/gamess/Makefile index 7bddda49b399..f11cffc0059b 100644 --- a/science/gamess/Makefile +++ b/science/gamess/Makefile @@ -32,27 +32,27 @@ MANUAL_PACKAGE_BUILD=You must manually get the source distribution from master s .include <bsd.port.pre.mk> -USE_BLAS?= reference - .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r -LAPACK= -lalapack_r +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif MAKE_ENV+= LANG="C" diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile index ecb24eb999cb..87b4f36fe46d 100644 --- a/science/mbdyn/Makefile +++ b/science/mbdyn/Makefile @@ -38,18 +38,18 @@ OPTIONS= MPI "Enable mpich-support" off \ BROKEN= Does not compile on powerpc .endif -USE_BLAS?= reference +WITH_BLAS?= reference -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas \ lapack.4:${PORTSDIR}/math/lapack CONFIGURE_ARGS+= --with-blas=blas LAPACK_LIBS= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto:${PORTSDIR}/math/gotoblas CONFIGURE_ARGS+= --with-blas=goto --with-goto=goto2 LAPACK_LIBS= -lgoto2 -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas CONFIGURE_ARGS+= --with-blas=atlas LAPACK_LIBS= -lalapack diff --git a/science/mpb/Makefile b/science/mpb/Makefile index adb91517ccba..51be6769cde4 100644 --- a/science/mpb/Makefile +++ b/science/mpb/Makefile @@ -28,7 +28,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.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) diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile index decad1bf7320..03e2eec0eb81 100644 --- a/science/mpqc/Makefile +++ b/science/mpqc/Makefile @@ -24,13 +24,13 @@ USE_LDCONFIG= yes .if defined(WITH_ICC) BUILD_DEPENDS+= ${LOCALBASE}/intel_cc_80/bin/icc:${PORTSDIR}/lang/icc .endif -.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 -lcblas -LAPACK= -lalapack +BLAS= -lf77blas +LAPACK= -lalapack -lcblas .else LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack diff --git a/science/ncs/Makefile b/science/ncs/Makefile index f533a03347e3..738c2f0d74ab 100644 --- a/science/ncs/Makefile +++ b/science/ncs/Makefile @@ -78,12 +78,12 @@ DOCS= AUTHORS COMPATIBILITY Changelog TODO .include <bsd.port.pre.mk> -.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) && !defined(WITHOUT_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS_LIB= -lcblas -lf77blas -latlas -L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} -lgfortranbegin -lgfortran +BLAS_LIB= -lf77blas .elif !defined(WITHOUT_BLAS) LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas BLAS_LIB= -lblas diff --git a/science/psi3/Makefile b/science/psi3/Makefile index c26d82e52303..107a61b033d6 100644 --- a/science/psi3/Makefile +++ b/science/psi3/Makefile @@ -22,28 +22,28 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= maho@FreeBSD.org COMMENT= An electronic structure programs for high-accuracy computations -USE_BLAS?= reference - .if exists(${LOCALBASE}/lib/libgoto2.so) -USE_BLAS= gotoblas -.elif exists(${LOCALBASE}/lib/libatlas_r.so) -USE_BLAS= atlas +WITH_BLAS?= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas.so) +WITH_BLAS?= atlas +.else +WITH_BLAS?= reference .endif -. if ${USE_BLAS} == reference +. if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack -.elif ${USE_BLAS} == gotoblas +.elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas LIB_DEPENDS+= lapack:${PORTSDIR}/math/lapack BLAS= -lgoto2p LAPACK= -lgoto2p -.elif ${USE_BLAS} == atlas +.elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas -BLAS= -lptf77blas -lptcblas -latlas_r -LAPACK= -lalapack_r +BLAS= -lptf77blas +LAPACK= -lalapack -lptcblas .endif USE_BZIP2= yes diff --git a/science/py-scipy/Makefile b/science/py-scipy/Makefile index 3d24f8cef036..433ecfbc4cf8 100644 --- a/science/py-scipy/Makefile +++ b/science/py-scipy/Makefile @@ -41,7 +41,7 @@ BROKEN= ldexpf is missing See http://lists.freebsd.org/pipermail/freebsd-amd64/2 .if defined(WITH_ATLAS) LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas .if !exists(${LOCALBASE}/lib/libalapack.a) -IGNORE= atlas needs to be built with WITH_STATICLIB for scipy to function properly +IGNORE= atlas needs to be built with WITH_STATIC for scipy to function properly .endif .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack \ |