summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorpooka <pooka@pkgsrc.org>2006-10-24 13:54:40 +0000
committerpooka <pooka@pkgsrc.org>2006-10-24 13:54:40 +0000
commitb94baac78b042601292e913bfc4dc2e3eb99870a (patch)
treead15dff63543895216a13f076091107a6c4c1ab6 /math
parent32c2886aece01ba6b97aa438e09cfcaccda39cc0 (diff)
downloadpkgsrc-b94baac78b042601292e913bfc4dc2e3eb99870a.tar.gz
clean namespace pollution
fixes pkg/34642, patches contributed by Hans Rosenfeld
Diffstat (limited to 'math')
-rw-r--r--math/octave-forge/distinfo4
-rw-r--r--math/octave-forge/patches/patch-aa13
-rw-r--r--math/octave-forge/patches/patch-ab13
3 files changed, 29 insertions, 1 deletions
diff --git a/math/octave-forge/distinfo b/math/octave-forge/distinfo
index e0dc4dd6f5f..e6b0458103a 100644
--- a/math/octave-forge/distinfo
+++ b/math/octave-forge/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.11 2006/04/20 18:16:47 adam Exp $
+$NetBSD: distinfo,v 1.12 2006/10/24 13:54:40 pooka Exp $
SHA1 (octave-forge-2006.03.17.tar.gz) = fca78a6eee1a2d44d2441c9ed9d3ffe3c51689de
RMD160 (octave-forge-2006.03.17.tar.gz) = 0875f4ea9c7d4f3b9b0834decdbf590fe5166fa6
Size (octave-forge-2006.03.17.tar.gz) = 3727272 bytes
+SHA1 (patch-aa) = 01a91d7e63d61f78b9fd391f62694e58bb68ccad
+SHA1 (patch-ab) = 5fa5009bd6e516d5ff8d611f92ac63d30326789c
SHA1 (patch-ag) = 79fa60ff62548aac9293bc5f040fd0145b85720c
SHA1 (patch-ak) = 49c63b4b2a92cb971410f325a077152d7b5ebcd8
SHA1 (patch-al) = d6925ebcc11ea5ad0dfa9be0df614a74c7fa31d0
diff --git a/math/octave-forge/patches/patch-aa b/math/octave-forge/patches/patch-aa
new file mode 100644
index 00000000000..417bf4fd40a
--- /dev/null
+++ b/math/octave-forge/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2006/10/24 13:54:40 pooka Exp $
+
+--- main/sparse/make_sparse.h.orig 2006-10-20 12:53:46.000000000 +0200
++++ main/sparse/make_sparse.h 2006-10-20 12:54:36.000000000 +0200
+@@ -209,8 +209,6 @@
+
+ #include <string>
+
+-using namespace std;
+-
+ class ostream;
+
+ #ifdef NEED_OCTAVE_QUIT
diff --git a/math/octave-forge/patches/patch-ab b/math/octave-forge/patches/patch-ab
new file mode 100644
index 00000000000..61121e7fdfb
--- /dev/null
+++ b/math/octave-forge/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.6 2006/10/24 13:54:40 pooka Exp $
+
+--- main/sparse/make_sparse.cc.orig 2006-10-20 12:58:09.000000000 +0200
++++ main/sparse/make_sparse.cc 2006-10-20 12:58:23.000000000 +0200
+@@ -321,7 +321,7 @@
+ // if args(5) is not string, then ignore the value
+ // otherwise check for summation or unique
+ if ( args(5).is_string()) {
+- string vv= args(5).string_value();
++ std::string vv= args(5).string_value();
+ if (error_state) return retval;
+
+ if ( vv== "summation" ||