Hide a bunch of own declarations of standard functions; should fix the

Solaris build. While here, stop stuffing pointers in ints on 64-bit
platforms (other than Alpha, which it already knew about) and therefore
bump PKGREVISION to 1.

3 files changed, 61 insertions, 7 deletions

diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile
index 43d64fc49cb..48b6dc9e176 100644
--- a/lang/umb-scheme/Makefile
+++ b/lang/umb-scheme/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2008/03/04 16:38:13 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2012/06/23 21:17:17 dholland Exp $
 
 DISTNAME=		umb-scheme-3.2
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.cs.umb.edu/pub/scheme/
 EXTRACT_SUFX=		.tar.Z
diff --git a/lang/umb-scheme/distinfo b/lang/umb-scheme/distinfo
index 49af89e92a4..547c1f52dc4 100644
--- a/lang/umb-scheme/distinfo
+++ b/lang/umb-scheme/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2006/07/22 00:09:18 minskim Exp $
+$NetBSD: distinfo,v 1.7 2012/06/23 21:17:17 dholland Exp $
 
 SHA1 (umb-scheme-3.2.tar.Z) = eebce3a837bd57b1509cf91adab144d6ddb48b44
 RMD160 (umb-scheme-3.2.tar.Z) = f56954e66568d04d23ff3d535ca72fb1d2f4b1b3
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = c2d359e957b4f205bd4728d87c43563bb90b231a
 SHA1 (patch-ac) = 77eef2efa0efe5aaff06e3c5fb699628a1f6b857
 SHA1 (patch-ad) = 65d047e28ab1323e4bda18e79cd9192878f96edd
 SHA1 (patch-ae) = 3c2c41683253749005c65bb49f07a43f4afddd02
-SHA1 (patch-af) = c37635da09a3d2926172845fb93f7f3f97e53f7a
+SHA1 (patch-af) = 6b20db6bf5583e3e1acf4506fc81e3c2a15f6f9f
 SHA1 (patch-ag) = 2fc118318a3615a4cbe21f5ede870f0e7f96586c
diff --git a/lang/umb-scheme/patches/patch-af b/lang/umb-scheme/patches/patch-af
index e4db323ae1b..82fc5ddd643 100644
--- a/lang/umb-scheme/patches/patch-af
+++ b/lang/umb-scheme/patches/patch-af
@@ -1,13 +1,66 @@
-$NetBSD: patch-af,v 1.1 2001/04/12 21:06:45 jtb Exp $
+$NetBSD: patch-af,v 1.2 2012/06/23 21:17:17 dholland Exp $
 
---- portable.h.orig	Thu Apr 12 20:13:29 2001
+- use standard headers
+- remove own declarations of standard/system things
+- use intptr_t rather than stuffing pointers into int
+
+--- portable.h.orig	1996-01-21 22:15:51.000000000 +0000
 +++ portable.h
-@@ -94,7 +94,7 @@
+@@ -35,9 +35,11 @@ For additional information about UMB Sch
+ */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdint.h>
+ #include <math.h>
+ 
+ /* Machine dependencies */
+@@ -60,11 +62,7 @@ For additional information about UMB Sch
+ /* Processors (eg the Alpha) having 64-bit addresses require special casting
+    in the architecture module.  */
+ 
+-#if defined(__alpha__)
+-typedef long int Integral_Pointer;
+-#else
+-typedef int Integral_Pointer;
+-#endif
++typedef intptr_t Integral_Pointer;
+ 
+ 
+ /* NEGATIVE_ADDRESSES is defined to be 1 iff memory addresses have a 1 in the 
+@@ -83,27 +81,29 @@ typedef int Integral_Pointer;
+ /* The following declarations ought not to be necessary for C environments
+    that support the ANSI C Standard. */
+ 
++#if 0
+ extern void * malloc( /* size_t size */ );
+ extern void   free( /* char *ptr */ );
+ extern char * getenv( /* const char *name */ );
+ extern int    system( /* const char command */ );
+ extern void   exit( /* int status */ );
+ extern int    abs( /* int x */ );
++#endif
+ 
+ /* IF YOUR ENVIRONMENT HAS (any standard ANSI C library ought to have)
     a float.h defns file then replace the definition of DBL_MIN with
     an #include <float.h>                                                 */
  
 -#define DBL_MIN 10e-307
 +/* #define DBL_MIN 10e-307 */
  
- #ifdef sun
+-#ifdef sun
++#if 0
  extern int    fclose( /* FILE *stream */ );
+ extern int    ungetc( /* int c, FILE *stream */ );
+ extern int    fprintf( /* FILE *stream, const char *format, ...  */ );
+ extern int    _filbuf(), _flsbuf(); /* Yes, I know; talk to Sun! */
+ #endif
+ 
+-#ifdef sun386
++#if 0
+ extern int    sprintf( /* char *s,      const char *format, ...  */ );
+ extern char * memcpy( /* void *dest, const void *src, size_t len */ );
+ #endif