Mark as MAKE_JOBS_SAFE=no for race conditions. While here, fix ctype

abuse and a bunch of other warnings. Defensively bump revision.

8 files changed, 110 insertions, 11 deletions

diff --git a/lang/vslisp/Makefile b/lang/vslisp/Makefile
index 5b57e2c8461..1b4a1fcdfe2 100644
--- a/lang/vslisp/Makefile
+++ b/lang/vslisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/04/06 14:09:33 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2016/01/17 15:14:47 joerg Exp $
 
 DISTNAME=	vslisp-4.0-1
 PKGNAME=	vslisp-4.0.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vslisp/}
 
@@ -10,6 +10,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://vslisp.sourceforge.net/
 COMMENT=	Embeddable Lisp library and standalone interpreter
 
+# funcs.c:153:17: error: use of undeclared identifier 'r'
+# funct.c:336:15: error: expected expression
+# and similar
+MAKE_JOBS_SAFE=	no
+
 WRKSRC=		${WRKDIR}/vslisp-4.0
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
diff --git a/lang/vslisp/distinfo b/lang/vslisp/distinfo
index 169767eb523..3a3ae30bc40 100644
--- a/lang/vslisp/distinfo
+++ b/lang/vslisp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2015/12/29 23:34:57 dholland Exp $
+$NetBSD: distinfo,v 1.9 2016/01/17 15:14:47 joerg Exp $
 
 SHA1 (vslisp-4.0-1.tar.gz) = ccd21360f6bd2a7f47638797a7a5d25d2f8cb797
 RMD160 (vslisp-4.0-1.tar.gz) = e958c708ae1b63e9761f61a02b44ad639f23df4f
@@ -8,5 +8,10 @@ SHA1 (patch-aa) = aeab47abe89d5815743e3cd71b779f7f04303d12
 SHA1 (patch-ab) = 62e4ab3ce617a41dad80cd23b451bddf34e48013
 SHA1 (patch-ac) = ef5a45398eb11e306de07ff0d9002a0df132b854
 SHA1 (patch-ad) = db08fdf9f1e2cbcc74eae1b8ed25afaf1cb79f6f
-SHA1 (patch-ae) = 44ee54ce869bcb275dbcb1f0bc6dad65eda62b0f
+SHA1 (patch-ae) = 635c2a435baf27cd093d9ab99350fb507e083ecc
 SHA1 (patch-af) = 96b6c609c45b2586f92881515ed4c09d19de39c4
+SHA1 (patch-src_bin2c.c) = f492009182730bbbcb19ec6b369f6facd7b10160
+SHA1 (patch-src_functions_funcn.c) = 4f091554d0e8cd79f67bf2b1482a18e5b9f9e673
+SHA1 (patch-src_functions_funcs.c) = 9671a569c762edd629da4940f164cec091fb9790
+SHA1 (patch-src_mkfuns.c) = 225aac9ecf274e3834feeb9cac791f904b808c27
+SHA1 (patch-src_newhash.c) = ee057d8d6d11d209f6d62a0f9cabd5d55c1ae966
diff --git a/lang/vslisp/patches/patch-ae b/lang/vslisp/patches/patch-ae
index bc91603b8d4..0b0a0b8d655 100644
--- a/lang/vslisp/patches/patch-ae
+++ b/lang/vslisp/patches/patch-ae
@@ -1,10 +1,19 @@
-$NetBSD: patch-ae,v 1.2 2015/12/29 23:34:57 dholland Exp $
+$NetBSD: patch-ae,v 1.3 2016/01/17 15:14:47 joerg Exp $
 
 Handle floating values properly.
 
---- src/lcore.c.orig	Fri Mar 15 00:16:32 2002
-+++ src/lcore.c	Fri Mar 15 00:16:44 2002
-@@ -113,7 +113,7 @@
+--- src/lcore.c.orig	2000-05-07 20:26:14.000000000 +0000
++++ src/lcore.c
+@@ -9,6 +9,8 @@
+  *
+  * */
+ 
++int InitMiscFuns(void);
++
+ char IL_Version[] = "4.0"; 
+ 
+ #ifndef lint
+@@ -113,7 +115,7 @@ char *lText(ATOM a,char *TeXt)
    case 1: sprintf(TeXt,"[^H]");return TeXt;
    case 2: sprintf(TeXt,"[^F]");return TeXt;
    case 3: sprintf(TeXt,"[^T]");return TeXt;
@@ -13,7 +22,7 @@ Handle floating values properly.
    case 6: sprintf(TeXt,"%d",*(int*)(a->a)); return TeXt;
    case 5: sprintf(TeXt,"[^II]");return TeXt;
    case 8: sprintf(TeXt,"[^IF]");return TeXt;
-@@ -180,6 +180,7 @@
+@@ -180,6 +182,7 @@ ATOM MakeDAtom(double d)
    tmp->a=(char *)malloc(sizeof(double));
    dd=(double *)(tmp->a);
    (*dd)=d;
@@ -21,7 +30,7 @@ Handle floating values properly.
    tmp->g=1;tmp->f=4<<1;tmp->b=NULL;
    return tmp;
  }
-@@ -197,9 +198,7 @@
+@@ -197,9 +200,7 @@ ATOM MakeFAtom(FILE *d)
  /*--X FNAME: "GetDouble" DESC: "Takes a double from atom a" */
  double GetDbleOld(ATOM a)
  {
@@ -32,7 +41,23 @@ Handle floating values properly.
  }
  
  /*--X VNAME: "Pos" DESC: "Temporary variable for a string to list conversion" */
