Index: math/blas/Makefile =================================================================== --- math/blas/Makefile (revision 541448) +++ math/blas/Makefile (working copy) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= blas -PORTREVISION= 6 MAINTAINER= fortran@FreeBSD.org COMMENT= Basic Linear Algebra Subroutines Index: math/lapack/Makefile =================================================================== --- math/lapack/Makefile (revision 541448) +++ math/lapack/Makefile (working copy) @@ -2,224 +2,170 @@ # $FreeBSD$ PORTNAME?= lapack -PORTVERSION= 3.5.0 -PORTREVISION?= 8 # Never remove this line, keep PORTREVISION?=0 in case. +PORTVERSION= 3.9.0 +PORTREVISION?= 0 # Never remove this line, keep PORTREVISION?=0 in case. CATEGORIES= math MASTER_SITES= NL/lapack/ -DISTFILES= lapack-${PORTVERSION}.tgz +DISTFILES= v${PORTVERSION}${EXTRACT_SUFX} .if make(makesum) || !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT)) -DISTFILES+= manpages-${PORTVERSION}.tgz +DISTFILES+= manpages.tgz .endif DIST_SUBDIR= lapack MAINTAINER?= fortran@FreeBSD.org -COMMENT?= Library of Fortran 77 subroutines for linear algebra +COMMENT?= Linear Algebra PACKage LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE -USES= fortran +USES= cmake fortran +WRKSRC= ${WRKDIR}/lapack-${PORTVERSION} +# The actual math/scilab needs deprecated functions - to be removed later +CMAKE_ON= BUILD_SHARED_LIBS BUILD_DEPRECATED +USE_LDCONFIG= yes -OPTIONS_DEFINE= PROFILE SHARED STATIC -OPTIONS_DEFAULT= SHARED STATIC -PROFILE_DESC= Build profiling libraries -SHARED_DESC= Build shared libraries and PIC archives -STATIC_DESC= Build (non-PIC) archives +SVERSION= ${PORTVERSION:R:R} +PLIST_SUB= SVERSION="${SVERSION}" VER=${PORTVERSION} -MAKE_ENV= BLASLIB="${BLASLIB}" -FFLAGS+= -std=legacy -PLIST_SUB= SVERSION="${SVERSION}" - -WRKSRC= ${WRKDIR}/lapack-${PORTVERSION} -WRKSRC_PROFILE= ${WRKSRC}_PROFILE -WRKSRC_SHARED= ${WRKSRC}_SHARED -WRKSRC_STATIC= ${WRKSRC} - .include +.include .if defined(BLAS_SLAVEPORT) -ALL_TARGET= blaslib -BLASLIB= ../../libblas.a +BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/BLAS/SRC +INSTALL_WRKSRC= ${BUILD_WRKSRC} +BLASLIB= libblas.a LIBS= blas -PLIST_SUB+= BLAS="" LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment " -SVERSION= 2 -TEST_TARGET= blas_testing +PLIST_SUB+= BLAS="" CBLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment " +.elif defined(CBLAS_SLAVEPORT) +BUILD_DEPENDS+= lapack>0:math/lapack +LIB_DEPENDS+= libblas.so:math/blas +CMAKE_ON+= CBLAS +BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/CBLAS +INSTALL_WRKSRC= ${BUILD_WRKSRC} +CBLASLIB= libcblas.a +LIBS= cblas +PLIST_SUB+= BLAS="@comment " CBLAS="" LAPACK="@comment " XLAPACK="@comment " LAPACKE="@comment " .elif defined(LAPACKE_SLAVEPORT) -ALL_TARGET= lapackelib +USES+= blaslapack +CMAKE_ON+= USE_OPTIMIZED_BLAS USE_OPTIMIZED_LAPACK LAPACKE +CMAKE_ARGS+= -DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so" \ + -DLAPACK_LIBRARIES="${LOCALBASE}/lib/liblapack.so" +BUILD_WRKSRC= ${CONFIGURE_WRKSRC}/LAPACKE +INSTALL_WRKSRC= ${BUILD_WRKSRC} LAPACKELIB= liblapacke.a -LAPACKETMGLIB= liblapacke_tmg.a -MAKE_ENV+= LAPACKELIB="${LAPACKELIB}" LAPACKETMGLIB="${LAPACKETMGLIB}" -LIB_DEPENDS+= libblas.so:math/blas \ - liblapack.so:math/lapack -LIBS= lapacke lapacke_tmg -INCLS= lapacke lapacke_utils lapacke_mangling -PLIST_SUB+= BLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE="" -SVERSION= 1 -.else -ALL_TARGET= lib -BLASLIB?= -L${LOCALBASE}/lib -lblas +PLIST_SUB+= BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="@comment " LAPACKE="" +.elif defined(XLAPACK_SLAVEPORT) +BUILD_DEPENDS+= lapack>0:math/lapack LIB_DEPENDS+= libblas.so:math/blas -LIBS= lapack tmglib -SVERSION= 4 -TEST_TARGET= lapack_testing -.if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING) -S= ${PYTHON_CMD} -USES+= python:build -.else -S= \# -.endif -.if defined(XLAPACK_SLAVEPORT) LIB_DEPENDS+= libxblas.so:math/xblas -MAKE_ENV+= USEXBLAS=yes XBLASLIB="${XBLASLIB}" -P= x -PLIST_SUB+= BLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment " -XBLASLIB?= -L${LOCALBASE}/lib -lxblas +CMAKE_ON+= USE_OPTIMIZED_BLAS USE_XBLAS BUILD_TESTING +CMAKE_ARGS+= -DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so" +PLIST_SUB+= BLAS="@comment " CBLAS="@comment " LAPACK="@comment " XLAPACK="" LAPACKE="@comment " .else +# Upstream recommand to use an optimized BLAS, but it would cause conflicts +# among the dependencies: for an optimized lapack switch to OpenBLAS. +# BUILD_TESTING to get tmglib. +LIB_DEPENDS+= libblas.so:math/blas +. if defined(MAINTAINER_MODE) +USES+= python:3.6+,build,test +. endif +CMAKE_ON+= USE_OPTIMIZED_BLAS BUILD_TESTING +CMAKE_ARGS+= -DBLAS_LIBRARIES="${LOCALBASE}/lib/libblas.so" +LIBS= lapack PLIST_FILES+= ${MAN3L:S|^|man/man3/|:S|$|.gz|} -PLIST_SUB+= BLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment " -.if defined(MAINTAINER_MODE) -BUILD_DEPENDS += doxygen:devel/doxygen -MAN_TARGET= build-manpages +PLIST_SUB+= BLAS="@comment " CBLAS="@comment " LAPACK="" XLAPACK="@comment " LAPACKE="@comment " .endif -.endif -.endif -.if ${ARCH} == "sparc64" -PICFLAG?= -fPIC -.else -PICFLAG?= -fpic -.endif +.include -FFLAGS_PROFILE?= -pg -FFLAGS_SHARED ?= ${PICFLAG} - -.if ${PORT_OPTIONS:MPROFILE} -LDFLAGS+= -static -.endif - -.if ${PORT_OPTIONS:MPROFILE} && !exists(/usr/lib/libc_p.a) -IGNORE= you have chosen WITH_PROFILE, but have not installed the\ -base system profiling libraries -.endif - -.if ${PORT_OPTIONS:MSHARED} -USE_LDCONFIG= yes -.endif - -.for o in PROFILE SHARED STATIC -.if ${PORT_OPTIONS:M${o}} -PLIST_SUB+= ${o}="" -.else -PLIST_SUB+= ${o}="@comment " -.endif -.endfor - -post-patch: - @${SED} -Ee '\ +pre-configure: + ${SED} -Ee '\ s@^(FORTRAN|LOADER)([[:blank:]]*=)(.*)@\1\2 $${FC}@; \ s@^(OPTS[[:blank:]]*=)(.*)@\1 $${FFLAGS} $${EXTRAFLAGS}@; \ s@^NOOPT[[:blank:]]*=.*@& $${EXTRAFLAGS}@; \ s@^(LOADOPTS[[:blank:]]*=)(.*)@\1 $${LDFLAGS} $${EXTRAFLAGS}@; \ s@^(CC[[:blank:]]*=)(.*)@@; \ + s@^(FC[[:blank:]]*=)(.*)@@; \ s@^(CFLAGS[[:blank:]]*)(=)(.*)@\1 += $${EXTRAFLAGS}@; \ + s@^(FFLAGS[[:blank:]]*=)(.*)@@; \ + s@^(LDFLAGS[[:blank:]]*=)(.*)@@; \ \@(BLAS|LAPACKE|RAN)LIB[[:blank:]]*=@d;' \ ${WRKSRC}/make.inc.example > ${WRKSRC}/make.inc - @${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \ + ${REINPLACE_CMD} -e 's@\./lapack_testing\.py@${S} &@' \ ${WRKSRC}/Makefile -.for o in PROFILE SHARED -.if ${PORT_OPTIONS:M${o}} - @${CP} -a ${WRKSRC} ${WRKSRC_${o}} + ${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ + ${SED} -i ".bak" -e 's|^ifdef|.ifdef|;s|^endif|.endif|' +.if defined(MAINTAINER_MODE) + ${REINPLACE_CMD} -e 's|PythonInterp 2.7|PythonInterp ${PYTHON_VER}|' \ + ${WRKSRC}/CMakeLists.txt .endif -.endfor -do-build: ${MAN_TARGET} build-profile build-shared build-static - -.for o in PROFILE SHARED STATIC -build-${o:tl}: patch -.if ${PORT_OPTIONS:M${o}} - ${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n" - cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \ - ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${ALL_TARGET} - -.endif -.endfor - -.if defined (MAINTAINER_MODE) -build-manpages: patch - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} man - -.endif - post-build: -.if ${PORT_OPTIONS:MSHARED} -.for L in ${LIBS} - cd ${WRKSRC_SHARED} ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \ - -o lib${P}${L}.so.${SVERSION} -Wl,-x -Wl,-soname,lib${P}${L}.so.${SVERSION} \ - -Wl,--whole-archive lib${L}.a -Wl,--no-whole-archive -.endfor -.endif - -.if ${PORT_OPTIONS:MSHARED} -TESTS ?= test-shared -.elif ${PORT_OPTIONS:MSTATIC} -TESTS ?= test-static -.elif ${PORT_OPTIONS:MPROFILE} -TESTS ?= test-profile -.endif - -.if !defined(LAPACKE_SLAVEPORT) -check regression-test test: ${TESTS} -.for o in PROFILE SHARED STATIC -test-${o:tl}: build-${o:tl} -.if ${PORT_OPTIONS:M${o}} - @${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n" - @cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FFLAGS_${o}}" \ - ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ARCH="${AR}" ${TEST_TARGET} .if defined(BLAS_SLAVEPORT) - @${CAT} ${WRKSRC_${o}}/BLAS/*.out + ${SED} -e 's|%%LIB%%|blas|g;s|cd SRC|cd BLAS/SRC|' ${FILESDIR}/static.mk \ + >> ${BUILD_WRKSRC}/CMakeFiles/blas.dir/build.make + (cd ${CONFIGURE_WRKSRC} && ${MAKE} -f BLAS/SRC/CMakeFiles/blas.dir/build.make build-static) +.elif defined(CBLAS_SLAVEPORT) + ${SED} -e 's|%%LIB%%|cblas|g;s|cd SRC|cd CBLAS/src|' ${FILESDIR}/static.mk \ + >> ${BUILD_WRKSRC}/src/CMakeFiles/cblas.dir/build.make + (cd ${CONFIGURE_WRKSRC} && ${MAKE} -f CBLAS/src/CMakeFiles/cblas.dir/build.make build-static) +.elif defined(LAPACKE_SLAVEPORT) + ${SED} -e 's|%%LIB%%|lapacke|g;s|cd SRC|cd LAPACKE|' ${FILESDIR}/static.mk \ + >> ${BUILD_WRKSRC}/CMakeFiles/lapacke.dir/build.make + (cd ${CONFIGURE_WRKSRC} && ${MAKE} -f LAPACKE/CMakeFiles/lapacke.dir/build.make build-static) +.else # xlapack + Lapack + tmglib + ${SED} -e 's|%%LIB%%|lapack|g' ${FILESDIR}/static.mk \ + >> ${BUILD_WRKSRC}/SRC/CMakeFiles/lapack.dir/build.make + (cd ${CONFIGURE_WRKSRC} && ${MAKE} -f SRC/CMakeFiles/lapack.dir/build.make build-static) + ${SED} -e 's|%%LIB%%|tmglib|g;s|cd SRC|cd TESTING/MATGEN|' ${FILESDIR}/static.mk \ + >> ${BUILD_WRKSRC}/TESTING/MATGEN/CMakeFiles/tmglib.dir/build.make + (cd ${BUILD_WRKSRC} && ${MAKE} -f TESTING/MATGEN/CMakeFiles/tmglib.dir/build.make build-static) .endif -.endif -.endfor -.endif -do-install: -.for L in ${LIBS} -.if ${PORT_OPTIONS:MSTATIC} - @${INSTALL_DATA} ${WRKSRC}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.a -.endif -.if ${PORT_OPTIONS:MSHARED} - @${INSTALL_DATA} ${WRKSRC_SHARED}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_pic.a - @${INSTALL_DATA} ${WRKSRC_SHARED}/lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib - @${LN} -sf lib${P}${L}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/lib${P}${L}.so -.endif -.if ${PORT_OPTIONS:MPROFILE} - @${INSTALL_DATA} ${WRKSRC_PROFILE}/lib${L}.a ${STAGEDIR}${PREFIX}/lib/lib${P}${L}_p.a -.endif -.endfor -.if defined(LAPACKE_SLAVEPORT) -.for I in ${INCLS} - @${INSTALL_DATA} ${WRKSRC}/lapacke/include/${I}.h ${STAGEDIR}${PREFIX}/include -.endfor -.endif - -.include - -.if !(defined(BLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT)) - .include "${FILESDIR}/manpages" post-install: - @cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3L:S|^|man3/|} \ +.if defined(BLAS_SLAVEPORT) + ${INSTALL_DATA} ${CONFIGURE_WRKSRC}/BLAS/SRC/${BLASLIB} ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${CONFIGURE_WRKSRC}/BLAS/blas.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig +.elif defined(CBLAS_SLAVEPORT) + # Avoid conflict with OpenBLAS + ${MKDIR} ${STAGEDIR}${PREFIX}/include/cblas + ${MV} ${STAGEDIR}${PREFIX}/include/*.h ${STAGEDIR}${PREFIX}/include/cblas/ + ${INSTALL_DATA} ${BUILD_WRKSRC}/src/${CBLASLIB} ${STAGEDIR}${PREFIX}/lib +.elif defined(LAPACKE_SLAVEPORT) + # Avoid conflict with OpenBLAS + ${MKDIR} ${STAGEDIR}${PREFIX}/include/lapacke + ${MV} ${STAGEDIR}${PREFIX}/include/*.h ${STAGEDIR}${PREFIX}/include/lapacke/ + ${INSTALL_DATA} ${CONFIGURE_WRKSRC}/LAPACKE/${LAPACKELIB} ${STAGEDIR}${PREFIX}/lib +.elif defined(XLAPACK_SLAVEPORT) + ${INSTALL_DATA} ${BUILD_WRKSRC}/SRC/liblapack.a ${STAGEDIR}${PREFIX}/lib/libxlapack.a + ${INSTALL_DATA} ${BUILD_WRKSRC}/TESTING/MATGEN/libtmglib.a \ + ${STAGEDIR}${PREFIX}/lib/libxtmglib.a + ${MV} ${STAGEDIR}${PREFIX}/lib/liblapack.so \ + ${STAGEDIR}${PREFIX}/lib/libxlapack.so.${PORTVERSION} + ${LN} -sf libxlapack.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libxlapack.so + ${LN} -sf libxlapack.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libxlapack.so.${SVERSION} + ${MV} ${STAGEDIR}${PREFIX}/lib/libtmglib.so \ + ${STAGEDIR}${PREFIX}/lib/libxtmglib.so.${PORTVERSION} + ${LN} -sf libxtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libxtmglib.so + ${LN} -sf libxtmglib.so.${PORTVERSION} \ + ${STAGEDIR}${PREFIX}/lib/libxtmglib.so.${SVERSION} + ${SED} -e 's|lapack|xlapack|g;s|LAPACK|XLAPACK|' \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc \ + > ${STAGEDIR}${PREFIX}/libdata/pkgconfig/xlapack.pc + ${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/lapack.pc +.else # Lapack + ${INSTALL_DATA} ${BUILD_WRKSRC}/SRC/liblapack.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${BUILD_WRKSRC}/TESTING/MATGEN/libtmglib.a ${STAGEDIR}${PREFIX}/lib + ${MV} ${STAGEDIR}${PREFIX}/lib/libtmglib.so \ + ${STAGEDIR}${PREFIX}/lib/libtmglib.so.${PORTVERSION} + ${LN} -sf libtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtmglib.so + ${LN} -sf libtmglib.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtmglib.so.${SVERSION} +.endif +.if !(defined(BLAS_SLAVEPORT) || defined(CBLAS_SLAVEPORT) || defined(XLAPACK_SLAVEPORT) || defined(LAPACKE_SLAVEPORT)) + cd ${WRKDIR}/man ; ${ECHO_CMD} ${MAN3L:S|^|man3/|} \ | ${XARGS} -J @ ${INSTALL_MAN} @ ${STAGEDIR}${MAN3PREFIX}/man/man3 +.endif -.if defined(MAINTAINER_MODE) -package-manpages: build-manpages - @${RM} ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz ; \ - cd ${WRKSRC}/DOCS/man; \ - ${TAR} -czvf ${WRKDIR}/lapack-manpages-${PORTVERSION}.tar.gz \ - ${MAN3L:S|^|man3/|} - -.endif -.endif .include Index: math/lapack/distinfo =================================================================== --- math/lapack/distinfo (revision 541448) +++ math/lapack/distinfo (working copy) @@ -1,4 +1,5 @@ -SHA256 (lapack/lapack-3.5.0.tgz) = 9ad8f0d3f3fb5521db49f2dd716463b8fb2b6bc9dc386a9956b8c6144f726352 -SIZE (lapack/lapack-3.5.0.tgz) = 6313139 -SHA256 (lapack/manpages-3.5.0.tgz) = 055da7402ea807cc16f6c50b71ac63d290f83a5f2885aa9f679b7ad11dd8903d -SIZE (lapack/manpages-3.5.0.tgz) = 1394730 +TIMESTAMP = 1592857098 +SHA256 (lapack/v3.9.0.tar.gz) = 106087f1bb5f46afdfba7f569d0cbe23dacb9a07cd24733765a0e89dbe1ad573 +SIZE (lapack/v3.9.0.tar.gz) = 7534567 +SHA256 (lapack/manpages.tgz) = 65181ed22a87cde3cfee3bc9e4135434e3ee9f5fc5651a37c0ca4e4b737254de +SIZE (lapack/manpages.tgz) = 1378304 Index: math/lapack/pkg-descr =================================================================== --- math/lapack/pkg-descr (revision 541448) +++ math/lapack/pkg-descr (working copy) @@ -8,3 +8,4 @@ http://www.netlib.org/lapack/lug/ WWW: http://www.netlib.org/lapack/ +WWW: https://github.com/Reference-LAPACK/lapack Index: math/lapack/pkg-plist =================================================================== --- math/lapack/pkg-plist (revision 541448) +++ math/lapack/pkg-plist (working copy) @@ -1,38 +1,54 @@ -%%BLAS%%%%STATIC%%lib/libblas.a -%%BLAS%%%%SHARED%%lib/libblas_pic.a -%%BLAS%%%%SHARED%%lib/libblas.so -%%BLAS%%%%SHARED%%lib/libblas.so.%%SVERSION%% -%%BLAS%%%%PROFILE%%lib/libblas_p.a -%%LAPACK%%%%STATIC%%lib/liblapack.a -%%LAPACK%%%%SHARED%%lib/liblapack_pic.a -%%LAPACK%%%%SHARED%%lib/liblapack.so -%%LAPACK%%%%SHARED%%lib/liblapack.so.%%SVERSION%% -%%LAPACK%%%%PROFILE%%lib/liblapack_p.a -%%LAPACK%%%%STATIC%%lib/libtmglib.a -%%LAPACK%%%%SHARED%%lib/libtmglib_pic.a -%%LAPACK%%%%SHARED%%lib/libtmglib.so -%%LAPACK%%%%SHARED%%lib/libtmglib.so.%%SVERSION%% -%%LAPACK%%%%PROFILE%%lib/libtmglib_p.a -%%XLAPACK%%%%STATIC%%lib/libxlapack.a -%%XLAPACK%%%%SHARED%%lib/libxlapack_pic.a -%%XLAPACK%%%%SHARED%%lib/libxlapack.so -%%XLAPACK%%%%SHARED%%lib/libxlapack.so.%%SVERSION%% -%%XLAPACK%%%%PROFILE%%lib/libxlapack_p.a -%%XLAPACK%%%%STATIC%%lib/libxtmglib.a -%%XLAPACK%%%%SHARED%%lib/libxtmglib_pic.a -%%XLAPACK%%%%SHARED%%lib/libxtmglib.so -%%XLAPACK%%%%SHARED%%lib/libxtmglib.so.%%SVERSION%% -%%XLAPACK%%%%PROFILE%%lib/libxtmglib_p.a -%%LAPACKE%%include/lapacke.h -%%LAPACKE%%include/lapacke_utils.h -%%LAPACKE%%include/lapacke_mangling.h -%%LAPACKE%%%%STATIC%%lib/liblapacke.a -%%LAPACKE%%%%SHARED%%lib/liblapacke_pic.a -%%LAPACKE%%%%SHARED%%lib/liblapacke.so -%%LAPACKE%%%%SHARED%%lib/liblapacke.so.%%SVERSION%% -%%LAPACKE%%%%PROFILE%%lib/liblapacke_p.a -%%LAPACKE%%%%STATIC%%lib/liblapacke_tmg.a -%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg_pic.a -%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg.so -%%LAPACKE%%%%SHARED%%lib/liblapacke_tmg.so.%%SVERSION%% -%%LAPACKE%%%%PROFILE%%lib/liblapacke_tmg_p.a +%%CBLAS%%include/cblas/cblas.h +%%CBLAS%%include/cblas/cblas_f77.h +%%CBLAS%%include/cblas/cblas_mangling.h +%%CBLAS%%include/cblas/cblas_test.h +%%LAPACKE%%include/lapacke/lapack.h +%%LAPACKE%%include/lapacke/lapacke.h +%%LAPACKE%%include/lapacke/lapacke_config.h +%%LAPACKE%%include/lapacke/lapacke_mangling.h +%%LAPACKE%%include/lapacke/lapacke_utils.h +%%BLAS%%lib/libblas.a +%%BLAS%%lib/libblas.so +%%BLAS%%lib/libblas.so.%%SVERSION%% +%%BLAS%%lib/libblas.so.%%VER%% +%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-config-version.cmake +%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-config.cmake +%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-targets-%%CMAKE_BUILD_TYPE%%.cmake +%%CBLAS%%lib/cmake/cblas-%%VER%%/cblas-targets.cmake +%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-config-version.cmake +%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-config.cmake +%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-targets-%%CMAKE_BUILD_TYPE%%.cmake +%%LAPACK%%lib/cmake/lapack-%%VER%%/lapack-targets.cmake +%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-config-version.cmake +%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-config.cmake +%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-targets-%%CMAKE_BUILD_TYPE%%.cmake +%%LAPACKE%%lib/cmake/lapacke-%%VER%%/lapacke-targets.cmake +%%CBLAS%%lib/libcblas.a +%%CBLAS%%lib/libcblas.so +%%CBLAS%%lib/libcblas.so.%%SVERSION%% +%%CBLAS%%lib/libcblas.so.%%VER%% +%%LAPACK%%lib/liblapack.a +%%LAPACK%%lib/liblapack.so +%%LAPACK%%lib/liblapack.so.%%SVERSION%% +%%LAPACK%%lib/liblapack.so.%%VER%% +%%LAPACK%%lib/libtmglib.a +%%LAPACK%%lib/libtmglib.so +%%LAPACK%%lib/libtmglib.so.%%SVERSION%% +%%LAPACK%%lib/libtmglib.so.%%VER%% +%%XLAPACK%%lib/libxlapack.a +%%XLAPACK%%lib/libxlapack.so +%%XLAPACK%%lib/libxlapack.so.%%SVERSION%% +%%XLAPACK%%lib/libxlapack.so.%%VER%% +%%XLAPACK%%lib/libxtmglib.a +%%XLAPACK%%lib/libxtmglib.so +%%XLAPACK%%lib/libxtmglib.so.%%SVERSION%% +%%XLAPACK%%lib/libxtmglib.so.%%VER%% +%%LAPACKE%%lib/liblapacke.a +%%LAPACKE%%lib/liblapacke.so +%%LAPACKE%%lib/liblapacke.so.%%SVERSION%% +%%LAPACKE%%lib/liblapacke.so.%%VER%% +%%BLAS%%libdata/pkgconfig/blas.pc +%%CBLAS%%libdata/pkgconfig/cblas.pc +%%LAPACK%%libdata/pkgconfig/lapack.pc +%%LAPACKE%%libdata/pkgconfig/lapacke.pc +%%XLAPACK%%libdata/pkgconfig/xlapack.pc Index: math/xlapack/Makefile =================================================================== --- math/xlapack/Makefile (revision 541448) +++ math/xlapack/Makefile (working copy) @@ -2,7 +2,6 @@ # $FreeBSD$ PORTNAME= xlapack -PORTREVISION= 6 MAINTAINER= fortran@FreeBSD.org COMMENT= Extended Precision LAPACK Index: math/cblas/Makefile =================================================================== --- math/cblas/Makefile (revision 541448) +++ math/cblas/Makefile (working copy) @@ -2,136 +2,13 @@ # $FreeBSD$ PORTNAME= cblas -PORTVERSION= 1.0 -PORTREVISION= 12 -CATEGORIES= math -MASTER_SITES= NL/blas/blast-forum/ LOCAL/bf -DISTFILES= cblas.tgz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fortran@FreeBSD.org COMMENT= Reference implementation of the C interface to the legacy Fortran BLAS -LICENSE= BLAS -LICENSE_NAME= BLAS License -LICENSE_TEXT= http://www.netlib.org/blas/#_licensing -LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell +DESCR= ${.CURDIR}/pkg-descr +CBLAS_SLAVEPORT= yes -USES= fortran +MASTERDIR= ${.CURDIR}/../lapack -CONFLICTS_INSTALL= atlas-[0-9]* atlas-devel-[0-9]* - -OPTIONS_DEFINE= PROFILE SHARED STATIC DOCS -OPTIONS_DEFAULT= SHARED STATIC -PROFILE_DESC= Build profiling libraries -SHARED_DESC= Build shared libraries and PIC archives -STATIC_DESC= Build (non-PIC) archives - -PLIST_FILES= include/cblas.h include/cblas_f77.h -PLIST_SUB= SVERSION="${SVERSION}" - -SVERSION= 2 - -WRKSRC= ${WRKDIR}/CBLAS -WRKSRC_PROFILE= ${WRKSRC}_PROFILE -WRKSRC_SHARED= ${WRKSRC}_SHARED -WRKSRC_STATIC= ${WRKSRC} - -.include - -.if make(makesum) || ${PORT_OPTIONS:MDOCS} -DISTFILES+= blas-report.pdf -EXTRACT_ONLY= cblas.tgz -.endif - -MANGLING?= -DADD_ -CFLAGS+= ${MANGLING} - -.if ${ARCH} == "sparc64" -PICFLAG?= -fPIC -.else -PICFLAG?= -fpic -.endif - -FLAGS_PROFILE?= -pg -FLAGS_SHARED ?= ${PICFLAG} - -.if ${PORT_OPTIONS:MSHARED} -PLIST_FILES+= lib/libcblas_pic.a lib/libcblas.so lib/libcblas.so.${SVERSION} -TESTS ?= test-shared -USE_LDCONFIG= yes -.endif -.if ${PORT_OPTIONS:MSTATIC} -PLIST_FILES+= lib/libcblas.a -TESTS ?= test-static -.endif -.if ${PORT_OPTIONS:MPROFILE} -PLIST_FILES+= lib/libcblas_p.a -TESTS ?= test-profile -.endif - -post-patch: - @${SED} -Ee '\@^CBLIB[[:blank:]]*=@s@cblas.*\.a@libcblas.a@; \ - \@^((BL|RAN)LIB|CC|FC)[[:blank:]]*=@d; \ - \@^((C|F)FLAGS)[[:blank:]]*=@s@=.*@+= $${EXTRAFLAGS}@; \ - \@^LOADER@{x; s|^|LOADFLAGS = $${LDFLAGS} $${EXTRAFLAGS}|; G;};' \ - ${WRKSRC}/Makefile.LINUX > ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's@$$(ARCH)@$$(AR)@' ${WRKSRC}/src/Makefile -.for o in PROFILE SHARED -.if ${PORT_OPTIONS:M${o}} - @${CP} -a ${WRKSRC} ${WRKSRC_${o}} -.endif -.endfor - -do-build: build-profile build-shared build-static - -.for o in PROFILE SHARED STATIC -build-${o:tl}: patch -.if ${PORT_OPTIONS:M${o}} - @${PRINTF} "\n\nBuilding ${o:tl} libraries:\n\n\n" - @cd ${WRKSRC_${o}}/src; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \ - ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all - -.endif -.endfor - -post-build: -.if ${PORT_OPTIONS:MSHARED} - cd ${WRKSRC_SHARED}/lib ; ${FC} ${FFLAGS} ${FFLAGS_SHARED} ${LDFLAGS} -shared \ - -o libcblas.so.${SVERSION} -Wl,-x -Wl,-soname,libcblas.so.${SVERSION} \ - -Wl,--whole-archive libcblas.a -Wl,--no-whole-archive -.endif - -.if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING) -BLAS?= -L${LOCALBASE}/lib -lblas -BUILD_DEPENDS += ${LOCALBASE}/lib/libblas.so:math/blas -MAKE_ENV+= BLLIB="${BLAS}" - -check regression-test test: ${TESTS} - -.for o in PROFILE SHARED STATIC -test-${o:tl}: build-${o:tl} -.if ${PORT_OPTIONS:M${o}} - @${PRINTF} "\n\nTesting ${o:tl} libraries:\n\n\n" - @cd ${WRKSRC_${o}}/testing; ${SETENV} ${MAKE_ENV} EXTRAFLAGS="${FLAGS_${o}}" \ - ${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} all run - @${CAT} ${WRKSRC_${o}}/testing/*.out - -.endif -.endfor -.endif - -do-install: - @${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include -.if ${PORT_OPTIONS:MSTATIC} - @${INSTALL_DATA} ${WRKSRC}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib -.endif -.if ${PORT_OPTIONS:MSHARED} - @${INSTALL_DATA} ${WRKSRC_SHARED}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_pic.a - @${INSTALL_LIB} ${WRKSRC_SHARED}/lib/libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib - @${LN} -sf libcblas.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/libcblas.so -.endif -.if ${PORT_OPTIONS:MPROFILE} - @${INSTALL_DATA} ${WRKSRC_PROFILE}/lib/libcblas.a ${STAGEDIR}${PREFIX}/lib/libcblas_p.a -.endif - -.include +.include "${MASTERDIR}/Makefile" Index: math/cblas/distinfo =================================================================== --- math/cblas/distinfo (revision 541448) +++ math/cblas/distinfo (working copy) @@ -1,4 +0,0 @@ -SHA256 (cblas.tgz) = 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a2a3 -SIZE (cblas.tgz) = 197468 -SHA256 (blas-report.pdf) = 7874962ae4dc753fcdd483ff0c69931227846632251f79a68f4f879348f321a6 -SIZE (blas-report.pdf) = 2412966 Index: math/openblas/Makefile =================================================================== --- math/openblas/Makefile (revision 541448) +++ math/openblas/Makefile (working copy) @@ -24,8 +24,6 @@ USES= fortran gmake perl5 pkgconfig -CONFLICTS_INSTALL= cblas lapacke - USE_GITHUB= yes GH_ACCOUNT= xianyi GH_PROJECT= OpenBLAS Index: science/py-phono3py/Makefile =================================================================== --- science/py-phono3py/Makefile (revision 541448) +++ science/py-phono3py/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= phono3py DISTVERSION= 1.13.3.27 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +18,7 @@ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}phonopy>=1.13.2:science/py-phonopy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${LOCALBASE}/include/lapacke.h:math/lapacke + ${LOCALBASE}/include/lapacke/lapacke.h:math/lapacke RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}h5py>0:science/py-h5py@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \