diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 868e2b2bf28..07bb805539d 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.4 1999/07/13 20:37:14 espie Exp $
+# $OpenBSD: Makefile,v 1.5 1999/07/13 20:55:39 espie Exp $
 
-DISTNAME=	icon-9.3.1
+DISTNAME=	icon-9.3.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.arizona.edu:/icon/packages/unix/
 DIST_SUBDIR=	icon
diff --git a/lang/icon/files/md5 b/lang/icon/files/md5
index 4b973647dd9..ebbf0450deb 100644
--- a/lang/icon/files/md5
+++ b/lang/icon/files/md5
@@ -1,3 +1,3 @@
-MD5 (icon/unix.tgz) = 87b8628e24c1e7c14edbe593f46e06e4
-RMD160 (icon/unix.tgz) = 48fdd8e65f7e4b66ef3ac6d723d4ed129c111d2f
-SHA1 (icon/unix.tgz) = 0a9d5c5953352367d599371ee378928f730249cd
+MD5 (icon/unix.tgz) = 3147586808024239962390cfa78a00a8
+RMD160 (icon/unix.tgz) = 13fb301eae467ec1a69b55afce7b88c13a015147
+SHA1 (icon/unix.tgz) = 153c59210b6d2df17a6411ae6ba453210016f565
diff --git a/lang/icon/files/openbsd/rtt.hdr b/lang/icon/files/openbsd/rtt.hdr
index b35769b63be..af28d458b6f 100644
--- a/lang/icon/files/openbsd/rtt.hdr
+++ b/lang/icon/files/openbsd/rtt.hdr
@@ -1,2 +1,2 @@
-CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\"" -O2 -I/usr/include/X11R6
+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\"" -O2 -I/usr/X11R6/include
 SHELL=/bin/sh
diff --git a/lang/icon/files/openbsd/runtime.hdr b/lang/icon/files/openbsd/runtime.hdr
index b654a83545f..5c245bfdf88 100644
--- a/lang/icon/files/openbsd/runtime.hdr
+++ b/lang/icon/files/openbsd/runtime.hdr
@@ -1,2 +1,3 @@
 SHELL=/bin/sh
 CFLAGS+=-I/usr/X11R6/include
+LIBS=-lm
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index d7196963ad8..7e0af6f1dfa 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,14 +1,13 @@
---- src/h/sys.h.orig	Fri Feb 13 15:13:42 1998
-+++ src/h/sys.h	Tue Sep 29 21:56:41 1998
-@@ -291,7 +291,10 @@
- #else					/* VMS */
+--- src/h/sys.h.orig	Thu Jul  1 19:36:34 1999
++++ src/h/sys.h	Tue Jul 13 22:14:22 1999
+@@ -190,7 +190,9 @@
+       #undef VMS
  
- #ifdef HaveXpmFormat
--#include "../xpm/xpm.h"
-+/* kludge !!!! */
-+#undef AMIGA
-+#include <X11/xpm.h>
-+#define AMIGA 0
- #else					/* HaveXpmFormat */
- #include <X11/Xlib.h>
- #endif					/* HaveXpmFormat */
+       #ifdef HaveXpmFormat
+-         #include "../xpm/xpm.h"
++			#undef AMIGA
++         #include <X11/xpm.h>
++			#define AMIGA 0
+       #else				/* HaveXpmFormat */
+          #include <X11/Xlib.h>
+       #endif				/* HaveXpmFormat */
diff --git a/lang/icon_lib/Makefile b/lang/icon_lib/Makefile
index e31575bdc19..609e049dc7a 100644
--- a/lang/icon_lib/Makefile
+++ b/lang/icon_lib/Makefile
@@ -1,7 +1,7 @@
 # Icon library port
-# $OpenBSD: Makefile,v 1.3 1999/04/16 00:03:51 espie Exp $
+# $OpenBSD: Makefile,v 1.4 1999/07/13 20:55:42 espie Exp $
 
-DISTNAME=icon_lib-9.3.1
+DISTNAME=icon_lib-9.3.2
 DIST_SUBDIR=icon
 
 CATEGORIES=lang
@@ -17,7 +17,8 @@ MAINTAINER=espie@openbsd.org
 MASTER_SITES=
 DISTFILES=bipl.tgz gipl.tgz info.tgz
 USE_X11=yes
-WRKSRC=${WRKDIR}
+NO_WRKSUBDIR=yes
+
 
 MASTER_SITES=ftp://ftp.cs.arizona.edu:/icon/library/
 
diff --git a/lang/icon_lib/files/md5 b/lang/icon_lib/files/md5
index 0299d1ec149..af068ad54c8 100644
--- a/lang/icon_lib/files/md5
+++ b/lang/icon_lib/files/md5
@@ -1,9 +1,9 @@
-MD5 (icon/bipl.tgz) = 3abae41cfa110249df72f05cd1cbf33a
-MD5 (icon/gipl.tgz) = fb7e9ffe09178f4f0a7adee6ee327c60
-MD5 (icon/info.tgz) = 44ba8bccde1fad56f791ac0f2fdef928
-RMD160 (icon/bipl.tgz) = 769ece632126c4d18cafd5750501c0a132f94e22
-RMD160 (icon/gipl.tgz) = b26e43aeb46a84f2227a0246404f86d6f67559eb
-RMD160 (icon/info.tgz) = 320171b10239f4ccc82135cc154c5fc8cf73cd9a
-SHA1 (icon/bipl.tgz) = b5719d5646bc99f65b3ca9451dad22d5a015eb76
-SHA1 (icon/gipl.tgz) = 35ef9440e801744a824c6fb0ef86659049ea2e53
-SHA1 (icon/info.tgz) = 87e6ef90268e841c6f01938b9bd58d1ff530de44
+MD5 (icon/bipl.tgz) = 13e3a0659016c88873ec91cae6c89523
+MD5 (icon/gipl.tgz) = 7885db634caa4be7da4a0ea31f804172
+MD5 (icon/info.tgz) = 56e2488e05115bbc0477ae8463fadfd8
+RMD160 (icon/bipl.tgz) = 5850b69524981e94f2b0c41b0b6521f8301c6403
+RMD160 (icon/gipl.tgz) = e933e11c270cb18a1992afeaa0dbff9ad7172a4b
+RMD160 (icon/info.tgz) = 5d2623368ae35d032241335bf544942e50b549a2
+SHA1 (icon/bipl.tgz) = 9acbd21a94764daf5ad7c3ee538aa52143df541c
+SHA1 (icon/gipl.tgz) = 5cb0951e3fdb8e7e6c03ca0f65a5a1d0f83e9386
+SHA1 (icon/info.tgz) = 521eeb2bb0affb32e253753fb91a02374955ad67