From 0bbb5eef1e4dd6330cab0ecf5a9af6e68d8ebeca Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Thu, 2 Mar 2017 15:42:39 +0000 Subject: [PATCH] Update math/cminpack to 1.3.6 PR: 217366 Submitted by: maintainer Approved by: mat (mentor) Differential Revision: https://reviews.freebsd.org/D9813 --- math/cminpack/Makefile | 2 +- math/cminpack/distinfo | 6 +++--- math/cminpack/files/patch-CMakeLists.txt | 11 ----------- math/cminpack/files/patch-cmake_CMakeLists.txt | 9 ++++----- math/cminpack/pkg-plist | 2 +- 5 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 math/cminpack/files/patch-CMakeLists.txt diff --git a/math/cminpack/Makefile b/math/cminpack/Makefile index e635200a8698..a20778a02818 100644 --- a/math/cminpack/Makefile +++ b/math/cminpack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cminpack -PORTVERSION= 1.3.5 +PORTVERSION= 1.3.6 DISTVERSIONPREFIX= v CATEGORIES= math diff --git a/math/cminpack/distinfo b/math/cminpack/distinfo index fd2e7804d037..5894a1c3c5e5 100644 --- a/math/cminpack/distinfo +++ b/math/cminpack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1464767219 -SHA256 (devernay-cminpack-v1.3.5_GH0.tar.gz) = a3ab4be6c8a8bab36c6ac7d4322fb0b9c4347a8096fd6c96d1686dc30e4b1afe -SIZE (devernay-cminpack-v1.3.5_GH0.tar.gz) = 312932 +TIMESTAMP = 1487969746 +SHA256 (devernay-cminpack-v1.3.6_GH0.tar.gz) = 3c07fd21308c96477a2c900032e21d937739c233ee273b4347a0d4a84a32d09f +SIZE (devernay-cminpack-v1.3.6_GH0.tar.gz) = 313459 diff --git a/math/cminpack/files/patch-CMakeLists.txt b/math/cminpack/files/patch-CMakeLists.txt deleted file mode 100644 index 02404b27599f..000000000000 --- a/math/cminpack/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2014-05-28 09:24:45 UTC -+++ CMakeLists.txt -@@ -58,6 +58,8 @@ set (cminpack_hdrs - - add_library (cminpack ${LIB_TYPE} ${cminpack_srcs}) - -+TARGET_LINK_LIBRARIES(cminpack m) -+ - install (TARGETS cminpack - LIBRARY DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library - ARCHIVE DESTINATION ${CMINPACK_LIB_INSTALL_DIR} COMPONENT library diff --git a/math/cminpack/files/patch-cmake_CMakeLists.txt b/math/cminpack/files/patch-cmake_CMakeLists.txt index 97ca8a5c223b..a8f9c202390e 100644 --- a/math/cminpack/files/patch-cmake_CMakeLists.txt +++ b/math/cminpack/files/patch-cmake_CMakeLists.txt @@ -1,11 +1,10 @@ ---- cmake/CMakeLists.txt.orig 2014-02-26 18:22:04 UTC +--- cmake/CMakeLists.txt.orig 2017-02-24 21:33:00 UTC +++ cmake/CMakeLists.txt -@@ -3,6 +3,6 @@ set(PKG_EXTERNAL_DEPS "") - set(pkg_conf_file ${CMAKE_CURRENT_BINARY_DIR}/cminpack.pc) +@@ -11,6 +11,6 @@ if (USE_BLAS AND BLAS_FOUND) + endif() configure_file(cminpack.pc.in ${pkg_conf_file} @ONLY) install(FILES ${pkg_conf_file} - DESTINATION ${CMINPACK_LIB_INSTALL_DIR}/pkgconfig/ COMPONENT pkgconfig) + DESTINATION libdata/pkgconfig/ COMPONENT pkgconfig) --install(FILES FindCMinpack.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+install(FILES FindCMinpack.cmake DESTINATION share/cmake/Modules) + install(FILES CMinpackConfig.cmake DESTINATION share/cmake/CMinpack) diff --git a/math/cminpack/pkg-plist b/math/cminpack/pkg-plist index 7bff42db51bd..000c998d7800 100644 --- a/math/cminpack/pkg-plist +++ b/math/cminpack/pkg-plist @@ -2,7 +2,7 @@ include/cminpack-1/cminpack.h include/cminpack-1/minpack.h lib/libcminpack_s.a libdata/pkgconfig/cminpack.pc -share/cmake/Modules/FindCMinpack.cmake +share/cmake/CMinpack/CMinpackConfig.cmake %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkdrv.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/chkdrv_.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cmpfiles.c