1 files changed, 90 insertions, 126 deletions

diff --git a/benchmarks/lmbench/pkg-plist b/benchmarks/lmbench/pkg-plist
index 3d1d7d078203..ab656e835c22 100644
--- a/benchmarks/lmbench/pkg-plist
+++ b/benchmarks/lmbench/pkg-plist
@@ -1,153 +1,117 @@
 lib/lmbench/Makefile
-lib/lmbench/Results/EXAMPLE
-lib/lmbench/Results/EXAMPLE2
-lib/lmbench/Results/FreeBSD/i586
-lib/lmbench/Results/FreeBSD/i586.1
-lib/lmbench/Results/FreeBSD/i586.2
-lib/lmbench/Results/FreeBSD/i586.3
-lib/lmbench/Results/FreeBSD/i586.4
-lib/lmbench/Results/GS/gs_init.ps
-lib/lmbench/Results/GS/gs_statd.ps
-lib/lmbench/Results/LIST-
-lib/lmbench/Results/Makefile
-lib/lmbench/Results/OUT
-lib/lmbench/Results/PAPER
-lib/lmbench/Results/RCS/Makefile,v
-lib/lmbench/Results/aix/6000-990
-lib/lmbench/Results/aix/powerpc.2
-lib/lmbench/Results/dgux/AViiON
-lib/lmbench/Results/hpux/735
-lib/lmbench/Results/hpux/cello
-lib/lmbench/Results/hpux/hamsky2
-lib/lmbench/Results/hpux/k200
-lib/lmbench/Results/hpux/snake
-lib/lmbench/Results/hpux/wk4
-lib/lmbench/Results/hpux/wk4.4
-lib/lmbench/Results/hpux/wk4.5
-lib/lmbench/Results/i686.predicted
-lib/lmbench/Results/irix/IP19
-lib/lmbench/Results/irix/IP19+
-lib/lmbench/Results/irix/IP19-5.3
-lib/lmbench/Results/irix/IP19-newsched
-lib/lmbench/Results/irix/IP21
-lib/lmbench/Results/irix/IP22
-lib/lmbench/Results/irix/IP22+
-lib/lmbench/Results/irix/IP26
-lib/lmbench/Results/irix/cedar3
-lib/lmbench/Results/linux/aurora.4
-lib/lmbench/Results/linux/i586
-lib/lmbench/Results/linux/i586.1
-lib/lmbench/Results/linux/i586.120
-lib/lmbench/Results/linux/i586.2
-lib/lmbench/Results/linux/i586.3
-lib/lmbench/Results/linux/i586.4
-lib/lmbench/Results/linux/linux
-lib/lmbench/Results/linux/linux.1
-lib/lmbench/Results/linux/pc64
-lib/lmbench/Results/linux/pc64.1
-lib/lmbench/Results/osf1/8400-32.psc.edu
-lib/lmbench/Results/osf1/alpha
-lib/lmbench/Results/osf1/alpha.1
-lib/lmbench/Results/osf1/alpha.2
-lib/lmbench/Results/osf1/alpha.3
-lib/lmbench/Results/osf1/alpha.4
-lib/lmbench/Results/osf1/gauss
-lib/lmbench/Results/osf1/nobozo
-lib/lmbench/Results/solaris/sc1000
-lib/lmbench/Results/solaris/sc2000
-lib/lmbench/Results/solaris/sc2000.1
-lib/lmbench/Results/solaris/ss20.50
-lib/lmbench/Results/solaris/ss20.61
-lib/lmbench/Results/solaris/sun4m
-lib/lmbench/Results/solaris/ultrasparc.10
-lib/lmbench/Results/unixware/alder.2
-lib/lmbench/bin/bsd/bw_file_rd
-lib/lmbench/bin/bsd/bw_mem_cp
-lib/lmbench/bin/bsd/bw_mem_rd
-lib/lmbench/bin/bsd/bw_mem_wr
-lib/lmbench/bin/bsd/bw_mmap_rd
-lib/lmbench/bin/bsd/bw_pipe
-lib/lmbench/bin/bsd/bw_tcp
-lib/lmbench/bin/bsd/hello
-lib/lmbench/bin/bsd/lat_connect
-lib/lmbench/bin/bsd/lat_ctx
-lib/lmbench/bin/bsd/lat_fs
-lib/lmbench/bin/bsd/lat_mem_rd
-lib/lmbench/bin/bsd/lat_mmap
-lib/lmbench/bin/bsd/lat_pagefault
-lib/lmbench/bin/bsd/lat_pipe
-lib/lmbench/bin/bsd/lat_proc
-lib/lmbench/bin/bsd/lat_rpc
-lib/lmbench/bin/bsd/lat_sig
-lib/lmbench/bin/bsd/lat_syscall
-lib/lmbench/bin/bsd/lat_tcp
-lib/lmbench/bin/bsd/lat_udp
-lib/lmbench/bin/bsd/lmdd
-lib/lmbench/bin/bsd/memsize
-lib/lmbench/bin/bsd/mhz
-lib/lmbench/scripts/Makefile
-lib/lmbench/scripts/README
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_tcp.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_udp.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_unix.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_timing.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_mem.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_stats.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_debug.o
+lib/lmbench/bin/%%LMBENCH_OS%%/getopt.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lib_sched.o
+lib/lmbench/bin/%%LMBENCH_OS%%/lmbench.a
+lib/lmbench/bin/%%LMBENCH_OS%%/bw_file_rd
+lib/lmbench/bin/%%LMBENCH_OS%%/bw_mem
+lib/lmbench/bin/%%LMBENCH_OS%%/bw_mmap_rd
+lib/lmbench/bin/%%LMBENCH_OS%%/bw_pipe
+lib/lmbench/bin/%%LMBENCH_OS%%/bw_tcp
+lib/lmbench/bin/%%LMBENCH_OS%%/bw_unix
+lib/lmbench/bin/%%LMBENCH_OS%%/hello
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_select
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_pipe
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_rpc
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_syscall
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_tcp
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_udp
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_mmap
+lib/lmbench/bin/%%LMBENCH_OS%%/mhz
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_proc
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_pagefault
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_connect
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_fs
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_sig
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_mem_rd
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_ctx
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_sem
+lib/lmbench/bin/%%LMBENCH_OS%%/memsize
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_unix
+lib/lmbench/bin/%%LMBENCH_OS%%/lmdd
+lib/lmbench/bin/%%LMBENCH_OS%%/timing_o
+lib/lmbench/bin/%%LMBENCH_OS%%/enough
+lib/lmbench/bin/%%LMBENCH_OS%%/msleep
+lib/lmbench/bin/%%LMBENCH_OS%%/loop_o
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_fifo
+lib/lmbench/bin/%%LMBENCH_OS%%/lmhttp
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_http
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_fcntl
+lib/lmbench/bin/%%LMBENCH_OS%%/disk
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_unix_connect
+lib/lmbench/bin/%%LMBENCH_OS%%/flushdisk
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_ops
+lib/lmbench/bin/%%LMBENCH_OS%%/line
+lib/lmbench/bin/%%LMBENCH_OS%%/tlb
+lib/lmbench/bin/%%LMBENCH_OS%%/par_mem
+lib/lmbench/bin/%%LMBENCH_OS%%/par_ops
+lib/lmbench/bin/%%LMBENCH_OS%%/stream
+lib/lmbench/bin/%%LMBENCH_OS%%/lmbench
+lib/lmbench/bin/%%LMBENCH_OS%%/cache
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_dram_page
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_pmake
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_rand
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_usleep
+lib/lmbench/bin/%%LMBENCH_OS%%/lat_cmd
 lib/lmbench/scripts/allctx
 lib/lmbench/scripts/allmem
 lib/lmbench/scripts/bargraph
 lib/lmbench/scripts/bghtml
