diff options
author | jtb <jtb> | 2001-04-12 21:06:43 +0000 |
---|---|---|
committer | jtb <jtb> | 2001-04-12 21:06:43 +0000 |
commit | aaa440d7a6d62d407916932f70b8c5c9ca3f164c (patch) | |
tree | fb68fe5c0ab17453a3fb9a5984ff40f02ae8d5dd /lang | |
parent | 6c3e432145cc59736bf06ec485250fd2db9452d9 (diff) | |
download | pkgsrc-aaa440d7a6d62d407916932f70b8c5c9ca3f164c.tar.gz |
Updated umb-scheme to 3.2. No changelog. Executable now called `umb-scheme'
to avoid conflict with other Schemes.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/umb-scheme/Makefile | 48 | ||||
-rw-r--r-- | lang/umb-scheme/files/md5 | 4 | ||||
-rw-r--r-- | lang/umb-scheme/files/patch-sum | 12 | ||||
-rw-r--r-- | lang/umb-scheme/files/path.h | 2 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-aa | 30 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-ab | 20 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-ac | 76 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-ad | 13 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-ae | 22 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-af | 13 | ||||
-rw-r--r-- | lang/umb-scheme/patches/patch-ag | 12 | ||||
-rw-r--r-- | lang/umb-scheme/pkg/PLIST | 106 |
12 files changed, 311 insertions, 47 deletions
diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile index 54a49854a15..cbab3fec162 100644 --- a/lang/umb-scheme/Makefile +++ b/lang/umb-scheme/Makefile @@ -1,25 +1,41 @@ -# $NetBSD: Makefile,v 1.3 2001/02/25 04:17:57 hubertf Exp $ +# $NetBSD: Makefile,v 1.4 2001/04/12 21:06:43 jtb Exp $ -DISTNAME= umb-scheme-2.12 -CATEGORIES= lang -MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/umb/ +DISTNAME= umb-scheme-3.2 +CATEGORIES= lang +MASTER_SITES= ftp://ftp.cs.umb.edu/pub/scheme/ +EXTRACT_SUFX= .tar.Z -MAINTAINER= packages@netbsd.org -COMMENT= UMB scheme interpreter +MAINTAINER= packages@netbsd.org +COMMENT= UMB Scheme interpreter -WRKSRC= ${WRKDIR}/scheme-2.12 -ALL_TARGET= default +WRKSRC= ${WRKDIR}/scheme-3.2 +ALL_TARGET= default -post-patch: - ${SED} -e "s,@PREFIX@,${PREFIX}," <${FILESDIR}/path.h >${WRKSRC}/path.h +pre-patch: ${MV} ${WRKSRC}/scheme.1 ${WRKSRC}/scheme.1.dist - ${SED} -e "s,@PREFIX@,${PREFIX}," <${WRKSRC}/scheme.1.dist \ - >${WRKSRC}/scheme.1 + ${SED} -e 's:\$$::g' ${WRKSRC}/scheme.1.dist > ${WRKSRC}/scheme.1.tmp + +post-patch: + ${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h + ${SED} -e "s,@PREFIX@,${PREFIX}," ${WRKSRC}/scheme.1.tmp \ + >${WRKSRC}/scheme.1 + ${MV} ${WRKSRC}/prelude.scheme ${WRKSRC}/prelude.scheme.dist + ${SED} -e "s,@PREFIX@,${PREFIX}," ${WRKSRC}/prelude.scheme.dist \ + >${WRKSRC}/prelude.scheme + ${MV} ${WRKSRC}/SLIB-for-umb-scheme.init \ + ${WRKSRC}/SLIB-for-umb-scheme.init.dist + ${SED} -e "s,@PREFIX@,${PREFIX}," \ + ${WRKSRC}/SLIB-for-umb-scheme.init.dist \ + >${WRKSRC}/SLIB-for-umb-scheme.init do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/scheme ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/lib/umb-scheme - ${INSTALL_DATA} ${WRKSRC}/prelude.scheme ${PREFIX}/lib/umb-scheme - ${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/umb-scheme ${PREFIX}/bin + ${INSTALL_DATA_DIR} ${PREFIX}/share/umb-scheme + ${INSTALL_DATA} ${WRKSRC}/prelude.scheme ${PREFIX}/share/umb-scheme + ${INSTALL_DATA} ${WRKSRC}/SLIB-for-umb-scheme.init \ + ${PREFIX}/share/umb-scheme + ${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/man/man1/umb-scheme.1 + ${INSTALL_DATA_DIR} ${PREFIX}/share/umb-scheme/slib + ${INSTALL_DATA} ${WRKSRC}/slib/*.scm ${PREFIX}/share/umb-scheme/slib .include "../../mk/bsd.pkg.mk" diff --git a/lang/umb-scheme/files/md5 b/lang/umb-scheme/files/md5 index 83acc62242e..5b9804fc56a 100644 --- a/lang/umb-scheme/files/md5 +++ b/lang/umb-scheme/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $ +$NetBSD: md5,v 1.2 2001/04/12 21:06:44 jtb Exp $ -MD5 (umb-scheme-2.12.tar.gz) = d350bbbcb135c0b5b535b17a2d22a7b4 +SHA1 (umb-scheme-3.2.tar.Z) = eebce3a837bd57b1509cf91adab144d6ddb48b44 diff --git a/lang/umb-scheme/files/patch-sum b/lang/umb-scheme/files/patch-sum index 8df267a0a9b..861088bc954 100644 --- a/lang/umb-scheme/files/patch-sum +++ b/lang/umb-scheme/files/patch-sum @@ -1,5 +1,9 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $ +$NetBSD: patch-sum,v 1.2 2001/04/12 21:06:44 jtb Exp $ -MD5 (patch-aa) = 2a1efc9eefdc709a6195e871de56dddd -MD5 (patch-ab) = e756bff65e5953ae487f6f9326bd0f1f -MD5 (patch-ac) = 09ed4ba5ec16f86f3f90e5ef588b3360 +SHA1 (patch-aa) = aae6b46834d5ed4e60ec76badeeb3b7cef169993 +SHA1 (patch-ab) = c2d359e957b4f205bd4728d87c43563bb90b231a +SHA1 (patch-ac) = 62da770601ff8ab420753f5b78a271d1e5470439 +SHA1 (patch-ad) = 65d047e28ab1323e4bda18e79cd9192878f96edd +SHA1 (patch-ae) = 3c2c41683253749005c65bb49f07a43f4afddd02 +SHA1 (patch-af) = c37635da09a3d2926172845fb93f7f3f97e53f7a +SHA1 (patch-ag) = 7008660c7161d91e1d5876e999ac3d275176cb14 diff --git a/lang/umb-scheme/files/path.h b/lang/umb-scheme/files/path.h index 666328d6e32..b1115898873 100644 --- a/lang/umb-scheme/files/path.h +++ b/lang/umb-scheme/files/path.h @@ -1 +1 @@ -#define STANDARD_PRELUDE_PATHNAME "@PREFIX@/lib/umb-scheme/prelude.scheme" +#define STANDARD_PRELUDE_PATHNAME "@PREFIX@/share/umb-scheme/prelude.scheme" diff --git a/lang/umb-scheme/patches/patch-aa b/lang/umb-scheme/patches/patch-aa index 8a94d032e1d..472f27c3409 100644 --- a/lang/umb-scheme/patches/patch-aa +++ b/lang/umb-scheme/patches/patch-aa @@ -1,13 +1,29 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $ +$NetBSD: patch-aa,v 1.2 2001/04/12 21:06:44 jtb Exp $ ---- steering.c- Thu Nov 2 20:47:38 2000 -+++ steering.c Thu Nov 2 20:47:50 2000 -@@ -61,6 +61,8 @@ +--- steering.c.orig Sun Jan 21 22:15:53 1996 ++++ steering.c +@@ -62,7 +62,11 @@ #define TOP_LEVEL_PROMPT "\n==> " +#include "path.h" + - #ifndef STANDARD_PRELUDE_PATHNAME - #define STANDARD_PRELUDE_PATHNAME "/usr/local/lib/prelude.scheme" - #endif ++#ifndef STANDARD_PRELUDE_PATHNAME + #define STANDARD_PRELUDE_PATHNAME "/usr/local/lib/scheme/prelude.scheme" ++#endif + + Private String OPENING = + "Welcome to UMB Scheme, version Copyright (c) 1988,1996 William R Campbell.\n\ +@@ -91,10 +95,10 @@ + Private void Steering() + { + Character Opening[400]; +- String Init_Filename = getenv ("SCHEME_INIT"); ++ String Init_Filename = getenv ("UMB_SCHEME_INIT"); + Character Dot_Scheme_Filename [256]; + sprintf (Opening, "%s", OPENING); +- sprintf (Dot_Scheme_Filename, "%s/.scheme", getenv ("HOME")); ++ sprintf (Dot_Scheme_Filename, "%s/.umb-scheme", getenv ("HOME")); + + Initializations(); + diff --git a/lang/umb-scheme/patches/patch-ab b/lang/umb-scheme/patches/patch-ab index 8a2f62b91f7..e4d81676f19 100644 --- a/lang/umb-scheme/patches/patch-ab +++ b/lang/umb-scheme/patches/patch-ab @@ -1,12 +1,22 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $ +$NetBSD: patch-ab,v 1.2 2001/04/12 21:06:44 jtb Exp $ ---- Makefile- Thu Nov 2 20:49:05 2000 -+++ Makefile Thu Nov 2 20:49:21 2000 +--- Makefile.orig Sun Jan 21 22:15:47 1996 ++++ Makefile @@ -1,6 +1,6 @@ # Makefile for the UMB Scheme interpreter. - CC = gcc +-CC = gcc -CFLAGS = -g -O -pedantic -Wall -+CFLAGS = -g -O -pedantic -Wall -I${.CURDIR} ++#CC = gcc ++#CFLAGS = -g -O -pedantic -Wall #CC = cc #CFLAGS = -O +@@ -11,7 +11,7 @@ + io.o compiler.o eval.o architecture.o number.o\ + fixnum.o bignum.o rational.o real.o complex.o + libraries = -lm +-program = scheme ++program = umb-scheme + + .PHONY: default tags print + diff --git a/lang/umb-scheme/patches/patch-ac b/lang/umb-scheme/patches/patch-ac index 4fed22a6ec1..81e4d38702f 100644 --- a/lang/umb-scheme/patches/patch-ac +++ b/lang/umb-scheme/patches/patch-ac @@ -1,13 +1,75 @@ -$NetBSD: patch-ac,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $ +$NetBSD: patch-ac,v 1.2 2001/04/12 21:06:44 jtb Exp $ ---- scheme.1- Thu Nov 2 20:51:05 2000 -+++ scheme.1 Thu Nov 2 20:51:21 2000 -@@ -321,7 +321,7 @@ +--- scheme.1.tmp.orig Sun Jan 21 22:15:52 1996 ++++ scheme.1.tmp Thu Apr 12 19:05:35 2001 +@@ -1,10 +1,10 @@ +-.TH SCHEME 1 "Janaury 22, 1996" "local" ++.TH UMB-SCHEME 1 "Janaury 22, 1996" "local" + .SH NAME +-scheme \- UMB Scheme (Revision: 3.2 ) ++umb-scheme \- UMB Scheme (Revision: 3.2 ) + .SH ORIGIN + University of Massachusetts at Boston + .SH SYNOPSIS +-.B scheme [file ...] ++.B umb-scheme [file ...] + .SH DESCRIPTION + .ta +0.5i 2.0i + .PP +@@ -21,14 +21,14 @@ + .PP + The following files are loaded in order at startup: + .PP +-If the variable SCHEME_INIT is set in the user's environment by executing ++If the variable UMB_SCHEME_INIT is set in the user's environment by executing + .nf +- setenv SCHEME_INIT file ++ setenv UMB_SCHEME_INIT file + .fi + then file is loaded. + .PP +-If SCHEME_INIT is not set and if a file +-.I " .scheme " ++If UMB_SCHEME_INIT is not set and if a file ++.I " .umb-scheme " + exists in the user's home directory then it is loaded. + .PP + The files named as optional arguments are loaded from left to right. +@@ -99,11 +99,9 @@ + + UMB Scheme can access Aubrey Jaffer's + .I "Scheme Portable Library (SLIB)." +-For documentation on SLIB see either ++For documentation on SLIB see + .br +-.I "http://www.cs.indiana.edu/scheme-repository/SCM/slib_toc.html" +-or +-.I "/usr/local/lib/slib/slib.texinfo." ++.I "http://swissnet.ai.mit.edu/~jaffer/SLIB.html" + + .SH SYSTEM INTERFACE + +@@ -281,7 +279,7 @@ + the debugger is turned + .I "off" + by default. One can insure the debugger is always turned on by putting a +-call to debug in the Scheme Init file (e.g. .scheme). ++call to debug in the Scheme Init file (e.g. .umb-scheme). + .PP + Any scheme expression may be evaluated in debugging mode. It is evaluated + in the environment that existed when the break occurred in the top level +@@ -345,11 +343,11 @@ UMB Scheme does not support nested debugging sessions. (Keep it simple.) .fi .SH FILES --/usr/local/lib/prelude.scheme -+@PREFIX@/lib/umb-scheme/prelude.scheme +-/usr/local/lib/scheme/prelude.scheme ++@PREFIX@/share/umb-scheme/prelude.scheme + .br +-/usr/local/lib/scheme/SLIB-for-umb-scheme.init ++@PREFIX@/share/umb-scheme/SLIB-for-umb-scheme.init + .br +-/usr/local/lib/slib/* ++@SLIB_PREFIX@/share/slib/* + .SH "SEE ALSO" Release Notes - .SH COPYING diff --git a/lang/umb-scheme/patches/patch-ad b/lang/umb-scheme/patches/patch-ad new file mode 100644 index 00000000000..fb5a8308305 --- /dev/null +++ b/lang/umb-scheme/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2001/04/12 21:06:45 jtb Exp $ + +--- prelude.scheme.orig Thu Apr 12 19:36:23 2001 ++++ prelude.scheme +@@ -708,7 +708,7 @@ + ; + ; Comment this out if you don't want to use SLIB + +-(load "/usr/local/lib/scheme/SLIB-for-umb-scheme.init") ++(load "@PREFIX@/share/umb-scheme/SLIB-for-umb-scheme.init") + + ; MAINTENANCE PROCEDURES + diff --git a/lang/umb-scheme/patches/patch-ae b/lang/umb-scheme/patches/patch-ae new file mode 100644 index 00000000000..75d3cd36d58 --- /dev/null +++ b/lang/umb-scheme/patches/patch-ae @@ -0,0 +1,22 @@ +$NetBSD: patch-ae,v 1.1 2001/04/12 21:06:45 jtb Exp $ + +--- SLIB-for-umb-scheme.init.orig Thu Apr 12 20:08:58 2001 ++++ SLIB-for-umb-scheme.init +@@ -40,7 +40,7 @@ + + (define (implementation-vicinity) + (case (software-type) +- ((UNIX) "/usr/local/src/scheme/") ++ ((UNIX) "@PREFIX@/share/umb-scheme/") + ((VMS) "scheme$src:") + ((MS-DOS) "C:\\scheme\\"))) + +@@ -55,7 +55,7 @@ + ;; Use this path if your scheme does not support GETENV + ;; or if SCHEME_LIBRARY_PATH is not set. + (case (software-type) +- ((UNIX) "/usr/local/lib/slib/") ++ ((UNIX) "@PREFIX@/share/umb-scheme/slib/") + ((VMS) "lib$scheme:") + ((MS-DOS) "C:\\SLIB\\") + (else ""))))) diff --git a/lang/umb-scheme/patches/patch-af b/lang/umb-scheme/patches/patch-af new file mode 100644 index 00000000000..e4db323ae1b --- /dev/null +++ b/lang/umb-scheme/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2001/04/12 21:06:45 jtb Exp $ + +--- portable.h.orig Thu Apr 12 20:13:29 2001 ++++ portable.h +@@ -94,7 +94,7 @@ + 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 + extern int fclose( /* FILE *stream */ ); diff --git a/lang/umb-scheme/patches/patch-ag b/lang/umb-scheme/patches/patch-ag new file mode 100644 index 00000000000..50fe99a9fe7 --- /dev/null +++ b/lang/umb-scheme/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2001/04/12 21:06:45 jtb Exp $ + +--- real.c.orig Thu Apr 12 20:15:25 2001 ++++ real.c +@@ -38,6 +38,7 @@ + point type. As a result, all the operations can use native (C) + functions. */ + ++#include <limits.h> + #include "portable.h" + #include "eval.h" + #include "object.h" diff --git a/lang/umb-scheme/pkg/PLIST b/lang/umb-scheme/pkg/PLIST index 9eb6d3ca9a4..f8a0ca66df3 100644 --- a/lang/umb-scheme/pkg/PLIST +++ b/lang/umb-scheme/pkg/PLIST @@ -1,5 +1,101 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $ -bin/scheme -lib/umb-scheme/prelude.scheme -@dirrm lib/umb-scheme -man/man1/scheme.1 +@comment $NetBSD: PLIST,v 1.2 2001/04/12 21:06:46 jtb Exp $ +bin/umb-scheme +man/man1/umb-scheme.1 +share/umb-scheme/SLIB-for-umb-scheme.init +share/umb-scheme/prelude.scheme +share/umb-scheme/slib/Template.scm +share/umb-scheme/slib/alist.scm +share/umb-scheme/slib/alistab.scm +share/umb-scheme/slib/array.scm +share/umb-scheme/slib/arraymap.scm +share/umb-scheme/slib/batch.scm +share/umb-scheme/slib/chap.scm +share/umb-scheme/slib/charplot.scm +share/umb-scheme/slib/cltime.scm +share/umb-scheme/slib/collect.scm +share/umb-scheme/slib/comlist.scm +share/umb-scheme/slib/comparse.scm +share/umb-scheme/slib/dbutil.scm +share/umb-scheme/slib/debug.scm +share/umb-scheme/slib/defmacex.scm +share/umb-scheme/slib/dwindtst.scm +share/umb-scheme/slib/dynamic.scm +share/umb-scheme/slib/dynwind.scm +share/umb-scheme/slib/factor.scm +share/umb-scheme/slib/fluidlet.scm +share/umb-scheme/slib/format.scm +share/umb-scheme/slib/formatst.scm +share/umb-scheme/slib/genwrite.scm +share/umb-scheme/slib/getopt.scm +share/umb-scheme/slib/hash.scm +share/umb-scheme/slib/hashtab.scm +share/umb-scheme/slib/lineio.scm +share/umb-scheme/slib/logical.scm +share/umb-scheme/slib/macrotst.scm +share/umb-scheme/slib/macwork.scm +share/umb-scheme/slib/mbe.scm +share/umb-scheme/slib/modular.scm +share/umb-scheme/slib/mulapply.scm +share/umb-scheme/slib/mularg.scm +share/umb-scheme/slib/mwdenote.scm +share/umb-scheme/slib/mwexpand.scm +share/umb-scheme/slib/mwsynrul.scm +share/umb-scheme/slib/mwtest.scm +share/umb-scheme/slib/obj2str.scm +share/umb-scheme/slib/object.scm +share/umb-scheme/slib/paramlst.scm +share/umb-scheme/slib/plottest.scm +share/umb-scheme/slib/pp.scm +share/umb-scheme/slib/ppfile.scm +share/umb-scheme/slib/primes.scm +share/umb-scheme/slib/priorque.scm +share/umb-scheme/slib/process.scm +share/umb-scheme/slib/promise.scm +share/umb-scheme/slib/queue.scm +share/umb-scheme/slib/r4rsyn.scm +share/umb-scheme/slib/randinex.scm +share/umb-scheme/slib/random.scm +share/umb-scheme/slib/ratize.scm +share/umb-scheme/slib/rbtest.scm +share/umb-scheme/slib/rbtree.scm +share/umb-scheme/slib/rdms.scm +share/umb-scheme/slib/recobj.scm +share/umb-scheme/slib/record.scm +share/umb-scheme/slib/repl.scm +share/umb-scheme/slib/report.scm +share/umb-scheme/slib/require.scm +share/umb-scheme/slib/sc2.scm +share/umb-scheme/slib/sc4opt.scm +share/umb-scheme/slib/sc4sc3.scm +share/umb-scheme/slib/scaexpp.scm +share/umb-scheme/slib/scaglob.scm +share/umb-scheme/slib/scainit.scm +share/umb-scheme/slib/scamacr.scm +share/umb-scheme/slib/scanf.scm +share/umb-scheme/slib/scaoutp.scm +share/umb-scheme/slib/scmacro.scm +share/umb-scheme/slib/scmactst.scm +share/umb-scheme/slib/sierpinski.scm +share/umb-scheme/slib/sort.scm +share/umb-scheme/slib/soundex.scm +share/umb-scheme/slib/stdio.scm +share/umb-scheme/slib/strcase.scm +share/umb-scheme/slib/strport.scm +share/umb-scheme/slib/struct.scm +share/umb-scheme/slib/structst.scm +share/umb-scheme/slib/structure.scm +share/umb-scheme/slib/synchk.scm +share/umb-scheme/slib/synclo.scm +share/umb-scheme/slib/synrul.scm +share/umb-scheme/slib/tek40.scm +share/umb-scheme/slib/tek41.scm +share/umb-scheme/slib/test.scm +share/umb-scheme/slib/time.scm +share/umb-scheme/slib/trace.scm +share/umb-scheme/slib/tree.scm +share/umb-scheme/slib/trnscrpt.scm +share/umb-scheme/slib/values.scm +share/umb-scheme/slib/withfile.scm +share/umb-scheme/slib/yasyn.scm +@dirrm share/umb-scheme/slib +@dirrm share/umb-scheme |