6 files changed, 10 insertions, 74 deletions

diff --git a/math/librsb/Makefile b/math/librsb/Makefile
index 1031960eeb88..3ee55e4c0883 100644
--- a/math/librsb/Makefile
+++ b/math/librsb/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	librsb
-PORTVERSION=	1.2.0r4
-PORTREVISION=	3
+PORTVERSION=	1.2.0r7
 CATEGORIES=	math
 MASTER_SITES=	SF/librsb
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/-rc/}
@@ -22,18 +21,12 @@ INSTALL_TARGET=	install-strip
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--enable-fortran-module-install \
-		--enable-matrix-types="double, double complex" \
-		--with-memhinfo="${RSB_USER_SET_MEM_HIERARCHY_INFO}"
+		--enable-matrix-types="double, double complex"
 SHEBANG_FILES=	scripts/*.sh
+USE_LDCONFIG=	yes
 
 MANUAL_PACKAGE_BUILD=	Optimizes for the local machine
 
-pre-configure:
-	@if [ -z "${RSB_USER_SET_MEM_HIERARCHY_INFO}" ]; then \
-		${CAT} ${FILESDIR}/memhinfo.txt; \
-		exit 1; \
-	fi
-
 post-patch:
 	@${REINPLACE_CMD} -E s/sed/gsed/g ${WRKSRC}/scripts/*.sh
 
diff --git a/math/librsb/distinfo b/math/librsb/distinfo
index 7734009a2a6b..b7cac01e3715 100644
--- a/math/librsb/distinfo
+++ b/math/librsb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470435344
-SHA256 (librsb-1.2.0-rc4.tar.gz) = 21635cc174fcb1a58a6bd73bb74d86a106c85e9535872dccc988e8720488a3d4
-SIZE (librsb-1.2.0-rc4.tar.gz) = 2216622
+TIMESTAMP = 1497930681
+SHA256 (librsb-1.2.0-rc7.tar.gz) = 49ac0ab07ba9ea02028dfe18c0401c6c5831bbb1f05b59256133a5b27c674a8c
+SIZE (librsb-1.2.0-rc7.tar.gz) = 2223136
diff --git a/math/librsb/files/memhinfo.txt b/math/librsb/files/memhinfo.txt
deleted file mode 100644
index 2c3b1cf7a51c..000000000000
--- a/math/librsb/files/memhinfo.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This port needs information about the memory cache system before building.
-You can set this in the variable RSB_USER_SET_MEM_HIERARCHY_INFO, for example
-make RSB_USER_SET_MEM_HIERARCHY_INFO="L2:12/64/3M,L1:64/8/32K"
-Finding these values is tricky, but the following steps will help:
-	1. read the README file in the source code
-	2. build the port misc/cpuid
-	3. run the program cpuid
-You are on your own in figuring out how to convert the information from the
-program cpuid to the value of RSB_USER_SET_MEM_HIERARCHY_INFO.
-
diff --git a/math/librsb/files/patch-rsb__init.c b/math/librsb/files/patch-rsb__init.c
deleted file mode 100644
index b2679b31883e..000000000000
--- a/math/librsb/files/patch-rsb__init.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- rsb_init.c.orig	2015-05-01 21:04:42 UTC
-+++ rsb_init.c
-@@ -50,13 +50,15 @@ const rsb_char_t * rsb__init_get_mem_hie
- 	if((usmhi = getenv("RSB_USER_SET_MEM_HIERARCHY_INFO"))!=NULL && *usmhi)
- 		goto done;
- #endif /* RSB_HAVE_GETENV */
-+#ifdef RSB_DETECTED_MEM_HIERARCHY_INFO
-+	if(verbose) RSB_INFO("Checking hardcoded RSB_DETECTED_MEM_HIERARCHY_INFO symbol\n");
-+	usmhi = RSB_DETECTED_MEM_HIERARCHY_INFO;
-+	if (*usmhi)
-+		goto done;
- #ifdef RSB_USER_SET_MEM_HIERARCHY_INFO
- 	if(verbose) RSB_INFO("Checking hardcoded RSB_USER_SET_MEM_HIERARCHY_INFO symbol\n");
- 	usmhi = RSB_USER_SET_MEM_HIERARCHY_INFO;
- #endif /* RSB_USER_SET_MEM_HIERARCHY_INFO */
--#ifdef RSB_DETECTED_MEM_HIERARCHY_INFO
--	if(verbose) RSB_INFO("Checking hardcoded RSB_DETECTED_MEM_HIERARCHY_INFO symbol\n");
--	usmhi = RSB_DETECTED_MEM_HIERARCHY_INFO;
- #endif /* RSB_USER_SET_MEM_HIERARCHY_INFO */
- done:
- 	if(verbose) RSB_INFO("Available memory hierarchy info string: \"%s\"\n",usmhi);
diff --git a/math/librsb/files/patch-rsb__util.c b/math/librsb/files/patch-rsb__util.c
deleted file mode 100644
index cbd4c5ab8804..000000000000
--- a/math/librsb/files/patch-rsb__util.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- rsb_util.c.orig	2015-05-01 21:21:34 UTC
-+++ rsb_util.c
-@@ -161,6 +161,26 @@ void rsb__util_set_area_to_converted_int
- 	return;
- }
- 
-+/*
-+ *  Added because of lack of functionality with FreeBSD
-+ *  See https://wiki.freebsd.org/Numerics
-+ */
-+complex float clogf(complex float a) {
-+	return logf(cabsf(a)) + I*cargf(a);
-+}
-+
-+complex float cpowf(complex float a, complex float b) {
-+	return cexpf(b*clogf(a));
-+}
-+
-+complex double clog(complex double a) {
-+	return logf(cabs(a)) + I*carg(a);
-+}
-+
-+complex double cpow(complex double a, complex double b) {
-+	return cexp(b*clog(a));
-+}
-+
- rsb_coo_idx_t * rsb__util_get_partitioning_array( size_t bs, size_t X , rsb_blk_idx_t * X_b, rsb_flags_t flags){
- 	/*!
- 	 * Given a block size (be it rows or columns), an element size X in bytes,
diff --git a/math/librsb/pkg-plist b/math/librsb/pkg-plist
index 7c9bf1cee007..7c4ff6fe0b5a 100644
--- a/math/librsb/pkg-plist
+++ b/math/librsb/pkg-plist
@@ -8,6 +8,9 @@ include/rsb.h
 include/rsb.mod
 include/rsb_types.h
 lib/librsb.a
+lib/librsb.so
+lib/librsb.so.0
+lib/librsb.so.0.0.0
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/examples/autotune.c
@@ -18,6 +21,7 @@ lib/librsb.a
 %%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/pd.mtx
 %%PORTDOCS%%%%DOCSDIR%%/examples/power.c
 %%PORTDOCS%%%%DOCSDIR%%/examples/transpose.c