+lib/lmbench/scripts/build
+lib/lmbench/scripts/compiler
+lib/lmbench/scripts/config
 lib/lmbench/scripts/config-run
+lib/lmbench/scripts/config-scaling
 lib/lmbench/scripts/depend
+lib/lmbench/scripts/do_ctx
 lib/lmbench/scripts/getbg
+lib/lmbench/scripts/getbw
 lib/lmbench/scripts/getctx
+lib/lmbench/scripts/getdisk
 lib/lmbench/scripts/getlist
 lib/lmbench/scripts/getmax
 lib/lmbench/scripts/getmem
 lib/lmbench/scripts/getpercent
+lib/lmbench/scripts/getresults
 lib/lmbench/scripts/getsummary
 lib/lmbench/scripts/gifs
+lib/lmbench/scripts/gnu-os
 lib/lmbench/scripts/graph
 lib/lmbench/scripts/html-list
 lib/lmbench/scripts/html-man
+lib/lmbench/scripts/info
 lib/lmbench/scripts/lmbench
+lib/lmbench/scripts/info-template
+lib/lmbench/scripts/make
+lib/lmbench/scripts/Makefile
 lib/lmbench/scripts/man2html
+lib/lmbench/scripts/mkrelease
+lib/lmbench/scripts/new2oldctx
+lib/lmbench/scripts/opercent
 lib/lmbench/scripts/os
