Update Icon to 9.4.3

Notable changes in version 9.4.3:

The system-specific Icon configurations have been reorganized and renamed.
The several BSD configurations have been merged into one.

The macintosh configuration now supports the loadfunc function.

A new porting guide has been written, and a new posix configuration
has been added as a starting point in constructing new ports.

The core library files remain stable. Notable changes include:
- procs/dijkstra          new procedures implement Dijkstra's control structures
- procs/html              add procedure for canonicalization of paths
- procs/matrix2           new procedures for matrix manipulation
- procs/nestlist          new procedures for representing nested lists as strings
- procs/printf            add %e format and fix a rounding problem
- progs/noise             new program for producing a random bitstream
- progs/unclog            improve logic for combining adjacent entries
- gprogs/dlgvu            improve coverage map; allow altitude in GPS data
- gprogs/gallery          faster thumbnail loading for JPEG images
- gprogs/img              many new features
- gprogs/sier             better color choices
- gprogs/trkvu            accept GPS track logs with altitude as the last field

The undocumented save function, which only worked on a few platforms, has been removed.


Approved by <tnn>.

21 files changed, 164 insertions, 372 deletions

diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 101712a9df6..3de71387bfc 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2008/07/20 19:02:47 ahoka Exp $
+# $NetBSD: Makefile,v 1.46 2009/02/08 12:51:04 asau Exp $
 
-DISTNAME=		icon.v942src
-PKGNAME=		icon-9.4.2
-PKGREVISION=		1
+DISTNAME=		icon.v943src
+PKGNAME=		icon-9.4.3
+PKGREVISION=		#
 CATEGORIES=		lang
 MASTER_SITES=		http://www.cs.arizona.edu/icon/ftp/packages/unix/
 EXTRACT_SUFX=		.tgz
@@ -11,18 +11,19 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.cs.arizona.edu/icon/index.htm
 COMMENT=		The Icon programming language
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFIGURE_TARGET=	X-Configure
 BUILD_TARGET=		All
+INSTALL_TARGET=		Install
 TEST_TARGET=		Test
 MAKE_JOBS_SAFE=		no
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
-
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
 .if ${OPSYS} == "NetBSD"
-NAME=	netbsd
+NAME=	bsd
 .  if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "i386") || \
 	(${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "powerpc") || \
 	(${MACHINE_ARCH} == "mipseb") || (${MACHINE_ARCH} == "mipsel") || \
@@ -33,7 +34,7 @@ PTHREAD_OPTS+=		require native
 .  endif
 
 .elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-NAME=	freebsd
+NAME=	bsd
 
 .elif ${OPSYS} == "Linux"
 NAME=	linux
@@ -62,13 +63,12 @@ pre-build:
 	${MKDIR} ${WRKSRC}/lib/icon
 
 do-configure:
-	cd ${WRKSRC}/config/netbsd && \
+	cd ${WRKSRC}/config/bsd && \
 	${SED} -e 's:@X11BASE@:${X11BASE}:g' define.h.in \
 		> define.h
 	cd ${WRKSRC} && ${MAKE} ${CONFIGURE_TARGET} name=${NAME}
 
-do-install:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} dest=${PREFIX} Install
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/lang/icon/PLIST b/lang/icon/PLIST
index 3a85b7be944..c2487e8453a 100644
--- a/lang/icon/PLIST
+++ b/lang/icon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/06/06 08:58:42 jtb Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/02/08 12:51:04 asau Exp $
 bin/colrbook
 bin/colrpick
 bin/fontpick
@@ -149,6 +149,8 @@ lib/icon/dif.u1
 lib/icon/dif.u2
 lib/icon/digitcnt.u1
 lib/icon/digitcnt.u2
+lib/icon/dijkstra.u1
+lib/icon/dijkstra.u2
 lib/icon/distance.u1
 lib/icon/distance.u2
 lib/icon/divide.u1
@@ -421,6 +423,8 @@ lib/icon/math.u1
 lib/icon/math.u2
 lib/icon/matrix.u1
 lib/icon/matrix.u2
+lib/icon/matrix2.u1
+lib/icon/matrix2.u2
 lib/icon/memlog.u1
 lib/icon/memlog.u2
 lib/icon/memrfncs.u1
