From 3dedd209c7a8ca7ee6ee539cd4dcffd1559c8063 Mon Sep 17 00:00:00 2001 From: mef Date: Sun, 16 Aug 2015 06:39:45 +0000 Subject: [PATCH] Update 2.2.2 to 2.2.3 --------------------- - (Explicit ChangeLog not known) --- benchmarks/nbench/Makefile | 4 ++-- benchmarks/nbench/distinfo | 10 +++++----- benchmarks/nbench/patches/patch-sysinfo.sh | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/benchmarks/nbench/Makefile b/benchmarks/nbench/Makefile index 907d172b406c..c17e87a94ac5 100644 --- a/benchmarks/nbench/Makefile +++ b/benchmarks/nbench/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2012/09/11 22:37:13 asau Exp $ +# $NetBSD: Makefile,v 1.7 2015/08/16 06:39:45 mef Exp $ # -DISTNAME= nbench-byte-2.2.2 +DISTNAME= nbench-byte-2.2.3 PKGNAME= ${DISTNAME:S/-byte//} CATEGORIES= benchmarks MASTER_SITES= http://www.tux.org/~mayer/linux/ diff --git a/benchmarks/nbench/distinfo b/benchmarks/nbench/distinfo index 821a3ae9af7e..6fa66c1f384f 100644 --- a/benchmarks/nbench/distinfo +++ b/benchmarks/nbench/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2011/12/19 13:21:39 wiz Exp $ +$NetBSD: distinfo,v 1.4 2015/08/16 06:39:45 mef Exp $ -SHA1 (nbench-byte-2.2.2.tar.gz) = 2ad7c76fb88f80e475650dd3802c187195cc80c1 -RMD160 (nbench-byte-2.2.2.tar.gz) = 78b8e1eaf3c24ca8c619a90693265402a4f8be68 -Size (nbench-byte-2.2.2.tar.gz) = 111751 bytes +SHA1 (nbench-byte-2.2.3.tar.gz) = f2a03c56dc2bf26e478c2a1828debcafd83983ef +RMD160 (nbench-byte-2.2.3.tar.gz) = a07d2a9f1a6162a5071602e89e6360c13521e463 +Size (nbench-byte-2.2.3.tar.gz) = 111791 bytes SHA1 (patch-aa) = 5beabbb962fc2a56b5561b6d5a3eaa882af3dbd1 SHA1 (patch-ab) = 6308ca09483da37a72e17503ba8d6f342692e508 -SHA1 (patch-sysinfo.sh) = 56ec31e921b199c1926180acde87b30336bb4d1d +SHA1 (patch-sysinfo.sh) = 6846c6cc8d323f83c60fb95a9e6c0cd7b1e2ff5f diff --git a/benchmarks/nbench/patches/patch-sysinfo.sh b/benchmarks/nbench/patches/patch-sysinfo.sh index f7c312d359a3..2edcbe30a59c 100644 --- a/benchmarks/nbench/patches/patch-sysinfo.sh +++ b/benchmarks/nbench/patches/patch-sysinfo.sh @@ -1,15 +1,15 @@ -$NetBSD: patch-sysinfo.sh,v 1.1 2011/12/19 13:21:39 wiz Exp $ +$NetBSD: patch-sysinfo.sh,v 1.2 2015/08/16 06:39:45 mef Exp $ Avoid matching too many lines (trouble with gcc-4.5.3 on NetBSD) ---- sysinfo.sh.orig 2004-12-30 02:58:29.000000000 +0000 -+++ sysinfo.sh -@@ -18,7 +18,7 @@ fi - +--- sysinfo.sh~ 2015-08-16 15:10:42.000000000 +0900 ++++ sysinfo.sh 2015-08-16 15:11:19.000000000 +0900 +@@ -19,7 +19,7 @@ fi compiler=`echo $* | sed -e 's/-static//g' -e 's/-Bstatic//g'` if $TEST `basename $1` = "gcc" && ($compiler -v) >/dev/null 2>&1 ; then -- gccversion=`$compiler -v 2>&1 | sed -e "/version/!d"` -+ gccversion=`$compiler -v 2>&1 | sed -e "/ version/!d"` + # Cygwin writes more than one line with "version" in it +- gccversion=`$compiler -v 2>&1 | sed -e "/version/!d" | tail -n 1` ++ gccversion=`$compiler -v 2>&1 | sed -e "/ version/!d" | tail -n 1` else gccversion="$1" fi