Attachment 113114 Details for Bug 154645 – levmar.diff.2.txt

levmar.diff.2.txt

levmar.diff.2.txt (text/plain; charset=US-ASCII), 2.90 KB, created by b. f. on 2011-02-10 12:47:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: b. f.

Created: 2011-02-10 12:47:46 UTC

Size: 2.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/math/levmar/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- Makefile	18 Dec 2010 00:44:21 -0000	1.2
>+++ Makefile	10 Feb 2011 12:43:15 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	levmar
> PORTVERSION=	2.5
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math
> MASTER_SITES=	http://www.ics.forth.gr/~lourakis/levmar/
> EXTRACT_SUFX=	.tgz
>@@ -20,9 +20,11 @@
> USE_LDCONFIG=	yes
> USE_FORTRAN=	yes
> 
>+OPTIONS=	PROFILE "Build a profiling library" Off
>+
> .include <bsd.port.pre.mk>
> 
>-.if exists(${LOCALBASE}/lib/libgoto2.so)
>+.if exists(${LOCALBASE}/lib/libgoto2p.so)
> WITH_BLAS?=	gotoblas
> .elif exists(${LOCALBASE}/lib/libatlas_r.so)
> WITH_BLAS?=	atlas
>@@ -36,21 +38,20 @@
> BLAS=		-lblas
> LAPACK=		-llapack
> .elif ${WITH_BLAS} == "gotoblas"
>-LIB_DEPENDS=	goto2:${PORTSDIR}/math/gotoblas \
>-		lapack.4:${PORTSDIR}/math/lapack
>-BLAS=		-lpthread -lgoto2p
>-LAPACK=		-lpthread -lgoto2p
>+LIB_DEPENDS=	goto2p.1:${PORTSDIR}/math/gotoblas
>+BLAS=		-lgoto2p
>+LAPACK=		-lgoto2p
> .elif ${WITH_BLAS} == "atlas"
>-LIB_DEPENDS=	atlas:${PORTSDIR}/math/atlas
>-BLAS=		-pthread -lptf77blas -lptcblas -latlas_r
>-LAPACK=		-pthread -lalapack_r
>+LIB_DEPENDS=	atlas_r.2:${PORTSDIR}/math/atlas
>+BLAS=		-lptf77blas -lptcblas -latlas_r
>+LAPACK=		-lalapack_r
> .endif
> 
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-MAKE_ENV=	LDADD="${LAPACK} ${BLAS}" LDFLAGS="${LDFLAGS}"
>-.for _u in AR NM RANLIB
>-MAKE_ENV+=	${_u}="${LOCALBASE}/bin/${_u:L}"
>-.endfor
>+CFLAGS+=	${PTHREAD_CFLAGS}
>+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
>+SRCCONF=	${NONEXISTENT}
>+MAKE_ENV=	LDADD="${LAPACK} ${BLAS}" LDFLAGS="${LDFLAGS}" \
>+		SRCCONF="${SRCCONF}"
> 
> .if !defined(NOPORTDOCS)
> PORTDOCS=	README.txt
>@@ -63,8 +64,17 @@
> 	lib/liblevmar.so \
> 	lib/liblevmar.so.2
> 
>-.if !(defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE))
>+.if defined(WITH_PROFILE)
>+.if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
>+IGNORE =	you have defined WITH_PROFILE, but have also defined\
>+WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
>+.elif !exists(/usr/lib/libc_p.a)
>+IGNORE	=	you have chosen WITH_PROFILE, but have not installed the\
>+base system profiling libraries
>+.endif
> PLIST_FILES+=	lib/liblevmar_p.a
>+.else
>+MAKE_ENV+=	NO_PROFILE=
> .endif
> 
> post-extract:
>@@ -73,7 +83,7 @@
> 	@${CP} ${FILESDIR}/Makefile.demo ${WRKSRC}/
> 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g' \
> 		-e 's+%%CFLAGS%%+${CFLAGS} -I${LOCALBASE}/include+g' \
>-		-e 's+%%LDFLAGS%%+${LDFLAGS} -L${LOCALBASE}/lib+g' \
>+		-e 's+%%LDFLAGS%%+${LDFLAGS}+g' \
> 		-e 's+%%BLAS%%+${BLAS}+g' \
> 		-e 's+%%LAPACK%%+${LAPACK}+g' \
> 			${WRKSRC}/Makefile.demo
>@@ -88,4 +98,9 @@
> 	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR})
> .endif
> 
>+test check: install
>+	@( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.demo \
>+	${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} )
>+	${WRKSRC}/lmdemo
>+
> .include <bsd.port.post.mk>

Actions: View

Attachments on bug 154645: 113112 | 113113 | 113114