[pkgsrc/trunk]: pkgsrc/benchmarks/hbench Doesn't hide the output from the pos...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a71f1e3e97db
branches:  trunk
changeset: 505026:a71f1e3e97db
user:      reed <reed%pkgsrc.org@localhost>
date:      Thu Dec 29 03:26:28 2005 +0000

description:
Doesn't hide the output from the post-configure and do-install steps (I
needed for troubleshooting). And use BINOWN and BINGRP because user "bin"
and group "bin" don't exist on some systems.

Use BSD_INSTALL_PROGRAM, BSD_INSTALL_DATA and BSD_INSTALL_SCRIPT
instead of calling /usr/bin/install directly.

Okayed by maintainer.

Bumped PKGREVISION, since ownership of files may be different on
some systems.

diffstat:

 benchmarks/hbench/Makefile         |  11 ++++++-----
 benchmarks/hbench/files/do-install |  10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (75 lines):

diff -r d3654b9b2ed5 -r a71f1e3e97db benchmarks/hbench/Makefile
--- a/benchmarks/hbench/Makefile        Wed Dec 28 22:41:27 2005 +0000
+++ b/benchmarks/hbench/Makefile        Thu Dec 29 03:26:28 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2005/07/16 19:10:37 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/29 03:26:28 reed Exp $
 
 DISTNAME=              hbench-OS-1.0
 PKGNAME=               hbench-1.0
-PKGREVISION=   2
+PKGREVISION=           3
 CATEGORIES=            benchmarks
 MASTER_SITES=  http://www.eecs.harvard.edu/vino/perf/hbench/
 
@@ -22,7 +22,7 @@
 DIST_SUBDIR=           ${PKGNAME_NOREV}
 
 post-configure:
-       @cd ${WRKSRC};                                                  \
+       cd ${WRKSRC};                                                   \
        for f in scripts/create-all-analyses                            \
                scripts/create-all-latgraphs                            \
                scripts/create-all-summaries scripts/gen-analysis       \
@@ -32,10 +32,11 @@
                ${MV} $$f $$f.in;                                       \
                ${SED} -e 's|@PREFIX@|${PREFIX}|g' $$f.in > $$f;        \
        done
-       @ ${CHMOD} 0755 ${WRKSRC}/scripts/*
+       ${CHMOD} 0755 ${WRKSRC}/scripts/*
 
 do-install:
-       @${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} ${FILESDIR}/do-install
+       ${SETENV} ${MAKE_ENV} WRKSRC=${WRKSRC} BINOWN=${BINOWN} \
+               BINGRP=${BINGRP} ${FILESDIR}/do-install
 
 benchmark:
        @if [ `id -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi
diff -r d3654b9b2ed5 -r a71f1e3e97db benchmarks/hbench/files/do-install
--- a/benchmarks/hbench/files/do-install        Wed Dec 28 22:41:27 2005 +0000
+++ b/benchmarks/hbench/files/do-install        Thu Dec 29 03:26:28 2005 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: do-install,v 1.1 2001/10/26 12:54:24 agc Exp $
+# $NetBSD: do-install,v 1.2 2005/12/29 03:26:28 reed Exp $
 #
 
 cd $WRKSRC
@@ -15,22 +15,22 @@
 for basedir in $DIRS; do
        OSDIR=`basename $basedir`
        mkdir -p $PREFIX/bin/hbench/$OSDIR
-       /usr/bin/install -c -s -o bin -g bin -m 0755 bin/$OSDIR/* $PREFIX/bin/hbench/$OSDIR
+       $BSD_INSTALL_PROGRAM bin/$OSDIR/* $PREFIX/bin/hbench/$OSDIR
 done
 
 for files in $SCRIPTS; do
-       /usr/bin/install -c -o bin -g bin -m 0755 scripts/$files $PREFIX/bin/hbench
+       $BSD_INSTALL_SCRIPT scripts/$files $PREFIX/bin/hbench
 done
 mkdir -p $PREFIX/share/doc/hbench
 for files in $DOCS; do
-       /usr/bin/install -c -o bin -g bin -m 0444 doc/$files $PREFIX/share/doc/hbench
+       $BSD_INSTALL_DATA doc/$files $PREFIX/share/doc/hbench
 done
 cat <<EOF >$PREFIX/bin/run-hbench
 #!/bin/sh
 ${PREFIX}/bin/hbench/interactive-setup
 ${PREFIX}/bin/hbench/maindriver ${PREFIX}/share/hbench/conf/`hostname`.run
 EOF
-chown bin:bin ${PREFIX}/bin/run-hbench
+chown $BINOWN:$BINGRP ${PREFIX}/bin/run-hbench
 chmod 0755 ${PREFIX}/bin/run-hbench
 cp Results/Makefile $PREFIX/share/hbench/Results
 cp -R conf $PREFIX/share/hbench