+lib/lmbench/scripts/output
+lib/lmbench/scripts/percent
 lib/lmbench/scripts/rccs
+lib/lmbench/scripts/README
 lib/lmbench/scripts/results
 lib/lmbench/scripts/save
+lib/lmbench/scripts/SHIT
+lib/lmbench/scripts/stats
+lib/lmbench/scripts/statsummary
+lib/lmbench/scripts/synchronize
+lib/lmbench/scripts/target
+lib/lmbench/scripts/TODO
+lib/lmbench/scripts/version
 lib/lmbench/scripts/xroff
-lib/lmbench/scripts/RCS/rccs,v
-lib/lmbench/scripts/RCS/bargraph,v
-lib/lmbench/scripts/RCS/depend,v
-lib/lmbench/scripts/RCS/getbg,v
-lib/lmbench/scripts/RCS/getctx,v
-lib/lmbench/scripts/RCS/getlist,v
-lib/lmbench/scripts/RCS/getmax,v
-lib/lmbench/scripts/RCS/getmem,v
-lib/lmbench/scripts/RCS/graph,v
-lib/lmbench/scripts/RCS/getpercent,v
-lib/lmbench/scripts/RCS/getsummary,v
-lib/lmbench/scripts/RCS/lmbench,v
-lib/lmbench/scripts/RCS/os,v
-lib/lmbench/scripts/RCS/save,v
-lib/lmbench/scripts/RCS/xroff,v
-lib/lmbench/scripts/RCS/README,v
-lib/lmbench/scripts/RCS/Makefile,v
-lib/lmbench/scripts/RCS/results,v
-lib/lmbench/scripts/RCS/config-run,v
-lib/lmbench/scripts/RCS/allmem,v
-lib/lmbench/scripts/RCS/allctx,v
-@dirrm lib/lmbench/Results/FreeBSD
-@dirrm lib/lmbench/Results/GS
-@dirrm lib/lmbench/Results/PS
-@dirrm lib/lmbench/Results/RCS
-@dirrm lib/lmbench/Results/aix
-@dirrm lib/lmbench/Results/dgux
-@dirrm lib/lmbench/Results/hpux
-@dirrm lib/lmbench/Results/irix
-@dirrm lib/lmbench/Results/linux
-@dirrm lib/lmbench/Results/osf1
-@dirrm lib/lmbench/Results/solaris
-@dirrm lib/lmbench/Results/tmp
-@dirrm lib/lmbench/Results/unixware
-@dirrm lib/lmbench/Results
-@dirrm lib/lmbench/bin/bsd
-@dirrm lib/lmbench/bin
-@dirrm lib/lmbench/scripts/RCS
+lib/lmbench/results/Makefile
+@dirrm lib/lmbench/results
 @dirrm lib/lmbench/scripts
+@dirrm lib/lmbench/bin/%%LMBENCH_OS%%
+@dirrm lib/lmbench/bin
 @dirrm lib/lmbench