Update eigen2 to 2.0-beta6

changes unspecified - better handling of systems without posix_memalign.

4 files changed, 24 insertions, 29 deletions

diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile
index e7b92541835..6349234459c 100644
--- a/math/eigen2/Makefile
+++ b/math/eigen2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/01/11 11:45:11 markd Exp $
+# $NetBSD: Makefile,v 1.4 2009/01/27 12:22:46 markd Exp $
 
-DISTNAME=	eigen-2.0-beta5
+DISTNAME=	eigen-2.0-beta6
 PKGNAME=	${DISTNAME:S/-beta/beta/}
-PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=   http://download.tuxfamily.org/eigen/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/math/eigen2/PLIST b/math/eigen2/PLIST
index fbe77fad546..8a378eb1b79 100644
--- a/math/eigen2/PLIST
+++ b/math/eigen2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/10 01:02:47 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/01/27 12:22:46 markd Exp $
 include/eigen2/Eigen/Array
 include/eigen2/Eigen/Cholesky
 include/eigen2/Eigen/Core
@@ -9,6 +9,7 @@ include/eigen2/Eigen/QR
 include/eigen2/Eigen/Regression
 include/eigen2/Eigen/SVD
 include/eigen2/Eigen/Sparse
+include/eigen2/Eigen/StdVector
 include/eigen2/Eigen/src/Array/AllAndAny.h
 include/eigen2/Eigen/src/Array/CwiseOperators.h
 include/eigen2/Eigen/src/Array/Functors.h
@@ -100,6 +101,7 @@ include/eigen2/Eigen/src/Sparse/SparseLU.h
 include/eigen2/Eigen/src/Sparse/SparseMatrix.h
 include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
 include/eigen2/Eigen/src/Sparse/SparseProduct.h
+include/eigen2/Eigen/src/Sparse/SparseRedux.h
 include/eigen2/Eigen/src/Sparse/SparseUtil.h
 include/eigen2/Eigen/src/Sparse/SparseVector.h
 include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
diff --git a/math/eigen2/distinfo b/math/eigen2/distinfo
index 4e857a8a77e..22fc9f714db 100644
--- a/math/eigen2/distinfo
+++ b/math/eigen2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/01/11 11:45:11 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/01/27 12:22:46 markd Exp $
 
-SHA1 (eigen-2.0-beta5.tar.bz2) = 045155ddd498f43168d197547fdc86755497a7a8
-RMD160 (eigen-2.0-beta5.tar.bz2) = 8cf6b34f2499d7016f62419a8eae555988ec234b
-Size (eigen-2.0-beta5.tar.bz2) = 320560 bytes
-SHA1 (patch-aa) = 702b670eefa101b1f48dee11bd14c17a3689a157
+SHA1 (eigen-2.0-beta6.tar.bz2) = 323fd1641332a60ef4f0c97d886d34220f5d9040
+RMD160 (eigen-2.0-beta6.tar.bz2) = 9e45b2b9b068a91a994bee01d28c34cc2769ee6b
+Size (eigen-2.0-beta6.tar.bz2) = 329351 bytes
+SHA1 (patch-aa) = c5690df51a7b0095f8a2d9de5b32b37a30d142ba
diff --git a/math/eigen2/patches/patch-aa b/math/eigen2/patches/patch-aa
index 163662e63bb..4616a6a52bc 100644
--- a/math/eigen2/patches/patch-aa
+++ b/math/eigen2/patches/patch-aa
@@ -1,22 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2009/01/11 11:45:12 markd Exp $
+$NetBSD: patch-aa,v 1.3 2009/01/27 12:22:46 markd Exp $
 
---- Eigen/src/Core/util/Memory.h.orig	2009-01-06 07:21:44.000000000 +1300
+SVN commit 910275 by bjacob
+
+--- Eigen/src/Core/util/Memory.h.orig	2009-01-13 05:06:04.000000000 +1300
 +++ Eigen/src/Core/util/Memory.h
-@@ -56,7 +56,7 @@ inline T* ei_aligned_malloc(size_t size)
-     #else
-       #ifdef _MSC_VER
-         void_result = _aligned_malloc(size*sizeof(T), 16);
--      #elif defined(__APPLE__)
-+      #elif defined(__APPLE__) || defined(__NetBSD__)
-         void_result = malloc(size*sizeof(T)); // Apple's malloc() already returns aligned ptrs
-       #else
-         void_result = _mm_malloc(size*sizeof(T), 16);
-@@ -97,7 +97,7 @@ inline void ei_aligned_free(T* ptr, size
-       while(size) ptr[--size].~T();
-       #if defined(__linux)
-         free(ptr);
--      #elif defined(__APPLE__)
-+      #elif defined(__APPLE__) || defined(__NetBSD__)
-         free(ptr);
-       #elif defined(_MSC_VER)
-         _aligned_free(ptr);
+@@ -27,7 +27,8 @@
+ #ifndef EIGEN_MEMORY_H
+ #define EIGEN_MEMORY_H
+ 
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN64)
++// for NetBSD I didn't see any clear statement in the docs, but Mark Davies is confident about this.
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(_WIN64)
+   #define EIGEN_MALLOC_ALREADY_ALIGNED 1
+ #else
+   #define EIGEN_MALLOC_ALREADY_ALIGNED 0