Update of icon to 9.4.1.

Changes:

*  Support for NetBSD on PowerPC based systems.

*  An  Icon source file can be made executable under Unix by prefixing it
   with a comment line

     #!/usr/bin/env icon

   and setting its execute permission bit.  This uses a new icon command,
   which in another form allows a small Icon program to be embedded within
   a shell script. See the new man page for details. The traditional icont
   command remains available for less specialized purposes.

*  The performance of large sets and tables has been improved.

*  Some minor bugs have been fixed.

25 files changed, 199 insertions, 230 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 79cbe3a0b2a..0bfea2babef 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2002/02/28 13:42:59 agc Exp $
-# FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
-#
+# $NetBSD: Makefile,v 1.22 2003/03/24 12:12:08 jtb Exp $
 
-DISTNAME=       	icon.v940src
-PKGNAME=		icon-9.4.0
+DISTNAME=       	icon.v941src
+PKGNAME=		icon-9.4.1
 CATEGORIES=		lang
 MASTER_SITES=		http://www.cs.arizona.edu/icon/ftp/packages/unix/
 EXTRACT_SUFX=		.tgz
@@ -12,24 +10,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.arizona.edu/icon/index.htm
 COMMENT=		The Icon programming language
 
-ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-i386 NetBSD-*-sparc
+ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-powerpc
 
-PLIST_SRC=		${PKGDIR}/PLIST
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS=		ICON_WITH_GRAPHICS
-
-ICON_WITH_GRAPHICS?=	YES
-
-.if (${ICON_WITH_GRAPHICS} == "YES")
 CONFIGURE_TARGET?=	X-Configure
-PLIST_SRC+=		${PKGDIR}/PLIST.graphics
-USE_X11=		yes
-.else
-CONFIGURE_TARGET?=	Configure
-.endif
-
 ALL_TARGET=		All
 
 pre-build:
@@ -37,12 +20,11 @@ pre-build:
 
 do-configure:
 	cd ${WRKSRC}/config/unix/netbsd; \
-	${SED} -e 's:@X11BASE@:${X11BASE}:g' define.h.graphics.in \
-		> define.h.graphics
+	${SED} -e 's:@X11BASE@:${X11BASE}:g' define.h.in \
+		> define.h
 	cd ${WRKSRC}; ${MAKE} ${CONFIGURE_TARGET} name=netbsd
 
 do-install:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} dest=${PREFIX} Install
 
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/lang/icon/PLIST b/lang/icon/PLIST
index 4b87da0bf09..c62c7113b58 100644
--- a/lang/icon/PLIST
+++ b/lang/icon/PLIST
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:30 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/03/24 12:12:08 jtb Exp $
+bin/colrbook
+bin/colrpick
+bin/fontpick
+bin/icon
 bin/iconc
 bin/icont
 bin/iconx
 bin/ipatch
+bin/palette
 bin/patchstr
 bin/rtt
+bin/vib
+bin/wevents
+bin/xgamma
 lib/icon/abkform.u1
 lib/icon/abkform.u2
 lib/icon/adjuncts.u1
@@ -19,6 +27,7 @@ lib/icon/ansi.u1
 lib/icon/ansi.u2
 lib/icon/apply.u1
 lib/icon/apply.u2
+lib/icon/arch.h
 lib/icon/argparse.u1
 lib/icon/argparse.u2
 lib/icon/array.u1
@@ -333,8 +342,6 @@ lib/icon/iscreen.u1
 lib/icon/iscreen.u2
 lib/icon/isdplot.u1
 lib/icon/isdplot.u2
-lib/icon/ispf.u1
-lib/icon/ispf.u2
 lib/icon/iterfncs.u1
 lib/icon/iterfncs.u2
 lib/icon/itlib.u1
@@ -366,6 +373,7 @@ lib/icon/lastname.u2
 lib/icon/lcseval.u1
 lib/icon/lcseval.u2
 lib/icon/lexdef.h
+lib/icon/libXpm.a
 lib/icon/libcfunc.so
 lib/icon/linddefs.u1
 lib/icon/linddefs.u2
