From bfaf641833ac33411908da586c8463cf44780112 Mon Sep 17 00:00:00 2001 From: jtb Date: Mon, 4 Aug 2003 15:34:18 +0000 Subject: Update to version 0.7.3.2. The main elements of this release are: * Persistent-store garbage collection. * Build cleanup. --- lang/RScheme/Makefile | 64 +++++-- lang/RScheme/PLIST | 431 +++++++++++++++++++++--------------------- lang/RScheme/distinfo | 23 ++- lang/RScheme/patches/patch-aa | 4 +- lang/RScheme/patches/patch-ab | 4 +- lang/RScheme/patches/patch-ac | 34 ++-- lang/RScheme/patches/patch-ad | 34 ++-- lang/RScheme/patches/patch-ae | 15 +- lang/RScheme/patches/patch-af | 56 +++++- lang/RScheme/patches/patch-ah | 17 ++ lang/RScheme/patches/patch-ai | 14 ++ lang/RScheme/patches/patch-aj | 13 ++ lang/RScheme/patches/patch-ak | 13 ++ 13 files changed, 422 insertions(+), 300 deletions(-) create mode 100644 lang/RScheme/patches/patch-ah create mode 100644 lang/RScheme/patches/patch-ai create mode 100644 lang/RScheme/patches/patch-aj create mode 100644 lang/RScheme/patches/patch-ak (limited to 'lang') diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile index 84adb9ad04d..d88e79d2543 100644 --- a/lang/RScheme/Makefile +++ b/lang/RScheme/Makefile @@ -1,42 +1,66 @@ -# $NetBSD: Makefile,v 1.11 2003/07/17 21:43:55 grant Exp $ +# $NetBSD: Makefile,v 1.12 2003/08/04 15:34:18 jtb Exp $ -DISTNAME= rs-0.7.3.1 -PKGNAME= RScheme-0.7.3.1 -PKGREVISION= 2 +DISTNAME= rs-0.7.3.2 +PKGNAME= RScheme-0.7.3.2 CATEGORIES= lang MASTER_SITES= ftp://ftp.rscheme.org/pub/rscheme/ MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.rscheme.org -COMMENT= Scheme implementation +HOMEPAGE= http://www.rscheme.org/ +COMMENT= Object-oriented Scheme implementation -HAS_CONFIGURE= #defined -CONFIGURE_ARGS+= --prefix=${PREFIX}/lib/RScheme +USE_BUILDLINK2= YES +GNU_CONFIGURE= YES ALL_TARGET= base NOT_FOR_PLATFORM= *-*-alpha -# -# Can't define WRKSRC as the src subdir since it doesn't appear until after -# the configure stage and patches need to be applied before then. -# +RSCHEME_MODULES_DIR= src/install/resource/modules +RSCHEME_MODULES= ${RSCHEME_MODULES_DIR}/primops.mif ${RSCHEME_MODULES_DIR}/precore.mif \ + ${RSCHEME_MODULES_DIR}/corelib.mif ${RSCHEME_MODULES_DIR}/low_scheme.mif \ + ${RSCHEME_MODULES_DIR}/objsys.mif ${RSCHEME_MODULES_DIR}/paths.mif \ + ${RSCHEME_MODULES_DIR}/mathlib.mif ${RSCHEME_MODULES_DIR}/tables.mif \ + ${RSCHEME_MODULES_DIR}/iolib.mif ${RSCHEME_MODULES_DIR}/high_scheme.mif \ + ${RSCHEME_MODULES_DIR}/start.mif ${RSCHEME_MODULES_DIR}/sort.mif \ + ${RSCHEME_MODULES_DIR}/imageio.mif ${RSCHEME_MODULES_DIR}/editinp.mif \ + ${RSCHEME_MODULES_DIR}/mlink.mif ${RSCHEME_MODULES_DIR}/compiler.mif \ + ${RSCHEME_MODULES_DIR}/codegen.mif ${RSCHEME_MODULES_DIR}/repl.mif \ + ${RSCHEME_MODULES_DIR}/debugger.mif ${RSCHEME_MODULES_DIR}/regex.mif \ + ${RSCHEME_MODULES_DIR}/hacks.mif ${RSCHEME_MODULES_DIR}/threads.mif + pre-configure: - cd ${WRKSRC} && ${MAKE} stage1 + @cd ${WRKSRC}/stage0 && ${AUTOCONF} + cd ${WRKSRC}/stage0 && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \ + ./configure ${CONFIGURE_ARGS} --prefix=`pwd`/install + @cd ${WRKSRC}/stage0 && ${SETENV} ${MAKE_ENV} ${MAKE} + @${MKDIR} ${WRKSRC}/stage0/install/bin + @cd ${WRKSRC}/stage0 && ${SETENV} ${MAKE_ENV} ${MAKE} shell + @cd ${WRKSRC}/stage0 && ${LN} -fs ../../rshell/rs install/bin/rs + @cd ${WRKSRC}/stage0 && ${LN} -fs ../../system.img install/resource/system.img + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${MAKE} RS=${WRKSRC}/stage0/install/bin/rs \ + RSC_FLAGS2=-ccode src src/tmp/rsc.img \ + ${RSCHEME_MODULES} src/tmp/system.bas + @cd ${WRKSRC} && ${CP} -p stage0/configure src/configure do-configure: - cd ${WRKSRC}/src && ./configure ${CONFIGURE_ARGS} + @cd ${WRKSRC}/src && ${SETENV} ${CONFIGURE_ENV} CFLAGS="${CFLAGS}" \ + ./configure ${CONFIGURE_ARGS} --prefix=${PREFIX}/lib/rscheme \ + --enable-readline --enable-dynamic-linking do-build: - cd ${WRKSRC}/src && ${MAKE} ${ALL_TARGET} + @cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} ${ALL_TARGET} do-install: - cd ${WRKSRC}/src && ${MAKE} install-base && ${MAKE} shell && \ - ${MAKE} install-shell && ${MAKE} packages + @cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE} install-base && ${MAKE} shell && \ + ${MAKE} install-shell && ${MAKE} packages post-install: - ${LN} -fs ${PREFIX}/lib/RScheme/bin/rs ${PREFIX}/bin/RScheme - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/RScheme + ${LN} -fs ${PREFIX}/lib/rscheme/bin/rs ${PREFIX}/bin/rscheme + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rscheme ${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/README \ - ${PREFIX}/share/doc/RScheme + ${PREFIX}/share/doc/rscheme +.include "../../devel/readline/buildlink2.mk" +.include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/RScheme/PLIST b/lang/RScheme/PLIST index 736f78fa40f..403d3cf06e1 100644 --- a/lang/RScheme/PLIST +++ b/lang/RScheme/PLIST @@ -1,217 +1,214 @@ -@comment $NetBSD: PLIST,v 1.2 2002/03/06 06:48:15 jmc Exp $ -bin/RScheme -lib/RScheme/bin/lssctl -lib/RScheme/bin/rs -lib/RScheme/bin/rsc -lib/RScheme/include/rscheme/alloc.h -lib/RScheme/include/rscheme/allocns.h -lib/RScheme/include/rscheme/api.h -lib/RScheme/include/rscheme/bcextend.h -lib/RScheme/include/rscheme/buildsty.h -lib/RScheme/include/rscheme/chektype.ci -lib/RScheme/include/rscheme/chektype.h -lib/RScheme/include/rscheme/clientyp.h -lib/RScheme/include/rscheme/collectn.h -lib/RScheme/include/rscheme/gcadapt.h -lib/RScheme/include/rscheme/gcclient1.ci -lib/RScheme/include/rscheme/gcclient2.ci -lib/RScheme/include/rscheme/gcconfig.h -lib/RScheme/include/rscheme/gcglue.h -lib/RScheme/include/rscheme/gcserver.h -lib/RScheme/include/rscheme/gcserver1.ci -lib/RScheme/include/rscheme/gcserver2.ci -lib/RScheme/include/rscheme/gcxverse.h -lib/RScheme/include/rscheme/hashfn.h -lib/RScheme/include/rscheme/hashmain.h -lib/RScheme/include/rscheme/hasht.h -lib/RScheme/include/rscheme/heapi.h -lib/RScheme/include/rscheme/imagfile.h -lib/RScheme/include/rscheme/interim.ci -lib/RScheme/include/rscheme/intrs.h -lib/RScheme/include/rscheme/irc.h -lib/RScheme/include/rscheme/irctypes.h -lib/RScheme/include/rscheme/langtype.h -lib/RScheme/include/rscheme/linktype.h -lib/RScheme/include/rscheme/longint.h -lib/RScheme/include/rscheme/modulo.h -lib/RScheme/include/rscheme/ntohd.ci -lib/RScheme/include/rscheme/obj.h -lib/RScheme/include/rscheme/osglue.h -lib/RScheme/include/rscheme/pkgs/db.h -lib/RScheme/include/rscheme/pkgs/fasl.h -lib/RScheme/include/rscheme/pkgs/lss/lss.h -lib/RScheme/include/rscheme/pkgs/lss/lsserrno.h -lib/RScheme/include/rscheme/pkgs/lss/lsszips.h -lib/RScheme/include/rscheme/pkgs/rs_db_lss.h -lib/RScheme/include/rscheme/pkgs/rs_db_rstore.h -lib/RScheme/include/rscheme/pkgs/rs_sys_threads_manager.h -lib/RScheme/include/rscheme/pkgs/rstore/rstore.h -lib/RScheme/include/rscheme/pkgs/syscalls.h -lib/RScheme/include/rscheme/pkgs/unixm.h -lib/RScheme/include/rscheme/platform.h -lib/RScheme/include/rscheme/profile.h -lib/RScheme/include/rscheme/rdln.h -lib/RScheme/include/rscheme/readwrit.ci -lib/RScheme/include/rscheme/record.h -lib/RScheme/include/rscheme/regs.h -lib/RScheme/include/rscheme/rlseconf.cfg -lib/RScheme/include/rscheme/rlseconf.h -lib/RScheme/include/rscheme/rsmodule.h -lib/RScheme/include/rscheme/runtime.h -lib/RScheme/include/rscheme/scheme.h -lib/RScheme/include/rscheme/sizeclas.h -lib/RScheme/include/rscheme/smemory.ci -lib/RScheme/include/rscheme/smemory.h -lib/RScheme/include/rscheme/stack.ci -lib/RScheme/include/rscheme/stack.h -lib/RScheme/include/rscheme/stakcach.ci -lib/RScheme/include/rscheme/stakcach.h -lib/RScheme/include/rscheme/stdiox.h -lib/RScheme/include/rscheme/stdmodul.h -lib/RScheme/include/rscheme/timeprof.h -lib/RScheme/include/rscheme/traverse.h -lib/RScheme/include/rscheme/travstat.h -lib/RScheme/include/rscheme/vinsns.ci -lib/RScheme/include/rscheme/vinsns.h -lib/RScheme/include/rscheme/writebar.h -lib/RScheme/include/rscheme.h -lib/RScheme/lib/db.o -lib/RScheme/lib/fasl.o -lib/RScheme/lib/liblss.a -lib/RScheme/lib/librs.a -lib/RScheme/lib/librstore.a -lib/RScheme/lib/rs_db_lss.o -lib/RScheme/lib/rs_db_rstore.o -lib/RScheme/lib/rs_sys_threads_manager.o -lib/RScheme/lib/syscalls.o -lib/RScheme/lib/unixm.o -lib/RScheme/resource/buildenv/module.mak -lib/RScheme/resource/buildenv/preamble.mak -lib/RScheme/resource/compiler/bytecode/bcgen.scm -lib/RScheme/resource/compiler/bytecode/bctable.dat -lib/RScheme/resource/compiler/bytecode/potable.dat -lib/RScheme/resource/compiler/cflags -lib/RScheme/resource/compiler/rsc.img -lib/RScheme/resource/modules/calendar.mif -lib/RScheme/resource/modules/calendar.mx -lib/RScheme/resource/modules/codegen.doc -lib/RScheme/resource/modules/codegen.mif -lib/RScheme/resource/modules/codegen.mx -lib/RScheme/resource/modules/compiler.doc -lib/RScheme/resource/modules/compiler.mif -lib/RScheme/resource/modules/compiler.mx -lib/RScheme/resource/modules/corelib.doc -lib/RScheme/resource/modules/corelib.mif -lib/RScheme/resource/modules/corelib.mx -lib/RScheme/resource/modules/db.mif -lib/RScheme/resource/modules/db.mx -lib/RScheme/resource/modules/debugger.doc -lib/RScheme/resource/modules/debugger.mif -lib/RScheme/resource/modules/debugger.mx -lib/RScheme/resource/modules/editinp.doc -lib/RScheme/resource/modules/editinp.mif -lib/RScheme/resource/modules/editinp.mx -lib/RScheme/resource/modules/fasl.mif -lib/RScheme/resource/modules/fasl.mx -lib/RScheme/resource/modules/hacks.doc -lib/RScheme/resource/modules/hacks.mif -lib/RScheme/resource/modules/hacks.mx -lib/RScheme/resource/modules/high_scheme.doc -lib/RScheme/resource/modules/high_scheme.mif -lib/RScheme/resource/modules/high_scheme.mx -lib/RScheme/resource/modules/imageio.doc -lib/RScheme/resource/modules/imageio.mif -lib/RScheme/resource/modules/imageio.mx -lib/RScheme/resource/modules/iolib.doc -lib/RScheme/resource/modules/iolib.mif -lib/RScheme/resource/modules/iolib.mx -lib/RScheme/resource/modules/low_scheme.doc -lib/RScheme/resource/modules/low_scheme.mif -lib/RScheme/resource/modules/low_scheme.mx -lib/RScheme/resource/modules/mathlib.doc -lib/RScheme/resource/modules/mathlib.mif -lib/RScheme/resource/modules/mathlib.mx -lib/RScheme/resource/modules/mlink.doc -lib/RScheme/resource/modules/mlink.mif -lib/RScheme/resource/modules/mlink.mx -lib/RScheme/resource/modules/objsys.doc -lib/RScheme/resource/modules/objsys.mif -lib/RScheme/resource/modules/objsys.mx -lib/RScheme/resource/modules/paths.doc -lib/RScheme/resource/modules/paths.mif -lib/RScheme/resource/modules/paths.mx -lib/RScheme/resource/modules/precore.doc -lib/RScheme/resource/modules/precore.mif -lib/RScheme/resource/modules/precore.mx -lib/RScheme/resource/modules/primops.mif -lib/RScheme/resource/modules/primops.mx -lib/RScheme/resource/modules/regex.doc -lib/RScheme/resource/modules/regex.mif -lib/RScheme/resource/modules/regex.mx -lib/RScheme/resource/modules/repl.doc -lib/RScheme/resource/modules/repl.mif -lib/RScheme/resource/modules/repl.mx -lib/RScheme/resource/modules/rs_db_lss.mif -lib/RScheme/resource/modules/rs_db_lss.mx -lib/RScheme/resource/modules/rs_db_rstore.mif -lib/RScheme/resource/modules/rs_db_rstore.mx -lib/RScheme/resource/modules/rs_glue.mif -lib/RScheme/resource/modules/rs_glue.mx -lib/RScheme/resource/modules/rs_lang.mif -lib/RScheme/resource/modules/rs_lang.mx -lib/RScheme/resource/modules/rs_lang_eval.mif -lib/RScheme/resource/modules/rs_lang_eval.mx -lib/RScheme/resource/modules/rs_lang_internal.mif -lib/RScheme/resource/modules/rs_lang_internal.mx -lib/RScheme/resource/modules/rs_sys_linker.mif -lib/RScheme/resource/modules/rs_sys_linker.mx -lib/RScheme/resource/modules/rs_sys_paths.mif -lib/RScheme/resource/modules/rs_sys_paths.mx -lib/RScheme/resource/modules/rs_sys_reflect.mif -lib/RScheme/resource/modules/rs_sys_reflect.mx -lib/RScheme/resource/modules/rs_sys_tables.mif -lib/RScheme/resource/modules/rs_sys_tables.mx -lib/RScheme/resource/modules/rs_sys_threads_manager.mif -lib/RScheme/resource/modules/rs_sys_threads_manager.mx -lib/RScheme/resource/modules/rs_sys_threads_shell.mif -lib/RScheme/resource/modules/rs_sys_threads_shell.mx -lib/RScheme/resource/modules/sets.mif -lib/RScheme/resource/modules/sets.mx -lib/RScheme/resource/modules/sort.doc -lib/RScheme/resource/modules/sort.mif -lib/RScheme/resource/modules/sort.mx -lib/RScheme/resource/modules/start.doc -lib/RScheme/resource/modules/start.mif -lib/RScheme/resource/modules/start.mx -lib/RScheme/resource/modules/syscalls.mif -lib/RScheme/resource/modules/syscalls.mx -lib/RScheme/resource/modules/tables.doc -lib/RScheme/resource/modules/tables.mif -lib/RScheme/resource/modules/tables.mx -lib/RScheme/resource/modules/threads.doc -lib/RScheme/resource/modules/threads.mif -lib/RScheme/resource/modules/threads.mx -lib/RScheme/resource/modules/unixm.mif -lib/RScheme/resource/modules/unixm.mx -lib/RScheme/resource/system.img -lib/RScheme/resource/modules/libsyscalls.so -lib/RScheme/resource/modules/libunixm.so -lib/RScheme/resource/modules/libfasl.so -lib/RScheme/resource/modules/librs_sys_threads_manager.so -lib/RScheme/resource/modules/libdb.so -share/doc/RScheme/COPYING -share/doc/RScheme/README -@dirrm share/doc/RScheme -@dirrm lib/RScheme/resource/modules -@dirrm lib/RScheme/resource/compiler/bytecode -@dirrm lib/RScheme/resource/compiler -@dirrm lib/RScheme/resource/buildenv -@dirrm lib/RScheme/resource -@dirrm lib/RScheme/lib -@dirrm lib/RScheme/include/rscheme/pkgs/rstore -@dirrm lib/RScheme/include/rscheme/pkgs/lss -@dirrm lib/RScheme/include/rscheme/pkgs -@dirrm lib/RScheme/include/rscheme -@dirrm lib/RScheme/include -@dirrm lib/RScheme/bin -@dirrm lib/RScheme +@comment $NetBSD: PLIST,v 1.3 2003/08/04 15:34:18 jtb Exp $ +bin/rscheme +lib/rscheme/bin/lssctl +lib/rscheme/bin/rs +lib/rscheme/bin/rsc +lib/rscheme/include/rscheme.h +lib/rscheme/include/rscheme/alloc.h +lib/rscheme/include/rscheme/allocns.h +lib/rscheme/include/rscheme/api.h +lib/rscheme/include/rscheme/bcextend.h +lib/rscheme/include/rscheme/buildsty.h +lib/rscheme/include/rscheme/chektype.ci +lib/rscheme/include/rscheme/chektype.h +lib/rscheme/include/rscheme/clientyp.h +lib/rscheme/include/rscheme/collectn.h +lib/rscheme/include/rscheme/gcadapt.h +lib/rscheme/include/rscheme/gcclient1.ci +lib/rscheme/include/rscheme/gcclient2.ci +lib/rscheme/include/rscheme/gcconfig.h +lib/rscheme/include/rscheme/gcglue.h +lib/rscheme/include/rscheme/gcserver.h +lib/rscheme/include/rscheme/gcserver1.ci +lib/rscheme/include/rscheme/gcserver2.ci +lib/rscheme/include/rscheme/gcxverse.h +lib/rscheme/include/rscheme/hashfn.h +lib/rscheme/include/rscheme/hashmain.h +lib/rscheme/include/rscheme/hasht.h +lib/rscheme/include/rscheme/heapi.h +lib/rscheme/include/rscheme/imagfile.h +lib/rscheme/include/rscheme/interim.ci +lib/rscheme/include/rscheme/intrs.h +lib/rscheme/include/rscheme/irc.h +lib/rscheme/include/rscheme/irctypes.h +lib/rscheme/include/rscheme/langtype.h +lib/rscheme/include/rscheme/linktype.h +lib/rscheme/include/rscheme/longint.h +lib/rscheme/include/rscheme/modulo.h +lib/rscheme/include/rscheme/ntohd.ci +lib/rscheme/include/rscheme/obj.h +lib/rscheme/include/rscheme/osglue.h +lib/rscheme/include/rscheme/pkgs/db.h +lib/rscheme/include/rscheme/pkgs/fasl.h +lib/rscheme/include/rscheme/pkgs/lss/lss.h +lib/rscheme/include/rscheme/pkgs/lss/lsserrno.h +lib/rscheme/include/rscheme/pkgs/lss/lsszips.h +lib/rscheme/include/rscheme/pkgs/rs_db_lss.h +lib/rscheme/include/rscheme/pkgs/rs_db_rstore.h +lib/rscheme/include/rscheme/pkgs/rs_sys_threads_manager.h +lib/rscheme/include/rscheme/pkgs/rstore/rstore.h +lib/rscheme/include/rscheme/pkgs/syscalls.h +lib/rscheme/include/rscheme/pkgs/unixm.h +lib/rscheme/include/rscheme/platform.h +lib/rscheme/include/rscheme/profile.h +lib/rscheme/include/rscheme/rdln.h +lib/rscheme/include/rscheme/readwrit.ci +lib/rscheme/include/rscheme/record.h +lib/rscheme/include/rscheme/regs.h +lib/rscheme/include/rscheme/rlseconf.cfg +lib/rscheme/include/rscheme/rlseconf.h +lib/rscheme/include/rscheme/rsmodule.h +lib/rscheme/include/rscheme/runtime.h +lib/rscheme/include/rscheme/scheme.h +lib/rscheme/include/rscheme/sizeclas.h +lib/rscheme/include/rscheme/smemory.ci +lib/rscheme/include/rscheme/smemory.h +lib/rscheme/include/rscheme/stack.ci +lib/rscheme/include/rscheme/stack.h +lib/rscheme/include/rscheme/stakcach.ci +lib/rscheme/include/rscheme/stakcach.h +lib/rscheme/include/rscheme/stdiox.h +lib/rscheme/include/rscheme/stdmodul.h +lib/rscheme/include/rscheme/timeprof.h +lib/rscheme/include/rscheme/traverse.h +lib/rscheme/include/rscheme/travstat.h +lib/rscheme/include/rscheme/vinsns.ci +lib/rscheme/include/rscheme/vinsns.h +lib/rscheme/include/rscheme/writebar.h +lib/rscheme/lib/db.o +lib/rscheme/lib/fasl.o +lib/rscheme/lib/liblss.a +lib/rscheme/lib/librs.a +lib/rscheme/lib/librstore.a +lib/rscheme/lib/rs_db_lss.o +lib/rscheme/lib/rs_db_rstore.o +lib/rscheme/lib/rs_sys_threads_manager.o +lib/rscheme/lib/syscalls.o +lib/rscheme/lib/unixm.o +lib/rscheme/resource/buildenv/module.mak +lib/rscheme/resource/buildenv/preamble.mak +lib/rscheme/resource/compiler/bytecode/bcgen.scm +lib/rscheme/resource/compiler/bytecode/bctable.dat +lib/rscheme/resource/compiler/bytecode/potable.dat +lib/rscheme/resource/compiler/cflags +lib/rscheme/resource/compiler/rsc.img +lib/rscheme/resource/modules/calendar.mif +lib/rscheme/resource/modules/calendar.mx +lib/rscheme/resource/modules/codegen.doc +lib/rscheme/resource/modules/codegen.mif +lib/rscheme/resource/modules/codegen.mx +lib/rscheme/resource/modules/compiler.doc +lib/rscheme/resource/modules/compiler.mif +lib/rscheme/resource/modules/compiler.mx +lib/rscheme/resource/modules/corelib.doc +lib/rscheme/resource/modules/corelib.mif +lib/rscheme/resource/modules/corelib.mx +lib/rscheme/resource/modules/db.mif +lib/rscheme/resource/modules/db.mx +lib/rscheme/resource/modules/debugger.doc +lib/rscheme/resource/modules/debugger.mif +lib/rscheme/resource/modules/debugger.mx +lib/rscheme/resource/modules/editinp.doc +lib/rscheme/resource/modules/editinp.mif +lib/rscheme/resource/modules/editinp.mx +lib/rscheme/resource/modules/fasl.mif +lib/rscheme/resource/modules/fasl.mx +lib/rscheme/resource/modules/hacks.doc +lib/rscheme/resource/modules/hacks.mif +lib/rscheme/resource/modules/hacks.mx +lib/rscheme/resource/modules/high_scheme.doc +lib/rscheme/resource/modules/high_scheme.mif +lib/rscheme/resource/modules/high_scheme.mx +lib/rscheme/resource/modules/imageio.doc +lib/rscheme/resource/modules/imageio.mif +lib/rscheme/resource/modules/imageio.mx +lib/rscheme/resource/modules/iolib.doc +lib/rscheme/resource/modules/iolib.mif +lib/rscheme/resource/modules/iolib.mx +lib/rscheme/resource/modules/libdb.so +lib/rscheme/resource/modules/libfasl.so +lib/rscheme/resource/modules/librs_sys_threads_manager.so +lib/rscheme/resource/modules/libsyscalls.so +lib/rscheme/resource/modules/libunixm.so +lib/rscheme/resource/modules/low_scheme.doc +lib/rscheme/resource/modules/low_scheme.mif +lib/rscheme/resource/modules/low_scheme.mx +lib/rscheme/resource/modules/mathlib.doc +lib/rscheme/resource/modules/mathlib.mif +lib/rscheme/resource/modules/mathlib.mx +lib/rscheme/resource/modules/mlink.doc +lib/rscheme/resource/modules/mlink.mif +lib/rscheme/resource/modules/mlink.mx +lib/rscheme/resource/modules/objsys.doc +lib/rscheme/resource/modules/objsys.mif +lib/rscheme/resource/modules/objsys.mx +lib/rscheme/resource/modules/paths.doc +lib/rscheme/resource/modules/paths.mif +lib/rscheme/resource/modules/paths.mx +lib/rscheme/resource/modules/precore.doc +lib/rscheme/resource/modules/precore.mif +lib/rscheme/resource/modules/precore.mx +lib/rscheme/resource/modules/primops.mif +lib/rscheme/resource/modules/primops.mx +lib/rscheme/resource/modules/regex.doc +lib/rscheme/resource/modules/regex.mif +lib/rscheme/resource/modules/regex.mx +lib/rscheme/resource/modules/repl.doc +lib/rscheme/resource/modules/repl.mif +lib/rscheme/resource/modules/repl.mx +lib/rscheme/resource/modules/rs_db_lss.mif +lib/rscheme/resource/modules/rs_db_lss.mx +lib/rscheme/resource/modules/rs_db_rstore.mif +lib/rscheme/resource/modules/rs_db_rstore.mx +lib/rscheme/resource/modules/rs_glue.mif +lib/rscheme/resource/modules/rs_glue.mx +lib/rscheme/resource/modules/rs_lang.mif +lib/rscheme/resource/modules/rs_lang.mx +lib/rscheme/resource/modules/rs_lang_eval.mif +lib/rscheme/resource/modules/rs_lang_eval.mx +lib/rscheme/resource/modules/rs_lang_internal.mif +lib/rscheme/resource/modules/rs_lang_internal.mx +lib/rscheme/resource/modules/rs_sys_linker.mif +lib/rscheme/resource/modules/rs_sys_linker.mx +lib/rscheme/resource/modules/rs_sys_paths.mif +lib/rscheme/resource/modules/rs_sys_paths.mx +lib/rscheme/resource/modules/rs_sys_reflect.mif +lib/rscheme/resource/modules/rs_sys_reflect.mx +lib/rscheme/resource/modules/rs_sys_tables.mif +lib/rscheme/resource/modules/rs_sys_tables.mx +lib/rscheme/resource/modules/rs_sys_threads_manager.mif +lib/rscheme/resource/modules/rs_sys_threads_manager.mx +lib/rscheme/resource/modules/rs_sys_threads_shell.mif +lib/rscheme/resource/modules/rs_sys_threads_shell.mx +lib/rscheme/resource/modules/sets.mif +lib/rscheme/resource/modules/sets.mx +lib/rscheme/resource/modules/sort.doc +lib/rscheme/resource/modules/sort.mif +lib/rscheme/resource/modules/sort.mx +lib/rscheme/resource/modules/start.doc +lib/rscheme/resource/modules/start.mif +lib/rscheme/resource/modules/start.mx +lib/rscheme/resource/modules/syscalls.mif +lib/rscheme/resource/modules/syscalls.mx +lib/rscheme/resource/modules/tables.doc +lib/rscheme/resource/modules/tables.mif +lib/rscheme/resource/modules/tables.mx +lib/rscheme/resource/modules/threads.doc +lib/rscheme/resource/modules/threads.mif +lib/rscheme/resource/modules/threads.mx +lib/rscheme/resource/modules/unixm.mif +lib/rscheme/resource/modules/unixm.mx +lib/rscheme/resource/system.img +@dirrm lib/rscheme/resource/modules +@dirrm lib/rscheme/resource/compiler/bytecode +@dirrm lib/rscheme/resource/compiler +@dirrm lib/rscheme/resource/buildenv +@dirrm lib/rscheme/resource +@dirrm lib/rscheme/lib +@dirrm lib/rscheme/include/rscheme/pkgs/rstore +@dirrm lib/rscheme/include/rscheme/pkgs/lss +@dirrm lib/rscheme/include/rscheme/pkgs +@dirrm lib/rscheme/include/rscheme +@dirrm lib/rscheme/include +@dirrm lib/rscheme/bin +@dirrm lib/rscheme diff --git a/lang/RScheme/distinfo b/lang/RScheme/distinfo index e67601ac4f8..32b493865f7 100644 --- a/lang/RScheme/distinfo +++ b/lang/RScheme/distinfo @@ -1,11 +1,16 @@ -$NetBSD: distinfo,v 1.4 2002/03/06 06:48:15 jmc Exp $ +$NetBSD: distinfo,v 1.5 2003/08/04 15:34:19 jtb Exp $ -SHA1 (rs-0.7.3.1.tar.gz) = 31f8b515e394e3e467e0f445335a3fdf22fcdb63 -Size (rs-0.7.3.1.tar.gz) = 1872020 bytes -SHA1 (patch-aa) = c7021af105513a71b3ddbeddd15865c1e197b1a4 -SHA1 (patch-ab) = 29f4eb38c21631dc92bb5ff086fecc56d35ed366 -SHA1 (patch-ac) = 3b4924d62afa5fc7c4a4973fe48eead719e1d7a4 -SHA1 (patch-ad) = b4387026fb26f2a75af49eed113708ff218ae04a -SHA1 (patch-ae) = 3e47bf75f359e480293cf21f14ef4e0c9115fedd -SHA1 (patch-af) = 5ffd5d2a3afd76edd1b4de7bacd07389bad27ee8 +SHA1 (rs-0.7.3.2.tar.gz) = 77684f5be5609d8b5bf203f3944172fbc80f06cb +Size (rs-0.7.3.2.tar.gz) = 1907741 bytes +SHA1 (patch-aa) = 7dc2ff680b5772c38920141f2ffcd1828a4ce9ef +SHA1 (patch-ab) = 3d185953e0d69071587b9df5e571c33201d4af0f +SHA1 (patch-ac) = 6eeb983340975ac4de59ea8b14cd74df0df2f4d5 +SHA1 (patch-ad) = e0efd451eb1694bb5caa3b5724573483b3095f0c +SHA1 (patch-ae) = 9303297d84c8d361a6ac8c7e24138da935ceaac2 +SHA1 (patch-af) = b7735535f0f24e683cc630e7d4039eee27dc9abe SHA1 (patch-ag) = 11f32cedb3e2ab4879676d55b4ecf886ee89164b +SHA1 (patch-ah) = 4ed3ce7e0ab2f9cb292f7c6f6b312f737c9ffb16 +SHA1 (patch-ai) = 5fc94806395094e8c43f206110ee647001ded727 +SHA1 (patch-aj) = 541573223bd89cd1018fcc44b26089b1b7222c7a +SHA1 (patch-ak) = 074667d368a29dea022fac7cdeba9ff636773764 +SHA1 (patch-al) = f31abdc468830af2e0020d29900bdd0d1b42235d diff --git a/lang/RScheme/patches/patch-aa b/lang/RScheme/patches/patch-aa index 0d5eab09ab5..b36baf29708 100644 --- a/lang/RScheme/patches/patch-aa +++ b/lang/RScheme/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2002/03/05 08:45:34 jmc Exp $ +$NetBSD: patch-aa,v 1.2 2003/08/04 15:34:19 jtb Exp $ --- stage0/config.guess.orig Tue Mar 5 05:12:43 2002 +++ stage0/config.guess Tue Mar 5 05:13:01 2002 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2002/03/05 08:45:34 jmc Exp $ echo m68k-apple-openbsd${UNAME_RELEASE} exit 0 ;; + macppc:NetBSD:*:*) -+ echo macppc-unknown-netbsd${UNAME_RELEASE} ++ echo powerpc-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} diff --git a/lang/RScheme/patches/patch-ab b/lang/RScheme/patches/patch-ab index 2e01ef7300b..93e465a4a6b 100644 --- a/lang/RScheme/patches/patch-ab +++ b/lang/RScheme/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2002/03/05 08:45:34 jmc Exp $ +$NetBSD: patch-ab,v 1.2 2003/08/04 15:34:20 jtb Exp $ --- handc/config.guess.orig Tue Mar 5 05:46:32 2002 +++ handc/config.guess Tue Mar 5 05:46:34 2002 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2002/03/05 08:45:34 jmc Exp $ echo m68k-apple-openbsd${UNAME_RELEASE} exit 0 ;; + macppc:NetBSD:*:*) -+ echo macppc-unknown-netbsd${UNAME_RELEASE} ++ echo powerpc-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} diff --git a/lang/RScheme/patches/patch-ac b/lang/RScheme/patches/patch-ac index 3e54adc3561..dcb602a5c30 100644 --- a/lang/RScheme/patches/patch-ac +++ b/lang/RScheme/patches/patch-ac @@ -1,22 +1,14 @@ -$NetBSD: patch-ac,v 1.1 2002/03/05 08:45:34 jmc Exp $ +$NetBSD: patch-ac,v 1.2 2003/08/04 15:34:20 jtb Exp $ ---- handc/config.sub.orig Tue Mar 5 07:53:10 2002 -+++ handc/config.sub Tue Mar 5 07:58:38 2002 -@@ -155,7 +155,7 @@ - | alpha | we32k | ns16k | clipper | i370 | sh \ - | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ - | pdp11 | mips64el | mips64orion | mips64orionel \ -- | sparc | sparclet | sparclite | sparc64) -+ | sparc | sparclet | sparclite | sparc64 | macppc) - basic_machine=$basic_machine-unknown - ;; - # We use `pc' rather than `unknown' -@@ -177,7 +177,7 @@ - | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ - | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ -- | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) -+ | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | macppc-* ) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. +--- packages/lss/config.guess.orig 2003-08-04 09:09:41.000000000 +0100 ++++ packages/lss/config.guess 2003-08-04 09:10:06.000000000 +0100 +@@ -129,6 +129,9 @@ + mac68k:OpenBSD:*:*) + echo m68k-apple-openbsd${UNAME_RELEASE} + exit 0 ;; ++ macppc:NetBSD:*:*) ++ echo powerpc-unknown-netbsd${UNAME_RELEASE} ++ exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; diff --git a/lang/RScheme/patches/patch-ad b/lang/RScheme/patches/patch-ad index 62a6a30c9b3..447c21f946a 100644 --- a/lang/RScheme/patches/patch-ad +++ b/lang/RScheme/patches/patch-ad @@ -1,22 +1,14 @@ -$NetBSD: patch-ad,v 1.1 2002/03/05 08:45:35 jmc Exp $ +$NetBSD: patch-ad,v 1.2 2003/08/04 15:34:21 jtb Exp $ ---- stage0/config.sub.orig Tue Mar 5 07:53:10 2002 -+++ stage0/config.sub Tue Mar 5 07:58:38 2002 -@@ -155,7 +155,7 @@ - | alpha | we32k | ns16k | clipper | i370 | sh \ - | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ - | pdp11 | mips64el | mips64orion | mips64orionel \ -- | sparc | sparclet | sparclite | sparc64) -+ | sparc | sparclet | sparclite | sparc64 | macppc) - basic_machine=$basic_machine-unknown - ;; - # We use `pc' rather than `unknown' -@@ -177,7 +177,7 @@ - | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ - | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ -- | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) -+ | mips64el-* | mips64orion-* | mips64orionel-* | f301-* | macppc-* ) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. +--- packages/lss/timebase/config.guess.orig 2003-08-04 09:10:28.000000000 +0100 ++++ packages/lss/timebase/config.guess 2003-08-04 09:11:51.000000000 +0100 +@@ -129,6 +129,9 @@ + mac68k:OpenBSD:*:*) + echo m68k-apple-openbsd${UNAME_RELEASE} + exit 0 ;; ++ macppc:NetBSD:*:*) ++ echo powerpc-unknown-netbsd${UNAME_RELEASE} ++ exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; diff --git a/lang/RScheme/patches/patch-ae b/lang/RScheme/patches/patch-ae index 7ced8770061..7ea9c1424bd 100644 --- a/lang/RScheme/patches/patch-ae +++ b/lang/RScheme/patches/patch-ae @@ -1,9 +1,16 @@ -$NetBSD: patch-ae,v 1.1 2002/03/06 06:48:16 jmc Exp $ +$NetBSD: patch-ae,v 1.2 2003/08/04 15:34:21 jtb Exp $ ---- packages/pkg-bld.orig Tue Jan 12 22:03:47 1999 -+++ packages/pkg-bld Wed Mar 6 05:48:19 2002 -@@ -41,7 +41,7 @@ +--- packages/pkg-bld.orig 1999-01-12 22:03:47.000000000 +0000 ++++ packages/pkg-bld 2003-08-04 13:55:10.000000000 +0100 +@@ -39,9 +39,14 @@ + M="`echo $PKG | sed 's/\./_/g'`" + rsc -P src/pkg packages/$PKG/$P.mcf ++if test "$PKG" = "db" ++then ++ echo "NOSTDINC=-I/usr/include" >> src/pkg/db/Makefile ++fi ++ if test -d src/pkg/$PKG then cd src/pkg/$PKG - make INSTALL_DIR=$INSTALL_DIR install diff --git a/lang/RScheme/patches/patch-af b/lang/RScheme/patches/patch-af index 6e453d6a9c8..aecef3c0555 100644 --- a/lang/RScheme/patches/patch-af +++ b/lang/RScheme/patches/patch-af @@ -1,8 +1,56 @@ -$NetBSD: patch-af,v 1.1 2002/03/06 06:48:16 jmc Exp $ +$NetBSD: patch-af,v 1.2 2003/08/04 15:34:21 jtb Exp $ ---- stage0/configure.orig Mon Nov 27 02:03:11 2000 -+++ stage0/configure Wed Mar 6 06:24:01 2002 -@@ -2762,8 +2762,10 @@ +--- stage0/configure.in.orig 2003-08-04 11:22:05.000000000 +0100 ++++ stage0/configure.in 2003-08-04 11:22:10.000000000 +0100 +@@ -56,7 +56,7 @@ + + + GC="" +-LDX_FLAGS="-lm" ++LDX_FLAGS="$LDFLAGS -lm" + + AC_CANONICAL_HOST + AC_C_BIGENDIAN +@@ -179,32 +179,12 @@ + # if using readline library, add appropriate LDX flags + # should this a --with option? Better defaults? + +-case "$enable_readline" in +- gnu | yes ) +- rdln_dir="" +- for i in /lib /usr/lib /usr/local/lib $HOME/lib +- do if test -r $i/libreadline.a +- then rdln_dir=$i +- fi +- done +- if test -z "$rdln_dir" +- then echo "WARNING: could not find GNU readline library" >&2 +- echo " may need to patch rshell/Makefile" >&2 +- LDX_FLAGS="-lreadline $LDX_FLAGS" +- else LDX_FLAGS="-L$rdln_dir -lreadline $LDX_FLAGS" +- fi +- if test -r /usr/lib/libcur.a +- then LDX_FLAGS="$LDX_FLAGS -lcur" +- else if test -r /usr/lib/libtermcap.a +- then LDX_FLAGS="$LDX_FLAGS -ltermcap" +- fi +- fi +- RDLN="gnu" ;; +- "std" | "no" | "" ) +- RDLN="std" ;; +- *) +- RDLN="$enable_readline" ;; +-esac ++AC_CHECK_LIB(readline, readline, RDLN="gnu", RDLN="std", -ltermcap) ++[ ++if test "$RDLN" = "gnu"; then ++ ] LDX_FLAGS="$LDX_FLAGS -lreadline -ltermcap" [ ++fi ++] + + if test "$enable_dynamic_linking" = "" -a "$dl_default" = "yes" + then enable_dynamic_linking=yes +@@ -564,8 +544,10 @@ $(SO_PRODUCT): $(SOFILES) $(CC) -shared $(SOFILES) -o $(SO_PRODUCT) $(XLFLAGS) diff --git a/lang/RScheme/patches/patch-ah b/lang/RScheme/patches/patch-ah new file mode 100644 index 00000000000..e0055f51778 --- /dev/null +++ b/lang/RScheme/patches/patch-ah @@ -0,0 +1,17 @@ +$NetBSD: patch-ah,v 1.1 2003/08/04 15:34:22 jtb Exp $ + +--- packages/lss/timebase/Makefile.in.orig 1998-12-12 03:44:07.000000000 +0000 ++++ packages/lss/timebase/Makefile.in 2003-08-04 09:40:40.000000000 +0100 +@@ -2,9 +2,11 @@ + CFILES=timebase_ops.c @READ_C@ + SFILES=@READ_S@ + +-OFILES=$(CFILES:.c=.o) $(SFILES:.s=.o) ++OFILES=$(CFILES:.c=.o) $(SFILES:S,ppc/,,:.s=.o) + LD=ld + ++readtime.o: $(SFILES) ++ + PRODUCT=timebase.o + + $(PRODUCT): $(OFILES) diff --git a/lang/RScheme/patches/patch-ai b/lang/RScheme/patches/patch-ai new file mode 100644 index 00000000000..bb756463fef --- /dev/null +++ b/lang/RScheme/patches/patch-ai @@ -0,0 +1,14 @@ +$NetBSD: patch-ai,v 1.1 2003/08/04 15:34:22 jtb Exp $ + +--- packages/rstore/config.guess.orig 2003-08-04 09:12:07.000000000 +0100 ++++ packages/rstore/config.guess 2003-08-04 09:12:30.000000000 +0100 +@@ -129,6 +129,9 @@ + mac68k:OpenBSD:*:*) + echo m68k-apple-openbsd${UNAME_RELEASE} + exit 0 ;; ++ macppc:NetBSD:*:*) ++ echo powerpc-unknown-netbsd${UNAME_RELEASE} ++ exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; diff --git a/lang/RScheme/patches/patch-aj b/lang/RScheme/patches/patch-aj new file mode 100644 index 00000000000..33e801087d7 --- /dev/null +++ b/lang/RScheme/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1 2003/08/04 15:34:23 jtb Exp $ + +--- handc/cfg/rdln/gnu/Makefile.orig 1996-04-22 17:18:59.000000000 +0100 ++++ handc/cfg/rdln/gnu/Makefile 2003-08-04 10:57:21.000000000 +0100 +@@ -11,7 +11,7 @@ + # + + +-CFLAGS2=$(CFLAGS) -I$(HOME)/include ++CFLAGS2=$(CFLAGS) $(CPPFLAGS) + CFILES=rdln_gnu.c + PRODUCT=rdln.o + diff --git a/lang/RScheme/patches/patch-ak b/lang/RScheme/patches/patch-ak new file mode 100644 index 00000000000..a18646ffb56 --- /dev/null +++ b/lang/RScheme/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2003/08/04 15:34:23 jtb Exp $ + +--- stage0/cfg/rdln/gnu/Makefile.orig 2003-08-04 11:29:45.000000000 +0100 ++++ stage0/cfg/rdln/gnu/Makefile 2003-08-04 11:30:02.000000000 +0100 +@@ -11,7 +11,7 @@ + # + + +-CFLAGS2=$(CFLAGS) -I$(HOME)/include ++CFLAGS2=$(CFLAGS) $(CPPFLAGS) + CFILES=rdln_gnu.c + PRODUCT=rdln.o + -- cgit v1.2.3