-@@ -249,7 +248,7 @@
+@@ -233,12 +234,12 @@ ATOM reada(char *s)
+       }
+       else {
+ 	c[i]=s[Pos]; c[i+1]=0;
+-	if(!(isdigit(c[i]) || (c[i]=='+') || (c[i]=='-') || (c[i]=='.'))) {
++	if(!(isdigit((unsigned char)c[i]) || (c[i]=='+') || (c[i]=='-') || (c[i]=='.'))) {
+ 	  if(i) {
+-	    if(!((c[i]=='e' || c[i]=='E') && (c[i-1]=='.' || isdigit(c[i-1])))) fd=0;
++	    if(!((c[i]=='e' || c[i]=='E') && (c[i-1]=='.' || isdigit((unsigned char)c[i-1])))) fd=0;
+ 	  } else fd=0;
+ 	}
+-	if(isdigit(c[i])) nd++;
++	if(isdigit((unsigned char)c[i])) nd++;
+       }
+     }
+   c[i]=0;
+@@ -249,7 +250,7 @@ ATOM reada(char *s)
      {
        double *d;
        t=mkatm(sizeof(double));t->f=4<<1;
diff --git a/lang/vslisp/patches/patch-src_bin2c.c b/lang/vslisp/patches/patch-src_bin2c.c
new file mode 100644
index 00000000000..55e650d4f1f
--- /dev/null
+++ b/lang/vslisp/patches/patch-src_bin2c.c
@@ -0,0 +1,9 @@
+$NetBSD: patch-src_bin2c.c,v 1.1 2016/01/17 15:14:47 joerg Exp $
+
+--- src/bin2c.c.orig	2016-01-16 13:47:40.000000000 +0000
++++ src/bin2c.c
+@@ -1,3 +1,4 @@
++#include <stdlib.h>
+ #include <stdio.h>
+ 
+ int main(int np,char **p)
diff --git a/lang/vslisp/patches/patch-src_functions_funcn.c b/lang/vslisp/patches/patch-src_functions_funcn.c
new file mode 100644
index 00000000000..d651900eb0e
--- /dev/null
+++ b/lang/vslisp/patches/patch-src_functions_funcn.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_functions_funcn.c,v 1.1 2016/01/17 15:14:47 joerg Exp $
+
+--- src/functions/funcn.c.orig	2016-01-16 13:50:45.000000000 +0000
++++ src/functions/funcn.c
+@@ -729,7 +729,7 @@ LIST L_Defefun(IL_PARS)
+ 
+   while((ss[ii]=fgetc(FiI))!=' ' && ss[ii]!='(' &&
+        ss[ii]!=')' && ss[ii]!='\n' && (!feof(FiI))) {
+-   if(!isdigit(ss[ii])) {
++   if(!isdigit((unsigned char)ss[ii])) {
+     if(ss[ii]!='\n' && ss[ii]!='+' && ss[ii]!='-' && ss[ii]!='.') id=0;} 
+     else dg++;   
+    ii++;
diff --git a/lang/vslisp/patches/patch-src_functions_funcs.c b/lang/vslisp/patches/patch-src_functions_funcs.c
new file mode 100644
index 00000000000..1b8db21fba1
--- /dev/null
+++ b/lang/vslisp/patches/patch-src_functions_funcs.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_functions_funcs.c,v 1.1 2016/01/17 15:14:47 joerg Exp $
+
+--- src/functions/funcs.c.orig	2016-01-16 13:50:27.000000000 +0000
++++ src/functions/funcs.c
+@@ -56,7 +56,7 @@
+     if(ss[i]==' ') 
+       s[j++]='+';
+     else
+-      if((toupper(ss[i])>= 'A') && (toupper(ss[i]<='Z')))
++      if((toupper((unsigned char)ss[i])>= 'A') && (toupper((unsigned char)ss[i]<='Z')))
+ 	s[j++]=ss[i];
+       else
+ 	if(ss[i]>='0' && ss[i]<='9') s[j++]=ss[i];
diff --git a/lang/vslisp/patches/patch-src_mkfuns.c b/lang/vslisp/patches/patch-src_mkfuns.c
new file mode 100644
index 00000000000..41517134921
--- /dev/null
+++ b/lang/vslisp/patches/patch-src_mkfuns.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mkfuns.c,v 1.1 2016/01/17 15:14:47 joerg Exp $
+
+--- src/mkfuns.c.orig	2016-01-16 13:51:04.000000000 +0000
++++ src/mkfuns.c
+@@ -1,10 +1,11 @@
+ 
+ /* This is a preprocessor for iLisp3.x sources */
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
+-main(int np,char **p)
++int main(int np,char **p)
+ {
+   char s[500];
+   FILE *fo;
diff --git a/lang/vslisp/patches/patch-src_newhash.c b/lang/vslisp/patches/patch-src_newhash.c
new file mode 100644
index 00000000000..db7cb43f18f
--- /dev/null
+++ b/lang/vslisp/patches/patch-src_newhash.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_newhash.c,v 1.1 2016/01/17 15:14:47 joerg Exp $
+
+--- src/newhash.c.orig	2016-01-16 13:48:20.000000000 +0000
++++ src/newhash.c
+@@ -21,6 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "l_defs.h"
+ 
+ static hash *IL_NULL_hash;