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, 24 insertions, 24 deletions

diff --git a/wm/bbpager/Makefile b/wm/bbpager/Makefile
index d73d5c22b5b..82cfd464db6 100644
--- a/wm/bbpager/Makefile
+++ b/wm/bbpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/08/20 23:08:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	bbpager-0.3.1
@@ -18,7 +18,7 @@ USE_LANGUAGES=	c c++
 .include "../../mk/x11.buildlink3.mk"
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bbpager04/Makefile b/wm/bbpager04/Makefile
index 2c96fbb023c..085b1e12ad1 100644
--- a/wm/bbpager04/Makefile
+++ b/wm/bbpager04/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/09/03 10:16:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	bbpager-0.4.1beta1
@@ -15,8 +15,8 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/bbpager.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/bbpager.bb.5 ${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../wm/blackbox70/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index b3f6f900f27..b1d32f403af 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:11:12 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -16,13 +16,13 @@ GNU_CONFIGURE=	YES
 
 BUILD_DIRS=	${WRKSRC}/nls ${WRKSRC}/util
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/util/bsetbg ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/util/bsetroot ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/bsetbg.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bsetbg.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bsetroot.1 ${PREFIX}/${PKGMANDIR}/man1
 	( cd ${WRKSRC}/nls && ${MAKE} install )
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index 57c84e1b20f..26ed647d02a 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/27 10:03:05 sketch Exp $
+# $NetBSD: Makefile,v 1.24 2007/01/07 09:14:15 rillig Exp $
 #
 
 DISTNAME=	evilwm-0.99.25
@@ -9,13 +9,13 @@ MAINTAINER=	sketch@NetBSD.org
 HOMEPAGE=	http://www.6809.org.uk/evilwm/
 COMMENT=	Minimalist Window Manager for X
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${PREFIX}/bin/evilwm
-	${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/man/man1/evilwm.1
+	${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/${PKGMANDIR}/man1/evilwm.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/evilwm
 	for docfile in ChangeLog README TODO; \
 	do \
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index b058e997057..a5e5062df36 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:15 rillig Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -17,7 +17,7 @@ CONFIGURE_ENV+=	PATH_RM=${TOOLS_RM:Q}
 USE_LANGUAGES=	c c++
 
 post-install:
-	${MV} ${PREFIX}/man/man1/qvwm.1x ${PREFIX}/man/man1/qvwm.1
+	${MV} ${PREFIX}/${PKGMANDIR}/man1/qvwm.1x ${PREFIX}/${PKGMANDIR}/man1/qvwm.1
 
 .include "options.mk"
 .include "../../audio/esound/buildlink3.mk"
diff --git a/wm/weewm/Makefile b/wm/weewm/Makefile
index e8504475cf9..2503295a423 100644
--- a/wm/weewm/Makefile
+++ b/wm/weewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:15 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:15 rillig Exp $
 #
 
 DISTNAME=	weewm-0.0.2
@@ -15,13 +15,13 @@ COMMENT=	Fast and ultra light windowmanager with total keyboard control
 EXAMPLESDIR=	${PREFIX}/share/examples/weewm
 DOCDIR=		${PREFIX}/share/doc/weewm
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/weewm ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/weewm.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/weewm.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/config.rc ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/keys.rc ${EXAMPLESDIR}
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index 5e60078117f..c73e7ce724d 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:11:15 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:15 rillig Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -16,12 +16,12 @@ USE_LANGUAGES=	c c++
 USE_X11BASE=	YES
 MAKE_ENV+=	CCC=${CXX:Q}
 
-INSTALLATION_DIRS=	bin man/cat1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/man/cat1/wm2.0
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${PKGMANDIR}/cat1/wm2.0
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmdrawer/Makefile b/wm/wmdrawer/Makefile
index 515c1a37ee8..5da5fd146cf 100644
--- a/wm/wmdrawer/Makefile
+++ b/wm/wmdrawer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/18 20:04:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:15 rillig Exp $
 #
 
 DISTNAME=		wmdrawer-0.10.5
@@ -11,14 +11,14 @@ HOMEPAGE=		http://people.easter-eggs.org/~valos/wmdrawer/
 COMMENT=		Drawer (retractable button bar) to launch applications
 
 USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmdrawer ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/wmdrawer
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmdrawer
-	${INSTALL_MAN} ${WRKSRC}/doc/wmdrawer.1x.gz ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/wmdrawer.1x.gz ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/wmdrawerrc.example ${PREFIX}/share/examples/wmdrawer
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/wmdrawer
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/wmdrawer