@@ -392,6 +400,8 @@ lib/icon/lstfncs.u1
 lib/icon/lstfncs.u2
 lib/icon/lsystem.u1
 lib/icon/lsystem.u2
+lib/icon/lterps.u1
+lib/icon/lterps.u2
 lib/icon/lu.u1
 lib/icon/lu.u2
 lib/icon/maccolor.icn
@@ -494,6 +504,8 @@ lib/icon/plural.u1
 lib/icon/plural.u2
 lib/icon/polynom.u1
 lib/icon/polynom.u2
+lib/icon/polyseq.u1
+lib/icon/polyseq.u2
 lib/icon/polystuf.u1
 lib/icon/polystuf.u2
 lib/icon/popen.u1
@@ -560,8 +572,6 @@ lib/icon/revadd.u2
 lib/icon/rewrap.u1
 lib/icon/rewrap.u2
 lib/icon/rexterns.h
-lib/icon/rexx.u1
-lib/icon/rexx.u2
 lib/icon/rgbcomp.u1
 lib/icon/rgbcomp.u2
 lib/icon/rgbrec.u1
@@ -804,6 +814,8 @@ lib/icon/xio.u2
 lib/icon/xnames.icn
 lib/icon/xplane.u1
 lib/icon/xplane.u2
+lib/icon/xpm.h
+lib/icon/xpmP.h
 lib/icon/xputpixl.u1
 lib/icon/xputpixl.u2
 lib/icon/xqueue.u1
@@ -815,6 +827,7 @@ lib/icon/xutils.u2
 lib/icon/xwin.h
 lib/icon/zipread.u1
 lib/icon/zipread.u2
+man/man1/icon.1
 man/man1/icont.1
 share/doc/icon/blubordr.gif
 share/doc/icon/build.htm
@@ -826,6 +839,7 @@ share/doc/icon/faq.txt
 share/doc/icon/files.htm
 share/doc/icon/gb80.jpg
 share/doc/icon/ib80.jpg
+share/doc/icon/icon.txt
 share/doc/icon/icont.txt
 share/doc/icon/index.htm
 share/doc/icon/install.htm
@@ -834,4 +848,4 @@ share/doc/icon/lb80.jpg
 share/doc/icon/relnotes.htm
 share/doc/icon/wwwcube.gif
 @dirrm share/doc/icon
-@unexec ${RMDIR} %D/lib/icon 2>/dev/null || ${TRUE}
+@dirrm lib/icon
diff --git a/lang/icon/PLIST.graphics b/lang/icon/PLIST.graphics
deleted file mode 100644
index b6438fb766b..00000000000
--- a/lang/icon/PLIST.graphics
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST.graphics,v 1.1 2001/11/01 00:32:28 zuntum Exp $
-bin/colrbook
-bin/colrpick
-bin/fontpick
-bin/palette
-bin/vib
-bin/wevents
-bin/xgamma
-lib/icon/libXpm.a
-lib/icon/xpm.h
-lib/icon/xpmP.h
-@dirrm lib/icon
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 7913432dea8..945408f7d61 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,29 +1,23 @@
-$NetBSD: distinfo,v 1.5 2001/06/25 19:28:42 jtb Exp $
+$NetBSD: distinfo,v 1.6 2003/03/24 12:12:08 jtb Exp $
 
