Update of icon to 9.4.0.

   Version  9.4 of Icon is a modified and repackaged implementation based
   on  version  9.3.2  of  Icon.  The changes make it easier to maintain,
   install,  and  use under Unix while retaining potential portability to
   other  systems.  Most  significant  are  changes  to  path  searching,
   described  below,  and  the inclusion of the Icon program library as a
   standard part of all Unix source and binary distributions.

   The  Icon  language  is  unchanged,  and  this 9.4 Unix implementation
   remains compatible at the source level with Icon 9.3 for Windows.

Recent feature additions

   New  features  added  since  the  publication  of  the  Icon books are
   described below.

  Reading foreign text files

   (new with Version 9.3.1 of Icon)

   The  function  read()  recognizes three kinds of line terminators when
   reading  a  file opened in translated mode: Windows (CR+LF), Macintosh
   (CR),  or  Unix (LF). Consequently, text files created on one platform
   can be read by an Icon program running on a different platform.

  Reading directory contents

   (new with Version 9.3.2 of Icon)

   The  files  in a directory can be listed by opening the directory as a
   file.  Subsequent reads return the names of the files contained in the
   directory.  The  names  are  returned  in no particular order, and for
   Unix, the directories "." and ".." are included.

  Path searching

   (new with Version 9.4 of Icon)

   Under  Unix,  colons (:) may now separate directories in the LPATH and
   IPATH  environment  variables  as  an  alternative to spaces. The Icon
   translator and linker search these paths when looking for $include and
   link files respectively.

   The  Icon program library is now searched automatically, but LPATH and
   IPATH  can  still be set to control the search order. For version 9.4,
   the effective path in each case is:
    1. the current directory
    2. any directories named by the environment variable
    3. the Icon library directory

   Other  changes  affect  the configuration of Icon at installation time
   and  the  way  executable  Icon programs locate the interpreter. These
   changes,  which  are  transparent to most users, are discussed in more
   detail on the [2]File Organization page.

Other Icon Changes

   Several  areas  of  the  Icon  implementation have been cleaned up, in
   particular   the  run-time  initialization  code,  and  some  obsolete
   configurations have been removed.

   With one clearly marked exception, programs in the standard test suite
   now generate reproducible output.

   The following problems have been corrected:
     * The sign bit was lost when converting a real to a large integer.
     * A duplicate close(f) could crash the interpreter.
     * Very large coordinate values were silently mishandled.
     * Window attributes over 127 characters long caused a segfault.
     * A segfault during traceback could produce an infinite loop.
     * A file inclusion bug in gcc 2.96 prevented Icon from building.

Library Changes

   The  program  library  has been incorporated into the main Icon source
   tree and is routinely built along with icont and iconx. Tests for most
   of  the  core  library  functions  and  loadable C functions have been
   incorporated  the standard test suite, and some additional consistency
   tests were developed.

   Numerous  changes  were  made  throughout  the  library to fix linking
   problems,  to  fix  typos  and formatting, and to support building via
   Makefiles.

   Some  files  that were miscategorized as graphics or non-graphics have
   been   moved.   Duplicate  files  in  the  cfuncs  and  packs/loadfunc
   directories  have been eliminated. Some other obsolete files were also
   removed.

   Other significant changes were:
procs/datetime          fixed dayoweek() to get all twelve months right
procs/factors           fixed divisors() to consistently return all factors
                        fixed genfactors() for some failing cases
                        added some minor optimizations
procs/genrfncs          added several new sequence generators
procs/io                modified to allow ":" as a path separator under Unix
procs/lists             fixed fatal bugs in lminlen() and lmaxlen()
                        added several new list manipulation procedures
procs/lstfncs           added: procedures to produce lists from sequences
procs/numbers           fixed decimal() for values where remainder repeats
procs/pdco              added several new control operations
procs/periodic          added: procedures related to periodic sequences
procs/permutat          added: procedures for permutations
procs/polynom           added: manipulate multi-variate polynomials
procs/pqueue            added new priority queue procedures
procs/rational          added real2rat(v, p)    #: convert real to rational
                        added medrat(r1, r2)    #: rational mediant
procs/records           added fieldnum(R, s)    #: return index of field R.s
procs/seqops            replaced: procedures to manipulate T-sequences
procs/strings           modified fchars() to break ties lexically
                        renamed permute() to permutes()

cfuncs/icall.h          fixed reading of misaligned doubles by RealVal()
cfuncs/fpoll.c          support fpoll() under BSD Unix flavors

gprocs/drawlab          modified to let the caller control the window size

progs/htprep            modified to improve quoting
progs/ipatch            modified to understand v9.4 headers as well as v9.3
progs/unclog            added: program to reformat CVS logs

gprogs/breakout         added: a new breakout game
gprogs/dlgvu            modified to allow interruption while drawing labels
gprogs/gallery          modified to recognize some nonstandard JPEG files
gpacks/tiger            modified to allow interruption of drawing
gpacks/xtiles           fixed the usage message

packs/loadfunc/cspace   increased the default window size

63 files changed, 635 insertions, 777 deletions

diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa
new file mode 100644
index 00000000000..5eaed8deb9b
--- /dev/null
+++ b/lang/icon/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2001/06/25 18:00:16 jtb Exp $
+
+--- ipl/cfuncs/mklib.sh.orig	Sat Jun 23 09:15:23 2001
++++ ipl/cfuncs/mklib.sh
+@@ -21,8 +21,8 @@
+       ld -shared -o $LIBNAME "$@";;
+    OSF*)
+       ld -shared -expect_unresolved '*' -o $LIBNAME "$@" -lc;;
+-   Linux*|BSD/OS*|OpenBSD*)
+-      gcc -shared -o $LIBNAME -fPIC "$@";;
++   Linux*|BSD/OS*|OpenBSD*|NetBSD*)
++      $CC -shared -o $LIBNAME -fPIC "$@";;
+    FreeBSD*)
+       ld -Bshareable -o $LIBNAME "$@" -lc;;
+    *)
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index 44fca955427..c44ce34ba66 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,30 +1,22 @@
-$NetBSD: patch-ab,v 1.5 2000/04/05 14:32:53 pooka Exp $
+$NetBSD: patch-ab,v 1.6 2001/06/25 18:00:16 jtb Exp $
 
---- Makefile.orig	Thu Jul  1 20:39:20 1999
-+++ Makefile	Wed Apr  5 16:16:27 2000
-@@ -186,6 +186,25 @@
- 		-cd src;		$(MAKE) Clean
- 		-cd tests;		$(MAKE) Clean
- 
-+# Install
+--- /dev/null	Mon Jun 25 14:19:36 2001
++++ config/unix/netbsd/define.h
+@@ -0,0 +1,17 @@
++/*
++ * Icon configuration file for NetBSD
++ */
 +
-+install:
-+	@bin/patchstr bin/iconc ${PREFIX}/share/icon/
-+	@bin/patchstr bin/icont ${PREFIX}/bin/iconx
-+	install -c -s -g wheel -o root -m 755 bin/iconc ${PREFIX}/bin/iconc
-+	install -c -s -g wheel -o root -m 755 bin/icont ${PREFIX}/bin/icont
-+	install -c -s -g wheel -o root -m 755 bin/iconx ${PREFIX}/bin/iconx
-+	install -c -s -g wheel -o root -m 755 bin/patchstr ${PREFIX}/bin/patchstr
-+	@mkdir -p ${PREFIX}/share/icon
-+	install -c -g wheel -o root -m 644 bin/dlrgint.o ${PREFIX}/share/icon/dlrgint.o
-+	install -c -g wheel -o root -m 644 bin/rt.a ${PREFIX}/share/icon/rt.a
-+	install -c -g wheel -o root -m 644 bin/rt.db ${PREFIX}/share/icon/rt.db
-+	install -c -g wheel -o root -m 644 bin/rt.h ${PREFIX}/share/icon/rt.h
-+#	@mkdir -p ${PREFIX}/man/man1
-+#	install -c -g wheel -o root -m 444 docs/icon.1 ${PREFIX}/man/man1/icon.1
-+#	@gzip -9fn ${PREFIX}/man/man1/icon.1
-+# XXX (icon.1 missing from this distribution!)
++#define UNIX 1
++#define GenericBSD
++#define BSD_4_4_LITE    1	/* This is new, for 4.4Lite specific stuff */
++#define NetBSD			/* This is for NetBSD stuff (save) */
 +
