Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 May 2015 11:58:47 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r386074 - head/math/levmar
Message-ID:  <201505111158.t4BBwlfU008293@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Mon May 11 11:58:46 2015
New Revision: 386074
URL: https://svnweb.freebsd.org/changeset/ports/386074

Log:
  - Use blaslapack.mk
  - Bump PORTREVISION
  
  PR:		199383
  Submitted by:	phd_kimberlite@yahoo.co.jp (maintainer)

Modified:
  head/math/levmar/Makefile

Modified: head/math/levmar/Makefile
==============================================================================
--- head/math/levmar/Makefile	Mon May 11 11:57:28 2015	(r386073)
+++ head/math/levmar/Makefile	Mon May 11 11:58:46 2015	(r386074)
@@ -3,7 +3,7 @@
 
 PORTNAME=	levmar
 PORTVERSION=	2.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math
 MASTER_SITES=	http://users.ics.forth.gr/~lourakis/levmar/
 
@@ -17,34 +17,16 @@ USE_LDCONFIG=	yes
 USES=		fortran tar:tgz uidfix
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PROFILE
+OPTIONS_SINGLE=	BLASLIB
+OPTIONS_DEFAULT=	NETLIB
+OPTIONS_SINGLE_BLASLIB=	ATLAS NETLIB OPENBLAS
 PROFILE_DESC=	Build a profiling library
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/libgoto2p.so)
-WITH_BLAS?=	gotoblas
-.elif exists(${LOCALBASE}/lib/libatlas.so)
-WITH_BLAS?=	atlas
-.else
-WITH_BLAS?=	reference
-.endif
+ATLAS_USES=	blaslapack:atlas
+NETLIB_USES=	blaslapack:netlib
+OPENBLAS_USES=	blaslapack:openblas
 
-.if ${WITH_BLAS} == "reference"
-LIB_DEPENDS+=	libblas.so:${PORTSDIR}/math/blas \
-		liblapack.so:${PORTSDIR}/math/lapack
-BLAS=		-lblas
-LAPACK=		-llapack
-.elif ${WITH_BLAS} == "gotoblas"
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-LIB_DEPENDS+=	libgoto2p.so:${PORTSDIR}/math/gotoblas
-BLAS=		-lgoto2p
-LAPACK=		-lgoto2p
-.elif ${WITH_BLAS} == "atlas"
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
-BLAS=		-lptf77blas
-LAPACK=		-lalapack -lptcblas
-.endif
+.include <bsd.port.pre.mk>
 
 PORTDOCS=	README.txt
 PORTEXAMPLES=	lmdemo.c Makefile.demo
@@ -73,8 +55,8 @@ post-extract:
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g' \
 		-e 's+%%CFLAGS%%+${CFLAGS} -I${LOCALBASE}/include+g' \
 		-e 's+%%LDFLAGS%%+${LDFLAGS}+g' \
-		-e 's+%%BLAS%%+${BLAS}+g' \
-		-e 's+%%LAPACK%%+${LAPACK}+g' \
+		-e 's+%%BLAS%%+${BLASLIB}+g' \
+		-e 's+%%LAPACK%%+${LAPACKLIB}+g' \
 			${WRKSRC}/Makefile.demo
 
 post-install:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505111158.t4BBwlfU008293>