Do the PLIST substitutions more efficiently, and use the new OS_VERSION

substitution when compiling the PLIST. Eliminate the unnecessary command
execution from the package Makefile, which was incorrect.

3 files changed, 63 insertions, 66 deletions

diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index ce6cdf213ff..fcaf90eb854 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/11/12 16:15:29 agc Exp $
+# $NetBSD: Makefile,v 1.5 1998/11/16 11:27:54 agc Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
@@ -13,19 +13,16 @@ DEPENDS+=		gnuplot-3.5:../../graphics/gnuplot
 ALL_TARGET=		build
 USE_PERL5=		yes
 WRKSRC=			${WRKDIR}/hbench-OS
-NETBSDVER!=		${ECHO} `uname -s|tr '[A-Z]' '[a-z]'``uname -r`-`uname -m`
-ARCH!=			${ECHO} `uname -m`
 
 PLIST_SRC=		${WRKDIR}/PLIST-src
 
 post-patch:
-	@if [ ${ARCH} = i386 ];then					\
-		extrafiles=${PKGDIR}/PLIST.i386;			\
-	else								\
-		extrafiles="";						\
+	@machfiles="";							\
+	if [ ${MACHINE} = i386 ]; then					\
+		machfiles="$$machfiles ${PKGDIR}/PLIST.i386";		\
 	fi ;								\
-	${CAT} ${PKGDIR}/PLIST.md $$extrafiles ${PKGDIR}/PLIST.common |	\
-		${SED} -e 's@XXXNETBSDVERXXX@${NETBSDVER}@' > ${PLIST_SRC}
+	${CAT} ${PKGDIR}/PLIST.md $$machfiles ${PKGDIR}/PLIST.common |	\
+		${SED} -e 's|@OPSYS@|'`${ECHO} ${OPSYS} | ${TR} '[A-Z]' '[a-z]'`'|g' > ${PLIST_SRC}
 
 post-configure:
 	@cd ${WRKSRC};							\