@@ -444,6 +448,8 @@ lib/icon/namepfx.u1
 lib/icon/namepfx.u2
 lib/icon/navitrix.u1
 lib/icon/navitrix.u2
+lib/icon/nestlist.u1
+lib/icon/nestlist.u2
 lib/icon/ngrams.u1
 lib/icon/ngrams.u2
 lib/icon/noncase.u1
@@ -851,7 +857,10 @@ share/doc/icon/index.htm
 share/doc/icon/install.htm
 share/doc/icon/istyle.css
 share/doc/icon/lb80.jpg
+share/doc/icon/macintosh.htm
+share/doc/icon/port.htm
 share/doc/icon/relnotes.htm
+share/doc/icon/shortcut.gif
 share/doc/icon/wwwcube.gif
 @dirrm share/doc/icon
 @dirrm lib/icon
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 285933be110..2036fd4b8c2 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,32 +1,25 @@
-$NetBSD: distinfo,v 1.15 2008/06/28 17:14:25 tnn Exp $
+$NetBSD: distinfo,v 1.16 2009/02/08 12:51:04 asau Exp $
 
-SHA1 (icon.v942src.tgz) = 9536e9346188deb2dc5853e03b5f7a85991314b1
-RMD160 (icon.v942src.tgz) = 7e0ec62b714c433acb23a31bad62028424f72ead
-Size (icon.v942src.tgz) = 3204076 bytes
-SHA1 (patch-aa) = 4466461cf703d3506d505bd12e5627ebbc581f9c
-SHA1 (patch-ab) = 751e605b803e2e046cf71375d512c69792b3bdb9
-SHA1 (patch-ac) = 8d283b4b6db50b3b9d1d9a6b5a0d328fbd47c184
-SHA1 (patch-ad) = 20f718bcaed88e210d9c4e5d5b652043dff04f00
-SHA1 (patch-ae) = 6e83f7f256e096cb0ac879cc03766c12f05ebf97
-SHA1 (patch-af) = b29abc57596d3e8f1bbb531539215aa5283cae5b
-SHA1 (patch-ag) = 8d9b913a1d28adf6c672a09ab45516f13f6f5459
-SHA1 (patch-ah) = 912bdb9620807a9c0e205c694416805814e718dd
-SHA1 (patch-ai) = 7009e2d51e3cde5f3ef97f69a85ab217ef1c13bf
-SHA1 (patch-aj) = a712ff27937237a4c69f62605ab5310056a04016
+SHA1 (icon.v943src.tgz) = 92bd3347807b333fb903edf61a2805f2e1159577
+RMD160 (icon.v943src.tgz) = af75af7f106920cd59a7f8ac85954aa472ae78e7
+Size (icon.v943src.tgz) = 3218627 bytes
+SHA1 (patch-aa) = 5d9a996a9957e391333c4b934f9f1d8ed7a681d6
+SHA1 (patch-ab) = 077c92c85e689084fe2b0d4c57a01a5f967a4c78
+SHA1 (patch-ac) = 10e4dd6d012aab3853cd3af279b44f5a03443c4f
+SHA1 (patch-ai) = 16cbd079625d81d38d6cd58a976e5f3062098677
+SHA1 (patch-aj) = 5498067a68c575c8b563b4214436ad92c5409708
 SHA1 (patch-ak) = 64a2cc88155db10b618b314a23f101587ec86761
 SHA1 (patch-al) = c4705ab795093189196eb512c9182d8b55fa7c96
 SHA1 (patch-am) = fe2a7e2a41d27e1c26fab74235ecc0ed7e6bb80d
 SHA1 (patch-an) = 487bd5d35d94026ac2ef7ce08e197a2d378b73e7
