From ba6e5715eac7f32726bed221c2864ba43efaa871 Mon Sep 17 00:00:00 2001
From: bf <bf@FreeBSD.org>
Date: Sun, 23 Oct 2011 09:04:04 +0000
Subject: correct linking and dependency tests; remove MAKE_ENV additions
 needed only on FreeBSD 6.* from math/levmar; patch a makefile of, and add an
 option to build profiling libraries to, math/lapacke; mark MAKE_JOBS_SAFE

PR:		161154, 161155
Submitted by:	E. Shibusawa (maintainer)
---
 math/levmar/Makefile            | 24 ++++++++++++------------
 math/levmar/files/Makefile.demo |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'math/levmar')

diff --git a/math/levmar/Makefile b/math/levmar/Makefile
index 4d76f8ae0a91..d6349e8eb9d6 100644
--- a/math/levmar/Makefile
+++ b/math/levmar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	levmar
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://www.ics.forth.gr/~lourakis/levmar/
 EXTRACT_SUFX=	.tgz
@@ -16,9 +16,11 @@ MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	A GPL-licensed library implementing the Levenberg-Marquardt algorithm
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
 USE_FORTRAN=	yes
+MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	PROFILE "Build a profiling library" Off
 
@@ -26,32 +28,30 @@ OPTIONS=	PROFILE "Build a profiling library" Off
 
 .if exists(${LOCALBASE}/lib/libgoto2p.so)
 WITH_BLAS?=	gotoblas
-.elif exists(${LOCALBASE}/lib/libatlas_r.so)
+.elif exists(${LOCALBASE}/lib/libatlas.so)
 WITH_BLAS?=	atlas
 .else
 WITH_BLAS?=	reference
 .endif
 
 .if ${WITH_BLAS} == "reference"
-LIB_DEPENDS=	blas.2:${PORTSDIR}/math/blas \
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas \
 		lapack.4:${PORTSDIR}/math/lapack
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == "gotoblas"
-LIB_DEPENDS=	goto2p.1:${PORTSDIR}/math/gotoblas
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+LIB_DEPENDS+=	goto2p.1:${PORTSDIR}/math/gotoblas
 BLAS=		-lgoto2p
 LAPACK=		-lgoto2p
 .elif ${WITH_BLAS} == "atlas"
-LIB_DEPENDS=	atlas_r.2:${PORTSDIR}/math/atlas
-BLAS=		-lptf77blas -lptcblas -latlas_r
-LAPACK=		-lalapack_r
-.endif
-
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
-SRCCONF=	${NONEXISTENT}
-MAKE_ENV=	LDADD="${LAPACK} ${BLAS}" \
-		SRCCONF="${SRCCONF}"
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
+BLAS=		-lptf77blas -lptcblas -latlas
+LAPACK=		-lalapack
+.endif
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	README.txt
diff --git a/math/levmar/files/Makefile.demo b/math/levmar/files/Makefile.demo
index 6ad6dba69fbc..751eb0ba2ce6 100644
--- a/math/levmar/files/Makefile.demo
+++ b/math/levmar/files/Makefile.demo
@@ -3,7 +3,7 @@ CFLAGS= %%CFLAGS%%
 LDFLAGS= %%LDFLAGS%%
 LAPACK= %%LAPACK%%
 BLAS= %%BLAS%%
-LIBS= -llevmar $(LAPACK) $(BLAS) -lm -lgcc_s -lgfortran
+LIBS= -llevmar $(LAPACK) $(BLAS) -lm
 
 DEMOBJS= lmdemo.o
 DEMOSRCS= lmdemo.c
-- 
cgit