Fix broken build with gcc 4.5. While here, fix usage of tolower().

PKGREVISION -> 1.

4 files changed, 42 insertions, 11 deletions

diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index 7c881cfb7da..717d876d0dd 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2012/10/02 20:11:57 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/12/21 04:23:45 dholland Exp $
 
 DISTNAME=	vscmV1R2
 PKGNAME=	vscm-1.4
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vscm/} \
 	ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/
diff --git a/lang/vscm/distinfo b/lang/vscm/distinfo
index 6518071e4cc..f2f7058dc6b 100644
--- a/lang/vscm/distinfo
+++ b/lang/vscm/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.6 2012/11/19 02:54:42 joerg Exp $
+$NetBSD: distinfo,v 1.7 2012/12/21 04:23:45 dholland Exp $
 
 SHA1 (vscmV1R2.tar.gz) = 5c9107d825370e2a3b0d02c008faee2ca9f35eba
 RMD160 (vscmV1R2.tar.gz) = 3c405b384b4fb55594fd9a84c3aec6f10cda6bae
 Size (vscmV1R2.tar.gz) = 229752 bytes
 SHA1 (patch-Code.c) = 11f97f7aaeef3878da5ebfaeb6e8e92a93309743
-SHA1 (patch-aa) = 3c85e4519b8d17724672b093889016ec6bee5402
+SHA1 (patch-aa) = 76858679286de5936f985a00772972edf137f188
 SHA1 (patch-ab) = e4cd3a11cf083ab08dc7a5e83eb74965f0a1a163
 SHA1 (patch-ac) = de82fbea05306a9d70708696f4a7b53ec22d69d4
 SHA1 (patch-ad) = 80ccfbe99d114cd6695faf09f4d27a22e68a31cb
 SHA1 (patch-except.c) = c9542f192e5c71d0b74f94a793e244de14823af0
+SHA1 (patch-noreturn.h) = affce174e36739fc36548a68a1ab5a36004c0e22
diff --git a/lang/vscm/patches/patch-aa b/lang/vscm/patches/patch-aa
index fb8d5b672f9..225644863fd 100644
--- a/lang/vscm/patches/patch-aa
+++ b/lang/vscm/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
+$NetBSD: patch-aa,v 1.3 2012/12/21 04:23:45 dholland Exp $
 
---- Numeric.c.orig	1999-02-09 08:05:13.000000000 +0300
-+++ Numeric.c	2011-03-30 20:17:55.000000000 +0400
-@@ -591,7 +591,7 @@
+--- Numeric.c.orig	1999-02-09 05:05:13.000000000 +0000
++++ Numeric.c
+@@ -591,7 +591,7 @@ static int mul (bigdig *a, bigdig *b, bi
    return len;
  }
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
  {
    int i;
    bigreg d;
-@@ -1212,11 +1212,11 @@
+@@ -1212,11 +1212,11 @@ static void *
      (void) normalize (d, &ld, 0);
    } else if (gcd [0] != 1) {
      PROVIDE_BIGNUM (tmp_n, ln);
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
        --ld;
      d = tmp_d_dig;
    } else {
-@@ -1939,7 +1939,7 @@
+@@ -1939,7 +1939,7 @@ static void *fract_to_int (ScmFraction *
      PROVIDE_BIGNUM (tmp1, a->nlength);
      PROVIDE_BIGNUM (tmp2, 1);
      l1 = a->nlength;
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
      tmp2_dig [0] = rr;
      (void) normalize (tmp1_dig, &l1, 0);
      r = tmp2_dig;
-@@ -2407,7 +2407,7 @@
+@@ -2407,7 +2407,7 @@ static void raw_bigdig_to_ascii_10 (bigd
    bigdig_copy (a, tmp1_dig, la);
    s = strg;
    while (la > 1 || tmp1_dig [0] > 0) {
@@ -43,7 +43,16 @@ $NetBSD: patch-aa,v 1.2 2011/04/17 07:46:05 asau Exp $
        --la;
      sprintf (buf, "%04u", (unsigned) r);
      for (i = 3; i >= 0; i--)
-@@ -3312,7 +3312,7 @@
+@@ -3116,7 +3116,7 @@ void *ScmParseNumberString (const char *
+   provide_parse_buf (l);
+   s = parse_buf;
+   for (p = 0; p < l; p++)
+-    s [p] = tolower (arg [p]);
++    s [p] = tolower ((unsigned char) arg [p]);
+ 
+   /* scanning the prefix */
+   if (l > 1 && s [0] == '#') {
+@@ -3312,7 +3312,7 @@ static void big_small_qr (ScmFixnum *a, 
        PROVIDE_BIGNUM (tmp1, lq);
        qq = tmp1_dig;
      }
diff --git a/lang/vscm/patches/patch-noreturn.h b/lang/vscm/patches/patch-noreturn.h
new file mode 100644
index 00000000000..56e3214aa04
--- /dev/null
+++ b/lang/vscm/patches/patch-noreturn.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-noreturn.h,v 1.1 2012/12/21 04:23:45 dholland Exp $
+
+Place attribute noreturn where recent gcc wants it.
+
+--- noreturn.h~	1999-02-09 05:05:17.000000000 +0000
++++ noreturn.h
+@@ -12,7 +12,12 @@
+ 
+ # if defined (__GNUC__) && defined (__GNUC_MINOR__)
+ 
+-# if __GNUC__ >= 2 && __GNUC_MINOR__ >= 5
++# if __GNUC__ >= 4
++
++# define NORETURN __attribute__ ((noreturn))
++# define NRUTERON
++
++# elif __GNUC__ >= 2 && __GNUC_MINOR__ >= 5
+ 
+ # define NORETURN
+ # define NRUTERON __attribute__ ((noreturn))