A couple of files should not have been imported. While were at it,

add extra directories to the includes path for the benchmarks.

7 files changed, 14 insertions, 14 deletions

diff --git a/lang/stalin/patches/patch-ae b/lang/stalin/patches/patch-ae
index 8e9a2897f03..65ffef7d1eb 100644
--- a/lang/stalin/patches/patch-ae
+++ b/lang/stalin/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-ae,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- /dev/null	Sun Dec 10 09:45:42 2000
 +++ stalinc
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +
-+exec %%PREFIX%%/bin/stalin -I %%PREFIX%%/lib/stalin -I %%PREFIX%%/include -I %%PREFIX%%/lib -I %%GC_PREFIX%%/include -I %%GC_PREFIX%%/lib -I %%X11BASE%%/lib -I %%X11BASE%%/include -I %%MESA_PREFIX%%/lib -I %%MESA_PREFIX%%/include -Ob -Om -On -Or -Ot -d -d1 -du -dI -k -copt -O2 -copt -fomit-frame-pointer -copt -freg-struct-return $@
++exec %%PREFIX%%/bin/stalin -I %%PREFIX%%/lib/stalin -I %%PREFIX%%/include -I %%PREFIX%%/lib -I %%GC_PREFIX%%/include -I %%GC_PREFIX%%/lib -Ob -Om -On -Or -Ot -d -d1 -du -dI -k -copt -O2 -copt -fomit-frame-pointer -copt -freg-struct-return $@
diff --git a/lang/stalin/patches/patch-ag b/lang/stalin/patches/patch-ag
index cd9cb4efec7..cef2650c897 100644
--- a/lang/stalin/patches/patch-ag
+++ b/lang/stalin/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-ag,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- benchmarks/benchmark.orig	Wed May 19 15:50:11 1999
 +++ benchmarks/benchmark
@@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
  #!/bin/sh
  gcc -o unbuff unbuff.c
 -../stalin -q -On -db benchmarks-to-latex
-+%%PREFIX%%/bin/stalin -q -On -db benchmarks-to-latex
++%%STALIN%% -q -On -db benchmarks-to-latex
  ./compile-benchmarks
  ./run-benchmarks
  ./benchmarks-to-latex
diff --git a/lang/stalin/patches/patch-ah b/lang/stalin/patches/patch-ah
index 3f4ed5684b5..3ae8b3e9169 100644
--- a/lang/stalin/patches/patch-ah
+++ b/lang/stalin/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-ah,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- benchmarks/compile-and-run-stalin-benchmark.orig	Mon Apr 26 20:40:00 1999
 +++ benchmarks/compile-and-run-stalin-benchmark
@@ -7,6 +7,6 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
  echo compile $1
  sed -f stalin.sed $1.sc >$1-stalin.sc
 -time ../stalin $o $2 $1-stalin
-+time %%PREFIX%%/bin/stalin $o $2 $1-stalin
++time %%STALIN%% $o $2 $1-stalin
  echo run $1
  time ./$1-stalin >/dev/null
diff --git a/lang/stalin/patches/patch-ai b/lang/stalin/patches/patch-ai
index 8f6813a2a1d..6f78cfe11f5 100644
--- a/lang/stalin/patches/patch-ai
+++ b/lang/stalin/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- benchmarks/compile-stalin-benchmark.orig	Mon Apr 26 20:40:11 1999
 +++ benchmarks/compile-stalin-benchmark
@@ -7,4 +7,4 @@ $NetBSD: patch-ai,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
  echo compile $1
  sed -f stalin.sed $1.sc >$1-stalin.sc
 -time ../stalin $o $2 $1-stalin
-+time %%PREFIX%%/bin/stalin $o $2 $1-stalin
++time %%STALIN%% $o $2 $1-stalin
diff --git a/lang/stalin/patches/patch-aj b/lang/stalin/patches/patch-aj
index cfc8ab596f2..8ee5b8d3ce7 100644
--- a/lang/stalin/patches/patch-aj
+++ b/lang/stalin/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- benchmarks/make-define-application-example.orig	Mon Apr 26 20:40:26 1999
 +++ benchmarks/make-define-application-example
@@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
  ulimit -s unlimited
  ulimit -c 0
 -../stalin -d0 -d1 -d5 -d6 -On -du -dI -q -no-escaping-continuations\
-+%%PREFIX%%/bin/stalin -d0 -d1 -d5 -d6 -On -du -dI -q \
++%%STALIN%% -d0 -d1 -d5 -d6 -On -du -dI -q \
 + -no-escaping-continuations \
   -copt -O2 -copt -fomit-frame-pointer -copt -Wall -copt -freg-struct-return\
 - -copt -L/usr/X11/lib -copt -lX11\
diff --git a/lang/stalin/patches/patch-ak b/lang/stalin/patches/patch-ak
index 1a9ed3078d1..f663acada26 100644
--- a/lang/stalin/patches/patch-ak
+++ b/lang/stalin/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-ak,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- benchmarks/make-hello.orig	Sun Dec 10 10:21:03 2000
 +++ benchmarks/make-hello
@@ -7,6 +7,6 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
  ulimit -s unlimited
  ulimit -c 0
 -../stalin -d0 -d1 -d5 -d6 -On -du -dI\
-+%%PREFIX%%/bin/stalin -d0 -d1 -d5 -d6 -On -du -dI\
++%%STALIN%% -d0 -d1 -d5 -d6 -On -du -dI\
   -copt -O2 -copt -fomit-frame-pointer -copt -Wall -copt -freg-struct-return\
   hello
diff --git a/lang/stalin/patches/patch-al b/lang/stalin/patches/patch-al
index 990fd1d14c9..7c7221012d9 100644
--- a/lang/stalin/patches/patch-al
+++ b/lang/stalin/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
+$NetBSD: patch-al,v 1.2 2000/12/10 12:20:48 jtb Exp $
 
 --- benchmarks/make-xhello.orig	Sun Dec 10 10:21:10 2000
 +++ benchmarks/make-xhello
@@ -7,7 +7,7 @@ $NetBSD: patch-al,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $
  ulimit -s unlimited
  ulimit -c 0
 -../stalin -d0 -d1 -d5 -d6 -On -du -dI\
-+%%PREFIX%%/bin/stalin -d0 -d1 -d5 -d6 -On -du -dI\
++%%STALIN%% -d0 -d1 -d5 -d6 -On -du -dI\
   -copt -O2 -copt -fomit-frame-pointer -copt -Wall -copt -freg-struct-return\
 - -copt -L/usr/X11/lib -copt -lX11\
 + -copt -L%%X11BASE%%/lib -copt -lX11\