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.

20 files changed, 80 insertions, 80 deletions

diff --git a/misc/9menu/Makefile b/misc/9menu/Makefile
index 085de2e1642..dc776912a8e 100644
--- a/misc/9menu/Makefile
+++ b/misc/9menu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/09/09 02:43:11 obache Exp $
+# $NetBSD: Makefile,v 1.20 2007/01/07 09:14:00 rillig Exp $
 
 DISTNAME=		9menu-1.8
 PKGREVISION=		1
@@ -13,12 +13,12 @@ MAKE_FILE=		Makefile.noimake
 BUILD_TARGET=		9menu
 
 WRKSRC=			${WRKDIR}
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/9menu ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/9menu.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile
index 28175411bcb..ecd2934c2db 100644
--- a/misc/ascii/Makefile
+++ b/misc/ascii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	ascii-3.0
@@ -11,11 +11,11 @@ COMMENT=	ASCII character table program
 
 BUILD_TARGET= ascii
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ascii ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ascii.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ascii.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ascii
 	${INSTALL_DATA} ${WRKSRC}/ascii.cgi ${PREFIX}/share/examples/ascii
 
diff --git a/misc/asr-manpages/Makefile b/misc/asr-manpages/Makefile
index e24ee84625e..3aeca5c316d 100644
--- a/misc/asr-manpages/Makefile
+++ b/misc/asr-manpages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	asr.pages
@@ -14,25 +14,25 @@ COMMENT=	alt.sysadmin.recovery man page distribution
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 DIST_SUBDIR=	${PKGNAME_NOREV}
-INSTALLATION_DIRS=	man/man1 man/man2 man/man3 man5 man/man8
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${PKGMANDIR}/man2 ${PKGMANDIR}/man3 man5 ${PKGMANDIR}/man8
 
 do-install:
