Update to version 9.4.2.

   Notable changes in this latest version are listed here. Some code
   cleanup work and documentation editing has also been done.

  256-color limit removed

   Icon's X-windows interface previously limited each window to 256
   colors at one time. This limitation has been removed for the TrueColor
   displays provided by most modern computers. Median-cut quantization is
   used to select 256 image colors when WriteImage() is called to write a
   GIF file.

  Library changes

   As usual, several files in the Icon program library have been added or
   edited. The core library files, however, remain stable.

  Minor changes

     * The command "icon - [args]" can now be used to execute a source
       program read from standard input.
     * A new "icont -N" flag suppresses embedding of an iconx path in the
       generated executable
     * The configuration directory has been restructured.
     * Several obsolete configurations have been removed.
     * The environment variables HEAPSIZE and BLOCKSIZE no longer
       function as undocumented alternatives to BLKSIZE. The GNU ls
       utility uses BLOCKSIZE for other purposes, leading to confusion.
     * "make Install" has been changed to never delete anything. It now
       creates a new directory rather than altering an existing one.

24 files changed, 170 insertions, 159 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 6a1e7636727..53ad774ba56 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/06/02 01:19:02 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2003/06/06 08:58:42 jtb Exp $
 
-DISTNAME=       	icon.v941src
-PKGNAME=		icon-9.4.1
+DISTNAME=       	icon.v942src
+PKGNAME=		icon-9.4.2
 CATEGORIES=		lang
 MASTER_SITES=		http://www.cs.arizona.edu/icon/ftp/packages/unix/
 EXTRACT_SUFX=		.tgz
@@ -20,7 +20,7 @@ pre-build:
 	${MKDIR} ${WRKSRC}/lib/icon
 
 do-configure:
-	cd ${WRKSRC}/config/unix/netbsd; \
+	cd ${WRKSRC}/config/netbsd; \
 	${SED} -e 's:@X11BASE@:${X11BASE}:g' define.h.in \
 		> define.h
 	cd ${WRKSRC}; ${MAKE} ${CONFIGURE_TARGET} name=netbsd
diff --git a/lang/icon/PLIST b/lang/icon/PLIST
index c62c7113b58..3a85b7be944 100644
--- a/lang/icon/PLIST
+++ b/lang/icon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/03/24 12:12:08 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/06/06 08:58:42 jtb Exp $
 bin/colrbook
 bin/colrpick
 bin/fontpick
@@ -6,7 +6,6 @@ bin/icon
 bin/iconc
 bin/icont
 bin/iconx
-bin/ipatch
 bin/palette
 bin/patchstr
 bin/rtt
@@ -64,6 +63,8 @@ lib/icon/bkutil.u1
 lib/icon/bkutil.u2
 lib/icon/bold.u1
 lib/icon/bold.u2
+lib/icon/boolops.u1
+lib/icon/boolops.u2
 lib/icon/bufread.u1
 lib/icon/bufread.u2
 lib/icon/button.u1
@@ -212,7 +213,6 @@ lib/icon/filedim.u1
 lib/icon/filedim.u2
 lib/icon/filenseq.u1
 lib/icon/filenseq.u2
-lib/icon/filepat.h
 lib/icon/filesize.u1
 lib/icon/filesize.u2
 lib/icon/findre.u1
@@ -342,6 +342,8 @@ lib/icon/iscreen.u1
 lib/icon/iscreen.u2
 lib/icon/isdplot.u1
 lib/icon/isdplot.u2
+lib/icon/isdxplot.u1
+lib/icon/isdxplot.u2
 lib/icon/iterfncs.u1
 lib/icon/iterfncs.u2
 lib/icon/itlib.u1
@@ -373,7 +375,7 @@ lib/icon/lastname.u2
 lib/icon/lcseval.u1
 lib/icon/lcseval.u2
 lib/icon/lexdef.h
-lib/icon/libXpm.a
+lib/icon/libIgpx.a
 lib/icon/libcfunc.so
 lib/icon/linddefs.u1
 lib/icon/linddefs.u2
@@ -409,6 +411,8 @@ lib/icon/makelsys.u1
 lib/icon/makelsys.u2
 lib/icon/mapbit.u1
 lib/icon/mapbit.u2
+lib/icon/mapnav.u1
+lib/icon/mapnav.u2
 lib/icon/mapstr.u1
 lib/icon/mapstr.u2
 lib/icon/matchlib.u1
