CVS commit: pkgsrc/textproc/R-stringi

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Mon Feb  5 18:52:05 UTC 2018

Modified Files:
        pkgsrc/textproc/R-stringi: Makefile distinfo
        pkgsrc/textproc/R-stringi/patches: patch-configure

Log Message:
textproc/R-stringi: Update to 1.1.6

Notable changes since 1.1.2:
- `omit_na=TRUE` in `stri_sub<-` now ignores missing values in any of
  the arguments provided.
- Add support for custom rule-based break iteration, see
  `?stri_opts_brkiter`.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/R-stringi/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/R-stringi/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/R-stringi/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/textproc/R-stringi/Makefile
diff -u pkgsrc/textproc/R-stringi/Makefile:1.9 pkgsrc/textproc/R-stringi/Makefile:1.10
--- pkgsrc/textproc/R-stringi/Makefile:1.9      Thu Nov 30 16:45:39 2017
+++ pkgsrc/textproc/R-stringi/Makefile  Mon Feb  5 18:52:05 2018
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.9 2017/11/30 16:45:39 adam Exp $
+# $NetBSD: Makefile,v 1.10 2018/02/05 18:52:05 minskim Exp $
 
-PKGREVISION=   3
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_R_CRAN:=contrib/}
 
@@ -10,11 +9,12 @@ COMMENT=     Character String Processing Fac
 LICENSE=       modified-bsd
 
 R_PKGNAME=     stringi
-R_PKGVER=      1.1.2
+R_PKGVER=      1.1.6
 
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
 
 .include "../../textproc/icu/buildlink3.mk"
+BUILDLINK_API_DEPENDS.R+=      R>=2.14
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/R-stringi/distinfo
diff -u pkgsrc/textproc/R-stringi/distinfo:1.2 pkgsrc/textproc/R-stringi/distinfo:1.3
--- pkgsrc/textproc/R-stringi/distinfo:1.2      Sun Dec 18 02:18:39 2016
+++ pkgsrc/textproc/R-stringi/distinfo  Mon Feb  5 18:52:05 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/12/18 02:18:39 wen Exp $
+$NetBSD: distinfo,v 1.3 2018/02/05 18:52:05 minskim Exp $
 
-SHA1 (R/stringi_1.1.2.tar.gz) = 983c527ef51ca441def25438b7a4829de563deaa
-RMD160 (R/stringi_1.1.2.tar.gz) = 56745cd4bec327c42e6bbbde085b7a10acc1c676
-SHA512 (R/stringi_1.1.2.tar.gz) = 8145fa8c08146ca9a1d7d64cc4f0b5f4803231c860c5363f155826996c1f739964cd3b92d655335413508d56771c6debc14261b801c99d2f30c8d8b325bec253
-Size (R/stringi_1.1.2.tar.gz) = 3644855 bytes
-SHA1 (patch-configure) = 25897b9a905b9761f1d23a1a0b0177d61a3a1ab9
+SHA1 (R/stringi_1.1.6.tar.gz) = 1393f38caee1430fa56718d33b25b3c909cc587d
+RMD160 (R/stringi_1.1.6.tar.gz) = a839d214d3fd9a7a76e7f1441e20125ad7d5c567
+SHA512 (R/stringi_1.1.6.tar.gz) = b79390533b94aab79e9f696d6ef85e5c4da92244e586ec5edc3eb6dccf0f584d5f9bc9f9514b00926f1abf4e83e0d174a17e241b2894af3e3fc17f2251f24f2f
+Size (R/stringi_1.1.6.tar.gz) = 3647049 bytes
+SHA1 (patch-configure) = 987246cf48481166846d042772ca79eca4115f57

Index: pkgsrc/textproc/R-stringi/patches/patch-configure
diff -u pkgsrc/textproc/R-stringi/patches/patch-configure:1.2 pkgsrc/textproc/R-stringi/patches/patch-configure:1.3
--- pkgsrc/textproc/R-stringi/patches/patch-configure:1.2       Sun Dec 18 02:18:39 2016
+++ pkgsrc/textproc/R-stringi/patches/patch-configure   Mon Feb  5 18:52:05 2018
@@ -1,8 +1,10 @@
-$NetBSD: patch-configure,v 1.2 2016/12/18 02:18:39 wen Exp $
-Fix configure
---- configure.orig     2016-12-17 12:43:37.000000000 +0000
+$NetBSD: patch-configure,v 1.3 2018/02/05 18:52:05 minskim Exp $
+
+Fix configure.
+
+--- configure.orig     2017-11-10 13:42:05.000000000 +0000
 +++ configure
