pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/benchmarks/lmbench Moved the helper binaries from bin/...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/624de27c1bde
branches:  trunk
changeset: 518106:624de27c1bde
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Aug 31 18:04:08 2006 +0000

description:
Moved the helper binaries from bin/lmbench/ to libexec/lmbench. Bumped
PKGREVISION.

diffstat:

 benchmarks/lmbench/Makefile         |    8 +-
 benchmarks/lmbench/PLIST            |  154 ++++++++++++++++++------------------
 benchmarks/lmbench/distinfo         |   12 +-
 benchmarks/lmbench/files/do-install |   16 +-
 benchmarks/lmbench/patches/patch-af |   35 ++++---
 benchmarks/lmbench/patches/patch-ag |   11 +-
 benchmarks/lmbench/patches/patch-ah |   10 +-
 benchmarks/lmbench/patches/patch-ai |    8 +-
 benchmarks/lmbench/patches/patch-aj |    4 +-
 9 files changed, 130 insertions(+), 128 deletions(-)

diffs (truncated from 483 to 300 lines):

diff -r ad289702385d -r 624de27c1bde benchmarks/lmbench/Makefile
--- a/benchmarks/lmbench/Makefile       Thu Aug 31 18:02:41 2006 +0000
+++ b/benchmarks/lmbench/Makefile       Thu Aug 31 18:04:08 2006 +0000
@@ -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 @@
 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 @@
 
 .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 -r ad289702385d -r 624de27c1bde benchmarks/lmbench/PLIST
--- a/benchmarks/lmbench/PLIST  Thu Aug 31 18:02:41 2006 +0000
+++ b/benchmarks/lmbench/PLIST  Thu Aug 31 18:04:08 2006 +0000
@@ -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 @@
 @dirrm share/lmbench/webpage-lm/gifs
 @dirrm share/lmbench/webpage-lm/pictures
 @dirrm share/lmbench/webpage-lm
-@dirrm bin/lmbench
+@dirrm libexec/lmbench
diff -r ad289702385d -r 624de27c1bde benchmarks/lmbench/distinfo
--- a/benchmarks/lmbench/distinfo       Thu Aug 31 18:02:41 2006 +0000
+++ b/benchmarks/lmbench/distinfo       Thu Aug 31 18:04:08 2006 +0000
@@ -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-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 -r ad289702385d -r 624de27c1bde benchmarks/lmbench/files/do-install
--- a/benchmarks/lmbench/files/do-install       Thu Aug 31 18:02:41 2006 +0000
+++ b/benchmarks/lmbench/files/do-install       Thu Aug 31 18:04:08 2006 +0000
@@ -10,27 +10,27 @@
 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 -r ad289702385d -r 624de27c1bde benchmarks/lmbench/patches/patch-af
--- a/benchmarks/lmbench/patches/patch-af       Thu Aug 31 18:02:41 2006 +0000
+++ b/benchmarks/lmbench/patches/patch-af       Thu Aug 31 18:04:08 2006 +0000
@@ -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 @@
  # 1.23 98/07/31 lm%lm.bitmover.com@localhost
  
 -OS=`../scripts/os`
-+OS=`@PREFIX@/bin/lmbench/os`
++OS=`@PREFIX@/libexec/lmbench/os`
  L='====================================================================='
  echo $L; 
  cat<<EOF;
@@ -16,24 +17,24 @@
  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."



Home | Main Index | Thread Index | Old Index