@@ -482,6 +486,8 @@ lib/icon/patch.u1
 lib/icon/patch.u2
 lib/icon/patterns.u1
 lib/icon/patterns.u2
+lib/icon/pattread.u1
+lib/icon/pattread.u2
 lib/icon/patutils.u1
 lib/icon/patutils.u2
 lib/icon/patword.u1
@@ -524,7 +530,6 @@ lib/icon/procname.u1
 lib/icon/procname.u2
 lib/icon/progary.u1
 lib/icon/progary.u2
-lib/icon/proto.h
 lib/icon/pscript.u1
 lib/icon/pscript.u2
 lib/icon/psrecord.u1
@@ -833,6 +838,7 @@ share/doc/icon/blubordr.gif
 share/doc/icon/build.htm
 share/doc/icon/clnroff.sed
 share/doc/icon/cube128.gif
+share/doc/icon/cygwin.htm
 share/doc/icon/docguide.htm
 share/doc/icon/faq.htm
 share/doc/icon/faq.txt
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 3c14eab65e8..436dd8a862b 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,27 +1,27 @@
-$NetBSD: distinfo,v 1.7 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: distinfo,v 1.8 2003/06/06 08:58:42 jtb Exp $
 
-SHA1 (icon.v941src.tgz) = 04ed005302c2652c6db14395d82e54338fe7b8f9
-Size (icon.v941src.tgz) = 3249869 bytes
-SHA1 (patch-aa) = 280f3e3b2057f6be3b118f90925cfc32f18cc885
-SHA1 (patch-ab) = 9450aa8c9c95b6e1abfb3c2e0fdabd6b78fb7725
-SHA1 (patch-ac) = 1ea1d2556238ebf05c6bf669fecf104bdea2e886
-SHA1 (patch-ad) = b28ae8c52bcd94a02998376d6e35fa7c1b649fc2
-SHA1 (patch-ae) = 3745b9544ca72fd0deb016040fc2fcd9bc65cc42
-SHA1 (patch-af) = eb58ff21480e48ac693eb2f0f92bf92db463623f
-SHA1 (patch-ag) = ce85beb36248ce7c2d86e7dc6ec5f50c6e379353
-SHA1 (patch-ah) = f8289bb2c29ecbe03eb480cc33fe78cd49338ac1
-SHA1 (patch-ai) = 8cca8c4847e40728727c25998b1679ba2107a0dd
-SHA1 (patch-aj) = a2b0bb59984a099635204a41ebca7a086b50424f
+SHA1 (icon.v942src.tgz) = 9536e9346188deb2dc5853e03b5f7a85991314b1
+Size (icon.v942src.tgz) = 3204076 bytes
+SHA1 (patch-aa) = 4466461cf703d3506d505bd12e5627ebbc581f9c
+SHA1 (patch-ab) = 751e605b803e2e046cf71375d512c69792b3bdb9
+SHA1 (patch-ac) = 601093ab1ea2970eca82f59d42212643a2753cae
+SHA1 (patch-ad) = 20f718bcaed88e210d9c4e5d5b652043dff04f00
+SHA1 (patch-ae) = 6e83f7f256e096cb0ac879cc03766c12f05ebf97
+SHA1 (patch-af) = 43b713a8ccabbbbd9d0042225c53711d7ed6db7f
+SHA1 (patch-ag) = 8d9b913a1d28adf6c672a09ab45516f13f6f5459
+SHA1 (patch-ah) = 4d1571f0ce79254eaa71aefd7da784d33ae4a040
+SHA1 (patch-ai) = 7009e2d51e3cde5f3ef97f69a85ab217ef1c13bf
+SHA1 (patch-aj) = a712ff27937237a4c69f62605ab5310056a04016
 SHA1 (patch-ak) = cd66608d05ffc9f953bad63781632c6c416b4bc7
-SHA1 (patch-al) = 3c2b05206fe404ac3987eaac3d35fb91172b580d
+SHA1 (patch-al) = c4705ab795093189196eb512c9182d8b55fa7c96
 SHA1 (patch-am) = fe2a7e2a41d27e1c26fab74235ecc0ed7e6bb80d
