Update to 3.00

Upstream changes:
CHANGES FROM 2.61 to 3.00

   * Code redesign from Howard Wulf, AF5NE


CHANGES FROM 2.60 to 2.61

   * Bug fix from Matthias Rustler


CHANGES FROM 2.50 to 2.60

   * New maths functions and append mode support from Edmond Orignac

   * Bug fixes

5 files changed, 226 insertions, 65 deletions

diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 0ba05c87485..9392396f529 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2012/10/02 20:11:36 asau Exp $
+# $NetBSD: Makefile,v 1.17 2015/05/20 07:28:05 wen Exp $
 
-DISTNAME=	bwbasic-2.50
+DISTNAME=	bwbasic-3.00
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bwbasic/}
 EXTRACT_SUFX=	.zip
@@ -15,6 +15,8 @@ GNU_CONFIGURE=	yes
 
 SHARE_DIR=	${PREFIX}/share/bwbasic
 
+CFLAGS+=		-DHAVE_ISNAN=1
+
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${SHARE_DIR}
 
 post-install:
diff --git a/lang/bwbasic/PLIST b/lang/bwbasic/PLIST
index 1509926ef3b..24c124b1763 100644
--- a/lang/bwbasic/PLIST
+++ b/lang/bwbasic/PLIST
@@ -1,45 +1,226 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/05/20 07:28:05 wen Exp $
 bin/bwbasic
 man/man1/bwbasic.1
+share/bwbasic/bwbtest/00readme.txt
+share/bwbasic/bwbtest/00test.sh
+share/bwbasic/bwbtest/PAD80.BAS
+share/bwbasic/bwbtest/PAD80.INP
+share/bwbasic/bwbtest/abs.80
+share/bwbasic/bwbtest/abs.OUT
 share/bwbasic/bwbtest/abs.bas
+share/bwbasic/bwbtest/abs.dif
+share/bwbasic/bwbtest/abs.run
+share/bwbasic/bwbtest/assign.80
+share/bwbasic/bwbtest/assign.OUT
 share/bwbasic/bwbtest/assign.bas
+share/bwbasic/bwbtest/assign.dif
+share/bwbasic/bwbtest/assign.run
+share/bwbasic/bwbtest/callfunc.80
+share/bwbasic/bwbtest/callfunc.OUT
 share/bwbasic/bwbtest/callfunc.bas
+share/bwbasic/bwbtest/callfunc.dif
+share/bwbasic/bwbtest/callfunc.run
+share/bwbasic/bwbtest/callsub.80
+share/bwbasic/bwbtest/callsub.OUT
 share/bwbasic/bwbtest/callsub.bas
+share/bwbasic/bwbtest/callsub.dif
+share/bwbasic/bwbtest/callsub.run
+share/bwbasic/bwbtest/chain1.80
+share/bwbasic/bwbtest/chain1.OUT
 share/bwbasic/bwbtest/chain1.bas
+share/bwbasic/bwbtest/chain1.dif
+share/bwbasic/bwbtest/chain1.run
+share/bwbasic/bwbtest/chain2.80
+share/bwbasic/bwbtest/chain2.OUT
 share/bwbasic/bwbtest/chain2.bas
+share/bwbasic/bwbtest/chain2.dif
+share/bwbasic/bwbtest/chain2.run
+share/bwbasic/bwbtest/data.tmp
+share/bwbasic/bwbtest/dataread.80
+share/bwbasic/bwbtest/dataread.OUT
 share/bwbasic/bwbtest/dataread.bas
+share/bwbasic/bwbtest/dataread.dif
+share/bwbasic/bwbtest/dataread.run
+share/bwbasic/bwbtest/deffn.80
+share/bwbasic/bwbtest/deffn.OUT
 share/bwbasic/bwbtest/deffn.bas
+share/bwbasic/bwbtest/deffn.dif
+share/bwbasic/bwbtest/deffn.run
+share/bwbasic/bwbtest/dif.OUT
+share/bwbasic/bwbtest/dim.80
+share/bwbasic/bwbtest/dim.OUT
 share/bwbasic/bwbtest/dim.bas
