diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/vscm/Makefile | 8 | ||||
-rw-r--r-- | lang/vscm/files/patch-sum | 8 | ||||
-rw-r--r-- | lang/vscm/files/path.h | 4 | ||||
-rw-r--r-- | lang/vscm/patches/patch-ab | 57 | ||||
-rw-r--r-- | lang/vscm/pkg/PLIST | 6 |
5 files changed, 65 insertions, 18 deletions
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile index 9ba67dc5a02..6e24da144b7 100644 --- a/lang/vscm/Makefile +++ b/lang/vscm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2001/04/02 20:07:03 zuntum Exp $ +# $NetBSD: Makefile,v 1.6 2001/04/12 20:21:59 jtb Exp $ DISTNAME= vscmV0r4 -PKGNAME= vscm-0.4 +PKGNAME= vscm-0.4nb1 CATEGORIES= lang MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/vscm/ @@ -18,9 +18,9 @@ post-patch: ${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/scheme ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/vscm ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/lib/vscm - ${INSTALL_DATA} ${WRKSRC}/.scheme-boot ${PREFIX}/lib/vscm/scheme-boot + ${INSTALL_DATA} ${WRKSRC}/.scheme-boot ${PREFIX}/lib/vscm/vscm-boot ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vscm for i in README INSTALL DESCRIPTION; do \ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/examples/vscm; \ diff --git a/lang/vscm/files/patch-sum b/lang/vscm/files/patch-sum index 75927cd504e..6264ba2025e 100644 --- a/lang/vscm/files/patch-sum +++ b/lang/vscm/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $ +$NetBSD: patch-sum,v 1.2 2001/04/12 20:21:59 jtb Exp $ -MD5 (patch-aa) = ae0294754c227077b253c20a58939bea -MD5 (patch-ab) = 3a780ad4cf2330aa96a6d1f958644f75 -MD5 (patch-ac) = ffc049185e63e9f58ff7047fee8b5125 +SHA1 (patch-aa) = 5b98a6330ac897ea26beb838b28c97503f419e0d +SHA1 (patch-ab) = ccc424a8d0523b2570676a0a942d43605b35207a +SHA1 (patch-ac) = 73adae14da2fb236fb41277a17e0b936a75b9433 diff --git a/lang/vscm/files/path.h b/lang/vscm/files/path.h index abe1a89a19b..3f8e787e499 100644 --- a/lang/vscm/files/path.h +++ b/lang/vscm/files/path.h @@ -1,2 +1,2 @@ -#define DEFAULT_BOOTFILE "@PREFIX@/lib/vscm/scheme-boot" -#define DEFAULT_DUMP_PREFIX "#! @PREFIX@/bin/scheme -b" +#define DEFAULT_BOOTFILE "@PREFIX@/lib/vscm/vscm-boot" +#define DEFAULT_DUMP_PREFIX "#! @PREFIX@/bin/vscm -b" diff --git a/lang/vscm/patches/patch-ab b/lang/vscm/patches/patch-ab index 4d602b3ac6e..dae7b48d6b2 100644 --- a/lang/vscm/patches/patch-ab +++ b/lang/vscm/patches/patch-ab @@ -1,9 +1,56 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/11/02 11:01:53 itojun Exp $ +$NetBSD: patch-ab,v 1.2 2001/04/12 20:21:59 jtb Exp $ ---- Makefile Sat Aug 6 00:31:07 1994 -+++ Makefile Thu Nov 2 19:41:00 2000 -@@ -415,3 +415,3 @@ +--- Makefile.orig Fri Aug 5 15:31:07 1994 ++++ Makefile +@@ -49,8 +49,8 @@ + # this is what works for me on a DEC Alpha, running OSF/1: + # (gcc version 2.5.7) + +- CC = gcc +- OPTFLAGS = -O2 -funroll-loops -fomit-frame-pointer ++# CC = gcc ++ OPTFLAGS = -funroll-loops -fomit-frame-pointer + WARNFLAGS = -Wall -Wmissing-prototypes + DEBUGFLAGS = + EXTRACFLAGS = +@@ -208,7 +208,7 @@ + .DEFAULT: + @echo I hope, making $< is not necessary... + +-CFLAGS = $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) ++CFLAGS += $(A_OPTFLAGS) $(A_WARNFLAGS) $(A_DEBUGFLAGS) $(A_EXTRACFLAGS) $(DDP) + LDFLAGS = $(A_OPTFLAGS) $(A_DEBUGFLAGS) $(A_EXTRALDFLAGS) + CLFLAGS = $(CFLAGS) $(A_EXTRALDFLAGS) + LIBS = -lm $(A_EXTRALIBS) +@@ -413,8 +413,8 @@ + distclean: archclean + $(FORCEDELETE) compiler/repl.boot -scheme: $(OBJECTS) $(TMPLIBS) +- $(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) +scheme: $(OBJECTS) non-ansi-lib $(TMPLIBS) - $(CC) -o scheme $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) ++ $(CC) -o vscm $(LDFLAGS) $(OBJECTS) $(LIBS) -lc $(TMPLIBS) + + .scheme-boot: compiler/repl.boot + cp compiler/repl.boot .scheme-boot +@@ -422,17 +422,17 @@ + compiler/filt.boot: format.time compiler/vscmc.asm \ + compiler/version.asm compiler/filt-ml.asm + cat compiler/vscmc.asm compiler/version.asm compiler/filt-ml.asm | \ +- ./scheme -b - -a - -d compiler/filt.boot ++ ./vscm -b - -a - -d compiler/filt.boot + + compiler/repl.boot: format.time compiler/vscmc.asm \ + compiler/version.asm compiler/repl-ml.asm + cat compiler/vscmc.asm compiler/version.asm compiler/repl-ml.asm | \ +- ./scheme -b - -a - -d compiler/repl.boot ++ ./vscm -b - -a - -d compiler/repl.boot + + compiler/vscmc.asm: compiler/vscmc.scm + -mv compiler/vscmc.asm compiler/vscmc.oasm >/dev/null 2>&1 + mv compiler/filt.boot compiler/filt.oboot +- ./scheme -b compiler/filt.oboot <compiler/vscmc.scm >compiler/vscmc.asm ++ ./vscm -b compiler/filt.oboot <compiler/vscmc.scm >compiler/vscmc.asm + + compiler/vscmc.scm: compiler/s.vscmc.scm + -(cd compiler; \ diff --git a/lang/vscm/pkg/PLIST b/lang/vscm/pkg/PLIST index f35c78d0d86..c9a5209e9c6 100644 --- a/lang/vscm/pkg/PLIST +++ b/lang/vscm/pkg/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2000/11/17 13:58:59 wiz Exp $ -bin/scheme -lib/vscm/scheme-boot +@comment $NetBSD: PLIST,v 1.4 2001/04/12 20:21:59 jtb Exp $ +bin/vscm +lib/vscm/vscm-boot @dirrm lib/vscm share/examples/vscm/DESCRIPTION share/examples/vscm/INSTALL |