Don't assume all rswitch files are in C. Fix build to cope with this.

6 files changed, 23 insertions, 180 deletions

diff --git a/lang/icon/distinfo b/lang/icon/distinfo
index 699a5e4f622..7913432dea8 100644
--- a/lang/icon/distinfo
+++ b/lang/icon/distinfo
@@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.4 2001/06/25 18:29:21 jtb Exp $
+$NetBSD: distinfo,v 1.5 2001/06/25 19:28:42 jtb Exp $
 
 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-ae) = df3653f8b958970af8ced3b40adb6d13d64cb9f6
+SHA1 (patch-af) = 97eeba0e240529d005872c647177dcb251cbd56d
+SHA1 (patch-ag) = ffae555d665df1aa77a4189b2e8b8b54c3025a52
 SHA1 (patch-ah) = 4d04fb330fd6a3436729c087374285f6320f7bf1
 SHA1 (patch-ai) = 37fffe999deb7fd560dda056f2edc1972726fe91
-SHA1 (patch-aj) = ea79925c974c8c36993a16f68b2f366f27f91de4
+SHA1 (patch-aj) = 4173a2417a2d61d8e30209cca2d63ae023d7b145
 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-ap) = c90cb7df8e6d6c7f871eba603e8f561d64384a29
 SHA1 (patch-aq) = 07ad177de29dc6498b921c0ede43a4ea36c0815e
 SHA1 (patch-ar) = 6a6fcb68461e1d1a0e0e86f65be610170a4cf890
 SHA1 (patch-as) = baff3d1b011b9e6b1d3bc033f8aa25336ff7afd7
diff --git a/lang/icon/patches/patch-ae b/lang/icon/patches/patch-ae
index fa9b921cfd4..ed12185f321 100644
--- a/lang/icon/patches/patch-ae
+++ b/lang/icon/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.4 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-ae,v 1.5 2001/06/25 19:28:42 jtb Exp $
 
 --- /dev/null	Sat Jun 23 16:44:46 2001
-+++ config/unix/netbsd/rswitch.alpha
++++ config/unix/netbsd/rswitch.s.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
index 9b471ed299e..16ef09a5638 100644
--- a/lang/icon/patches/patch-af
+++ b/lang/icon/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.5 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-af,v 1.6 2001/06/25 19:28:42 jtb Exp $
 
 --- /dev/null	Sat Jun 23 16:44:55 2001
-+++ config/unix/netbsd/rswitch.i386
++++ config/unix/netbsd/rswitch.c.i386
 @@ -0,0 +1,28 @@
 +/*
 + * This is the co-expression context switch for the Intel 80386
diff --git a/lang/icon/patches/patch-ag b/lang/icon/patches/patch-ag
index 6c116d0b35f..89c15787591 100644
--- a/lang/icon/patches/patch-ag
+++ b/lang/icon/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-ag,v 1.4 2001/06/25 19:28:42 jtb Exp $
 
 --- /dev/null	Sat Jun 23 16:45:07 2001
-+++ config/unix/netbsd/rswitch.sparc
++++ config/unix/netbsd/rswitch.c.sparc
 @@ -0,0 +1,39 @@
 +/*
 + * coswitch for Sun-4 Sparc.
diff --git a/lang/icon/patches/patch-aj b/lang/icon/patches/patch-aj
index 0dbeb887ca9..878da918f20 100644
--- a/lang/icon/patches/patch-aj
+++ b/lang/icon/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-aj,v 1.4 2001/06/25 19:28:42 jtb Exp $
 
 --- Makefile.orig	Mon Jun 11 18:04:42 2001
 +++ Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.3 2001/06/25 18:00:16 jtb Exp $
  
  config/unix/$(name)/status src/h/define.h:
  	:
-@@ -97,20 +97,180 @@
+@@ -97,18 +97,21 @@
  
  D=$(dest)
  Install:
@@ -42,165 +42,6 @@ $NetBSD: patch-aj,v 1.3 2001/06/25 18:00:16 jtb Exp $
 +		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-ap b/lang/icon/patches/patch-ap
index ef18408ed93..6e818a06744 100644
--- a/lang/icon/patches/patch-ap
+++ b/lang/icon/patches/patch-ap
@@ -1,8 +1,8 @@
-$NetBSD: patch-ap,v 1.3 2001/06/25 18:00:16 jtb Exp $
+$NetBSD: patch-ap,v 1.4 2001/06/25 19:28:42 jtb Exp $
 
---- /dev/null	Sun Jun 24 10:50:03 2001
+--- /dev/null	Mon Jun 25 20:21:04 2001
 +++ config/unix/netbsd/custom.sh
-@@ -0,0 +1,16 @@
+@@ -0,0 +1,18 @@
 +#!/bin/sh
 +#
 +#  custom setup script for netbsd
@@ -10,12 +10,14 @@ $NetBSD: patch-ap,v 1.3 2001/06/25 18:00:16 jtb Exp $
 +SRC=../../../src
 +ARCH=`uname -m`
 +
-+if [ -f rswitch.$ARCH ]; then
-+	cp -f rswitch.$ARCH $SRC/common/rswitch.c
++if [ -f rswitch.c.$ARCH ]; then
++	cp -f rswitch.c.$ARCH $SRC/common/rswitch.c
++elif [ -f rswitch.s.$ARCH ]; then
++	cp -f rswitch.s.$ARCH $SRC/common/rswitch.s
 +else
 +	echo "#define NoCoexpr" >>$SRC/h/define.h
 +fi
 +
-+if [ -f define.$ARCH ]; then
-+        cat define.$ARCH >>$SRC/h/define.h
++if [ -f define.h.$ARCH ]; then
++        cat define.h.$ARCH >>$SRC/h/define.h
 +fi