+share/bwbasic/bwbtest/dim.dif
+share/bwbasic/bwbtest/dim.run
+share/bwbasic/bwbtest/doloop.80
+share/bwbasic/bwbtest/doloop.OUT
 share/bwbasic/bwbtest/doloop.bas
+share/bwbasic/bwbtest/doloop.dif
+share/bwbasic/bwbtest/doloop.run
+share/bwbasic/bwbtest/dowhile.80
+share/bwbasic/bwbtest/dowhile.OUT
 share/bwbasic/bwbtest/dowhile.bas
+share/bwbasic/bwbtest/dowhile.dif
+share/bwbasic/bwbtest/dowhile.run
+share/bwbasic/bwbtest/elseif.80
+share/bwbasic/bwbtest/elseif.INP
+share/bwbasic/bwbtest/elseif.OUT
 share/bwbasic/bwbtest/elseif.bas
+share/bwbasic/bwbtest/elseif.dif
+share/bwbasic/bwbtest/elseif.run
+share/bwbasic/bwbtest/end.80
+share/bwbasic/bwbtest/end.OUT
 share/bwbasic/bwbtest/end.bas
+share/bwbasic/bwbtest/end.dif
+share/bwbasic/bwbtest/end.run
+share/bwbasic/bwbtest/err.80
+share/bwbasic/bwbtest/err.OUT
 share/bwbasic/bwbtest/err.bas
+share/bwbasic/bwbtest/err.dif
+share/bwbasic/bwbtest/err.run
+share/bwbasic/bwbtest/fncallfn.80
+share/bwbasic/bwbtest/fncallfn.OUT
 share/bwbasic/bwbtest/fncallfn.bas
+share/bwbasic/bwbtest/fncallfn.dif
+share/bwbasic/bwbtest/fncallfn.run
+share/bwbasic/bwbtest/fornext.80
+share/bwbasic/bwbtest/fornext.OUT
 share/bwbasic/bwbtest/fornext.bas
+share/bwbasic/bwbtest/fornext.dif
+share/bwbasic/bwbtest/fornext.run
+share/bwbasic/bwbtest/function.80
+share/bwbasic/bwbtest/function.INP
+share/bwbasic/bwbtest/function.OUT
 share/bwbasic/bwbtest/function.bas
+share/bwbasic/bwbtest/function.dif
+share/bwbasic/bwbtest/function.run
+share/bwbasic/bwbtest/gosub.80
+share/bwbasic/bwbtest/gosub.INP
+share/bwbasic/bwbtest/gosub.OUT
 share/bwbasic/bwbtest/gosub.bas
+share/bwbasic/bwbtest/gosub.dif
+share/bwbasic/bwbtest/gosub.run
+share/bwbasic/bwbtest/gotolabl.80
+share/bwbasic/bwbtest/gotolabl.OUT
 share/bwbasic/bwbtest/gotolabl.bas
+share/bwbasic/bwbtest/gotolabl.dif
+share/bwbasic/bwbtest/gotolabl.run
+share/bwbasic/bwbtest/ifline.80
+share/bwbasic/bwbtest/ifline.OUT
 share/bwbasic/bwbtest/ifline.bas
+share/bwbasic/bwbtest/ifline.dif
+share/bwbasic/bwbtest/ifline.run
 share/bwbasic/bwbtest/index.txt
+share/bwbasic/bwbtest/input.80
+share/bwbasic/bwbtest/input.INP
+share/bwbasic/bwbtest/input.OUT
 share/bwbasic/bwbtest/input.bas
+share/bwbasic/bwbtest/input.dif
+share/bwbasic/bwbtest/input.run
+share/bwbasic/bwbtest/lof.80
+share/bwbasic/bwbtest/lof.INP
+share/bwbasic/bwbtest/lof.OUT
 share/bwbasic/bwbtest/lof.bas
+share/bwbasic/bwbtest/lof.dif
+share/bwbasic/bwbtest/lof.run
+share/bwbasic/bwbtest/loopuntl.80
+share/bwbasic/bwbtest/loopuntl.OUT
 share/bwbasic/bwbtest/loopuntl.bas
+share/bwbasic/bwbtest/loopuntl.dif
+share/bwbasic/bwbtest/loopuntl.run
+share/bwbasic/bwbtest/main.80
+share/bwbasic/bwbtest/main.OUT
 share/bwbasic/bwbtest/main.bas