-SHA1 (icon.v940src.tgz) = 8e1a1a13567fdbeb458f284ad313493e1e9aa96b
-Size (icon.v940src.tgz) = 3209202 bytes
-SHA1 (patch-aa) = 77fafa66e144a5654fb086ce53a8e198ca126d6a
-SHA1 (patch-ab) = 097027fec8d879622e6e29556fb39607ad7f3b01
-SHA1 (patch-ae) = df3653f8b958970af8ced3b40adb6d13d64cb9f6
-SHA1 (patch-af) = 97eeba0e240529d005872c647177dcb251cbd56d
-SHA1 (patch-ag) = ffae555d665df1aa77a4189b2e8b8b54c3025a52
-SHA1 (patch-ah) = 4d04fb330fd6a3436729c087374285f6320f7bf1
-SHA1 (patch-ai) = 37fffe999deb7fd560dda056f2edc1972726fe91
-SHA1 (patch-aj) = 4173a2417a2d61d8e30209cca2d63ae023d7b145
+SHA1 (icon.v941src.tgz) = 04ed005302c2652c6db14395d82e54338fe7b8f9
+Size (icon.v941src.tgz) = 3249869 bytes
+SHA1 (patch-aa) = 280f3e3b2057f6be3b118f90925cfc32f18cc885
+SHA1 (patch-ab) = 9450aa8c9c95b6e1abfb3c2e0fdabd6b78fb7725
+SHA1 (patch-ac) = 7df859b2c6502391c7f3d7cd789c9901fdf32d7e
+SHA1 (patch-ae) = 2461d8f7adf9738ac6b1a214c551276959bab2a5
+SHA1 (patch-af) = 6b85682ef23f1cfa8ad469e1e08cc3f93429e1b2
+SHA1 (patch-ag) = fdec07d56e7bfff20fb2b952e78bd6b661902fae
+SHA1 (patch-ah) = f8289bb2c29ecbe03eb480cc33fe78cd49338ac1
+SHA1 (patch-ai) = f99dfb986411bfc1bb338c5e8da173028e1886a7
+SHA1 (patch-aj) = a2b0bb59984a099635204a41ebca7a086b50424f
 SHA1 (patch-ak) = cd66608d05ffc9f953bad63781632c6c416b4bc7
 SHA1 (patch-al) = 3c2b05206fe404ac3987eaac3d35fb91172b580d
-SHA1 (patch-am) = a4e23ccd481508e2b2fb139e4d1d6414b7e243c6
-SHA1 (patch-an) = 0ec847f7ad002a9f471ee4dc8dfa46a8b300983a
-SHA1 (patch-ao) = c6c0b0e524b2274ba3551323da1b6d0f21e37ac4
-SHA1 (patch-ap) = c90cb7df8e6d6c7f871eba603e8f561d64384a29
-SHA1 (patch-aq) = 07ad177de29dc6498b921c0ede43a4ea36c0815e
-SHA1 (patch-ar) = 6a6fcb68461e1d1a0e0e86f65be610170a4cf890
+SHA1 (patch-am) = fe2a7e2a41d27e1c26fab74235ecc0ed7e6bb80d
+SHA1 (patch-an) = a123ca718649b61aae145473214eb368f28e9c87
 SHA1 (patch-as) = baff3d1b011b9e6b1d3bc033f8aa25336ff7afd7
 SHA1 (patch-at) = afe068041bc99a287adb88df6d282d7b7ce853bb
 SHA1 (patch-au) = e86fb1c6b7784bf18963db3dabf81b5cf564bc3e
-SHA1 (patch-av) = 413e8c56b1c1809022fbb6995c5c0a2fb3b4e65a
-SHA1 (patch-aw) = a738587324006d71a61cc6af72dcab7004b5101e
-SHA1 (patch-ax) = 4ffb0492f0ed60a7ead5423a44a29d1cc9f9c5af
-SHA1 (patch-ay) = 3a744613441b678234cb415f15c41afa1e1cf7f6
-SHA1 (patch-az) = 777b7e9c3357dd7f34181fc4615a6e6897cb2e2e
-SHA1 (patch-ba) = 6932d2e1de32a0c22313045dd1c6af7fea5e79a5
+SHA1 (patch-av) = b6bae0da01aaa00dfc575f338c602963bf7b47cc
+SHA1 (patch-aw) = 6192050d39e8ae4fb3232c8ebe925e412f9d78ec
+SHA1 (patch-ax) = 4aefe1e20753e2a6b686d8f94a308d30cb58d119
diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa
index 5eaed8deb9b..c5647bd6c54 100644
--- a/lang/icon/patches/patch-aa
+++ b/lang/icon/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-aa,v 1.6 2003/03/24 12:12:10 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;;
-    *)
+--- config/unix/setup.sh.orig	Mon Mar  4 21:32:55 2002
++++ config/unix/setup.sh
+@@ -31,7 +31,7 @@ fi
+ # find and copy the context switch code.
+ # use pthreads version if specified, or as a last resort.
+ # by default, look for `uname -m`.[cs] and then rswitch.[cs].
+-ARCH=`uname -m`
++ARCH=`uname -p`
+ if [ "$CSW" = "pthreads" ]; then
+    RSW=pthreads.c
+    COCLEAN="#define CoClean"
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index c44ce34ba66..1033f859e02 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-ab,v 1.7 2003/03/24 12:12:10 jtb Exp $
 
