From owner-svn-ports-all@FreeBSD.ORG Fri Jun 20 14:32:11 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24DF23E0; Fri, 20 Jun 2014 14:32:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 04EFA2763; Fri, 20 Jun 2014 14:32:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5KEWAME043054; Fri, 20 Jun 2014 14:32:10 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5KEWAFv043051; Fri, 20 Jun 2014 14:32:10 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201406201432.s5KEWAFv043051@svn.freebsd.org> From: Raphael Kubo da Costa Date: Fri, 20 Jun 2014 14:32:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358577 - in head/math/lapacke: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 14:32:11 -0000 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@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@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 +.include 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 +.include 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