pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/benchmarks/hbench Use the extended PLIST_SRC support w...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8dc4d678bf7
branches:  trunk
changeset: 489454:e8dc4d678bf7
user:      veego <veego%pkgsrc.org@localhost>
date:      Mon Feb 21 20:51:21 2005 +0000

description:
Use the extended PLIST_SRC support which now also reads:
PLIST.${MACHINE_ARCH:C/i[3-6]86/i386/g}
PLIST.${OPSYS}-${MACHINE_ARCH:C/i[3-6]86/i386/g}
and remove the package hack for MD PLIST files.

While here merge the PLIST.md file into PLIST.common and put the
@dirrm commands into the new PLIST.common_end

diffstat:

 benchmarks/hbench/Makefile         |  12 +-----------
 benchmarks/hbench/PLIST.common     |  33 +++++++++++++++++++++++++++------
 benchmarks/hbench/PLIST.common_end |   7 +++++++
 benchmarks/hbench/PLIST.md         |  28 ----------------------------
 4 files changed, 35 insertions(+), 45 deletions(-)

diffs (122 lines):

diff -r 5b2955a0bc30 -r e8dc4d678bf7 benchmarks/hbench/Makefile
--- a/benchmarks/hbench/Makefile        Mon Feb 21 20:26:08 2005 +0000
+++ b/benchmarks/hbench/Makefile        Mon Feb 21 20:51:21 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/12/03 15:14:51 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/02/21 20:51:21 veego Exp $
 
 DISTNAME=              hbench-OS-1.0
 PKGNAME=               hbench-1.0
@@ -19,18 +19,8 @@
 OSVERSION_SPECIFIC=    YES
 BUILD_TARGET=          build
 
-PLIST_SRC=             ${WRKDIR}/PLIST-src
-
 DIST_SUBDIR=           ${PKGNAME_NOREV}
 
-post-patch:
-       @machfiles="";                                                  \
-       if [ ${MACHINE} = i386 ]; then                                  \
-               machfiles="$$machfiles ${PKGDIR}/PLIST.${MACHINE}";     \
-       fi ;                                                            \
-       ${CAT} ${PKGDIR}/PLIST.md $$machfiles ${PKGDIR}/PLIST.common    \
-               > ${PLIST_SRC}
-
 post-configure:
        @cd ${WRKSRC};                                                  \
        for f in scripts/create-all-analyses                            \
diff -r 5b2955a0bc30 -r e8dc4d678bf7 benchmarks/hbench/PLIST.common
--- a/benchmarks/hbench/PLIST.common    Mon Feb 21 20:26:08 2005 +0000
+++ b/benchmarks/hbench/PLIST.common    Mon Feb 21 20:51:21 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2001/10/31 23:48:36 zuntum Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2005/02/21 20:51:21 veego Exp $
 bin/hbench/argsort
 bin/hbench/config.guess
 bin/hbench/config.sub
@@ -14,6 +14,32 @@
 bin/hbench/maindriver
 bin/hbench/stats-full
 bin/hbench/stats-single
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_bzero
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_file_rd
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mem_cp
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mem_rd
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mem_wr
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mmap_rd
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_pipe
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_tcp
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/hello
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/hello-s
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_connect
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_ctx
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_ctx2
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_fs
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_fslayer
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_mem_rd
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_mmap
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_pipe
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_proc
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_rpc
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_sig
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_syscall
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_tcp
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_udp
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/memsize
+bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/mhz
 bin/run-hbench
 share/doc/hbench/README
 share/doc/hbench/benchmark-descriptions
@@ -23,8 +49,3 @@
 share/hbench/Results/Makefile
 share/hbench/conf/full.test
 share/hbench/conf/sample.run
-@dirrm bin/hbench
-@dirrm share/doc/hbench
-@dirrm share/hbench/Results
-@dirrm share/hbench/conf
-@dirrm share/hbench
diff -r 5b2955a0bc30 -r e8dc4d678bf7 benchmarks/hbench/PLIST.common_end
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/benchmarks/hbench/PLIST.common_end        Mon Feb 21 20:51:21 2005 +0000
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2005/02/21 20:51:21 veego Exp $
+@dirrm bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}
+@dirrm bin/hbench
+@dirrm share/doc/hbench
+@dirrm share/hbench/Results
+@dirrm share/hbench/conf
+@dirrm share/hbench
diff -r 5b2955a0bc30 -r e8dc4d678bf7 benchmarks/hbench/PLIST.md
--- a/benchmarks/hbench/PLIST.md        Mon Feb 21 20:26:08 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST.md,v 1.1 2001/10/31 23:48:36 zuntum Exp $
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_bzero
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_file_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mem_cp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mem_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mem_wr
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_mmap_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_pipe
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/bw_tcp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/hello
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/hello-s
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_connect
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_ctx
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_ctx2
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_fs
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_fslayer
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_mem_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_mmap
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_pipe
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_proc
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_rpc
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_sig
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_syscall
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_tcp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/lat_udp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/memsize
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}/mhz
-@dirrm bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}



Home | Main Index | Thread Index | Old Index