---- /dev/null	Mon Jun 25 14:19:36 2001
-+++ config/unix/netbsd/define.h
-@@ -0,0 +1,17 @@
+--- /dev/null	Mon Mar 24 07:25:29 2003
++++ config/unix/netbsd/define.h.in
+@@ -0,0 +1,14 @@
 +/*
 + * Icon configuration file for NetBSD
 + */
@@ -13,10 +13,7 @@ $NetBSD: patch-ab,v 1.6 2001/06/25 18:00:16 jtb Exp $
 +#define NetBSD			/* This is for NetBSD stuff (save) */
 +
 +#define LoadFunc
-+#define SysOpt
-+#define ExecImages
-+
-+#define MaxStatSize 20480
 +
 +#define CComp "gcc"
-+#define COpts "-O2"
++#define COpts "-O2 -I@X11BASE@/include"
++#define ICONC_XLIB "-Wl,-R@X11BASE@/lib -L@X11BASE@/lib -lX11"
diff --git a/lang/icon/patches/patch-ac b/lang/icon/patches/patch-ac
new file mode 100644
index 00000000000..a160a3e8d75
--- /dev/null
+++ b/lang/icon/patches/patch-ac
@@ -0,0 +1,52 @@
+$NetBSD: patch-ac,v 1.5 2003/03/24 12:12:10 jtb Exp $
+
+--- /dev/null	Mon Mar 24 11:07:29 2003
++++ config/unix/netbsd/powerpc.s	Mon Mar 24 11:40:22 2003
+@@ -0,0 +1,47 @@
++#       Adapted from ppc_macos/rswitch.s
++#
++
++	.file   "rswitch.s"
++
++	.set	RSIZE, 80		# room for regs 13-31, rounded up mod16
++
++	.text
++	.align  2
++	.globl  coswitch
++	.type	coswitch,@function
++
++coswitch:
++	stwu	%r1, -RSIZE(%r1)	# allocate stack frame
++
++					# Save Old Context:
++	stw	%r1, 0(%r3)		# SP
++	stw	%r2, 4(%r3)		# TOC
++	mflr	%r0
++	stw	%r0, 8(%r3)		# LR (return address)
++	mfcr	%r0
++	stw	%r0, 12(%r3)		# CR
++	stmw	%r13, -RSIZE(%r1)	# GPRs 13-31 (save on stack)
++
++	cmpi	0, %r5, 0
++	beq	first			# if first time
++
++					# Restore new context
++	lwz	%r1, 0(%r4)		# SP
++	lwz	%r2, 4(%r4)		# TOC
++	lwz	%r0, 8(%r4)		# LR
++	mtlr	%r0
++	lwz	%r0, 12(%r4)		# CR
++	mtcr	%r0
++	lmw	%r13, -RSIZE(%r1)	# GPRs 13-31 (from stack)
++
++	addic	%r1, %r1, RSIZE		# deallocate stack frame
++	blr				# return into new context
++
++first:					# First-time call
++	lwz	%r1, 0(%r4)		# SP as figured by Icon
++	addic	%r1, %r1, -64		# save area for callee
++	addi	%r3, 0, 0		# arg1
++	addi	%r4, 0, 0		# arg2
++	bl	new_context		# new_context(0,0)
++	addi	%r3, 0, 0
++	bl	syserr
diff --git a/lang/icon/patches/patch-ae b/lang/icon/patches/patch-ae
index ed12185f321..cb2afe5c2c2 100644
--- a/lang/icon/patches/patch-ae
+++ b/lang/icon/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2001/06/25 19:28:42 jtb Exp $
+$NetBSD: patch-ae,v 1.6 2003/03/24 12:12:10 jtb Exp $
 
 --- /dev/null	Sat Jun 23 16:44:46 2001
