svn commit: r358577 - in head/math/lapacke: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Fri Jun 20 14:32:10 2014
New Revision: 358577
URL: http://svnweb.freebsd.org/changeset/ports/358577
QAT: https://qat.redports.org/buildarchive/r358577/

Log:
  Update to 3.4.2.
  
  Includes staging support and updates to the LIB_DEPENDS syntax.
  
  PR:		191060
  Submitted by:	phd_kimberlite at yahoo.co.jp (maintainer)

Deleted:
  head/math/lapacke/files/patch-include+lapacke.h
  head/math/lapacke/files/patch-make.inc
  head/math/lapacke/files/patch-testing+Makefile
  head/math/lapacke/files/patch-testing+interface+Makefile
Modified:
  head/math/lapacke/Makefile
  head/math/lapacke/distinfo
  head/math/lapacke/files/Makefile.lib

Modified: head/math/lapacke/Makefile
==============================================================================
--- head/math/lapacke/Makefile	Fri Jun 20 14:28:51 2014	(r358576)
+++ head/math/lapacke/Makefile	Fri Jun 20 14:32:10 2014	(r358577)
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	lapacke
-PORTVERSION=	3.4.0
-PORTREVISION=	2
+PORTVERSION=	3.4.2
 CATEGORIES=	math
 MASTER_SITES=	NL
 MASTER_SITE_SUBDIR=	lapack
 DISTNAME=	lapack-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tgz lapacke.tgz
+EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	lapack
 
 MAINTAINER=	phd_kimberlite at yahoo.co.jp
@@ -24,8 +23,7 @@ OPTIONS_DEFINE=	PROFILE XLAPACKE
 PROFILE_DESC=	Build a profiling library
 XLAPACKE_DESC=	Install interfaces to XLAPACK
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 LAPACKE_SVERSION=	1
 LAPACKE_LIBNAME=	lapacke
@@ -50,25 +48,25 @@ 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}
-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}
-LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	libatlas.so:${PORTSDIR}/math/atlas
 BLAS=		-lptf77blas
 LAPACK=		-lalapack -lptcblas
 .endif
 .if ${PORT_OPTIONS:MXLAPACKE}
-LIB_DEPENDS+=		xlapack.4:${PORTSDIR}/math/xlapack
+LIB_DEPENDS+=		libxlapack.so:${PORTSDIR}/math/xlapack
 .endif
 
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -107,23 +105,12 @@ PLIST_FILES+=	lib/lib${XLAPACKE_LIBNAME}
 MAKE_ENV+=	NO_PROFILE=
 .endif
 
-post-extract:
-	@${CP} -r ${WRKSRC_LEGACY}/testing ${WRKSRC}/.
-
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile*" -type f |\
 		${XARGS} ${REINPLACE_CMD} -e 's;$$(ARCH);$$(ARCH_);g'
-	@${REINPLACE_CMD} -e 's;%%CC%%;${CC};g' \
-			  -e 's;%%CFLAGS%%;${CFLAGS};g' \
-			  -e 's;%%LDFLAGS%%;${LDFLAGS};g' \
-			  -e 's;%%AR%%;${AR};g' \
-			  -e 's;%%RANLIB%%;${RANLIB};g' \
-			  -e 's;%%BLAS%%;${BLAS};g' \
-			  -e 's;%%LAPACK%%;${LAPACK};g' \
-			  -e 's;%%LAPACKE_LIBNAME%%;${LAPACKE_LIBNAME};g' \
-				${WRKSRC}/make.inc
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 	@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
+	@${CP} ${WRKSRC}/include//lapacke_mangling_with_flags.h ${WRKSRC}/include//lapacke_mangling.h
 	@${MKDIR} ${WRKSRC}/lib
 	@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}/lib/Makefile
 	@${MKDIR} ${WRKSRC}/libtmg
@@ -146,15 +133,8 @@ post-patch:
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 .endif
 
-check regression-test test: build
-	@${CP} ${WRKSRC}/lib/lib${LAPACKE_LIBNAME}.a ${WRKSRC}/.
-	@${ECHO_CMD} "Testing static lapacke library"
-	@(cd ${WRKSRC}/testing; ${SETENV} ${MAKE_ENV} \
-	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS})
-	@${CAT} ${WRKSRC}/testing/interface/*.out
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/math/lapacke/distinfo
==============================================================================
--- head/math/lapacke/distinfo	Fri Jun 20 14:28:51 2014	(r358576)
+++ head/math/lapacke/distinfo	Fri Jun 20 14:32:10 2014	(r358577)
@@ -1,4 +1,2 @@
-SHA256 (lapack/lapack-3.4.0.tgz) = a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9
-SIZE (lapack/lapack-3.4.0.tgz) = 6127787
-SHA256 (lapack/lapacke.tgz) = 7f992bd1f143251ddd03b99ef935942c17caf43652ae94a251601e00dce258e3
-SIZE (lapack/lapacke.tgz) = 840233
+SHA256 (lapack/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
+SIZE (lapack/lapack-3.4.2.tgz) = 6168281

Modified: head/math/lapacke/files/Makefile.lib
==============================================================================
--- head/math/lapacke/files/Makefile.lib	Fri Jun 20 14:28:51 2014	(r358576)
+++ head/math/lapacke/files/Makefile.lib	Fri Jun 20 14:32:10 2014	(r358577)
@@ -1119,7 +1119,7 @@ UTILS_SRCS=\
 		lapacke_ztr_nancheck.c lapacke_ztr_trans.c
 
 %%XLAPACKE%%beforeinstall:
-%%XLAPACKE%%	${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke.h ${PREFIX}/include
-%%XLAPACKE%%	${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke_utils.h ${PREFIX}/include
+%%XLAPACKE%%	${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke.h ${DESTDIR}${PREFIX}/include
+%%XLAPACKE%%	${BSD_INSTALL_DATA} ${.CURDIR}/../include/lapacke_utils.h ${DESTDIR}${PREFIX}/include
 
 .include <bsd.lib.mk>