From e6729acaa642132eab2bc330c1cebc6b1b3135ca Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 10 Oct 2018 19:19:19 +0000 Subject: [PATCH] math/primme: Update 2.1 -> 2.1.20181010 (current revision) Several relevant bugs were fixed: * SONAME was added * Some patches aren't needed now git-svn-id: svn+ssh://svn.freebsd.org/ports/head@481765 35697150-7ecd-e111-bb59-0022644237b5 --- math/primme/Makefile | 3 ++- math/primme/distinfo | 6 +++--- math/primme/files/patch-examples_Makefile | 11 ----------- math/primme/files/patch-src_Makefile | 11 ----------- math/primme/files/patch-src_eigs_primme__interface.c | 11 ----------- math/primme/files/patch-src_include_template.h | 11 ----------- 6 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 math/primme/files/patch-examples_Makefile delete mode 100644 math/primme/files/patch-src_Makefile delete mode 100644 math/primme/files/patch-src_eigs_primme__interface.c delete mode 100644 math/primme/files/patch-src_include_template.h diff --git a/math/primme/Makefile b/math/primme/Makefile index de3e95aea74df..4a8d4a18eab62 100644 --- a/math/primme/Makefile +++ b/math/primme/Makefile @@ -2,7 +2,7 @@ PORTNAME= primme DISTVERSIONPREFIX= v -DISTVERSION= 2.1 +DISTVERSION= 2.1.20181010 # git describe doesn't identify the tag properly CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -17,6 +17,7 @@ TEST_DEPENDS= gfortran${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT} USES= gmake localbase:ldflags USE_GITHUB= yes +GH_TAGNAME= d089bec MAKEFILE= makefile ALL_TARGET= solib USE_LDCONFIG= yes diff --git a/math/primme/distinfo b/math/primme/distinfo index 65cd874bf9b67..70102bb480bca 100644 --- a/math/primme/distinfo +++ b/math/primme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539019293 -SHA256 (primme-primme-v2.1_GH0.tar.gz) = edc924250d464f51d0f529aaa77d8b741411b4453b3423fa663a65732055467b -SIZE (primme-primme-v2.1_GH0.tar.gz) = 6071172 +TIMESTAMP = 1539198535 +SHA256 (primme-primme-v2.1.20181010-d089bec_GH0.tar.gz) = 90f9df43e5507b8f0dd40cd27ac50ebc06e0442f3e2939eca0e8a6fc0d43eef5 +SIZE (primme-primme-v2.1.20181010-d089bec_GH0.tar.gz) = 5510842 diff --git a/math/primme/files/patch-examples_Makefile b/math/primme/files/patch-examples_Makefile deleted file mode 100644 index d7be2f73eb4d7..0000000000000 --- a/math/primme/files/patch-examples_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- examples/Makefile.orig 2017-04-11 04:35:01 UTC -+++ examples/Makefile -@@ -8,7 +8,7 @@ include ../Link_flags - - override INCLUDE += -I../include - override FINCLUDE += -I../include --LIBDIRS += -L../lib -+LIBDIRS += ../lib/libprimme.so - - EXAMPLES_C = ex_eigs_dseq ex_eigs_zseq ex_svds_dseq ex_svds_zseq - EXAMPLES_CXX = ex_eigs_zseqxx ex_svds_zseqxx diff --git a/math/primme/files/patch-src_Makefile b/math/primme/files/patch-src_Makefile deleted file mode 100644 index 5e27ef90f1d0d..0000000000000 --- a/math/primme/files/patch-src_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig 2018-10-09 07:03:22 UTC -+++ src/Makefile -@@ -89,7 +89,7 @@ auto_headers: $(AUTOMATED_HEADERS_LINALG - $(RANLIB) $@ - - ../lib/$(SOLIBRARY): ../lib/$(LIBRARY) -- $(CC) -shared -o ../lib/$(SOLIBRARY) -Wl,--whole-archive ../lib/$(LIBRARY) -Wl,--no-whole-archive -+ $(CC) -shared -o ../lib/$(SOLIBRARY) -Wl,--whole-archive ../lib/$(LIBRARY) -Wl,--no-whole-archive $(LDFLAGS) - - # - # Generate CTAGS diff --git a/math/primme/files/patch-src_eigs_primme__interface.c b/math/primme/files/patch-src_eigs_primme__interface.c deleted file mode 100644 index a030f5a332fbc..0000000000000 --- a/math/primme/files/patch-src_eigs_primme__interface.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/eigs/primme_interface.c.orig 2018-10-08 17:26:04 UTC -+++ src/eigs/primme_interface.c -@@ -36,7 +36,7 @@ - * - ******************************************************************************/ - --#if !(defined (__APPLE__) && defined (__MACH__)) -+#if !(defined (__APPLE__) && defined (__MACH__)) && !defined(__FreeBSD__) - # include - #endif - #include /* mallocs, free */ diff --git a/math/primme/files/patch-src_include_template.h b/math/primme/files/patch-src_include_template.h deleted file mode 100644 index d7c44e296fb05..0000000000000 --- a/math/primme/files/patch-src_include_template.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/include/template.h.orig 2018-10-08 17:27:07 UTC -+++ src/include/template.h -@@ -368,7 +368,7 @@ - * - **********************************************************************/ - --#if !(defined (__APPLE__) && defined (__MACH__)) -+#if !(defined (__APPLE__) && defined (__MACH__)) && !defined(__FreeBSD__) - # include /* malloc */ - #endif - #include /* malloc, free */