-	${INSTALL_MAN} ${WRKDIR}/bosskill.8	${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/c.1		${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/chastise.3	${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKDIR}/ctluser.8	${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/guru.8		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/knife.8	${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/lart.1m	${PREFIX}/man/man1/lart.1
-	${INSTALL_MAN} ${WRKDIR}/luser.8	${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/normality.5	${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKDIR}/nuke.8		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/people.2	${PREFIX}/man/man2
-	${INSTALL_MAN} ${WRKDIR}/pmsd.8		${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKDIR}/rtfm.1		${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/slave.1	${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/sysadmin.1	${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/think.1	${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/whack.1	${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/bosskill.8	${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/c.1		${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKDIR}/chastise.3	${PREFIX}/${PKGMANDIR}/man3
+	${INSTALL_MAN} ${WRKDIR}/ctluser.8	${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/guru.8		${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/knife.8	${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/lart.1m	${PREFIX}/${PKGMANDIR}/man1/lart.1
+	${INSTALL_MAN} ${WRKDIR}/luser.8	${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/normality.5	${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_MAN} ${WRKDIR}/nuke.8		${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/people.2	${PREFIX}/${PKGMANDIR}/man2
+	${INSTALL_MAN} ${WRKDIR}/pmsd.8		${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKDIR}/rtfm.1		${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKDIR}/slave.1	${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKDIR}/sysadmin.1	${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKDIR}/think.1	${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKDIR}/whack.1	${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/autocue/Makefile b/misc/autocue/Makefile
index db4637a92a5..b944d76d765 100644
--- a/misc/autocue/Makefile
+++ b/misc/autocue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:10:07 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	autocue-20060129
@@ -18,6 +18,6 @@ do-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autocue ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/autocue.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/autocue.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/bbappconf/Makefile b/misc/bbappconf/Makefile
index 6d03bab7cb3..326d1b9360c 100644
--- a/misc/bbappconf/Makefile
+++ b/misc/bbappconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:10:07 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	bbappconf-0.0.2
@@ -24,7 +24,7 @@ post-patch:
 	${MV} ${WRKSRC}/data/README.bbappconf.tmp ${WRKSRC}/data/README.bbappconf
 
 post-install:
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/data/bbappconf.1 ${PREFIX}/man/man1
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/data/bbappconf.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile
index fbf782376ce..87e327b4995 100644
--- a/misc/bbweather/Makefile
+++ b/misc/bbweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/05/13 21:06:02 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	bbweather-0.6.2
@@ -21,7 +21,7 @@ USE_TOOLS+=		gunzip perl:run
 .include "../../mk/x11.buildlink3.mk"
 
 post-install:
-	cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} GrabWeather.1.gz
-	cd ${PREFIX}/man/man1 && ${GUNZIP_CMD} bbweather.1.gz
+	cd ${PREFIX}/${PKGMANDIR}/man1 && ${GUNZIP_CMD} GrabWeather.1.gz
+	cd ${PREFIX}/${PKGMANDIR}/man1 && ${GUNZIP_CMD} bbweather.1.gz
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 436ee674b73..e44cbe5355a 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/16 17:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	colorize_0.3.0
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 NO_BUILD=	yes
 
 USE_TOOLS+=		gunzip perl:run
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		color
 SUBST_STAGE.color=	pre-configure
@@ -35,7 +35,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/colorize.pl ${PREFIX}/bin/colorize
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/colorize
 	${INSTALL_DATA} ${WRKSRC}/colorizerc ${PREFIX}/share/examples/colorize
-	${INSTALL_MAN} ${WRKSRC}/colorize.pl.1 ${PREFIX}/man/man1/colorize.1
+	${INSTALL_MAN} ${WRKSRC}/colorize.pl.1 ${PREFIX}/${PKGMANDIR}/man1/colorize.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/colorize
 	cd ${WRKSRC} && ${INSTALL_DATA} README TIPS ${PREFIX}/share/doc/colorize
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/colorize-fifo.sh		\
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 4ffe0fe01c7..732f2dff5a6 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:00 rillig Exp $
 
 DISTNAME=		ls
 PKGNAME=		colorls-2.2
@@ -16,7 +16,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 MANCOMPRESSED_IF_MANZ=	yes
 MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} \
 			MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}
-INSTALLATION_DIRS=	bin man/man1 man/cat1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/cat1
 
 pre-patch:
 	${CP} ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index cdec7dfffe2..02d40f1dc52 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/07/22 04:46:17 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:00 rillig Exp $
 
 DISTNAME=	colortail-0.3.0
 CATEGORIES=	misc
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=--datadir=${PREFIX}/share/examples/colortail
 DESCR_SRC=	${WRKDIR}/.DESCR_SRC
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/colortail.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/colortail.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/colortail
 	cd ${WRKSRC}/example-conf/ && \
 	${INSTALL_DATA} conf.kernel conf.messages conf.secure \
diff --git a/misc/cowsay/Makefile b/misc/cowsay/Makefile
index ed82f2613b5..f7822c6bbe3 100644
--- a/misc/cowsay/Makefile
+++ b/misc/cowsay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:00 rillig Exp $
 
 DISTNAME=		cowsay-3.03
 PKGREVISION=		1
@@ -20,13 +20,13 @@ SUBST_SED.pap=		-e "s|%BANGPERL%|!${PERL5}|" -e "s|%PREFIX%|${PREFIX}|"
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
-INSTALLATION_DIRS=	bin man/man1 share/cows
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/cows
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cowsay ${PREFIX}/bin
 	cd ${PREFIX}/bin; ${LN} -s cowsay cowthink
-	${INSTALL_DATA} ${WRKSRC}/cowsay.1 ${PREFIX}/man/man1
-	cd ${PREFIX}/man/man1; ${LN} -s cowsay.1 cowthink.1
+	${INSTALL_DATA} ${WRKSRC}/cowsay.1 ${PREFIX}/${PKGMANDIR}/man1
+	cd ${PREFIX}/${PKGMANDIR}/man1; ${LN} -s cowsay.1 cowthink.1
 	${INSTALL_DATA} ${WRKSRC}/cows/*.cow ${PREFIX}/share/cows
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/cuetools/Makefile b/misc/cuetools/Makefile
index 61251bae5a6..41bda1b53e7 100644
--- a/misc/cuetools/Makefile
+++ b/misc/cuetools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/07/22 00:45:10 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	cuetools-1.2
@@ -14,18 +14,18 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	flex gmake yacc
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/cuebreakpoints ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/cueconvert ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/cueprint ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/man/cuebreakpoints.man \
-		${PREFIX}/man/man1/cuebreakpoints.1
+		${PREFIX}/${PKGMANDIR}/man1/cuebreakpoints.1
 	${INSTALL_DATA} ${WRKSRC}/man/cueconvert.man \
-		${PREFIX}/man/man1/cueconvert.1
+		${PREFIX}/${PKGMANDIR}/man1/cueconvert.1
 	${INSTALL_DATA} ${WRKSRC}/man/cueprint.man \
-		${PREFIX}/man/man1/cueprint.1
+		${PREFIX}/${PKGMANDIR}/man1/cueprint.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cuetools/
 	${INSTALL_DATA} ${WRKSRC}/formats.txt ${PREFIX}/share/doc/cuetools/
 
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 263e1089df9..dddf0ac8985 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:00 rillig Exp $
 #
 
 DISTNAME=	coreutils-5.2.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		YES
 PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/dircolors \
@@ -27,9 +27,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ls \
 		${PREFIX}/bin/${GNU_PROGRAM_PREFIX}ls
 	${INSTALL_DATA} ${WRKSRC}/man/dircolors.1 \
-		${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}dircolors.1
+		${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}dircolors.1
 	${INSTALL_DATA} ${WRKSRC}/man/ls.1 \
-		${PREFIX}/man/man1/${GNU_PROGRAM_PREFIX}ls.1
+		${PREFIX}/${PKGMANDIR}/man1/${GNU_PROGRAM_PREFIX}ls.1
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/misc/jhd/Makefile b/misc/jhd/Makefile
index 91c3af0c662..16266c8b572 100644
--- a/misc/jhd/Makefile
+++ b/misc/jhd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/05/26 19:09:43 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:01 rillig Exp $
 
 DISTNAME=	jhd-2.3
 CATEGORIES=	japanese misc
@@ -9,13 +9,13 @@ COMMENT=	Japanese Hexadecimal Dump
 
 BUILD_DEPENDS+=	nkf>=1.7:../../converters/nkf
 
-INSTALLATION_DIRS=	bin man/ja_JP.EUC/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 post-build:
 	@(cd ${WRKSRC}; ${MV} jhd.1 jhd.1.org; nkf -e jhd.1.org > jhd.1)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jhd ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/jhd.1 ${PREFIX}/man/ja_JP.EUC/man1
+	${INSTALL_MAN} ${WRKSRC}/jhd.1 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index ad994ca3d2e..fa557af66a0 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:01 rillig Exp $
 
 DISTNAME=		jive-1.1
 CATEGORIES=		misc
@@ -8,12 +8,12 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 COMMENT=		Filter that converts English text to Jive
 
 WRKSRC=			${WRKDIR}/jive
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 USE_TOOLS+=		flex
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jive ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/jive.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/jive.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 6347879ee7e..0058785a846 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:01 rillig Exp $
 #
 
 DISTNAME=       mmv_1.01b.orig
@@ -19,10 +19,10 @@ BUILD_TARGET=	mmv
 CFLAGS+=	-DIS_SYSV
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mmv ${PREFIX}/bin/mmv
-	${INSTALL_MAN} ${WRKSRC}/mmv.1 ${PREFIX}/man/man1/mmv.1
+	${INSTALL_MAN} ${WRKSRC}/mmv.1 ${PREFIX}/${PKGMANDIR}/man1/mmv.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/multitail/Makefile b/misc/multitail/Makefile
index 1516075eb95..81a9994f0c9 100644
--- a/misc/multitail/Makefile
+++ b/misc/multitail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/25 00:01:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:01 rillig Exp $
 #
 
 DISTNAME=	multitail-4.0.6
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.vanheusden.com/multitail/
 COMMENT=	View one or multiple files
 
 USE_NCURSES=		yes	# Needs the <panel> library.
-INSTALLATION_DIRS=	bin man/man1 share/doc/multitail share/examples/multitail
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/multitail share/examples/multitail
 
 CONF_FILES=	${PREFIX:Q}/share/examples/multitail/multitail.conf	\
 		${PKG_SYSCONFDIR:Q}/multitail.conf
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index 11ec09cb2b1..86d3847b45f 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/15 13:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:01 rillig Exp $
 
 DISTNAME=	reed-5.4
 PKGREVISION=	2
@@ -18,15 +18,15 @@ REPLACE_PERL=		breed fix_bookmarks.pl wrap
 # wgetnstr()
 INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-U]-*
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/reed ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/breed ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/wrap ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/breed.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/reed.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/wrap.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/breed.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/reed.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/wrap.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/reed
 	${INSTALL_DATA} ${WRKSRC}/help ${PREFIX}/share/reed/
 
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index 4680358d308..9468e731251 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:13 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:01 rillig Exp $
 
 DISTNAME=		splitvt-1.6.3
 CATEGORIES=		misc
@@ -10,10 +10,10 @@ COMMENT=		Run two shells in a split window/terminal
 BUILD_TARGET=
 CONFIGURE_SCRIPT=	./Configure
 HAS_CONFIGURE=		yes
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile
index b418185fa1d..ef4e9b123b5 100644
--- a/misc/ttyrec/Makefile
+++ b/misc/ttyrec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/09/09 13:48:02 obache Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:01 rillig Exp $
 
 DISTNAME=	ttyrec-1.0.8
 CATEGORIES=	misc
@@ -14,14 +14,14 @@ COMMENT=	ttyrec is a tty recorder
 CFLAGS+=	-DSVR4
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttyplay ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ttyrec ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ttytime ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ttyplay.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/ttyrec.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/ttytime.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ttyplay.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/ttyrec.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/ttytime.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/xjdic/Makefile b/misc/xjdic/Makefile
index aab80c9ec7b..fe8bf687201 100644
--- a/misc/xjdic/Makefile
+++ b/misc/xjdic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:13 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:01 rillig Exp $
 #
 
 DISTNAME=	xjdic24
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}
 MESSAGE_SUBST+=	PREFIX=${PREFIX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 		cd ${WRKSRC} ; \
@@ -50,7 +50,7 @@ do-install:
 			${WRKSRC}/xjdic24.inf \
 			${WRKSRC}/xjdic24.install \
 			${PREFIX}/share/doc/xjdic
-		${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1
+		${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/${PKGMANDIR}/man1
 		${LN} -s ../edict/edict ${PREFIX}/share/xjdic/edict
 		${LN} -s ../kanjidic/kanjidic ${PREFIX}/share/xjdic/kanjidic
 		${PREFIX}/bin/xjdxgen ${PREFIX}/share/xjdic/edict