Mechanically replaced man/* with ${PKGMANDIR}/* in the definition of

INSTALLATION_DIRS, as well as all occurrences of ${PREFIX}/man with
${PREFIX}/${PKGMANDIR}.

Fixes PR 35265, although I did not use the patch provided therein.

8 files changed, 21 insertions, 21 deletions

diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 6647b97a86c..541f3c21e6e 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/06/06 00:02:54 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=       bonnie
 PKGNAME=	bonnie-2.06
@@ -22,7 +22,7 @@ MAKE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
 MAKE_ENV+=		MANOWN=${MANOWN} MANGRP=${MANGRP} MANMODE=${MANMODE}
 MANCOMPRESSED_IF_MANZ=	yes
 
-INSTALLATION_DIRS=	bin man/cat1 man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 post-extract:
 	${MV} ${WRKSRC}/Bonnie.c ${WRKSRC}/bonnie.c
diff --git a/benchmarks/hint/Makefile b/benchmarks/hint/Makefile
index e14fd31f8c9..5e57d1d6156 100644
--- a/benchmarks/hint/Makefile
+++ b/benchmarks/hint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 20:46:42 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	hint_unix_serial
 PKGNAME=	hint.serial-98.06.12
@@ -16,7 +16,7 @@ BUILD_TARGET=	DOUBLE INT
 
 WRKSRC=		${WRKDIR}/unix
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-extract:
 	${CP} ${FILESDIR}/hint.1 ${WRKSRC}/hint.1
@@ -24,7 +24,7 @@ post-extract:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/DOUBLE ${PREFIX}/bin/hint-double
 	${INSTALL_PROGRAM} ${WRKSRC}/INT ${PREFIX}/bin/hint-int
-	${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/hint.1 ${PREFIX}/${PKGMANDIR}/man1
 
 benchmark:
 	cd ${WRKSRC} ; ${MKDIR} data ; ./DOUBLE | tee hint.out
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 9c2f3f80850..ebcaaa7d416 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	iozone3_263
 PKGNAME=	iozone-3.263
@@ -39,11 +39,11 @@ BUILD_TARGET=		${OPSYS}
 BUILD_TARGET=		generic
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/iozone ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/docs/iozone.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/IOzone
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/Iozone_ps.gz \
 		${PREFIX}/share/doc/IOzone
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index 437bc55833b..8d39bf7ea11 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/11/21 10:59:25 tron Exp $
+# $NetBSD: Makefile,v 1.2 2007/01/07 09:13:48 rillig Exp $
 # KAME Id: Makefile,v 1.3 2000/01/21 12:34:29 itojun Exp
 #
 
@@ -19,8 +19,8 @@ CFLAGS.IRIX+=	-DIRIX
 post-install:
 	strip ${PREFIX}/netperf/netperf
 	strip ${PREFIX}/netperf/netserver
-	${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1
-	${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1
+	${INSTALL_MAN} ${WRKSRC}/netperf.man ${PREFIX}/${PKGMANDIR}/man1/netperf.1
+	${INSTALL_MAN} ${WRKSRC}/netserver.man ${PREFIX}/${PKGMANDIR}/man1/netserver.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/netperf
 	${INSTALL_MAN} ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf
 	${GZIP_CMD} ${PREFIX}/share/doc/netperf/netperf.ps
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 02a48aba4d6..9ded7b74e74 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:29:01 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:48 rillig Exp $
 
 DISTNAME=	NetPIPE_2.4
 PKGNAME=	netpipe-2.4
@@ -20,11 +20,11 @@ CFLAGS+=	-DHAVE_GETRUSAGE
 MAKE_ENV+=	EXTRA_LIBS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	cd ${WRKSRC} ; \
 	${INSTALL_PROGRAM} NPtcp ${PREFIX}/bin/NPtcp ; \
-	${INSTALL_MAN} netpipe.1 ${PREFIX}/man/man1/netpipe.1
+	${INSTALL_MAN} netpipe.1 ${PREFIX}/${PKGMANDIR}/man1/netpipe.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/nettest/Makefile b/benchmarks/nettest/Makefile
index ff1eb5eeb3a..ac34a7cd75f 100644
--- a/benchmarks/nettest/Makefile
+++ b/benchmarks/nettest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/01/12 20:49:17 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:48 rillig Exp $
 
 DISTNAME=	nettest.92.11.09
 PKGNAME=	nettest-92.11.09
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/nettest ${PREFIX:Q}/bin/nettest
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 5ec7047772c..498165d3c36 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/04 20:46:42 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:48 rillig Exp $
 
 DISTNAME=	nttcp-1.47
 PKGREVISION=	1
@@ -17,11 +17,11 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 MAKE_ENV+=	LIB="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	cd ${WRKSRC} ; \
 	${INSTALL_PROGRAM} nttcp ${PREFIX}/bin/nttcp ; \
-	${INSTALL_MAN} nttcp.1 ${PREFIX}/man/man1/nttcp.1
+	${INSTALL_MAN} nttcp.1 ${PREFIX}/${PKGMANDIR}/man1/nttcp.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index c3c1c02c33e..5b90ccb4085 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/21 11:49:51 tron Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:48 rillig Exp $
 
 DISTNAME=	ttcp
 PKGNAME=	${DISTNAME}-1.12
@@ -26,7 +26,7 @@ MANCOMPRESSED_IF_MANZ=	YES
 #MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
 #.endif
 
-INSTALLATION_DIRS=	bin man/cat1 man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
 
 .if (${OPSYS} == SunOS)
 do-build: