From 9cecd2ea12014eb0af2614a8dfc41beac1ecfb75 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Wed, 18 Jun 2014 16:16:40 +0000 Subject: [PATCH] 1: Stagify. 2: USES=libtool, bump version. 3: new syntax of LIB_DEPENDS. Approved by: portmgr@ --- math/libtsnnls/Makefile | 13 ++++++------- math/libtsnnls/pkg-plist | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/math/libtsnnls/Makefile b/math/libtsnnls/Makefile index df8a594e0678..1635b4f3db7e 100644 --- a/math/libtsnnls/Makefile +++ b/math/libtsnnls/Makefile @@ -3,7 +3,7 @@ PORTNAME= libtsnnls PORTVERSION= 2.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= http://www.jasoncantarella.com/downloads/ @@ -11,7 +11,7 @@ MAINTAINER= tzhuan@gmail.com COMMENT= Fast Sparse Nonnegative Least Squares Solver GNU_CONFIGURE= yes -USES= fortran +USES= fortran libtool USE_LDCONFIG= yes OPTIONS_DEFINE= GOTOBLAS ATLAS @@ -19,7 +19,6 @@ GOTOBLAS_DESC= Use gotoblas (conflict with USE_ATLAS) ATLAS_DESC= Use atlas (conflict with USE_GOTOBLAS) # DMALLOC "Use dmalloc" off -NO_STAGE= yes .include WITH_BLAS=reference @@ -36,16 +35,16 @@ WITH_BLAS=atlas #.endif .if ${WITH_BLAS} == reference -LIB_DEPENDS+=blas.2:${PORTSDIR}/math/blas -LIB_DEPENDS+=lapack.4:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas +LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack BLAS=-lblas LAPACK=-llapack .elif ${WITH_BLAS} == gotoblas -LIB_DEPENDS+=goto2:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= libgoto2.so:${PORTSDIR}/math/gotoblas BLAS=-lgoto2p LAPACK=-lgoto2p .elif ${WITH_BLAS} == atlas -LIB_DEPENDS+=atlas:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS=-lptf77blas LAPACK=-lalapack -lptcblas .endif diff --git a/math/libtsnnls/pkg-plist b/math/libtsnnls/pkg-plist index 6c6cd2c58edb..bc201939e4dc 100644 --- a/math/libtsnnls/pkg-plist +++ b/math/libtsnnls/pkg-plist @@ -7,8 +7,8 @@ include/libtsnnls/taucs_basic/taucs_config_build.h include/libtsnnls/taucs_basic/taucs_config_tests.h include/libtsnnls/taucs_basic/taucs_private.h lib/libtsnnls.a -lib/libtsnnls.la lib/libtsnnls.so lib/libtsnnls.so.0 +lib/libtsnnls.so.0.0.0 @dirrm include/libtsnnls/taucs_basic @dirrm include/libtsnnls