CVS commit: pkgsrc

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Wed Jul 31 20:01:42 UTC 2019

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

Log Message:
R-nloptr: update to version 1.2.1.

Update to the canonical form of an R package.


To generate a diff of this commit:
cvs rdiff -u -r1.3188 -r1.3189 pkgsrc/doc/CHANGES-2019
cvs rdiff -u -r1.4 -r1.5 pkgsrc/math/R-nloptr/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/R-nloptr/distinfo
cvs rdiff -u -r1.1 -r1.2 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/doc/CHANGES-2019
diff -u pkgsrc/doc/CHANGES-2019:1.3188 pkgsrc/doc/CHANGES-2019:1.3189
--- pkgsrc/doc/CHANGES-2019:1.3188      Wed Jul 31 19:58:05 2019
+++ pkgsrc/doc/CHANGES-2019     Wed Jul 31 20:01:41 2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.3188 2019/07/31 19:58:05 brook Exp $
+$NetBSD: CHANGES-2019,v 1.3189 2019/07/31 20:01:41 brook Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -5145,3 +5145,4 @@ Changes to the packages collection and i
        Updated math/R-mapproj to 1.2.6 [brook 2019-07-31]
        Updated math/R-maps to 3.3.0 [brook 2019-07-31]
        Updated math/R-mvtnorm to 1.0.11 [brook 2019-07-31]
+       Updated math/R-nloptr to 1.2.1 [brook 2019-07-31]

Index: pkgsrc/math/R-nloptr/Makefile
diff -u pkgsrc/math/R-nloptr/Makefile:1.4 pkgsrc/math/R-nloptr/Makefile:1.5
--- pkgsrc/math/R-nloptr/Makefile:1.4   Sat Jul 28 14:40:49 2018
+++ pkgsrc/math/R-nloptr/Makefile       Wed Jul 31 20:01:42 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/07/28 14:40:49 brook Exp $
-#
+# $NetBSD: Makefile,v 1.5 2019/07/31 20:01:42 brook Exp $
 
-CATEGORIES=    math
+CATEGORIES=    math R
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      ${R_HOMEPAGE_BASE}/nloptr/
@@ -9,7 +8,7 @@ COMMENT=        R interface to NLopt
 LICENSE=       gnu-lgpl-v3
 
 R_PKGNAME=     nloptr
-R_PKGVER=      1.0.4
+R_PKGVER=      1.2.1
 
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config

Index: pkgsrc/math/R-nloptr/distinfo
diff -u pkgsrc/math/R-nloptr/distinfo:1.2 pkgsrc/math/R-nloptr/distinfo:1.3
--- pkgsrc/math/R-nloptr/distinfo:1.2   Thu Mar 23 17:06:54 2017
+++ pkgsrc/math/R-nloptr/distinfo       Wed Jul 31 20:01:42 2019
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2017/03/23 17:06:54 joerg Exp $
+$NetBSD: distinfo,v 1.3 2019/07/31 20:01:42 brook Exp $
 
-SHA1 (R/nloptr_1.0.4.tar.gz) = 96a408dd280081c4ee4e56050afd317e8c3cfef9
-RMD160 (R/nloptr_1.0.4.tar.gz) = 2d28e16b635bcaaceb108a0a96d21ba621b8955f
-SHA512 (R/nloptr_1.0.4.tar.gz) = 9ab93a0e0a9b1d704fc333f43ea5761032cfdd009cce47a77d68de9dc4b9c8bc490ed5d070489f63e38c4071d1132fd8a1e17aa4af78c874d4cd7eff783ab346
-Size (R/nloptr_1.0.4.tar.gz) = 353942 bytes
-SHA1 (patch-configure) = edadaf36dce4e3ff1b762dee7842ad63ca67603d
+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

Index: pkgsrc/math/R-nloptr/patches/patch-configure
diff -u pkgsrc/math/R-nloptr/patches/patch-configure:1.1 pkgsrc/math/R-nloptr/patches/patch-configure:1.2
--- pkgsrc/math/R-nloptr/patches/patch-configure:1.1    Sun Apr 17 04:09:44 2016
+++ pkgsrc/math/R-nloptr/patches/patch-configure        Wed Jul 31 20:01:42 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2016/04/17 04:09:44 wen Exp $
+$NetBSD: patch-configure,v 1.2 2019/07/31 20:01:42 brook Exp $
 Fix usage of conditionals in configure
---- configure.orig     2015-11-28 07:01:04.000000000 +0000
+--- configure.orig     2018-10-03 07:37:01.000000000 +0000
 +++ configure
-@@ -2953,8 +2953,8 @@ fi
+@@ -2982,8 +2982,8 @@ nlopt_libs=""
  
  ## also use pkg-config to check for NLopt
  ##
@@ -10,6 +10,15 @@ Fix usage of conditionals in configure
 -    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 hiredis
+         ## check via pkg-config for nlopt
          if pkg-config --exists nlopt; then
              ## obtain cflags and obtain libs
+@@ -3280,7 +3280,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;}
+-    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