Update to 2.50

Based on PR pkg/42846

Changelog:
CHANGES FROM 2.40 to 2.50
   * Bug fixes
   * New compilation procedure for MVS and CMS

CHANGES FROM 2.30 to 2.40
   * Bug fixes from Bill Chatfield
   * Updated documentation
   * Added support for compiling on CMS (another IBM mainframe OS)

CHANGES FROM 2.20pl2 to 2.30
   * Minor bug fixes, cosmetic improvements and portability improvements
   * Added support for compiling on MVS (IBM mainframe)

Tested on NetBSD/i3865.99.59 and 5.1.

7 files changed, 53 insertions, 77 deletions

diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 28c45f6a0af..011d79f7cff 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,37 +1,28 @@
-# $NetBSD: Makefile,v 1.14 2010/03/03 12:38:28 obache Exp $
+# $NetBSD: Makefile,v 1.15 2012/01/15 15:29:31 ryoon Exp $
 
-PKGNAME=	${DISTNAME:=pl2}
-DISTNAME=	bwbasic-2.20
+DISTNAME=	bwbasic-2.50
 CATEGORIES=	lang
-MASTER_SITES=	http://www.nicholson.com/rhn/files/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bwbasic/}
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	jspath@bcpl.net
-HOMEPAGE=	http://bwbasic.sourceforge.net/
+HOMEPAGE=	http://sourceforge.net/projects/bwbasic/
 COMMENT=	The Bywater Basic interpreter
 LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/bwbasic-2.20p2
-BWBASIC_WRKSRC=	${WRKSRC}/bwbasic-2.20
-DIST_SUBDIR=	${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}
 GNU_CONFIGURE=	yes
-CONFIGURE_DIRS=	${BWBASIC_WRKSRC}
-BUILD_DIRS=	${CONFIGURE_DIRS}
 
 SHARE_DIR=	${PREFIX}/share/bwbasic
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${SHARE_DIR}
 
-pre-patch:
-	${CP} ${WRKSRC}/bwb-2.20-patch01/* ${BWBASIC_WRKSRC}
-	${CP} ${WRKSRC}/bwb-2.20-patch02/* ${BWBASIC_WRKSRC}
-
 post-install:
-	${CP} -r ${BWBASIC_WRKSRC}/bwbtest ${DESTDIR}${SHARE_DIR}
+	${CP} -r ${WRKSRC}/bwbtest ${DESTDIR}${SHARE_DIR}
 	${FIND} ${DESTDIR}${SHARE_DIR} -type d -print | ${XARGS} ${CHMOD} ${BINMODE}
 	${FIND} ${DESTDIR}${SHARE_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bwbasic.1
+	${INSTALL_MAN} ${WRKSRC}/bwbasic.doc ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/bwbasic.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo
index 747a85fb067..3bb6e51b200 100644
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/08/29 06:09:19 dholland Exp $
+$NetBSD: distinfo,v 1.10 2012/01/15 15:29:31 ryoon Exp $
 
-SHA1 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = b96ff440c573b9aac17dfd90830e3defa46a5592
-RMD160 (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = a6ae5cdde2aa18228258314a34b776d3681cb0e8
-Size (bwbasic-2.20pl2/bwbasic-2.20.tar.Z) = 485971 bytes
-SHA1 (patch-aa) = 6b955a62001cb357a960202842c7f08930b70448
-SHA1 (patch-ab) = 7c2efa205c5866733bfd99dbd102aa517afc819f
-SHA1 (patch-ac) = 286c3f91c90b33d1bab2de1581900129661ca74a
-SHA1 (patch-ad) = 030c3105be620ff8442765ee5c28322b2fd568b4
+SHA1 (bwbasic-2.50.zip) = 6e8e8af9fa791bff791534d429092b4904609424
+RMD160 (bwbasic-2.50.zip) = bccc94eb3dcbf903fc1535cda67353f7c372d520
+Size (bwbasic-2.50.zip) = 209629 bytes
+SHA1 (patch-aa) = ca4a5d62dc7aebfcace1df368cdc6ffbaa2c60da
+SHA1 (patch-ac) = 99156f6cd267196af2c3ba62ca7e668ebfd38a24
+SHA1 (patch-bwbasic.h) = 52b19a328791da3b53832ca16cc17ff453558048
diff --git a/lang/bwbasic/patches/patch-aa b/lang/bwbasic/patches/patch-aa
index 6474fcbddb2..51177063f17 100644
--- a/lang/bwbasic/patches/patch-aa
+++ b/lang/bwbasic/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/03/02 14:27:12 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2012/01/15 15:29:31 ryoon Exp $
 
---- bwbasic-2.20/Makefile.in.orig	Sat Nov 25 14:32:18 1995
-+++ bwbasic-2.20/Makefile.in	Sun Feb  6 16:12:49 2000
-@@ -16,9 +16,10 @@
+--- Makefile.in.orig	2009-06-04 12:50:16.000000000 +0000
++++ Makefile.in
+@@ -16,9 +16,10 @@ INSTALL_DATA = @INSTALL_DATA@
  
  DEFS = @DEFS@
  
diff --git a/lang/bwbasic/patches/patch-ab b/lang/bwbasic/patches/patch-ab
deleted file mode 100644
index a2787303c18..00000000000
--- a/lang/bwbasic/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/12/30 23:29:36 joerg Exp $
-
---- bwbasic-2.20/bwbasic.c.orig	2005-12-30 23:25:02.000000000 +0000
-+++ bwbasic-2.20/bwbasic.c
-@@ -51,7 +51,7 @@
- char *bwb_ebuf;				/* error buffer */
- static char *read_line;
- int bwb_trace = FALSE;
--FILE *errfdevice = stderr;              /* output device for error messages */
-+FILE *errfdevice;              /* output device for error messages */
- 
- #if HAVE_LONGJUMP
- jmp_buf mark;
-@@ -133,6 +133,8 @@ bwb_init( argc, argv )
-    static char end_buf[] = "\0";
- #endif
- 
-+   errfdevice = stderr;
-+
- #if INTENSIVE_DEBUG
-    prn_xprintf( stderr, "Memory Allocation Statistics:\n" );
-    prn_xprintf( stderr, "----------------------------\n" );
diff --git a/lang/bwbasic/patches/patch-ac b/lang/bwbasic/patches/patch-ac
index e2235228eaf..99334e8928b 100644
--- a/lang/bwbasic/patches/patch-ac
+++ b/lang/bwbasic/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2012/01/15 15:29:31 ryoon Exp $
 
