Use MAN? macros. CATEGORIES+= -> CATEGORIES.

7 files changed, 27 insertions, 35 deletions

diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 769d66f934c8..4446c6be7d66 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -3,21 +3,20 @@
 # Date created:         26 September 1994
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1995/07/13 01:09:03 asami Exp $
+# $Id: Makefile,v 1.3 1995/11/22 11:36:48 asami Exp $
 #
 
 DISTNAME=       Bonnie
 PKGNAME=	bonnie-1.0
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.sunet.se/pub/benchmark/Bonnie/ \
 		ftp://swedishchef.lerc.nasa.gov/drlabs/io/
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	se@FreeBSD.org
 
-CFLAGS+=	-static
+MAN1=		bonnie.1
 
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/bonnie.1
+CFLAGS+=	-static
 
 .include <bsd.port.mk>
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 5fa5bf80879a..54408f371646 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -3,13 +3,13 @@
 # Date created:         28 December 1995
 # Whom:                 se
 #
-# $Id: Makefile,v 1.3 1996/01/03 00:06:21 se Exp $
+# $Id: Makefile,v 1.4 1996/01/05 16:37:50 se Exp $
 #
 
 DISTNAME=       bytebench-3.1
-EXTRACT_SUFX=	.tar.Z
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	se@FreeBSD.org
 
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index f19e51f18228..5c322ad0dd2a 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -3,12 +3,12 @@
 # Date created:         26 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.15 1995/11/22 11:36:56 asami Exp $
+# $Id: Makefile,v 1.16 1996/11/14 08:08:04 ache Exp $
 #
 
 DISTNAME=       iozone
 PKGNAME=	iozone-2.01
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
 DISTFILES=      iozone-2.01.shar.gz
 
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index f19e51f18228..5c322ad0dd2a 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -3,12 +3,12 @@
 # Date created:         26 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.15 1995/11/22 11:36:56 asami Exp $
+# $Id: Makefile,v 1.16 1996/11/14 08:08:04 ache Exp $
 #
 
 DISTNAME=       iozone
 PKGNAME=	iozone-2.01
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
 DISTFILES=      iozone-2.01.shar.gz
 
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 1a07dc8e9fb1..d48f89290538 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -3,16 +3,22 @@
 # Date created:		6 May 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/11/22 11:36:59 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/21 11:35:08 asami Exp $
 #
 
 DISTNAME=	lmbench-1.0
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://forte.mathematik.uni-bremen.de/pub/unix/benchmarks/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
 ALL_TARGET=	build
+MAN1=		bargraph.1 graph.1
+MAN8=		bw_file_rd.8 bw_mem_cp.8 bw_mem_rd.8 bw_mem_wr.8 \
+		bw_mmap_rd.8 bw_pipe.8 bw_tcp.8 lat_connect.8 lat_ctx.8 \
+		lat_fs.8 lat_mem_rd.8 lat_mmap.8 lat_pagefault.8 lat_pipe.8 \
+		lat_proc.8 lat_rpc.8 lat_syscall.8 lat_tcp.8 lat_udp.8 \
+		lmbench.8 lmdd.8 mhz.8
 
 test: build
 	@(cd ${WRKSRC}; make results)
@@ -27,21 +33,11 @@ do-install:
 	cp ${FILESDIR}/Makefile ${PREFIX}/lib/lmbench
 	tar -C ${WRKSRC} -cf - Results bin scripts | \
 	  tar -C ${PREFIX}/lib/lmbench -xf -
-.for man in bargraph.1 graph.1
+.for man in ${MAN1}
 	cp ${WRKSRC}/doc/${man} ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/${man}
-.endif
 .endfor
-.for man in bw_file_rd.8 bw_mem_cp.8 bw_mem_rd.8 bw_mem_wr.8 \
-	  bw_mmap_rd.8 bw_pipe.8 bw_tcp.8 lat_connect.8 lat_ctx.8 \
-	  lat_fs.8 lat_mem_rd.8 lat_mmap.8 lat_pagefault.8 lat_pipe.8 \
-	  lat_proc.8 lat_rpc.8 lat_syscall.8 lat_tcp.8 lat_udp.8 \
-	  lmbench.8 lmdd.8 mhz.8
+.for man in ${MAN8}
 	cp ${WRKSRC}/doc/${man} ${PREFIX}/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man8/${man}
-.endif
 .endfor
 
 .include <bsd.port.mk>
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index 2e5cd05277c5..43a0afafb601 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -3,27 +3,24 @@
 # Date created:		19 July 1996
 # Whom:			koshy
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/03 19:51:04 pst Exp $
+# $Id: Makefile,v 1.2 1996/08/04 08:46:07 asami Exp $
 #
 
 DISTNAME=	netperf-2.1pl1
 PKGNAME=	netperf-2.1.1
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/
 
 MAINTAINER=	pst@freebsd.org
 
 MAKEFILE=	makefile
+MAN1=		netperf.1 netserver.1
 
 post-install:
 	strip ${PREFIX}/netperf/netperf
 	strip ${PREFIX}/netperf/netserver
 	cp ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1
 	cp ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/netperf.1
-	gzip -9nf ${PREFIX}/man/man1/netserver.1
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/netperf
 	cp ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index 5fa5bf80879a..54408f371646 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -3,13 +3,13 @@
 # Date created:         28 December 1995
 # Whom:                 se
 #
-# $Id: Makefile,v 1.3 1996/01/03 00:06:21 se Exp $
+# $Id: Makefile,v 1.4 1996/01/05 16:37:50 se Exp $
 #
 
 DISTNAME=       bytebench-3.1
-EXTRACT_SUFX=	.tar.Z
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	se@FreeBSD.org