diff --git a/lang/icon/interp/Makefile b/lang/icon/interp/Makefile
index ae072228746..39e952cabe3 100644
--- a/lang/icon/interp/Makefile
+++ b/lang/icon/interp/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.13 2005/02/24 13:20:41 alek Exp $
+# $OpenBSD: Makefile,v 1.14 2006/10/16 10:01:55 espie Exp $
 
 COMMENT=	"programming language with generators, X11 and more"
 COMMENT-no_x11=	"programming language with generators"
 COMMENT-compiler="icon compiler"
-VERSION=	9.4
-DISTNAME=	icon.v940src
+VERSION=	9.4.3
+DISTNAME=	icon.v943src
 PKGNAME=	icon-interp-${VERSION}
 CATEGORIES=	lang
 MASTER_SITES= http://www.cs.arizona.edu/icon/ftp/packages/unix/
 #DIST_SUBDIR=	icon/${VERSION}
-DISTFILES=	icon.v940src.tgz
+DISTFILES=	icon.v943src.tgz
 
 MULTI_PACKAGES=	-compiler
 SUBPACKAGE?=
@@ -53,7 +53,7 @@ USE_X11=Yes
 .endif
 
 do-configure:
-	cd ${WRKSRC} && ${MAKE} ${CONFIGURE_TARGET} name=openbsd
+	cd ${WRKSRC} && ${MAKE} ${CONFIGURE_TARGET} name=bsd
 
 post-build:
 	if [ x${NO_SHARED_LIBS:L} != "yes" ]; then \
@@ -82,10 +82,6 @@ do-install:
 	${INSTALL_DATA} ${WRKBUILD}/bin/rt.a ${WRKINST}${LIBDIR}
 	${INSTALL_DATA} ${WRKBUILD}/bin/rt.db ${WRKINST}${LIBDIR}
 	${INSTALL_DATA} ${WRKBUILD}/bin/dlrgint.o ${WRKINST}${LIBDIR}
-	cd ${PREFIX}/bin && \
-	    ${WRKSRC}/bin/patchstr ${WRKINST}${LIBDIR}/icont ${TRUEPREFIX}/bin/iconx
-	cd ${PREFIX}/bin && \
-	    ${WRKSRC}/bin/patchstr ${PREFIX}/bin/iconc ${LIBDIR}/
 	if [ x${NO_SHARED_LIBS:L} != "yes" ]; then \
 	    ${INSTALL_DATA_DIR} ${PREFIX}/share/ipl/ucode; \
 	    ${INSTALL_DATA} ${WRKBUILD}/ipl/cfuncs/cfunc.u?  ${PREFIX}/share/ipl/ucode; \