- ##################################################################
- # Entries beyond this point are for use at Arizona only.
- #   *** Do not delete the line above; it is used in trimming Makefiles
++#define LoadFunc
++#define SysOpt
++#define ExecImages
++
++#define MaxStatSize 20480
++
++#define CComp "gcc"
++#define COpts "-O2"
diff --git a/lang/icon/patches/patch-bc b/lang/icon/patches/patch-ae
index 2e3206e39ab..fa9b921cfd4 100644
--- a/lang/icon/patches/patch-bc
+++ b/lang/icon/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.2 1998/08/07 11:09:11 agc Exp $
+$NetBSD: patch-ae,v 1.4 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/rswitch.s	Fri Jun 19 02:47:53 1998
+--- /dev/null	Sat Jun 23 16:44:46 2001
++++ config/unix/netbsd/rswitch.alpha
 @@ -0,0 +1,46 @@
 +/*
 + *  coswitch(old_cs, new_cs, first) for Dec Alpha architecture
diff --git a/lang/icon/patches/patch-af b/lang/icon/patches/patch-af
new file mode 100644
index 00000000000..9b471ed299e
--- /dev/null
+++ b/lang/icon/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.5 2001/06/25 18:00:16 jtb Exp $
+
+--- /dev/null	Sat Jun 23 16:44:55 2001
++++ config/unix/netbsd/rswitch.i386
+@@ -0,0 +1,28 @@
++/*
++ * This is the co-expression context switch for the Intel 80386
++ * under Microport Unix System V/386
++ */
++
++/*
++ * coswitch
++ */
++
++coswitch(old_cs, new_cs, first)
++int *old_cs, *new_cs;
++int first;
++   {
++   asm("  movl 8(%ebp),%eax");
++   asm("  movl %esp,0(%eax)");
++   asm("  movl %ebp,4(%eax)");
++   asm("  movl 12(%ebp),%eax");
++   if (first == 0) {		/* this is the first activation */
++      asm("  movl 0(%eax),%esp");
++      asm("  movl $0,%ebp");
++      new_context(0, 0);
++      syserr("interp() returned in coswitch");
++      }
++   else {
++      asm("  movl 0(%eax),%esp");
++      asm("  movl 4(%eax),%ebp");
++      }
++   }
diff --git a/lang/icon/patches/patch-ag b/lang/icon/patches/patch-ag
index 5a0e9948301..6c116d0b35f 100644
--- a/lang/icon/patches/patch-ag
+++ b/lang/icon/patches/patch-ag
@@ -1,15 +1,44 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:09:05 agc Exp $
+$NetBSD: patch-ag,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/common.hdr	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,10 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#	make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
-+RSWITCH=rswitch.c
+--- /dev/null	Sat Jun 23 16:45:07 2001
++++ config/unix/netbsd/rswitch.sparc
+@@ -0,0 +1,39 @@
++/*
++ * coswitch for Sun-4 Sparc.
++ * 
++ * Compile this with 'cc -c rswitch.c'.  Do not use cc -O.
++ */
++
++/* #include <sys/asm_linkage.h> */
++/*#include <sys/trap.h>*/
++
++int coswitch(old_cs, new_cs, first)
++int *old_cs, *new_cs;
++int first;
++{
++   asm("ta     0x03");                 /* ST_FLUSH_WINDOWS in trap.h     */
++   asm("ld     [%fp+0x44], %o0");      /* load old_cs into %o0           */
++   asm("st     %sp,[%o0]");            /* Save user stack pointer        */
++   asm("st     %fp,[%o0+0x4]");        /* Save frame pointer             */
++   asm("st     %i7,[%o0+0x8]");        /* Save return address            */
++
++   if (first == 0) {                   /* this is the first activation   */
++      asm("ld  [%fp+0x48], %o0");      /* load new_cs into %o0           */
++      asm("ld  [%o0], %o1");           /* load %o1 from cstate[0]        */
++
++      /* Decrement new stack pointer value before loading it into sp.    */
++      /* The top 64 bytes of the stack are reserved for the kernel, to    */
++      /* save the 8 local and 8 in registers into, on context switches,   */
++      /* interrupts, traps, etc.                                         */
++
++      asm("save  %o1,-96, %sp");       /* load %sp from %o1              */
++      new_context(0,0);
++      syserr("new_context() returned in coswitch");
++
++   } else {
++      asm("ld  [%fp+0x48], %o0");      /* load new_cs into %o0           */
++      asm("ld  [%o0+0x4],%fp");        /* Load frame pointer             */
++      asm("ld  [%o0+0x8],%i7");        /* Load return address            */
++      asm("ld  [%o0],%sp");            /* Load user stack pointer        */
++   }
++}
diff --git a/lang/icon/patches/patch-ah b/lang/icon/patches/patch-ah
index c09bbc10c27..ccc4519e5d2 100644
--- a/lang/icon/patches/patch-ah
+++ b/lang/icon/patches/patch-ah
@@ -1,8 +1,19 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:09:05 agc Exp $
+$NetBSD: patch-ah,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/copybin.c	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,3 @@
-+#include "../../../src/h/define.h"
-+#include "paths.h"
-+#include "../Generic/copybin.h"
+--- /dev/null	Mon Jun 25 14:20:12 2001
++++ config/unix/netbsd/Makedefs
+@@ -0,0 +1,14 @@
++#  Makefile definitions from config/unix/intel_netbsd
++
++#  CC       C compiler
++#  CFLAGS   flags for building C files
++#  CFDYN    additional flags for dynamic functions
++#  RLINK    flags for linking run-time system
++#  RLIBS    libraries to link with run-time system
++#  XLIBS    libraries to link for graphics
++#  XPMDEFS  definitions for building XPM library
++
++CC ?= cc
++CFDYN = -fPIC
++RLINK = -Wl,-E
++RLIBS = -lm
diff --git a/lang/icon/patches/patch-ai b/lang/icon/patches/patch-ai
index df0563b5817..a1cf36395bc 100644
--- a/lang/icon/patches/patch-ai
+++ b/lang/icon/patches/patch-ai
@@ -1,27 +1,34 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 11:09:06 agc Exp $
+$NetBSD: patch-ai,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/define.h	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,22 @@
-+#define Standard
-+#define IconGcvt
-+#define index strchr
-+#define rindex strrchr
-+#define GetHost
-+#define Hz 100
-+#define MaxHdr 13400
-+#define MaxStatSize 20480
-+
-+#define GenericBSD
-+#define BSD_4_4_LITE    1	/* This is new, for 4.4Lite specific stuff */
-+#define UNIX 1
-+#define LoadFunc
-+#define ExecImages
-+
-+#define KeyboardFncs
-+#define HaveTioc
-+#define USE_OLD_TTY
-+#define AllowConst
-+#define SysOpt
-+#define CComp "gcc"
-+#define COpts "-O2"
+--- /dev/null	Mon Jun 25 15:36:24 2001
++++ config/unix/netbsd/status
+@@ -0,0 +1,29 @@
++System configuration:
++
++	NetBSD Alpha, SPARC, or i386
++
++Latest Icon version:
++
++	Version 9.4.0
++
++Installer:
++	Alistair G. Crooks <agc@netbsd.org>	     (Intel)
++	John Hayward <John.C.Hayward@wheaton.edu>    (Intel)
++	David A. Holland <dholland@eecs.harvard.edu> (SPARC)
++	Tim Rightnour <root@garbled.net>	     (Alpha)
++
++Missing features:
++
++	None
++
++Known bugs:
++
++	None
++
++Comments:
++
++	None
++
++Date:
++
++	June 25, 2001
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index 42b3fe957fb..0dbeb887ca9 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,7 +1,206 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 11:09:06 agc Exp $
+$NetBSD: patch-aj,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/icon_pi.c	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/icon_pi.h"
+--- Makefile.orig	Mon Jun 11 18:04:42 2001
++++ Makefile
+@@ -14,7 +14,7 @@
+ #
+ # Default targets.
+ 
+-All:	Icont Ilib Ibin
++All:	Icont Iconc Ilib Ibin
+ 
+ config/unix/$(name)/status src/h/define.h:
+ 	:
+@@ -97,20 +97,180 @@
+ 
+ D=$(dest)
+ Install:
+-		test -d $D || mkdir $D
+-		test -d $D/bin || mkdir $D/bin
+-		test -d $D/lib || mkdir $D/lib
+-		test -d $D/doc || mkdir $D/doc
+-		test -d $D/man || mkdir $D/man
+-		test -d $D/man/man1 || mkdir $D/man/man1
+-		cp README $D
+-		cp bin/[a-qs-z]* $D/bin
+-		rm -f $D/bin/libXpm*
+-		cp lib/*.* $D/lib
+-		cp doc/*.* $D/doc
+-		cp man/man1/icont.1 $D/man/man1
++		./bin/patchstr ./bin/icont ${PREFIX}/bin/iconx
++		./bin/patchstr ./bin/iconc ${PREFIX}/lib/icon/
++		cd bin; $(BSD_INSTALL_PROGRAM) icont iconx iconc	\
++			patchstr rtt $D/bin
++		$(BSD_INSTALL_DATA_DIR) $D/lib/icon
++		$(BSD_INSTALL_DATA) lib/icon/*.* $D/lib/icon
++		$(BSD_INSTALL_DATA_DIR) $D/share/doc/icon
++		for f in ipatch colrbook colrpick fontpick palette vib	\
++		wevents xgamma; do					\
++		if [ -f bin/$$f ]; then					\
++			${BSD_INSTALL_SCRIPT} bin/$$f $D/bin;		\
++		fi;							\
++		done
++		$(BSD_INSTALL_DATA) doc/*.* $D/share/doc/icon
++		$(BSD_INSTALL_MAN) man/man1/icont.1 $D/man/man1
++
++
++# Bundle up for binary distribution.
++
++DIR=icon.$(VERSION)
++Package:
++		rm -rf $(DIR)
++		umask 002; $(MAKE) Install dest=$(DIR)
++		tar cf - icon.$(VERSION) | gzip -9 >icon.$(VERSION).tgz
++		rm -rf $(DIR)
++
++
++##################################################################
++#
++# Tests.
++
++Test    Test-icont:	; cd tests; $(MAKE) Test
++Samples Samples-icont:	; cd tests; $(MAKE) Samples
++
++Test-iconc:		; cd tests; $(MAKE) Test-iconc
++Samples-iconc:		; cd tests; $(MAKE) Samples-iconc
+ 
+ 
++#################################################################
++#
++# Run benchmarks.
++
++Benchmark:
++		$(MAKE) Benchmark-icont
++
++Benchmark-iconc:
++		cd tests/bench;		$(MAKE) benchmark-iconc
++
++Benchmark-icont:
++		cd tests/bench;		$(MAKE) benchmark-icont
++
++
++##################################################################
++#
++# Cleanup.
++#
++# "make Clean" removes intermediate files, leaving executables and library.
++# "make Pure"  also removes binaries, library, and configured files.
++
++Clean:
++		touch Makedefs
++		rm -rf icon.*
++		cd src;			$(MAKE) Clean
++		cd ipl;			$(MAKE) Clean
++		cd tests;		$(MAKE) Clean
++
++Pure:
++		touch Makedefs
++		rm -rf icon.* bin/[a-z]* lib/[a-z]*
++		cd ipl;			$(MAKE) Pure
++		cd src;			$(MAKE) Pure
++		cd tests;		$(MAKE) Pure
++		cd config/unix; 	$(MAKE) Pure
++
++
++
++#  (This is used at Arizona to prepare source distributions.)
++
++Dist-Clean:
++		rm -rf `find * -type d -name CVS`
++		rm -f `find * -type f | xargs grep -l '<<ARIZONA-[O]NLY>>'`
++#  Makefile for Version 9.4 of Icon
++#
++#  Things have changed since Version 9.3.
++#  See doc/install.htm for instructions.
++
++
++#  configuration parameters
++VERSION=v940
++name=unspecified
++dest=/must/specify/dest/
++
++
++##################################################################
++#
++# Default targets.
++
++All:	Icont Ilib Ibin
++
++config/unix/$(name)/status src/h/define.h:
++	:
++	: To configure Icon, run either
++	:
++	:	make Configure name=xxxx     [for no graphics]
++	: or	make X-Configure name=xxxx   [with X-Windows graphics]
++	:
++	: where xxxx is one of
++	:
++	@cd config/unix; ls -d [a-z]*
++	:
++	@exit 1
++
++
++##################################################################
++#
++# Code configuration.
++
++
++# Configure the code for a specific system.
++
++Configure:	config/unix/$(name)/status
++		$(MAKE) Pure >/dev/null
++		cd config/unix; $(MAKE) Setup-NoGraphics name=$(name)
++
++X-Configure:	config/unix/$(name)/status
++		$(MAKE) Pure >/dev/null
++		cd config/unix; $(MAKE) Setup-Graphics name=$(name)
++
++
++# Get the status information for a specific system.
++
++Status:
++		@cat config/unix/$(name)/status
++
++
++##################################################################
++#
++# Compilation.
++
++
++# The interpreter: icont and iconx.
++
++Icont bin/icont: Common
++		cd src/icont;		$(MAKE)
++		cd src/runtime;		$(MAKE) 
++
++
++# The compiler: rtt, the run-time system, and iconc.
++# (NO LONGER SUPPORTED OR MAINTAINED.)
++
++Iconc bin/iconc: Common
++		cd src/runtime;		$(MAKE) comp_all
++		cd src/iconc;		$(MAKE)
++
++
++# Common components.
++
++Common:		src/h/define.h
++		cd src/common;		$(MAKE)
++		cd src/rtt;		$(MAKE)
++
++
++# The Icon program library.
++
++Ilib:		bin/icont
++		cd ipl;			$(MAKE)
++
++Ibin:		bin/icont
++		cd ipl;			$(MAKE) Ibin
++
++
++##################################################################
++#
++# Installation and packaging.
+ # Bundle up for binary distribution.
+ 
+ DIR=icon.$(VERSION)
diff --git a/lang/icon/patches/patch-ak b/lang/icon/patches/patch-ak
index abbdd8857f4..3dac9daa4b2 100644
--- a/lang/icon/patches/patch-ak
+++ b/lang/icon/patches/patch-ak
@@ -1,14 +1,12 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 11:09:06 agc Exp $
+$NetBSD: patch-ak,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/iconc.hdr	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,9 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#	make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
+--- src/icont/tunix.c.orig	Sat Jun 23 20:08:38 2001
++++ src/icont/tunix.c
+@@ -247,6 +247,6 @@
+    else
+       strcpy(buf, ".");
+    strcat(buf, ":");
+-   strcat(buf, relfile(prog, "/../../lib"));
++   strcat(buf, relfile(prog, "/../../lib/icon"));
+    return salloc(buf);
+    }
diff --git a/lang/icon/patches/patch-al b/lang/icon/patches/patch-al
index c11ce8c32f9..245ab31cccb 100644
--- a/lang/icon/patches/patch-al
+++ b/lang/icon/patches/patch-al
@@ -1,6 +1,15 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-al,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/icont.hdr	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
+--- ipl/BuildBin.orig	Sat Jun 23 20:09:56 2001
++++ ipl/BuildBin
+@@ -15,8 +15,8 @@
+ TOP=`cd ..; pwd`
+ BIN=$TOP/bin
+ PATH=$BIN:$PATH
+-IPATH=$TOP/lib
+-LPATH=$TOP/lib
++IPATH=$TOP/lib/icon
++LPATH=$TOP/lib/icon
+ export PATH IPATH LPATH
+ 
+ #  Always build progs
diff --git a/lang/icon/patches/patch-am b/lang/icon/patches/patch-am
index f699cc3c579..86dc3631fa1 100644
--- a/lang/icon/patches/patch-am
+++ b/lang/icon/patches/patch-am
@@ -1,12 +1,15 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-am,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/iconx.hdr	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,7 @@
-+SHELL=/bin/sh
-+# the seek stuff is defined in a header file that they don't
-+# include.  This is the easiest.  -Dconst= causes const to
-+# be ignored.  This is needed because otherwise we get complaints
-+# due to stdio.h defining some functions with const when they
-+# are not defined that way in Icon's header files
-+RSWITCH=rswitch.c
+--- ipl/BuildExe.orig	Sat Jun 23 20:10:50 2001
++++ ipl/BuildExe
+@@ -10,8 +10,8 @@
+ #  Set minimal path needed.  Not all systems have all these directories
+ TOP=`cd ..; pwd`
+ export PATH=$TOP/bin:/usr/xpg4/bin:/usr/ccs/bin:/bin:/usr/bin
+-export IPATH=$TOP/lib
+-export LPATH=$TOP/lib
++export IPATH=$TOP/lib/icon/lib
++export LPATH=$TOP/lib/icon
+ 
+ #  Use default Icon options for packages that include an Icon execution
+ unset BLKSIZE STRSIZE MSTKSIZE COEXPSIZE TRACE NOERRBUF FPATH
diff --git a/lang/icon/patches/patch-an b/lang/icon/patches/patch-an
index b5672f999f7..ca6b9e47f92 100644
--- a/lang/icon/patches/patch-an
+++ b/lang/icon/patches/patch-an
@@ -1,8 +1,49 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-an,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/paths.h	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,3 @@
-+#define RootPath "/usr/local"
-+#define IcontPath "/usr/local/lib/icon/icont"
-+#define IconxPath "/usr/local/lib/icon/iconx"
+--- ipl/Makefile.orig	Fri Jun  8 19:48:36 2001
++++ ipl/Makefile
+@@ -5,16 +5,16 @@
+ 
+ Ilib:	../bin/libcfunc.so
+ ../bin/libcfunc.so:  ../bin/icont
+-	cp incl/*.icn gincl/*.icn cfuncs/icall.h ../lib
+-	cd procs;  LPATH= ../../bin/icont -usc *.icn; mv *.u? ../../lib
+-	cd gprocs; LPATH= ../../bin/icont -usc *.icn; mv *.u? ../../lib
++	cp incl/*.icn gincl/*.icn cfuncs/icall.h ../lib/icon
++	cd procs;  LPATH= ../../bin/icont -usc *.icn; mv *.u? ../../lib/icon
++	cd gprocs; LPATH= ../../bin/icont -usc *.icn; mv *.u? ../../lib/icon
+ 	cd cfuncs; LPATH= $(MAKE) ICONT=../../bin/icont
+-	mv cfuncs/*.u? ../lib
+-	mv cfuncs/libcfunc.so ../bin
++	mv cfuncs/*.u? ../lib/icon
++	mv cfuncs/libcfunc.so ../lib/icon
+ 
+ 
+ #  Make selected program binaries (platform-dependent icode) for ../bin,
+-#  given that ../lib is ready
++#  given that ../lib/icon is ready
+ 
+ Ibin:	../bin/ipatch
+ ../bin/ipatch:  ../bin/icont
+@@ -22,18 +22,18 @@
+ 
+ 
+ #  Make a full set of program binaries (not usually done) in ./iexe,
+-#  given that ../lib is ready
++#  given that ../lib/icon is ready
+ 
+ Iexe:
+ 	rm -f iexe/*
+ 	MAKE=$(MAKE) ./BuildExe
+ 
+ 
+-#  Check for undefined identifiers in ../lib.
++#  Check for undefined identifiers in ../lib/icon.
+ #  (A few are expected: references to Mp, program, init, goal).
+ 
+ Undef:
+-	cd ../lib; for f in *.u2; do (echo $$f; icont -us -fs $$f); done
++	cd ../lib/icon; for f in *.u2; do (echo $$f; icont -us -fs $$f); done
+ 
+ 
+ #  Check for stray files
diff --git a/lang/icon/patches/patch-ao b/lang/icon/patches/patch-ao
index 6c0c7cf0cfb..1665bcd8374 100644
--- a/lang/icon/patches/patch-ao
+++ b/lang/icon/patches/patch-ao
@@ -1,7 +1,16 @@
-$NetBSD: patch-ao,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-ao,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/pi.hdr	Wed Oct  1 17:32:26 1997
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+=-DPersInterp
+--- config/unix/Makefile.orig	Wed Jun  6 00:12:08 2001
++++ config/unix/Makefile
+@@ -18,8 +18,10 @@
+ 	echo '# Graphics not enabled'		>> $(TOP)/Makedefs
+ 
+ Setup-Graphics:  Setup-Common
++	cat $(name)/define.h.graphics >> $(SRC)/h/define.h
++	cat $(name)/Makedefs.graphics >> $(TOP)/Makedefs
+ 	echo '# Graphics enabled'		>> $(TOP)/Makedefs
+-	echo 'XL = -L../../bin -lXpm $$(XLIBS)'	>> $(TOP)/Makedefs
++	echo 'XL = -L../../lib/icon -lXpm $$(XLIBS)'	>> $(TOP)/Makedefs
+ 	echo '#define Graphics 1'		>> $(SRC)/h/define.h
+ 
+ 
diff --git a/lang/icon/patches/patch-ap b/lang/icon/patches/patch-ap
index ed39bae072c..ef18408ed93 100644
--- a/lang/icon/patches/patch-ap
+++ b/lang/icon/patches/patch-ap
@@ -1,15 +1,21 @@
-$NetBSD: patch-ap,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-ap,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/preproc.hdr	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,10 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
+--- /dev/null	Sun Jun 24 10:50:03 2001
++++ config/unix/netbsd/custom.sh
+@@ -0,0 +1,16 @@
++#!/bin/sh
 +#
-+#	make D=Debug
-+#
-+D=NOTHING
-+CC=cc
-+CFLAGS+= -O -D$D
-+SHELL=/bin/sh
++#  custom setup script for netbsd
++
++SRC=../../../src
++ARCH=`uname -m`
++
++if [ -f rswitch.$ARCH ]; then
++	cp -f rswitch.$ARCH $SRC/common/rswitch.c
++else
++	echo "#define NoCoexpr" >>$SRC/h/define.h
++fi
++
++if [ -f define.$ARCH ]; then
++        cat define.$ARCH >>$SRC/h/define.h
++fi
diff --git a/lang/icon/patches/patch-aq b/lang/icon/patches/patch-aq
index b748dafae76..8e05b0bc685 100644
--- a/lang/icon/patches/patch-aq
+++ b/lang/icon/patches/patch-aq
@@ -1,33 +1,9 @@
-$NetBSD: patch-aq,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-aq,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/rswitch.c	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,28 @@
-+/*
-+ * This is the co-expression context switch for the Intel 80386
-+ * under Microport Unix System V/386
-+ */
-+
-+/*
-+ * coswitch
-+ */
-+
-+coswitch(old_cs, new_cs, first)
-+int *old_cs, *new_cs;
-+int first;
-+   {
-+   asm("  movl 8(%ebp),%eax");
-+   asm("  movl %esp,0(%eax)");
-+   asm("  movl %ebp,4(%eax)");
-+   asm("  movl 12(%ebp),%eax");
-+   if (first == 0) {		/* this is the first activation */
-+      asm("  movl 0(%eax),%esp");
-+      asm("  movl $0,%ebp");
-+      new_context(0, 0);
-+      syserr("interp() returned in coswitch");
-+      }
-+   else {
-+      asm("  movl 0(%eax),%esp");
-+      asm("  movl 4(%eax),%ebp");
-+      }
-+   }
+--- /dev/null	Sun Jun 24 10:51:40 2001
++++ config/unix/netbsd/define.h.alpha
+@@ -0,0 +1,4 @@
++#define IntBits 32
++#define WordBits 64
++#define Double
++#define StackAlign 8
diff --git a/lang/icon/patches/patch-ar b/lang/icon/patches/patch-ar
index da41c957132..1840fe9a23d 100644
--- a/lang/icon/patches/patch-ar
+++ b/lang/icon/patches/patch-ar
@@ -1,7 +1,16 @@
-$NetBSD: patch-ar,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-ar,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/rtt.hdr	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
-+SHELL=/bin/sh
+--- /dev/null	Sun Jun 24 10:54:54 2001
++++ config/unix/netbsd/rswitch.c
+@@ -0,0 +1,11 @@
++/*
++ *  This is a dummy co-expression context switch that can be used in
++ *  the absence of a working one.
++ */  
++
++int coswitch(old_cs, new_cs, fnc)
++int *old_cs, *new_cs;
++int fnc;
++   {
++   err_msg(401, (void*)0);
++   }
diff --git a/lang/icon/patches/patch-as b/lang/icon/patches/patch-as
index 006dffeede8..54ce079bf1f 100644
--- a/lang/icon/patches/patch-as
+++ b/lang/icon/patches/patch-as
@@ -1,6 +1,13 @@
-$NetBSD: patch-as,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-as,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/runtime.hdr	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
+--- src/runtime/imain.r.orig	Mon Jun 25 10:58:18 2001
++++ src/runtime/imain.r
+@@ -282,7 +282,7 @@
+    {
+       char *p, *q, buf[1000];
+       p = getenv("FPATH");
+-      q = relfile(argv[0], "/..");
++      q = relfile(argv[0], "/../../lib/icon");
+       sprintf(buf, "FPATH=%s %s", (p ? p : "."), (q ? q : "."));
+       putenv(buf);
+       }
diff --git a/lang/icon/patches/patch-at b/lang/icon/patches/patch-at
index 4707dc23b86..c1f36ba8274 100644
--- a/lang/icon/patches/patch-at
+++ b/lang/icon/patches/patch-at
@@ -1,7 +1,12 @@
-$NetBSD: patch-at,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-at,v 1.3 2001/06/25 18:00:16 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/setpath.c	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/setpath.h"
+--- src/rtt/Makefile.orig	Tue May 29 23:43:05 2001
++++ src/rtt/Makefile
+@@ -24,7 +24,6 @@
+ rtt:	$(OBJ)
+ 	$(CC) $(LDFLAGS) -o rtt $(OBJ)
+ 	cp rtt ../../bin
+-	strip ../../bin/rtt
+ 
+ library:	$(OBJ)
+ 		rm -rf rtt.a
diff --git a/lang/icon/patches/patch-au b/lang/icon/patches/patch-au
index fd982cd3191..f7d768f4607 100644
--- a/lang/icon/patches/patch-au
+++ b/lang/icon/patches/patch-au
@@ -1,33 +1,12 @@
-$NetBSD: patch-au,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-au,v 1.3 2001/06/25 18:00:17 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/status	Wed Oct  1 17:36:09 1997
-@@ -0,0 +1,28 @@
-+System configuration:
-+
-+	Intel 486-type processor or better running BSD 4.4.lite derivative
-+
-+Latest Icon version:
-+
-+	Version 9.3
-+
-+Installer:
-+
-+	Alistair G. Crooks
-+	<agc@netbsd.org>
-+
-+Missing features:
-+
-+	None.
-+
-+Known bugs:
-+
-+	None.
-+
-+Comments:
-+
-+	None.
-+
-+Date:
-+
-+	Wed Oct  1 17:36:04 BST 1997
+--- src/iconc/Makefile.orig	Wed Jun  6 20:14:38 2001
++++ src/iconc/Makefile
+@@ -20,7 +20,6 @@
+ iconc:		$(OBJS) $(COBJS)
+ 		$(CC) -o iconc $(OBJS) $(COBJS)
+ 		cp iconc ../../bin
+-		strip ../../bin/iconc
+ 
+ $(OBJS):	../h/config.h ../h/cpuconf.h ../h/cstructs.h ../h/define.h\
+ 		../h/proto.h ../h/mproto.h ../h/typedefs.h ../h/gsupport.h \
diff --git a/lang/icon/patches/patch-av b/lang/icon/patches/patch-av
index 8da2361d12a..071abfa7001 100644
--- a/lang/icon/patches/patch-av
+++ b/lang/icon/patches/patch-av
@@ -1,7 +1,12 @@
-$NetBSD: patch-av,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-av,v 1.3 2001/06/25 18:00:17 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/vt.hdr	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
+--- src/icont/Makefile.orig	Wed Jun  6 20:14:41 2001
++++ src/icont/Makefile
+@@ -21,7 +21,6 @@
+ icont:		$(OBJS) $(COBJS)
+ 		$(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS)
+ 		cp icont ../../bin
+-		strip ../../bin/icont
+ 
+ $(OBJS):	$(HFILES) tproto.h
+ 
diff --git a/lang/icon/patches/patch-aw b/lang/icon/patches/patch-aw
index 30443a6ac27..3f7ed57976c 100644
--- a/lang/icon/patches/patch-aw
+++ b/lang/icon/patches/patch-aw
@@ -1,7 +1,37 @@
-$NetBSD: patch-aw,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-aw,v 1.3 2001/06/25 18:00:17 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/vtran.hdr	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
+--- src/common/Makefile.orig	Thu Jun  7 16:20:54 2001
++++ src/common/Makefile
+@@ -5,7 +5,7 @@
+ 	munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
+ 	save.o redirerr.o xwindow.o dlrgint.o ipp.o
+ 
+-common:		doincl patchstr $(OBJS) xpmaybe
++common:		doincl patchstr $(OBJS) headers xpmaybe
+ 
+ doincl:		doincl.c
+ 		$(CC) $(CFLAGS) -o doincl doincl.c
+@@ -15,12 +15,22 @@
+ 		$(CC) $(CFLAGS) -o patchstr patchstr.c
+ 		cp patchstr ../../bin
+ 
++headers:
++		cd ../h; for f in *.h; do		\
++		sed -e 's:../h/::g;s:../xpm/::g' $$f >	\
++		../../lib/icon/$$f;			\
++		done
++
+ xpmaybe:
+ 		-if [ "x$(XL)" != "x" ]; then $(MAKE) xpm; fi
+ 
+ xpm:
+ 		cd ../xpm; $(MAKE) libXpm.a
+-		cp ../xpm/libXpm.a ../../bin
++		cp ../xpm/libXpm.a ../../lib/icon
++		cd ../xpm; for f in *.h; do		\
++		sed -e 's:../h/::g;s:../xpm/::g' $$f >	\
++		../../lib/icon/$$f;			\
++		done
+ 
+ $(OBJS): ../h/define.h ../h/config.h ../h/cstructs.h ../h/mproto.h \
+ 	  ../h/typedefs.h ../h/proto.h ../h/cpuconf.h
diff --git a/lang/icon/patches/patch-ax b/lang/icon/patches/patch-ax
index 17b945bda37..178e9506775 100644
--- a/lang/icon/patches/patch-ax
+++ b/lang/icon/patches/patch-ax
@@ -1,8 +1,21 @@
-$NetBSD: patch-ax,v 1.2 1998/08/07 11:09:10 agc Exp $
+$NetBSD: patch-ax,v 1.3 2001/06/25 18:00:17 jtb Exp $
 