diff --git a/benchmarks/hbench/pkg/PLIST.i386 b/benchmarks/hbench/pkg/PLIST.i386
index e1485b06a37..e9d0b4c6de4 100644
--- a/benchmarks/hbench/pkg/PLIST.i386
+++ b/benchmarks/hbench/pkg/PLIST.i386
@@ -1,29 +1,29 @@
-@comment $NetBSD: PLIST.i386,v 1.1 1998/09/05 22:02:21 garbled Exp $
-bin/hbench/XXXNETBSDVERXXX-c/bw_bzero
-bin/hbench/XXXNETBSDVERXXX-c/bw_file_rd
-bin/hbench/XXXNETBSDVERXXX-c/bw_mem_cp
-bin/hbench/XXXNETBSDVERXXX-c/bw_mem_rd
-bin/hbench/XXXNETBSDVERXXX-c/bw_mem_wr
-bin/hbench/XXXNETBSDVERXXX-c/bw_mmap_rd
-bin/hbench/XXXNETBSDVERXXX-c/bw_pipe
-bin/hbench/XXXNETBSDVERXXX-c/bw_tcp
-bin/hbench/XXXNETBSDVERXXX-c/hello
-bin/hbench/XXXNETBSDVERXXX-c/hello-s
-bin/hbench/XXXNETBSDVERXXX-c/lat_connect
-bin/hbench/XXXNETBSDVERXXX-c/lat_ctx
-bin/hbench/XXXNETBSDVERXXX-c/lat_ctx2
-bin/hbench/XXXNETBSDVERXXX-c/lat_fs
-bin/hbench/XXXNETBSDVERXXX-c/lat_fslayer
-bin/hbench/XXXNETBSDVERXXX-c/lat_mem_rd
-bin/hbench/XXXNETBSDVERXXX-c/lat_mmap
-bin/hbench/XXXNETBSDVERXXX-c/lat_pipe
-bin/hbench/XXXNETBSDVERXXX-c/lat_proc
-bin/hbench/XXXNETBSDVERXXX-c/lat_rpc
-bin/hbench/XXXNETBSDVERXXX-c/lat_sig
-bin/hbench/XXXNETBSDVERXXX-c/lat_syscall
-bin/hbench/XXXNETBSDVERXXX-c/lat_tcp
-bin/hbench/XXXNETBSDVERXXX-c/lat_udp
-bin/hbench/XXXNETBSDVERXXX-c/memsize
-bin/hbench/XXXNETBSDVERXXX-c/mhz
-bin/hbench/XXXNETBSDVERXXX-c/mhz-counter
-@dirrm bin/hbench/XXXNETBSDVERXXX-c
+@comment $NetBSD: PLIST.i386,v 1.2 1998/11/16 11:27:55 agc Exp $
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_bzero
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_file_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_mem_cp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_mem_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_mem_wr
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_mmap_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_pipe
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/bw_tcp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/hello
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/hello-s
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_connect
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_ctx
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_ctx2
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_fs
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_fslayer
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_mem_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_mmap
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_pipe
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_proc
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_rpc
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_sig
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_syscall
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_tcp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/lat_udp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/memsize
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/mhz
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c/mhz-counter
+@dirrm bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}-c
diff --git a/benchmarks/hbench/pkg/PLIST.md b/benchmarks/hbench/pkg/PLIST.md
index 0c8ae8d2c43..68de86cb436 100644
--- a/benchmarks/hbench/pkg/PLIST.md
+++ b/benchmarks/hbench/pkg/PLIST.md
@@ -1,28 +1,28 @@
-@comment $NetBSD: PLIST.md,v 1.1 1998/09/05 22:02:21 garbled Exp $
-bin/hbench/XXXNETBSDVERXXX/bw_bzero
-bin/hbench/XXXNETBSDVERXXX/bw_file_rd
-bin/hbench/XXXNETBSDVERXXX/bw_mem_cp
-bin/hbench/XXXNETBSDVERXXX/bw_mem_rd
-bin/hbench/XXXNETBSDVERXXX/bw_mem_wr
-bin/hbench/XXXNETBSDVERXXX/bw_mmap_rd
-bin/hbench/XXXNETBSDVERXXX/bw_pipe
-bin/hbench/XXXNETBSDVERXXX/bw_tcp
-bin/hbench/XXXNETBSDVERXXX/hello
-bin/hbench/XXXNETBSDVERXXX/hello-s
-bin/hbench/XXXNETBSDVERXXX/lat_connect
-bin/hbench/XXXNETBSDVERXXX/lat_ctx
-bin/hbench/XXXNETBSDVERXXX/lat_ctx2
-bin/hbench/XXXNETBSDVERXXX/lat_fs
-bin/hbench/XXXNETBSDVERXXX/lat_fslayer
-bin/hbench/XXXNETBSDVERXXX/lat_mem_rd
-bin/hbench/XXXNETBSDVERXXX/lat_mmap
-bin/hbench/XXXNETBSDVERXXX/lat_pipe
-bin/hbench/XXXNETBSDVERXXX/lat_proc
-bin/hbench/XXXNETBSDVERXXX/lat_rpc
-bin/hbench/XXXNETBSDVERXXX/lat_sig
-bin/hbench/XXXNETBSDVERXXX/lat_syscall
-bin/hbench/XXXNETBSDVERXXX/lat_tcp
-bin/hbench/XXXNETBSDVERXXX/lat_udp
-bin/hbench/XXXNETBSDVERXXX/memsize
-bin/hbench/XXXNETBSDVERXXX/mhz
-@dirrm bin/hbench/XXXNETBSDVERXXX
+@comment $NetBSD: PLIST.md,v 1.2 1998/11/16 11:27:55 agc Exp $
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_bzero
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_file_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_mem_cp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_mem_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_mem_wr
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_mmap_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_pipe
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/bw_tcp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/hello
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/hello-s
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_connect
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_ctx
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_ctx2
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_fs
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_fslayer
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_mem_rd
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_mmap
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_pipe
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_proc
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_rpc
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_sig
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_syscall
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_tcp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/lat_udp
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/memsize
+bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}/mhz
+@dirrm bin/hbench/@OPSYS@${OS_VERSION}-${MACHINE_ARCH}