- make this work on arch's where 'uname -m' != 'uname -p', for example

  the m68k and mipsel ports.  This address PR 9781 filed by Michael Wolfson
  and also fixes recently noted bulk pkgsrc build failures on pmax.

  The os version/machine type specific string is now consistently
  ${OPSYS}-${OS_VERSION}-${MACHINE_ARCH}

3 files changed, 31 insertions, 1 deletions

diff --git a/lang/STk/files/patch-sum b/lang/STk/files/patch-sum
index 4454849db42..df3b372bdb3 100644
--- a/lang/STk/files/patch-sum
+++ b/lang/STk/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:54:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/07/06 16:24:46 dmcmahill Exp $
 
 MD5 (patch-aa) = 74bd9dd240297e0bcbc82e8d6aac707f
 MD5 (patch-ab) = c317985bbf06feeffd0a998edd2ae8b8
+MD5 (patch-ac) = 57356c2542b2bf899597f5ed55546bf1
+MD5 (patch-ad) = 5c2213f3747941b72224df61fce789d2
diff --git a/lang/STk/patches/patch-ac b/lang/STk/patches/patch-ac
new file mode 100644
index 00000000000..11f2a94e5ed
--- /dev/null
+++ b/lang/STk/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2000/07/06 16:24:49 dmcmahill Exp $
+
+allow sharing between different arch's which use the same processor
+Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc.
+
+--- configure.in.orig	Sat Jun  6 08:19:03 1998
++++ configure.in	Thu Jul  6 10:24:09 2000
+@@ -15,5 +15,5 @@
+ os=`uname -s`
+ version=`uname -r`
+-machine=`uname -m`
++machine=`uname -p`
+ 
+ case $os in
diff --git a/lang/STk/patches/patch-ad b/lang/STk/patches/patch-ad
new file mode 100644
index 00000000000..221e2f2c2c5
--- /dev/null
+++ b/lang/STk/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2000/07/06 16:24:49 dmcmahill Exp $
+
+allow sharing between different arch's which use the same processor
+Ie, use 'm68k' instead of 'amiga', 'mac68k', 'hp300', etc.
+
+--- configure.orig	Sat Jun  6 08:19:03 1998
++++ configure	Thu Jul  6 10:23:59 2000
+@@ -554,5 +554,5 @@
+ os=`uname -s`
+ version=`uname -r`
+-machine=`uname -m`
++machine=`uname -p`
+ 
+ case $os in