Update to 0.15.0

No upstream changelog found.

5 files changed, 6 insertions, 84 deletions

diff --git a/math/R-intervals/Makefile b/math/R-intervals/Makefile
index 0d8cf786acb..7f7b41d5eb3 100644
--- a/math/R-intervals/Makefile
+++ b/math/R-intervals/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/07/07 11:32:24 wen Exp $
+# $NetBSD: Makefile,v 1.3 2015/05/31 14:00:12 wen Exp $
 
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_R_CRAN:=contrib/}
@@ -11,7 +11,7 @@ LICENSE=	artistic-2.0
 USE_LANGUAGES=	c++
 
 R_PKGNAME=	intervals
-R_PKGVER=	0.14.0
+R_PKGVER=	0.15.0
 
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/R-intervals/distinfo b/math/R-intervals/distinfo
index 08ce0eecfe1..a4583114ac1 100644
--- a/math/R-intervals/distinfo
+++ b/math/R-intervals/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2013/07/07 11:32:24 wen Exp $
+$NetBSD: distinfo,v 1.4 2015/05/31 14:00:12 wen Exp $
 
-SHA1 (R/intervals_0.14.0.tar.gz) = 7d81861064e220614ceb30cb1854831741105a31
-RMD160 (R/intervals_0.14.0.tar.gz) = 1cef62d1ab23fbc7c2ec09e88b306d7a6a86bcf8
-Size (R/intervals_0.14.0.tar.gz) = 321562 bytes
-SHA1 (patch-src_plot__overlap.cpp) = 1c1e6221eef6ede3e226dc80955f188747e0f762
-SHA1 (patch-src_reduce.cpp) = 8162b570b6482e9ed1f09b06268f9e1aaee0958c
-SHA1 (patch-src_which__nearest.cpp) = f7da847cf46a3ab590790b516d33da5d0af558b9
+SHA1 (R/intervals_0.15.0.tar.gz) = cfa6062725b32696bc89ebf01c4f16157822986a
+RMD160 (R/intervals_0.15.0.tar.gz) = 1d4418ba472a51fb5df70524a558cc5e8f36cbb4
+Size (R/intervals_0.15.0.tar.gz) = 393180 bytes
diff --git a/math/R-intervals/patches/patch-src_plot__overlap.cpp b/math/R-intervals/patches/patch-src_plot__overlap.cpp
deleted file mode 100644
index 88a97dbb87f..00000000000
--- a/math/R-intervals/patches/patch-src_plot__overlap.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_plot__overlap.cpp,v 1.1 2013/06/13 14:28:38 joerg Exp $
-
---- src/plot_overlap.cpp.orig	2013-06-12 19:47:03.000000000 +0000
-+++ src/plot_overlap.cpp
-@@ -79,7 +79,7 @@ extern "C"
- 
-     copy( 
- 	 y.begin(), y.end(),
--	 std::vector<int>::iterator ( INTEGER( result ) )
-+	 INTEGER( result )
- 	  );
-     
-     UNPROTECT(1);
diff --git a/math/R-intervals/patches/patch-src_reduce.cpp b/math/R-intervals/patches/patch-src_reduce.cpp
deleted file mode 100644
index 65c83df2339..00000000000
--- a/math/R-intervals/patches/patch-src_reduce.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_reduce.cpp,v 1.1 2013/06/13 14:28:38 joerg Exp $
-
---- src/reduce.cpp.orig	2013-06-12 19:50:00.000000000 +0000
-+++ src/reduce.cpp
-@@ -68,22 +68,22 @@ extern "C"
-     SET_VECTOR_ELT( result, 0, allocMatrix( REALSXP, start.size(), 2 ) );
-     copy( 
- 	 start.begin(), start.end(),
--	 std::vector<double>::iterator ( REAL( VECTOR_ELT( result, 0 ) ) )
-+	 REAL( VECTOR_ELT( result, 0 ) )
- 	  );
-     copy( 
- 	 end.begin(), end.end(),
--	 std::vector<double>::iterator ( REAL( VECTOR_ELT( result, 0 ) ) + start.size() )
-+	 REAL( VECTOR_ELT( result, 0 ) ) + start.size()
- 	  );
- 
-     if ( full_bool ) {
-       SET_VECTOR_ELT( result, 1, allocMatrix( LGLSXP, start.size(), 2 ) );
-       copy( 
-     	   start_c.begin(), start_c.end(),
--    	   std::vector<int>::iterator ( LOGICAL( VECTOR_ELT( result, 1 ) ) )
-+    	   LOGICAL( VECTOR_ELT( result, 1 ) )
-     	    );
-       copy( 
-     	   end_c.begin(), end_c.end(),
--    	   std::vector<int>::iterator ( LOGICAL( VECTOR_ELT( result, 1 ) ) + start.size() )
-+    	   LOGICAL( VECTOR_ELT( result, 1 ) ) + start.size()
-     	    );
-     }
-     else {
diff --git a/math/R-intervals/patches/patch-src_which__nearest.cpp b/math/R-intervals/patches/patch-src_which__nearest.cpp
deleted file mode 100644
index 830d64116e7..00000000000
--- a/math/R-intervals/patches/patch-src_which__nearest.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_which__nearest.cpp,v 1.1 2013/06/13 14:28:38 joerg Exp $
-
---- src/which_nearest.cpp.orig	2013-06-12 19:51:17.000000000 +0000
-+++ src/which_nearest.cpp
-@@ -185,7 +185,7 @@ extern "C"
- 
-     copy( 
- 	 delta.begin(), delta.end(),
--	 std::vector<double>::iterator ( REAL( VECTOR_ELT( result, 0 ) ) )
-+	 REAL( VECTOR_ELT( result, 0 ) )
- 	  );
- 		    
-     for( i = 0; i < tn; i++ ) {      
-@@ -195,7 +195,7 @@ extern "C"
- 		      );
-       copy( 
- 	   which[i].begin(), which[i].end(), 
--	   std::vector<int>::iterator ( INTEGER( VECTOR_ELT( VECTOR_ELT( result, 1 ), i ) ) )
-+	   INTEGER( VECTOR_ELT( VECTOR_ELT( result, 1 ), i ) )
- 	    );
-       SET_VECTOR_ELT( 
- 		     VECTOR_ELT( result, 2 ), i, 
-@@ -203,7 +203,7 @@ extern "C"
- 		      );
-       copy( 
- 	   indices[i].begin(), indices[i].end(), 
--	   std::vector<int>::iterator ( INTEGER( VECTOR_ELT( VECTOR_ELT( result, 2 ), i ) ) )
-+	   INTEGER( VECTOR_ELT( VECTOR_ELT( result, 2 ), i ) )
- 	    );
-     }
-