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.

10 files changed, 26 insertions, 26 deletions

diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 61b233ce564..dcc4f7c8639 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/12 16:28:06 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=		fceu-0.98.13.src
@@ -24,7 +24,7 @@ SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Documentation/fceu-sdl.6 \
-		${PREFIX}/man/man6/fceu.6
+		${PREFIX}/${PKGMANDIR}/man6/fceu.6
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fceu
 	${INSTALL_DATA} ${WRKSRC}/Documentation/*.html \
 		${PREFIX}/share/doc/fceu
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index d051a2bc9b9..d6d4b939185 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/11/09 20:01:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=	gxemul-0.4.3
@@ -19,7 +19,7 @@ INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gxemul ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/gxemul.1 ${PREFIX}/${PKGMANDIR}/man1
 .for f in README HISTORY TODO RELEASE LICENSE
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/${PKGBASE}
 .endfor
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index ff74764642a..98957bfc71a 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2006/07/18 23:27:14 jlam Exp $
+#	$NetBSD: Makefile,v 1.7 2007/01/07 09:13:53 rillig Exp $
 
 DISTNAME=		ski-0.9.81-l6-i686
 PKGNAME=		ski-0.9.81.6
@@ -38,7 +38,7 @@ FETCH_MESSAGE=								\
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/nue/usr/bin/*ski* ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/nue/usr/man/man1/*ski*.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKDIR}/nue/usr/X11R6/lib/X11/app-defaults/XSki ${PREFIX}/lib/X11/app-defaults/XSki
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index adee8ffaea9..37f4d0cdb44 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/05/18 20:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=		twin-src-3.1.14
@@ -27,8 +27,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/documentation/* ${PREFIX}/share/doc/twin/
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/include/*.h.in ${PREFIX}/include/
-	${INSTALL_DATA} ${WRKSRC}/documentation/rc.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/documentation/rc.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/documentation/debugger.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/rc/rc ${PREFIX}/bin
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 356ff20526b..30a55fac166 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/02 14:02:45 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=		vmips-1.3.1
@@ -11,7 +11,7 @@ COMMENT=		MIPS R3000 emulator
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INSTALLATION_DIRS=	bin include/vmips man/man1 share/vmips share/examples/vmips
+INSTALLATION_DIRS=	bin include/vmips ${PKGMANDIR}/man1 share/vmips share/examples/vmips
 INSTALL_MAKE_FLAGS+=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
 
 EGDIR=			${PREFIX}/share/examples/vmips
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index 08ad80635a4..cdca5b5de31 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/01/01 22:43:50 adrianp Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:53 rillig Exp $
 
 DISTNAME=	VMware-2.0.4-1142
 PKGNAME=	vmware-2.0.4
@@ -36,7 +36,7 @@ VMWARE_CFG_DIR=		${PREFIX}/emul/linux/etc/vmware
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
@@ -67,7 +67,7 @@ do-install-share:
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${PREFIX}/share/vmware/configurator
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${PREFIX}/share/vmware
 	${INSTALL_DATA} ${WRKSRC}/lib/floppy.nvr ${PREFIX}/share/vmware
-	${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/${PKGMANDIR}/man1
 
 post-install:
 	@${RM} -f ${VMWARE_CFG_DIR}/config
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index df30b9444a8..567f8ff0ccb 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/01/01 22:43:50 adrianp Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:53 rillig Exp $
 
 DISTNAME=	VMware-workstation-3.2.1-2242
 PKGNAME=	vmware-3.2.1pl1
@@ -48,7 +48,7 @@ VMWARE_CFG_DIR=		${PREFIX}/emul/linux/etc/vmware
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	${GZCAT} ${WRKSRC}/man/man1/vmware.1.gz > ${WRKDIR}/vmware.1
@@ -93,7 +93,7 @@ do-install-share:
 	${INSTALL_DATA} ${WRKSRC}/lib/smb/codepages/* ${PREFIX}/share/vmware/smb/codepages
 	${INSTALL_DATA} ${WRKSRC}/lib/configurator/* ${PREFIX}/share/vmware/configurator
 	${INSTALL_DATA} ${WRKSRC}/lib/config ${PREFIX}/share/vmware
-	${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/vmware.1 ${PREFIX}/${PKGMANDIR}/man1
 
 post-install:
 	@${RM} -f ${VMWARE_CFG_DIR}/config
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index f3e680fb680..192805a494d 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.147 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.148 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=		xmame-0.106
@@ -76,7 +76,7 @@ MAKE_FLAGS+=		JOY_USB=1
 .endif
 
 OWN_DIRS=		${SPOOLDIR}
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 post-configure:
 	cd ${WRKSRC}/doc;						\
@@ -97,7 +97,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/bin/chdman
 	${INSTALL_PROGRAM} ${WRKSRC}/xml2info ${PREFIX}/bin/xml2info
 	${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6			\
-		${PREFIX}/man/man6/${TARGET}.6
+		${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6
 	${INSTALL_DATA_DIR} ${ROMPATH}
 	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
 	${INSTALL_DATA_DIR}  ${PREFIX}/share/doc/html/xmame/
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index b622bcd06d6..52312053538 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.88 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=		xmame-0.106
@@ -77,7 +77,7 @@ MAKE_FLAGS+=		JOY_USB=1
 .endif
 
 OWN_DIRS=		${SPOOLDIR}
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 post-configure:
 	cd ${WRKSRC}/doc;						\
@@ -96,7 +96,7 @@ do-install:
 		${PREFIX}/bin/${TARGET}
 	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/bin/imgtool
 	${INSTALL_MAN} ${WRKSRC}/doc/${TARGET}.6			\
-		${PREFIX}/man/man6/${TARGET}.6
+		${PREFIX}/${PKGMANDIR}/man6/${TARGET}.6
 	${INSTALL_DATA_DIR} ${ROMPATH}
 	${INSTALL_DATA} ${WRKSRC}/doc/${TARGET}rc ${ROMPATH}/${TARGET}rc
 
diff --git a/emulators/xyame/Makefile b/emulators/xyame/Makefile
index be22d006c74..1be1ea8ae9e 100644
--- a/emulators/xyame/Makefile
+++ b/emulators/xyame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/12/18 01:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:53 rillig Exp $
 #
 
 DISTNAME=		xyame038
@@ -22,10 +22,10 @@ NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 ONLY_FOR_PLATFORM+=	*-*-i386
-INSTALLATION_DIRS=	bin man/man6
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xyame ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/yame.6 ${PREFIX}/man/man6/xyame.6
+	${INSTALL_MAN} ${WRKSRC}/yame.6 ${PREFIX}/${PKGMANDIR}/man6/xyame.6
 
 .include "../../mk/bsd.pkg.mk"