-SHA1 (patch-an) = a123ca718649b61aae145473214eb368f28e9c87
-SHA1 (patch-ao) = a73b70d5ed75dc2293a4ad8dbf2964e1e5916fed
-SHA1 (patch-ap) = 9178bcef6d46566dbc300aa2f98a958654c5e3fc
-SHA1 (patch-aq) = b844874fca2419d87433424e455d712b90a0c22f
-SHA1 (patch-as) = baff3d1b011b9e6b1d3bc033f8aa25336ff7afd7
-SHA1 (patch-at) = afe068041bc99a287adb88df6d282d7b7ce853bb
-SHA1 (patch-au) = e86fb1c6b7784bf18963db3dabf81b5cf564bc3e
-SHA1 (patch-av) = b6bae0da01aaa00dfc575f338c602963bf7b47cc
-SHA1 (patch-aw) = 6192050d39e8ae4fb3232c8ebe925e412f9d78ec
-SHA1 (patch-ax) = 4aefe1e20753e2a6b686d8f94a308d30cb58d119
+SHA1 (patch-an) = 487bd5d35d94026ac2ef7ce08e197a2d378b73e7
+SHA1 (patch-ao) = 1473a8f2f60cd571585cb901ac62b77bcf0cdfcf
+SHA1 (patch-ap) = 8a2db8e1e4af55be36956e8c66c2e5f426bc3c49
+SHA1 (patch-aq) = cf84a0549686eae51363d1619ce5bbf993e4ef3f
+SHA1 (patch-as) = e8749720bce4362c708c266a0f049f49742eddd2
+SHA1 (patch-at) = 7588ea1056dde3f8776c04e4f8786ca56462aedb
+SHA1 (patch-au) = de4bba2ee4c08ab4e20ec29132b46ed17bd03de4
+SHA1 (patch-av) = c7eda8b5e28a03b13ec6f037c168fab33c1bb214
+SHA1 (patch-aw) = 32fbb57aff56ab9ddffb0ab01872dbc79d7ce654
+SHA1 (patch-ax) = 2da62632e50bf9f60b0784598e74b8a15a245d1e
diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa
index c5647bd6c54..c181e5e835f 100644
--- a/lang/icon/patches/patch-aa
+++ b/lang/icon/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.6 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-aa,v 1.7 2003/06/06 08:58:42 jtb Exp $
 
---- config/unix/setup.sh.orig	Mon Mar  4 21:32:55 2002
-+++ config/unix/setup.sh
-@@ -31,7 +31,7 @@ fi
+--- config/setup.sh.orig
++++ config/setup.sh
+@@ -12,7 +12,7 @@
+ 
+ # check parameters
+ case "$GPX" in
+-   Graphics)	XL='-L../../bin -lIgpx $(XLIBS)';;
++   Graphics)	XL='-L../../lib/icon -lIgpx $(XLIBS)';;
+    NoGraphics)	XL= ;;
+    *)		echo "$USAGE" 1>&2; exit 1;;
+ esac
+@@ -31,7 +31,7 @@
  # 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].
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index 1033f859e02..4f24cccc975 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-ab,v 1.8 2003/06/06 08:58:42 jtb Exp $
 
 --- /dev/null	Mon Mar 24 07:25:29 2003