---- /dev/null	Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/xiconx.mak	Wed Oct  1 17:32:25 1997
-@@ -0,0 +1,3 @@
-+# If you define EventMon, add the -lgmon below to get profil(2) under Linux
-+#XLIB= -lX11 -lgmon
-+XLIB= -L/usr/X11R6/lib -lX11
+--- src/runtime/Makefile.orig	Mon Jun 25 13:54:05 2001
++++ src/runtime/Makefile
+@@ -41,7 +41,6 @@
+ 	cd ../common; $(MAKE)
+ 	$(CC) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS)
+ 	cp iconx ../../bin
+-	strip ../../bin/iconx
+ 
+ xcnv.o: cnv.r $(HDRS)
+ 	../../bin/rtt -x cnv.r
+@@ -311,7 +310,7 @@
+ 	    ../common/long.o ../common/time.o\
+ 	    ../common/xwindow.o ../common/alloc.o
+ 	ranlib rt.a 2>/dev/null || :
+-	cp rt.a rt.db ../common/dlrgint.o ../../bin
++	cp rt.a rt.db ../common/dlrgint.o ../../lib/icon
+ 
+ cnv.o: cnv.r $(HDRS)
+ 	../../bin/rtt cnv.r
diff --git a/lang/icon/patches/patch-ay b/lang/icon/patches/patch-ay
index 6a0c9b15bf5..d3ac269baad 100644
--- a/lang/icon/patches/patch-ay
+++ b/lang/icon/patches/patch-ay
@@ -1,28 +1,8 @@
-$NetBSD: patch-ay,v 1.3 2000/06/19 15:56:28 pooka Exp $
+$NetBSD: patch-ay,v 1.4 2001/06/25 18:00:17 jtb Exp $
 
