diff -uNr /usr/ports/math/levmar/./Makefile ./Makefile
--- /usr/ports/math/levmar/./Makefile	2011-09-24 07:24:04.000000000 +0900
+++ ./Makefile	2011-09-30 20:01:00.000000000 +0900
@@ -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 @@
 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,7 +28,7 @@
 
 .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
@@ -38,20 +40,18 @@
 BLAS=		-lblas
 LAPACK=		-llapack
 .elif ${WITH_BLAS} == "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 -uNr /usr/ports/math/levmar/./files/Makefile.demo ./files/Makefile.demo
--- /usr/ports/math/levmar/./files/Makefile.demo	2010-12-18 09:44:22.000000000 +0900
+++ ./files/Makefile.demo	2011-09-30 20:01:00.000000000 +0900
@@ -3,7 +3,7 @@
 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