-SHA1 (patch-ao) = 1473a8f2f60cd571585cb901ac62b77bcf0cdfcf
-SHA1 (patch-ap) = 8a2db8e1e4af55be36956e8c66c2e5f426bc3c49
-SHA1 (patch-aq) = cee577fb4e572d9d54184a9bc5ff8e5e09758958
+SHA1 (patch-ao) = 68cd2c4e4c7320127f66a0abd5d94a73c35ccf35
+SHA1 (patch-ap) = 3f8cc180a440feb42a0c4ae1475f5ac8d3709b2c
 SHA1 (patch-as) = e8749720bce4362c708c266a0f049f49742eddd2
 SHA1 (patch-at) = 7588ea1056dde3f8776c04e4f8786ca56462aedb
 SHA1 (patch-au) = de4bba2ee4c08ab4e20ec29132b46ed17bd03de4
 SHA1 (patch-av) = c7eda8b5e28a03b13ec6f037c168fab33c1bb214
-SHA1 (patch-aw) = 32fbb57aff56ab9ddffb0ab01872dbc79d7ce654
-SHA1 (patch-ax) = 2da62632e50bf9f60b0784598e74b8a15a245d1e
+SHA1 (patch-aw) = 2474d54ce778118a74ebac66018c8ae382b051ea
+SHA1 (patch-ax) = 834f3f62fd5ec7f4501d518957ccfb7c71198e8c
 SHA1 (patch-ay) = 34186d788599e3e62fd1f27e931feb240c5aab2d
-SHA1 (patch-az) = 49785eb95d1ee006a6788e92031e0782e081ee71
-SHA1 (patch-ba) = f077eaee178fba82da8a35ab8b6a046dc4df4809
-SHA1 (patch-bb) = 0a8dd463a16e8436db153c87ebda3af448cdb1ac
+SHA1 (patch-az) = 682d436f650731b771021be67a06b955ee5f058e
+SHA1 (patch-ba) = ffc6650779867e2b6c6521c64bc153d5357211dc
diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa
index c181e5e835f..a1528e6686d 100644
--- a/lang/icon/patches/patch-aa
+++ b/lang/icon/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2003/06/06 08:58:42 jtb Exp $
+$NetBSD: patch-aa,v 1.8 2009/02/08 12:51:04 asau Exp $
 
 --- config/setup.sh.orig
 +++ config/setup.sh
@@ -11,12 +11,3 @@ $NetBSD: patch-aa,v 1.7 2003/06/06 08:58:42 jtb Exp $
     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].
--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 4f24cccc975..4eb51468ac1 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,17 +1,13 @@
-$NetBSD: patch-ab,v 1.8 2003/06/06 08:58:42 jtb Exp $
+$NetBSD: patch-ab,v 1.9 2009/02/08 12:51:04 asau Exp $
 
---- /dev/null	Mon Mar 24 07:25:29 2003
-+++ config/netbsd/define.h.in
-@@ -0,0 +1,14 @@
+--- /dev/null	2009-02-08 02:30:41.000000000 +0300
++++ config/bsd/define.h.in	2009-02-08 03:08:28.000000000 +0300
+@@ -0,0 +1,10 @@
 +/*
-+ * Icon configuration file for NetBSD
++ * Icon configuration file for BSD
 + */
 +
 +#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) */
-+
 +#define LoadFunc
 +
 +#define CComp "gcc"
diff --git a/lang/icon/patches/patch-ac b/lang/icon/patches/patch-ac
index e3c9f9fe080..2ac64130a64 100644
--- a/lang/icon/patches/patch-ac
+++ b/lang/icon/patches/patch-ac
@@ -1,51 +1,79 @@
-$NetBSD: patch-ac,v 1.9 2003/06/29 23:06:47 jtb Exp $
+$NetBSD: patch-ac,v 1.10 2009/02/08 12:51:04 asau Exp $
 
---- /dev/null
-+++ config/netbsd/powerpc.s
-@@ -0,0 +1,46 @@
-+#
-+#	coswitch for the PowerPC
-+#
-+
-+	.file   "rswitch.s"
-+
+--- config/bsd/powerpc.s.orig	2005-06-16 19:55:17.000000000 +0400
++++ config/bsd/powerpc.s	2009-02-08 02:27:54.000000000 +0300
+@@ -1,9 +1,11 @@
+ #
+-#	coswitch for the PowerPC architecture
++#	coswitch for the PowerPC architecture
+ #
+ 
+ 	.file   "rswitch.s"
+ 
 +	.set	RSIZE, 80		# room for regs 14-31, rounded up mod16
 +
