summaryrefslogtreecommitdiff
path: root/lang/mzscheme/patches
diff options
context:
space:
mode:
Diffstat (limited to 'lang/mzscheme/patches')
-rw-r--r--lang/mzscheme/patches/patch-aa61
-rw-r--r--lang/mzscheme/patches/patch-ab14
-rw-r--r--lang/mzscheme/patches/patch-ac14
-rw-r--r--lang/mzscheme/patches/patch-ad13
-rw-r--r--lang/mzscheme/patches/patch-ae22
-rw-r--r--lang/mzscheme/patches/patch-af19
-rw-r--r--lang/mzscheme/patches/patch-ag13
-rw-r--r--lang/mzscheme/patches/patch-ah16
-rw-r--r--lang/mzscheme/patches/patch-ai13
-rw-r--r--lang/mzscheme/patches/patch-aj4
-rw-r--r--lang/mzscheme/patches/patch-ak11
-rw-r--r--lang/mzscheme/patches/patch-al13
-rw-r--r--lang/mzscheme/patches/patch-ba45
-rw-r--r--lang/mzscheme/patches/patch-bb126
-rw-r--r--lang/mzscheme/patches/patch-bc38
-rw-r--r--lang/mzscheme/patches/patch-bd25
-rw-r--r--lang/mzscheme/patches/patch-be42
-rw-r--r--lang/mzscheme/patches/patch-bf24
-rw-r--r--lang/mzscheme/patches/patch-bg39
19 files changed, 22 insertions, 530 deletions
diff --git a/lang/mzscheme/patches/patch-aa b/lang/mzscheme/patches/patch-aa
index 3d0777fb94c..c709f36178e 100644
--- a/lang/mzscheme/patches/patch-aa
+++ b/lang/mzscheme/patches/patch-aa
@@ -1,51 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2000/01/20 14:12:50 pooka Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/27 16:42:07 pooka Exp $
---- sconfig.h.orig Thu Oct 21 22:06:12 1999
-+++ sconfig.h Wed Jan 12 15:09:48 2000
-@@ -285,6 +285,37 @@
-
- #endif
-
-+ /********************* NetBSD ***********************/
-+
-+#if defined(__NetBSD__)
-+
-+# define SCHEME_PLATFORM_LIBRARY_SUBPATH "netbsd"
-+
-+# include "uconfig.h"
-+
-+# undef HAS_STANDARD_IOB
-+# define HAS_BSD_IOB
-+
-+# define STACK_GROWS_DOWN
-+
-+# define UNDERSCORE_DYNLOAD_SYMBOL_PREFIX
-+
-+# define USE_IEEE_FP_PREDS
-+# define POW_HANDLES_INF_CORRECTLY
-+
-+# define SIGSET_IS_SIGNAL
-+
-+# define USE_TM_GMTOFF_FIELD
-+
-+#if defined(__alpha__)
-+# define SIXTY_FOUR_BIT_INTEGERS
-+# define USE_DIVIDE_MAKE_INFINITY
-+#endif
-+
-+# define FLAGS_ALREADY_SET
-+
-+#endif
-+
- /************** x86/OpenBSD with gcc ****************/
- /* Thanks to Bengt Kleberg */
-
-@@ -505,7 +536,7 @@
-
- /************** ALPHA/OSF1 with gcc ****************/
-
--#if defined(__alpha)
-+#if defined(__alpha) && !defined(__NetBSD__)
-
- # define SCHEME_PLATFORM_LIBRARY_SUBPATH "alpha-osf1"
+--- Makefile.in.orig Tue Aug 27 18:32:50 2002
++++ Makefile.in Tue Aug 27 18:46:10 2002
+@@ -228,9 +228,6 @@
+ cd ..; cp mzscheme/mzdyn.o $(LIBIDIR)/mzdyn.o
+ cd ..; $(ICP) mzscheme/libmzgc.@LIBSFX@ $(LIBIDIR)/libmzgc.@LIBSFX@
+ cd ..; $(ICP) mzscheme/libmzscheme.@LIBSFX@ $(LIBIDIR)/libmzscheme.@LIBSFX@
+- cd ..; echo 'CC=@CC@' > $(BUILDINFO)
+- cd ..; echo 'CFLAGS=@CFLAGS@ @OPTIONS@' >> $(BUILDINFO)
+- cd ..; echo 'LIBS=@LIBS@' >> $(BUILDINFO)
+
+ MZFWDIR = "@FRAMEWORK_INSTALL_DIR@"/PLT_MzScheme.framework
diff --git a/lang/mzscheme/patches/patch-ab b/lang/mzscheme/patches/patch-ab
deleted file mode 100644
index 60ecdfa9df5..00000000000
--- a/lang/mzscheme/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- mzmake.orig Thu Oct 21 22:06:11 1999
-+++ mzmake Thu Dec 30 17:23:33 1999
-@@ -37,6 +37,9 @@
- make "$@" $GCOPTS RANLIB=':' CC='cc' WARN=''
- fi
- ;;
-+ NetBSD)
-+ gmake 'CC=gcc' 'PERL=' 'OPTIONS=-DSILENT' $GCOPTS "$@"
-+ ;;
- FreeBSD)
- gmake 'CC=gcc' $GCOPTS LIBS="-lm -rdynamic" "$@"
- ;;
diff --git a/lang/mzscheme/patches/patch-ac b/lang/mzscheme/patches/patch-ac
deleted file mode 100644
index 76194980f56..00000000000
--- a/lang/mzscheme/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- ../../bin/archsys.orig Thu May 20 16:44:32 1999
-+++ ../../bin/archsys Sat Jan 8 19:43:12 2000
-@@ -62,6 +62,9 @@
- OpenBSD)
- SYS=i386${SEP}openbsd
- ;;
-+ NetBSD)
-+ SYS=netbsd
-+ ;;
- IRIX*)
- SYS=mips${SEP}irix
- ;;
diff --git a/lang/mzscheme/patches/patch-ad b/lang/mzscheme/patches/patch-ad
deleted file mode 100644
index 645a318154d..00000000000
--- a/lang/mzscheme/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- Makefile.orig Sat Jan 8 19:45:36 2000
-+++ Makefile Sat Jan 8 19:47:11 2000
-@@ -158,7 +158,7 @@
- dlltool --def include/gmzwin.def --output-exp gmzwin.exp --output-lib gmzwin.a --dllname mzscheme.exe
-
- g-c: $(GCDIR)/objects $(GCDIR)/$(OBJDIR)
-- cd $(GCDIR); $(XMAKE) -e $(OBJDIR)/gc.a
-+ cd $(GCDIR); $(XMAKE) CFLAGS='-DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DOLD_BLOCK_ALLOC -O2' -e $(OBJDIR)/gc.a
- $(XMAKE) $(LIBDIR)/libgc.a
- $(XMAKE) $(GCLIBMAKEEXTRA)
-
diff --git a/lang/mzscheme/patches/patch-ae b/lang/mzscheme/patches/patch-ae
deleted file mode 100644
index 1f4de960f37..00000000000
--- a/lang/mzscheme/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- ../../bin/mzscheme.orig Sun Dec 21 03:47:24 1997
-+++ ../../bin/mzscheme Sat Jan 8 23:15:58 2000
-@@ -1,14 +1,11 @@
- #!/bin/sh
-
--# This script picks the right binary for a mutli-platform
--# configuration
-+# mzscheme execution script modified for the NetBSD pkg system
-
- if [ "$PLTHOME" = '' ] ; then
-- PLTHOME=/usr/local/lib/plt
-+ PLTHOME=XXXPREFIXXXX/lib/plt
- export PLTHOME
- fi
-
--SYS=`${PLTHOME}/bin/archsys z`
--
--exec ${PLTHOME}/.bin/${SYS}/mzscheme ${1+"$@"}
-+exec ${PLTHOME}/bin/mzscheme ${1+"$@"}
-
diff --git a/lang/mzscheme/patches/patch-af b/lang/mzscheme/patches/patch-af
deleted file mode 100644
index f02244c6d83..00000000000
--- a/lang/mzscheme/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- ../../bin/mzc.orig Thu May 14 00:35:57 1998
-+++ ../../bin/mzc Sat Jan 8 23:21:59 2000
-@@ -1,11 +1,9 @@
- #!/bin/sh
--# This script was created by make-mzscheme-launcher
-+# This script was modified for the NetBSD pkg system
-
- if [ "$PLTHOME" = '' ] ; then
-- PLTHOME=/usr/local/lib/plt
-+ PLTHOME=XXXPREFIXXXX/lib/plt
- export PLTHOME
- fi
-
--SYS=`${PLTHOME}/bin/archsys`
--
--exec ${PLTHOME}/.bin/${SYS}/mzscheme '-mqvL' 'start.ss' 'compiler' '--' ${1+"$@"}
-+exec ${PLTHOME}/bin/mzscheme '-mqvL' 'start.ss' 'compiler' '--' ${1+"$@"}
diff --git a/lang/mzscheme/patches/patch-ag b/lang/mzscheme/patches/patch-ag
deleted file mode 100644
index f70ea0d3e4c..00000000000
--- a/lang/mzscheme/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- cmdline.inc.orig Thu Oct 21 22:06:11 1999
-+++ cmdline.inc Sat Jan 8 23:19:04 2000
-@@ -432,7 +432,7 @@
- # ifdef USE_BEOS_SNOOZE
- "(#%lambda () \"/boot/apps/plt/collects\")"
- # else
-- "(#%lambda () \"/usr/local/lib/plt/collects\")"
-+ "(#%lambda () \"XXXPREFIXXXX/lib/plt/collects\")"
- # endif
- #endif
- #ifdef DOS_FILE_SYSTEM
diff --git a/lang/mzscheme/patches/patch-ah b/lang/mzscheme/patches/patch-ah
index a8147fec354..45b3a5a1ff9 100644
--- a/lang/mzscheme/patches/patch-ah
+++ b/lang/mzscheme/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
+$NetBSD: patch-ah,v 1.2 2002/08/27 16:42:23 pooka Exp $
---- ../../man/man1/mzscheme.1.orig Fri Jan 29 00:31:45 1999
-+++ ../../man/man1/mzscheme.1 Sat Jan 8 23:30:27 2000
-@@ -223,7 +223,7 @@
- "mzscheme") are checked. Links are followed as in the
- first case.
+--- ../../man/man1/mzscheme.1.orig Sat Feb 2 11:01:39 2002
++++ ../../man/man1/mzscheme.1 Wed Jul 31 19:07:28 2002
+@@ -304,7 +304,7 @@
+ invoked (usually "mzscheme") are checked. Links and parent directories
+ are followed as in the first case.
.IP
-The "/usr/local/lib/plt/collects" directory is
+The "XXXPREFIXXXX/lib/plt/collects" directory is
tried.
- .PP
- Please consult your local administrator to determine whether
+
+ .SH EXECUTABLE SCRIPTS
diff --git a/lang/mzscheme/patches/patch-ai b/lang/mzscheme/patches/patch-ai
deleted file mode 100644
index 12eff4bb7a2..00000000000
--- a/lang/mzscheme/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- ../../collects/mzlib/restartr.ss.orig Thu Mar 11 17:13:43 1999
-+++ ../../collects/mzlib/restartr.ss Sat Jan 8 23:58:48 2000
-@@ -144,7 +144,7 @@
- (lambda () (find-executable-path program "collects"))
- (lambda ()
- (case (system-type)
-- [(unix beos) "/usr/local/lib/plt/collects"]
-+ [(unix beos) "XXXPREFIXXXX/lib/plt/collects"]
- [(windows) "c:\\plt\\collects"]
- [else #f]))))
- null)))))
diff --git a/lang/mzscheme/patches/patch-aj b/lang/mzscheme/patches/patch-aj
index 847b5213d93..f0deb3eda2e 100644
--- a/lang/mzscheme/patches/patch-aj
+++ b/lang/mzscheme/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
+$NetBSD: patch-aj,v 1.2 2002/08/27 16:42:25 pooka Exp $
--- ../../collects/slibinit/init.ss.orig Thu Apr 22 19:21:19 1999
+++ ../../collects/slibinit/init.ss Sun Jan 9 00:00:34 2000
-@@ -46,7 +46,7 @@
+@@ -53,7 +53,7 @@
[(base name dir?) (split-path base)])
(and (string? base) base))))
(case (system-type)
diff --git a/lang/mzscheme/patches/patch-ak b/lang/mzscheme/patches/patch-ak
deleted file mode 100644
index 22f19f4609e..00000000000
--- a/lang/mzscheme/patches/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- src/makeexn.orig Tue Dec 15 21:13:56 1998
-+++ src/makeexn Sun Jan 9 00:02:04 2000
-@@ -1,5 +1,5 @@
- #!/bin/sh
--string=? ; if [ "$PLTHOME" = "" ] ; then PLTHOME=/usr/local/lib/plt ; export PLTHOME ; fi
-+string=? ; if [ "$PLTHOME" = "" ] ; then PLTHOME=XXXPREFIXXXX/lib/plt ; export PLTHOME ; fi
- string=? ; exec ${PLTHOME}/bin/mzscheme -gqr $0 "$@"
-
- (define doc? (and (= (vector-length argv) 1)
diff --git a/lang/mzscheme/patches/patch-al b/lang/mzscheme/patches/patch-al
deleted file mode 100644
index 65678f89690..00000000000
--- a/lang/mzscheme/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- ../../install.orig Mon Aug 9 16:39:17 1999
-+++ ../../install Sun Jan 9 02:17:40 2000
-@@ -60,7 +60,7 @@
- # PLTHOME=<newpath>
- # where <newpath> is provided to this script
-
-- PROGRAM="/set PLTHOME=.*/ { print \" set PLTHOME=$installplthome\"; next } /PLTHOME=.*/ { print \" PLTHOME=$installplthome\"; next } /.*/ {print} "
-+ PROGRAM="/PLTHOME=.*/ { print \" PLTHOME=${PREFIX}/lib/plt\"; next } /.*/ {print} "
-
- for f in bin/* ; do
- if [ -f $f ] ; then
diff --git a/lang/mzscheme/patches/patch-ba b/lang/mzscheme/patches/patch-ba
deleted file mode 100644
index 8c87b8793b1..00000000000
--- a/lang/mzscheme/patches/patch-ba
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- gc/Makefile.orig Thu Oct 21 22:06:13 1999
-+++ gc/Makefile Thu Jan 6 23:15:25 2000
-@@ -15,9 +15,9 @@
- # c++ interface to $(OBJDIR)/gc.a
- # cord/de - builds dumb editor based on cords.
- ABI_FLAG=
--CC= gcc $(ABI_FLAG)
--CXX= $(CC) $(ABI_FLAG)
--AS= as $(ABI_FLAG)
-+CC=gcc $(ABI_FLAG)
-+CXX=g++ $(ABI_FLAG)
-+AS=gcc -c -x assembler-with-cpp $(ABI_FLAG)
-
- OBJDIR = objects
- EXEDIR = $(OBJDIR)
-@@ -34,8 +34,8 @@
-
- # Debugging, warnings, optimization
- DEBUGFLAGS=
--WARN= -Wall
--OPT= -O
-+WARN=
-+OPT= -O2
-
- CFLAGS= -DNO_SIGNALS $(WARN) $(OPT) $(OPTIONS) $(DEBUGFLAGS) -DNO_EXECUTE_PERMISSION -DSILENT -DOLD_BLOCK_ALLOC
- # Setjmp_test may yield overly optimistic results when compiled
-@@ -176,7 +176,7 @@
- threadlibs.c if_mach.c if_not_there.c gc_cpp.cc gc_cpp.h weakpointer.h \
- gcc_support.c mips_ultrix_mach_dep.s include/gc_alloc.h gc_alloc.h \
- include/new_gc_alloc.h include/javaxfc.h sparc_sunos4_mach_dep.s \
-- solaris_threads.h backptr.h $(CORD_SRCS)
-+ sparc_netbsd_mach_dep.s solaris_threads.h backptr.h $(CORD_SRCS)
-
- OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
- README test.c test_cpp.cc setjmp_t.c SMakefile.amiga \
-@@ -291,6 +291,7 @@
- ./$(EXEDIR)/if_mach SPARC SUNOS5 $(AS) -o $(OBJDIR)/mach_dep.o $(srcdir)/sparc_mach_dep.s
- ./$(EXEDIR)/if_mach SPARC SUNOS4 $(AS) -o $(OBJDIR)/mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
- ./$(EXEDIR)/if_mach SPARC OPENBSD $(AS) -o $(OBJDIR)mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
-+ ./$(EXEDIR)/if_mach SPARC NETBSD $(AS) -o $(OBJDIR)/mach_dep.o $(srcdir)/sparc_netbsd_mach_dep.s
- ./$(EXEDIR)/if_not_there $(OBJDIR)/mach_dep.o $(CC) -c $(SPECIALCFLAGS) -o $(OBJDIR)/mach_dep.o $(srcdir)/mach_dep.c
-
- $(OBJDIR)/mark_rts.o: $(srcdir)/mark_rts.c $(UTILS)
diff --git a/lang/mzscheme/patches/patch-bb b/lang/mzscheme/patches/patch-bb
deleted file mode 100644
index 6e05823a2ab..00000000000
--- a/lang/mzscheme/patches/patch-bb
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- gc/gcconfig.h.orig Thu Oct 21 22:06:14 1999
-+++ gc/gcconfig.h Mon Jan 3 09:08:17 2000
-@@ -27,6 +27,11 @@
- # define LINUX
- # endif
-
-+# if defined(__NetBSD__)
-+# define NETBSD
-+# define unix /* symbol no longer defined by NetBSD */
-+# endif
-+
- /* Determine the machine type: */
- # if defined(sun) && defined(mc68000)
- # define M68K
-@@ -50,9 +55,12 @@
- # endif
- # if defined(__NetBSD__) && defined(m68k)
- # define M68K
--# define NETBSD
- # define mach_type_known
- # endif
-+# if defined(__NetBSD__) && defined(__powerpc__)
-+# define POWERPC
-+# define mach_type_unknown
-+# endif
- # if defined(vax)
- # define VAX
- # ifdef ultrix
-@@ -106,7 +114,7 @@
- # define mach_type_known
- # endif
- # if defined(sparc) && defined(unix) && !defined(sun) && !defined(linux) \
-- && !defined(__OpenBSD__)
-+ && !defined(__OpenBSD__) && !defined(__NetBSD__)
- # define SPARC
- # define DRSNX
- # define mach_type_known
-@@ -115,6 +123,10 @@
- # define RS6000
- # define mach_type_known
- # endif
-+# if defined(__NetBSD__) && defined(__sparc__)
-+# define SPARC
-+# define mach_type_known
-+# endif
- # if defined(_M_XENIX) && defined(_M_SYSV) && defined(_M_I386)
- /* The above test may need refinement */
- # define I386
-@@ -154,7 +166,7 @@
- # endif
- # if defined(__alpha) || defined(__alpha__)
- # define ALPHA
--# if !defined(LINUX)
-+# if !defined(LINUX) && !defined(NETBSD)
- # define OSF1 /* a.k.a Digital Unix */
- # endif
- # define mach_type_known
-@@ -203,7 +215,6 @@
- # endif
- # if defined(__NetBSD__) && defined(i386)
- # define I386
--# define NETBSD
- # define mach_type_known
- # endif
- # if defined(bsdi) && defined(i386)
-@@ -533,6 +544,14 @@
- # define STACKBOTTOM ((ptr_t) 0xc0000000)
- # define DATAEND /* not needed */
- # endif
-+# ifdef NETBSD
-+# define ALIGNMENT 4
-+# define OS_TYPE "NETBSD"
-+# define HEURISTIC2
-+ extern char etext;
-+# define DATASTART GC_data_start
-+# define DYNAMIC_LOADING
-+# endif
- # endif
-
- # ifdef VAX
-@@ -562,7 +581,6 @@
- # define MACH_TYPE "SPARC"
- # define ALIGNMENT 4 /* Required by hardware */
- # define ALIGN_DOUBLE
-- extern int etext;
- # ifdef SUNOS5
- # define OS_TYPE "SUNOS5"
- extern int _etext;
-@@ -634,8 +652,20 @@
- # ifdef OPENBSD
- # define OS_TYPE "OPENBSD"
- # define STACKBOTTOM ((ptr_t) 0xf8000000)
-+ extern int etext;
- # define DATASTART ((ptr_t)(&etext))
- # endif
-+# ifdef NETBSD
-+# define OS_TYPE "NETBSD"
-+# define HEURISTIC2
-+# ifdef __ELF__
-+# define DATASTART GC_data_start
-+# define DYNAMIC_LOADING
-+# else
-+ extern char etext;
-+# define DATASTART ((ptr_t)(&etext))
-+# endif
-+# endif
- # endif
-
- # ifdef I386
-@@ -925,6 +955,14 @@
- # ifdef ALPHA
- # define MACH_TYPE "ALPHA"
- # define ALIGNMENT 8
-+# ifdef NETBSD
-+# define OSTYPE "NETBSD"
-+# define HEURISTIC2
-+# define DATASTART GC_data_start
-+# define ELF_CLASS ELFCLASS64
-+# define CPP_WORDSZ 64
-+# define DYNAMIC_LOADING
-+# endif
- # ifdef OSF1
- # define OS_TYPE "OSF1"
- # define DATASTART ((ptr_t) 0x140000000)
diff --git a/lang/mzscheme/patches/patch-bc b/lang/mzscheme/patches/patch-bc
deleted file mode 100644
index ffc8b346385..00000000000
--- a/lang/mzscheme/patches/patch-bc
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- gc/dyn_load.c.orig Thu Oct 21 22:06:14 1999
-+++ gc/dyn_load.c Mon Jan 3 09:10:01 2000
-@@ -48,7 +48,8 @@
- #if !defined(SUNOS4) && !defined(SUNOS5DL) && !defined(IRIX5) && \
- !defined(MSWIN32) && !(defined(ALPHA) && defined(OSF1)) && \
- !defined(HP_PA) && !(defined(LINUX) && defined(__ELF__)) && \
-- !defined(RS6000) && !defined(SCO_ELF)
-+ !defined(RS6000) && !defined(SCO_ELF) && \
-+ !defined(NETBSD) && defined(__ELF__)
- --> We only know how to find data segments of dynamic libraries for the
- --> above. Additional SVR4 variants might not be too
- --> hard to add.
-@@ -260,14 +261,22 @@
- # endif /* !USE_PROC ... */
- # endif /* SUNOS */
-
--#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF)
-+#if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF) || \
-+ (defined(NETBSD) && defined(__ELF__))
-
- /* Dynamic loading code for Linux running ELF. Somewhat tested on
- * Linux/x86, untested but hopefully should work on Linux/Alpha.
- * This code was derived from the Solaris/ELF support. Thanks to
- * whatever kind soul wrote that. - Patrick Bridges */
-
-+#ifdef NETBSD
-+#include <sys/exec_elf.h>
-+#define DT_DEBUG 21
-+#define PT_LOAD 1
-+#define PF_W 0x2
-+#else
- #include <elf.h>
-+#endif
- #include <link.h>
-
- /* Newer versions of Linux/Alpha and Linux/x86 define this macro. We
diff --git a/lang/mzscheme/patches/patch-bd b/lang/mzscheme/patches/patch-bd
deleted file mode 100644
index a9a9bcfd896..00000000000
--- a/lang/mzscheme/patches/patch-bd
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- gc/misc.c.orig Thu Oct 21 22:06:15 1999
-+++ gc/misc.c Mon Jan 3 10:21:54 2000
-@@ -58,6 +58,10 @@
- # endif
- # endif
-
-+#if defined(NETBSD) && defined(__ELF__)
-+void GC_init_netbsd_elf(void);
-+#endif
-+
- GC_FAR struct _GC_arrays GC_arrays /* = { 0 } */;
-
-
-@@ -430,6 +434,9 @@
- # endif
- # if defined(LINUX) && (defined(POWERPC) || defined(ALPHA) || defined(SPARC))
- GC_init_linux_data_start();
-+# endif
-+# if defined(NETBSD) && defined(__ELF__)
-+ GC_init_netbsd_elf();
- # endif
- # ifdef SOLARIS_THREADS
- GC_thr_init();
diff --git a/lang/mzscheme/patches/patch-be b/lang/mzscheme/patches/patch-be
deleted file mode 100644
index ab0257c9364..00000000000
--- a/lang/mzscheme/patches/patch-be
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-be,v 1.2 2000/01/20 14:12:50 pooka Exp $
-
---- gc/os_dep.c.orig Thu Oct 21 22:06:15 1999
-+++ gc/os_dep.c Thu Dec 30 22:15:23 1999
-@@ -156,6 +156,19 @@
- }
- #endif
-
-+#if defined(NETBSD) && defined(__ELF__)
-+ ptr_t GC_data_start;
-+
-+ void GC_init_netbsd_elf()
-+ {
-+ extern ptr_t GC_find_limit();
-+ extern char **environ;
-+ /* This may need to be environ, without the underscore, for */
-+ /* some versions. */
-+ GC_data_start = GC_find_limit((ptr_t)&environ, FALSE);
-+ }
-+#endif
-+
- # ifdef OS2
-
- # include <stddef.h>
-@@ -2437,7 +2450,7 @@
- # if defined (DRSNX)
- # include <sys/sparc/frame.h>
- # else
--# if defined(OPENBSD)
-+# if defined(OPENBSD) || defined(NETBSD)
- # include <frame.h>
- # else
- # include <sys/frame.h>
-@@ -2452,7 +2465,7 @@
- /* Fill in the pc and argument information for up to NFRAMES of my */
- /* callers. Ignore my frame and my callers frame. */
-
--#ifdef OPENBSD
-+#if defined(OPENBSD) || defined(NETBSD)
- # define FR_SAVFP fr_fp
- # define FR_SAVPC fr_pc
- #else
diff --git a/lang/mzscheme/patches/patch-bf b/lang/mzscheme/patches/patch-bf
deleted file mode 100644
index 1b1ce14c2a6..00000000000
--- a/lang/mzscheme/patches/patch-bf
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bf,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- gc/mach_dep.c.orig Thu Oct 21 22:06:14 1999
-+++ gc/mach_dep.c Thu Dec 30 22:17:41 1999
-@@ -197,6 +197,8 @@
- && !defined(SCO) && !defined(SCO_ELF) \
- && !(defined(LINUX) && defined(__ELF__)) \
- && !(defined(__FreeBSD__) && defined(__ELF__)) \
-+ && !(defined(__NetBSD__) && defined(__ELF__)) \
-+ && !(defined(__OpenBSD__) && defined(__ELF__)) \
- && !defined(DOS4GW)
- /* I386 code, generic code does not appear to work */
- /* It does appear to work under OS2, and asms dont */
-@@ -211,7 +213,9 @@
- # endif
-
- # if ( defined(I386) && defined(LINUX) && defined(__ELF__) ) \
-- || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) )
-+ || ( defined(I386) && defined(__FreeBSD__) && defined(__ELF__) ) \
-+ || ( defined(I386) && defined(__NetBSD__) && defined(__ELF__) ) \
-+ || ( defined(I386) && defined(__OpenBSD__) && defined(__ELF__) )
-
- /* This is modified for Linux with ELF (Note: _ELF_ only) */
- /* This section handles FreeBSD with ELF. */
diff --git a/lang/mzscheme/patches/patch-bg b/lang/mzscheme/patches/patch-bg
deleted file mode 100644
index ceb99bd50c1..00000000000
--- a/lang/mzscheme/patches/patch-bg
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-bg,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
-
---- /dev/null Thu Dec 30 22:01:07 1999
-+++ gc/sparc_netbsd_mach_dep.s Thu Dec 30 22:19:46 1999
-@@ -0,0 +1,34 @@
-+! SPARCompiler 3.0 and later apparently no longer handles
-+! asm outside functions. So we need a separate .s file
-+! This is only set up for SunOS 4.
-+! Assumes this is called before the stack contents are
-+! examined.
-+
-+#include "machine/asm.h"
-+
-+ .seg "text"
-+ .globl _C_LABEL(GC_save_regs_in_stack)
-+ .globl _C_LABEL(GC_push_regs)
-+_C_LABEL(GC_save_regs_in_stack):
-+_C_LABEL(GC_push_regs):
-+ ta 0x3 ! ST_FLUSH_WINDOWS
-+ mov %sp,%o0
-+ retl
-+ nop
-+
-+ .globl _C_LABEL(GC_clear_stack_inner)
-+_C_LABEL(GC_clear_stack_inner):
-+ mov %sp,%o2 ! Save sp
-+ add %sp,-8,%o3 ! p = sp-8
-+ clr %g1 ! [g0,g1] = 0
-+ add %o1,-0x60,%sp ! Move sp out of the way,
-+ ! so that traps still work.
-+ ! Includes some extra words
-+ ! so we can be sloppy below.
-+loop:
-+ std %g0,[%o3] ! *(long long *)p = 0
-+ cmp %o3,%o1
-+ bgu loop ! if (p > limit) goto loop
-+ add %o3,-8,%o3 ! p -= 8 (delay slot)
-+ retl
-+ mov %o2,%sp ! Restore sp., delay slot