Sat Jun 23 21:17:18 2012 UTC ()
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.


(dholland)
diff -r1.13 -r1.14 pkgsrc/lang/umb-scheme/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/umb-scheme/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/umb-scheme/patches/patch-af
cvs diff -r1.13 -r1.14 pkgsrc/lang/umb-scheme/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/umb-scheme/Makefile 2008/03/04 16:38:13 1.13
+++ pkgsrc/lang/umb-scheme/Makefile 2012/06/23 21:17:17 1.14
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.13 2008/03/04 16:38:13 jlam Exp $ 1# $NetBSD: Makefile,v 1.14 2012/06/23 21:17:17 dholland Exp $
2 2
3DISTNAME= umb-scheme-3.2 3DISTNAME= umb-scheme-3.2
 4PKGREVISION= 1
4CATEGORIES= lang 5CATEGORIES= lang
5MASTER_SITES= ftp://ftp.cs.umb.edu/pub/scheme/ 6MASTER_SITES= ftp://ftp.cs.umb.edu/pub/scheme/
6EXTRACT_SUFX= .tar.Z 7EXTRACT_SUFX= .tar.Z
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= UMB Scheme interpreter 10COMMENT= UMB Scheme interpreter
10 11
11PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
12 13
13WRKSRC= ${WRKDIR}/scheme-3.2 14WRKSRC= ${WRKDIR}/scheme-3.2
14BUILD_TARGET= default 15BUILD_TARGET= default
15INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
16 17
cvs diff -r1.6 -r1.7 pkgsrc/lang/umb-scheme/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/umb-scheme/distinfo 2006/07/22 00:09:18 1.6
+++ pkgsrc/lang/umb-scheme/distinfo 2012/06/23 21:17:17 1.7
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.6 2006/07/22 00:09:18 minskim Exp $ 1$NetBSD: distinfo,v 1.7 2012/06/23 21:17:17 dholland Exp $
2 2
3SHA1 (umb-scheme-3.2.tar.Z) = eebce3a837bd57b1509cf91adab144d6ddb48b44 3SHA1 (umb-scheme-3.2.tar.Z) = eebce3a837bd57b1509cf91adab144d6ddb48b44
4RMD160 (umb-scheme-3.2.tar.Z) = f56954e66568d04d23ff3d535ca72fb1d2f4b1b3 4RMD160 (umb-scheme-3.2.tar.Z) = f56954e66568d04d23ff3d535ca72fb1d2f4b1b3
5Size (umb-scheme-3.2.tar.Z) = 583249 bytes 5Size (umb-scheme-3.2.tar.Z) = 583249 bytes
6SHA1 (patch-aa) = aae6b46834d5ed4e60ec76badeeb3b7cef169993 6SHA1 (patch-aa) = aae6b46834d5ed4e60ec76badeeb3b7cef169993
7SHA1 (patch-ab) = c2d359e957b4f205bd4728d87c43563bb90b231a 7SHA1 (patch-ab) = c2d359e957b4f205bd4728d87c43563bb90b231a
8SHA1 (patch-ac) = 77eef2efa0efe5aaff06e3c5fb699628a1f6b857 8SHA1 (patch-ac) = 77eef2efa0efe5aaff06e3c5fb699628a1f6b857
9SHA1 (patch-ad) = 65d047e28ab1323e4bda18e79cd9192878f96edd 9SHA1 (patch-ad) = 65d047e28ab1323e4bda18e79cd9192878f96edd
10SHA1 (patch-ae) = 3c2c41683253749005c65bb49f07a43f4afddd02 10SHA1 (patch-ae) = 3c2c41683253749005c65bb49f07a43f4afddd02
11SHA1 (patch-af) = c37635da09a3d2926172845fb93f7f3f97e53f7a 11SHA1 (patch-af) = 6b20db6bf5583e3e1acf4506fc81e3c2a15f6f9f
12SHA1 (patch-ag) = 2fc118318a3615a4cbe21f5ede870f0e7f96586c 12SHA1 (patch-ag) = 2fc118318a3615a4cbe21f5ede870f0e7f96586c
cvs diff -r1.1 -r1.2 pkgsrc/lang/umb-scheme/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/lang/umb-scheme/patches/patch-af 2001/04/12 21:06:45 1.1
+++ pkgsrc/lang/umb-scheme/patches/patch-af 2012/06/23 21:17:17 1.2
@@ -1,13 +1,66 @@ @@ -1,13 +1,66 @@
1$NetBSD: patch-af,v 1.1 2001/04/12 21:06:45 jtb Exp $ 1$NetBSD: patch-af,v 1.2 2012/06/23 21:17:17 dholland Exp $
2 2
3--- portable.h.orig Thu Apr 12 20:13:29 2001 3- use standard headers
 4- remove own declarations of standard/system things
 5- use intptr_t rather than stuffing pointers into int
 6
 7--- portable.h.orig 1996-01-21 22:15:51.000000000 +0000
4+++ portable.h 8+++ portable.h
5@@ -94,7 +94,7 @@ 9@@ -35,9 +35,11 @@ For additional information about UMB Sch
 10 */
 11
 12 #include <stdio.h>
 13+#include <stdlib.h>
 14 #include <ctype.h>
 15 #include <errno.h>
 16 #include <string.h>
 17+#include <stdint.h>
 18 #include <math.h>
 19
 20 /* Machine dependencies */
 21@@ -60,11 +62,7 @@ For additional information about UMB Sch
 22 /* Processors (eg the Alpha) having 64-bit addresses require special casting
 23 in the architecture module. */
 24
 25-#if defined(__alpha__)
 26-typedef long int Integral_Pointer;
 27-#else
 28-typedef int Integral_Pointer;
 29-#endif
 30+typedef intptr_t Integral_Pointer;
 31
 32
 33 /* NEGATIVE_ADDRESSES is defined to be 1 iff memory addresses have a 1 in the
 34@@ -83,27 +81,29 @@ typedef int Integral_Pointer;
 35 /* The following declarations ought not to be necessary for C environments
 36 that support the ANSI C Standard. */
 37
 38+#if 0
 39 extern void * malloc( /* size_t size */ );
 40 extern void free( /* char *ptr */ );
 41 extern char * getenv( /* const char *name */ );
 42 extern int system( /* const char command */ );
 43 extern void exit( /* int status */ );
 44 extern int abs( /* int x */ );
 45+#endif
 46
 47 /* IF YOUR ENVIRONMENT HAS (any standard ANSI C library ought to have)
6 a float.h defns file then replace the definition of DBL_MIN with 48 a float.h defns file then replace the definition of DBL_MIN with
7 an #include <float.h> */ 49 an #include <float.h> */
8  50
9-#define DBL_MIN 10e-307 51-#define DBL_MIN 10e-307
10+/* #define DBL_MIN 10e-307 */ 52+/* #define DBL_MIN 10e-307 */
11  53
12 #ifdef sun 54-#ifdef sun
 55+#if 0
13 extern int fclose( /* FILE *stream */ ); 56 extern int fclose( /* FILE *stream */ );
 57 extern int ungetc( /* int c, FILE *stream */ );
 58 extern int fprintf( /* FILE *stream, const char *format, ... */ );
 59 extern int _filbuf(), _flsbuf(); /* Yes, I know; talk to Sun! */
 60 #endif
 61
 62-#ifdef sun386
 63+#if 0
 64 extern int sprintf( /* char *s, const char *format, ... */ );
 65 extern char * memcpy( /* void *dest, const void *src, size_t len */ );
 66 #endif