diff --git a/lang/icon/interp/distinfo b/lang/icon/interp/distinfo
index ed034f963fa..65e44400f1a 100644
--- a/lang/icon/interp/distinfo
+++ b/lang/icon/interp/distinfo
@@ -1,4 +1,4 @@
-MD5 (icon.v940src.tgz) = 1e4b77ad34af335d8eb5b64f16f7853a
-RMD160 (icon.v940src.tgz) = 53b897ef3fac808b987f2a4789c8af549cffa4a7
-SHA1 (icon.v940src.tgz) = 8e1a1a13567fdbeb458f284ad313493e1e9aa96b
-SIZE (icon.v940src.tgz) = 3209202
+MD5 (icon.v943src.tgz) = 4740b1fc5caf2fe7409367923dffe607
+RMD160 (icon.v943src.tgz) = af75af7f106920cd59a7f8ac85954aa472ae78e7
+SHA1 (icon.v943src.tgz) = 92bd3347807b333fb903edf61a2805f2e1159577
+SIZE (icon.v943src.tgz) = 3218627
diff --git a/lang/icon/interp/patches/patch-config_bsd_Makedefs b/lang/icon/interp/patches/patch-config_bsd_Makedefs
new file mode 100644
index 00000000000..61561947a26
--- /dev/null
+++ b/lang/icon/interp/patches/patch-config_bsd_Makedefs
@@ -0,0 +1,24 @@
+$OpenBSD: patch-config_bsd_Makedefs,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- config/bsd/Makedefs.orig	Thu Jun 16 17:55:17 2005
++++ config/bsd/Makedefs	Mon Oct 16 10:57:58 2006
+@@ -8,12 +8,14 @@
+ #  XPMDEFS  definitions for building XPM library
+ #  GDIR     directory of graphics helper library
+ 
++X11BASE=/usr/X11R6
++OPTIMIZE=-O2
+ CC = cc
+-CFLAGS = -O -I/usr/X11R6/include
++CFLAGS = $(OPTIMIZE) -I$(X11BASE)/include
+ CFDYN = -fPIC
+-RLINK = -Wl,-E
++RLINK = 
+ RLIBS = -lm
+-TLIBS = -lpthread
+-XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
+-XPMDEFS = -DZPIPE -I/usr/X11R6/include
+-GDIR = xpm
++TLIBS = -pthread
++XLIBS = -L$(X11BASE)/lib -lXpm -lX11
++XPMDEFS = -DZPIPE -I$(X11BASE)/include
++GDIR = 
diff --git a/lang/icon/interp/patches/patch-config_bsd_custom_sh b/lang/icon/interp/patches/patch-config_bsd_custom_sh
new file mode 100644
index 00000000000..4fd289fea5d
--- /dev/null
+++ b/lang/icon/interp/patches/patch-config_bsd_custom_sh
@@ -0,0 +1,14 @@
+$OpenBSD: patch-config_bsd_custom_sh,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- config/bsd/custom.sh.orig	Mon Oct 16 10:35:53 2006
++++ config/bsd/custom.sh	Mon Oct 16 10:37:25 2006
+@@ -0,0 +1,10 @@
++#!/bin/sh
++#
++#  custom setup script for openbsd
++
++SRC=../../../src
++ARCH=`uname -m`
++
++if [ -f define.$ARCH ]; then
++        cat define.$ARCH >>$SRC/h/define.h
++fi
diff --git a/lang/icon/interp/patches/patch-config_bsd_define_h b/lang/icon/interp/patches/patch-config_bsd_define_h
new file mode 100644
index 00000000000..2153deb057c
--- /dev/null
+++ b/lang/icon/interp/patches/patch-config_bsd_define_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-config_bsd_define_h,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- config/bsd/define.h.orig	Mon Oct 16 10:32:47 2006
++++ config/bsd/define.h	Mon Oct 16 10:32:55 2006
+@@ -6,5 +6,5 @@
+ #define LoadFunc
+ 
+ #define CComp "gcc"
+-#define COpts "-O -I/usr/X11R6/include"
+-#define ICONC_XLIB "-Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11"
++#define COpts "-O2 -I/usr/X11R6/include"
++#define ICONC_XLIB "-L/usr/X11R6/lib -lX11"
diff --git a/lang/icon/interp/patches/patch-config_setup_sh b/lang/icon/interp/patches/patch-config_setup_sh
new file mode 100644
index 00000000000..ff923a75ee5
--- /dev/null
+++ b/lang/icon/interp/patches/patch-config_setup_sh
@@ -0,0 +1,24 @@
+$OpenBSD: patch-config_setup_sh,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- config/setup.sh.orig	Sat Dec 20 18:29:00 2003
++++ config/setup.sh	Mon Oct 16 10:59:06 2006
+@@ -12,7 +12,7 @@ SRC=$TOP/src
+ 
+ # check parameters
+ case "$GPX" in
+-   Graphics)	XL='-L../../bin -lIgpx $(XLIBS)';;
++   Graphics)	XL='-L../../bin $(XLIBS)';;
+    NoGraphics)	XL= ;;
+    *)		echo "$USAGE" 1>&2; exit 1;;
+ esac
+@@ -31,10 +31,7 @@ fi
+ # find and copy the context switch code.
+ # use pthreads version if specified, or as a last resort.
+ # first try `uname -p`.[cs] or `uname -m`.[cs] and then rswitch.[cs].
+-ARCH=`uname -p 2>/dev/null || echo unknown`
+-if [ "$ARCH" = "unknown" ]; then
+-   ARCH=`uname -m`
+-fi
++ARCH=`uname -m`
+ if [ "$CSW" = "pthreads" ]; then
+    RSW=pthreads.c
+    COCLEAN="#define CoClean"
diff --git a/lang/icon/interp/patches/patch-config_unix_Makefile b/lang/icon/interp/patches/patch-config_unix_Makefile
deleted file mode 100644
index 17664010281..00000000000
--- a/lang/icon/interp/patches/patch-config_unix_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-config_unix_Makefile,v 1.1 2001/07/03 13:13:13 espie Exp $
---- config/unix/Makefile.orig	Sun Jul  1 13:04:49 2001
-+++ config/unix/Makefile	Sun Jul  1 13:05:05 2001
-@@ -19,7 +19,7 @@ Setup-NoGraphics: Setup-Common
- 
- Setup-Graphics:  Setup-Common
- 	echo '# Graphics enabled'		>> $(TOP)/Makedefs
--	echo 'XL = -L../../bin -lXpm $$(XLIBS)'	>> $(TOP)/Makedefs
-+	echo 'XL = $$(XLLINK)'			>> $(TOP)/Makedefs
- 	echo '#define Graphics 1'		>> $(SRC)/h/define.h
- 
- 
diff --git a/lang/icon/interp/patches/patch-config_unix_openbsd_Makedefs b/lang/icon/interp/patches/patch-config_unix_openbsd_Makedefs
deleted file mode 100644
index 0025f2d5a04..00000000000
--- a/lang/icon/interp/patches/patch-config_unix_openbsd_Makedefs
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-config_unix_openbsd_Makedefs,v 1.1 2001/07/03 13:13:13 espie Exp $
---- config/unix/openbsd/Makedefs.orig	Sat Jun  9 00:59:50 2001
-+++ config/unix/openbsd/Makedefs	Sun Jul  1 13:07:23 2001
-@@ -18,3 +18,5 @@ RLINK =
- RLIBS = -lm
- XLIBS = -L$(X11BASE)/lib -lX11
- XPMDEFS = -DZPIPE -I$(X11BASE)/include
-+XLLINK= $(XLIBS) -lXpm
-+XPM=FORCE
diff --git a/lang/icon/interp/patches/patch-ipl_Makefile b/lang/icon/interp/patches/patch-ipl_Makefile
index 237f56c9c75..cfbafe73db8 100644
--- a/lang/icon/interp/patches/patch-ipl_Makefile
+++ b/lang/icon/interp/patches/patch-ipl_Makefile
@@ -1,15 +1,10 @@
-$OpenBSD: patch-ipl_Makefile,v 1.1 2001/07/03 13:13:13 espie Exp $
---- ipl/Makefile.orig	Sun Jul  1 13:14:58 2001
-+++ ipl/Makefile	Sun Jul  1 13:16:46 2001
-@@ -1,13 +1,17 @@
- #  Makefile for the Icon Program Library
-+include ../Makedefs
+$OpenBSD: patch-ipl_Makefile,v 1.2 2006/10/16 10:01:55 espie Exp $
+--- ipl/Makefile.orig	Fri Jan 10 16:30:01 2003
++++ ipl/Makefile	Mon Oct 16 10:38:51 2006
+@@ -8,9 +8,12 @@ All:	Ilib Ibin
  