-+	.data
-+errmsg:		.string "new_context() returned in coswitch\n"
-+
-+	.text
-+	.align  2
-+	.globl  coswitch
-+	.type	coswitch,@function
-+
-+coswitch:
+ 	.data
+ errmsg:		.string "new_context() returned in coswitch\n"
+ 
+@@ -13,30 +15,13 @@
+ 	.type	coswitch,@function
+ 
+ coswitch:
+-	stwu	1, -80(1)		# allocate stack frame
 +	stwu	1, -RSIZE(1)		# allocate stack frame
-+
-+					# Save Old Context:
-+	stw	1, 0(3)			# SP
-+	mflr	0
-+	stw	0, 4(3)			# LR (return address)
+ 
+ 					# Save Old Context:
+ 	stw	1, 0(3)			# SP
+ 	mflr	0
+ 	stw	0, 4(3)			# LR (return address)
+-	stw	14, 0(1)		# GPRs 14-31 (save on stack)
+-	stw	15, 4(1)
+-	stw	16, 8(1)
+-	stw	17, 12(1)
+-	stw	18, 16(1)
+-	stw	19, 20(1)
+-	stw	20, 24(1)
+-	stw	21, 28(1)
+-	stw	22, 32(1)
+-	stw	23, 36(1)
+-	stw	24, 40(1)
+-	stw	25, 44(1)
+-	stw	26, 48(1)
+-	stw	27, 52(1)
+-	stw	28, 56(1)
+-	stw	29, 60(1)
+-	stw	30, 64(1)
+-	stw	31, 68(1)
 +	stmw	14, -RSIZE(1)		# GPRs 14-31 (save on stack)
-+
-+	cmpi	0, 5, 0
-+	beq	first			# if first time
-+
-+					# Restore new context:
-+	lwz	1, 0(4)			# SP
-+	lwz	0, 4(4)			# LR
-+	mtlr	0
+ 
+ 	cmpi	0, 5, 0
+ 	beq	first			# if first time
+@@ -45,26 +30,9 @@
+ 	lwz	1, 0(4)			# SP
+ 	lwz	0, 4(4)			# LR
+ 	mtlr	0
+-	lwz	14, 0(1)		# GPRs 14-31 (from stack)
+-	lwz	15, 4(1)
+-	lwz	16, 8(1)
+-	lwz	17, 12(1)
+-	lwz	18, 16(1)
+-	lwz	19, 20(1)
+-	lwz	20, 24(1)
+-	lwz	21, 28(1)
+-	lwz	22, 32(1)
+-	lwz	23, 36(1)
+-	lwz	24, 40(1)
+-	lwz	25, 44(1)
+-	lwz	26, 48(1)
+-	lwz	27, 52(1)
+-	lwz	28, 56(1)
+-	lwz	29, 60(1)
+-	lwz	30, 64(1)
+-	lwz	31, 68(1)
 +	lmw	14, -RSIZE(1)		# GPRs 14-31 (from stack)
-+
+ 
+-	addic	1, 1, 80		# deallocate stack frame
 +	addic	1, 1, RSIZE		# deallocate stack frame
