From 2143994c8306a41db518566c83249a8a57185efa Mon Sep 17 00:00:00 2001 From: mef Date: Fri, 11 Aug 2023 08:41:09 +0000 Subject: [PATCH] (math/R-nloptr) Updated 1.2.2.2 to 2.0.3 # nloptr 2.0.3 * Improved compatibility on RHEL/CentOS by first searching for a `cmake3` binary on the `PATH` (#104). * Improved backward compatibility with older versions of `cmake` (#119). # nloptr 2.0.2 This is a patch version in which: * I link to the `nlopt` library via `nlopt/lib/libnlopt.a` instead of `-Lnlopt/lib -lnlopt` when building `nlopt` from included sources to avoid potential mess where `-lnlopt` could look for the `nlopt` library in other places and possibly link with an existing too old system build of `nlopt`. Additionally, we contacted Simon Urbanek for updating the `nlopt` recipe for macOS users so that it does now match the latest `v2.7.1`, which should avoid `nlopt` to be built on the fly on CRAN machines. # nloptr 2.0.1 This is a release mainly for increasing direct compatibility with most user cases. In details, here is the list of changes that have been made: * Update `SystemRequirements` description to make it clearer which minimal versions of `cmake` (`>= 3.15.0`) and `nlopt` (`>= 2.7.0`) are required (#100, @HenrikBengtsson). * End configuration sooner and louder if `cmake` is missing when needed with clearer message (#103, @eddelbuettel). * Ensure system-wide installation of `cmake` in the list of suggestions to install it when missing. * Update GHA scripts to latest versions. * Configure git to always use LF line endings for configure.ac file. * Add CI for R-devel on Windows with Rtools42. * Fix for compatibility with versions of R anterior to `4.0` (#111). * Look for a `cmake3` binary in the current path before `cmake` for increasing compatibility with most RHEL/CentOS users (#104, @bhogan-mitre @HenrikBengtsson). # nloptr 2.0.0 ## Major changes * Use [CMake](https://cmake.org) to build `nlopt` from included sources on macOS and on Linux if no system build of NLopt (>= 2.7.0) is found. * Update included sources of NLopt to latest version (2.7.1). * Put back the ability on Linux platforms to re-use an existing external build of NLopt instead of building from the included sources (contributed by Dirk Eddelbuettel, #88). * Now builds using NLopt from `rwinlib` on Windows current release (contributed by Jeroen Ooms, #92), or NLopt from `Rtools42` on Windows devel (contributed by Tomas Kalibera). ## Minor changes * Added a `NEWS.md` file to track changes to the package. * Use markdown in Roxygen documentation. * Added a logo and a proper [**nloptr** website](https://astamm.github.io/nloptr/). * Added coverage. * Switch from Travis to Github Actions for CI. * Use Catch for unit testing C/C++ code. * Now tracking code coverage. * Update NLopt-related URLs following migration of [NLopt website](https://nlopt.readthedocs.io/en/latest/). * Fixed bug to avoid linking issues when using the C API via `#include ` in several source files. * Fix precision issue in test example `hs071` (jyypma/nloptr#81, @Tom-python0121). * Made NLopt algorithm `NLOPT_GN_ESCH` available from R interface (contributed by Xiongtao Dai). --- math/R-nloptr/Makefile | 9 ++++--- math/R-nloptr/distinfo | 10 ++++---- math/R-nloptr/patches/patch-configure | 37 ++++++++------------------- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/math/R-nloptr/Makefile b/math/R-nloptr/Makefile index 82e7bacdb8fe..86100ae66314 100644 --- a/math/R-nloptr/Makefile +++ b/math/R-nloptr/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2021/09/20 01:16:44 mef Exp $ +# $NetBSD: Makefile,v 1.9 2023/08/11 08:41:09 mef Exp $ R_PKGNAME= nloptr -R_PKGVER= 1.2.2.2 +R_PKGVER= 2.0.3 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= R interface to NLopt @@ -10,11 +10,12 @@ LICENSE= gnu-lgpl-v3 TEST_DEPENDS+= R-knitr-[0-9]*:../../print/R-knitr TEST_DEPENDS+= R-rmarkdown-[0-9]*:../../textproc/R-rmarkdown TEST_DEPENDS+= R-inline-[0-9]*:../../devel/R-inline -TEST_DEPENDS+= R-testthat-[0-9]*:../../devel/R-testthat +#EST_DEPENDS+= R-testthat-[0-9]*:../../devel/R-testthat -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++ fortran77 USE_TOOLS+= pkg-config .include "../../math/R/Makefile.extension" .include "../../math/nlopt/buildlink3.mk" +.include "../../devel/R-testthat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/R-nloptr/distinfo b/math/R-nloptr/distinfo index 58372d1eb480..21420a3ff849 100644 --- a/math/R-nloptr/distinfo +++ b/math/R-nloptr/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 10:55:30 nia Exp $ +$NetBSD: distinfo,v 1.7 2023/08/11 08:41:09 mef Exp $ -BLAKE2s (R/nloptr_1.2.2.2.tar.gz) = d62d15837dcc9f1cbb8c3528debff147b5d6d2a97aed4657ca979989e2163c5d -SHA512 (R/nloptr_1.2.2.2.tar.gz) = fc553ab44f30d0d67be7a1a6cb67e24a90b74943505b3331e7f8f474bfa58a4655b23137c88d350472d4b7ffcb34503ba7ae81692948c4943600a2793e33ccc7 -Size (R/nloptr_1.2.2.2.tar.gz) = 2450931 bytes -SHA1 (patch-configure) = 30a2e272640cbf158a11d802b1162216fa42d919 +BLAKE2s (R/nloptr_2.0.3.tar.gz) = fe92ef7297289695918b121ae1cd1b916c68119516c4ecde393038a8bc58d579 +SHA512 (R/nloptr_2.0.3.tar.gz) = 08f8a6b7ddc20f7b75c567ee7e55abd47228c4fc8db254080dc7f4010311a92ad4c75ca9b593adbb4183308e4142fdc9ab80aed1b7fe5da3b7450a19624b98e6 +Size (R/nloptr_2.0.3.tar.gz) = 2219877 bytes +SHA1 (patch-configure) = 4cae010fd9245d667bf8c4be45f9dd65303ac9c9 diff --git a/math/R-nloptr/patches/patch-configure b/math/R-nloptr/patches/patch-configure index a85b92e9f283..7770ed1747b8 100644 --- a/math/R-nloptr/patches/patch-configure +++ b/math/R-nloptr/patches/patch-configure @@ -1,30 +1,15 @@ -$NetBSD: patch-configure,v 1.3 2021/09/20 01:16:44 mef Exp $ +$NetBSD: patch-configure,v 1.4 2023/08/11 08:41:09 mef Exp $ -=> Checking for portability problems in extracted files ERROR: [check-portability.awk] => Found test ... == ...: -ERROR: [check-portability.awk] configure:2974: if test x"${nlopt_libs}" == x""; then -ERROR: [check-portability.awk] configure:2975: if test x"${PKGCONFIG}" == x"yes"; then -ERROR: [check-portability.awk] configure:3272: if test x"${PKGCONFIG}" == x"yes"; then ---- configure.orig 2020-07-03 02:30:38.000000000 +0900 -+++ configure 2021-09-18 13:38:30.459037943 +0900 -@@ -2971,8 +2971,8 @@ nlopt_libs="" +--- configure.orig 2022-05-26 23:40:24.000000000 +0900 ++++ configure 2023-08-11 16:48:17.053659088 +0900 +@@ -3320,7 +3320,7 @@ printf "%s\n" "no" >&6; } + fi - ## also use pkg-config to check for NLopt - ## --if test x"${nlopt_libs}" == x""; then -- if test x"${PKGCONFIG}" == x"yes"; then -+if test x"${nlopt_libs}" = x""; then -+ if test x"${PKGCONFIG}" = x"yes"; then - ## check via pkg-config for nlopt - if pkg-config --exists nlopt; then - ## obtain cflags and obtain libs -@@ -3269,7 +3269,7 @@ fi - if test x"${nlopt_good}" = x"yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: Now testing for NLopt version 2.4.0 or greater." >&5 - $as_echo "$as_me: Now testing for NLopt version 2.4.0 or greater." >&6;} -- if test x"${PKGCONFIG}" == x"yes"; then -+ if test x"${PKGCONFIG}" = x"yes"; then - ## check via pkg-config for version number of nlopt - if pkg-config --exists nlopt; then - ## obtain version number + +- if test x"${have_cmake}" == x"no"; then ++ if test x"${have_cmake}" = x"no"; then + . src/scripts/cmake_config.sh + if test -z "${CMAKE_BIN}"; then + ## also error to end configure here