- 
- #  Make a library distribution (portable ucode and include files).
- 
- 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
 +	cp incl/*.icn cfuncs/icall.h ../lib
  	cd procs;  LPATH= ../../bin/icont -usc *.icn; mv *.u? ../../lib
@@ -18,6 +13,6 @@ $OpenBSD: patch-ipl_Makefile,v 1.1 2001/07/03 13:13:13 espie Exp $
 +	    cp incl/*.icn gincl/*.icn cfuncs/icall.h ../lib; \
 +	    cd gprocs; LPATH= ../../bin/icont -usc *.icn; mv *.u?  ../../lib; \
 +	fi
- 	cd cfuncs; LPATH= $(MAKE) ICONT=../../bin/icont
- 	mv cfuncs/*.u? ../lib
- 	mv cfuncs/libcfunc.so ../bin
+ 	if grep '^ *# *define LoadFunc' ../src/h/define.h >/dev/null; \
+ 	   then $(MAKE) Cfunctions; fi
+ 
diff --git a/lang/icon/interp/patches/patch-src_common_Makefile b/lang/icon/interp/patches/patch-src_common_Makefile
index 6324b763ba6..4aefa6058a2 100644
--- a/lang/icon/interp/patches/patch-src_common_Makefile
+++ b/lang/icon/interp/patches/patch-src_common_Makefile
@@ -1,18 +1,18 @@
-$OpenBSD: patch-src_common_Makefile,v 1.1 2001/07/03 13:13:13 espie Exp $
---- src/common/Makefile.orig	Sun Jul  1 13:00:31 2001
-+++ src/common/Makefile	Sun Jul  1 13:04:42 2001
+$OpenBSD: patch-src_common_Makefile,v 1.2 2006/10/16 10:01:55 espie Exp $
+--- src/common/Makefile.orig	Sat Jul  5 19:30:35 2003
++++ src/common/Makefile	Mon Oct 16 10:46:36 2006
 @@ -1,3 +1,5 @@
 +XLLINK=-L../../bin -lXpm $(XLIBS)
 +XPM=xpm
  include ../../Makedefs
  
  
-@@ -16,7 +18,7 @@ patchstr:	patchstr.c
- 		cp patchstr ../../bin
+@@ -5,7 +7,7 @@ OBJS =	long.o getopt.o time.o filepart.o
+ 	munix.o literals.o rswitch.o alloc.o long.o getopt.o time.o\
+ 	xwindow.o dlrgint.o ipp.o
  
- xpmaybe:
--		-if [ "x$(XL)" != "x" ]; then $(MAKE) xpm; fi
-+		-if [ "x$(XL)" != "x" ]; then $(MAKE) $(XPM); fi
+-common:		doincl $(OBJS) gpxmaybe
++common:		doincl $(OBJS)
  
- xpm:
- 		cd ../xpm; $(MAKE) libXpm.a
+ doincl:		doincl.c ../h/arch.h
+ 		$(CC) $(CFLAGS) -o doincl doincl.c
diff --git a/lang/icon/interp/patches/patch-src_iconc_ccomp_c b/lang/icon/interp/patches/patch-src_iconc_ccomp_c
new file mode 100644
index 00000000000..009152bb4b5
--- /dev/null
+++ b/lang/icon/interp/patches/patch-src_iconc_ccomp_c
@@ -0,0 +1,23 @@
+$OpenBSD: patch-src_iconc_ccomp_c,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- src/iconc/ccomp.c.orig	Mon Oct 16 10:53:16 2006
++++ src/iconc/ccomp.c	Mon Oct 16 10:54:01 2006
+@@ -75,9 +75,6 @@ char *exename;
+       }
+ 
+ #ifdef Graphics
+-   lib_sz += strlen(" -L") +
+-             strlen(refpath) +
+-	     strlen(" -lIgpx ");
+    lib_sz += strlen(ICONC_XLIB);
+ #endif					/* Graphics */
+ 
+@@ -109,9 +106,6 @@ char *exename;
+       }
+ 
+ #ifdef Graphics
+-   strcpy(s," -L");
+-   strcat(s, refpath);
+-   strcat(s," -lIgpx ");
+    strcat(s, ICONC_XLIB);
+    s += strlen(s);
+ #endif					/* Graphics */
diff --git a/lang/icon/interp/patches/patch-tests_general_Makefile b/lang/icon/interp/patches/patch-tests_general_Makefile
new file mode 100644
index 00000000000..e02a6f4a983
--- /dev/null
+++ b/lang/icon/interp/patches/patch-tests_general_Makefile
@@ -0,0 +1,12 @@
+$OpenBSD: patch-tests_general_Makefile,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- tests/general/Makefile.orig	Mon Oct 16 11:55:42 2006
++++ tests/general/Makefile	Mon Oct 16 11:56:37 2006
+@@ -13,7 +13,7 @@ Test Test-icont:  Test-programs Test-pre
+ # test programs
+ 
+ Programs Programs-icont Test-programs:
+-		IC=icont sh Test-icon
++		-IC=icont sh Test-icon
+ 
+ Samples Samples-icont:
+ 		IC=icont sh Test-icon $(SAMPLES)
diff --git a/lang/icon/interp/patches/patch-tests_general_Test-icon b/lang/icon/interp/patches/patch-tests_general_Test-icon
new file mode 100644
index 00000000000..96dda9dfa66
--- /dev/null
+++ b/lang/icon/interp/patches/patch-tests_general_Test-icon
@@ -0,0 +1,14 @@
+$OpenBSD: patch-tests_general_Test-icon,v 1.1 2006/10/16 10:01:55 espie Exp $
+--- tests/general/Test-icon.orig	Mon Oct 16 11:33:08 2006
++++ tests/general/Test-icon	Mon Oct 16 11:51:37 2006
+@@ -13,6 +13,10 @@ ICONX=../../bin/iconx
+ unset IPATH LPATH FPATH
+ unset BLKSIZE STRSIZE MSTKSIZE COEXPSIZE QLSIZE
+ 
++IPATH=/usr/local/share/ipl/ucode
++export IPATH
++FPATH=/usr/local/lib
++export FPATH
+ # may be needed with Icon is built with BinaryHeader defined
+ export ICONX
+ 
diff --git a/lang/icon/lib/Makefile b/lang/icon/lib/Makefile
index 6e7c46abe5d..9ad050a3ca0 100644
--- a/lang/icon/lib/Makefile
+++ b/lang/icon/lib/Makefile
@@ -1,13 +1,13 @@
 # Icon library port
