summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-08-31 18:04:08 +0000
committerrillig <rillig@pkgsrc.org>2006-08-31 18:04:08 +0000
commitd821c93ad1f47ae72b0f052aa1fbb80cb1f36da6 (patch)
tree79d79de8e12d46d696f42c8e930e0519886f55a1
parent9b5c8ba117acad9d9a198cd794b9f5b786abed32 (diff)
downloadpkgsrc-d821c93ad1f47ae72b0f052aa1fbb80cb1f36da6.tar.gz
Moved the helper binaries from bin/lmbench/ to libexec/lmbench. Bumped
PKGREVISION.
-rw-r--r--benchmarks/lmbench/Makefile8
-rw-r--r--benchmarks/lmbench/PLIST154
-rw-r--r--benchmarks/lmbench/distinfo12
-rwxr-xr-xbenchmarks/lmbench/files/do-install16
-rw-r--r--benchmarks/lmbench/patches/patch-af35
-rw-r--r--benchmarks/lmbench/patches/patch-ag11
-rw-r--r--benchmarks/lmbench/patches/patch-ah10
-rw-r--r--benchmarks/lmbench/patches/patch-ai8
-rw-r--r--benchmarks/lmbench/patches/patch-aj4
9 files changed, 130 insertions, 128 deletions
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index f2c9e98381c..d5cc25221cf 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/07/02 20:25:34 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/08/31 18:04:08 rillig Exp $
DISTNAME= lmbench-2alpha11
PKGNAME= lmbench-2.11a
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.bitmover.com/lmbench/
EXTRACT_SUFX= .tgz
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake perl:run
BUILD_TARGET= build
MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
-INSTALLATION_DIRS= man/man1 man/man3 man/man8
+INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man8
post-extract:
${INSTALL_SCRIPT} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/scripts/gnu-os
@@ -45,7 +45,7 @@ do-install:
.include "../../mk/bsd.prefs.mk"
benchmark:
- if [ ! -f ${PREFIX}/bin/lmbench/hello ]; then \
+ if [ ! -f ${PREFIX}/libexec/lmbench/hello ]; then \
${ECHO} "*** This benchmark must be installed to run"; \
exit 1; \
fi
diff --git a/benchmarks/lmbench/PLIST b/benchmarks/lmbench/PLIST
index 530040b0dc0..e89fbae7893 100644
--- a/benchmarks/lmbench/PLIST
+++ b/benchmarks/lmbench/PLIST
@@ -1,80 +1,80 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:45:29 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/08/31 18:04:08 rillig Exp $
bin/run-lmbench
-bin/lmbench/bw_file_rd
-bin/lmbench/bw_mem
-bin/lmbench/bw_mmap_rd
-bin/lmbench/bw_pipe
-bin/lmbench/bw_tcp
-bin/lmbench/bw_unix
-bin/lmbench/disk
-bin/lmbench/enough
-bin/lmbench/flushdisk
-bin/lmbench/hello
-bin/lmbench/lat_connect
-bin/lmbench/lat_ctx
-bin/lmbench/lat_fifo
-bin/lmbench/lat_fs
-bin/lmbench/lat_http
-bin/lmbench/lat_mem_rd
-bin/lmbench/lat_mmap
-bin/lmbench/lat_pagefault
-bin/lmbench/lat_pipe
-bin/lmbench/lat_proc
-bin/lmbench/lat_rpc
-bin/lmbench/lat_select
-bin/lmbench/lat_sig
-bin/lmbench/lat_syscall
-bin/lmbench/lat_tcp
-bin/lmbench/lat_udp
-bin/lmbench/lmdd
-bin/lmbench/lat_unix
-bin/lmbench/lat_unix_connect
-bin/lmbench/lmhttp
-bin/lmbench/loop_o
-bin/lmbench/memsize
-bin/lmbench/mhz
-bin/lmbench/msleep
-bin/lmbench/timing_o
-bin/lmbench/allctx
-bin/lmbench/allmem
-bin/lmbench/bargraph
-bin/lmbench/bghtml
-bin/lmbench/compiler
-bin/lmbench/config
-bin/lmbench/config-run
-bin/lmbench/depend
-bin/lmbench/do_ctx
-bin/lmbench/getbg
-bin/lmbench/getbw
-bin/lmbench/getctx
-bin/lmbench/getdisk
-bin/lmbench/getlist
-bin/lmbench/getmax
-bin/lmbench/getmem
-bin/lmbench/getpercent
-bin/lmbench/getsummary
-bin/lmbench/gifs
-bin/lmbench/gnu-os
-bin/lmbench/graph
-bin/lmbench/os
-bin/lmbench/html-list
-bin/lmbench/html-man
-bin/lmbench/info
-bin/lmbench/info-template
-bin/lmbench/lmbench
-bin/lmbench/man2html
-bin/lmbench/mkrelease
-bin/lmbench/new2oldctx
-bin/lmbench/opercent
-bin/lmbench/percent
-bin/lmbench/rccs
-bin/lmbench/results
-bin/lmbench/save
-bin/lmbench/stats
-bin/lmbench/synchronize
-bin/lmbench/target
-bin/lmbench/version
-bin/lmbench/xroff
+libexec/lmbench/bw_file_rd
+libexec/lmbench/bw_mem
+libexec/lmbench/bw_mmap_rd
+libexec/lmbench/bw_pipe
+libexec/lmbench/bw_tcp
+libexec/lmbench/bw_unix
+libexec/lmbench/disk
+libexec/lmbench/enough
+libexec/lmbench/flushdisk
+libexec/lmbench/hello
+libexec/lmbench/lat_connect
+libexec/lmbench/lat_ctx
+libexec/lmbench/lat_fifo
+libexec/lmbench/lat_fs
+libexec/lmbench/lat_http
+libexec/lmbench/lat_mem_rd
+libexec/lmbench/lat_mmap
+libexec/lmbench/lat_pagefault
+libexec/lmbench/lat_pipe
+libexec/lmbench/lat_proc
+libexec/lmbench/lat_rpc
+libexec/lmbench/lat_select
+libexec/lmbench/lat_sig
+libexec/lmbench/lat_syscall
+libexec/lmbench/lat_tcp
+libexec/lmbench/lat_udp
+libexec/lmbench/lmdd
+libexec/lmbench/lat_unix
+libexec/lmbench/lat_unix_connect
+libexec/lmbench/lmhttp
+libexec/lmbench/loop_o
+libexec/lmbench/memsize
+libexec/lmbench/mhz
+libexec/lmbench/msleep
+libexec/lmbench/timing_o
+libexec/lmbench/allctx
+libexec/lmbench/allmem
+libexec/lmbench/bargraph
+libexec/lmbench/bghtml
+libexec/lmbench/compiler
+libexec/lmbench/config
+libexec/lmbench/config-run
+libexec/lmbench/depend
+libexec/lmbench/do_ctx
+libexec/lmbench/getbg
+libexec/lmbench/getbw
+libexec/lmbench/getctx
+libexec/lmbench/getdisk
+libexec/lmbench/getlist
+libexec/lmbench/getmax
+libexec/lmbench/getmem
+libexec/lmbench/getpercent
+libexec/lmbench/getsummary
+libexec/lmbench/gifs
+libexec/lmbench/gnu-os
+libexec/lmbench/graph
+libexec/lmbench/os
+libexec/lmbench/html-list
+libexec/lmbench/html-man
+libexec/lmbench/info
+libexec/lmbench/info-template
+libexec/lmbench/lmbench
+libexec/lmbench/man2html
+libexec/lmbench/mkrelease
+libexec/lmbench/new2oldctx
+libexec/lmbench/opercent
+libexec/lmbench/percent
+libexec/lmbench/rccs
+libexec/lmbench/results
+libexec/lmbench/save
+libexec/lmbench/stats
+libexec/lmbench/synchronize
+libexec/lmbench/target
+libexec/lmbench/version
+libexec/lmbench/xroff
man/man1/graph.1
man/man1/bargraph.1
man/man3/lmbench.3
@@ -121,4 +121,4 @@ share/lmbench/webpage-lm/pictures/me-small.jpg
@dirrm share/lmbench/webpage-lm/gifs
@dirrm share/lmbench/webpage-lm/pictures
@dirrm share/lmbench/webpage-lm
-@dirrm bin/lmbench
+@dirrm libexec/lmbench
diff --git a/benchmarks/lmbench/distinfo b/benchmarks/lmbench/distinfo
index 4003416c40c..7a4e16ff766 100644
--- a/benchmarks/lmbench/distinfo
+++ b/benchmarks/lmbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $
+$NetBSD: distinfo,v 1.10 2006/08/31 18:04:08 rillig Exp $
SHA1 (lmbench-2alpha11.tgz) = 7480815b8f8d4000647db59eb6160e9dbac06490
RMD160 (lmbench-2alpha11.tgz) = 361401104fd5ea3a6e0a26a754ffd66fb2d9e9d6
@@ -8,9 +8,9 @@ SHA1 (patch-ab) = b25c659fd808535738591892c552b062bb7e7e8f
SHA1 (patch-ac) = 2aa73fbf3119db95ca483f676bd3f3c2fd25c8f6
SHA1 (patch-ad) = a196e6a4734de9a0d698d38f1691b1146bda45a2
SHA1 (patch-ae) = 6d55be411c3b1e02fb269a24c1fd115e6e86855a
-SHA1 (patch-af) = 9390d4b6fa950beb0020b44ad520dd22a8a2178e
-SHA1 (patch-ag) = cf5d1f3cf24b9fb6ab4a1a84ad8a44fda858add4
-SHA1 (patch-ah) = 3784e219af5be023bc7fe00dd8656f5af100279c
-SHA1 (patch-ai) = 81f3695239b96dfa848a6bc47f739038efc79dca
-SHA1 (patch-aj) = c0ddc2b95dab57b96f886dedcd6f253eadd9bf70
+SHA1 (patch-af) = cd7ae198a225c69a7111a0a9478929223e7daf79
+SHA1 (patch-ag) = ff7937e90faf3457b7b6bba93d9013a500dc85b3
+SHA1 (patch-ah) = 5b9a372f0ed668372bac00c3591e4ea30c6eff85
+SHA1 (patch-ai) = efe147c16805af6272051436b2f5674943c34b24
+SHA1 (patch-aj) = c813a620ee80f051d73d5bd40297aaebad5dc85d
SHA1 (patch-ak) = 486db292921675cac78b8e266da84ca04ed8d697
diff --git a/benchmarks/lmbench/files/do-install b/benchmarks/lmbench/files/do-install
index 917283eee2b..dd807e2f042 100755
--- a/benchmarks/lmbench/files/do-install
+++ b/benchmarks/lmbench/files/do-install
@@ -10,27 +10,27 @@ MAN3="lmbench.3 reporting.3 results.3 timing.3"
MAN8="lmbench.8 lat_proc.8 lat_mmap.8 lat_ctx.8 lat_syscall.8 lat_pipe.8 lat_tcp.8 lat_udp.8 lat_rpc.8 lat_connect.8 lat_fs.8 lat_pagefault.8 lat_mem_rd.8 bw_file_rd.8 bw_mem_cp.8 bw_mem_rd.8 bw_mem_wr.8 bw_mmap_rd.8 bw_pipe.8 bw_tcp.8 mhz.8 lmdd.8"
MAN1="bargraph.1 graph.1"
-mkdir -p $PREFIX/bin/lmbench
+mkdir -p $PREFIX/libexec/lmbench
mkdir -p $PREFIX/share/lmbench
for files in $BINS; do
- $BSD_INSTALL_PROGRAM bin/$OSDIR/$files $PREFIX/bin/lmbench
+ $BSD_INSTALL_PROGRAM bin/$OSDIR/$files $PREFIX/libexec/lmbench
done
for files in $SCRIPTS; do
- $BSD_INSTALL_SCRIPT scripts/$files $PREFIX/bin/lmbench
+ $BSD_INSTALL_SCRIPT scripts/$files $PREFIX/libexec/lmbench
done
for files in $MAN1; do
- $BSD_INSTALL_MAN doc/$files $PREFIX/man/man1
+ $BSD_INSTALL_MAN doc/$files $PREFIX/$PKGMANDIR/man1
done
for files in $MAN8; do
- $BSD_INSTALL_MAN doc/$files $PREFIX/man/man8
+ $BSD_INSTALL_MAN doc/$files $PREFIX/$PKGMANDIR/man8
done
for files in $MAN3; do
- $BSD_INSTALL_MAN doc/$files $PREFIX/man/man3
+ $BSD_INSTALL_MAN doc/$files $PREFIX/$PKGMANDIR/man3
done
cat <<EOF >$PREFIX/bin/run-lmbench
#!/bin/sh
-${PREFIX}/bin/lmbench/config-run
-${PREFIX}/bin/lmbench/results
+${PREFIX}/libexec/lmbench/config-run
+${PREFIX}/libexec/lmbench/results
EOF
chmod 0755 ${PREFIX}/bin/run-lmbench
cp -R src/webpage-lm $PREFIX/share/lmbench
diff --git a/benchmarks/lmbench/patches/patch-af b/benchmarks/lmbench/patches/patch-af
index ca7fffca509..a0a5b1fb33c 100644
--- a/benchmarks/lmbench/patches/patch-af
+++ b/benchmarks/lmbench/patches/patch-af
@@ -1,4 +1,5 @@
-$NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
+$NetBSD: patch-af,v 1.3 2006/08/31 18:04:08 rillig Exp $
+
--- scripts/config-run.orig Fri Jul 31 12:55:19 1998
+++ scripts/config-run Sun Aug 30 08:08:52 1998
@@ -3,7 +3,7 @@
@@ -6,7 +7,7 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
# 1.23 98/07/31 lm@lm.bitmover.com
-OS=`../scripts/os`
-+OS=`@PREFIX@/bin/lmbench/os`
++OS=`@PREFIX@/libexec/lmbench/os`
L='====================================================================='
echo $L;
cat<<EOF;
@@ -16,24 +17,24 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
echo "Hang on, we are calculating your timing granularity."
-../bin/$OS/msleep 250
-ENOUGH=`../bin/$OS/enough`
-+@PREFIX@/bin/lmbench/msleep 250
-+ENOUGH=`@PREFIX@/bin/lmbench/enough`
++@PREFIX@/libexec/lmbench/msleep 250
++ENOUGH=`@PREFIX@/libexec/lmbench/enough`
export ENOUGH
echo "OK, it looks like you can time stuff down to $ENOUGH usec resolution."
echo ""
echo "Hang on, we are calculating your timing overhead."
-../bin/$OS/msleep 250
-TIMING_O=`../bin/$OS/timing_o`
-+@PREFIX@/bin/lmbench/msleep 250
-+TIMING_O=`@PREFIX@/bin/lmbench/timing_o`
++@PREFIX@/libexec/lmbench/msleep 250
++TIMING_O=`@PREFIX@/libexec/lmbench/timing_o`
export TIMING_O
echo "OK, it looks like your gettimeofday() costs $TIMING_O usecs."
echo ""
echo "Hang on, we are calculating your loop overhead."
-../bin/$OS/msleep 250
-LOOP_O=`../bin/$OS/loop_o`
-+@PREFIX@/bin/lmbench/msleep 250
-+LOOP_O=`@PREFIX@/bin/lmbench/loop_o`
++@PREFIX@/libexec/lmbench/msleep 250
++LOOP_O=`@PREFIX@/libexec/lmbench/loop_o`
export LOOP_O
echo "OK, it looks like your benchmark loop costs $LOOP_O usecs."
echo ""
@@ -44,9 +45,9 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
-AVAILMEM=`../bin/$OS/memsize $MB`
-AVAILMEM=`../bin/$OS/memsize $MB`
-AVAILMEM=`../bin/$OS/memsize $MB`
-+AVAILMEM=`@PREFIX@/bin/lmbench/memsize $MB`
-+AVAILMEM=`@PREFIX@/bin/lmbench/memsize $MB`
-+AVAILMEM=`@PREFIX@/bin/lmbench/memsize $MB`
++AVAILMEM=`@PREFIX@/libexec/lmbench/memsize $MB`
++AVAILMEM=`@PREFIX@/libexec/lmbench/memsize $MB`
++AVAILMEM=`@PREFIX@/libexec/lmbench/memsize $MB`
if [ $AVAILMEM -lt 8 ]
then echo $0 aborted: Not enough memory, only ${AVAILMEM}MB available.
exit 1
@@ -55,7 +56,7 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
for i in $disks
do if [ -r $i ]
- then ../bin/$OS/flushdisk $i
-+ then @PREFIX@/bin/lmbench/flushdisk $i
++ then @PREFIX@/libexec/lmbench/flushdisk $i
if [ $? -eq 1 ]
then echo "Must be root to run disk benchmarks."
echo "Root is needed to flush the buffer cache"
@@ -64,7 +65,7 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
echo ""
echo "Calculating mhz, please wait for a moment..."
-MHZ=`../bin/$OS/mhz`
-+MHZ=`@PREFIX@/bin/lmbench/mhz`
++MHZ=`@PREFIX@/libexec/lmbench/mhz`
cat > /dev/tty <<EOF
I think your CPU mhz is
@@ -73,13 +74,13 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
esac
-INFO=`../scripts/info`
-+INFO=`@PREFIX@/bin/lmbench/info`
++INFO=`@PREFIX@/libexec/lmbench/info`
if [ $MAIL = yes ]
-then if [ ! -f ../bin/$OS/$INFO ]
- then cp ../scripts/info-template ../bin/$OS/$INFO
- chmod +w ../bin/$OS/$INFO
+then if [ ! -f $INFO ]
-+ then cp @PREFIX@/bin/lmbench/info-template @PREFIX@/share/lmbench/$INFO
++ then cp @PREFIX@/libexec/lmbench/info-template @PREFIX@/share/lmbench/$INFO
+ chmod +w @PREFIX@/share/lmbench/$INFO
REUSE=no
else
@@ -107,8 +108,8 @@ $NetBSD: patch-af,v 1.2 1998/09/24 08:45:00 agc Exp $
EOF
-VERSION=`../scripts/version`
-+VERSION=`@PREFIX@/bin/lmbench/version`
-+CONFIG=@PREFIX@/share/lmbench/`@PREFIX@/bin/lmbench/config`
++VERSION=`@PREFIX@/libexec/lmbench/version`
++CONFIG=@PREFIX@/share/lmbench/`@PREFIX@/libexec/lmbench/config`
-cat<<EOF > ../bin/$OS/`../scripts/config`
+cat <<EOF >$CONFIG
diff --git a/benchmarks/lmbench/patches/patch-ag b/benchmarks/lmbench/patches/patch-ag
index 08719e79172..60a0baf6653 100644
--- a/benchmarks/lmbench/patches/patch-ag
+++ b/benchmarks/lmbench/patches/patch-ag
@@ -1,4 +1,5 @@
-$NetBSD: patch-ag,v 1.2 1998/09/24 08:45:00 agc Exp $
+$NetBSD: patch-ag,v 1.3 2006/08/31 18:04:08 rillig Exp $
+
--- scripts/os.orig Sun Aug 30 05:38:55 1998
+++ scripts/os Sun Aug 30 05:40:06 1998
@@ -1,10 +1,10 @@
@@ -7,12 +8,12 @@ $NetBSD: patch-ag,v 1.2 1998/09/24 08:45:00 agc Exp $
OS=bloat-os
-if [ -f ../scripts/gnu-os ]
-then OS=`../scripts/gnu-os | sed s/unknown-//`
-+if [ -f @PREFIX@/bin/lmbench/gnu-os ]
-+then OS=`@PREFIX@/bin/lmbench/gnu-os | sed s/unknown-//`
++if [ -f @PREFIX@/libexec/lmbench/gnu-os ]
++then OS=`@PREFIX@/libexec/lmbench/gnu-os | sed s/unknown-//`
fi
-if [ -f ../../scripts/gnu-os ]
-then OS=`../../scripts/gnu-os | sed s/unknown-//`
-+if [ -f @PREFIX@/bin/lmbench/gnu-os ]
-+then OS=`@PREFIX@/bin/lmbench/gnu-os | sed s/unknown-//`
++if [ -f @PREFIX@/libexec/lmbench/gnu-os ]
++then OS=`@PREFIX@/libexec/lmbench/gnu-os | sed s/unknown-//`
fi
echo $OS
diff --git a/benchmarks/lmbench/patches/patch-ah b/benchmarks/lmbench/patches/patch-ah
index abbbbcf92d1..3eea1cb5fa0 100644
--- a/benchmarks/lmbench/patches/patch-ah
+++ b/benchmarks/lmbench/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $
+$NetBSD: patch-ah,v 1.5 2006/08/31 18:04:08 rillig Exp $
--- scripts/results.orig Fri Jul 31 21:55:19 1998
+++ scripts/results Mon Nov 15 14:19:57 1999
@@ -7,8 +7,8 @@ $NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $
-CONFIG=`../scripts/config`
-RESULTS=results/$OS
-BASE=../$RESULTS/`uname -n`
-+OS=`@PREFIX@/bin/lmbench/os`
-+CONFIG=`@PREFIX@/bin/lmbench/config`
++OS=`@PREFIX@/libexec/lmbench/os`
++CONFIG=`@PREFIX@/libexec/lmbench/config`
+RESULTS=@PREFIX@/share/lmbench/results/$OS
+BASE=$RESULTS/`uname -n`
EXT=0
@@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $
while [ $SYNC_PID -le $SYNC_MAX ]
do echo Results $SYNC_PID going to ${RESULTS}.$SYNC_PID
- ../../scripts/lmbench $CONFIG 2>../${RESULTS}.$SYNC_PID &
-+ @PREFIX@/bin/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS}.$SYNC_PID &
++ @PREFIX@/libexec/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS}.$SYNC_PID &
SYNC_PID=`expr $SYNC_PID + 1`
done; wait
else echo Results going to ${RESULTS}
@@ -48,7 +48,7 @@ $NetBSD: patch-ah,v 1.4 2005/05/23 08:55:56 rillig Exp $
SYNC_MAX=1
export SYNC_PID SYNC_MAX
- ../../scripts/lmbench $CONFIG 2>../${RESULTS}
-+ @PREFIX@/bin/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS}
++ @PREFIX@/libexec/lmbench/lmbench @PREFIX@/share/lmbench/$CONFIG 2>${RESULTS}
fi
if [ X$MAIL = Xyes ]
diff --git a/benchmarks/lmbench/patches/patch-ai b/benchmarks/lmbench/patches/patch-ai
index 7407a3fe0af..f669ddee0ae 100644
--- a/benchmarks/lmbench/patches/patch-ai
+++ b/benchmarks/lmbench/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.4 2005/05/23 08:55:56 rillig Exp $
+$NetBSD: patch-ai,v 1.5 2006/08/31 18:04:08 rillig Exp $
--- scripts/lmbench.orig Fri Jul 31 21:55:19 1998
+++ scripts/lmbench Mon Nov 15 14:21:29 1999
@@ -6,7 +6,7 @@ $NetBSD: patch-ai,v 1.4 2005/05/23 08:55:56 rillig Exp $
# Make sure we can find: ./cmd, df, and netstat
-PATH=.:../../scripts:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
-+PATH=.:@PREFIX@/bin/lmbench:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
++PATH=.:@PREFIX@/libexec/lmbench:$PATH:/etc:/usr/etc:/sbin:/usr/sbin
export PATH
if [ -f $1 ]
@@ -15,10 +15,10 @@ $NetBSD: patch-ai,v 1.4 2005/05/23 08:55:56 rillig Exp $
lat_unix
if [ $MP = Y ]
-then if [ $SYNC_MAX = $SYNC_PID ]; then cp hello /tmp/hello; fi
-+then if [ $SYNC_MAX = $SYNC_PID ]; then cp @PREFIX@/bin/lmbench/hello /tmp/hello; fi
++then if [ $SYNC_MAX = $SYNC_PID ]; then cp @PREFIX@/libexec/lmbench/hello /tmp/hello; fi
synchronize $SYNC/lat_proc
-else cp hello /tmp/hello
-+else cp @PREFIX@/bin/lmbench/hello /tmp/hello
++else cp @PREFIX@/libexec/lmbench/hello /tmp/hello
fi
lat_proc fork
lat_proc exec
diff --git a/benchmarks/lmbench/patches/patch-aj b/benchmarks/lmbench/patches/patch-aj
index eb559ca64ee..c792b970669 100644
--- a/benchmarks/lmbench/patches/patch-aj
+++ b/benchmarks/lmbench/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.2 1998/09/24 08:45:00 agc Exp $
+$NetBSD: patch-aj,v 1.3 2006/08/31 18:04:08 rillig Exp $
--- results/Makefile.orig Sun Aug 30 09:20:26 1998
+++ results/Makefile Sun Aug 30 09:23:43 1998
@@ -49,7 +49,7 @@
@@ -6,7 +6,7 @@ $NetBSD: patch-aj,v 1.2 1998/09/24 08:45:00 agc Exp $
SHELL=/bin/sh
-SCRIPTS=../scripts/
-+SCRIPTS=@PREFIX@/bin/lmbench/
++SCRIPTS=@PREFIX@/libexec/lmbench/
MISC= tmp/misc_mhz.bg \
tmp/lat_ctx.bg \