CVS commit: pkgsrc/math/R-nloptr

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Sep 20 01:16:44 UTC 2021

Modified Files:
        pkgsrc/math/R-nloptr: Makefile distinfo
        pkgsrc/math/R-nloptr/patches: patch-configure

Log Message:
(math/R-nloptr) updated 1.2.1 to 1.2.2.2

29 February 2020:
    * Replaced deprecated functions from testhat framework in unit tests (contributed by Avraham Adler).

26 February 2020:
    * Fixed warnings (as requested by CRAN): R CMD config variables 'CPP' and 'CXXCPP' are deprecated.

20 October 2018:
    * Exposed CCSAQ algorithm in R interface (contributed by Julien Chiquet).

03 October 2018:
    * Build process was changed to solve issues on several OS (many thanks to the CRAN maintainers).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/R-nloptr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/R-nloptr/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/R-nloptr/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/R-nloptr/Makefile
diff -u pkgsrc/math/R-nloptr/Makefile:1.7 pkgsrc/math/R-nloptr/Makefile:1.8
--- pkgsrc/math/R-nloptr/Makefile:1.7   Sun May  3 07:44:53 2020
+++ pkgsrc/math/R-nloptr/Makefile       Mon Sep 20 01:16:44 2021
@@ -1,13 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2020/05/03 07:44:53 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2021/09/20 01:16:44 mef Exp $
 
 R_PKGNAME=     nloptr
-R_PKGVER=      1.2.1
-CATEGORIES=    math
+R_PKGVER=      1.2.2.2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       R interface to NLopt
 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
+
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 

Index: pkgsrc/math/R-nloptr/distinfo
diff -u pkgsrc/math/R-nloptr/distinfo:1.3 pkgsrc/math/R-nloptr/distinfo:1.4
--- pkgsrc/math/R-nloptr/distinfo:1.3   Wed Jul 31 20:01:42 2019
+++ pkgsrc/math/R-nloptr/distinfo       Mon Sep 20 01:16:44 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/07/31 20:01:42 brook Exp $
+$NetBSD: distinfo,v 1.4 2021/09/20 01:16:44 mef Exp $
 
-SHA1 (R/nloptr_1.2.1.tar.gz) = 66592b35db03192ac3b69ff5d1127b7212c60ba7
-RMD160 (R/nloptr_1.2.1.tar.gz) = dd5e6f87fd9b8530eaf8886d037c68a76dbaf8d4
-SHA512 (R/nloptr_1.2.1.tar.gz) = 6f9aa62f3c6f1472d1cfdb5d21969f6f05e97ae2caa50aa2d5303b82a53d37879217b557a6b6f812a7ca23744126ba7c49e933adec579817c9aefc3eaf20f7a5
-Size (R/nloptr_1.2.1.tar.gz) = 2448313 bytes
-SHA1 (patch-configure) = 1aece475cd1cbf4e6a420f7bb20374c1f1282b42
+SHA1 (R/nloptr_1.2.2.2.tar.gz) = 3a3e8e61da0692653b4aba729a091094d08aa414
+RMD160 (R/nloptr_1.2.2.2.tar.gz) = 08fc7de50a72a913f75b8c36d56dd4b47bf5142b
+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

Index: pkgsrc/math/R-nloptr/patches/patch-configure
diff -u pkgsrc/math/R-nloptr/patches/patch-configure:1.2 pkgsrc/math/R-nloptr/patches/patch-configure:1.3
--- pkgsrc/math/R-nloptr/patches/patch-configure:1.2    Wed Jul 31 20:01:42 2019
+++ pkgsrc/math/R-nloptr/patches/patch-configure        Mon Sep 20 01:16:44 2021
@@ -1,8 +1,14 @@
-$NetBSD: patch-configure,v 1.2 2019/07/31 20:01:42 brook Exp $
-Fix usage of conditionals in configure
---- configure.orig     2018-10-03 07:37:01.000000000 +0000
-+++ configure
-@@ -2982,8 +2982,8 @@ nlopt_libs=""
+$NetBSD: patch-configure,v 1.3 2021/09/20 01:16:44 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=""
  
  ## also use pkg-config to check for NLopt
  ##
@@ -13,10 +19,10 @@ Fix usage of conditionals in configure
          ## check via pkg-config for nlopt
          if pkg-config --exists nlopt; then
              ## obtain cflags and obtain libs
-@@ -3280,7 +3280,7 @@ fi
+@@ -3269,7 +3269,7 @@ fi
  if test x"${nlopt_good}" = x"yes"; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Now testing for NLopt versison number." >&5
- $as_echo "$as_me: Now testing for NLopt versison number." >&6;}
+     { $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