+share/bwbasic/bwbtest/main.dif
+share/bwbasic/bwbtest/main.run
+share/bwbasic/bwbtest/mlifthen.80
+share/bwbasic/bwbtest/mlifthen.OUT
 share/bwbasic/bwbtest/mlifthen.bas
+share/bwbasic/bwbtest/mlifthen.dif
+share/bwbasic/bwbtest/mlifthen.run
+share/bwbasic/bwbtest/on.80
+share/bwbasic/bwbtest/on.INP
+share/bwbasic/bwbtest/on.OUT
 share/bwbasic/bwbtest/on.bas
+share/bwbasic/bwbtest/on.dif
+share/bwbasic/bwbtest/on.run
+share/bwbasic/bwbtest/onerr.80
+share/bwbasic/bwbtest/onerr.OUT
 share/bwbasic/bwbtest/onerr.bas
+share/bwbasic/bwbtest/onerr.dif
+share/bwbasic/bwbtest/onerr.run
+share/bwbasic/bwbtest/onerrlbl.80
+share/bwbasic/bwbtest/onerrlbl.OUT
 share/bwbasic/bwbtest/onerrlbl.bas
+share/bwbasic/bwbtest/onerrlbl.dif
+share/bwbasic/bwbtest/onerrlbl.run
+share/bwbasic/bwbtest/ongosub.80
+share/bwbasic/bwbtest/ongosub.INP
+share/bwbasic/bwbtest/ongosub.OUT
 share/bwbasic/bwbtest/ongosub.bas
+share/bwbasic/bwbtest/ongosub.dif
+share/bwbasic/bwbtest/ongosub.run
+share/bwbasic/bwbtest/opentest.80
+share/bwbasic/bwbtest/opentest.OUT
 share/bwbasic/bwbtest/opentest.bas
+share/bwbasic/bwbtest/opentest.dif
+share/bwbasic/bwbtest/opentest.run
+share/bwbasic/bwbtest/option.80
+share/bwbasic/bwbtest/option.OUT
 share/bwbasic/bwbtest/option.bas
+share/bwbasic/bwbtest/option.dif
+share/bwbasic/bwbtest/option.run
+share/bwbasic/bwbtest/pascaltr.80
+share/bwbasic/bwbtest/pascaltr.OUT
 share/bwbasic/bwbtest/pascaltr.bas
+share/bwbasic/bwbtest/pascaltr.dif
+share/bwbasic/bwbtest/pascaltr.run
+share/bwbasic/bwbtest/profile.bas
+share/bwbasic/bwbtest/putget.80
+share/bwbasic/bwbtest/putget.INP
+share/bwbasic/bwbtest/putget.OUT
 share/bwbasic/bwbtest/putget.bas
+share/bwbasic/bwbtest/putget.dif
+share/bwbasic/bwbtest/putget.run
+share/bwbasic/bwbtest/random.80
+share/bwbasic/bwbtest/random.OUT
 share/bwbasic/bwbtest/random.bas
+share/bwbasic/bwbtest/random.dif
+share/bwbasic/bwbtest/random.run
+share/bwbasic/bwbtest/selcase.80
+share/bwbasic/bwbtest/selcase.OUT
 share/bwbasic/bwbtest/selcase.bas
+share/bwbasic/bwbtest/selcase.dif
+share/bwbasic/bwbtest/selcase.run
+share/bwbasic/bwbtest/snglfunc.80
+share/bwbasic/bwbtest/snglfunc.OUT
 share/bwbasic/bwbtest/snglfunc.bas
+share/bwbasic/bwbtest/snglfunc.dif
+share/bwbasic/bwbtest/snglfunc.run
+share/bwbasic/bwbtest/stop.80
+share/bwbasic/bwbtest/stop.OUT
 share/bwbasic/bwbtest/stop.bas
+share/bwbasic/bwbtest/stop.dif
+share/bwbasic/bwbtest/stop.run
+share/bwbasic/bwbtest/term.80
+share/bwbasic/bwbtest/term.INP
+share/bwbasic/bwbtest/term.OUT
 share/bwbasic/bwbtest/term.bas