-+++ config/unix/netbsd/define.h.in
++++ config/netbsd/define.h.in
 @@ -0,0 +1,14 @@
 +/*
 + * Icon configuration file for NetBSD
diff --git a/lang/icon/patches/patch-ac b/lang/icon/patches/patch-ac
index c1da4763678..fe4fe1abe0e 100644
--- a/lang/icon/patches/patch-ac
+++ b/lang/icon/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.6 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-ac,v 1.7 2003/06/06 08:58:42 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/powerpc.s
++++ config/netbsd/powerpc.s
 @@ -0,0 +1,48 @@
 +#
 +#	coswitch for the PowerPC
@@ -31,7 +31,7 @@ $NetBSD: patch-ac,v 1.6 2003/04/05 05:42:56 jtb Exp $
 +	cmpi	0, %r5, 0
 +	beq	first			# if first time
 +
-+					# Restore new context
++					# Restore new context:
 +	lwz	%r1, 0(%r4)		# SP
 +	lwz	%r2, 4(%r4)		# TOC
 +	lwz	%r0, 8(%r4)		# LR
diff --git a/lang/icon/patches/patch-ad b/lang/icon/patches/patch-ad
index 16898d0ea5b..578dc12e298 100644
--- a/lang/icon/patches/patch-ad
+++ b/lang/icon/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/m68k.c
++++ config/netbsd/m68k.c
 @@ -0,0 +1,25 @@
 +/*
 + * coswitch for the m68k architecture
diff --git a/lang/icon/patches/patch-ae b/lang/icon/patches/patch-ae
index 782a6daf09d..82ea62be774 100644
--- a/lang/icon/patches/patch-ae
+++ b/lang/icon/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.7 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-ae,v 1.8 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/alpha.s
++++ config/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 0b9ddb0e253..9fdaf536d8a 100644
--- a/lang/icon/patches/patch-af
+++ b/lang/icon/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.8 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-af,v 1.9 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/i386.c
++++ config/netbsd/i386.c
 @@ -0,0 +1,23 @@
 +/*
 + * coswitch for i386 architecture
diff --git a/lang/icon/patches/patch-ag b/lang/icon/patches/patch-ag
index a1a3b20c7b0..a32b355eb82 100644
--- a/lang/icon/patches/patch-ag
+++ b/lang/icon/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.6 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-ag,v 1.7 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/sparc.c
++++ config/netbsd/sparc.c
 @@ -0,0 +1,33 @@
 +/*
 + * coswitch for NetBSD SPARC
diff --git a/lang/icon/patches/patch-ah b/lang/icon/patches/patch-ah
index 1ade14c96e4..e697a461a26 100644
--- a/lang/icon/patches/patch-ah
+++ b/lang/icon/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-ah,v 1.5 2003/06/06 08:58:43 jtb Exp $
 
---- config/unix/netbsd/Makedefs.orig	Mon Mar 24 06:48:54 2003
-+++ config/unix/netbsd/Makedefs
-@@ -0,0 +1,17 @@
+--- /dev/null
++++ config/netbsd/Makedefs
+@@ -0,0 +1,18 @@
 +#  Makefile definitions from config/unix/intel_netbsd
 +
 +#  CC       C compiler
@@ -20,3 +20,4 @@ $NetBSD: patch-ah,v 1.4 2003/03/24 12:12:10 jtb Exp $
 +CFLAGS += -I$(X11BASE)/include
 +XLIBS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11
 +XPMDEFS = -DZPIPE -I$(X11BASE)/include
++GDIR= xpm
diff --git a/lang/icon/patches/patch-ai b/lang/icon/patches/patch-ai
index 3b5d1531d79..74e05bcdc09 100644
--- a/lang/icon/patches/patch-ai
+++ b/lang/icon/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.5 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-ai,v 1.6 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/status
++++ config/netbsd/status
 @@ -0,0 +1,26 @@
 +System configuration:
 +
@@ -28,4 +28,4 @@ $NetBSD: patch-ai,v 1.5 2003/04/05 05:42:56 jtb Exp $
 +
 +Date:
 +
-+	March 24, 2003
++	June 6, 2003
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index a9ef490c297..1fb3c203495 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,40 +1,26 @@
-$NetBSD: patch-aj,v 1.5 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
 
---- Makefile.orig	Thu Mar 28 02:45:33 2002
+--- Makefile.orig
 +++ Makefile
-@@ -15,7 +15,7 @@ dest=/must/specify/dest/
+@@ -14,7 +14,7 @@
  #
  # Default targets.
  
 -All:	Icont Ilib Ibin
 +All:	Icont Iconc Ilib Ibin
  
- config/unix/$(name)/status src/h/define.h:
+ config/$(name)/status src/h/define.h:
  	:
-@@ -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
+@@ -97,16 +97,22 @@
  
  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
--		rm -f $D/bin/icon* $D/doc/* $D/man/man1/*
--		cd $D/lib; rm -f *
+-		mkdir $D
+-		mkdir $D/bin $D/lib $D/doc $D/man $D/man/man1
 -		cp README $D
--		cp bin/[abcdefghijklmnopqrstuvwxyz]* $D/bin
--		rm -f $D/bin/libXpm* $D/bin/rt* $D/bin/icon
+-		cp bin/[cflpvwx]* $D/bin
+-		cp bin/icon[tx]* $D/bin
+-		rm -f $D/bin/libI*
 -		(cd $D/bin; ln -s icont icon)
 -		cp lib/*.* $D/lib
 -		cp doc/*.* $D/doc
@@ -47,7 +33,7 @@ $NetBSD: patch-aj,v 1.5 2003/03/24 12:12:10 jtb Exp $
 +		$(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	\
++		for f in colrbook colrpick fontpick palette vib	\
 +		wevents xgamma; do					\
 +		if [ -f bin/$$f ]; then					\
 +			${BSD_INSTALL_SCRIPT} bin/$$f $D/bin;		\
@@ -55,7 +41,6 @@ $NetBSD: patch-aj,v 1.5 2003/03/24 12:12:10 jtb Exp $
 +		done
 +		$(BSD_INSTALL_DATA) doc/*.* $D/share/doc/icon
 +		$(BSD_INSTALL_MAN) man/man1/* $D/man/man1
-+
  
  
  # Bundle up for binary distribution.
diff --git a/lang/icon/patches/patch-al b/lang/icon/patches/patch-al
index 245ab31cccb..37fe7cb783e 100644
--- a/lang/icon/patches/patch-al
+++ b/lang/icon/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-al,v 1.4 2003/06/06 08:58:43 jtb Exp $
 
---- ipl/BuildBin.orig	Sat Jun 23 20:09:56 2001
+--- ipl/BuildBin.orig
 +++ ipl/BuildBin
-@@ -15,8 +15,8 @@
+@@ -13,8 +13,8 @@
  TOP=`cd ..; pwd`
  BIN=$TOP/bin
  PATH=$BIN:$PATH
@@ -12,4 +12,4 @@ $NetBSD: patch-al,v 1.3 2001/06/25 18:00:16 jtb Exp $
 +LPATH=$TOP/lib/icon
  export PATH IPATH LPATH
  
- #  Always build progs
+ #  Figure out executable extension
diff --git a/lang/icon/patches/patch-an b/lang/icon/patches/patch-an
index 2c06b379f97..851eb53fcd7 100644
--- a/lang/icon/patches/patch-an
+++ b/lang/icon/patches/patch-an
@@ -1,37 +1,37 @@
-$NetBSD: patch-an,v 1.4 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-an,v 1.5 2003/06/06 08:58:43 jtb Exp $
 
---- ipl/Makefile.orig	Sat Mar 16 00:23:29 2002
+--- ipl/Makefile.orig
 +++ ipl/Makefile
-@@ -5,9 +5,9 @@
+@@ -8,9 +8,9 @@
  
- Ilib:	../bin/libcfunc.so
- ../bin/libcfunc.so:  ../bin/icont
+ Ilib:	cfuncs/libcfunc.so
+ cfuncs/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
- 	if grep LoadFunc ../src/h/define.h >/dev/null; then $(MAKE) Cfuncs; fi
+ 	if grep '^ *# *define LoadFunc' ../src/h/define.h >/dev/null; \
+ 	   then $(MAKE) Cfunctions; fi
  
+@@ -19,12 +19,12 @@
  
-@@ -15,12 +15,12 @@ Ilib:	../bin/libcfunc.so
- 
- Cfuncs:
+ Cfunctions:
  	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
+-	cp cfuncs/*.u? ../lib
+-	cp cfuncs/libcfunc.so ../bin
++	cp cfuncs/*.u? ../lib/icon
++	cp 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
+ #  Make selected graphics program binaries (platform-dependent icode)
+-#  for ../bin, given that ../lib is ready
++#  for ../bin, given that ../lib/icon is ready
  
- Ibin:	../bin/ipatch
- ../bin/ipatch:  ../bin/icont
-@@ -28,18 +28,18 @@ Ibin:	../bin/ipatch
+ Ibin:	gpacks/vib/vib
+ gpacks/vib/vib:  ../bin/icont
+@@ -32,18 +32,18 @@
  
  
  #  Make a full set of program binaries (not usually done) in ./iexe,
@@ -53,12 +53,12 @@ $NetBSD: patch-an,v 1.4 2003/03/24 12:12:10 jtb Exp $
  
  
  #  Check for stray files
-@@ -63,7 +63,7 @@ ZipFiles:  Ilib
+@@ -67,7 +67,7 @@
  	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
++	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
index 992079e32ab..d5c43893aa7 100644
--- a/lang/icon/patches/patch-ao
+++ b/lang/icon/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.5 2003/04/05 05:42:56 jtb Exp $
+$NetBSD: patch-ao,v 1.6 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/mipseb.s
++++ config/netbsd/mipseb.s
 @@ -0,0 +1,76 @@
 +	.data	
 +	.align	0
diff --git a/lang/icon/patches/patch-ap b/lang/icon/patches/patch-ap
index 01c52d96f83..68349900ae5 100644
--- a/lang/icon/patches/patch-ap
+++ b/lang/icon/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.6 2003/04/05 05:42:57 jtb Exp $
+$NetBSD: patch-ap,v 1.7 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/mipsel.s
++++ config/netbsd/mipsel.s
 @@ -0,0 +1,76 @@
 +	.data	
 +	.align	0
diff --git a/lang/icon/patches/patch-aq b/lang/icon/patches/patch-aq
index 0680b79ba65..998bdd9ba2e 100644
--- a/lang/icon/patches/patch-aq
+++ b/lang/icon/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.5 2003/04/05 05:42:57 jtb Exp $
+$NetBSD: patch-aq,v 1.6 2003/06/06 08:58:43 jtb Exp $
 
 --- /dev/null
-+++ config/unix/netbsd/vax.c
++++ config/netbsd/vax.c
 @@ -0,0 +1,38 @@
 +/*
 + * coswitch for the VAX architecture.
diff --git a/lang/icon/patches/patch-as b/lang/icon/patches/patch-as
index 54ce079bf1f..3b7fafd2bc0 100644
--- a/lang/icon/patches/patch-as
+++ b/lang/icon/patches/patch-as
@@ -1,13 +1,13 @@
-$NetBSD: patch-as,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-as,v 1.4 2003/06/06 08:58:43 jtb Exp $
 
---- src/runtime/imain.r.orig	Mon Jun 25 10:58:18 2001
+--- src/runtime/imain.r.orig
 +++ 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);
-       }
+@@ -67,7 +67,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 c1f36ba8274..5bc17c071b9 100644
--- a/lang/icon/patches/patch-at
+++ b/lang/icon/patches/patch-at
@@ -1,12 +1,12 @@
-$NetBSD: patch-at,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-at,v 1.4 2003/06/06 08:58:43 jtb Exp $
 
---- src/rtt/Makefile.orig	Tue May 29 23:43:05 2001
+--- src/rtt/Makefile.orig
 +++ src/rtt/Makefile
 @@ -24,7 +24,6 @@
  rtt:	$(OBJ)
  	$(CC) $(LDFLAGS) -o rtt $(OBJ)
  	cp rtt ../../bin
--	strip ../../bin/rtt
+-	strip ../../bin/rtt$(EXE)
  
  library:	$(OBJ)
  		rm -rf rtt.a
diff --git a/lang/icon/patches/patch-au b/lang/icon/patches/patch-au
index f7d768f4607..dc0817c78c5 100644
--- a/lang/icon/patches/patch-au
+++ b/lang/icon/patches/patch-au
@@ -1,12 +1,12 @@
-$NetBSD: patch-au,v 1.3 2001/06/25 18:00:17 jtb Exp $
+$NetBSD: patch-au,v 1.4 2003/06/06 08:58:43 jtb Exp $
 
---- src/iconc/Makefile.orig	Wed Jun  6 20:14:38 2001
+--- src/iconc/Makefile.orig
 +++ src/iconc/Makefile
 @@ -20,7 +20,6 @@
  iconc:		$(OBJS) $(COBJS)
  		$(CC) -o iconc $(OBJS) $(COBJS)
  		cp iconc ../../bin
--		strip ../../bin/iconc
+-		strip ../../bin/iconc$(EXE)
  
  $(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 \
+ 		../h/mproto.h ../h/typedefs.h ../h/gsupport.h \
diff --git a/lang/icon/patches/patch-av b/lang/icon/patches/patch-av
index 2aae56d216a..bd9f92585a2 100644
--- a/lang/icon/patches/patch-av
+++ b/lang/icon/patches/patch-av
@@ -1,12 +1,20 @@
-$NetBSD: patch-av,v 1.4 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-av,v 1.5 2003/06/06 08:58:43 jtb Exp $
 
---- src/icont/Makefile.orig	Mon Jan 14 21:03:05 2002
+--- src/icont/Makefile.orig
 +++ src/icont/Makefile
-@@ -21,7 +21,6 @@ COBJS =		../common/long.o ../common/geto
+@@ -21,7 +21,6 @@
  icont:		$(OBJS) $(COBJS)
  		$(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS)
  		cp icont ../../bin
--		strip ../../bin/icont
+-		strip ../../bin/icont$(EXE)
  		(cd ../../bin; rm -f icon; ln -s icont icon)
  
  $(OBJS):	$(HFILES) tproto.h
+@@ -66,7 +65,6 @@
+ ixhdr.hdr:	ixhdr.c ../h/define.h ../h/config.h ../h/header.h $(COBJS)
+ 		$(CC) $(CFLAGS) $(LDFLAGS) -o ixhdr.hdr \
+ 			ixhdr.c ../common/alloc.o ../common/munix.o
+-		strip ixhdr.hdr
+ 
+ 
+ 
diff --git a/lang/icon/patches/patch-aw b/lang/icon/patches/patch-aw
index afca1bed9c0..b437d0501f4 100644
--- a/lang/icon/patches/patch-aw
+++ b/lang/icon/patches/patch-aw
@@ -1,35 +1,37 @@
-$NetBSD: patch-aw,v 1.4 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-aw,v 1.5 2003/06/06 08:58:43 jtb Exp $
 
---- src/common/Makefile.orig	Wed Dec 12 18:28:10 2001
+--- src/common/Makefile.orig
 +++ src/common/Makefile
-@@ -5,7 +5,7 @@ OBJS =	long.o getopt.o time.o filepart.o
+@@ -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
+ 	save.o xwindow.o dlrgint.o ipp.o
  
--common:		doincl patchstr $(OBJS) xpmaybe
-+common:		doincl patchstr $(OBJS) fixheaders xpmaybe
+-common:		doincl $(OBJS) gpxmaybe
++common:		doincl patchstr $(OBJS) fixheaders gpxmaybe
  
  doincl:		doincl.c ../h/arch.h
  		$(CC) $(CFLAGS) -o doincl doincl.c
-@@ -15,12 +15,20 @@ patchstr:	patchstr.c
- 		$(CC) $(CFLAGS) -o patchstr patchstr.c
- 		cp patchstr ../../bin
+@@ -13,13 +13,22 @@
  
+ patchstr:	patchstr.c
+ 		$(CC) $(CFLAGS) -o patchstr patchstr.c
++		cp patchstr ../../bin
++
 +fixheaders:
 +		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
+ 
+ gpxmaybe:
+ 		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(GDIR); fi
  
  xpm:
  		cd ../xpm; $(MAKE) libXpm.a
--		cp ../xpm/libXpm.a ../../bin
-+		cp ../xpm/libXpm.a ../../lib/icon
+-		cp -p ../xpm/libXpm.a ../../bin/libIgpx.a
++		cp -p ../xpm/libXpm.a ../../lib/icon/libIgpx.a
 +		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/arch.h ../h/config.h ../h/cstructs.h ../h/mproto.h \
- 	  ../h/typedefs.h ../h/proto.h ../h/cpuconf.h
+ wincap:		
+ 		cd ../wincap; $(MAKE) libWincap.a
diff --git a/lang/icon/patches/patch-ax b/lang/icon/patches/patch-ax
index 28eaff62351..6600b785767 100644
--- a/lang/icon/patches/patch-ax
+++ b/lang/icon/patches/patch-ax
@@ -1,21 +1,21 @@
-$NetBSD: patch-ax,v 1.4 2003/03/24 12:12:10 jtb Exp $
+$NetBSD: patch-ax,v 1.5 2003/06/06 08:58:43 jtb Exp $
 
---- src/runtime/Makefile.orig	Mon Mar  4 21:32:56 2002
+--- src/runtime/Makefile.orig
 +++ src/runtime/Makefile
-@@ -41,7 +41,6 @@ iconx: $(OBJS)
+@@ -41,7 +41,6 @@
  	cd ../common; $(MAKE)
  	$(CC) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS) $(TL)
  	cp iconx ../../bin
--	strip ../../bin/iconx
+-	strip ../../bin/iconx$(EXE)
  
  xcnv.o: cnv.r $(HDRS)
  	../../bin/rtt -x cnv.r
-@@ -311,7 +310,7 @@ rt.a: ../common/rswitch.o ../common/long
+@@ -306,7 +305,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
+-	cp -p rt.a rt.db ../common/dlrgint.o ../../bin
++	cp -p rt.a rt.db ../common/dlrgint.o ../../lib/icon
  
  cnv.o: cnv.r $(HDRS)
  	../../bin/rtt cnv.r