6 files changed, 53 insertions, 21 deletions

diff --git a/benchmarks/libmicro/Makefile b/benchmarks/libmicro/Makefile
index ef8186054469..cc7a9d9decd4 100644
--- a/benchmarks/libmicro/Makefile
+++ b/benchmarks/libmicro/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	libmicro
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	benchmarks
-MASTER_SITES=	http://opensolaris.org/os/community/performance/libmicro/
+MASTER_SITES=	http://opensolaris.org/os/project/libmicro/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of utilities to benchmark productivity of system calls
diff --git a/benchmarks/libmicro/distinfo b/benchmarks/libmicro/distinfo
index 0b623f32d334..73f8d5edc0a5 100644
--- a/benchmarks/libmicro/distinfo
+++ b/benchmarks/libmicro/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmicro-0.3.0.tar.gz) = 3c2ad95bd6e44e4dccae4bb349818038
-SHA256 (libmicro-0.3.0.tar.gz) = 1673031c579f830f72f74de3c4dc7777db992ec763353ebe0003e38581165e24
-SIZE (libmicro-0.3.0.tar.gz) = 49287
+MD5 (libmicro-0.4.0.tar.gz) = 67ea2541a663bca8cfc9efe435577ea3
+SHA256 (libmicro-0.4.0.tar.gz) = a005694c125d36ee9b089c1c4fb6d102a5f26e28f0282e5855d5661276bf7b7c
+SIZE (libmicro-0.4.0.tar.gz) = 48858
diff --git a/benchmarks/libmicro/files/patch-Makefile b/benchmarks/libmicro/files/patch-Makefile
index 450e5a1e511a..1ac9bb80b091 100644
--- a/benchmarks/libmicro/files/patch-Makefile
+++ b/benchmarks/libmicro/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	Sat Aug  6 14:07:26 2005
-+++ Makefile	Sat Aug  6 14:07:43 2005
-@@ -67,7 +67,7 @@
- 	wrapper		\
+--- Makefile.orig	Tue Jan  8 12:11:55 2008
++++ Makefile	Tue Jan  8 12:12:21 2008
+@@ -68,7 +68,7 @@
+ 	wrapper.sh	\
  	README
  
 -default $(ALL) run cstyle lint tattle: $(BINS)
 +all $(ALL) run cstyle lint tattle: $(BINS)
- 	@chmod +x bench multiview
- 	@mkdir -p bin-`uname -m`; cd bin-`uname -m`; MACH=`uname -m` $(MAKE) -f ../Makefile.`uname -s` $@
- 
+ 	@cp bench.sh bench
+ 	@cp multiview.sh multiview
+ 	@cp wrapper.sh wrapper
diff --git a/benchmarks/libmicro/files/patch-bench b/benchmarks/libmicro/files/patch-bench
index 71dca3fff1c9..11815f7c233e 100644
--- a/benchmarks/libmicro/files/patch-bench
+++ b/benchmarks/libmicro/files/patch-bench
@@ -1,15 +1,15 @@
---- bench.orig	Fri Aug  5 06:35:13 2005
-+++ bench	Tue Aug  9 12:32:52 2005
-@@ -67,7 +67,7 @@
+--- bench.orig	2008-01-12 14:26:38.000000000 +0100
++++ bench	2008-01-12 14:26:59.000000000 +0100
+@@ -65,7 +65,7 @@
  
  touch $IFILE
  
 -ARCH=`arch -k`
-+ARCH=`uname -m`
++ARCH=`uname -p`
  
  # produce benchmark header for easier comparisons
  
-@@ -85,6 +85,12 @@
+@@ -83,6 +83,12 @@
  	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
  fi
  
@@ -22,11 +22,11 @@
  printf "!Libmicro_#:   %30s\n" $libmicro_version
  printf "!Options:      %30s\n" "$OPTS"
  printf "!Machine_name: %30s\n" $hostname
-@@ -156,7 +162,6 @@
+@@ -154,7 +160,6 @@
  memset		$OPTS -N "memset_10k"	-s 10k	-I 600	 
  memset		$OPTS -N "memset_1m"	-s 1m	-I 200000
  memset		$OPTS -N "memset_10m"	-s 10m -I 2000000 
 -memset		$OPTS -N "memsetP2_10m"	-s 10m -P 2 -I 2000000 
  
- memrand		$OPTS -N "memrand"	-s 40m -B 10000
+ memrand		$OPTS -N "memrand"	-s 128m -B 10000
  cachetocache	$OPTS -N "cachetocache" -s 100k -T 2 -I 200
diff --git a/benchmarks/libmicro/files/patch-bench.sh b/benchmarks/libmicro/files/patch-bench.sh
new file mode 100644
index 000000000000..01ec71af5be0
--- /dev/null
+++ b/benchmarks/libmicro/files/patch-bench.sh
@@ -0,0 +1,32 @@
+--- bench.sh.orig	2008-01-12 14:26:38.000000000 +0100
++++ bench.sh	2008-01-12 14:26:59.000000000 +0100
+@@ -65,7 +65,7 @@
+ 
+ touch $IFILE
+ 
+-ARCH=`arch -k`
++ARCH=`uname -p`
+ 
+ # produce benchmark header for easier comparisons
+ 
+@@ -83,6 +83,12 @@
+ 	p_type=`awk -F: '/model name/{print $2; exit}' /proc/cpuinfo`
+ fi
+ 
++if [ F"`uname -s`" = F"FreeBSD" ] ; then
++	p_count=`sysctl -n hw.ncpu`
++	p_mhz=`sysctl -n hw.clockrate`
++	p_type=`sysctl -n hw.model`
++fi
++
+ printf "!Libmicro_#:   %30s\n" $libmicro_version
+ printf "!Options:      %30s\n" "$OPTS"
+ printf "!Machine_name: %30s\n" $hostname
+@@ -154,7 +160,6 @@
+ memset		$OPTS -N "memset_10k"	-s 10k	-I 600	 
+ memset		$OPTS -N "memset_1m"	-s 1m	-I 200000
+ memset		$OPTS -N "memset_10m"	-s 10m -I 2000000 
+-memset		$OPTS -N "memsetP2_10m"	-s 10m -P 2 -I 2000000 
+ 
+ memrand		$OPTS -N "memrand"	-s 128m -B 10000
+ cachetocache	$OPTS -N "cachetocache" -s 100k -T 2 -I 200
diff --git a/benchmarks/libmicro/files/patch-multiview b/benchmarks/libmicro/files/patch-multiview
index c3d1d13c63e1..3850eed72fa6 100644
--- a/benchmarks/libmicro/files/patch-multiview
+++ b/benchmarks/libmicro/files/patch-multiview
@@ -28,10 +28,10 @@
  }
  
  	{ 
-@@ -128,7 +128,7 @@
+@@ -136,7 +136,7 @@
  				
  			for (j = 2; j < ARGC; j++) 
- 				printf("<td align=\"right\">%25s</td>\n", "not computed");
+ 				printf("<td>%s</td>\n", "not computed");
 -			continue;
 +			next;
  		}