-@@ -2205,7 +2205,7 @@ if test "${enable_gcc_debug+set}" = set;
+@@ -2265,7 +2265,7 @@ if test "${enable_gcc_debug+set}" = set;
    enableval=$enable_gcc_debug;
  fi
  
@@ -11,7 +13,7 @@ Fix configure
     enable_gcc_debug="yes"
  else
     enable_gcc_debug="no"
-@@ -2216,7 +2216,7 @@ if test "${enable_gcc_pedantic+set}" = s
+@@ -2276,7 +2276,7 @@ if test "${enable_gcc_pedantic+set}" = s
    enableval=$enable_gcc_pedantic;
  fi
  
@@ -20,9 +22,9 @@ Fix configure
     enable_gcc_pedantic="yes"
  else
     enable_gcc_pedantic="no"
-@@ -2304,13 +2304,13 @@ $as_echo "$R_PATH" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for R >= 3.1.0" >&5
- $as_echo_n "checking for R >= 3.1.0... " >&6; }
+@@ -2382,13 +2382,13 @@ $as_echo "$R_PATH" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for R >= 3.1.0 for C++11 use" >&5
+ $as_echo_n "checking for R >= 3.1.0 for C++11 use... " >&6; }
  R_GE_31=`"${R_PATH}" --vanilla --slave -e 'cat(if (getRversion() >= numeric_version("3.1.0")) "yes" else "no")'`
 -if test "x$R_GE_31" == "xyes"; then
 +if test "x$R_GE_31" = "xyes"; then
@@ -36,7 +38,16 @@ Fix configure
        echo "*** disabling C++11 use"
        enable_cxx11="no"
     fi
-@@ -2369,14 +2369,14 @@ fi
+@@ -2397,7 +2397,7 @@ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for R < 3.4.0 for CXX1X flag use" >&5
+ $as_echo_n "checking for R < 3.4.0 for CXX1X flag use... " >&6; }
+ R_GE_34=`"${R_PATH}" --vanilla --slave -e 'cat(if (getRversion() >= numeric_version("3.4.0")) "yes" else "no")'`
+-if test "x$R_GE_34" == "xyes"; then
++if test "x$R_GE_34" = "xyes"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+    STRINGI_CXX1X="CXX11"
+@@ -2460,14 +2460,14 @@ fi
  
  ###### SETUP COMPILER FLAGS FOR TESTING ######################################
  
@@ -53,16 +64,16 @@ Fix configure
     with_extra_cflags="${with_extra_cflags} -Wall -Wextra -ansi -pedantic -std=c99"
     with_extra_cxxflags="${with_extra_cxxflags} -Wall -Wextra -ansi -pedantic -std=c++98 -Wlong-long"
  fi
-@@ -2391,7 +2391,7 @@ CPPFLAGS=`"${R_PATH}" CMD config CPPFLAG
+@@ -2482,7 +2482,7 @@ CPPFLAGS=`"${R_PATH}" CMD config CPPFLAG
  LIBS=
  LDFLAGS=
  
 -if test "x$enable_cxx11" == "xyes"; then
 +if test "x$enable_cxx11" = "xyes"; then
-    CXX_tmp1=`"${R_PATH}" CMD config CXX1X`
-    CXX_tmp2=`"${R_PATH}" CMD config CXX1XSTD`
+    CXX_tmp1=`"${R_PATH}" CMD config ${STRINGI_CXX1X}`
+    CXX_tmp2=`"${R_PATH}" CMD config ${STRINGI_CXX1X}STD`
     CXX="${CXX_tmp1} ${CXX_tmp2}"
-@@ -4062,7 +4062,7 @@ CPP_OK=0
+@@ -4153,7 +4153,7 @@ CPP_OK=0
  check_cpp
  
  if test $CPP_OK = 0; then