git: 234c241636b1 - main - math/librsb: Update to 1.3.0.0.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Feb 2022 02:49:11 UTC
The branch main has been updated by stephen:
URL: https://cgit.FreeBSD.org/ports/commit/?id=234c241636b1d1d3887fcf52cdaf53602f3d05ca
commit 234c241636b1d1d3887fcf52cdaf53602f3d05ca
Author: Stephen Montgomery-Smith <stephen@FreeBSD.org>
AuthorDate: 2022-02-01 02:47:58 +0000
Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org>
CommitDate: 2022-02-01 02:47:58 +0000
math/librsb: Update to 1.3.0.0.
Thanks to Michele Martone <michelemartone@users.sourceforge.net> for
the patch.
---
math/librsb/Makefile | 18 ++++-----
math/librsb/distinfo | 6 +--
math/librsb/files/patch-rsblib_configure | 50 +++++++++++++++++++++++
math/librsb/pkg-plist | 69 ++++++++++++++++++++++++++++++--
4 files changed, 127 insertions(+), 16 deletions(-)
diff --git a/math/librsb/Makefile b/math/librsb/Makefile
index f1049f93b4c7..5f45ace1e68e 100644
--- a/math/librsb/Makefile
+++ b/math/librsb/Makefile
@@ -1,7 +1,7 @@
# Created by: stephen@FreeBSD.org
PORTNAME= librsb
-PORTVERSION= 1.2.0.11
+PORTVERSION= 1.3.0.0
CATEGORIES= math
MASTER_SITES= SF/librsb
DISTNAME= ${PORTNAME}-${PORTVERSION:S/r/-rc/}
@@ -15,17 +15,13 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gsed:textproc/gsed \
bash:shells/bash
-USES= fortran gmake shebangfix libtool
-USE_GCC= yes
+USES= fortran gmake libtool shebangfix
INSTALL_TARGET= install-strip
TEST_TARGET= qtests
GNU_CONFIGURE= yes
-CFLAGS+= -fPIC
-CONFIGURE_ARGS= --enable-fortran-module-install \
- --enable-matrix-types="double, double complex"
-CONFIGURE_ENV= CFLAGS= SPCFLAGS="${CFLAGS}"
-SHEBANG_FILES= scripts/*.sh examples/make.sh.in
USE_LDCONFIG= yes
+LDFLAGS+= -lthr
+SHEBANG_FILES= *.sh */*.sh
OPTIONS_DEFINE= DOCS OPTIMIZE
@@ -33,10 +29,14 @@ OPTIMIZE_DESC= Optimize for the local machine
OPTIMIZE_CONFIGURE_ENV= SPCFLAGS="${CFLAGS:N-O*}"
post-patch:
- @${REINPLACE_CMD} -E s/sed/gsed/g ${WRKSRC}/scripts/*.sh
+ @${REINPLACE_CMD} -E s/sed/gsed/g ${WRKSRC}/*.sh ${WRKSRC}/*/*.sh
+ #@${REINPLACE_CMD} -E s+/bin/sh+/${PREFIX}/bin/bash+g ${WRKSRC}/configure ${WRKSRC}/*/configure ${WRKSRC}/*.sh ${WRKSRC}/*/*.sh
post-patch-OPTIMIZE-on:
@${REINPLACE_CMD} s/enable_optimize=no/enable_optimize=yes/ \
${WRKSRC}/configure
+#post-configure:
+# cd ${WRKSRC} && ${GMAKE} cleanall
+
.include <bsd.port.mk>
diff --git a/math/librsb/distinfo b/math/librsb/distinfo
index 0c60ddc0cf6b..30c3a3da603d 100644
--- a/math/librsb/distinfo
+++ b/math/librsb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642804756
-SHA256 (librsb-1.2.0.11.tar.gz) = 0686be29bbe277e227c6021de6bd0564e4fc83f996b787886437d28048057bc8
-SIZE (librsb-1.2.0.11.tar.gz) = 2396146
+TIMESTAMP = 1643682194
+SHA256 (librsb-1.3.0.0.tar.gz) = 2ac8725d1f988f57df9383ae6b0bb2ed221ec935187d31ebb62ea95ee868a790
+SIZE (librsb-1.3.0.0.tar.gz) = 4302867
diff --git a/math/librsb/files/patch-rsblib_configure b/math/librsb/files/patch-rsblib_configure
new file mode 100644
index 000000000000..61a975121ecd
--- /dev/null
+++ b/math/librsb/files/patch-rsblib_configure
@@ -0,0 +1,50 @@
+--- rsblib/configure.orig 2022-02-01 02:31:47 UTC
++++ rsblib/configure
+@@ -16350,7 +16350,7 @@ if test x"$want_rsblib" != x"no" ; then
+ LIBRSB_LOCAL_LIBS="${BPWD}/librsb.la";
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming building as subdir of librsb, and that librsb will be built later." >&5
+ $as_echo "$as_me: Assuming building as subdir of librsb, and that librsb will be built later." >&6;}
+- CPPFLAGS+=" -I${BPWD}"
++ CPPFLAGS="${CPPFLAGS} -I${BPWD}"
+ ac_cv_func_rsb_lib_init="yes";
+ else
+
+@@ -16438,9 +16438,9 @@ fi
+ $as_echo "$as_me: Where is librsb-config ?" >&6;};
+ else
+ want_rsblib=yes;
+- CPPFLAGS+=" ` $LIBRSB_CONFIG --I_opts`"
+- LDFLAGS+=" `$LIBRSB_CONFIG --ldflags`"
+- LIBS+=" `$LIBRSB_CONFIG --libs --extra_libs`"
++ CPPFLAGS="${CPPFLAGS} ` $LIBRSB_CONFIG --I_opts`"
++ LDFLAGS="${LDFLAGS} `$LIBRSB_CONFIG --ldflags`"
++ LIBS="${LIBS} `$LIBRSB_CONFIG --libs --extra_libs`"
+ fi
+ for ac_header in rsb.h
+ do :
+@@ -16538,7 +16538,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cancel" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_cancel" >&6; }
+ if test "x$ac_cv_lib_pthread_pthread_cancel" = xyes; then :
+- LIBS+=" -lpthread";
++ LIBS="${LIBS} -lpthread";
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgtest" >&5
+@@ -16680,14 +16680,14 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcppfs_main" >&5
+ $as_echo "$ac_cv_lib_stdcppfs_main" >&6; }
+ if test "x$ac_cv_lib_stdcppfs_main" = xyes; then :
+- RGT_LDADD+=" -lstdc++fs";
++ RGT_LDADD="${RGT_LDADD} -lstdc++fs";
+ fi
+ else
+ rsb_have_gtest=0;
+ fi
+ if test x"$want_rsblib" != x"no" ; then
+ # adding this now: assuming configure called *before* librsb.la built.
+- LIBS+=" ${LIBRSB_LOCAL_LIBS}"
++ LIBS="${LIBS} ${LIBRSB_LOCAL_LIBS}"
+ fi
+ RGT_LDADD="$RGT_LDADD"
+
diff --git a/math/librsb/pkg-plist b/math/librsb/pkg-plist
index bf5773d619ae..26d207c9f7c9 100644
--- a/math/librsb/pkg-plist
+++ b/math/librsb/pkg-plist
@@ -1,11 +1,11 @@
bin/librsb-config
bin/rsbench
include/blas_sparse.h
-include/blas_sparse.mod
+include/librsbpp.h
include/rsb-config.h
include/rsb.F90
include/rsb.h
-include/rsb.mod
+include/rsb.hpp
include/rsb_types.h
lib/librsb.a
lib/librsb.so
@@ -13,29 +13,58 @@ lib/librsb.so.0
lib/librsb.so.0.0.0
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/examples/assemble.cpp
%%PORTDOCS%%%%DOCSDIR%%/examples/autotune.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/autotune.cpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/backsolve.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/bench.cpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/bench.sh
%%PORTDOCS%%%%DOCSDIR%%/examples/benchex.sh
+%%PORTDOCS%%%%DOCSDIR%%/examples/build.cpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/configure.ac
+%%PORTDOCS%%%%DOCSDIR%%/examples/cplusplus.cpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/example.cpp
%%PORTDOCS%%%%DOCSDIR%%/examples/fortran.F90
%%PORTDOCS%%%%DOCSDIR%%/examples/fortran_rsb_fi.F90
%%PORTDOCS%%%%DOCSDIR%%/examples/hello-spblas.c
%%PORTDOCS%%%%DOCSDIR%%/examples/hello.c
%%PORTDOCS%%%%DOCSDIR%%/examples/io-spblas.c
%%PORTDOCS%%%%DOCSDIR%%/examples/make.sh
-%%PORTDOCS%%%%DOCSDIR%%/examples/make.sh.in
+%%PORTDOCS%%%%DOCSDIR%%/examples/makefile.am
+%%PORTDOCS%%%%DOCSDIR%%/examples/misc.cpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/mtx2bin.cpp
%%PORTDOCS%%%%DOCSDIR%%/examples/pd.mtx
%%PORTDOCS%%%%DOCSDIR%%/examples/power.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/render.cpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/snippets.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/span.cpp
%%PORTDOCS%%%%DOCSDIR%%/examples/transpose.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/twonnz.cpp
%%PORTDOCS%%%%DOCSDIR%%/examples/vf.mtx
%%PORTDOCS%%%%DOCSDIR%%/html/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/assemble_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/autotune_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/autotune_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/backsolve_8c.html
%%PORTDOCS%%%%DOCSDIR%%/html/bc_s.png
%%PORTDOCS%%%%DOCSDIR%%/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/html/bench_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/blas__sparse_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/build_8cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classRsbLib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/classRsbMatrix.html
%%PORTDOCS%%%%DOCSDIR%%/html/classes.html
%%PORTDOCS%%%%DOCSDIR%%/html/closed.png
+%%PORTDOCS%%%%DOCSDIR%%/html/cplusplus_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_3e1486c81cd234b49f49474e7d9b6c09.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_5bcbd6c2dea2f7bd09d0c309af16f2b7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dir_d28a4824dc47e487b107a5db32ef43c4.html
%%PORTDOCS%%%%DOCSDIR%%/html/doc.png
%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css
%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/example_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/files.html
%%PORTDOCS%%%%DOCSDIR%%/html/folderclosed.png
%%PORTDOCS%%%%DOCSDIR%%/html/folderopen.png
@@ -86,26 +115,47 @@ lib/librsb.so.0.0.0
%%PORTDOCS%%%%DOCSDIR%%/html/form_49.png
%%PORTDOCS%%%%DOCSDIR%%/html/form_5.png
%%PORTDOCS%%%%DOCSDIR%%/html/form_50.png
+%%PORTDOCS%%%%DOCSDIR%%/html/form_51.png
+%%PORTDOCS%%%%DOCSDIR%%/html/form_52.png
+%%PORTDOCS%%%%DOCSDIR%%/html/form_53.png
%%PORTDOCS%%%%DOCSDIR%%/html/form_6.png
%%PORTDOCS%%%%DOCSDIR%%/html/form_7.png
%%PORTDOCS%%%%DOCSDIR%%/html/form_8.png
%%PORTDOCS%%%%DOCSDIR%%/html/form_9.png
%%PORTDOCS%%%%DOCSDIR%%/html/formula.repository
+%%PORTDOCS%%%%DOCSDIR%%/html/fortran_8F90.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fortran__rsb__fi_8F90.html
%%PORTDOCS%%%%DOCSDIR%%/html/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/functions_eval.html
%%PORTDOCS%%%%DOCSDIR%%/html/functions_func.html
%%PORTDOCS%%%%DOCSDIR%%/html/functions_vars.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_d.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_e.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_enum.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_eval.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_eval_r.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func_c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func_e.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func_m.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_func_r.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func_t.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_func_v.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_m.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_r.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_t.html
%%PORTDOCS%%%%DOCSDIR%%/html/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_v.html
+%%PORTDOCS%%%%DOCSDIR%%/html/globals_vars.html
%%PORTDOCS%%%%DOCSDIR%%/html/group__rsb__doc__examples.html
%%PORTDOCS%%%%DOCSDIR%%/html/group__rsb__doc__rsb.html
%%PORTDOCS%%%%DOCSDIR%%/html/group__rsb__doc__sparse__blas.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hello-spblas_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hello_8c.html
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfaceblas__sparse_1_1rsb__blas__get__mtx.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfaceblas__sparse_1_1uscr__insert__block.html
@@ -118,6 +168,8 @@ lib/librsb.so.0.0.0
%%PORTDOCS%%%%DOCSDIR%%/html/interfaceblas__sparse_1_1usmv.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfaceblas__sparse_1_1ussm.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfaceblas__sparse_1_1ussv.html
+%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__blas__file__mtx__load.html
+%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__coo__cleanup.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__coo__sort.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__file__mtx__get__dims.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__file__mtx__load.html
@@ -169,10 +221,13 @@ lib/librsb.so.0.0.0
%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__time.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__tune__spmm.html
%%PORTDOCS%%%%DOCSDIR%%/html/interfacersb_1_1rsb__tune__spsm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/io-spblas_8c.html
%%PORTDOCS%%%%DOCSDIR%%/html/jquery.js
%%PORTDOCS%%%%DOCSDIR%%/html/menu.js
%%PORTDOCS%%%%DOCSDIR%%/html/menudata.js
+%%PORTDOCS%%%%DOCSDIR%%/html/misc_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mtx2bin_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/namespaceblas__sparse.html
%%PORTDOCS%%%%DOCSDIR%%/html/namespacemembers.html
%%PORTDOCS%%%%DOCSDIR%%/html/namespacemembers_c.html
@@ -191,14 +246,18 @@ lib/librsb.so.0.0.0
%%PORTDOCS%%%%DOCSDIR%%/html/nav_h.png
%%PORTDOCS%%%%DOCSDIR%%/html/open.png
%%PORTDOCS%%%%DOCSDIR%%/html/pages.html
+%%PORTDOCS%%%%DOCSDIR%%/html/power_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/render_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb_8F90.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rsb_8hpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb__blas__sparse_8F90.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb__libspblas_8c.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb__libspblas_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rsb__libspblas__handle_8c.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb__rsb_8c.html
%%PORTDOCS%%%%DOCSDIR%%/html/rsb__types_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/snippets_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/span_8cpp.html
%%PORTDOCS%%%%DOCSDIR%%/html/splitbar.png
%%PORTDOCS%%%%DOCSDIR%%/html/structrsb__initopts.html
%%PORTDOCS%%%%DOCSDIR%%/html/sync_off.png
@@ -209,3 +268,5 @@ lib/librsb.so.0.0.0
%%PORTDOCS%%%%DOCSDIR%%/html/tab_s.png
%%PORTDOCS%%%%DOCSDIR%%/html/tabs.css
%%PORTDOCS%%%%DOCSDIR%%/html/todo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/transpose_8c.html
+%%PORTDOCS%%%%DOCSDIR%%/html/twonnz_8cpp.html