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.

22 files changed, 59 insertions, 59 deletions

diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index 1163cf74903..489ef15a0ad 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/28 14:58:32 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=		battalion
 PKGNAME=		battalion-1.4
@@ -23,7 +23,7 @@ USE_TOOLS+=		gtar
 MAKE_ENV+=	LIBFLAGS=-lcompat
 .endif
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL} -c -s -o ${ROOT_USER} -g games -m 2755 ${WRKSRC}/battalion ${PREFIX}/bin
@@ -39,7 +39,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/* ${PREFIX}/share/battalion/battalion.data/SOUNDS
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/* ${PREFIX}/share/battalion/battalion.data/TEXTURES
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${PREFIX}/share/battalion/battalion.data
-	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/man/man6/battalion.6
+	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/${PKGMANDIR}/man6/battalion.6
 	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/* ${PREFIX}/share/battalion/HELP
 	${INSTALL} -o bin -g games -m 664 /dev/null /var/games/battalion_hiscore
 
diff --git a/games/cmatrix/Makefile b/games/cmatrix/Makefile
index 557929c9463..341d1c87f00 100644
--- a/games/cmatrix/Makefile
+++ b/games/cmatrix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:29:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=		cmatrix-1.2a
@@ -11,11 +11,11 @@ COMMENT=		Make your console feel like Nadbuchonazor's bridge
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cmatrix ${PREFIX}/bin/cmatrix
-	${INSTALL_MAN} ${WRKSRC}/cmatrix.1 ${PREFIX}/man/man1/cmatrix.1
+	${INSTALL_MAN} ${WRKSRC}/cmatrix.1 ${PREFIX}/${PKGMANDIR}/man1/cmatrix.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/cmatrix
 	${INSTALL_DATA} ${WRKSRC}/mtx.pcf ${PREFIX}/share/cmatrix/mtx.pcf
 
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 8b8755c6f03..d16739ac562 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:43 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=	frotz-2.43
 PKGREVISION=	2
@@ -21,11 +21,11 @@ INCOMPAT_CURSES=	NetBSD-1.5-* NetBSD-1.5.*-* NetBSD-1.5[A-V]-*
 SAMPLEDIR=	${PREFIX}/share/examples/frotz
 DOCDIR=		${PREFIX}/share/doc/frotz
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/frotz ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/doc/frotz.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA_DIR} ${SAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/frotz.conf-big ${SAMPLEDIR}/frotz.conf
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index c70202c590a..a82fcd4dc96 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 21:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=	icebreaker-1.9.7
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake
 MAKE_ENV+=	mandir="${PREFIX}/man" highscoredir="/var/games"
 MAKE_ENV+=	prefix=${PREFIX:Q}
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icebreaker
@@ -23,7 +23,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} *.ibt *.wav *.bmp \
 		${PREFIX}/share/icebreaker
 	${INSTALL_PROGRAM} -g games -m 2755 ${WRKSRC}/icebreaker ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/icebreaker.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/icebreaker.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icebreaker
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 43209ea64c5..2acbac85932 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=	jetpack
 PKGNAME=	jetpack-1.0
@@ -19,7 +19,7 @@ post-install:
 	@${CHMOD} 2755 ${PREFIX}/bin/jetpack
 	${INSTALL} -o bin -g games -m 664 /dev/null /var/games/jetpack.scores
 	@${CHMOD} 0775 ${PREFIX}/share/jetpack
-	${INSTALL_MAN} ${WRKSRC}/jetpack.man ${PREFIX}/man/man6/jetpack.6
+	${INSTALL_MAN} ${WRKSRC}/jetpack.man ${PREFIX}/${PKGMANDIR}/man6/jetpack.6
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index 2815d864cc8..f3400675d19 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/08/07 19:35:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=		kajaani-kombat-0.7
@@ -11,11 +11,11 @@ COMMENT=		Rampart-like multiplayer game set in space
 
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/kajaani-kombat.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/kajaani-kombat.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/kajaani-kombat
 	${INSTALL_DATA} ${WRKSRC}/*.ogg ${PREFIX}/share/kajaani-kombat
 	${INSTALL_DATA} ${WRKSRC}/*.png ${PREFIX}/share/kajaani-kombat
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 1a0643bcdc8..aa83337be8c 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/07/02 10:11:09 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=	lincity-1.12.1
 PKGREVISION=	1
@@ -23,7 +23,7 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/lincity/opening
 
 post-install:
-	${LN} -sf lincity.6 ${PREFIX}/man/man6/xlincity.6
+	${LN} -sf lincity.6 ${PREFIX}/${PKGMANDIR}/man6/xlincity.6
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/games/omega/Makefile b/games/omega/Makefile
index 16110c9bd63..594a5968253 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/04 21:29:43 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=	omega-0.90.4-src
 PKGNAME=	omega-0.90.4
@@ -21,11 +21,11 @@ FILEMODE=	0660
 FILEMODE=	0600
 .endif
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_GAME} ${WRKSRC}/omega ${PREFIX}/bin/Omega
-	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/omega
 	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega
 	${RM} ${PREFIX}/share/omega/license.old
diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index de1c1a3ecd4..f8c510e274f 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:09:21 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=	powwow-1.2.5
 PKGREVISION=	1
@@ -12,14 +12,14 @@ COMMENT=	Client to play MUDs
 USE_TOOLS+=	gmake
 POWWOW_DIR=	${PREFIX}/share/powwow
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-build:
 	cd ${WRKSRC} && POWWOW_DIR="${POWWOW_DIR}" CFLAGS="${CFLAGS}" ./make_it
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/powwow ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/powwow.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/powwow.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA_DIR} ${POWWOW_DIR}
 	${INSTALL_DATA} ${WRKSRC}/powwow.doc ${POWWOW_DIR}
 	${INSTALL_DATA} ${WRKSRC}/powwow.help ${POWWOW_DIR}
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index c9342bd0f71..9b570ea0bb6 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/09/03 00:56:29 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=	pysol-4.81
@@ -19,14 +19,14 @@ PYTHON_VERSIONS_ACCEPTED=	22 21 20 15
 
 CARDSETS=	pysol-cardsets-4.40
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${SED} -e "s|@pkgdatadir@|${PREFIX}/share/pysol|" \
 		-e "s|python|${PYTHONBIN}|" \
 		< ${WRKSRC}/pysol > ${PREFIX}/bin/pysol
 	${CHMOD} +x ${PREFIX}/bin/pysol
-	${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/man/man6
+	${INSTALL_DATA} ${WRKSRC}/pysol.6 ${PREFIX}/${PKGMANDIR}/man6
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/pysol
 	(cd ${WRKSRC}/data; tar cf - *) | \
 		(cd ${PREFIX}/share/pysol; tar xf -)
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index c21139ca7fc..e6de528e76f 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/22 09:22:09 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=	qnetwalk-1.2
@@ -15,7 +15,7 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 
 QNETWALK_BIN=	${PREFIX}/bin
-QNETWALK_MAN=	${PREFIX}/man/man6
+QNETWALK_MAN=	${PREFIX}/${PKGMANDIR}/man6
 QNETWALK_DATA=	${PREFIX}/share/games/${PKGBASE}
 QNETWALK_TR=	${QNETWALK_DATA}
 KDEDIR=		${PREFIX:Q}/share/kde
diff --git a/games/sl/Makefile b/games/sl/Makefile
index c99da088920..250f9d6c782 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:17 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=	sl
@@ -19,13 +19,13 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 
 BUILD_DEPENDS+=	nkf-[0-9]*:../../converters/nkf
 
-INSTALLATION_DIRS=	bin man/ja_JP.EUC/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 post-build:
 	nkf -e ${WRKSRC}/sl.1 > ${WRKSRC}/sl.1.euc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sl ${PREFIX}/bin/sl
-	${INSTALL_DATA} ${WRKSRC}/sl.1.euc ${PREFIX}/man/ja_JP.EUC/man1/sl.1
+	${INSTALL_DATA} ${WRKSRC}/sl.1.euc ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/sl.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/svb/Makefile b/games/svb/Makefile
index 37a2a348f43..b3075de137e 100644
--- a/games/svb/Makefile
+++ b/games/svb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:55 rillig Exp $
 
 DISTNAME=		svb
 PKGNAME=		svb-1.0
@@ -18,7 +18,7 @@ post-install:
 	${INSTALL_GAME_DATA} /dev/null /var/games/svb.scorefile
 	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/svb
 	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/svb
-	${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/man/man6/svb.6
+	${INSTALL_MAN} ${WRKSRC}/svb.man ${PREFIX}/${PKGMANDIR}/man6/svb.6
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/vms-empire/Makefile b/games/vms-empire/Makefile
index d1ecaee54d8..1d556ac2526 100644
--- a/games/vms-empire/Makefile
+++ b/games/vms-empire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:56 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:55 rillig Exp $
 #
 
 DISTNAME=	vms-empire-1.7
@@ -9,11 +9,11 @@ MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://www.catb.org/~esr/vms-empire/
 COMMENT=	Solitaire Empire (sometimes called "VMS Empire")
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vms-empire ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${PREFIX}/man/man6/vms-empire.6
+	${INSTALL_MAN} ${WRKSRC}/vms-empire.6 ${PREFIX}/${PKGMANDIR}/man6/vms-empire.6
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 0bd6da3ade7..c25b46a52fd 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/05/07 03:16:48 dsainty Exp $
+# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:55 rillig Exp $
 #
 
 DISTNAME=		xblast-2.10.2
@@ -34,7 +34,7 @@ pre-build:
 	${MV} ${WRKDIR}/musics-2005-01-06/* ${WRKSRC}/sounds
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/xblast.man ${PREFIX}/man/man6/xblast.6
+	${INSTALL_MAN} ${WRKSRC}/xblast.man ${PREFIX}/${PKGMANDIR}/man6/xblast.6
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index da7e241ad3d..8cc5d00a2ff 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:55 rillig Exp $
 #
 
 DISTNAME=		xboing2.4
@@ -21,7 +21,7 @@ MAKE_ENV+=		VARBASE=${VARBASE:Q}
 post-install:
 	${CHOWN} ${GAMEOWN}:${GAMEGRP} ${PREFIX}/bin/xboing
 	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xboing
-	${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6
+	${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/${PKGMANDIR}/man6/xboing.6
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 9e7518a5dff..0cbe17c01e2 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/08 15:50:14 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:55 rillig Exp $
 
 DISTNAME=	xbomb-2.1a
 PKGREVISION=	2
@@ -22,7 +22,7 @@ SCORE_GROUP=	games
 PKG_USERS=	${SCORE_USER}:${SCORE_GROUP}
 PKG_GROUPS=	${SCORE_GROUP}
 
-INSTALLATION_DIRS=	bin man/man6 lib/X11/app-defaults
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6 lib/X11/app-defaults
 CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH}/xbomb3.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH}/xbomb4.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
 CONF_FILES_PERMS+=	/dev/null ${SCORE_PATH}/xbomb6.hi ${GAMEOWN} ${GAMEGRP} ${GAMEDATAMODE}
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 055a5b5ae3c..ba6ec92834b 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:55 rillig Exp $
 
 DISTNAME=		xmris.4.0.5
 PKGNAME=		xmris-4.05
@@ -20,9 +20,9 @@ post-patch:
 		< ${WRKSRC}/Imakefile-pre > ${WRKSRC}/Imakefile
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/xmris.man ${PREFIX}/man/man6/xmris.6
-	${LN} -fs xmris.6 ${PREFIX}/man/man6/xmsit.6
-	${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/man/man6/xmred.6
+	${INSTALL_MAN} ${WRKSRC}/xmris.man ${PREFIX}/${PKGMANDIR}/man6/xmris.6
+	${LN} -fs xmris.6 ${PREFIX}/${PKGMANDIR}/man6/xmsit.6
+	${INSTALL_MAN} ${WRKSRC}/xmred.man ${PREFIX}/${PKGMANDIR}/man6/xmred.6
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index ee9fbcebcde..8570f4d92b8 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:55 rillig Exp $
 #
 
 DISTNAME=	xpipeman-1.5
@@ -14,12 +14,12 @@ COMMENT=	Connect the pipes to contain the water flow game for X11
 WRKSRC=		${WRKDIR}/xpipeman
 USE_IMAKE=	yes
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL} -o bin -g games -m 2755 ${WRKSRC}/xpipeman \
 		${PREFIX}/bin/xpipeman
-	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/man/man6/xpipeman.6
+	${INSTALL_MAN} ${WRKSRC}/xpipeman.man ${PREFIX}/${PKGMANDIR}/man6/xpipeman.6
 	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/xpipeman
 	if [ ! -r /var/games/xpipescores ]; then \
 		${INSTALL} -o bin -g games -m 0664 ${WRKSRC}/xpipescores /var/games ; \
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index f6cf0fc6343..d9a186ddac1 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:55 rillig Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -25,14 +25,14 @@ SUBST_MESSAGE.data=	Adjusting path to data.zip
 SUBST_FILES.data=	src/xrick.c
 SUBST_SED.data=		-e "s|data.zip|${PREFIX}/share/xrick/&|"
 
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 post-extract:
 	cd ${WRKSRC} && ${GUNZIP_CMD} xrick.6.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/man/man6
+	${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/${PKGMANDIR}/man6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xrick
 	${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick
 
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 6c81b92a613..2d118054508 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:37 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:55 rillig Exp $
 #
 
 DISTNAME=	xscavenger-1.4.4
@@ -20,12 +20,12 @@ NO_INSTALL_MANPAGES=	yes
 
 CPPFLAGS+=	-DSOUNDDEV="\"${DEVOSSSOUND}\""
 
-INSTALLATION_DIRS=	man/man6
+INSTALLATION_DIRS=	${PKGMANDIR}/man6
 
 .include "../../mk/oss.buildlink3.mk"
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/man/man6/
+	@${INSTALL_MAN} ${WRKSRC}/src/scavenger.6 ${PREFIX}/${PKGMANDIR}/man6/
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger
 	@${INSTALL_MAN} ${WRKSRC}/DOC ${PREFIX}/share/doc/scavenger
 
diff --git a/games/zombies/Makefile b/games/zombies/Makefile
index 22e1d8f235d..835b4eef18f 100644
--- a/games/zombies/Makefile
+++ b/games/zombies/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:55 rillig Exp $
 
 DISTNAME=	zombies-1.0
 PKGREVISION=	1
@@ -10,7 +10,7 @@ MAINTAINER=	simonb@NetBSD.org
 HOMEPAGE=	http://www.thistledown.com.au/software/
 COMMENT=	Simple robots-like game where you destroy the zombies
 
-INSTALLATION_DIRS=	bin man/man6 share/games
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6 share/games
 
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"