From 4f0dc9c63268ad4aa379fd9b6cbed81e2437f80a Mon Sep 17 00:00:00 2001
From: dmcmahill <dmcmahill@pkgsrc.org>
Date: Thu, 10 Mar 2005 12:55:08 +0000
Subject: Fix compilation on solaris.  Octave-current works here now.

---
 math/octave-current/distinfo         |  3 ++-
 math/octave-current/patches/patch-ab | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 math/octave-current/patches/patch-ab

(limited to 'math')

diff --git a/math/octave-current/distinfo b/math/octave-current/distinfo
index 5f52602ee58..9ba03f4eb04 100644
--- a/math/octave-current/distinfo
+++ b/math/octave-current/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.25 2005/02/23 12:06:56 agc Exp $
+$NetBSD: distinfo,v 1.26 2005/03/10 12:55:08 dmcmahill Exp $
 
 SHA1 (octave-2.1.65.tar.bz2) = f423b85860fe4734caecaba1d065fd016e90f4f1
 RMD160 (octave-2.1.65.tar.bz2) = 2ce29bee5138d3493b8c98f56223ec87479ba1a5
 Size (octave-2.1.65.tar.bz2) = 4352497 bytes
 SHA1 (patch-aa) = e2d8591c222f3b67b5d9798ea349c4d4ce2eae91
+SHA1 (patch-ab) = db51227510dd4ac0a49b8d0bc6882779f8878f68
 SHA1 (patch-ac) = 201e5e6a58f6934371daa9ccac8d4f1f01533a4c
 SHA1 (patch-ad) = d162862a0e45ddf15de438d8e7b0386ccfe7390e
 SHA1 (patch-ae) = 79544d09268d41647b081680fc839f4fe481b111
diff --git a/math/octave-current/patches/patch-ab b/math/octave-current/patches/patch-ab
new file mode 100644
index 00000000000..3752e765daf
--- /dev/null
+++ b/math/octave-current/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.3 2005/03/10 12:55:08 dmcmahill Exp $
+
+fix compilation on solaris.  Patch taken from octave's cvs
+
+--- liboctave/file-ops.cc.orig	2005-02-09 18:11:11.000000000 -0500
++++ liboctave/file-ops.cc	2005-03-09 07:52:22.689776000 -0500
+@@ -356,7 +356,7 @@
+   // directory if the path is not absolute.
+ 
+-  name = octave_env::make_absolute (name);
++  std::string absolute_name = octave_env::make_absolute (name, octave_env::getcwd() );
+ 
+-  size_t resolved_size = name.length ();
++  size_t resolved_size = absolute_name.length ();
+ 
+   while (1)
+@@ -366,5 +366,5 @@
+       OCTAVE_LOCAL_BUFFER (char, resolved, resolved_size);
+ 
+-      resolved_len = ::resolvepath (name, resolved, resolved_size);
++      int resolved_len = ::resolvepath (absolute_name.c_str(), resolved, resolved_size);
+ 
+       if (resolved_len < 0)
-- 
cgit v1.2.3