diff options
author | jtb <jtb> | 2001-06-25 19:28:42 +0000 |
---|---|---|
committer | jtb <jtb> | 2001-06-25 19:28:42 +0000 |
commit | b05b2db4c0cbd33ae2b6be707715225de7d40ac4 (patch) | |
tree | d208d8659d707c3fe454c0f47e7433be99be705a /lang/icon/patches | |
parent | 0f8b61aad5c705a8630e2b9833a2c3d8942e1045 (diff) | |
download | pkgsrc-b05b2db4c0cbd33ae2b6be707715225de7d40ac4.tar.gz |
Don't assume all rswitch files are in C. Fix build to cope with this.
Diffstat (limited to 'lang/icon/patches')
-rw-r--r-- | lang/icon/patches/patch-ae | 4 | ||||
-rw-r--r-- | lang/icon/patches/patch-af | 4 | ||||
-rw-r--r-- | lang/icon/patches/patch-ag | 4 | ||||
-rw-r--r-- | lang/icon/patches/patch-aj | 163 | ||||
-rw-r--r-- | lang/icon/patches/patch-ap | 16 |
5 files changed, 17 insertions, 174 deletions
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 |