Update wsbasic to 1.2.5. Patches provided by Geert Hendrickx.

Changes:
- patch-ab and patch-ac were incorporated.

5 files changed, 9 insertions, 58 deletions

diff --git a/lang/wsbasic/Makefile b/lang/wsbasic/Makefile
index 43779550840..3d99a54b4a0 100644
--- a/lang/wsbasic/Makefile
+++ b/lang/wsbasic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/19 03:36:03 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/10/26 21:38:30 minskim Exp $
 
-DISTNAME=	wsbasic-1_2_4
+DISTNAME=	wsbasic-1_2_5
 PKGNAME=	${DISTNAME:S/_/./g}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wsbasic/}
diff --git a/lang/wsbasic/distinfo b/lang/wsbasic/distinfo
index a6da9febbd2..805ec362663 100644
--- a/lang/wsbasic/distinfo
+++ b/lang/wsbasic/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/10/26 15:58:54 minskim Exp $
+$NetBSD: distinfo,v 1.3 2005/10/26 21:38:30 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
+SHA1 (wsbasic-1_2_5.tar.gz) = 7cac105c3d11ee00e008b7d1756f8ddf9a70929e
+RMD160 (wsbasic-1_2_5.tar.gz) = 70b8aeb73a2a2ba9f05b9067645c6feb895ee382
+Size (wsbasic-1_2_5.tar.gz) = 20745 bytes
+SHA1 (patch-aa) = 5217f62abd2efd27faaf9dad9371932a28218230
diff --git a/lang/wsbasic/patches/patch-aa b/lang/wsbasic/patches/patch-aa
index 17440f43f34..e7a2b000bbf 100644
--- a/lang/wsbasic/patches/patch-aa
+++ b/lang/wsbasic/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/19 03:36:03 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/26 21:38:30 minskim Exp $
 
 --- Makefile.orig	2005-01-28 02:40:58.000000000 +0100
 +++ Makefile
@@ -8,5 +8,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/10/19 03:36:03 minskim Exp $
  FLAGS       = -O2 -Wall #-D_DEBUG_
 +FLAGS      += $(CXXFLAGS)
  INSTALL_DIR = /usr/local/bin/
- RELEASE	    = 1_2_4
+ RELEASE	    = 1_2_5
  
diff --git a/lang/wsbasic/patches/patch-ab b/lang/wsbasic/patches/patch-ab
deleted file mode 100644
index c5bd1ef7378..00000000000
--- a/lang/wsbasic/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index d5807d74cf9..00000000000
--- a/lang/wsbasic/patches/patch-ac
+++ /dev/null
@@ -1,34 +0,0 @@
-$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;