-+	blr				# return into new context
-+
-+first:					# First-time call:
-+	lwz	1, 0(4)			# SP as figured by Icon
-+	addic	1, 1, -64		# save area for callee
-+	addi	3, 0, 0			# arg1
-+	addi	4, 0, 0			# arg2
-+	bl	new_context		# new_context(0,0)
-+	lis	3, errmsg@ha
-+	la	3, errmsg@l(3)
-+	bl	syserr
+ 	blr				# return into new context
+ 
+ first:					# First-time call:
diff --git a/lang/icon/patches/patch-ad b/lang/icon/patches/patch-ad
deleted file mode 100644
index 578dc12e298..00000000000
--- a/lang/icon/patches/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/06/06 08:58:43 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/m68k.c
-@@ -0,0 +1,25 @@
-+/*
-+ * coswitch for the m68k architecture
-+ */
-+
-+int
-+coswitch (int *old_cs, int *new_cs, int first)
-+{
-+	asm ("movl %a6@(8),%a0");		/* a0 = old */
-+	asm ("movl %a6@(12),%a1");		/* a1 = new */
-+	asm ("movl %a7,%a0@");		        /* save sp in cstate[0] */
-+	asm ("movl %a6,%a0@(4)");		/* save a6 (fp) in cstate[0] */
-+	asm ("moveml #0x3cfc,%a0@(8)");		/* store d2-d7, a2-a6 in old->cstate */
-+
-+	if (first == 0) {                       /* this is first activation */
-+		asm ("movl %a1@,%a7");
-+		asm ("movl #0,%a6");
-+		new_context (0, 0);
-+		syserr ("new_context() returned in coswitch");
-+	}
-+	else {
-+		asm ("movl %a1@,%a7");		/* restore sp */
-+		asm ("movl %a1@(4),%a6");	/* restore fp */
-+		asm ("moveml %a1@(8),#0x3cfc");	/* restore d2-d7, a2-a6 */
-+	}
-+}
diff --git a/lang/icon/patches/patch-ae b/lang/icon/patches/patch-ae
deleted file mode 100644
index 82ea62be774..00000000000
--- a/lang/icon/patches/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-ae,v 1.8 2003/06/06 08:58:43 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/alpha.s
-@@ -0,0 +1,46 @@
-+/*
-+ *  coswitch(old_cs, new_cs, first) for DEC Alpha architecture
-+ *             $16     $17    $18
-+ */
-+	.data
-+errmsg:	.ascii	"new_context() returned in coswitch\X00"
-+
-+	.text
-+	.globl	coswitch
-+	.ent	coswitch
-+coswitch:
-+	lda	$sp, -72($sp)		/* make room on stack */
-+	stq	$sp, 0($16)		/* save stack pointer */
-+	stq	$9, 0($sp)		/* save registers on stack */
-+	stq	$10, 8($sp)
-+	stq	$11, 16($sp)
-+	stq	$12, 24($sp)
-+	stq	$13, 32($sp)
-+	stq	$14, 40($sp)
-+	stq	$15, 48($sp)
-+	stq	$27, 56($sp)
-+	stq	$26, 64($sp)		/* return address */
-+	beq	$18, first		/* if first time */
-+
-+	ldq	$sp, 0($17)		/* load new stack pointer */
-+	ldq	$9, 0($sp)		/* load registers from stack */
-+	ldq	$10, 8($sp)
-+	ldq	$11, 16($sp)
-+	ldq	$12, 24($sp)
-+	ldq	$13, 32($sp)
-+	ldq	$14, 40($sp)
-+	ldq	$15, 48($sp)
-+	ldq	$27, 56($sp)
-+	ldq	$26, 64($sp)		/* return address */
-+	lda	$sp, 72($sp)		/* reset sp */
-+	jsr_coroutine	$31, ($26), 0	/* jump into new_context */
-+
-+first:
-+	ldq	$sp, 0($17)		/* load stack pointer only */
-+	bis	$31, $31, $16		/* r16 = 0 */
-+	bis	$31, $31, $17		/* r17 = 0 */
-+	jsr	$26, new_context	/* new_context(0,0) */
-+	lda	$16, errmsg
-+	jsr	$26, syserr		/* shouldn't get here */
-+
-+	.end	coswitch
diff --git a/lang/icon/patches/patch-af b/lang/icon/patches/patch-af
deleted file mode 100644
index 20e628621e6..00000000000
--- a/lang/icon/patches/patch-af
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.10 2003/06/29 23:06:47 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/i386.c
-@@ -0,0 +1,23 @@
-+/*
-+ * coswitch for i386 architecture
-+ */
-+
-+int
-+coswitch (int *old_cs, int *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 ("new_context() 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
deleted file mode 100644
index a32b355eb82..00000000000
--- a/lang/icon/patches/patch-ag
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2003/06/06 08:58:43 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/sparc.c
-@@ -0,0 +1,33 @@
-+/*
-+ * coswitch for NetBSD SPARC
-+ */
-+
-+int
-+coswitch (int *old_cs, int *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
deleted file mode 100644
index fc6103ecfbc..00000000000
--- a/lang/icon/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2003/07/10 13:46:05 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/Makedefs
-@@ -0,0 +1,19 @@
-+#  Makefile definitions from config/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
-+CFLAGS += -I$(X11BASE)/include
-+XLIBS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lX11
-+XPMDEFS = -DZPIPE -I$(X11BASE)/include
-+GDIR= xpm
-+TLIBS= -lpthread
diff --git a/lang/icon/patches/patch-ai b/lang/icon/patches/patch-ai
index 74e05bcdc09..e4c5a441a2b 100644
--- a/lang/icon/patches/patch-ai
+++ b/lang/icon/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.6 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ai,v 1.7 2009/02/08 12:51:05 asau Exp $
 
 --- /dev/null
-+++ config/netbsd/status
++++ config/bsd/status.netbsd
 @@ -0,0 +1,26 @@
 +System configuration:
 +
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index 1fb3c203495..0b495a6938e 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-aj,v 1.7 2009/02/08 12:51:05 asau Exp $
 
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	2005-11-09 02:24:34.000000000 +0300
++++ Makefile	2009-02-08 01:57:40.000000000 +0300
 @@ -14,7 +14,7 @@
  #
  # Default targets.
@@ -11,9 +11,11 @@ $NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
  
  config/$(name)/status src/h/define.h:
  	:
-@@ -97,16 +97,22 @@
+@@ -95,18 +95,23 @@
  
- D=$(dest)
+ # Installation:  "make Install dest=new-icon-directory"
+ 
+-D=$(dest)
  Install:
 -		mkdir $D
 -		mkdir $D/bin $D/lib $D/doc $D/man $D/man/man1
@@ -25,22 +27,22 @@ $NetBSD: patch-aj,v 1.6 2003/06/06 08:58:43 jtb Exp $
 -		cp lib/*.* $D/lib
 -		cp doc/*.* $D/doc
 -		cp man/man1/*.* $D/man/man1
-+		./bin/patchstr ./bin/icont $(PREFIX)/bin/iconx
-+		./bin/patchstr ./bin/iconc $(PREFIX)/lib/icon/
++		./bin/patchstr ./bin/icont $(DESTDIR)$(PREFIX)/bin/iconx
++		./bin/patchstr ./bin/iconc $(DESTDIR)$(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
++			patchstr rtt $(DESTDIR)$(PREFIX)/bin
++		cd $(DESTDIR)$(PREFIX)/bin && ln -sf icont icon
++		$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/lib/icon
++		$(BSD_INSTALL_DATA) lib/icon/*.* $(DESTDIR)$(PREFIX)/lib/icon
++		$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/doc/icon
 +		for f in colrbook colrpick fontpick palette vib	\
 +		wevents xgamma; do					\
 +		if [ -f bin/$$f ]; then					\
-+			${BSD_INSTALL_SCRIPT} bin/$$f $D/bin;		\
++			${BSD_INSTALL_SCRIPT} bin/$$f $(DESTDIR)$(PREFIX)/bin;	\
 +		fi;							\
 +		done
-+		$(BSD_INSTALL_DATA) doc/*.* $D/share/doc/icon
-+		$(BSD_INSTALL_MAN) man/man1/* $D/man/man1
++		$(BSD_INSTALL_DATA) doc/*.* $(DESTDIR)$(PREFIX)/share/doc/icon
++		$(BSD_INSTALL_MAN) man/man1/* $(DESTDIR)$(PREFIX)/man/man1
  
  
  # Bundle up for binary distribution.
diff --git a/lang/icon/patches/patch-ao b/lang/icon/patches/patch-ao
index d5c43893aa7..596981da480 100644
--- a/lang/icon/patches/patch-ao
+++ b/lang/icon/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.6 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ao,v 1.7 2009/02/08 12:51:05 asau Exp $
 
 --- /dev/null
-+++ config/netbsd/mipseb.s
++++ config/bsd/mipseb.s
 @@ -0,0 +1,76 @@
 +	.data	
 +	.align	0
diff --git a/lang/icon/patches/patch-ap b/lang/icon/patches/patch-ap
index 68349900ae5..1273392f70f 100644
--- a/lang/icon/patches/patch-ap
+++ b/lang/icon/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.7 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ap,v 1.8 2009/02/08 12:51:05 asau Exp $
 
 --- /dev/null
-+++ config/netbsd/mipsel.s
++++ config/bsd/mipsel.s
 @@ -0,0 +1,76 @@
 +	.data	
 +	.align	0
diff --git a/lang/icon/patches/patch-aq b/lang/icon/patches/patch-aq
deleted file mode 100644
index c3f61835726..00000000000
--- a/lang/icon/patches/patch-aq
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aq,v 1.7 2003/06/23 20:48:24 jtb Exp $
-
---- /dev/null
-+++ config/netbsd/vax.c
-@@ -0,0 +1,38 @@
-+/*
-+ * coswitch for the VAX architecture.
-+ */
-+
-+int
-+coswitch (int *old_cs, int *new_cs, int first)
-+{
-+	asm ("movl 4(%ap),%r0");
-+	asm ("movl 8(%ap),%r1");
-+	asm ("movl %sp,0(%r0)");
-+	asm ("movl %fp,4(%r0)");
-+	asm ("movl %ap,8(%r0)");
-+	asm ("movl %r11,16(%r0)");
-+	asm ("movl %r10,20(%r0)");
-+	asm ("movl %r9,24(%r0)");
-+	asm ("movl %r8,28(%r0)");
-+	asm ("movl %r7,32(%r0)");
-+	asm ("movl %r6,36(%r0)");
-+
-+	if (first == 0) {                  /* this is the first activation */
-+		asm ("movl 0(%r1),%sp");
-+		asm ("clrl %fp");
-+		asm ("clrl %ap");
-+		new_context (0,0);
-+		syserr ("new_context() returned in coswitch");
-+	}
-+	else {
-+		asm ("movl 0(%r1),%sp");
-+		asm ("movl 4(%r1),%fp");
-+		asm ("movl 8(%r1),%ap");
-+		asm ("movl 16(%r1),%r11");
-+		asm ("movl 20(%r1),%r10");
-+		asm ("movl 24(%r1),%r9");
-+		asm ("movl 28(%r1),%r8");
-+		asm ("movl 32(%r1),%r7");
-+		asm ("movl 36(%r1),%r6");
-+	}
-+}
diff --git a/lang/icon/patches/patch-aw b/lang/icon/patches/patch-aw
index b437d0501f4..ac978647b5e 100644
--- a/lang/icon/patches/patch-aw
+++ b/lang/icon/patches/patch-aw
@@ -1,10 +1,10 @@
-$NetBSD: patch-aw,v 1.5 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-aw,v 1.6 2009/02/08 12:51:05 asau Exp $
 
---- src/common/Makefile.orig
-+++ src/common/Makefile
+--- src/common/Makefile.orig	2003-07-05 21:30:35.000000000 +0400
++++ src/common/Makefile	2009-02-08 01:41:40.000000000 +0300
 @@ -5,7 +5,7 @@
  	munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
- 	save.o xwindow.o dlrgint.o ipp.o
+ 	xwindow.o dlrgint.o ipp.o
  
 -common:		doincl $(OBJS) gpxmaybe
 +common:		doincl patchstr $(OBJS) fixheaders gpxmaybe
diff --git a/lang/icon/patches/patch-ax b/lang/icon/patches/patch-ax
index 6600b785767..76917045332 100644
--- a/lang/icon/patches/patch-ax
+++ b/lang/icon/patches/patch-ax
@@ -1,12 +1,12 @@
-$NetBSD: patch-ax,v 1.5 2003/06/06 08:58:43 jtb Exp $
+$NetBSD: patch-ax,v 1.6 2009/02/08 12:51:05 asau Exp $
 
---- src/runtime/Makefile.orig
-+++ src/runtime/Makefile
+--- src/runtime/Makefile.orig	2005-07-07 21:36:06.000000000 +0400
++++ src/runtime/Makefile	2009-02-08 01:43:04.000000000 +0300
 @@ -41,7 +41,6 @@
  	cd ../common; $(MAKE)
  	$(CC) $(RLINK) -o iconx  $(OBJS) $(XL) $(RLIBS) $(TL)
  	cp iconx ../../bin
--	strip ../../bin/iconx$(EXE)
+-	strip $(SFLAGS) ../../bin/iconx$(EXE)
  
  xcnv.o: cnv.r $(HDRS)
  	../../bin/rtt -x cnv.r
diff --git a/lang/icon/patches/patch-az b/lang/icon/patches/patch-az
index 7c5543a7d7a..82a2bb71b98 100644
--- a/lang/icon/patches/patch-az
+++ b/lang/icon/patches/patch-az
@@ -1,13 +1,13 @@
-$NetBSD: patch-az,v 1.6 2006/03/19 15:57:36 joerg Exp $
+$NetBSD: patch-az,v 1.7 2009/02/08 12:51:05 asau Exp $
 
---- ipl/cfuncs/mklib.sh.orig	2006-03-19 15:16:00.000000000 +0000
-+++ ipl/cfuncs/mklib.sh
-@@ -21,7 +21,7 @@ case "$SYS" in
-       ld -shared -o $LIBNAME "$@";;
-    OSF*)
-       ld -shared -expect_unresolved '*' -o $LIBNAME "$@" -lc;;
--   Linux*|BSD/OS*|OpenBSD*|NetBSD*|GNU*)
-+   Linux*|BSD/OS*|OpenBSD*|NetBSD*|GNU*|DragonFly*)
+--- ipl/cfuncs/mklib.sh.orig	2005-07-07 21:36:06.000000000 +0400
++++ ipl/cfuncs/mklib.sh	2009-02-08 01:44:18.000000000 +0300
+@@ -10,7 +10,7 @@
+ SYS=`uname -s`
+ set -x
+ case "$SYS" in
+-   Linux*|*BSD*|GNU*)
++   Linux*|*BSD*|GNU*|DragonFly*)
        gcc -shared -o $LIBNAME -fPIC "$@";;