-# $OpenBSD: Makefile,v 1.18 2002/10/27 14:12:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2006/10/16 10:01:55 espie Exp $
 
 COMMENT=	"useful and interesting programs for Icon"
 
-VERSION=9.4
-DISTNAME=	icon.v940src
+VERSION=9.4.3
+DISTNAME=	icon.v943src
 PKGNAME=	icon-lib-${VERSION}
 #DIST_SUBDIR=icon/${VERSION}
-DISTFILES=	icon.v940src.tgz
+DISTFILES=	icon.v943src.tgz
 
 CATEGORIES=lang
 
@@ -46,10 +46,6 @@ FLAVOR?=
 PATCH_LIST=patch-progs*
 .endif
 
-post-extract:
-	mv ${WRKSRC}/procs/wifisd.icn ${WRKSRC}/gprocs
-	mv ${WRKSRC}/progs/wif2isd.icn ${WRKSRC}/gprogs
-
 do-build:
 # first build library
 	${BUILDENV} cd ${WRKSRC}/procs && icont -usc *.icn
diff --git a/lang/icon/lib/distinfo b/lang/icon/lib/distinfo
index ed034f963fa..65e44400f1a 100644
--- a/lang/icon/lib/distinfo
+++ b/lang/icon/lib/distinfo
@@ -1,4 +1,4 @@
-MD5 (icon.v940src.tgz) = 1e4b77ad34af335d8eb5b64f16f7853a
-RMD160 (icon.v940src.tgz) = 53b897ef3fac808b987f2a4789c8af549cffa4a7
-SHA1 (icon.v940src.tgz) = 8e1a1a13567fdbeb458f284ad313493e1e9aa96b
-SIZE (icon.v940src.tgz) = 3209202
+MD5 (icon.v943src.tgz) = 4740b1fc5caf2fe7409367923dffe607
+RMD160 (icon.v943src.tgz) = af75af7f106920cd59a7f8ac85954aa472ae78e7
+SHA1 (icon.v943src.tgz) = 92bd3347807b333fb903edf61a2805f2e1159577
+SIZE (icon.v943src.tgz) = 3218627
diff --git a/lang/icon/lib/pkg/PFRAG.no-no_x11 b/lang/icon/lib/pkg/PFRAG.no-no_x11
index 5871bfdc785..c1aae3f91d0 100644
--- a/lang/icon/lib/pkg/PFRAG.no-no_x11
+++ b/lang/icon/lib/pkg/PFRAG.no-no_x11
@@ -1,10 +1,12 @@
-@comment $OpenBSD: PFRAG.no-no_x11,v 1.5 2004/09/15 19:16:08 espie Exp $
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.6 2006/10/16 10:01:55 espie Exp $
 bin/vib
 bin/xtiles
 @man man/man6/xtiles.6
 share/ipl/bin/autotile
 share/ipl/bin/binpack
 share/ipl/bin/bitdemo
