From 04aea5547c3299f2977e67db21b0ecca1f9fbe2f Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Wed, 26 Oct 2005 15:58:54 +0000
Subject: Make this package build on NetBSD-1.6.2, and remove warning on Mac OS
 X and Solaris.  Patches provided by Geert Hendrickx.

---
 lang/wsbasic/distinfo         |  4 +++-
 lang/wsbasic/patches/patch-ab | 13 +++++++++++++
 lang/wsbasic/patches/patch-ac | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 lang/wsbasic/patches/patch-ab
 create mode 100644 lang/wsbasic/patches/patch-ac

(limited to 'lang/wsbasic')

diff --git a/lang/wsbasic/distinfo b/lang/wsbasic/distinfo
index 1f398afa961..a6da9febbd2 100644
--- a/lang/wsbasic/distinfo
+++ b/lang/wsbasic/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/19 03:36:03 minskim Exp $
+$NetBSD: distinfo,v 1.2 2005/10/26 15:58:54 minskim Exp $
 
 SHA1 (wsbasic-1_2_4.tar.gz) = 5470c247fcdf7d3940d51f824d549c40495b60a5
 RMD160 (wsbasic-1_2_4.tar.gz) = 022c80019a5f6c85073d3a7386b51b41ff9285fe
 Size (wsbasic-1_2_4.tar.gz) = 20850 bytes
 SHA1 (patch-aa) = 0758724f05585c357a530b8979e56f6e15584493
+SHA1 (patch-ab) = 210b1f0dd17a2dfce691a79cbb375d920add9350
+SHA1 (patch-ac) = 62d1dabae7a7b566a4bea236814e28d86ef5227a
diff --git a/lang/wsbasic/patches/patch-ab b/lang/wsbasic/patches/patch-ab
new file mode 100644
index 00000000000..c5bd1ef7378
--- /dev/null
+++ b/lang/wsbasic/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/10/26 15:58:54 minskim Exp $
+
+--- number.h.orig	2004-06-09 02:20:18.000000000 +0200
++++ number.h
+@@ -26,7 +26,7 @@ class Number{
+     //==============
+     void toString(); //explicit conversion to string strVal
+     void toDouble(); //explicit conversion to double val
+-    void setValue( double d ){ val=d; strVal.clear(); bString=false;}
++    void setValue( double d ){ val=d; bString=false;}
+     void setValue( const string& s ){ strVal=s; bString=true;}
+ 
+     void minus(){ val=-val; }
diff --git a/lang/wsbasic/patches/patch-ac b/lang/wsbasic/patches/patch-ac
new file mode 100644
index 00000000000..d5807d74cf9
--- /dev/null
+++ b/lang/wsbasic/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.1 2005/10/26 15:58:54 minskim Exp $
+
+--- executer.cpp.orig	2005-01-27 01:27:53.000000000 +0100
++++ executer.cpp
+@@ -641,7 +641,8 @@ void Executer::execLeft( TreeNode* node 
+   GET_BINARY_OPERANDS
+   string val  = a->strVal;
+   int to      = (int) b->val;
+-  delete a,b;
++  delete a;
++  delete b;
+   runStack.pop();
+ 
+   if( ( to >= 0 ) && ( to < (int)val.size() ) ){
+@@ -658,7 +659,8 @@ void Executer::execRight( TreeNode* node
+   GET_BINARY_OPERANDS
+   string val  = a->strVal;
+   int to      = (int) b->val;
+-  delete a,b;
++  delete a;
++  delete b;
+   runStack.pop();
+ 
+   if( ( to >= 0 ) && ( to < (int)val.size() ) ){
+@@ -681,7 +683,8 @@ void Executer::execMid( TreeNode* node )
+   GET_BINARY_OPERANDS
+   string val  = a->strVal;
+   int    from = (int) b->val-1;
+-  delete a,b;
++  delete a;
++  delete b;
+   runStack.pop();
+ 
+   int to=0;
-- 
cgit v1.2.3