---- bwbasic-2.20/bwbasic.doc	Tue Oct 12 19:30:12 1993
-+++ bwbasic-2.20/bwbasic.1	Fri Feb 11 22:42:36 2000
+--- bwbasic.doc.orig	2006-10-24 05:40:18.000000000 +0000
++++ bwbasic.doc
 @@ -1,33 +1,10 @@
 -
 -
@@ -43,7 +43,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     The Bywater BASIC Interpreter (bwBASIC) implements a large
     superset of the ANSI Standard for Minimal BASIC (X3.60-1978)
-@@ -60,7 +37,7 @@
+@@ -60,7 +37,7 @@ CONTENTS:
     offer further shell-processing capabilities.
  
  
@@ -52,7 +52,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     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 @@
+@@ -71,7 +48,7 @@ CONTENTS:
     for information on which you should contact the author.
  
  
@@ -61,7 +61,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     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 @@
+@@ -199,7 +176,7 @@ CONTENTS:
     WRITE [# device-number,] element [, element ]....
     
  
@@ -70,7 +70,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     4.a. Interactive Environment
  
-@@ -305,7 +282,7 @@
+@@ -305,7 +282,7 @@ CONTENTS:
     aliases to allow Microsoft-style programs to be run.
  
  
@@ -79,7 +79,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     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 @@
+@@ -1636,7 +1613,7 @@ CONTENTS:
     ------------------------------------------
  
  
@@ -88,7 +88,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     BWB.EDITOR$
     BWB.FILES$
-@@ -1669,7 +1646,7 @@
+@@ -1669,7 +1646,7 @@ CONTENTS:
     (specifically CLS, LOCATE, and INKEY$) may be available. 
  
  
@@ -97,7 +97,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig Exp $
  
     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 @@
+@@ -1853,7 +1830,7 @@ CONTENTS:
     ZONEWIDTH
  
  
@@ -106,7 +106,7 @@ $NetBSD: patch-ac,v 1.2 2005/11/03 22:19:01 rillig 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 @@
+@@ -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
     should know, though, that I myself am an historian, not a programmer.
diff --git a/lang/bwbasic/patches/patch-ad b/lang/bwbasic/patches/patch-ad
deleted file mode 100644
index a8cef79f814..00000000000
--- a/lang/bwbasic/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2011/08/29 06:09:19 dholland Exp $
-
-- fix void main.
-
---- bwbasic-2.20/bwx_tty.c~	2011-08-29 06:01:48.000000000 +0000
-+++ bwbasic-2.20/bwx_tty.c
-@@ -66,7 +66,7 @@ extern jmp_buf mark;
- ***************************************************************/
- 
- #if ANSI_C
--void
-+int
- main( int argc, char **argv )
- #else
- main( argc, argv )
diff --git a/lang/bwbasic/patches/patch-bwbasic.h b/lang/bwbasic/patches/patch-bwbasic.h
new file mode 100644
index 00000000000..80737989f0b
--- /dev/null
+++ b/lang/bwbasic/patches/patch-bwbasic.h
@@ -0,0 +1,23 @@
+$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