+share/ipl/bin/blp2grid
+share/ipl/bin/blp2rows
 share/ipl/bin/bme
 share/ipl/bin/bpack
 share/ipl/bin/breakout
@@ -24,6 +26,11 @@ share/ipl/bin/colrpick
 share/ipl/bin/concen
 share/ipl/bin/cquilts
 share/ipl/bin/cw
+share/ipl/bin/dd2draft
+share/ipl/bin/dd2res
+share/ipl/bin/dd2unit
+share/ipl/bin/dd2wif
+share/ipl/bin/ddextend
 share/ipl/bin/design1
 share/ipl/bin/design2
 share/ipl/bin/design3
@@ -47,7 +54,9 @@ share/ipl/bin/fractlin
 share/ipl/bin/fstarlab
 share/ipl/bin/gallery
 share/ipl/bin/gamma
+share/ipl/bin/gif2blp
 share/ipl/bin/gif2isd
+share/ipl/bin/gif2rows
 share/ipl/bin/gif2wif
 share/ipl/bin/gifs2pdb
 share/ipl/bin/giftoims
@@ -69,9 +78,12 @@ share/ipl/bin/imltogif
 share/ipl/bin/ims2pat
 share/ipl/bin/imstogif
 share/ipl/bin/ipicker
+share/ipl/bin/isd2disd
 share/ipl/bin/isd2gif
 share/ipl/bin/isd2grid
 share/ipl/bin/isd2ill
