From 11cd40adff9f0acf4e84817be592baaa400e2a7b Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Wed, 5 Jan 2000 12:23:55 +0000
Subject: Make this package compile and run on Solaris - undo some
 over-aggressive NetBSD patching, and use ${ID} in preference to "id".

---
 benchmarks/bytebench/Makefile         |  4 ++--
 benchmarks/bytebench/files/patch-sum  |  4 ++--
 benchmarks/bytebench/patches/patch-ac | 23 +++++++++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'benchmarks/bytebench')

diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 8de0a063b7d..57f02af49a5 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/28 04:26:17 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/01/05 12:23:55 agc Exp $
 
 DISTNAME=		byte
 PKGNAME=		bytebench-3.6
@@ -19,7 +19,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/run-byte ${PREFIX}/bin
 
 benchmark:
-	@if [ `id -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi
+	@if [ `${ID} -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi
 	@${WRKSRC}/run-byte | tee ${WRKSRC}/bytebench.out
 
 results:
diff --git a/benchmarks/bytebench/files/patch-sum b/benchmarks/bytebench/files/patch-sum
index bec2252729b..e99d2b25f9b 100644
--- a/benchmarks/bytebench/files/patch-sum
+++ b/benchmarks/bytebench/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/05 12:23:56 agc Exp $
 
 MD5 (patch-aa) = 6491252e66183914b4a546b1638c0d67
 MD5 (patch-ab) = 8af9aa8181cc0fa37a0b9ba1e457fe7f
-MD5 (patch-ac) = f656f8cc32b050ad4eb688d217195d94
+MD5 (patch-ac) = d091ccb6de88383e5c5ed1507d8f81e8
diff --git a/benchmarks/bytebench/patches/patch-ac b/benchmarks/bytebench/patches/patch-ac
index c69d7594468..ee079a45f4c 100644
--- a/benchmarks/bytebench/patches/patch-ac
+++ b/benchmarks/bytebench/patches/patch-ac
@@ -1,6 +1,7 @@
-$NetBSD: patch-ac,v 1.1 1998/09/03 04:30:28 garbled Exp $
---- src/looper.c.orig	Sat May 13 12:32:00 1995
-+++ src/looper.c	Wed Sep  2 21:10:45 1998
+$NetBSD: patch-ac,v 1.2 2000/01/05 12:23:56 agc Exp $
+
+--- src/looper.c.orig	Sat May 13 20:32:00 1995
++++ src/looper.c	Wed Jan  5 12:17:10 2000
 @@ -22,6 +22,9 @@
  
  #include <stdio.h>
@@ -11,21 +12,21 @@ $NetBSD: patch-ac,v 1.1 1998/09/03 04:30:28 garbled Exp $
  
  unsigned long iter;
  char *cmd_argv[28];
-@@ -84,14 +87,22 @@
+@@ -84,14 +87,30 @@
  		perror("Reason");
  		exit(2);
  		} 
 -	else
 +	else {
  		/* master */
--		wait(&status);
+ 		wait(&status);
 -	if (status != 0) 
 -		{
 -		printf("Bad wait status: 0x%x\n", status);
 -		exit(2);
--		}
-+		wait(&status); /* NetBSD 1.3H and lower have a bug in dc */
-+		if (NetBSD < 199810 && strcmp(cmd_argv[0],"dc") != 0) {
++#if (defined(NetBSD) && (NetBSD < 199810))
++		/* NetBSD 1.3H and lower have a bug in dc */
++		if (strcmp(cmd_argv[0],"dc") != 0) {
 +		  if (WIFSIGNALED(status)) {
 +		    printf("signaled: %d\n",WTERMSIG(status));
 +		    exit(2);
@@ -37,6 +38,12 @@ $NetBSD: patch-ac,v 1.1 1998/09/03 04:30:28 garbled Exp $
 +		    }
 +		  }
 +	        } /* NetBSD 1.3H */
++#else
++		if (status != 0) {
++		    printf("Bad wait status: 0x%x\n", status);
++		    exit(2);
+ 		}
++#endif
 +	     }  /* else */
  	iter++;
  	}
-- 
cgit v1.2.3