Update to version 2.20pl2, as hinted by Roland Illig in PR 26577. While

here, find a new fetch site since the previous one didn't work any more.

Patch1:

bwb_cnd.c
   Moved init routine for bwb_while so that it would be initialized regardless
   of expression value, not just if TRUE.  This was causing some segmentation
   faults in WHILE-WEND loops.

bwb_elx.c
   Plugged gaping memory leak.  Temp variable space for expression evaluation
   was being allocated but not freed when done (oops!).

bwb_fnc.c
   Added check for NULL return from getenv to prevent segmentation faults.

Patch2:

bwb_cmd.c
   Fixed calling stack level logic in RETURN statement to prevent erroneous
   "RETURN without GOSUB" messages.

bwb_cnd.c
bwb_stc.c

   Changed continuation condition for WHILE, ELSEIF, and LOOP UNTIL
   to be != FALSE, not == TRUE.  More in line with common commercial
   BASIC implementations.

bwb_mth.c
   Fixed initialization in VAL function so that old results are not later
   returned as values.

bwb_var.c
   Added parenthesis level checking to dim_getparams. Using multi-level
   expressions as array subscripts was causing the program to bomb.

bwx_iqc.c
bwx_tty.c
bwb_mes.h
   Added second copyright notice.

bwb_dio.c
bwb_str.c
   Added support for strings longer than 255 characters.

bwb_prn.c
   Disabled tab expansion and print width checks when not printing to a file.

bwb_inp.c
   Fixed LINE INPUT file reads to accommodate strings of length MAXSTRINGSIZE.

bwx_ncu.h
bwx_ncu.c
   New files.  Code for UNIX ncurses interface, compliments of L.C. Benschop,
   Eindhoven, The Netherlands.

Makefile.ncu
   New files.  Sample makefile for ncurses implementation.

bwbasic.h
   Revised defines for MININTSIZE and MAXINTSIZE from 16-bit to 32-bit limits.
   Revised define for MAXSTRINGSIZE from 255 to 5000 characters.
   Changed string length from unsigned char to unsigned int to support strings
   longer than 255 characters.
   Added support for new ncurses package.
   Revised VERSION define to reflect above changes.

2 files changed, 12 insertions, 7 deletions

diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index c33d7d8127b..6b8b61e2566 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.7 2004/01/27 00:53:11 heinz Exp $
+# $NetBSD: Makefile,v 1.8 2004/08/09 21:41:23 cube Exp $
 
+PKGNAME=	${DISTNAME:=pl2}
 DISTNAME=	bwbasic-2.20
-PKGREVISION=	1
+PKGREVISION=	# empty
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.rahul.net/pub/rhn/
+MASTER_SITES=	http://www.nicholson.com/rhn/files/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jspath@bcpl.net
 COMMENT=	The Bywater Basic interpreter
 
-WRKSRC=		${WRKDIR}/bwbasic-2.20p2/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/bwbasic-2.20p2/bwbasic-2.20
 DIST_SUBDIR=	${PKGNAME_NOREV}
 GNU_CONFIGURE=	yes
 
 SHARE_DIR=	${PREFIX}/share/bwbasic
 
+pre-patch:
+	${CP} ${WRKSRC}/../bwb-2.20-patch01/* ${WRKSRC}
+	${CP} ${WRKSRC}/../bwb-2.20-patch02/* ${WRKSRC}
+
 post-install:
 	${INSTALL_DATA_DIR} ${SHARE_DIR}
 	${CP} -r ${WRKSRC}/bwbtest ${SHARE_DIR}
diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo
index 7f36e1ea599..b531e12c533 100644
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/05/20 10:39:36 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/08/09 21:41:23 cube Exp $
 
-SHA1 (bwbasic-2.20/bwbasic-2.20.tar.Z) = b96ff440c573b9aac17dfd90830e3defa46a5592
-Size (bwbasic-2.20/bwbasic-2.20.tar.Z) = 485971 bytes
+SHA1 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = b96ff440c573b9aac17dfd90830e3defa46a5592
+Size (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = 485971 bytes
 SHA1 (patch-aa) = e397e2e5b88ccccb44750702bff6d65054d96641
 SHA1 (patch-ac) = e316d334098ba1919239959333804973619dbc81