[pkgsrc/trunk]: pkgsrc/benchmarks/lmbench Fixed unprivileged builds. Added ba...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a718c07625a1
branches:  trunk
changeset: 515072:a718c07625a1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jun 24 08:44:33 2006 +0000

description:
Fixed unprivileged builds. Added basic error checking. Bumped PKGREVISION.

diffstat:

 benchmarks/lmbench/Makefile         |   6 +++---
 benchmarks/lmbench/files/do-install |  11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (57 lines):

diff -r aae1e0246713 -r a718c07625a1 benchmarks/lmbench/Makefile
--- a/benchmarks/lmbench/Makefile       Sat Jun 24 08:37:40 2006 +0000
+++ b/benchmarks/lmbench/Makefile       Sat Jun 24 08:44:33 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2006/06/08 14:58:38 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2006/06/24 08:44:33 rillig Exp $
 
 DISTNAME=              lmbench-2alpha11
 PKGNAME=               lmbench-2.11a
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            benchmarks
 MASTER_SITES=          ftp://ftp.bitmover.com/lmbench/
 EXTRACT_SUFX=          .tgz
@@ -37,7 +37,7 @@
        ${CHMOD} 0755 ${WRKSRC}/scripts/lmbench
 
 do-install:
-       ${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} \
+       ${SETENV} ${MAKE_ENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} \
                INSTALL_PROGRAM=${INSTALL:Q} ${FILESDIR}/do-install
 
 .include "../../mk/bsd.prefs.mk"
diff -r aae1e0246713 -r a718c07625a1 benchmarks/lmbench/files/do-install
--- a/benchmarks/lmbench/files/do-install       Sat Jun 24 08:37:40 2006 +0000
+++ b/benchmarks/lmbench/files/do-install       Sat Jun 24 08:44:33 2006 +0000
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 cd $WRKSRC
 DIR=`ls -1d bin/*`
@@ -12,19 +13,19 @@
 mkdir -p $PREFIX/bin/lmbench
 mkdir -p $PREFIX/share/lmbench
 for files in $BINS; do
-       $INSTALL_PROGRAM -c -s -o bin -g bin -m 0755 bin/$OSDIR/$files $PREFIX/bin/lmbench
+       $BSD_INSTALL_PROGRAM bin/$OSDIR/$files $PREFIX/bin/lmbench
 done
 for files in $SCRIPTS; do
-       $INSTALL_PROGRAM -c -o bin -g bin -m 0755 scripts/$files $PREFIX/bin/lmbench
+       $BSD_INSTALL_SCRIPT scripts/$files $PREFIX/bin/lmbench
 done
 for files in $MAN1; do
-       $INSTALL_PROGRAM -c -o bin -g bin -m 0444 doc/$files $PREFIX/man/man1
+       $BSD_INSTALL_MAN doc/$files $PREFIX/man/man1
 done
 for files in $MAN8; do
-       $INSTALL_PROGRAM -c -o bin -g bin -m 0444 doc/$files $PREFIX/man/man8
+       $BSD_INSTALL_MAN doc/$files $PREFIX/man/man8
 done
 for files in $MAN3; do
-       $INSTALL_PROGRAM -c -o bin -g bin -m 0444 doc/$files $PREFIX/man/man3
+       $BSD_INSTALL_MAN doc/$files $PREFIX/man/man3
 done
 cat <<EOF >$PREFIX/bin/run-lmbench
 #!/bin/sh