summaryrefslogtreecommitdiff
path: root/lang/icon
diff options
context:
space:
mode:
Diffstat (limited to 'lang/icon')
-rw-r--r--lang/icon/Makefile39
-rw-r--r--lang/icon/distinfo92
-rw-r--r--lang/icon/patches/patch-aa15
-rw-r--r--lang/icon/patches/patch-ab46
-rw-r--r--lang/icon/patches/patch-ae (renamed from lang/icon/patches/patch-bc)6
-rw-r--r--lang/icon/patches/patch-af33
-rw-r--r--lang/icon/patches/patch-ag57
-rw-r--r--lang/icon/patches/patch-ah25
-rw-r--r--lang/icon/patches/patch-ai59
-rw-r--r--lang/icon/patches/patch-aj211
-rw-r--r--lang/icon/patches/patch-ak24
-rw-r--r--lang/icon/patches/patch-al19
-rw-r--r--lang/icon/patches/patch-am25
-rw-r--r--lang/icon/patches/patch-an55
-rw-r--r--lang/icon/patches/patch-ao21
-rw-r--r--lang/icon/patches/patch-ap32
-rw-r--r--lang/icon/patches/patch-aq40
-rw-r--r--lang/icon/patches/patch-ar21
-rw-r--r--lang/icon/patches/patch-as17
-rw-r--r--lang/icon/patches/patch-at17
-rw-r--r--lang/icon/patches/patch-au43
-rw-r--r--lang/icon/patches/patch-av17
-rw-r--r--lang/icon/patches/patch-aw42
-rw-r--r--lang/icon/patches/patch-ax27
-rw-r--r--lang/icon/patches/patch-ay34
-rw-r--r--lang/icon/patches/patch-az8
-rw-r--r--lang/icon/patches/patch-ba20
-rw-r--r--lang/icon/patches/patch-bb6
-rw-r--r--lang/icon/patches/patch-bd8
-rw-r--r--lang/icon/patches/patch-be7
-rw-r--r--lang/icon/patches/patch-bf7
-rw-r--r--lang/icon/patches/patch-bg34
-rw-r--r--lang/icon/patches/patch-bh7
-rw-r--r--lang/icon/patches/patch-bi6
-rw-r--r--lang/icon/patches/patch-bj7
-rw-r--r--lang/icon/patches/patch-bk15
-rw-r--r--lang/icon/patches/patch-bl7
-rw-r--r--lang/icon/patches/patch-bm8
-rw-r--r--lang/icon/patches/patch-bn12
-rw-r--r--lang/icon/patches/patch-bo6
-rw-r--r--lang/icon/patches/patch-bp14
-rw-r--r--lang/icon/patches/patch-bq7
-rw-r--r--lang/icon/patches/patch-br34
-rw-r--r--lang/icon/patches/patch-bs8
-rw-r--r--lang/icon/patches/patch-bt13
-rw-r--r--lang/icon/patches/patch-bu13
-rw-r--r--lang/icon/patches/patch-bv13
-rw-r--r--lang/icon/patches/patch-bw16
-rw-r--r--lang/icon/patches/patch-ca56
-rw-r--r--lang/icon/patches/patch-cb7
-rw-r--r--lang/icon/patches/patch-cc14
-rw-r--r--lang/icon/patches/patch-cd6
-rw-r--r--lang/icon/patches/patch-ce12
-rw-r--r--lang/icon/patches/patch-cf8
-rw-r--r--lang/icon/patches/patch-cg7
-rw-r--r--lang/icon/patches/patch-ch15
-rw-r--r--lang/icon/patches/patch-ci44
-rw-r--r--lang/icon/patches/patch-cj7
-rw-r--r--lang/icon/patches/patch-ck6
-rw-r--r--lang/icon/patches/patch-cl7
-rw-r--r--lang/icon/patches/patch-cm33
-rw-r--r--lang/icon/patches/patch-cn7
-rw-r--r--lang/icon/patches/patch-co7
-rw-r--r--lang/icon/patches/patch-cp8
-rw-r--r--lang/icon/patches/patch-cq6
-rw-r--r--lang/icon/pkg/PLIST838
-rw-r--r--lang/icon/scripts/configure6
67 files changed, 1526 insertions, 861 deletions
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index b7ec26de073..c1765d5496d 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 09:07:13 agc Exp $
+# $NetBSD: Makefile,v 1.18 2001/06/25 18:00:16 jtb Exp $
# FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
#
-DISTNAME= unix
-PKGNAME= icon-9.3.2
+DISTNAME= icon.v940src
+PKGNAME= icon-9.4.0
CATEGORIES= lang
MASTER_SITES= http://www.cs.arizona.edu/icon/ftp/packages/unix/
EXTRACT_SUFX= .tgz
@@ -12,12 +12,35 @@ 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
+PLIST_SRC= ${PKGDIR}/PLIST
-DIST_SUBDIR= ${PKGNAME}
-NO_WRKSUBDIR= yes
-ALL_TARGET= Icon Icon-iconc
+.include "../../mk/bsd.prefs.mk"
-MANCOMPRESSED_IF_MANZ= yes
+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:
+ ${MKDIR} ${WRKSRC}/lib/icon
+
+do-configure:
+ cd ${WRKSRC}/config/unix/netbsd; \
+ ${SED} -e 's:@X11BASE@:${X11BASE}:g' define.h.graphics.in
+ > define.h.graphics
+ cd ${WRKSRC}; ${MAKE} ${CONFIGURE_TARGET} name=netbsd
+
+do-install:
+ cd ${WRKSRC}; ${MAKE} dest=${PREFIX} Install
.include "../../mk/bsd.pkg.mk"
+
diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index cb6ae9f73bd..940c861c259 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,65 +1,29 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:51 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/25 18:00:16 jtb Exp $
-SHA1 (icon-9.3.2/unix.tgz) = 153c59210b6d2df17a6411ae6ba453210016f565
-Size (icon-9.3.2/unix.tgz) = 1000579 bytes
-SHA1 (patch-ab) = de7699107d9aac66308778d38263f335f4e556aa
-SHA1 (patch-ac) = 54aec7939f0edb47e94b2982dac8117d59a92067
-SHA1 (patch-ag) = 9ee6da657df994b10e8aa95cd2032e90e0d17455
-SHA1 (patch-ah) = 91534e679a86027ff56c0ba0fdfff40f4aa77cff
-SHA1 (patch-ai) = 5ad3f30b454104cc01e317f9b246fab024020e57
-SHA1 (patch-aj) = b26943934b23347b97bdb98c388ee7259b7da7bf
-SHA1 (patch-ak) = 553f759c0dd8df4ebb89edd3d42c984fbf1ee0ec
-SHA1 (patch-al) = 26514553b5a9bd598f872a53f6d65c5476491c6d
-SHA1 (patch-am) = b995c62b3cdcee98f012896e01c9a354a75736d0
-SHA1 (patch-an) = 0fe16bd62157703f1ad3badf59b47911840638a6
-SHA1 (patch-ao) = 08967ec34868b8a10994221ea4d542994bd7947b
-SHA1 (patch-ap) = 5eb766fa9595d9bafcb4afd4a677c4bd5e52a183
-SHA1 (patch-aq) = 32be5f107b2310842d1f52450ba3b95bda05762c
-SHA1 (patch-ar) = 9bca022a61c6729653a1a799c7484e1b525144b4
-SHA1 (patch-as) = f5f15b6d56020878a8707616943564a66379633f
-SHA1 (patch-at) = db95e23ab1aa032d148eb5970b48ef27fca094d4
-SHA1 (patch-au) = 58d20458a5670e579c1017dba8ae40bc3dfa2e63
-SHA1 (patch-av) = e89cfa9077ad26a849f30ee1d4410bfc08fd907e
-SHA1 (patch-aw) = d6debc40e1e4bde6e16b830e6c07dd2ecc221b99
-SHA1 (patch-ax) = 3611b581cd6133b6acf780a15510524b22574431
-SHA1 (patch-ay) = 215497df73edcc554532df0f710fbaf74286b446
-SHA1 (patch-ba) = 843f82e4b42e3ca702ac49aeb05913affd5d9d86
-SHA1 (patch-bb) = a0dc78da1af675e69959b2a743eef42ac5d05a5d
-SHA1 (patch-bc) = 422627b6c1a121f164147dbabf33a306e39ce01f
-SHA1 (patch-bd) = 88ef031375112f6ba6840799794cddc5e2f74b47
-SHA1 (patch-be) = 3384f6e8a5ba929630f22c5794cd8b337bcf389b
-SHA1 (patch-bf) = 2705ed98c8f818ce0411834c3b3349dd696e0fec
-SHA1 (patch-bg) = 36112d96f122adeb019daa7f15e59249ee33d340
-SHA1 (patch-bh) = 693974f3c2ef7dc489a55ebe55228a9ed5f3bb85
-SHA1 (patch-bi) = 82c1e1caa0d3a51388be2c5b701d7381fa3e571a
-SHA1 (patch-bj) = 121b6329839fdb91292b5aa2a8ec4a5681dcf87d
-SHA1 (patch-bk) = 36e58a0fa9f2fe73cc32915f0d6be067f9a87c70
-SHA1 (patch-bl) = aa4a9aed0b8e18afe46ad1e78cfe20370f7a88d5
-SHA1 (patch-bm) = 3281f6f151e2f9e7787def6395c98157f23bc0f5
-SHA1 (patch-bn) = f880717360ad4b5c4a1ac204dfc249309d6dbc30
-SHA1 (patch-bo) = ba5df6bf53093f00561f48e9424a3bf829a04bf1
-SHA1 (patch-bp) = 5abf6bb04dc9dbbeab23584e113f5afac4b98537
-SHA1 (patch-bq) = 3aaccb4f4c5dccb81e2f77f7c1a4ee8b76287532
-SHA1 (patch-br) = a17d7fb23896ad92188cd49747b0963c9ddcb95d
-SHA1 (patch-bs) = 06a51b115f8d28240e942f75772986cfdd6c81d4
-SHA1 (patch-bt) = 7b74537e1fdb8390b012b8733c22e472043dda38
-SHA1 (patch-bu) = a60537818af54e8c00911aae8f88c9a1f74c7698
-SHA1 (patch-bv) = 10093c4bfd9dcdd768b913e68254fb700fac0647
-SHA1 (patch-bw) = 5a9e3b18bbeda9ac25687c5342d5ab3ddc3c6a01
-SHA1 (patch-ca) = faf1d7d26dab6cfed37e1d9106c129741d39ee47
-SHA1 (patch-cb) = ed71e0ed6d231986e48dcc5efd889200a28daeaf
-SHA1 (patch-cc) = 532020e215898f6b99c22ce1735a54aee7bd68bc
-SHA1 (patch-cd) = 33d4bd72cf7053d12d319ef177ea4dd74d22f6e8
-SHA1 (patch-ce) = 159f7231382faa6dc107a8b04424cc7673c44d20
-SHA1 (patch-cf) = 2898092071e9678822c3cdc58bdd707a3645f083
-SHA1 (patch-cg) = 1a53e9ba7918eb59a5e5543dc73fcc808475df28
-SHA1 (patch-ch) = 7a94c56255d3b88ff47cf52cb45ede1fcc226af2
-SHA1 (patch-ci) = d1ef0b3f0f0b5158757e8c88f174a2deb31aaf43
-SHA1 (patch-cj) = 2f2b1bf629579e1b4860d85c84379bd17b766750
-SHA1 (patch-ck) = b373dadfd9b03531cbba2df8b234095dc25f3914
-SHA1 (patch-cl) = 17cf17feec2647bfadbd30583ef8196b0dda7051
-SHA1 (patch-cm) = c0010871bf15c51800cc4dbd7c5bee23c62a7ba3
-SHA1 (patch-cn) = 6a2188618a7fa1ecde596a8c107804a6ef811530
-SHA1 (patch-co) = 2a904620e95af0029f5b3d0fc54a40b8b3334762
-SHA1 (patch-cp) = 9929ea46e17eb411b36974d5085baf6b1a8a1042
-SHA1 (patch-cq) = c4b3591fd3e059e355748d111804e7a1f412682b
+SHA1 (icon.v940src.tgz) = 8e1a1a13567fdbeb458f284ad313493e1e9aa96b
+Size (icon.v940src.tgz) = 3209202 bytes
+SHA1 (patch-aa) = 77fafa66e144a5654fb086ce53a8e198ca126d6a
+SHA1 (patch-ab) = 097027fec8d879622e6e29556fb39607ad7f3b01
+SHA1 (patch-ae) = f2452d3188e58312c241cb4ad9fc73122c6e8ceb
+SHA1 (patch-af) = 3a67dcfe5d045c68bcd19b2b297cb027a63ac606
+SHA1 (patch-ag) = 3a34e272ff57fe70c4bb5ad08626b7be77967e67
+SHA1 (patch-ah) = 4d04fb330fd6a3436729c087374285f6320f7bf1
+SHA1 (patch-ai) = 37fffe999deb7fd560dda056f2edc1972726fe91
+SHA1 (patch-aj) = ea79925c974c8c36993a16f68b2f366f27f91de4
+SHA1 (patch-ak) = cd66608d05ffc9f953bad63781632c6c416b4bc7
+SHA1 (patch-al) = 3c2b05206fe404ac3987eaac3d35fb91172b580d
+SHA1 (patch-am) = a4e23ccd481508e2b2fb139e4d1d6414b7e243c6
+SHA1 (patch-an) = 0ec847f7ad002a9f471ee4dc8dfa46a8b300983a
+SHA1 (patch-ao) = c6c0b0e524b2274ba3551323da1b6d0f21e37ac4
+SHA1 (patch-ap) = 7da7f2f7f04cfc45f08bb5711f2bb9173a8231d6
+SHA1 (patch-aq) = 07ad177de29dc6498b921c0ede43a4ea36c0815e
+SHA1 (patch-ar) = 6a6fcb68461e1d1a0e0e86f65be610170a4cf890
+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
diff --git a/lang/icon/patches/patch-aa b/lang/icon/patches/patch-aa
new file mode 100644
index 00000000000..5eaed8deb9b
--- /dev/null
+++ b/lang/icon/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.5 2001/06/25 18:00:16 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;;
+ *)
diff --git a/lang/icon/patches/patch-ab b/lang/icon/patches/patch-ab
index 44fca955427..c44ce34ba66 100644
--- a/lang/icon/patches/patch-ab
+++ b/lang/icon/patches/patch-ab
@@ -1,30 +1,22 @@
-$NetBSD: patch-ab,v 1.5 2000/04/05 14:32:53 pooka Exp $
+$NetBSD: patch-ab,v 1.6 2001/06/25 18:00:16 jtb Exp $
---- Makefile.orig Thu Jul 1 20:39:20 1999
-+++ Makefile Wed Apr 5 16:16:27 2000
-@@ -186,6 +186,25 @@
- -cd src; $(MAKE) Clean
- -cd tests; $(MAKE) Clean
-
-+# Install
+--- /dev/null Mon Jun 25 14:19:36 2001
++++ config/unix/netbsd/define.h
+@@ -0,0 +1,17 @@
++/*
++ * Icon configuration file for NetBSD
++ */
+
-+install:
-+ @bin/patchstr bin/iconc ${PREFIX}/share/icon/
-+ @bin/patchstr bin/icont ${PREFIX}/bin/iconx
-+ install -c -s -g wheel -o root -m 755 bin/iconc ${PREFIX}/bin/iconc
-+ install -c -s -g wheel -o root -m 755 bin/icont ${PREFIX}/bin/icont
-+ install -c -s -g wheel -o root -m 755 bin/iconx ${PREFIX}/bin/iconx
-+ install -c -s -g wheel -o root -m 755 bin/patchstr ${PREFIX}/bin/patchstr
-+ @mkdir -p ${PREFIX}/share/icon
-+ install -c -g wheel -o root -m 644 bin/dlrgint.o ${PREFIX}/share/icon/dlrgint.o
-+ install -c -g wheel -o root -m 644 bin/rt.a ${PREFIX}/share/icon/rt.a
-+ install -c -g wheel -o root -m 644 bin/rt.db ${PREFIX}/share/icon/rt.db
-+ install -c -g wheel -o root -m 644 bin/rt.h ${PREFIX}/share/icon/rt.h
-+# @mkdir -p ${PREFIX}/man/man1
-+# install -c -g wheel -o root -m 444 docs/icon.1 ${PREFIX}/man/man1/icon.1
-+# @gzip -9fn ${PREFIX}/man/man1/icon.1
-+# XXX (icon.1 missing from this distribution!)
++#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) */
+
- ##################################################################
- # Entries beyond this point are for use at Arizona only.
- # *** Do not delete the line above; it is used in trimming Makefiles
++#define LoadFunc
++#define SysOpt
++#define ExecImages
++
++#define MaxStatSize 20480
++
++#define CComp "gcc"
++#define COpts "-O2"
diff --git a/lang/icon/patches/patch-bc b/lang/icon/patches/patch-ae
index 2e3206e39ab..fa9b921cfd4 100644
--- a/lang/icon/patches/patch-bc
+++ b/lang/icon/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.2 1998/08/07 11:09:11 agc Exp $
+$NetBSD: patch-ae,v 1.4 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/rswitch.s Fri Jun 19 02:47:53 1998
+--- /dev/null Sat Jun 23 16:44:46 2001
++++ config/unix/netbsd/rswitch.alpha
@@ -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
new file mode 100644
index 00000000000..9b471ed299e
--- /dev/null
+++ b/lang/icon/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.5 2001/06/25 18:00:16 jtb Exp $
+
+--- /dev/null Sat Jun 23 16:44:55 2001
++++ config/unix/netbsd/rswitch.i386
+@@ -0,0 +1,28 @@
++/*
++ * This is the co-expression context switch for the Intel 80386
++ * under Microport Unix System V/386
++ */
++
++/*
++ * coswitch
++ */
++
++coswitch(old_cs, new_cs, first)
++int *old_cs, *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("interp() 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
index 5a0e9948301..6c116d0b35f 100644
--- a/lang/icon/patches/patch-ag
+++ b/lang/icon/patches/patch-ag
@@ -1,15 +1,44 @@
-$NetBSD: patch-ag,v 1.2 1998/08/07 11:09:05 agc Exp $
+$NetBSD: patch-ag,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/common.hdr Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,10 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
-+RSWITCH=rswitch.c
+--- /dev/null Sat Jun 23 16:45:07 2001
++++ config/unix/netbsd/rswitch.sparc
+@@ -0,0 +1,39 @@
++/*
++ * coswitch for Sun-4 Sparc.
++ *
++ * Compile this with 'cc -c rswitch.c'. Do not use cc -O.
++ */
++
++/* #include <sys/asm_linkage.h> */
++/*#include <sys/trap.h>*/
++
++int coswitch(old_cs, new_cs, first)
++int *old_cs, *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
index c09bbc10c27..ccc4519e5d2 100644
--- a/lang/icon/patches/patch-ah
+++ b/lang/icon/patches/patch-ah
@@ -1,8 +1,19 @@
-$NetBSD: patch-ah,v 1.2 1998/08/07 11:09:05 agc Exp $
+$NetBSD: patch-ah,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/copybin.c Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,3 @@
-+#include "../../../src/h/define.h"
-+#include "paths.h"
-+#include "../Generic/copybin.h"
+--- /dev/null Mon Jun 25 14:20:12 2001
++++ config/unix/netbsd/Makedefs
+@@ -0,0 +1,14 @@
++# Makefile definitions from config/unix/intel_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
diff --git a/lang/icon/patches/patch-ai b/lang/icon/patches/patch-ai
index df0563b5817..a1cf36395bc 100644
--- a/lang/icon/patches/patch-ai
+++ b/lang/icon/patches/patch-ai
@@ -1,27 +1,34 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 11:09:06 agc Exp $
+$NetBSD: patch-ai,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/define.h Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,22 @@
-+#define Standard
-+#define IconGcvt
-+#define index strchr
-+#define rindex strrchr
-+#define GetHost
-+#define Hz 100
-+#define MaxHdr 13400
-+#define MaxStatSize 20480
-+
-+#define GenericBSD
-+#define BSD_4_4_LITE 1 /* This is new, for 4.4Lite specific stuff */
-+#define UNIX 1
-+#define LoadFunc
-+#define ExecImages
-+
-+#define KeyboardFncs
-+#define HaveTioc
-+#define USE_OLD_TTY
-+#define AllowConst
-+#define SysOpt
-+#define CComp "gcc"
-+#define COpts "-O2"
+--- /dev/null Mon Jun 25 15:36:24 2001
++++ config/unix/netbsd/status
+@@ -0,0 +1,29 @@
++System configuration:
++
++ NetBSD Alpha, SPARC, or i386
++
++Latest Icon version:
++
++ Version 9.4.0
++
++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)
++
++Missing features:
++
++ None
++
++Known bugs:
++
++ None
++
++Comments:
++
++ None
++
++Date:
++
++ June 25, 2001
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index 42b3fe957fb..0dbeb887ca9 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,7 +1,206 @@
-$NetBSD: patch-aj,v 1.2 1998/08/07 11:09:06 agc Exp $
+$NetBSD: patch-aj,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/icon_pi.c Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/icon_pi.h"
+--- Makefile.orig Mon Jun 11 18:04:42 2001
++++ Makefile
+@@ -14,7 +14,7 @@
+ #
+ # Default targets.
+
+-All: Icont Ilib Ibin
++All: Icont Iconc Ilib Ibin
+
+ config/unix/$(name)/status src/h/define.h:
+ :
+@@ -97,20 +97,180 @@
+
+ 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
+- cp README $D
+- cp bin/[a-qs-z]* $D/bin
+- rm -f $D/bin/libXpm*
+- 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/
++ cd bin; $(BSD_INSTALL_PROGRAM) icont iconx iconc \
++ patchstr rtt $D/bin
++ $(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 \
++ wevents xgamma; do \
++ if [ -f bin/$$f ]; then \
++ ${BSD_INSTALL_SCRIPT} bin/$$f $D/bin; \
++ fi; \
++ done
++ $(BSD_INSTALL_DATA) doc/*.* $D/share/doc/icon
++ $(BSD_INSTALL_MAN) man/man1/icont.1 $D/man/man1
++
++
++# Bundle up for binary distribution.
++
++DIR=icon.$(VERSION)
++Package:
++ rm -rf $(DIR)
++ umask 002; $(MAKE) Install dest=$(DIR)
++ tar cf - icon.$(VERSION) | gzip -9 >icon.$(VERSION).tgz
++ rm -rf $(DIR)
++
++
++##################################################################
++#
++# Tests.
++
++Test Test-icont: ; cd tests; $(MAKE) Test
++Samples Samples-icont: ; cd tests; $(MAKE) Samples
++
++Test-iconc: ; cd tests; $(MAKE) Test-iconc
++Samples-iconc: ; cd tests; $(MAKE) Samples-iconc
+
+
++#################################################################
++#
++# Run benchmarks.
++
++Benchmark:
++ $(MAKE) Benchmark-icont
++
++Benchmark-iconc:
++ cd tests/bench; $(MAKE) benchmark-iconc
++
++Benchmark-icont:
++ cd tests/bench; $(MAKE) benchmark-icont
++
++
++##################################################################
++#
++# Cleanup.
++#
++# "make Clean" removes intermediate files, leaving executables and library.
++# "make Pure" also removes binaries, library, and configured files.
++
++Clean:
++ touch Makedefs
++ rm -rf icon.*
++ cd src; $(MAKE) Clean
++ cd ipl; $(MAKE) Clean
++ cd tests; $(MAKE) Clean
++
++Pure:
++ touch Makedefs
++ rm -rf icon.* bin/[a-z]* lib/[a-z]*
++ cd ipl; $(MAKE) Pure
++ cd src; $(MAKE) Pure
++ cd tests; $(MAKE) Pure
++ cd config/unix; $(MAKE) Pure
++
++
++
++# (This is used at Arizona to prepare source distributions.)
++
++Dist-Clean:
++ rm -rf `find * -type d -name CVS`
++ rm -f `find * -type f | xargs grep -l '<<ARIZONA-[O]NLY>>'`
++# Makefile for Version 9.4 of Icon
++#
++# Things have changed since Version 9.3.
++# See doc/install.htm for instructions.
++
++
++# configuration parameters
++VERSION=v940
++name=unspecified
++dest=/must/specify/dest/
++
++
++##################################################################
++#
++# Default targets.
++
++All: Icont Ilib Ibin
++
++config/unix/$(name)/status src/h/define.h:
++ :
++ : To configure Icon, run either
++ :
++ : make Configure name=xxxx [for no graphics]
++ : or make X-Configure name=xxxx [with X-Windows graphics]
++ :
++ : where xxxx is one of
++ :
++ @cd config/unix; ls -d [a-z]*
++ :
++ @exit 1
++
++
++##################################################################
++#
++# Code configuration.
++
++
++# Configure the code for a specific system.
++
++Configure: config/unix/$(name)/status
++ $(MAKE) Pure >/dev/null
++ cd config/unix; $(MAKE) Setup-NoGraphics name=$(name)
++
++X-Configure: config/unix/$(name)/status
++ $(MAKE) Pure >/dev/null
++ cd config/unix; $(MAKE) Setup-Graphics name=$(name)
++
++
++# Get the status information for a specific system.
++
++Status:
++ @cat config/unix/$(name)/status
++
++
++##################################################################
++#
++# Compilation.
++
++
++# The interpreter: icont and iconx.
++
++Icont bin/icont: Common
++ cd src/icont; $(MAKE)
++ cd src/runtime; $(MAKE)
++
++
++# The compiler: rtt, the run-time system, and iconc.
++# (NO LONGER SUPPORTED OR MAINTAINED.)
++
++Iconc bin/iconc: Common
++ cd src/runtime; $(MAKE) comp_all
++ cd src/iconc; $(MAKE)
++
++
++# Common components.
++
++Common: src/h/define.h
++ cd src/common; $(MAKE)
++ cd src/rtt; $(MAKE)
++
++
++# The Icon program library.
++
++Ilib: bin/icont
++ cd ipl; $(MAKE)
++
++Ibin: bin/icont
++ cd ipl; $(MAKE) Ibin
++
++
++##################################################################
++#
++# Installation and packaging.
+ # Bundle up for binary distribution.
+
+ DIR=icon.$(VERSION)
diff --git a/lang/icon/patches/patch-ak b/lang/icon/patches/patch-ak
index abbdd8857f4..3dac9daa4b2 100644
--- a/lang/icon/patches/patch-ak
+++ b/lang/icon/patches/patch-ak
@@ -1,14 +1,12 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 11:09:06 agc Exp $
+$NetBSD: patch-ak,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/iconc.hdr Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,9 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
+--- src/icont/tunix.c.orig Sat Jun 23 20:08:38 2001
++++ src/icont/tunix.c
+@@ -247,6 +247,6 @@
+ else
+ strcpy(buf, ".");
+ strcat(buf, ":");
+- strcat(buf, relfile(prog, "/../../lib"));
++ strcat(buf, relfile(prog, "/../../lib/icon"));
+ return salloc(buf);
+ }
diff --git a/lang/icon/patches/patch-al b/lang/icon/patches/patch-al
index c11ce8c32f9..245ab31cccb 100644
--- a/lang/icon/patches/patch-al
+++ b/lang/icon/patches/patch-al
@@ -1,6 +1,15 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-al,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/icont.hdr Wed Oct 1 17:32:26 1997
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
+--- ipl/BuildBin.orig Sat Jun 23 20:09:56 2001
++++ ipl/BuildBin
+@@ -15,8 +15,8 @@
+ TOP=`cd ..; pwd`
+ BIN=$TOP/bin
+ PATH=$BIN:$PATH
+-IPATH=$TOP/lib
+-LPATH=$TOP/lib
++IPATH=$TOP/lib/icon
++LPATH=$TOP/lib/icon
+ export PATH IPATH LPATH
+
+ # Always build progs
diff --git a/lang/icon/patches/patch-am b/lang/icon/patches/patch-am
index f699cc3c579..86dc3631fa1 100644
--- a/lang/icon/patches/patch-am
+++ b/lang/icon/patches/patch-am
@@ -1,12 +1,15 @@
-$NetBSD: patch-am,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-am,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/iconx.hdr Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,7 @@
-+SHELL=/bin/sh
-+# the seek stuff is defined in a header file that they don't
-+# include. This is the easiest. -Dconst= causes const to
-+# be ignored. This is needed because otherwise we get complaints
-+# due to stdio.h defining some functions with const when they
-+# are not defined that way in Icon's header files
-+RSWITCH=rswitch.c
+--- ipl/BuildExe.orig Sat Jun 23 20:10:50 2001
++++ ipl/BuildExe
+@@ -10,8 +10,8 @@
+ # Set minimal path needed. Not all systems have all these directories
+ TOP=`cd ..; pwd`
+ 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 LPATH=$TOP/lib/icon
+
+ # Use default Icon options for packages that include an Icon execution
+ unset BLKSIZE STRSIZE MSTKSIZE COEXPSIZE TRACE NOERRBUF FPATH
diff --git a/lang/icon/patches/patch-an b/lang/icon/patches/patch-an
index b5672f999f7..ca6b9e47f92 100644
--- a/lang/icon/patches/patch-an
+++ b/lang/icon/patches/patch-an
@@ -1,8 +1,49 @@
-$NetBSD: patch-an,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-an,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/paths.h Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,3 @@
-+#define RootPath "/usr/local"
-+#define IcontPath "/usr/local/lib/icon/icont"
-+#define IconxPath "/usr/local/lib/icon/iconx"
+--- ipl/Makefile.orig Fri Jun 8 19:48:36 2001
++++ ipl/Makefile
+@@ -5,16 +5,16 @@
+
+ Ilib: ../bin/libcfunc.so
+ ../bin/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
+ 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
+
+
+ # Make selected program binaries (platform-dependent icode) for ../bin,
+-# given that ../lib is ready
++# given that ../lib/icon is ready
+
+ Ibin: ../bin/ipatch
+ ../bin/ipatch: ../bin/icont
+@@ -22,18 +22,18 @@
+
+
+ # Make a full set of program binaries (not usually done) in ./iexe,
+-# given that ../lib is ready
++# given that ../lib/icon is ready
+
+ Iexe:
+ rm -f iexe/*
+ MAKE=$(MAKE) ./BuildExe
+
+
+-# Check for undefined identifiers in ../lib.
++# Check for undefined identifiers in ../lib/icon.
+ # (A few are expected: references to Mp, program, init, goal).
+
+ Undef:
+- cd ../lib; for f in *.u2; do (echo $$f; icont -us -fs $$f); done
++ cd ../lib/icon; for f in *.u2; do (echo $$f; icont -us -fs $$f); done
+
+
+ # Check for stray files
diff --git a/lang/icon/patches/patch-ao b/lang/icon/patches/patch-ao
index 6c0c7cf0cfb..1665bcd8374 100644
--- a/lang/icon/patches/patch-ao
+++ b/lang/icon/patches/patch-ao
@@ -1,7 +1,16 @@
-$NetBSD: patch-ao,v 1.2 1998/08/07 11:09:07 agc Exp $
+$NetBSD: patch-ao,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/pi.hdr Wed Oct 1 17:32:26 1997
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+=-DPersInterp
+--- 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
index ed39bae072c..ef18408ed93 100644
--- a/lang/icon/patches/patch-ap
+++ b/lang/icon/patches/patch-ap
@@ -1,15 +1,21 @@
-$NetBSD: patch-ap,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-ap,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/preproc.hdr Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,10 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
+--- /dev/null Sun Jun 24 10:50:03 2001
++++ config/unix/netbsd/custom.sh
+@@ -0,0 +1,16 @@
++#!/bin/sh
+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CC=cc
-+CFLAGS+= -O -D$D
-+SHELL=/bin/sh
++# custom setup script for netbsd
++
++SRC=../../../src
++ARCH=`uname -m`
++
++if [ -f rswitch.$ARCH ]; then
++ cp -f rswitch.$ARCH $SRC/common/rswitch.c
++else
++ echo "#define NoCoexpr" >>$SRC/h/define.h
++fi
++
++if [ -f define.$ARCH ]; then
++ cat define.$ARCH >>$SRC/h/define.h
++fi
diff --git a/lang/icon/patches/patch-aq b/lang/icon/patches/patch-aq
index b748dafae76..8e05b0bc685 100644
--- a/lang/icon/patches/patch-aq
+++ b/lang/icon/patches/patch-aq
@@ -1,33 +1,9 @@
-$NetBSD: patch-aq,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-aq,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/rswitch.c Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,28 @@
-+/*
-+ * This is the co-expression context switch for the Intel 80386
-+ * under Microport Unix System V/386
-+ */
-+
-+/*
-+ * coswitch
-+ */
-+
-+coswitch(old_cs, new_cs, first)
-+int *old_cs, *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("interp() returned in coswitch");
-+ }
-+ else {
-+ asm(" movl 0(%eax),%esp");
-+ asm(" movl 4(%eax),%ebp");
-+ }
-+ }
+--- /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
index da41c957132..1840fe9a23d 100644
--- a/lang/icon/patches/patch-ar
+++ b/lang/icon/patches/patch-ar
@@ -1,7 +1,16 @@
-$NetBSD: patch-ar,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-ar,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/rtt.hdr Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
-+SHELL=/bin/sh
+--- /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-as b/lang/icon/patches/patch-as
index 006dffeede8..54ce079bf1f 100644
--- a/lang/icon/patches/patch-as
+++ b/lang/icon/patches/patch-as
@@ -1,6 +1,13 @@
-$NetBSD: patch-as,v 1.2 1998/08/07 11:09:08 agc Exp $
+$NetBSD: patch-as,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/runtime.hdr Wed Oct 1 17:32:25 1997
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
+--- src/runtime/imain.r.orig Mon Jun 25 10:58:18 2001
++++ 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);
+ }
diff --git a/lang/icon/patches/patch-at b/lang/icon/patches/patch-at
index 4707dc23b86..c1f36ba8274 100644
--- a/lang/icon/patches/patch-at
+++ b/lang/icon/patches/patch-at
@@ -1,7 +1,12 @@
-$NetBSD: patch-at,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-at,v 1.3 2001/06/25 18:00:16 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/setpath.c Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/setpath.h"
+--- src/rtt/Makefile.orig Tue May 29 23:43:05 2001
++++ src/rtt/Makefile
+@@ -24,7 +24,6 @@
+ rtt: $(OBJ)
+ $(CC) $(LDFLAGS) -o rtt $(OBJ)
+ cp rtt ../../bin
+- strip ../../bin/rtt
+
+ library: $(OBJ)
+ rm -rf rtt.a
diff --git a/lang/icon/patches/patch-au b/lang/icon/patches/patch-au
index fd982cd3191..f7d768f4607 100644
--- a/lang/icon/patches/patch-au
+++ b/lang/icon/patches/patch-au
@@ -1,33 +1,12 @@
-$NetBSD: patch-au,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-au,v 1.3 2001/06/25 18:00:17 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/status Wed Oct 1 17:36:09 1997
-@@ -0,0 +1,28 @@
-+System configuration:
-+
-+ Intel 486-type processor or better running BSD 4.4.lite derivative
-+
-+Latest Icon version:
-+
-+ Version 9.3
-+
-+Installer:
-+
-+ Alistair G. Crooks
-+ <agc@netbsd.org>
-+
-+Missing features:
-+
-+ None.
-+
-+Known bugs:
-+
-+ None.
-+
-+Comments:
-+
-+ None.
-+
-+Date:
-+
-+ Wed Oct 1 17:36:04 BST 1997
+--- src/iconc/Makefile.orig Wed Jun 6 20:14:38 2001
++++ src/iconc/Makefile
+@@ -20,7 +20,6 @@
+ iconc: $(OBJS) $(COBJS)
+ $(CC) -o iconc $(OBJS) $(COBJS)
+ cp iconc ../../bin
+- strip ../../bin/iconc
+
+ $(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 \
diff --git a/lang/icon/patches/patch-av b/lang/icon/patches/patch-av
index 8da2361d12a..071abfa7001 100644
--- a/lang/icon/patches/patch-av
+++ b/lang/icon/patches/patch-av
@@ -1,7 +1,12 @@
-$NetBSD: patch-av,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-av,v 1.3 2001/06/25 18:00:17 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/vt.hdr Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
+--- src/icont/Makefile.orig Wed Jun 6 20:14:41 2001
++++ src/icont/Makefile
+@@ -21,7 +21,6 @@
+ icont: $(OBJS) $(COBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS)
+ cp icont ../../bin
+- strip ../../bin/icont
+
+ $(OBJS): $(HFILES) tproto.h
+
diff --git a/lang/icon/patches/patch-aw b/lang/icon/patches/patch-aw
index 30443a6ac27..3f7ed57976c 100644
--- a/lang/icon/patches/patch-aw
+++ b/lang/icon/patches/patch-aw
@@ -1,7 +1,37 @@
-$NetBSD: patch-aw,v 1.2 1998/08/07 11:09:09 agc Exp $
+$NetBSD: patch-aw,v 1.3 2001/06/25 18:00:17 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/vtran.hdr Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
+--- src/common/Makefile.orig Thu Jun 7 16:20:54 2001
++++ src/common/Makefile
+@@ -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
+
+-common: doincl patchstr $(OBJS) xpmaybe
++common: doincl patchstr $(OBJS) headers xpmaybe
+
+ doincl: doincl.c
+ $(CC) $(CFLAGS) -o doincl doincl.c
+@@ -15,12 +15,22 @@
+ $(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; \
++ done
++
+ xpmaybe:
+ -if [ "x$(XL)" != "x" ]; then $(MAKE) xpm; fi
+
+ xpm:
+ 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; \
++ done
+
+ $(OBJS): ../h/define.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 17b945bda37..178e9506775 100644
--- a/lang/icon/patches/patch-ax
+++ b/lang/icon/patches/patch-ax
@@ -1,8 +1,21 @@
-$NetBSD: patch-ax,v 1.2 1998/08/07 11:09:10 agc Exp $
+$NetBSD: patch-ax,v 1.3 2001/06/25 18:00:17 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/xiconx.mak Wed Oct 1 17:32:25 1997
-@@ -0,0 +1,3 @@
-+# If you define EventMon, add the -lgmon below to get profil(2) under Linux
-+#XLIB= -lX11 -lgmon
-+XLIB= -L/usr/X11R6/lib -lX11
+--- src/runtime/Makefile.orig Mon Jun 25 13:54:05 2001
++++ src/runtime/Makefile
+@@ -41,7 +41,6 @@
+ cd ../common; $(MAKE)
+ $(CC) $(RLINK) -o iconx $(OBJS) $(XL) $(RLIBS)
+ cp iconx ../../bin
+- strip ../../bin/iconx
+
+ xcnv.o: cnv.r $(HDRS)
+ ../../bin/rtt -x cnv.r
+@@ -311,7 +310,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
+
+ cnv.o: cnv.r $(HDRS)
+ ../../bin/rtt cnv.r
diff --git a/lang/icon/patches/patch-ay b/lang/icon/patches/patch-ay
index 6a0c9b15bf5..d3ac269baad 100644
--- a/lang/icon/patches/patch-ay
+++ b/lang/icon/patches/patch-ay
@@ -1,28 +1,8 @@
-$NetBSD: patch-ay,v 1.3 2000/06/19 15:56:28 pooka Exp $
+$NetBSD: patch-ay,v 1.4 2001/06/25 18:00:17 jtb Exp $
---- /dev/null Wed Oct 1 17:23:30 1997
-+++ config/unix/intel_netbsd/xpm.hdr Wed Oct 1 17:32:26 1997
-@@ -0,0 +1 @@
-+DEFINES= -DZPIPE
---- src/common/save.c 1997/10/02 07:49:07 1.1
-+++ src/common/save.c 1997/10/02 08:00:57
-@@ -79,6 +79,7 @@
- */
-
- #ifdef GenericBSD
-+#include <sys/param.h>
- #include <a.out.h>
- wrtexec(ef)
- int ef;
-@@ -91,7 +92,11 @@
- * Construct the header. The text and data region sizes must be multiples
- * of 1024.
- */
-+#ifdef __NetBSD__
-+ N_SETMAGIC(hdr, ZMAGIC, MID_MACHINE, EX_DYNAMIC);
-+#else
- hdr.a_magic = ZMAGIC;
-+#endif
- tsize = (int)&etext;
- hdr.a_text = (tsize + 1024) & ~(1024-1);
- dsize = sbrk(0) - (int)&environ;
+--- /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
new file mode 100644
index 00000000000..30bd4b99e66
--- /dev/null
+++ b/lang/icon/patches/patch-az
@@ -0,0 +1,8 @@
+$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
index c436262f210..fbe318a1fd7 100644
--- a/lang/icon/patches/patch-ba
+++ b/lang/icon/patches/patch-ba
@@ -1,15 +1,7 @@
-$NetBSD: patch-ba,v 1.2 1998/08/07 11:09:11 agc Exp $
+$NetBSD: patch-ba,v 1.3 2001/06/25 18:00:17 jtb Exp $
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/common.hdr Fri Jun 19 02:48:05 1998
-@@ -0,0 +1,10 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
-+RSWITCH=rswitch.s
+--- /dev/null Mon Jun 25 15:27:11 2001
++++ config/unix/netbsd/define.h.sparc
+@@ -0,0 +1,2 @@
++#define Double
++#define StackAlign 8
diff --git a/lang/icon/patches/patch-bb b/lang/icon/patches/patch-bb
deleted file mode 100644
index f3a4114a82c..00000000000
--- a/lang/icon/patches/patch-bb
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1998/08/07 11:09:11 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/xpm.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1 @@
-+DEFINES= -DZPIPE
diff --git a/lang/icon/patches/patch-bd b/lang/icon/patches/patch-bd
deleted file mode 100644
index 086d79a92f9..00000000000
--- a/lang/icon/patches/patch-bd
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-bd,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/xiconx.mak Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,3 @@
-+# If you define EventMon, add the -lgmon below to get profil(2) under Linux
-+#XLIB= -lX11 -lgmon
-+XLIB= -L/usr/X11R6/lib -lX11
diff --git a/lang/icon/patches/patch-be b/lang/icon/patches/patch-be
deleted file mode 100644
index fa2000627d6..00000000000
--- a/lang/icon/patches/patch-be
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-be,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/vtran.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-bf b/lang/icon/patches/patch-bf
deleted file mode 100644
index 563f21e3311..00000000000
--- a/lang/icon/patches/patch-bf
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bf,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/vt.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-bg b/lang/icon/patches/patch-bg
deleted file mode 100644
index 76b9a18e467..00000000000
--- a/lang/icon/patches/patch-bg
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-bg,v 1.2 1998/08/07 11:09:12 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/status Fri Jun 19 02:46:17 1998
-@@ -0,0 +1,28 @@
-+System configuration:
-+
-+ Alpha 21064 processor or better running NetBSD
-+
-+Latest Icon version:
-+
-+ Version 9.3.1
-+
-+Installer:
-+
-+ Tim Rightnour
-+ root@garbled.net
-+
-+Missing features:
-+
-+ None.
-+
-+Known bugs:
-+
-+ None.
-+
-+Comments:
-+
-+ Most of this was taken directly from dec_osf and intel_netbsd.
-+ The same errata that applies to the dec_osf version applies here.
-+
-+Date:
-+
-+ Fri Jun 19 02:46:07 MST 1998
diff --git a/lang/icon/patches/patch-bh b/lang/icon/patches/patch-bh
deleted file mode 100644
index 716b8138e41..00000000000
--- a/lang/icon/patches/patch-bh
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bh,v 1.2 1998/08/07 11:09:13 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/setpath.c Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/setpath.h"
diff --git a/lang/icon/patches/patch-bi b/lang/icon/patches/patch-bi
deleted file mode 100644
index 5a2ecd738d7..00000000000
--- a/lang/icon/patches/patch-bi
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-bi,v 1.2 1998/08/07 11:09:13 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/runtime.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bj b/lang/icon/patches/patch-bj
deleted file mode 100644
index c88cc563fb1..00000000000
--- a/lang/icon/patches/patch-bj
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bj,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/rtt.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bk b/lang/icon/patches/patch-bk
deleted file mode 100644
index da5d9fa9eb0..00000000000
--- a/lang/icon/patches/patch-bk
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bk,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/preproc.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,10 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CC=cc
-+CFLAGS+= -O -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bl b/lang/icon/patches/patch-bl
deleted file mode 100644
index 1af14c2d997..00000000000
--- a/lang/icon/patches/patch-bl
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bl,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/pi.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+=-DPersInterp
diff --git a/lang/icon/patches/patch-bm b/lang/icon/patches/patch-bm
deleted file mode 100644
index 42eb68e5646..00000000000
--- a/lang/icon/patches/patch-bm
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-bm,v 1.2 1998/08/07 11:09:14 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/paths.h Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,3 @@
-+#define RootPath "/usr/local"
-+#define IcontPath "/usr/local/lib/icon/icont"
-+#define IconxPath "/usr/local/lib/icon/iconx"
diff --git a/lang/icon/patches/patch-bn b/lang/icon/patches/patch-bn
deleted file mode 100644
index bc073ebcb60..00000000000
--- a/lang/icon/patches/patch-bn
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bn,v 1.2 1998/08/07 11:09:15 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/iconx.hdr Fri Jun 19 02:48:20 1998
-@@ -0,0 +1,7 @@
-+SHELL=/bin/sh
-+# the seek stuff is defined in a header file that they don't
-+# include. This is the easiest. -Dconst= causes const to
-+# be ignored. This is needed because otherwise we get complaints
-+# due to stdio.h defining some functions with const when they
-+# are not defined that way in Icon's header files
-+RSWITCH=rswitch.s
diff --git a/lang/icon/patches/patch-bo b/lang/icon/patches/patch-bo
deleted file mode 100644
index 04c1ff33543..00000000000
--- a/lang/icon/patches/patch-bo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-bo,v 1.2 1998/08/07 11:09:15 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/icont.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bp b/lang/icon/patches/patch-bp
deleted file mode 100644
index 1f29a29b5ac..00000000000
--- a/lang/icon/patches/patch-bp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bp,v 1.2 1998/08/07 11:09:15 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/iconc.hdr Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,9 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-bq b/lang/icon/patches/patch-bq
deleted file mode 100644
index 97fed6fb8cf..00000000000
--- a/lang/icon/patches/patch-bq
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-bq,v 1.2 1998/08/07 11:09:16 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/icon_pi.c Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/icon_pi.h"
diff --git a/lang/icon/patches/patch-br b/lang/icon/patches/patch-br
deleted file mode 100644
index 16d41191040..00000000000
--- a/lang/icon/patches/patch-br
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-br,v 1.2 1998/08/07 11:09:16 agc Exp $
-
---- /dev/null Fri Jun 19 03:24:28 1998
-+++ config/unix/alpha_netbsd/define.h Fri Jun 19 05:00:47 1998
-@@ -0,0 +1,28 @@
-+#define Standard
-+#define IconGcvt
-+#define index strchr
-+#define rindex strrchr
-+#define GetHost
-+#define MaxHdr 13400
-+#define MaxStatSize 20480
-+
-+#define GenericBSD
-+#define BSD_4_4_LITE 1 /* This is new, for 4.4Lite specific stuff */
-+#define UNIX 1
-+#define LoadFunc
-+#define ExecImages
-+
-+#define KeyboardFncs
-+#define HaveTioc
-+#define USE_OLD_TTY
-+#define AllowConst
-+#define SysOpt
-+#define CComp "gcc"
-+#define COpts "-O2"
-+
-+/* CPU architecture */
-+#define IntBits 32
-+#define WordBits 64
-+#define Double
-+#define StackAlign 8
-+#define Hz 1024
-
diff --git a/lang/icon/patches/patch-bs b/lang/icon/patches/patch-bs
deleted file mode 100644
index f69287be26c..00000000000
--- a/lang/icon/patches/patch-bs
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-bs,v 1.2 1998/08/07 11:09:16 agc Exp $
-
---- /dev/null Fri Jun 19 02:02:36 1998
-+++ config/unix/alpha_netbsd/copybin.c Fri Jun 19 02:44:07 1998
-@@ -0,0 +1,3 @@
-+#include "../../../src/h/define.h"
-+#include "paths.h"
-+#include "../Generic/copybin.h"
diff --git a/lang/icon/patches/patch-bt b/lang/icon/patches/patch-bt
deleted file mode 100644
index 090097090c6..00000000000
--- a/lang/icon/patches/patch-bt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bt,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/iconc.make.orig Thu Jul 1 20:36:41 1999
-+++ config/unix/Config/iconc.make Wed Apr 5 16:23:12 2000
-@@ -23,7 +23,7 @@
- iconc: $(OBJS) $(COBJS)
- $(CC) $(LDFLAGS) -o iconc $(OBJS) $(COBJS)
- cp iconc ../../bin
-- strip ../../bin/iconc
-+# strip ../../bin/iconc
-
- $(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 \
diff --git a/lang/icon/patches/patch-bu b/lang/icon/patches/patch-bu
deleted file mode 100644
index f6874a2298a..00000000000
--- a/lang/icon/patches/patch-bu
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bu,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/icont.make.orig Thu Jul 1 20:36:41 1999
-+++ config/unix/Config/icont.make Wed Apr 5 16:24:37 2000
-@@ -21,7 +21,7 @@
- icont: $(OBJS) common
- $(CC) $(CFLAGS) $(LDFLAGS) -o icont $(OBJS) $(COBJS) $(LIBS)
- cp icont ../../bin
-- strip ../../bin/icont
-+# strip ../../bin/icont
-
- $(OBJS): ../h/define.h ../h/config.h ../h/cpuconf.h ../h/gsupport.h \
- ../h/proto.h ../h/mproto.h \
diff --git a/lang/icon/patches/patch-bv b/lang/icon/patches/patch-bv
deleted file mode 100644
index 95cc2d79fca..00000000000
--- a/lang/icon/patches/patch-bv
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bv,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/rtt.make.orig Thu Jul 1 20:36:41 1999
-+++ config/unix/Config/rtt.make Wed Apr 5 16:26:31 2000
-@@ -27,7 +27,7 @@
- rtt: $(OBJ)
- $(CC) $(LDFLAGS) -o rtt $(OBJ)
- cp rtt ../../bin
-- strip ../../bin/rtt
-+# strip ../../bin/rtt
-
- library: $(OBJ)
- rm -rf rtt.a
diff --git a/lang/icon/patches/patch-bw b/lang/icon/patches/patch-bw
deleted file mode 100644
index 994781fdc8d..00000000000
--- a/lang/icon/patches/patch-bw
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bw,v 1.3 2000/04/05 14:32:53 pooka Exp $
-
---- config/unix/Config/runtime.make.orig Thu Jul 1 20:36:41 1999
-+++ config/unix/Config/runtime.make Wed Apr 5 17:14:41 2000
-@@ -36,9 +36,9 @@
- $(MAKE) iconx
-
- iconx: $(OBJS)
-- $(CC) $(LDFLAGS) -o iconx $(OBJS) $(XPMLIB) $(XLIB) $(LIBS)
-+ $(CC) $(LDFLAGS) -o iconx $(OBJS) $(XPMLIB) $(XLIB) $(LIBS) -lm
- cp iconx ../../bin
-- strip ../../bin/iconx
-+# strip ../../bin/iconx
-
- xcnv.o: cnv.r $(HDRS)
- ../../bin/rtt -x cnv.r
diff --git a/lang/icon/patches/patch-ca b/lang/icon/patches/patch-ca
deleted file mode 100644
index 4b55588385c..00000000000
--- a/lang/icon/patches/patch-ca
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ca,v 1.3 2000/06/19 15:56:28 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/common.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,10 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
-+RSWITCH=rswitch.c
-diff -u /dev/null config/unix/sun_netbsd/copybin.c
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/copybin.c Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,3 @@
-+#include "../../../src/h/define.h"
-+#include "paths.h"
-+#include "../Generic/copybin.h"
-diff -u /dev/null config/unix/sun_netbsd/define.h
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/define.h Thu Jun 8 22:17:12 2000
-@@ -0,0 +1,30 @@
-+#define Standard
-+#define IconGcvt
-+#define index strchr
-+#define rindex strrchr
-+#define GetHost
-+#define MaxHdr 13400
-+#define MaxStatSize 20480
-+
-+#define GenericBSD
-+#define BSD_4_4_LITE 1 /* This is new, for 4.4Lite specific stuff */
-+#define UNIX 1
-+#define LoadFunc
-+#define ExecImages
-+
-+#define KeyboardFncs
-+#define HaveTioc
-+#define USE_OLD_TTY
-+#define AllowConst
-+#define SysOpt
-+#define CComp "gcc"
-+#define COpts "-O2"
-+
-+/* Sun parameters */
-+/*#define SUN*/
-+#define ZERODIVIDE
-+
-+/* CPU architecture */
-+#define Double
-+#define StackAlign 8
-+
diff --git a/lang/icon/patches/patch-cb b/lang/icon/patches/patch-cb
deleted file mode 100644
index 6826cfa469b..00000000000
--- a/lang/icon/patches/patch-cb
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2000/06/19 15:56:31 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/icon_pi.c Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/icon_pi.h"
diff --git a/lang/icon/patches/patch-cc b/lang/icon/patches/patch-cc
deleted file mode 100644
index 57cced8794c..00000000000
--- a/lang/icon/patches/patch-cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cc,v 1.4 2000/06/19 15:56:32 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/iconc.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,9 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CFLAGS+= -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-cd b/lang/icon/patches/patch-cd
deleted file mode 100644
index da69121c4c2..00000000000
--- a/lang/icon/patches/patch-cd
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-cd,v 1.3 2000/06/19 15:56:33 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/icont.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ce b/lang/icon/patches/patch-ce
deleted file mode 100644
index 8bbde22f615..00000000000
--- a/lang/icon/patches/patch-ce
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2000/06/19 15:56:34 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/iconx.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,7 @@
-+SHELL=/bin/sh
-+# the seek stuff is defined in a header file that they don't
-+# include. This is the easiest. -Dconst= causes const to
-+# be ignored. This is needed because otherwise we get complaints
-+# due to stdio.h defining some functions with const when they
-+# are not defined that way in Icon's header files
-+RSWITCH=rswitch.c
diff --git a/lang/icon/patches/patch-cf b/lang/icon/patches/patch-cf
deleted file mode 100644
index f1ae9cea3f3..00000000000
--- a/lang/icon/patches/patch-cf
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-cf,v 1.1 2000/06/19 15:56:34 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/paths.h Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,3 @@
-+#define RootPath "/usr/local"
-+#define IcontPath "/usr/local/lib/icon/icont"
-+#define IconxPath "/usr/local/lib/icon/iconx"
diff --git a/lang/icon/patches/patch-cg b/lang/icon/patches/patch-cg
deleted file mode 100644
index 91ff268f02f..00000000000
--- a/lang/icon/patches/patch-cg
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2000/06/19 15:56:35 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/pi.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+=-DPersInterp
diff --git a/lang/icon/patches/patch-ch b/lang/icon/patches/patch-ch
deleted file mode 100644
index 0a74a096fd4..00000000000
--- a/lang/icon/patches/patch-ch
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ch,v 1.1 2000/06/19 15:56:36 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/preproc.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,10 @@
-+# The -D$D option to CFLAGS makes it possible to specify a definition
-+# at the Make command level without revising the Makefile, as
-+# in
-+#
-+# make D=Debug
-+#
-+D=NOTHING
-+CC=cc
-+CFLAGS+= -O -D$D
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ci b/lang/icon/patches/patch-ci
deleted file mode 100644
index 3e9932a6f8b..00000000000
--- a/lang/icon/patches/patch-ci
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2000/06/19 15:56:36 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/rswitch.c Thu Jun 8 22:14:54 2000
-@@ -0,0 +1,39 @@
-+/*
-+ * coswitch for Sun-4 Sparc.
-+ *
-+ * Compile this with 'cc -c rswitch.c'. Do not use cc -O.
-+ */
-+
-+/* #include <sys/asm_linkage.h> */
-+/*#include <sys/trap.h>*/
-+
-+int coswitch(old_cs, new_cs, first)
-+int *old_cs, *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-cj b/lang/icon/patches/patch-cj
deleted file mode 100644
index 40b24dcd055..00000000000
--- a/lang/icon/patches/patch-cj
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cj,v 1.1 2000/06/19 15:56:36 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/rtt.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+CFLAGS+= -DTokDotH="\"../rtt/ltoken.h\""
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-ck b/lang/icon/patches/patch-ck
deleted file mode 100644
index 57a252ffd12..00000000000
--- a/lang/icon/patches/patch-ck
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2000/06/19 15:56:37 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/runtime.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1 @@
-+SHELL=/bin/sh
diff --git a/lang/icon/patches/patch-cl b/lang/icon/patches/patch-cl
deleted file mode 100644
index a0c10e56405..00000000000
--- a/lang/icon/patches/patch-cl
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2000/06/19 15:56:37 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/setpath.c Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+#include "paths.h"
-+#include "../Generic/setpath.h"
diff --git a/lang/icon/patches/patch-cm b/lang/icon/patches/patch-cm
deleted file mode 100644
index 78986b554ab..00000000000
--- a/lang/icon/patches/patch-cm
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2000/06/19 15:56:38 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/status Thu Jun 8 22:21:08 2000
-@@ -0,0 +1,28 @@
-+System configuration:
-+
-+ SPARC architecture running NetBSD 1.4
-+
-+Latest Icon version:
-+
-+ Version 9.3.2
-+
-+Installer:
-+
-+ David A. Holland
-+ <dholland@eecs.harvard.edu>
-+
-+Missing features:
-+
-+ None.
-+
-+Known bugs:
-+
-+ None.
-+
-+Comments:
-+
-+ Mostly cribbed from a diff of intel_linux and sun_linux.
-+
-+Date:
-+
-+ Thu Jun 8 18:20:33 EDT 2000
diff --git a/lang/icon/patches/patch-cn b/lang/icon/patches/patch-cn
deleted file mode 100644
index e531bda6cb0..00000000000
--- a/lang/icon/patches/patch-cn
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-cn,v 1.1 2000/06/19 15:56:39 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/vt.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-co b/lang/icon/patches/patch-co
deleted file mode 100644
index 0f3a4449634..00000000000
--- a/lang/icon/patches/patch-co
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-co,v 1.1 2000/06/19 15:56:39 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/vtran.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,2 @@
-+SHELL=/bin/sh
-+CFLAGS+= -DVarTran
diff --git a/lang/icon/patches/patch-cp b/lang/icon/patches/patch-cp
deleted file mode 100644
index 0067dc10823..00000000000
--- a/lang/icon/patches/patch-cp
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-cp,v 1.1 2000/06/19 15:56:40 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/xiconx.mak Thu Jun 8 22:10:28 2000
-@@ -0,0 +1,3 @@
-+# If you define EventMon, add the -lgmon below to get profil(2) under Linux
-+#XLIB= -lX11 -lgmon
-+XLIB= -L/usr/X11R6/lib -lX11
diff --git a/lang/icon/patches/patch-cq b/lang/icon/patches/patch-cq
deleted file mode 100644
index b3f23d90417..00000000000
--- a/lang/icon/patches/patch-cq
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-cq,v 1.1 2000/06/19 15:56:40 pooka Exp $
-
---- /dev/null Thu Jan 1 00:00:00 1970
-+++ config/unix/sun_netbsd/xpm.hdr Thu Jun 8 22:10:28 2000
-@@ -0,0 +1 @@
-+DEFINES= -DZPIPE
diff --git a/lang/icon/pkg/PLIST b/lang/icon/pkg/PLIST
index 306c27f2e13..8162049fc4a 100644
--- a/lang/icon/pkg/PLIST
+++ b/lang/icon/pkg/PLIST
@@ -1,10 +1,836 @@
-@comment $NetBSD: PLIST,v 1.4 1998/06/27 22:03:47 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/06/25 18:00:21 jtb Exp $
bin/iconc
bin/icont
bin/iconx
bin/patchstr
-share/icon/dlrgint.o
-share/icon/rt.a
-share/icon/rt.db
-share/icon/rt.h
-@dirrm share/icon
+bin/rtt
+lib/icon/abkform.u1
+lib/icon/abkform.u2
+lib/icon/adjuncts.u1
+lib/icon/adjuncts.u2
+lib/icon/adlutils.u1
+lib/icon/adlutils.u2
+lib/icon/allof.u1
+lib/icon/allof.u2
+lib/icon/allpat.u1
+lib/icon/allpat.u2
+lib/icon/ansi.u1
+lib/icon/ansi.u2
+lib/icon/apply.u1
+lib/icon/apply.u2
+lib/icon/argparse.u1
+lib/icon/argparse.u2
+lib/icon/array.u1
+lib/icon/array.u2
+lib/icon/asciinam.u1
+lib/icon/asciinam.u2
+lib/icon/attribs.u1
+lib/icon/attribs.u2
+lib/icon/autopost.u1
+lib/icon/autopost.u2
+lib/icon/barchart.u1
+lib/icon/barchart.u2
+lib/icon/base64.u1
+lib/icon/base64.u2
+lib/icon/basename.u1
+lib/icon/basename.u2
+lib/icon/bevel.u1
+lib/icon/bevel.u2
+lib/icon/binary.u1
+lib/icon/binary.u2
+lib/icon/bincvt.u1
+lib/icon/bincvt.u2
+lib/icon/binop.u1
+lib/icon/binop.u2
+lib/icon/bitint.u1
+lib/icon/bitint.u2
+lib/icon/bitplane.u1
+lib/icon/bitplane.u2
+lib/icon/bitstr.u1
+lib/icon/bitstr.u2
+lib/icon/bitstrm.u1
+lib/icon/bitstrm.u2
+lib/icon/bkutil.u1
+lib/icon/bkutil.u2
+lib/icon/bold.u1
+lib/icon/bold.u2
+lib/icon/bufread.u1
+lib/icon/bufread.u2
+lib/icon/button.u1
+lib/icon/button.u2
+lib/icon/calendar.u1
+lib/icon/calendar.u2
+lib/icon/calendat.u1
+lib/icon/calendat.u2
+lib/icon/calls.u1
+lib/icon/calls.u2
+lib/icon/capture.u1
+lib/icon/capture.u2
+lib/icon/cardbits.u1
+lib/icon/cardbits.u2
+lib/icon/cartog.u1
+lib/icon/cartog.u2
+lib/icon/caseless.u1
+lib/icon/caseless.u2
+lib/icon/cells.u1
+lib/icon/cells.u2
+lib/icon/cfunc.u1
+lib/icon/cfunc.u2
+lib/icon/clip.u1
+lib/icon/clip.u2
+lib/icon/clipping.u1
+lib/icon/clipping.u2
+lib/icon/clrnames.u1
+lib/icon/clrnames.u2
+lib/icon/clrutils.u1
+lib/icon/clrutils.u2
+lib/icon/codeobj.u1
+lib/icon/codeobj.u2
+lib/icon/colmize.u1
+lib/icon/colmize.u2
+lib/icon/color.u1
+lib/icon/color.u2
+lib/icon/colorway.u1
+lib/icon/colorway.u2
+lib/icon/colrlist.u1
+lib/icon/colrlist.u2
+lib/icon/colrmodl.u1
+lib/icon/colrmodl.u2
+lib/icon/colrspec.u1
+lib/icon/colrspec.u2
+lib/icon/complete.u1
+lib/icon/complete.u2
+lib/icon/complex.u1
+lib/icon/complex.u2
+lib/icon/conffile.u1
+lib/icon/conffile.u2
+lib/icon/config.h
+lib/icon/converge.u1
+lib/icon/converge.u2
+lib/icon/convert.u1
+lib/icon/convert.u2
+lib/icon/core.u1
+lib/icon/core.u2
+lib/icon/cpuconf.h
+lib/icon/created.u1
+lib/icon/created.u2
+lib/icon/cstructs.h
+lib/icon/currency.u1
+lib/icon/currency.u2
+lib/icon/curves.u1
+lib/icon/curves.u2
+lib/icon/cwutils.u1
+lib/icon/cwutils.u2
+lib/icon/datefns.u1
+lib/icon/datefns.u2
+lib/icon/datetime.u1
+lib/icon/datetime.u2
+lib/icon/ddfread.u1
+lib/icon/ddfread.u2
+lib/icon/decay.u1
+lib/icon/decay.u2
+lib/icon/define.h
+lib/icon/dialog.u1
+lib/icon/dialog.u2
+lib/icon/dialogs.u1
+lib/icon/dialogs.u2
+lib/icon/dif.u1
+lib/icon/dif.u2
+lib/icon/digitcnt.u1
+lib/icon/digitcnt.u2
+lib/icon/distance.u1
+lib/icon/distance.u2
+lib/icon/divide.u1
+lib/icon/divide.u2
+lib/icon/dlrgint.o
+lib/icon/drag.u1
+lib/icon/drag.u2
+lib/icon/drawcard.u1
+lib/icon/drawcard.u2
+lib/icon/drawcolr.u1
+lib/icon/drawcolr.u2
+lib/icon/drawlab.u1
+lib/icon/drawlab.u2
+lib/icon/dsetup.u1
+lib/icon/dsetup.u2
+lib/icon/ebcdic.u1
+lib/icon/ebcdic.u2
+lib/icon/empgsup.u1
+lib/icon/empgsup.u2
+lib/icon/emptygen.u1
+lib/icon/emptygen.u2
+lib/icon/enqueue.u1
+lib/icon/enqueue.u2
+lib/icon/equiv.u1
+lib/icon/equiv.u2
+lib/icon/escape.u1
+lib/icon/escape.u2
+lib/icon/escapesq.u1
+lib/icon/escapesq.u2
+lib/icon/esctab.h
+lib/icon/eval.u1
+lib/icon/eval.u2
+lib/icon/evallist.u1
+lib/icon/evallist.u2
+lib/icon/event.u1
+lib/icon/event.u2
+lib/icon/eventgen.u1
+lib/icon/eventgen.u2
+lib/icon/everycat.u1
+lib/icon/everycat.u2
+lib/icon/evmux.u1
+lib/icon/evmux.u2
+lib/icon/evplay.u1
+lib/icon/evplay.u2
+lib/icon/evrecord.u1
+lib/icon/evrecord.u2
+lib/icon/expander.u1
+lib/icon/expander.u2
+lib/icon/exprfile.u1
+lib/icon/exprfile.u2
+lib/icon/factors.u1
+lib/icon/factors.u2
+lib/icon/fastfncs.u1
+lib/icon/fastfncs.u2
+lib/icon/fdefs.h
+lib/icon/features.h
+lib/icon/fetchpat.u1
+lib/icon/fetchpat.u2
+lib/icon/feval.u1
+lib/icon/feval.u2
+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
+lib/icon/findre.u2
+lib/icon/fstars.u1
+lib/icon/fstars.u2
+lib/icon/fstartbl.u1
+lib/icon/fstartbl.u2
+lib/icon/ftype.u1
+lib/icon/ftype.u2
+lib/icon/fullimag.u1
+lib/icon/fullimag.u2
+lib/icon/gauss.u1
+lib/icon/gauss.u2
+lib/icon/gdisable.u1
+lib/icon/gdisable.u2
+lib/icon/gdl.u1
+lib/icon/gdl.u2
+lib/icon/gdl2.u1
+lib/icon/gdl2.u2
+lib/icon/gedcom.u1
+lib/icon/gedcom.u2
+lib/icon/gen.u1
+lib/icon/gen.u2
+lib/icon/gener.u1
+lib/icon/gener.u2
+lib/icon/genrfncs.u1
+lib/icon/genrfncs.u2
+lib/icon/geodat.u1
+lib/icon/geodat.u2
+lib/icon/getchlib.u1
+lib/icon/getchlib.u2
+lib/icon/getcolrs.u1
+lib/icon/getcolrs.u2
+lib/icon/getkeys.u1
+lib/icon/getkeys.u2
+lib/icon/getmail.u1
+lib/icon/getmail.u2
+lib/icon/getpaths.u1
+lib/icon/getpaths.u2
+lib/icon/gettext.u1
+lib/icon/gettext.u2
+lib/icon/gifsize.u1
+lib/icon/gifsize.u2
+lib/icon/glabels.u1
+lib/icon/glabels.u2
+lib/icon/glib.u1
+lib/icon/glib.u2
+lib/icon/gobject.u1
+lib/icon/gobject.u2
+lib/icon/gpxlib.u1
+lib/icon/gpxlib.u2
+lib/icon/gpxop.u1
+lib/icon/gpxop.u2
+lib/icon/grammar.h
+lib/icon/graphics.h
+lib/icon/graphics.u1
+lib/icon/graphics.u2
+lib/icon/graphpak.u1
+lib/icon/graphpak.u2
+lib/icon/grecords.u1
+lib/icon/grecords.u2
+lib/icon/grttin.h
+lib/icon/gsupport.h
+lib/icon/gtrace.u1
+lib/icon/gtrace.u2
+lib/icon/header.h
+lib/icon/hetero.u1
+lib/icon/hetero.u2
+lib/icon/hexcvt.u1
+lib/icon/hexcvt.u2
+lib/icon/hostname.u1
+lib/icon/hostname.u2
+lib/icon/html.u1
+lib/icon/html.u2
+lib/icon/ibench.u1
+lib/icon/ibench.u2
+lib/icon/icall.h
+lib/icon/ichartp.u1
+lib/icon/ichartp.u2
+lib/icon/identgen.u1
+lib/icon/identgen.u2
+lib/icon/identity.u1
+lib/icon/identity.u2
+lib/icon/ifg.u1
+lib/icon/ifg.u2
+lib/icon/ifncs.u1
+lib/icon/ifncs.u2
+lib/icon/iftrace.u1
+lib/icon/iftrace.u2
+lib/icon/image.u1
+lib/icon/image.u2
+lib/icon/imagedim.u1
+lib/icon/imagedim.u2
+lib/icon/imageseq.u1
+lib/icon/imageseq.u2
+lib/icon/imgcolor.u1
+lib/icon/imgcolor.u2
+lib/icon/imrutils.u1
+lib/icon/imrutils.u2
+lib/icon/imscanon.u1
+lib/icon/imscanon.u2
+lib/icon/imscolor.u1
+lib/icon/imscolor.u2
+lib/icon/imsutils.u1
+lib/icon/imsutils.u2
+lib/icon/imutils.u1
+lib/icon/imutils.u2
+lib/icon/imxform.u1
+lib/icon/imxform.u2
+lib/icon/inbits.u1
+lib/icon/inbits.u2
+lib/icon/indices.u1
+lib/icon/indices.u2
+lib/icon/inserts.u1
+lib/icon/inserts.u2
+lib/icon/interact.u1
+lib/icon/interact.u2
+lib/icon/intstr.u1
+lib/icon/intstr.u2
+lib/icon/invkdefs.icn
+lib/icon/io.u1
+lib/icon/io.u2
+lib/icon/iolib.u1
+lib/icon/iolib.u2
+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
+lib/icon/itlib.u2
+lib/icon/itlibdos.u1
+lib/icon/itlibdos.u2
+lib/icon/itokens.u1
+lib/icon/itokens.u2
+lib/icon/itrcline.u1
+lib/icon/itrcline.u2
+lib/icon/ivalue.u1
+lib/icon/ivalue.u2
+lib/icon/joinpair.u1
+lib/icon/joinpair.u2
+lib/icon/jolygs.u1
+lib/icon/jolygs.u2
+lib/icon/jumpque.u1
+lib/icon/jumpque.u2
+lib/icon/kdefs.h
+lib/icon/keysyms.icn
+lib/icon/kmap.u1
+lib/icon/kmap.u2
+lib/icon/labeler.u1
+lib/icon/labeler.u2
+lib/icon/lastc.u1
+lib/icon/lastc.u2
+lib/icon/lastname.u1
+lib/icon/lastname.u2
+lib/icon/lcseval.u1
+lib/icon/lcseval.u2
+lib/icon/lexdef.h
+lib/icon/libcfunc.so
+lib/icon/linddefs.u1
+lib/icon/linddefs.u2
+lib/icon/linddraw.u1
+lib/icon/linddraw.u2
+lib/icon/lindgen.u1
+lib/icon/lindgen.u2
+lib/icon/lindrec.u1
+lib/icon/lindrec.u2
+lib/icon/lindstrp.u1
+lib/icon/lindstrp.u2
+lib/icon/lindterp.u1
+lib/icon/lindterp.u2
+lib/icon/list2tab.u1
+lib/icon/list2tab.u2
+lib/icon/lists.u1
+lib/icon/lists.u2
+lib/icon/longstr.u1
+lib/icon/longstr.u2
+lib/icon/lrgapprx.u1
+lib/icon/lrgapprx.u2
+lib/icon/lshade.icn
+lib/icon/lstfncs.u1
+lib/icon/lstfncs.u2
+lib/icon/lsystem.u1
+lib/icon/lsystem.u2
+lib/icon/lu.u1
+lib/icon/lu.u2
+lib/icon/maccolor.icn
+lib/icon/makelsys.u1
+lib/icon/makelsys.u2
+lib/icon/mapbit.u1
+lib/icon/mapbit.u2
+lib/icon/mapstr.u1
+lib/icon/mapstr.u2
+lib/icon/matchlib.u1
+lib/icon/matchlib.u2
+lib/icon/math.u1
+lib/icon/math.u2
+lib/icon/matrix.u1
+lib/icon/matrix.u2
+lib/icon/memlog.u1
+lib/icon/memlog.u2
+lib/icon/memrfncs.u1
+lib/icon/memrfncs.u2
+lib/icon/mirror.u1
+lib/icon/mirror.u2
+lib/icon/mixsort.u1
+lib/icon/mixsort.u2
+lib/icon/models.u1
+lib/icon/models.u2
+lib/icon/modlines.u1
+lib/icon/modlines.u2
+lib/icon/monitor.h
+lib/icon/morse.u1
+lib/icon/morse.u2
+lib/icon/mproto.h
+lib/icon/mset.u1
+lib/icon/mset.u2
+lib/icon/mswin.h
+lib/icon/namepfx.u1
+lib/icon/namepfx.u2
+lib/icon/navitrix.u1
+lib/icon/navitrix.u2
+lib/icon/ngrams.u1
+lib/icon/ngrams.u2
+lib/icon/noncase.u1
+lib/icon/noncase.u2
+lib/icon/numbers.u1
+lib/icon/numbers.u2
+lib/icon/odefs.h
+lib/icon/opdefs.h
+lib/icon/opdefs.icn
+lib/icon/openchk.u1
+lib/icon/openchk.u2
+lib/icon/opnames.u1
+lib/icon/opnames.u2
+lib/icon/opsyms.u1
+lib/icon/opsyms.u2
+lib/icon/options.u1
+lib/icon/options.u2
+lib/icon/optwindw.u1
+lib/icon/optwindw.u2
+lib/icon/orbits.u1
+lib/icon/orbits.u2
+lib/icon/outbits.u1
+lib/icon/outbits.u2
+lib/icon/overlay.u1
+lib/icon/overlay.u2
+lib/icon/packunpk.u1
+lib/icon/packunpk.u2
+lib/icon/palettes.u1
+lib/icon/palettes.u2
+lib/icon/parscond.u1
+lib/icon/parscond.u2
+lib/icon/parserr.h
+lib/icon/partit.u1
+lib/icon/partit.u2
+lib/icon/pascal.u1
+lib/icon/pascal.u2
+lib/icon/pascltri.u1
+lib/icon/pascltri.u2
+lib/icon/patch.u1
+lib/icon/patch.u2
+lib/icon/patterns.u1
+lib/icon/patterns.u2
+lib/icon/patutils.u1
+lib/icon/patutils.u2
+lib/icon/patword.u1
+lib/icon/patword.u2
+lib/icon/patxform.u1
+lib/icon/patxform.u2
+lib/icon/pbkform.u1
+lib/icon/pbkform.u2
+lib/icon/pdco.u1
+lib/icon/pdco.u2
+lib/icon/periodic.u1
+lib/icon/periodic.u2
+lib/icon/permutat.u1
+lib/icon/permutat.u2
+lib/icon/phoname.u1
+lib/icon/phoname.u2
+lib/icon/pixelmap.u1
+lib/icon/pixelmap.u2
+lib/icon/plural.u1
+lib/icon/plural.u2
+lib/icon/polynom.u1
+lib/icon/polynom.u2
+lib/icon/polystuf.u1
+lib/icon/polystuf.u2
+lib/icon/popen.u1
+lib/icon/popen.u2
+lib/icon/popular.u1
+lib/icon/popular.u2
+lib/icon/pqueue.u1
+lib/icon/pqueue.u2
+lib/icon/printcol.u1
+lib/icon/printcol.u2
+lib/icon/printf.u1
+lib/icon/printf.u2
+lib/icon/prockind.u1
+lib/icon/prockind.u2
+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
+lib/icon/psrecord.u2
+lib/icon/ptutils.u1
+lib/icon/ptutils.u2
+lib/icon/putpixel.u1
+lib/icon/putpixel.u2
+lib/icon/randarea.u1
+lib/icon/randarea.u2
+lib/icon/randfigs.u1
+lib/icon/randfigs.u2
+lib/icon/random.u1
+lib/icon/random.u2
+lib/icon/rational.u1
+lib/icon/rational.u2
+lib/icon/rawimage.u1
+lib/icon/rawimage.u2
+lib/icon/readcpt.u1
+lib/icon/readcpt.u2
+lib/icon/readtbl.u1
+lib/icon/readtbl.u2
+lib/icon/reassign.u1
+lib/icon/reassign.u2
+lib/icon/rec2tab.u1
+lib/icon/rec2tab.u2
+lib/icon/recog.u1
+lib/icon/recog.u2
+lib/icon/records.u1
+lib/icon/records.u2
+lib/icon/recrfncs.u1
+lib/icon/recrfncs.u2
+lib/icon/recurmap.u1
+lib/icon/recurmap.u2
+lib/icon/reduce.u1
+lib/icon/reduce.u2
+lib/icon/regexp.u1
+lib/icon/regexp.u2
+lib/icon/repeats.u1
+lib/icon/repeats.u2
+lib/icon/repetit.u1
+lib/icon/repetit.u2
+lib/icon/revadd.u1
+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
+lib/icon/rgbrec.u2
+lib/icon/rmacros.h
+lib/icon/rng.u1
+lib/icon/rng.u2
+lib/icon/rpolys.u1
+lib/icon/rpolys.u2
+lib/icon/rproto.h
+lib/icon/rstars.u1
+lib/icon/rstars.u2
+lib/icon/rstartbl.u1
+lib/icon/rstartbl.u2
+lib/icon/rstructs.h
+lib/icon/rt.a
+lib/icon/rt.db
+lib/icon/rt.h
+lib/icon/sandgen.u1
+lib/icon/sandgen.u2
+lib/icon/scan.u1
+lib/icon/scan.u2
+lib/icon/scanmodl.u1
+lib/icon/scanmodl.u2
+lib/icon/scanset.u1
+lib/icon/scanset.u2
+lib/icon/segment.u1
+lib/icon/segment.u2
+lib/icon/select.u1
+lib/icon/select.u2
+lib/icon/senten1.u1
+lib/icon/senten1.u2
+lib/icon/sentence.u1
+lib/icon/sentence.u2
+lib/icon/seqfncs.u1
+lib/icon/seqfncs.u2
+lib/icon/seqimage.u1
+lib/icon/seqimage.u2
+lib/icon/seqops.u1
+lib/icon/seqops.u2
+lib/icon/serial.u1
+lib/icon/serial.u2
+lib/icon/sername.u1
+lib/icon/sername.u2
+lib/icon/sets.u1
+lib/icon/sets.u2
+lib/icon/showtbl.u1
+lib/icon/showtbl.u2
+lib/icon/shquote.u1
+lib/icon/shquote.u2
+lib/icon/signed.u1
+lib/icon/signed.u2
+lib/icon/slider.u1
+lib/icon/slider.u2
+lib/icon/sort.u1
+lib/icon/sort.u2
+lib/icon/sortt.u1
+lib/icon/sortt.u2
+lib/icon/soundex.u1
+lib/icon/soundex.u2
+lib/icon/soundex1.u1
+lib/icon/soundex1.u2
+lib/icon/speedo.u1
+lib/icon/speedo.u2
+lib/icon/spin.u1
+lib/icon/spin.u2
+lib/icon/spirals.u1
+lib/icon/spirals.u2
+lib/icon/spokes.u1
+lib/icon/spokes.u2
+lib/icon/statemap.u1
+lib/icon/statemap.u2
+lib/icon/step.u1
+lib/icon/step.u2
+lib/icon/str2toks.u1
+lib/icon/str2toks.u2
+lib/icon/strings.u1
+lib/icon/strings.u2
+lib/icon/strip.u1
+lib/icon/strip.u2
+lib/icon/stripcom.u1
+lib/icon/stripcom.u2
+lib/icon/stripunb.u1
+lib/icon/stripunb.u2
+lib/icon/strpchrt.u1
+lib/icon/strpchrt.u2
+lib/icon/subturtl.u1
+lib/icon/subturtl.u2
+lib/icon/symrand.u1
+lib/icon/symrand.u2
+lib/icon/sys.h
+lib/icon/tab2list.u1
+lib/icon/tab2list.u2
+lib/icon/tab2rec.u1
+lib/icon/tab2rec.u2
+lib/icon/tables.u1
+lib/icon/tables.u2
+lib/icon/tclass.u1
+lib/icon/tclass.u2
+lib/icon/tieedit.u1
+lib/icon/tieedit.u2
+lib/icon/tieutils.u1
+lib/icon/tieutils.u2
+lib/icon/tile.u1
+lib/icon/tile.u2
+lib/icon/tiler.u1
+lib/icon/tiler.u2
+lib/icon/title.u1
+lib/icon/title.u2
+lib/icon/titleset.u1
+lib/icon/titleset.u2
+lib/icon/tokgen.u1
+lib/icon/tokgen.u2
+lib/icon/trees.u1
+lib/icon/trees.u2
+lib/icon/tuple.u1
+lib/icon/tuple.u2
+lib/icon/turtle.u1
+lib/icon/turtle.u2
+lib/icon/twists.u1
+lib/icon/twists.u2
+lib/icon/typecode.u1
+lib/icon/typecode.u2
+lib/icon/typedefs.h
+lib/icon/unsigned.u1
+lib/icon/unsigned.u2
+lib/icon/usage.u1
+lib/icon/usage.u2
+lib/icon/varsub.u1
+lib/icon/varsub.u2
+lib/icon/vbuttons.u1
+lib/icon/vbuttons.u2
+lib/icon/vcoupler.u1
+lib/icon/vcoupler.u2
+lib/icon/vdefns.icn
+lib/icon/vdialog.u1
+lib/icon/vdialog.u2
+lib/icon/verncnt.u1
+lib/icon/verncnt.u2
+lib/icon/version.h
+lib/icon/version.u1
+lib/icon/version.u2
+lib/icon/vfilter.u1
+lib/icon/vfilter.u2
+lib/icon/vframe.u1
+lib/icon/vframe.u2
+lib/icon/vgrid.u1
+lib/icon/vgrid.u2
+lib/icon/vhttp.u1
+lib/icon/vhttp.u2
+lib/icon/vidgets.u1
+lib/icon/vidgets.u2
+lib/icon/viface.u1
+lib/icon/viface.u2
+lib/icon/vlist.u1
+lib/icon/vlist.u2
+lib/icon/vmenu.u1
+lib/icon/vmenu.u2
+lib/icon/vpane.u1
+lib/icon/vpane.u2
+lib/icon/vquery.u1
+lib/icon/vquery.u2
+lib/icon/vradio.u1
+lib/icon/vradio.u2
+lib/icon/vrml.u1
+lib/icon/vrml.u2
+lib/icon/vrml1lib.u1
+lib/icon/vrml1lib.u2
+lib/icon/vrml2lib.u1
+lib/icon/vrml2lib.u2
+lib/icon/vscroll.u1
+lib/icon/vscroll.u2
+lib/icon/vsetup.u1
+lib/icon/vsetup.u2
+lib/icon/vslider.u1
+lib/icon/vslider.u2
+lib/icon/vstd.u1
+lib/icon/vstd.u2
+lib/icon/vstyle.u1
+lib/icon/vstyle.u2
+lib/icon/vtext.u1
+lib/icon/vtext.u2
+lib/icon/wattrib.u1
+lib/icon/wattrib.u2
+lib/icon/wdiag.u1
+lib/icon/wdiag.u2
+lib/icon/weavegif.u1
+lib/icon/weavegif.u2
+lib/icon/weavgenr.u1
+lib/icon/weavgenr.u2
+lib/icon/weaving.u1
+lib/icon/weaving.u2
+lib/icon/weavutil.u1
+lib/icon/weavutil.u2
+lib/icon/weighted.u1
+lib/icon/weighted.u2
+lib/icon/wifisd.u1
+lib/icon/wifisd.u2
+lib/icon/wildcard.u1
+lib/icon/wildcard.u2
+lib/icon/win.u1
+lib/icon/win.u2
+lib/icon/window.u1
+lib/icon/window.u2
+lib/icon/winsnap.u1
+lib/icon/winsnap.u2
+lib/icon/wipe.u1
+lib/icon/wipe.u2
+lib/icon/wopen.u1
+lib/icon/wopen.u2
+lib/icon/word.u1
+lib/icon/word.u2
+lib/icon/wrap.u1
+lib/icon/wrap.u2
+lib/icon/writecpt.u1
+lib/icon/writecpt.u2
+lib/icon/xbfont.u1
+lib/icon/xbfont.u2
+lib/icon/xcode.u1
+lib/icon/xcode.u2
+lib/icon/xcodes.u1
+lib/icon/xcodes.u2
+lib/icon/xcolor.u1
+lib/icon/xcolor.u2
+lib/icon/xcolors.icn
+lib/icon/xcompat.u1
+lib/icon/xcompat.u2
+lib/icon/xform.u1
+lib/icon/xform.u2
+lib/icon/xformimg.u1
+lib/icon/xformimg.u2
+lib/icon/xforms.u1
+lib/icon/xforms.u2
+lib/icon/xgtrace.u1
+lib/icon/xgtrace.u2
+lib/icon/ximage.u1
+lib/icon/ximage.u2
+lib/icon/xio.u1
+lib/icon/xio.u2
+lib/icon/xnames.icn
+lib/icon/xplane.u1
+lib/icon/xplane.u2
+lib/icon/xputpixl.u1
+lib/icon/xputpixl.u2
+lib/icon/xqueue.u1
+lib/icon/xqueue.u2
+lib/icon/xrotate.u1
+lib/icon/xrotate.u2
+lib/icon/xutils.u1
+lib/icon/xutils.u2
+lib/icon/xwin.h
+lib/icon/zipread.u1
+lib/icon/zipread.u2
+man/man1/icont.1
+share/doc/icon/blubordr.gif
+share/doc/icon/build.htm
+share/doc/icon/clnroff.sed
+share/doc/icon/cube128.gif
+share/doc/icon/docguide.htm
+share/doc/icon/faq.htm
+share/doc/icon/faq.txt
+share/doc/icon/files.htm
+share/doc/icon/gb80.jpg
+share/doc/icon/ib80.jpg
+share/doc/icon/icont.txt
+share/doc/icon/index.htm
+share/doc/icon/install.htm
+share/doc/icon/istyle.css
+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
diff --git a/lang/icon/scripts/configure b/lang/icon/scripts/configure
deleted file mode 100644
index 7c5906fecff..00000000000
--- a/lang/icon/scripts/configure
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: configure,v 1.5 2000/06/19 15:56:41 pooka Exp $
-#
-
-cd ${WRKSRC}; make Configure name=`uname -m| sed -e 's/i386/intel/;s/sparc/sun/'`_`uname -s|tr '[A-Z]' '[a-z]'`