2 files changed, 60 insertions, 29 deletions

diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 47a94eb44ca2..d42d194026f8 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lmbench
 PORTVERSION=	3.0.a9
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	benchmarks
 MASTER_SITES=	SF/${PORTNAME}/development/${PORTNAME}-3.0-a9 http://thegaul.org/src/
@@ -11,25 +11,15 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.a9/-a9/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sacchi@gmail.com
-COMMENT=	A system performance measurement tool
+COMMENT=	System performance measurement tool
 
 ALL_TARGET=	build
 MAKE_ARGS=	CC='${CC}'
 MAKE_ENV=	PATH=${PATH}:${WRKSRC}/scripts
-MAN1=		bargraph.1 graph.1 pgraph.1 rccs.1
-MAN3=		lmbench.3 reporting.3 results.3 timing.3
-MAN8=		bw_file_rd.8 bw_mem.8 bw_mem_rd.8 bw_mmap_rd.8 \
-		bw_pipe.8 bw_tcp.8 bw_unix.8 cache.8 lat_connect.8 \
-		lat_ctx.8 lat_fcntl.8 lat_fifo.8 lat_fs.8 lat_http.8 \
-		lat_mem_rd.8 lat_mmap.8 lat_ops.8 lat_pagefault.8 \
-		lat_pipe.8 lat_proc.8 lat_rpc.8 lat_select.8 lat_sig.8 \
-		lat_syscall.8 lat_tcp.8 lat_udp.8 lat_unix.8 \
-		lat_unix_connect.8 line.8 lmbench.8 lmdd.8 mhz.8 \
-		par_mem.8 par_ops.8 stream.8 tlb.8
+USES=		shebangfix perl5 gmake
+USE_PERL5=	run
+SHEBANG_FILES=	scripts/getresults
 
-USES=		gmake
-
-NO_STAGE=	yes
 # the bindir for the PLIST is:
 # (note that ./os needs to be run inside the work dir, running it
 #  outside will give a different result.)
@@ -57,21 +47,18 @@ post-extract:
 post-build:
 	@${RM} -f ${WRKSRC}/bin/*/*.[os]
 
-pre-install:
-	[ -d ${PREFIX}/lib/lmbench ] || ${MKDIR} ${PREFIX}/lib/lmbench
-
 do-install:
-	${CP} ${FILESDIR}/Makefile ${PREFIX}/lib/lmbench
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/lmbench
+	${CP} ${FILESDIR}/Makefile ${STAGEDIR}${PREFIX}/lib/lmbench
 	tar --exclude \*.orig -C ${WRKSRC} -cf - bin scripts results | \
-	  tar -C ${PREFIX}/lib/lmbench -xf -
-.for man in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/doc/${man} ${PREFIX}/man/man1
-.endfor
-.for man in ${MAN3}
-	${INSTALL_MAN} ${WRKSRC}/doc/${man} ${PREFIX}/man/man3
-.endfor
-.for man in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/doc/${man} ${PREFIX}/man/man8
-.endfor
+	  tar -C ${STAGEDIR}${PREFIX}/lib/lmbench -xf -
+	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/*.3 ${STAGEDIR}${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${STAGEDIR}${PREFIX}/man/man8
+	${ECHO_CMD}  ${STAGEDIR}${PREFIX}/lib/lmbench/bin/*/[^l]* \
+		${STAGEDIR}${PREFIX}/lib/lmbench/bin/*/l[iao]* \
+		${STAGEDIR}${PREFIX}/lib/lmbench/bin/*/lmdd \
+		${STAGEDIR}${PREFIX}/lib/lmbench/bin/*/lmhttp \
+		| ${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/lmbench/pkg-plist b/benchmarks/lmbench/pkg-plist
index c94004446b72..e43c4a607284 100644
--- a/benchmarks/lmbench/pkg-plist
+++ b/benchmarks/lmbench/pkg-plist
@@ -101,6 +101,50 @@ lib/lmbench/scripts/TODO
 lib/lmbench/scripts/version
 lib/lmbench/scripts/xroff
 lib/lmbench/results/Makefile
+man/man1/bargraph.1.gz
+man/man1/graph.1.gz
+man/man1/pgraph.1.gz
+man/man1/rccs.1.gz
+man/man3/lmbench.3.gz
+man/man3/reporting.3.gz
+man/man3/results.3.gz
+man/man3/timing.3.gz
+man/man8/bw_file_rd.8.gz
+man/man8/bw_mem.8.gz
+man/man8/bw_mem_rd.8.gz
+man/man8/bw_mmap_rd.8.gz
+man/man8/bw_pipe.8.gz
+man/man8/bw_tcp.8.gz
+man/man8/bw_unix.8.gz
+man/man8/cache.8.gz
+man/man8/lat_connect.8.gz
+man/man8/lat_ctx.8.gz
+man/man8/lat_fcntl.8.gz
+man/man8/lat_fifo.8.gz
+man/man8/lat_fs.8.gz
+man/man8/lat_http.8.gz
+man/man8/lat_mem_rd.8.gz
+man/man8/lat_mmap.8.gz
+man/man8/lat_ops.8.gz
+man/man8/lat_pagefault.8.gz
+man/man8/lat_pipe.8.gz
+man/man8/lat_proc.8.gz
+man/man8/lat_rpc.8.gz
+man/man8/lat_select.8.gz
+man/man8/lat_sig.8.gz
+man/man8/lat_syscall.8.gz
+man/man8/lat_tcp.8.gz
+man/man8/lat_udp.8.gz
+man/man8/lat_unix.8.gz
+man/man8/lat_unix_connect.8.gz
+man/man8/line.8.gz
+man/man8/lmbench.8.gz
+man/man8/lmdd.8.gz
+man/man8/mhz.8.gz
+man/man8/par_mem.8.gz
+man/man8/par_ops.8.gz
+man/man8/stream.8.gz
+man/man8/tlb.8.gz
 @dirrm lib/lmbench/results
 @dirrm lib/lmbench/scripts
 @dirrm lib/lmbench/bin/%%LMBENCH_OS%%