-+++ config/unix/netbsd/rswitch.s.alpha
++++ config/unix/netbsd/alpha.s
 @@ -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
index 16ef09a5638..13ca4f762e3 100644
--- a/lang/icon/patches/patch-af
+++ b/lang/icon/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2001/06/25 19:28:42 jtb Exp $
+$NetBSD: patch-af,v 1.7 2003/03/24 12:12:10 jtb Exp $
 
 --- /dev/null	Sat Jun 23 16:44:55 2001
-+++ config/unix/netbsd/rswitch.c.i386
++++ config/unix/netbsd/i386.c
 @@ -0,0 +1,28 @@
 +/*
 + * This is the co-expression context switch for the Intel 80386
diff --git a/lang/icon/patches/patch-ag b/lang/icon/patches/patch-ag
index 89c15787591..5ee25bacf69 100644
--- a/lang/icon/patches/patch-ag
+++ b/lang/icon/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.4 2001/06/25 19:28:42 jtb Exp $
+$NetBSD: patch-ag,v 1.5 2003/03/24 12:12:10 jtb Exp $
 
 --- /dev/null	Sat Jun 23 16:45:07 2001
-+++ config/unix/netbsd/rswitch.c.sparc
++++ config/unix/netbsd/sparc.c
 @@ -0,0 +1,39 @@
 +/*
 + * coswitch for Sun-4 Sparc.
diff --git a/lang/icon/patches/patch-ah b/lang/icon/patches/patch-ah
index ccc4519e5d2..1ade14c96e4 100644
--- a/lang/icon/patches/patch-ah
+++ b/lang/icon/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-ah,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
---- /dev/null	Mon Jun 25 14:20:12 2001
+--- config/unix/netbsd/Makedefs.orig	Mon Mar 24 06:48:54 2003
 +++ config/unix/netbsd/Makedefs
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,17 @@
 +#  Makefile definitions from config/unix/intel_netbsd
 +
 +#  CC       C compiler
@@ -17,3 +17,6 @@ $NetBSD: patch-ah,v 1.3 2001/06/25 18:00:16 jtb Exp $
 +CFDYN = -fPIC
 +RLINK = -Wl,-E
 +RLIBS = -lm
++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-ai b/lang/icon/patches/patch-ai
index a1cf36395bc..b762ae4a3e2 100644
--- a/lang/icon/patches/patch-ai
+++ b/lang/icon/patches/patch-ai
@@ -1,21 +1,22 @@
-$NetBSD: patch-ai,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-ai,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
---- /dev/null	Mon Jun 25 15:36:24 2001
-+++ config/unix/netbsd/status
-@@ -0,0 +1,29 @@
+--- /dev/null	Mon Mar 24 09:43:29 2003
++++ config/unix/netbsd/status	Mon Mar 24 10:13:52 2003
+@@ -0,0 +1,30 @@
 +System configuration:
 +
-+	NetBSD Alpha, SPARC, or i386
++	NetBSD
 +
 +Latest Icon version:
 +
-+	Version 9.4.0
++	Version 9.4.1
 +
 +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)
++       Jason Beegan <jtb@netbsd.org>                (PowerPC)
 +
 +Missing features:
 +
@@ -31,4 +32,4 @@ $NetBSD: patch-ai,v 1.3 2001/06/25 18:00:16 jtb Exp $
 +
 +Date:
 +
-+	June 25, 2001
++	March 24, 2003
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index 878da918f20..a9ef490c297 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.4 2001/06/25 19:28:42 jtb Exp $
+$NetBSD: patch-aj,v 1.5 2003/03/24 12:12:10 jtb Exp $
 
---- Makefile.orig	Mon Jun 11 18:04:42 2001
+--- Makefile.orig	Thu Mar 28 02:45:33 2002
 +++ Makefile
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@ dest=/must/specify/dest/
  #
  # Default targets.
  
@@ -11,7 +11,16 @@ $NetBSD: patch-aj,v 1.4 2001/06/25 19:28:42 jtb Exp $
  
  config/unix/$(name)/status src/h/define.h:
  	:
-@@ -97,18 +97,21 @@
+@@ -62,7 +62,7 @@ Status:
+ 
+ Icont bin/icont: Common
+ 		cd src/icont;		$(MAKE)
+-		cd src/runtime;		$(MAKE) 
++		cd src/runtime;		$(MAKE)
+ 
+ 
+ # The compiler: rtt, the run-time system, and iconc.
+@@ -98,21 +98,23 @@ Ibin:		bin/icont
  
  D=$(dest)
  Install:
@@ -21,16 +30,20 @@ $NetBSD: patch-aj,v 1.4 2001/06/25 19:28:42 jtb Exp $
 -		test -d $D/doc || mkdir $D/doc
 -		test -d $D/man || mkdir $D/man
 -		test -d $D/man/man1 || mkdir $D/man/man1
+-		rm -f $D/bin/icon* $D/doc/* $D/man/man1/*
+-		cd $D/lib; rm -f *
 -		cp README $D
--		cp bin/[a-qs-z]* $D/bin
--		rm -f $D/bin/libXpm*
+-		cp bin/[abcdefghijklmnopqrstuvwxyz]* $D/bin
+-		rm -f $D/bin/libXpm* $D/bin/rt* $D/bin/icon
+-		(cd $D/bin; ln -s icont icon)
 -		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/
+-		cp man/man1/*.* $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
++		cd $(PREFIX)/bin && ln -sf icont icon
 +		$(BSD_INSTALL_DATA_DIR) $D/lib/icon
 +		$(BSD_INSTALL_DATA) lib/icon/*.* $D/lib/icon
 +		$(BSD_INSTALL_DATA_DIR) $D/share/doc/icon
@@ -41,7 +54,8 @@ $NetBSD: patch-aj,v 1.4 2001/06/25 19:28:42 jtb Exp $
 +		fi;							\
 +		done
 +		$(BSD_INSTALL_DATA) doc/*.* $D/share/doc/icon
-+		$(BSD_INSTALL_MAN) man/man1/icont.1 $D/man/man1
++		$(BSD_INSTALL_MAN) man/man1/* $D/man/man1
++
  
  
  # Bundle up for binary distribution.
diff --git a/lang/icon/patches/patch-am b/lang/icon/patches/patch-am
index 86dc3631fa1..ad79ca022e6 100644
--- a/lang/icon/patches/patch-am
+++ b/lang/icon/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-am,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
 --- ipl/BuildExe.orig	Sat Jun 23 20:10:50 2001
 +++ ipl/BuildExe
@@ -8,7 +8,7 @@ $NetBSD: patch-am,v 1.3 2001/06/25 18:00:16 jtb Exp $
  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 IPATH=$TOP/lib/icon
 +export LPATH=$TOP/lib/icon
  
  #  Use default Icon options for packages that include an Icon execution
diff --git a/lang/icon/patches/patch-an b/lang/icon/patches/patch-an
index ca6b9e47f92..2c06b379f97 100644
--- a/lang/icon/patches/patch-an
+++ b/lang/icon/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-an,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
---- ipl/Makefile.orig	Fri Jun  8 19:48:36 2001
+--- ipl/Makefile.orig	Sat Mar 16 00:23:29 2002
 +++ ipl/Makefile
-@@ -5,16 +5,16 @@
+@@ -5,9 +5,9 @@
  
  Ilib:	../bin/libcfunc.so
  ../bin/libcfunc.so:  ../bin/icont
@@ -12,6 +12,12 @@ $NetBSD: patch-an,v 1.3 2001/06/25 18:00:16 jtb Exp $
 +	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
+ 	if grep LoadFunc ../src/h/define.h >/dev/null; then $(MAKE) Cfuncs; fi
+ 
+ 
+@@ -15,12 +15,12 @@ Ilib:	../bin/libcfunc.so
+ 
+ Cfuncs:
  	cd cfuncs; LPATH= $(MAKE) ICONT=../../bin/icont
 -	mv cfuncs/*.u? ../lib
 -	mv cfuncs/libcfunc.so ../bin
@@ -25,7 +31,7 @@ $NetBSD: patch-an,v 1.3 2001/06/25 18:00:16 jtb Exp $
  
  Ibin:	../bin/ipatch
  ../bin/ipatch:  ../bin/icont
-@@ -22,18 +22,18 @@
+@@ -28,18 +28,18 @@ Ibin:	../bin/ipatch
  
  
  #  Make a full set of program binaries (not usually done) in ./iexe,
@@ -47,3 +53,12 @@ $NetBSD: patch-an,v 1.3 2001/06/25 18:00:16 jtb Exp $
  
  
  #  Check for stray files
+@@ -63,7 +63,7 @@ ZipFiles:  Ilib
+ 	zip -qrX9 gipl.zip gdocs gincl gprocs gprogs gpacks gdata  -x '*/CVS/*'
+ 	zip -qrX9 mipl.zip mincl mprocs mprogs                     -x '*/CVS/*'
+ 	mkdir ilib
+-	cp ../lib/*.* ilib
++	cp ../lib/icon*.* ilib
+ 	zip -qrX9 ilib.zip ilib
+ 	rm -rf ilib
+ 
diff --git a/lang/icon/patches/patch-ao b/lang/icon/patches/patch-ao
deleted file mode 100644
index 1665bcd8374..00000000000
--- a/lang/icon/patches/patch-ao
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2001/06/25 18:00:16 jtb Exp $
-
---- 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
deleted file mode 100644
index 6e818a06744..00000000000
--- a/lang/icon/patches/patch-ap
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ap,v 1.4 2001/06/25 19:28:42 jtb Exp $
-
---- /dev/null	Mon Jun 25 20:21:04 2001
-+++ config/unix/netbsd/custom.sh
-@@ -0,0 +1,18 @@
-+#!/bin/sh
-+#
-+#  custom setup script for netbsd
-+
-+SRC=../../../src
-+ARCH=`uname -m`
-+
-+if [ -f rswitch.c.$ARCH ]; then
-+	cp -f rswitch.c.$ARCH $SRC/common/rswitch.c
-+elif [ -f rswitch.s.$ARCH ]; then
-+	cp -f rswitch.s.$ARCH $SRC/common/rswitch.s
-+else
-+	echo "#define NoCoexpr" >>$SRC/h/define.h
-+fi
-+
-+if [ -f define.h.$ARCH ]; then
-+        cat define.h.$ARCH >>$SRC/h/define.h
-+fi
diff --git a/lang/icon/patches/patch-aq b/lang/icon/patches/patch-aq
deleted file mode 100644
index 8e05b0bc685..00000000000
--- a/lang/icon/patches/patch-aq
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2001/06/25 18:00:16 jtb Exp $
-
---- /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
deleted file mode 100644
index 1840fe9a23d..00000000000
--- a/lang/icon/patches/patch-ar
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ar,v 1.3 2001/06/25 18:00:16 jtb Exp $
-
---- /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-av b/lang/icon/patches/patch-av
index 071abfa7001..2aae56d216a 100644
--- a/lang/icon/patches/patch-av
+++ b/lang/icon/patches/patch-av
@@ -1,12 +1,12 @@
-$NetBSD: patch-av,v 1.3 2001/06/25 18:00:17 jtb Exp $
+$NetBSD: patch-av,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
---- src/icont/Makefile.orig	Wed Jun  6 20:14:41 2001
+--- src/icont/Makefile.orig	Mon Jan 14 21:03:05 2002
 +++ src/icont/Makefile
-@@ -21,7 +21,6 @@
+@@ -21,7 +21,6 @@ COBJS =		../common/long.o ../common/geto
  icont:		$(OBJS) $(COBJS)
  		$(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS)
  		cp icont ../../bin
 -		strip ../../bin/icont
+ 		(cd ../../bin; rm -f icon; ln -s icont icon)
  
  $(OBJS):	$(HFILES) tproto.h
- 
diff --git a/lang/icon/patches/patch-aw b/lang/icon/patches/patch-aw
index 3f7ed57976c..afca1bed9c0 100644
--- a/lang/icon/patches/patch-aw
+++ b/lang/icon/patches/patch-aw
@@ -1,24 +1,23 @@
-$NetBSD: patch-aw,v 1.3 2001/06/25 18:00:17 jtb Exp $
+$NetBSD: patch-aw,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
---- src/common/Makefile.orig	Thu Jun  7 16:20:54 2001
+--- src/common/Makefile.orig	Wed Dec 12 18:28:10 2001
 +++ src/common/Makefile
-@@ -5,7 +5,7 @@
+@@ -5,7 +5,7 @@ OBJS =	long.o getopt.o time.o filepart.o
  	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
++common:		doincl patchstr $(OBJS) fixheaders xpmaybe
  
- doincl:		doincl.c
+ doincl:		doincl.c ../h/arch.h
  		$(CC) $(CFLAGS) -o doincl doincl.c
-@@ -15,12 +15,22 @@
+@@ -15,12 +15,20 @@ patchstr:	patchstr.c
  		$(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;			\
++fixheaders:
++		cd ../h; for f in *.h; do							\
++		sed -e 's:../h/::g;s:../xpm/::g' $$f > ../../lib/icon/$$f;			\
 +		done
 +
  xpmaybe:
@@ -28,10 +27,9 @@ $NetBSD: patch-aw,v 1.3 2001/06/25 18:00:17 jtb Exp $
  		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;			\
++		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 \
+ $(OBJS): ../h/define.h ../h/arch.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 178e9506775..28eaff62351 100644
--- a/lang/icon/patches/patch-ax
+++ b/lang/icon/patches/patch-ax
@@ -1,16 +1,16 @@
-$NetBSD: patch-ax,v 1.3 2001/06/25 18:00:17 jtb Exp $
+$NetBSD: patch-ax,v 1.4 2003/03/24 12:12:10 jtb Exp $
 
---- src/runtime/Makefile.orig	Mon Jun 25 13:54:05 2001
+--- src/runtime/Makefile.orig	Mon Mar  4 21:32:56 2002
 +++ src/runtime/Makefile
-@@ -41,7 +41,6 @@
+@@ -41,7 +41,6 @@ iconx: $(OBJS)
  	cd ../common; $(MAKE)
- 	$(CC) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS)
+ 	$(CC) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS) $(TL)
  	cp iconx ../../bin
 -	strip ../../bin/iconx
  
  xcnv.o: cnv.r $(HDRS)
  	../../bin/rtt -x cnv.r
-@@ -311,7 +310,7 @@
+@@ -311,7 +310,7 @@ rt.a: ../common/rswitch.o ../common/long
  	    ../common/long.o ../common/time.o\
  	    ../common/xwindow.o ../common/alloc.o
  	ranlib rt.a 2>/dev/null || :
diff --git a/lang/icon/patches/patch-ay b/lang/icon/patches/patch-ay
deleted file mode 100644
index d3ac269baad..00000000000
--- a/lang/icon/patches/patch-ay
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ay,v 1.4 2001/06/25 18:00:17 jtb Exp $
-
---- /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
deleted file mode 100644
index 30bd4b99e66..00000000000
--- a/lang/icon/patches/patch-az
+++ /dev/null
@@ -1,8 +0,0 @@
-$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
deleted file mode 100644
index fbe318a1fd7..00000000000
--- a/lang/icon/patches/patch-ba
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2001/06/25 18:00:17 jtb Exp $
-
---- /dev/null	Mon Jun 25 15:27:11 2001
-+++ config/unix/netbsd/define.h.sparc
-@@ -0,0 +1,2 @@
-+#define Double
-+#define StackAlign 8