Date: Wed, 9 Oct 2013 03:15:59 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329857 - in head/math/levmar: . files Message-ID: <201310090315.r993Fx0K066002@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Wed Oct 9 03:15:58 2013 New Revision: 329857 URL: http://svnweb.freebsd.org/changeset/ports/329857 Log: - Update to 2.6 [1] - Correction of MASTER_SITES [1] - Add DOCS and EXAMPLES options - Add stage support - Convert LIB_DEPENDS to new syntax PR: ports/182573 Submitted by: Eijiro Shibusawa <phd_kimberlite@yahoo.co.jp> (maintainer) [1] Approved by: wg/culot (mentors, implicit) Modified: head/math/levmar/Makefile head/math/levmar/distinfo head/math/levmar/files/Makefile.lib Modified: head/math/levmar/Makefile ============================================================================== --- head/math/levmar/Makefile Wed Oct 9 03:14:49 2013 (r329856) +++ head/math/levmar/Makefile Wed Oct 9 03:15:58 2013 (r329857) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= levmar -PORTVERSION= 2.5 -PORTREVISION= 3 +PORTVERSION= 2.6 CATEGORIES= math -MASTER_SITES= http://www.ics.forth.gr/~lourakis/levmar/ +MASTER_SITES= http://users.ics.forth.gr/~lourakis/levmar/ EXTRACT_SUFX= .tgz MAINTAINER= phd_kimberlite@yahoo.co.jp @@ -17,10 +16,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USE_LDCONFIG= yes USE_FORTRAN= yes -OPTIONS_DEFINE= PROFILE +OPTIONS_DEFINE= DOCS EXAMPLES PROFILE PROFILE_DESC= Build a profiling library -NO_STAGE= yes .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/lib/libgoto2p.so) @@ -32,30 +30,26 @@ WITH_BLAS?= reference .endif .if ${WITH_BLAS} == "reference" -LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas \ - lapack.4:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ + liblapack.so:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack .elif ${WITH_BLAS} == "gotoblas" CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -LIB_DEPENDS+= goto2p.1:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p .elif ${WITH_BLAS} == "atlas" CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS= -lptf77blas LAPACK= -lalapack -lptcblas .endif -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= README.txt -.endif -.if ${PORT_OPTIONS:MEXAMPLES} PORTEXAMPLES= lmdemo.c Makefile.demo -.endif PLIST_FILES= include/levmar.h \ lib/liblevmar.a \ lib/liblevmar.so \ @@ -86,14 +80,10 @@ post-extract: ${WRKSRC}/Makefile.demo post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}) -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}) test check: install @( cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.demo \ Modified: head/math/levmar/distinfo ============================================================================== --- head/math/levmar/distinfo Wed Oct 9 03:14:49 2013 (r329856) +++ head/math/levmar/distinfo Wed Oct 9 03:15:58 2013 (r329857) @@ -1,2 +1,2 @@ -SHA256 (levmar-2.5.tgz) = b70f6ac3eff30ec29150e217b137312cb84e85529815efea2c12e4eab74b9d75 -SIZE (levmar-2.5.tgz) = 78817 +SHA256 (levmar-2.6.tgz) = 3bf4ef1ea4475ded5315e8d8fc992a725f2e7940a74ca3b0f9029d9e6e94bad7 +SIZE (levmar-2.6.tgz) = 81143 Modified: head/math/levmar/files/Makefile.lib ============================================================================== --- head/math/levmar/files/Makefile.lib Wed Oct 9 03:14:49 2013 (r329856) +++ head/math/levmar/files/Makefile.lib Wed Oct 9 03:15:58 2013 (r329857) @@ -8,6 +8,6 @@ SHLIB_MINOR= 5 SRCS= lm.c Axb.c misc.c lmlec.c lmbc.c lmblec.c lmbleic.c beforeinstall: - ${BSD_INSTALL_DATA} ${.CURDIR}/levmar.h ${PREFIX}/include + ${BSD_INSTALL_DATA} ${.CURDIR}/levmar.h ${DESTDIR}${PREFIX}/include .include <bsd.lib.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310090315.r993Fx0K066002>