---- /dev/null   Wed Oct  1 17:23:30 1997
-+++ config/unix/intel_netbsd/xpm.hdr    Wed Oct  1 17:32:26 1997
-@@ -0,0 +1 @@                                                   
-+DEFINES= -DZPIPE                                               
---- src/common/save.c   1997/10/02 07:49:07     1.1             
-+++ src/common/save.c   1997/10/02 08:00:57                     
-@@ -79,6 +79,7 @@
-  */
- 
- #ifdef GenericBSD
-+#include <sys/param.h>
- #include <a.out.h>
- wrtexec(ef)
- int ef;
-@@ -91,7 +92,11 @@
-     * Construct the header.  The text and data region sizes must be multiples
-     *  of 1024.
-     */
-+#ifdef __NetBSD__
-+   N_SETMAGIC(hdr, ZMAGIC, MID_MACHINE, EX_DYNAMIC);
-+#else
-    hdr.a_magic = ZMAGIC;
-+#endif
-    tsize = (int)&etext;
-    hdr.a_text = (tsize + 1024) & ~(1024-1);
-    dsize = sbrk(0) - (int)&environ;
+--- /dev/null	Mon Jun 25 14:20:42 2001
++++ config/unix/netbsd/Makedefs.graphics
+@@ -0,0 +1,3 @@
++CFLAGS += -I$(X11BASE)/include
++XLIBS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11
++XPMDEFS = -DZPIPE -I$(X11BASE)/include
diff --git a/lang/icon/patches/patch-az b/lang/icon/patches/patch-az
new file mode 100644
index 00000000000..30bd4b99e66
--- /dev/null
+++ b/lang/icon/patches/patch-az
@@ -0,0 +1,8 @@
+$NetBSD: patch-az,v 1.4 2001/06/25 18:00:17 jtb Exp $
+
+--- /dev/null	Mon Jun 25 14:20:55 2001
++++ config/unix/netbsd/define.h.graphics.in
+@@ -0,0 +1,3 @@
++#undef COpts
++#define COpts "-O2 -I@X11BASE@/include"
++#define ICONC_XLIB "-Wl,-R@X11BASE@/lib -L@X11BASE@/lib -lX11"
diff --git a/lang/icon/patches/patch-ba b/lang/icon/patches/patch-ba
index c436262f210..fbe318a1fd7 100644
--- a/lang/icon/patches/patch-ba
+++ b/lang/icon/patches/patch-ba
@@ -1,15 +1,7 @@
-$NetBSD: patch-ba,v 1.2 1998/08/07 11:09:11 agc Exp $
+$NetBSD: patch-ba,v 1.3 2001/06/25 18:00:17 jtb Exp $
 
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/common.hdr	Fri Jun 19 02:48:05 1998
-@@ -0,0 +1,10 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#	make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
-+RSWITCH=rswitch.s
+--- /dev/null	Mon Jun 25 15:27:11 2001
++++ config/unix/netbsd/define.h.sparc
+@@ -0,0 +1,2 @@
++#define Double
++#define StackAlign 8
diff --git a/lang/icon/patches/patch-bb b/lang/icon/patches/patch-bb
deleted file mode 100644
index f3a4114a82c..00000000000
--- a/lang/icon/patches/patch-bb
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1998/08/07 11:09:11 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/xpm.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1 @@
-+DEFINES= -DZPIPE
diff --git a/lang/icon/patches/patch-bd b/lang/icon/patches/patch-bd
deleted file mode 100644
index 086d79a92f9..00000000000
--- a/lang/icon/patches/patch-bd
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-bd,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/xiconx.mak	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,3 @@
-+# If you define EventMon, add the -lgmon below to get profil(2) under Linux
-+#XLIB= -lX11 -lgmon
-+XLIB= -L/usr/X11R6/lib -lX11
diff --git a/lang/icon/patches/patch-be b/lang/icon/patches/patch-be
deleted file mode 100644
index fa2000627d6..00000000000
--- a/lang/icon/patches/patch-be
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-be,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/vtran.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-bf b/lang/icon/patches/patch-bf
deleted file mode 100644
index 563f21e3311..00000000000
--- a/lang/icon/patches/patch-bf
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bf,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/vt.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-bg b/lang/icon/patches/patch-bg
deleted file mode 100644
index 76b9a18e467..00000000000
--- a/lang/icon/patches/patch-bg
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bg,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/status	Fri Jun 19 02:46:17 1998
-@@ -0,0 +1,28 @@
-+System configuration:
-+
-+	Alpha 21064 processor or better running NetBSD
-+
-+Latest Icon version:
-+
-+	Version 9.3.1
-+
-+Installer:
-+
-+	Tim Rightnour
-+	root@garbled.net
-+
-+Missing features:
-+
-+	None.
-+
-+Known bugs:
-+
-+	None.
-+
-+Comments:
-+
-+	Most of this was taken directly from dec_osf and intel_netbsd.
-+	The same errata that applies to the dec_osf version applies here.
-+
-+Date:
-+
-+	Fri Jun 19 02:46:07 MST 1998
diff --git a/lang/icon/patches/patch-bh b/lang/icon/patches/patch-bh
deleted file mode 100644
index 716b8138e41..00000000000
--- a/lang/icon/patches/patch-bh
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bh,v 1.2 1998/08/07 11:09:13 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/setpath.c	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/setpath.h"
diff --git a/lang/icon/patches/patch-bi b/lang/icon/patches/patch-bi
deleted file mode 100644
index 5a2ecd738d7..00000000000
--- a/lang/icon/patches/patch-bi
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-bi,v 1.2 1998/08/07 11:09:13 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/runtime.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bj b/lang/icon/patches/patch-bj
deleted file mode 100644
index c88cc563fb1..00000000000
--- a/lang/icon/patches/patch-bj
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bj,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/rtt.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bk b/lang/icon/patches/patch-bk
deleted file mode 100644
index da5d9fa9eb0..00000000000
--- a/lang/icon/patches/patch-bk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bk,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/preproc.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,10 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#	make D=Debug
-+#
-+D=NOTHING
-+CC=cc
-+CFLAGS+= -O -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bl b/lang/icon/patches/patch-bl
deleted file mode 100644
index 1af14c2d997..00000000000
--- a/lang/icon/patches/patch-bl
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bl,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/pi.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+=-DPersInterp
diff --git a/lang/icon/patches/patch-bm b/lang/icon/patches/patch-bm
deleted file mode 100644
index 42eb68e5646..00000000000
--- a/lang/icon/patches/patch-bm
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-bm,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/paths.h	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,3 @@
-+#define RootPath "/usr/local"
-+#define IcontPath "/usr/local/lib/icon/icont"
-+#define IconxPath "/usr/local/lib/icon/iconx"
diff --git a/lang/icon/patches/patch-bn b/lang/icon/patches/patch-bn
deleted file mode 100644
index bc073ebcb60..00000000000
--- a/lang/icon/patches/patch-bn
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bn,v 1.2 1998/08/07 11:09:15 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/iconx.hdr	Fri Jun 19 02:48:20 1998
-@@ -0,0 +1,7 @@
-+SHELL=/bin/sh
-+# the seek stuff is defined in a header file that they don't
-+# include.  This is the easiest.  -Dconst= causes const to
-+# be ignored.  This is needed because otherwise we get complaints
-+# due to stdio.h defining some functions with const when they
-+# are not defined that way in Icon's header files
-+RSWITCH=rswitch.s
diff --git a/lang/icon/patches/patch-bo b/lang/icon/patches/patch-bo
deleted file mode 100644
index 04c1ff33543..00000000000
--- a/lang/icon/patches/patch-bo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-bo,v 1.2 1998/08/07 11:09:15 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/icont.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bp b/lang/icon/patches/patch-bp
deleted file mode 100644
index 1f29a29b5ac..00000000000
--- a/lang/icon/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.2 1998/08/07 11:09:15 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/iconc.hdr	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,9 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#	make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bq b/lang/icon/patches/patch-bq
deleted file mode 100644
index 97fed6fb8cf..00000000000
--- a/lang/icon/patches/patch-bq
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bq,v 1.2 1998/08/07 11:09:16 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/icon_pi.c	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/icon_pi.h"
diff --git a/lang/icon/patches/patch-br b/lang/icon/patches/patch-br
deleted file mode 100644
index 16d41191040..00000000000
--- a/lang/icon/patches/patch-br
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-br,v 1.2 1998/08/07 11:09:16 agc Exp $
-
---- /dev/null	Fri Jun 19 03:24:28 1998
-+++ config/unix/alpha_netbsd/define.h	Fri Jun 19 05:00:47 1998
-@@ -0,0 +1,28 @@
-+#define Standard
-+#define IconGcvt
-+#define index strchr
-+#define rindex strrchr
-+#define GetHost
-+#define MaxHdr 13400
-+#define MaxStatSize 20480
-+
-+#define GenericBSD
-+#define BSD_4_4_LITE    1	/* This is new, for 4.4Lite specific stuff */
-+#define UNIX 1
-+#define LoadFunc
-+#define ExecImages
-+
-+#define KeyboardFncs
-+#define HaveTioc
-+#define USE_OLD_TTY
-+#define AllowConst
-+#define SysOpt
-+#define CComp "gcc"
-+#define COpts "-O2"
-+
-+/* CPU architecture */
-+#define IntBits 32
-+#define WordBits 64
-+#define Double
-+#define StackAlign 8
-+#define Hz 1024
-
diff --git a/lang/icon/patches/patch-bs b/lang/icon/patches/patch-bs
deleted file mode 100644
index f69287be26c..00000000000
--- a/lang/icon/patches/patch-bs
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-bs,v 1.2 1998/08/07 11:09:16 agc Exp $
-
---- /dev/null	Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/copybin.c	Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,3 @@
-+#include "../../../src/h/define.h"
-+#include "paths.h"
-+#include "../Generic/copybin.h"
diff --git a/lang/icon/patches/patch-bt b/lang/icon/patches/patch-bt
deleted file mode 100644
index 090097090c6..00000000000
--- a/lang/icon/patches/patch-bt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bt,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/iconc.make.orig	Thu Jul  1 20:36:41 1999
-+++ config/unix/Config/iconc.make	Wed Apr  5 16:23:12 2000
-@@ -23,7 +23,7 @@
- iconc:		$(OBJS) $(COBJS)
- 		$(CC) $(LDFLAGS) -o iconc $(OBJS) $(COBJS)
- 		cp iconc ../../bin
--		strip ../../bin/iconc
-+#		strip ../../bin/iconc
- 
- $(OBJS):	../h/config.h ../h/cpuconf.h ../h/cstructs.h ../h/define.h\
- 		../h/proto.h ../h/mproto.h ../h/typedefs.h ../h/gsupport.h \
diff --git a/lang/icon/patches/patch-bu b/lang/icon/patches/patch-bu
deleted file mode 100644
index f6874a2298a..00000000000
--- a/lang/icon/patches/patch-bu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bu,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/icont.make.orig	Thu Jul  1 20:36:41 1999
-+++ config/unix/Config/icont.make	Wed Apr  5 16:24:37 2000
-@@ -21,7 +21,7 @@
- icont:		$(OBJS) common
- 		$(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS) $(LIBS)
- 		cp icont ../../bin
--		strip ../../bin/icont
-+#		strip ../../bin/icont
- 
- $(OBJS):	../h/define.h ../h/config.h ../h/cpuconf.h ../h/gsupport.h \
- 		   ../h/proto.h ../h/mproto.h \
diff --git a/lang/icon/patches/patch-bv b/lang/icon/patches/patch-bv
deleted file mode 100644
index 95cc2d79fca..00000000000
--- a/lang/icon/patches/patch-bv
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bv,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/rtt.make.orig	Thu Jul  1 20:36:41 1999
-+++ config/unix/Config/rtt.make	Wed Apr  5 16:26:31 2000
-@@ -27,7 +27,7 @@
- rtt:	$(OBJ)
- 	$(CC) $(LDFLAGS) -o rtt $(OBJ)
- 	cp rtt ../../bin
--	strip ../../bin/rtt
-+#	strip ../../bin/rtt
- 
- library:	$(OBJ)
- 		rm -rf rtt.a
diff --git a/lang/icon/patches/patch-bw b/lang/icon/patches/patch-bw
deleted file mode 100644
index 994781fdc8d..00000000000
--- a/lang/icon/patches/patch-bw
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bw,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/runtime.make.orig	Thu Jul  1 20:36:41 1999
-+++ config/unix/Config/runtime.make	Wed Apr  5 17:14:41 2000
-@@ -36,9 +36,9 @@
- 	$(MAKE) iconx
- 
- iconx: $(OBJS)
--	$(CC) $(LDFLAGS) -o iconx  $(OBJS) $(XPMLIB) $(XLIB) $(LIBS)
-+	$(CC) $(LDFLAGS) -o iconx  $(OBJS) $(XPMLIB) $(XLIB) $(LIBS) -lm
- 	cp iconx ../../bin
--	strip ../../bin/iconx
-+#	strip ../../bin/iconx
- 
- xcnv.o: cnv.r $(HDRS)
- 	../../bin/rtt -x cnv.r
diff --git a/lang/icon/patches/patch-ca b/lang/icon/patches/patch-ca
deleted file mode 100644
index 4b55588385c..00000000000
--- a/lang/icon/patches/patch-ca
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ca,v 1.3 2000/06/19 15:56:28 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/common.hdr   Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,10 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#      make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
-+RSWITCH=rswitch.c
-diff -u /dev/null config/unix/sun_netbsd/copybin.c
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/copybin.c    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,3 @@
-+#include "../../../src/h/define.h"
-+#include "paths.h"
-+#include "../Generic/copybin.h"
-diff -u /dev/null config/unix/sun_netbsd/define.h
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/define.h     Thu Jun  8 22:17:12 2000
-@@ -0,0 +1,30 @@
-+#define Standard
-+#define IconGcvt
-+#define index strchr
-+#define rindex strrchr
-+#define GetHost
-+#define MaxHdr 13400
-+#define MaxStatSize 20480
-+
-+#define GenericBSD
-+#define BSD_4_4_LITE    1      /* This is new, for 4.4Lite specific stuff */
-+#define UNIX 1
-+#define LoadFunc
-+#define ExecImages
-+
-+#define KeyboardFncs
-+#define HaveTioc
-+#define USE_OLD_TTY
-+#define AllowConst
-+#define SysOpt
-+#define CComp "gcc"
-+#define COpts "-O2"
-+
-+/* Sun parameters */
-+/*#define SUN*/
-+#define ZERODIVIDE
-+
-+/* CPU architecture */
-+#define Double
-+#define StackAlign 8
-+
diff --git a/lang/icon/patches/patch-cb b/lang/icon/patches/patch-cb
deleted file mode 100644
index 6826cfa469b..00000000000
--- a/lang/icon/patches/patch-cb
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2000/06/19 15:56:31 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/icon_pi.c    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/icon_pi.h"
diff --git a/lang/icon/patches/patch-cc b/lang/icon/patches/patch-cc
deleted file mode 100644
index 57cced8794c..00000000000
--- a/lang/icon/patches/patch-cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cc,v 1.4 2000/06/19 15:56:32 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/iconc.hdr    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,9 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#      make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-cd b/lang/icon/patches/patch-cd
deleted file mode 100644
index da69121c4c2..00000000000
--- a/lang/icon/patches/patch-cd
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-cd,v 1.3 2000/06/19 15:56:33 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/icont.hdr    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ce b/lang/icon/patches/patch-ce
deleted file mode 100644
index 8bbde22f615..00000000000
--- a/lang/icon/patches/patch-ce
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2000/06/19 15:56:34 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/iconx.hdr    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,7 @@
-+SHELL=/bin/sh
-+# the seek stuff is defined in a header file that they don't
-+# include.  This is the easiest.  -Dconst= causes const to
-+# be ignored.  This is needed because otherwise we get complaints
-+# due to stdio.h defining some functions with const when they
-+# are not defined that way in Icon's header files
-+RSWITCH=rswitch.c
diff --git a/lang/icon/patches/patch-cf b/lang/icon/patches/patch-cf
deleted file mode 100644
index f1ae9cea3f3..00000000000
--- a/lang/icon/patches/patch-cf
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2000/06/19 15:56:34 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/paths.h      Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,3 @@
-+#define RootPath "/usr/local"
-+#define IcontPath "/usr/local/lib/icon/icont"
-+#define IconxPath "/usr/local/lib/icon/iconx"
diff --git a/lang/icon/patches/patch-cg b/lang/icon/patches/patch-cg
deleted file mode 100644
index 91ff268f02f..00000000000
--- a/lang/icon/patches/patch-cg
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2000/06/19 15:56:35 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/pi.hdr       Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+=-DPersInterp
diff --git a/lang/icon/patches/patch-ch b/lang/icon/patches/patch-ch
deleted file mode 100644
index 0a74a096fd4..00000000000
--- a/lang/icon/patches/patch-ch
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ch,v 1.1 2000/06/19 15:56:36 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/preproc.hdr  Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,10 @@
-+#  The -D$D option to CFLAGS makes it possible to specify a definition
-+#  at the Make command level without revising the Makefile, as
-+#  in
-+#
-+#      make D=Debug
-+#
-+D=NOTHING
-+CC=cc
-+CFLAGS+= -O -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ci b/lang/icon/patches/patch-ci
deleted file mode 100644
index 3e9932a6f8b..00000000000
--- a/lang/icon/patches/patch-ci
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2000/06/19 15:56:36 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/rswitch.c    Thu Jun  8 22:14:54 2000
-@@ -0,0 +1,39 @@
-+/*
-+ * coswitch for Sun-4 Sparc.
-+ * 
-+ * Compile this with 'cc -c rswitch.c'.  Do not use cc -O.
-+ */
-+
-+/* #include <sys/asm_linkage.h> */
-+/*#include <sys/trap.h>*/
-+
-+int coswitch(old_cs, new_cs, first)
-+int *old_cs, *new_cs;
-+int first;
-+{
-+   asm("ta     0x03");                 /* ST_FLUSH_WINDOWS in trap.h     */
-+   asm("ld     [%fp+0x44], %o0");      /* load old_cs into %o0           */
-+   asm("st     %sp,[%o0]");            /* Save user stack pointer        */
-+   asm("st     %fp,[%o0+0x4]");        /* Save frame pointer             */
-+   asm("st     %i7,[%o0+0x8]");        /* Save return address            */
-+
-+   if (first == 0) {                   /* this is the first activation   */
-+      asm("ld  [%fp+0x48], %o0");      /* load new_cs into %o0           */
-+      asm("ld  [%o0], %o1");           /* load %o1 from cstate[0]        */
-+
-+      /* Decrement new stack pointer value before loading it into sp.    */
-+      /* The top 64 bytes of the stack are reserved for the kernel, to    */
-+      /* save the 8 local and 8 in registers into, on context switches,   */
-+      /* interrupts, traps, etc.                                         */
-+
-+      asm("save  %o1,-96, %sp");       /* load %sp from %o1              */
-+      new_context(0,0);
-+      syserr("new_context() returned in coswitch");
-+
-+   } else {
-+      asm("ld  [%fp+0x48], %o0");      /* load new_cs into %o0           */
-+      asm("ld  [%o0+0x4],%fp");        /* Load frame pointer             */
-+      asm("ld  [%o0+0x8],%i7");        /* Load return address            */
-+      asm("ld  [%o0],%sp");            /* Load user stack pointer        */
-+   }
-+}
diff --git a/lang/icon/patches/patch-cj b/lang/icon/patches/patch-cj
deleted file mode 100644
index 40b24dcd055..00000000000
--- a/lang/icon/patches/patch-cj
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cj,v 1.1 2000/06/19 15:56:36 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/rtt.hdr      Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ck b/lang/icon/patches/patch-ck
deleted file mode 100644
index 57a252ffd12..00000000000
--- a/lang/icon/patches/patch-ck
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2000/06/19 15:56:37 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/runtime.hdr  Thu Jun  8 22:10:28 2000
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-cl b/lang/icon/patches/patch-cl
deleted file mode 100644
index a0c10e56405..00000000000
--- a/lang/icon/patches/patch-cl
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2000/06/19 15:56:37 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/setpath.c    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/setpath.h"
diff --git a/lang/icon/patches/patch-cm b/lang/icon/patches/patch-cm
deleted file mode 100644
index 78986b554ab..00000000000
--- a/lang/icon/patches/patch-cm
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2000/06/19 15:56:38 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/status       Thu Jun  8 22:21:08 2000
-@@ -0,0 +1,28 @@
-+System configuration:
-+
-+       SPARC architecture running NetBSD 1.4
-+
-+Latest Icon version:
-+
-+       Version 9.3.2
-+
-+Installer:
-+
-+       David A. Holland
-+       <dholland@eecs.harvard.edu>
-+
-+Missing features:
-+
-+       None.
-+
-+Known bugs:
-+
-+       None.
-+
-+Comments:
-+
-+       Mostly cribbed from a diff of intel_linux and sun_linux.
-+
-+Date:
-+
-+       Thu Jun  8 18:20:33 EDT 2000
diff --git a/lang/icon/patches/patch-cn b/lang/icon/patches/patch-cn
deleted file mode 100644
index e531bda6cb0..00000000000
--- a/lang/icon/patches/patch-cn
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2000/06/19 15:56:39 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/vt.hdr       Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-co b/lang/icon/patches/patch-co
deleted file mode 100644
index 0f3a4449634..00000000000
--- a/lang/icon/patches/patch-co
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-co,v 1.1 2000/06/19 15:56:39 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/vtran.hdr    Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-cp b/lang/icon/patches/patch-cp
deleted file mode 100644
index 0067dc10823..00000000000
--- a/lang/icon/patches/patch-cp
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-cp,v 1.1 2000/06/19 15:56:40 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/xiconx.mak   Thu Jun  8 22:10:28 2000
-@@ -0,0 +1,3 @@
-+# If you define EventMon, add the -lgmon below to get profil(2) under Linux
-+#XLIB= -lX11 -lgmon
-+XLIB= -L/usr/X11R6/lib -lX11
diff --git a/lang/icon/patches/patch-cq b/lang/icon/patches/patch-cq
deleted file mode 100644
index b3f23d90417..00000000000
--- a/lang/icon/patches/patch-cq
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-cq,v 1.1 2000/06/19 15:56:40 pooka Exp $
-
---- /dev/null   Thu Jan  1 00:00:00 1970
-+++ config/unix/sun_netbsd/xpm.hdr      Thu Jun  8 22:10:28 2000
-@@ -0,0 +1 @@
-+DEFINES= -DZPIPE