+share/bwbasic/bwbtest/term.dif
+share/bwbasic/bwbtest/term.run
+share/bwbasic/bwbtest/test.out
+share/bwbasic/bwbtest/whilwend.80
+share/bwbasic/bwbtest/whilwend.OUT
 share/bwbasic/bwbtest/whilwend.bas
+share/bwbasic/bwbtest/whilwend.dif
+share/bwbasic/bwbtest/whilwend.run
+share/bwbasic/bwbtest/width.80
+share/bwbasic/bwbtest/width.OUT
 share/bwbasic/bwbtest/width.bas
+share/bwbasic/bwbtest/width.dif
+share/bwbasic/bwbtest/width.run
+share/bwbasic/bwbtest/writeinp.80
+share/bwbasic/bwbtest/writeinp.OUT
 share/bwbasic/bwbtest/writeinp.bas
+share/bwbasic/bwbtest/writeinp.dif
+share/bwbasic/bwbtest/writeinp.run
diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo
index 3bb6e51b200..572506056ea 100644
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2012/01/15 15:29:31 ryoon Exp $
+$NetBSD: distinfo,v 1.11 2015/05/20 07:28:05 wen Exp $
 
-SHA1 (bwbasic-2.50.zip) = 6e8e8af9fa791bff791534d429092b4904609424
-RMD160 (bwbasic-2.50.zip) = bccc94eb3dcbf903fc1535cda67353f7c372d520
-Size (bwbasic-2.50.zip) = 209629 bytes
+SHA1 (bwbasic-3.00.zip) = 89bb9e960bb91339752bb6d9796d93998d9ca3f6
+RMD160 (bwbasic-3.00.zip) = 3d78b2fc3c6a73856b92443c296d71cd5b39208e
+Size (bwbasic-3.00.zip) = 2777709 bytes
 SHA1 (patch-aa) = ca4a5d62dc7aebfcace1df368cdc6ffbaa2c60da
-SHA1 (patch-ac) = 99156f6cd267196af2c3ba62ca7e668ebfd38a24
-SHA1 (patch-bwbasic.h) = 52b19a328791da3b53832ca16cc17ff453558048
+SHA1 (patch-ac) = 1f8e3a3d6d75223abe2ceef63b5eb97a4b4cf4b4
diff --git a/lang/bwbasic/patches/patch-ac b/lang/bwbasic/patches/patch-ac
index 99334e8928b..3dbd2e44690 100644
--- a/lang/bwbasic/patches/patch-ac
+++ b/lang/bwbasic/patches/patch-ac
@@ -1,18 +1,21 @@
-$NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
+$NetBSD: patch-ac,v 1.4 2015/05/20 07:27:21 wen Exp $
 
---- bwbasic.doc.orig	2006-10-24 05:40:18.000000000 +0000
+--- bwbasic.doc.orig	2015-05-20 14:17:40.000000000 +0000
 +++ bwbasic.doc
-@@ -1,33 +1,10 @@
+@@ -1,36 +1,10 @@
 -
 -
 -
 -
--               Bywater BASIC Interpreter/Shell, version 2.10
+-               Bywater BASIC Interpreter, version 3.00
 -               ---------------------------------------------
 -
 -                    Copyright (c) 1993, Ted A. Campbell
 -                  for bwBASIC version 2.10, 11 October 1993
 -
+-                  Copyright (c) 2014-2015, Howatd Wulf, AF5NE
+-                  for bwBASIC version 3.00, 2015-04-05
+-
 -
 -CONTENTS:
 -
@@ -43,16 +46,16 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
  
     The Bywater BASIC Interpreter (bwBASIC) implements a large
     superset of the ANSI Standard for Minimal BASIC (X3.60-1978)
-@@ -60,7 +37,7 @@ CONTENTS:
-    offer further shell-processing capabilities.
+@@ -53,7 +27,7 @@ CONTENTS:
+    into distinct lines as they are loaded.
  
  
 -2. TERMS OF USE:
-+.Sh TERMS OF USE
++.Sh TERMS OF USE:
  
     This version of Bywater BASIC is released under the terms of the 
     GNU General Public License (GPL), which is distributed with this 
-@@ -71,7 +48,7 @@ CONTENTS:
+@@ -64,7 +38,7 @@ CONTENTS:
     for information on which you should contact the author.
  
  