-    FreeBSD*)
-       ld -Bshareable -o $LIBNAME "$@" -lc;;
+    Darwin*)
+       cc -bundle -undefined suppress -flat_namespace -o $LIBNAME "$@";;
diff --git a/lang/icon/patches/patch-ba b/lang/icon/patches/patch-ba
index dc94ebe4fd8..918a82575bf 100644
--- a/lang/icon/patches/patch-ba
+++ b/lang/icon/patches/patch-ba
@@ -1,12 +1,12 @@
-$NetBSD: patch-ba,v 1.5 2006/03/19 15:57:36 joerg Exp $
+$NetBSD: patch-ba,v 1.6 2009/02/08 12:51:05 asau Exp $
 
---- config/freebsd/Makedefs.orig	2006-03-19 15:21:42.000000000 +0000
-+++ config/freebsd/Makedefs
-@@ -14,6 +14,6 @@ CFDYN = -fPIC
+--- config/bsd/Makedefs.orig	2005-06-16 19:55:17.000000000 +0400
++++ config/bsd/Makedefs	2009-02-08 01:46:07.000000000 +0300
+@@ -14,6 +14,6 @@
  RLINK = -Wl,-E
  RLIBS = -lm
- TLIBS = -pthread
--XLIBS = -L/usr/X11R6/lib -lX11
-+XLIBS = -R${X11BASE}/lib -L${X11BASE}/lib -lX11
- XPMDEFS = -DZPIPE
+ TLIBS = -lpthread
+-XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
++XLIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11
+ XPMDEFS = -DZPIPE -I/usr/X11R6/include
  GDIR = xpm
diff --git a/lang/icon/patches/patch-bb b/lang/icon/patches/patch-bb
deleted file mode 100644
index 416a8920047..00000000000
--- a/lang/icon/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2008/06/28 17:14:25 tnn Exp $
-
---- src/common/time.c.orig	2002-07-09 18:49:27.000000000 +0200
-+++ src/common/time.c
-@@ -32,7 +32,7 @@ long millisec()
-    t = cptime();
-    if (starttime == -2)
-       starttime = t;
--   return (long) ((1000.0 / CLK_TCK) * (t - starttime));
-+   return (long) ((1000.0 / sysconf(_SC_CLK_TCK)) * (t - starttime));
-    }
- 
- #else					/* NoPosixTimes */