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

diff --git a/x11/dfm/Makefile b/x11/dfm/Makefile
index e936edb0a8a..568c36c49b8 100644
--- a/x11/dfm/Makefile
+++ b/x11/dfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 14:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:16 rillig Exp $
 #
 
 PKGREVISION=	6
@@ -8,6 +8,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Desktop File Manager
 
 post-install:
-	${MV} ${PREFIX}/man/man1/dfm.1x ${PREFIX}/man/man1/dfm.1
+	${MV} ${PREFIX}/${PKGMANDIR}/man1/dfm.1x ${PREFIX}/${PKGMANDIR}/man1/dfm.1
 
 .include "Makefile.common"
diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index 12c0142867d..092cde9e276 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:16 rillig Exp $
 
 DISTNAME=		AfterStep-1.0
 PKGNAME=		fvwm-wharf-1.0
@@ -12,14 +12,14 @@ COMMENT=		Copy of AfterStep's Wharf compatible with fvwm2
 
 USE_IMAKE=		YES
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-configure:
 	cd ${WRKSRC}; ${MAKE} Makefiles
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf
-	${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/man/man1/Fvwm-Wharf.1
+	${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/${PKGMANDIR}/man1/Fvwm-Wharf.1
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 5368718518b..2e2bf563d40 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:16 rillig Exp $
 #
 
 DISTNAME=		gtk-theme-switch-2.0.0rc2
@@ -14,13 +14,13 @@ COMMENT=		Allows quick & easy switching of GTK+ 2.x themes
 USE_TOOLS+=		gmake pkg-config
 
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/switch2 \
 		${PREFIX}/bin/gtk2-theme-switch
 	${INSTALL_MAN} ${WRKSRC}/switch.1 \
-		${PREFIX}/man/man1/gtk2-theme-switch.1
+		${PREFIX}/${PKGMANDIR}/man1/gtk2-theme-switch.1
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/p5-gtk/Makefile b/x11/p5-gtk/Makefile
index 8f17bb1c3e4..db20d3fcd45 100644
--- a/x11/p5-gtk/Makefile
+++ b/x11/p5-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/10/11 19:31:31 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2007/01/07 09:14:16 rillig Exp $
 #
 
 .include "Makefile.common"
@@ -11,7 +11,7 @@ MAINTAINER=		root@garbled.net
 COMMENT=		Perl bindings for GTK+
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/Gtk
-MAKE_PARAMS=		INSTALLMAN3DIR=${PREFIX}/man/man3
+MAKE_PARAMS=		INSTALLMAN3DIR=${PREFIX}/${PKGMANDIR}/man3
 PERL5_PACKLIST=		auto/Gtk/.packlist
 
 REPLACE_PERL+=		../tools/*
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index dcfe9e17ee5..7c3c58b0b2d 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/05/19 07:48:12 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:16 rillig Exp $
 
 DISTNAME=	qwt-0.3.0
 PKGREVISION=	5
@@ -18,7 +18,7 @@ MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:M*:Q}
 
 CONFLICTS=	qwtlib-[0-9]*
 
-INSTALLATION_DIRS=	lib man/man3
+INSTALLATION_DIRS=	lib ${PKGMANDIR}/man3
 
 post-patch:
 	${LN} -s ${WRKSRC}/makefiles/netbsd-g++ ${WRKSRC}/Makefile
@@ -28,7 +28,7 @@ do-install:
 	  ${PREFIX}/lib
 	${INSTALL_DATA_DIR} ${PREFIX}/include/qwt
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qwt
-	${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/man/man3
+	${INSTALL_DATA} ${WRKSRC}/doc/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
 
 .include "../../x11/qt2-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tkinfo/Makefile b/x11/tkinfo/Makefile
index 1026fa330f0..44b25cb90d7 100644
--- a/x11/tkinfo/Makefile
+++ b/x11/tkinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:31:11 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:16 rillig Exp $
 
 DISTNAME=	tkinfo-2.8
 PKGREVISION=	1
@@ -13,7 +13,7 @@ DEPENDS+=	tk>=8.3.2:../../x11/tk
 
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-patch:
 	cd ${WRKSRC}; \
@@ -25,6 +25,6 @@ post-patch:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tkinfo ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tkinfo.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tkinfo.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbindkeys-tk/Makefile b/x11/xbindkeys-tk/Makefile
index a9ea3a8b4b0..a41385a76d6 100644
--- a/x11/xbindkeys-tk/Makefile
+++ b/x11/xbindkeys-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/12/08 16:16:12 obache Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:16 rillig Exp $
 #
 
 .include "../../x11/xbindkeys/Makefile.common"
@@ -12,10 +12,10 @@ DEPENDS+=	tk>=8.3.4:../../x11/tk
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xbindkeys_show ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/xbindkeys_show.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/xbindkeys_show.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdesktopwaves/Makefile b/x11/xdesktopwaves/Makefile
index af3a8439a02..99116bc403f 100644
--- a/x11/xdesktopwaves/Makefile
+++ b/x11/xdesktopwaves/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:16 rillig Exp $
 #
 
 DISTNAME=	xdesktopwaves-1.1
@@ -15,13 +15,13 @@ USE_DIRS+=		xdg-1.1
 MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
 MAKE_FLAGS+=		LFLAGS=${LDFLAGS:M*:Q}
 
-INSTALLATION_DIRS=	bin man/man1 share/doc/xdesktopwaves
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/xdesktopwaves
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdesktopwaves ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/xdesktopwaves.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/xdesktopwaves.1 ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xdesktopwaves/
 	${INSTALL_DATA} ${WRKSRC}/xdesktopwaves.xpm ${PREFIX}/share/pixmaps/
 
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index c770282e188..8f9b54606d9 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/05/10 23:31:30 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/07 09:14:16 rillig Exp $
 #
 
 DISTNAME=		xfstt-1.6
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--disable-nls
 CXXFLAGS+=		-fomit-frame-pointer -ffast-math
 
 RCD_SCRIPTS=		xfstt
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/x11.buildlink3.mk"
 
@@ -32,7 +32,7 @@ SUBST_STAGE.paths=	post-patch
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/man/man1/xfstt.1
+	${INSTALL_MAN} ${WRKSRC}/doc/xfstt.1x ${PREFIX}/${PKGMANDIR}/man1/xfstt.1
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/X11/fonts/TTF
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xfstt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xfstt
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 81cc960750c..99d73bf8046 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/18 18:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:16 rillig Exp $
 #
 
 PKGNAME=	${DISTNAME:S/-/-demo-/}
@@ -23,7 +23,7 @@ INSTALL_TARGET=		install-gnome
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/driver/xscreensaver-demo ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/driver/xscreensaver-demo.man \
-		       ${PREFIX}/man/man1/xscreensaver-demo.1
+		       ${PREFIX}/${PKGMANDIR}/man1/xscreensaver-demo.1
 
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"