6 files changed, 24 insertions, 108 deletions

diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 4129543a6e6d..ec7c5db2ba67 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	bwbasic
-PORTVERSION=	3.10
+PORTVERSION=	3.20
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/version%20${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Bywater Basic interpreter
 
 LICENSE=	GPLv2
@@ -19,9 +19,7 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS=	CFLAGS="${CFLAGS} -Wall -ansi"
 
 PORTDOCS=	*
-PORTEXAMPLES=	*
-PORTEXAMPLES1=	B15A B15B C77A C77B D71 G65 GAMES HB1 HB1X \
-		HB2 HB2X I70 M80 NBS2 NBS2X T80A T80B T80C
+
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/renum
 
@@ -34,10 +32,4 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.doc ${STAGEDIR}${DOCSDIR}
 
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for d in ${PORTEXAMPLES1}
-	(cd ${WRKSRC}; ${COPYTREE_SHARE} ${d} ${STAGEDIR}${EXAMPLESDIR})
-.endfor
-
 .include <bsd.port.mk>
diff --git a/lang/bwbasic/distinfo b/lang/bwbasic/distinfo
index ac13a89291c1..4794e6d02c87 100644
--- a/lang/bwbasic/distinfo
+++ b/lang/bwbasic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484703673
-SHA256 (bwbasic-3.10.zip) = f73c1a4de8e5bb7ef66c62b00b1699ec414bc9e36b9ed59bcd3692cb9fbd1be1
-SIZE (bwbasic-3.10.zip) = 3158727
+TIMESTAMP = 1514798362
+SHA256 (bwbasic-3.20.zip) = ee18eefab7ed91ad1ad50ccab33eb038c4abd753595e19982890867f282339f1
+SIZE (bwbasic-3.20.zip) = 510680
diff --git a/lang/bwbasic/files/patch-Makefile.in b/lang/bwbasic/files/patch-Makefile.in
index 4a030b9dc906..e248f0487e0a 100644
--- a/lang/bwbasic/files/patch-Makefile.in
+++ b/lang/bwbasic/files/patch-Makefile.in
@@ -1,23 +1,5 @@
---- Makefile.in.orig	2017-01-19 00:10:01 UTC
+--- Makefile.in.orig	2018-01-01 11:17:18 UTC
 +++ Makefile.in
-@@ -29,13 +29,13 @@ bindir = $(exec_prefix)/bin
- 
- SHELL = /bin/sh
- 
--CFILES=         bwbasic.c bwb_cmd.c bwb_cnd.c bwb_dio.c bwb_elx.c\
--                bwb_exp.c bwb_fnc.c bwb_inp.c bwb_int.c bwb_ops.c\
-+CFILES=         bwbasic.c bwb_cmd.c bwb_cnd.c bwb_dio.c\
-+                bwb_exp.c bwb_fnc.c bwb_inp.c bwb_int.c\
-                 bwb_prn.c bwb_stc.c bwb_str.c bwb_tbl.c bwb_var.c\
- 		bwd_cmd.c bwd_fun.c bwx_tty.c
- 
--OFILES=         bwbasic.o bwb_cmd.o bwb_cnd.o bwb_dio.o bwb_elx.o\
--                bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o bwb_ops.o\
-+OFILES=         bwbasic.o bwb_cmd.o bwb_cnd.o bwb_dio.o\
-+                bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o\
-                 bwb_prn.o bwb_stc.o bwb_str.o bwb_tbl.o bwb_var.o\
- 		bwd_cmd.o bwd_fun.o bwx_tty.o
-  
 @@ -66,8 +66,8 @@ bwbasic:	$(OFILES)
  		$(CC) $(OFILES) -lm -o $@ $(LDFLAGS)
  
@@ -25,7 +7,7 @@
 -renum:
 -	$(CC) renum.c -o renum
 +renum:		renum.o
-+		$(CC) renum.o -o $@ $(LDFLAGS) 
++	$(CC)	renum.o -o $@ $(LDFLAGS) 
  
  $(OFILES):      $(HFILES)
  
diff --git a/lang/bwbasic/files/patch-bwb__cmd.c b/lang/bwbasic/files/patch-bwb__cmd.c
index 03f97cd19145..0503387b183b 100644
--- a/lang/bwbasic/files/patch-bwb__cmd.c
+++ b/lang/bwbasic/files/patch-bwb__cmd.c
@@ -1,10 +1,10 @@
---- bwb_cmd.c.orig	2017-01-19 00:10:00 UTC
+--- bwb_cmd.c.orig	2018-01-01 11:17:18 UTC
 +++ bwb_cmd.c
-@@ -38,6 +38,7 @@
+@@ -40,6 +40,7 @@
  
  
  
 +#include <string.h>
  #include "bwbasic.h"
  
- 
+ static void bwb_copy_file (char *Source, char *Target);
diff --git a/lang/bwbasic/files/patch-bwb__var.c b/lang/bwbasic/files/patch-bwb__var.c
deleted file mode 100644
index 26326c604eb6..000000000000
--- a/lang/bwbasic/files/patch-bwb__var.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- bwb_var.c.orig	2017-01-19 00:10:00 UTC
-+++ bwb_var.c
-@@ -124,7 +124,7 @@ bwb_COMMON(LineType * l)
-          {
-             /* COMMON A(,,) : DIM A( 5, 10, 20 ) */
-             dimensions++;
--            while( line_skip_comma(l) );
-+            while( line_skip_comma(l) )
-             {
-                dimensions++;
-             }
-@@ -2640,7 +2640,7 @@ bwb_OPTION_USING(LineType * l)
-    */
-    n = bwb_strlen( tbuf );
-    /* PAD RIGHT with NUL */
--   for( i = n; n < 12; i++ )
-+   for( i = n; i < 12; i++ )
-    {
-       tbuf[ i ] = BasicNulChar;
-    }
diff --git a/lang/bwbasic/files/patch-renum.c b/lang/bwbasic/files/patch-renum.c
index 17979dc66f61..47dbd47140c2 100644
--- a/lang/bwbasic/files/patch-renum.c
+++ b/lang/bwbasic/files/patch-renum.c
@@ -1,63 +1,25 @@
-Fix various warnings. Don't use unsafe gets().
+Fix various warnings. 
 
---- renum.c.orig	2017-01-19 00:10:01 UTC
+--- renum.c.orig	2018-01-01 11:17:37 UTC
 +++ renum.c
-@@ -7,6 +7,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- int instr();
- char *midstr1();
-@@ -17,14 +18,14 @@ int f2, l2, n, x;
- int sidx[1500][2];
- char rstr[255];
+@@ -20,7 +20,7 @@ int f2, l2, n, x;
+ int sidx[MAX_LINE_COUNT][2];
+ char rstr[MAX_LINE_LENGTH];
  
 -main(argc, argv)
 +int main(argc, argv)
     int argc;
     char *argv[];
  {
-    int f, d, s, p, s1, t, l, g;
+@@ -28,7 +28,6 @@ main(argc, argv)
     int c, f1, c1, i, f8, r, l1, l3;
     int v1, f6, l6, b, f9, x9, b1, p8, p9, a, d9;
--   char pstr[255], sstr[255], f9str[255], s9str[255], tempstr[255];
-+   char pstr[255], f9str[255], s9str[255], tempstr[255];
-    FILE *fdin, *fdout;
-    int skip, bp, temp, getout, disp_msg;
- 
-@@ -34,7 +35,10 @@ main(argc, argv)
-    else
-    {
-       printf("Program in file? ");
--      gets(pstr);
-+      fgets(pstr, 255, stdin);
-+      if (pstr[0] != '\n' || pstr[0] != '\0') {
-+	pstr[strlen(pstr) - 1] = '\0';
-+      }
-    }
-    if (strlen(pstr) == 0) strcpy(pstr, "0.doc");
- 
-@@ -124,7 +128,7 @@ main(argc, argv)
-       skip = 0;
-       bp = 0;
-       printf("RENUMBER-");
--      gets(pstr);
-+      fgets(pstr, 255, stdin);
-       p = strlen(pstr);
- 
-       if (g == 0)
-@@ -268,7 +272,7 @@ main(argc, argv)
-       printf("%d -> %d\n", sidx[r][0], sidx[r][1]); */
- 
-    printf("VERIFY? ");
--   gets(pstr);
-+   fgets(pstr, 255, stdin);
-    v1 = 0;
-    if (strcmp(midstr2(pstr, 1, 1), "N") == 0) v1 = 1;
- 
-@@ -473,7 +477,7 @@ main(argc, argv)
+    char pstr[MAX_LINE_LENGTH];
+-   char sstr[MAX_LINE_LENGTH];
+    char f9str[MAX_LINE_LENGTH];
+    char s9str[MAX_LINE_LENGTH];
+    char tempstr[MAX_LINE_LENGTH];
+@@ -490,7 +489,7 @@ main(argc, argv)
     fclose(fdin);
     fclose(fdout);
  #if !defined(__MVS__) && !defined(__CMS__)
@@ -66,7 +28,7 @@ Fix various warnings. Don't use unsafe gets().
     system(tempstr);
  #endif
     return (0);
-@@ -542,7 +546,7 @@ void binary_search(void)
+@@ -561,7 +560,7 @@ void binary_search(void)
  
        if (sidx[m][0] == n)
        {