Fixed the PLIST generation for NetBSD.

4 files changed, 65 insertions, 61 deletions

diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 08130dd7f79..3f9df7d658e 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/02/05 23:08:19 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/03/11 03:44:20 rillig Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
@@ -21,9 +21,13 @@ USE_TOOLS+=		perl:run
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
+GET_ARCH_CMD=		${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$//'
+GET_OS_CMD=		${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^.*-.*-//'
+PLIST_SUBST+=		PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q}
+
 pre-configure:
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/scripts
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/scripts
+	${INSTALL} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/scripts
+	${INSTALL} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/scripts
 
 post-configure:
 	cd ${WRKSRC};							\
diff --git a/benchmarks/hbench/PLIST.common b/benchmarks/hbench/PLIST.common
index 2c957484604..1153c1a7e15 100644
--- a/benchmarks/hbench/PLIST.common
+++ b/benchmarks/hbench/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2005/02/21 20:51:21 veego Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2006/03/11 03:44:20 rillig Exp $
 bin/hbench/argsort
 bin/hbench/config.guess
 bin/hbench/config.sub
@@ -14,32 +14,32 @@ bin/hbench/interactive-setup
 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/hbench/${PLATFORM}/bw_bzero
+bin/hbench/${PLATFORM}/bw_file_rd
+bin/hbench/${PLATFORM}/bw_mem_cp
+bin/hbench/${PLATFORM}/bw_mem_rd
+bin/hbench/${PLATFORM}/bw_mem_wr
+bin/hbench/${PLATFORM}/bw_mmap_rd
+bin/hbench/${PLATFORM}/bw_pipe
+bin/hbench/${PLATFORM}/bw_tcp
+bin/hbench/${PLATFORM}/hello
+bin/hbench/${PLATFORM}/hello-s
+bin/hbench/${PLATFORM}/lat_connect
+bin/hbench/${PLATFORM}/lat_ctx
+bin/hbench/${PLATFORM}/lat_ctx2
+bin/hbench/${PLATFORM}/lat_fs
+bin/hbench/${PLATFORM}/lat_fslayer
+bin/hbench/${PLATFORM}/lat_mem_rd
+bin/hbench/${PLATFORM}/lat_mmap
+bin/hbench/${PLATFORM}/lat_pipe
+bin/hbench/${PLATFORM}/lat_proc
+bin/hbench/${PLATFORM}/lat_rpc
+bin/hbench/${PLATFORM}/lat_sig
+bin/hbench/${PLATFORM}/lat_syscall
+bin/hbench/${PLATFORM}/lat_tcp
+bin/hbench/${PLATFORM}/lat_udp
+bin/hbench/${PLATFORM}/memsize
+bin/hbench/${PLATFORM}/mhz
 bin/run-hbench
 share/doc/hbench/README
 share/doc/hbench/benchmark-descriptions
diff --git a/benchmarks/hbench/PLIST.common_end b/benchmarks/hbench/PLIST.common_end
index c9373778d5c..67ad4777c31 100644
--- a/benchmarks/hbench/PLIST.common_end
+++ b/benchmarks/hbench/PLIST.common_end
@@ -1,5 +1,5 @@
-@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}
+@comment $NetBSD: PLIST.common_end,v 1.2 2006/03/11 03:44:20 rillig Exp $
+@dirrm bin/hbench/${PLATFORM}
 @dirrm bin/hbench
 @dirrm share/doc/hbench
 @dirrm share/hbench/Results
diff --git a/benchmarks/hbench/PLIST.i386 b/benchmarks/hbench/PLIST.i386
index 25a2c1dd21e..ccabd786ae0 100644
--- a/benchmarks/hbench/PLIST.i386
+++ b/benchmarks/hbench/PLIST.i386
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST.i386,v 1.1 2001/10/31 23:48:36 zuntum Exp $
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_bzero
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_file_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_mem_cp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_mem_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_mem_wr
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_mmap_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_pipe
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/bw_tcp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/hello
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/hello-s
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_connect
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_ctx
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_ctx2
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_fs
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_fslayer
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_mem_rd
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_mmap
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_pipe
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_proc
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_rpc
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_sig
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_syscall
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_tcp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/lat_udp
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/memsize
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/mhz
-bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c/mhz-counter
-@dirrm bin/hbench/${LOWER_OPSYS}${OS_VERSION}-${MACHINE_ARCH}-c
+@comment $NetBSD: PLIST.i386,v 1.2 2006/03/11 03:44:20 rillig Exp $
+bin/hbench/${PLATFORM}-c/bw_bzero
+bin/hbench/${PLATFORM}-c/bw_file_rd
+bin/hbench/${PLATFORM}-c/bw_mem_cp
+bin/hbench/${PLATFORM}-c/bw_mem_rd
+bin/hbench/${PLATFORM}-c/bw_mem_wr
+bin/hbench/${PLATFORM}-c/bw_mmap_rd
+bin/hbench/${PLATFORM}-c/bw_pipe
+bin/hbench/${PLATFORM}-c/bw_tcp
+bin/hbench/${PLATFORM}-c/hello
+bin/hbench/${PLATFORM}-c/hello-s
+bin/hbench/${PLATFORM}-c/lat_connect
+bin/hbench/${PLATFORM}-c/lat_ctx
+bin/hbench/${PLATFORM}-c/lat_ctx2
+bin/hbench/${PLATFORM}-c/lat_fs
+bin/hbench/${PLATFORM}-c/lat_fslayer
+bin/hbench/${PLATFORM}-c/lat_mem_rd
+bin/hbench/${PLATFORM}-c/lat_mmap
+bin/hbench/${PLATFORM}-c/lat_pipe
+bin/hbench/${PLATFORM}-c/lat_proc
+bin/hbench/${PLATFORM}-c/lat_rpc
+bin/hbench/${PLATFORM}-c/lat_sig
+bin/hbench/${PLATFORM}-c/lat_syscall
+bin/hbench/${PLATFORM}-c/lat_tcp
+bin/hbench/${PLATFORM}-c/lat_udp
+bin/hbench/${PLATFORM}-c/memsize
+bin/hbench/${PLATFORM}-c/mhz
+bin/hbench/${PLATFORM}-c/mhz-counter
+@dirrm bin/hbench/${PLATFORM}-c