+share/ipl/bin/isd2wif
+share/ipl/bin/isd2xgrid
 share/ipl/bin/iview
 share/ipl/bin/julia1
 share/ipl/bin/kaleid
@@ -94,6 +106,7 @@ share/ipl/bin/orbit
 share/ipl/bin/painterc
 share/ipl/bin/palcheck
 share/ipl/bin/palette
+share/ipl/bin/pat2gif
 share/ipl/bin/patfetch
 share/ipl/bin/penelope
 share/ipl/bin/pextract
@@ -115,6 +128,8 @@ share/ipl/bin/rects
 share/ipl/bin/repeater
 share/ipl/bin/rings
 share/ipl/bin/rolypoly
+share/ipl/bin/rows2blp
+share/ipl/bin/rows2isd
 share/ipl/bin/rstarlab
 share/ipl/bin/scroll
 share/ipl/bin/scroller
@@ -128,6 +143,7 @@ share/ipl/bin/sier1
 share/ipl/bin/sier2
 share/ipl/bin/snapper
 share/ipl/bin/spectra
+share/ipl/bin/spider
 share/ipl/bin/spiral
 share/ipl/bin/spiro
 share/ipl/bin/splat
@@ -142,9 +158,11 @@ share/ipl/bin/textures
 share/ipl/bin/tgdemo
 share/ipl/bin/tilescan
 share/ipl/bin/travels
