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

4 files changed, 35 insertions, 45 deletions

diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index e9acfba546e..6b2b9b41506 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -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 @@ USE_BUILDLINK3=		YES
 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 --git a/benchmarks/hbench/PLIST.common b/benchmarks/hbench/PLIST.common
index b0aa71dd69b..2c957484604 100644
--- a/benchmarks/hbench/PLIST.common
+++ b/benchmarks/hbench/PLIST.common
@@ -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/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/run-hbench
 share/doc/hbench/README
 share/doc/hbench/benchmark-descriptions
@@ -23,8 +49,3 @@ share/doc/hbench/using-hbench
 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 --git a/benchmarks/hbench/PLIST.common_end b/benchmarks/hbench/PLIST.common_end
new file mode 100644
index 00000000000..c9373778d5c
--- /dev/null
+++ b/benchmarks/hbench/PLIST.common_end
@@ -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 --git a/benchmarks/hbench/PLIST.md b/benchmarks/hbench/PLIST.md
deleted file mode 100644
index eb8d29ce3f5..00000000000
--- a/benchmarks/hbench/PLIST.md
+++ /dev/null
@@ -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}