@@ -60,27 +63,27 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
 +.Sh QUICK REFERENCE LIST OF COMMANDS AND FUNCTIONS
  
     Be aware that many of these commands and functions will not be
-    available unless you have set certain flags in the header files
-@@ -199,7 +176,7 @@ CONTENTS:
-    WRITE [# device-number,] element [, element ]....
+    available unless you have enabled a particular dialect using
+@@ -380,7 +354,7 @@ CONTENTS:
+      WRITE [# device-number,] element [, .... ]
     
  
 -4. GENERAL NOTES ON USAGE:
-+.Sh GENERAL NOTES ON USAGE
++.Sh GENERAL NOTES ON USAGE:
  
     4.a. Interactive Environment
  
-@@ -305,7 +282,7 @@ CONTENTS:
-    aliases to allow Microsoft-style programs to be run.
- 
- 
+@@ -790,7 +764,7 @@ CONTENTS:
+    END FUNCTION
+    
+    
 -5. EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
 +.Sh EXPANDED REFERENCE FOR COMMANDS AND FUNCTIONS
+    
+    bwBASIC provides a simple "HELP" command to assist you in
+    finding the command or function you are looking for.
+@@ -6965,7 +6939,7 @@ DESCRIPTION: For file X, sets the line w
  
-    The "Dependencies" listed in the folowing reference materials
-    refers to flags that must be set to TRUE in bwbasic.h for the
-@@ -1636,7 +1613,7 @@ CONTENTS:
-    ------------------------------------------
  
  
 -6. PREDEFINED VARIABLES
@@ -88,16 +91,16 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
  
     BWB.EDITOR$
     BWB.FILES$
-@@ -1669,7 +1646,7 @@ CONTENTS:
-    (specifically CLS, LOCATE, and INKEY$) may be available. 
- 
- 
+@@ -7003,7 +6977,7 @@ DESCRIPTION: For file X, sets the line w
+    return the current OPTION TERMINAL setting.
+    
+    
 -7. UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
 +.Sh UNIMPLEMENTED COMMANDS AND FUNCTIONS, and AGENDA FOR DEVELOPMENT
  
     There are some items not implemented that have been so long
     a part of standard BASICs that their absence will seem surprising.
-@@ -1853,7 +1830,7 @@ CONTENTS:
+@@ -7172,7 +7146,7 @@ DESCRIPTION: For file X, sets the line w
     ZONEWIDTH
  
  
@@ -106,13 +109,12 @@ $NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
  
     This program was originally begun in 1982 by my grandmother, Mrs.
     Verda Spell of Beaumont, TX.  She was writing the program using
-@@ -1873,9 +1850,3 @@ CONTENTS:
-    bag and eventually managed to have it all copied over to a PC
-    diskette. I have revised it slightly prior to this release. You
+@@ -7194,7 +7168,7 @@ DESCRIPTION: For file X, sets the line w
     should know, though, that I myself am an historian, not a programmer.
--
--
+ 
+ 
 -9. COMMUNICATIONS:
--
--   email:  tcamp@delphi.com
--
++.Sh COMMUNICATIONS:
+ 
+    email:  tcamp@delphi.com
+ 
diff --git a/lang/bwbasic/patches/patch-bwbasic.h b/lang/bwbasic/patches/patch-bwbasic.h
deleted file mode 100644
index 80737989f0b..00000000000
--- a/lang/bwbasic/patches/patch-bwbasic.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-bwbasic.h,v 1.1 2012/01/15 15:29:31 ryoon Exp $
-
-* Suppress redefined messages.
-
---- bwbasic.h.orig	2009-06-04 12:50:18.000000000 +0000
-+++ bwbasic.h
-@@ -111,10 +111,16 @@
- ***************************************************************/
- 
- #ifdef __STDC__
-+#ifndef HAVE_RAISE
- #define HAVE_RAISE TRUE
-+#endif
-+#ifndef HAVE_STRING
- #define HAVE_STRING TRUE
-+#endif
-+#ifndef HAVE_STDLIB
- #define HAVE_STDLIB TRUE
- #endif
-+#endif
- 
- #ifdef __STDC__
- #define	HAVE_SIGNAL	TRUE