+share/ipl/bin/trkvu
 share/ipl/bin/trycolor
 share/ipl/bin/tryfont
 share/ipl/bin/uix
+share/ipl/bin/unitgenr
 share/ipl/bin/viewpane
 share/ipl/bin/vqueens
 share/ipl/bin/webimage
@@ -277,6 +295,8 @@ share/ipl/ucode/interact.u1
 share/ipl/ucode/interact.u2
 share/ipl/ucode/isdplot.u1
 share/ipl/ucode/isdplot.u2
+share/ipl/ucode/isdxplot.u1
+share/ipl/ucode/isdxplot.u2
 share/ipl/ucode/joinpair.u1
 share/ipl/ucode/joinpair.u2
 share/ipl/ucode/jolygs.u1
@@ -291,6 +311,8 @@ share/ipl/ucode/lindterp.u1
 share/ipl/ucode/lindterp.u2
 share/ipl/ucode/lsystem.u1
 share/ipl/ucode/lsystem.u2
+share/ipl/ucode/mapnav.u1
+share/ipl/ucode/mapnav.u2
 share/ipl/ucode/mirror.u1
 share/ipl/ucode/mirror.u2
 share/ipl/ucode/modlines.u1
@@ -305,6 +327,8 @@ share/ipl/ucode/overlay.u1
 share/ipl/ucode/overlay.u2
 share/ipl/ucode/palettes.u1
 share/ipl/ucode/palettes.u2
+share/ipl/ucode/pattread.u1
+share/ipl/ucode/pattread.u2
 share/ipl/ucode/patutils.u1
 share/ipl/ucode/patutils.u2
 share/ipl/ucode/patxform.u1
diff --git a/lang/icon/lib/pkg/PLIST b/lang/icon/lib/pkg/PLIST
index dade3461108..4281d9ec834 100644
--- a/lang/icon/lib/pkg/PLIST
+++ b/lang/icon/lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/09/18 12:52:54 espie Exp $
+@comment $OpenBSD: PLIST,v 1.8 2006/10/16 10:01:55 espie Exp $
 @conflict unicon-*
 share/ipl/bin/
 share/ipl/bin/adlcheck
@@ -19,6 +19,7 @@ share/ipl/bin/calc
 share/ipl/bin/catlines
 share/ipl/bin/chars
 share/ipl/bin/chkhtml
+share/ipl/bin/choose
 share/ipl/bin/chop
 share/ipl/bin/colm
 share/ipl/bin/comfiles
@@ -32,10 +33,8 @@ share/ipl/bin/crypt
 share/ipl/bin/csgen
 share/ipl/bin/cstrings
 share/ipl/bin/cwd
+share/ipl/bin/datmerge
 share/ipl/bin/daystil
-share/ipl/bin/dd2draft
-share/ipl/bin/dd2res
-share/ipl/bin/dd2wif
 share/ipl/bin/ddfdump
 share/ipl/bin/deal
 share/ipl/bin/declchck
@@ -137,8 +136,6 @@ share/ipl/bin/ipsplit
 share/ipl/bin/ipxref
 share/ipl/bin/irsort
 share/ipl/bin/irunerr
-share/ipl/bin/isd2disd
-share/ipl/bin/isd2wif
 share/ipl/bin/iseq
 share/ipl/bin/isize
 share/ipl/bin/isrcline
@@ -195,6 +192,7 @@ share/ipl/bin/newicon
 share/ipl/bin/newsrc
 share/ipl/bin/nim
 share/ipl/bin/nocr
+share/ipl/bin/noise
 share/ipl/bin/normalize
 share/ipl/bin/oldicon
 share/ipl/bin/pack
@@ -238,6 +236,7 @@ share/ipl/bin/setmerge
 share/ipl/bin/shar
 share/ipl/bin/shortest
 share/ipl/bin/shuffile
+share/ipl/bin/shuffle
 share/ipl/bin/sing
 share/ipl/bin/slice
 share/ipl/bin/snake
@@ -320,6 +319,8 @@ share/ipl/ucode/bkutil.u1
 share/ipl/ucode/bkutil.u2
 share/ipl/ucode/bold.u1
 share/ipl/ucode/bold.u2
+share/ipl/ucode/boolops.u1
+share/ipl/ucode/boolops.u2
 share/ipl/ucode/bufread.u1
 share/ipl/ucode/bufread.u2
 share/ipl/ucode/calendar.u1
@@ -366,6 +367,8 @@ share/ipl/ucode/dif.u1
 share/ipl/ucode/dif.u2
 share/ipl/ucode/digitcnt.u1
 share/ipl/ucode/digitcnt.u2
+share/ipl/ucode/dijkstra.u1
+share/ipl/ucode/dijkstra.u2
 share/ipl/ucode/divide.u1
 share/ipl/ucode/divide.u2
 share/ipl/ucode/ebcdic.u1
@@ -476,8 +479,6 @@ share/ipl/ucode/iolib.u1
 share/ipl/ucode/iolib.u2
 share/ipl/ucode/iscreen.u1
 share/ipl/ucode/iscreen.u2
-share/ipl/ucode/ispf.u1
-share/ipl/ucode/ispf.u2
 share/ipl/ucode/iterfncs.u1
 share/ipl/ucode/iterfncs.u2
 share/ipl/ucode/itlib.u1
@@ -516,6 +517,8 @@ share/ipl/ucode/lrgapprx.u1
 share/ipl/ucode/lrgapprx.u2
 share/ipl/ucode/lstfncs.u1
 share/ipl/ucode/lstfncs.u2
+share/ipl/ucode/lterps.u1
+share/ipl/ucode/lterps.u2
 share/ipl/ucode/lu.u1
 share/ipl/ucode/lu.u2
 share/ipl/ucode/makelsys.u1
@@ -530,6 +533,8 @@ share/ipl/ucode/math.u1
 share/ipl/ucode/math.u2
 share/ipl/ucode/matrix.u1
 share/ipl/ucode/matrix.u2
+share/ipl/ucode/matrix2.u1
+share/ipl/ucode/matrix2.u2
 share/ipl/ucode/memlog.u1
 share/ipl/ucode/memlog.u2
 share/ipl/ucode/memrfncs.u1
@@ -544,6 +549,8 @@ share/ipl/ucode/mset.u1
 share/ipl/ucode/mset.u2
 share/ipl/ucode/namepfx.u1
 share/ipl/ucode/namepfx.u2
+share/ipl/ucode/nestlist.u1
+share/ipl/ucode/nestlist.u2
 share/ipl/ucode/ngrams.u1
 share/ipl/ucode/ngrams.u2
 share/ipl/ucode/noncase.u1
@@ -590,6 +597,8 @@ share/ipl/ucode/plural.u1
 share/ipl/ucode/plural.u2
 share/ipl/ucode/polynom.u1
 share/ipl/ucode/polynom.u2
+share/ipl/ucode/polyseq.u1
+share/ipl/ucode/polyseq.u2
 share/ipl/ucode/polystuf.u1
 share/ipl/ucode/polystuf.u2
 share/ipl/ucode/popen.u1
@@ -640,8 +649,6 @@ share/ipl/ucode/revadd.u1
 share/ipl/ucode/revadd.u2
 share/ipl/ucode/rewrap.u1
 share/ipl/ucode/rewrap.u2
-share/ipl/ucode/rexx.u1
-share/ipl/ucode/rexx.u2
 share/ipl/ucode/rng.u1
 share/ipl/ucode/rng.u2
 share/ipl/ucode/sandgen.u1