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.

5 files changed, 15 insertions, 15 deletions

diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index e14f61427d9..311b7e85456 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:38 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 MAKE_ENV+=	VERSION=${PKGVERSION:Q}
 USE_TOOLS+=	gmake gtar
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 # Might as well make this a general scheme for .src.rpm files... - HF
 do-extract:
@@ -26,7 +26,7 @@ do-extract:
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/chkfontpath ${PREFIX}/bin
-		${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${PREFIX}/man/man8
+		${INSTALL_MAN} ${WRKSRC}/man/en/chkfontpath.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 039e1586450..e158484e02c 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=	pcf2bdf-1.04
@@ -16,10 +16,10 @@ USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 MAKE_FILE=	Makefile.gcc
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pcf2bdf ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man ${PREFIX}/man/man1/pcf2bdf.1
+	${INSTALL_MAN} ${WRKSRC}/pcf2bdf.man ${PREFIX}/${PKGMANDIR}/man1/pcf2bdf.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile
index f51b8c90c11..ff4dd2d036b 100644
--- a/fonts/ttf2pk/Makefile
+++ b/fonts/ttf2pk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/27 00:09:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:54 rillig Exp $
 #
 
 .include "../../graphics/freetype-lib/Makefile.common"
@@ -24,7 +24,7 @@ BUILD_TARGET=		depend all
 USE_DIRS+=		texmf-1.0
 USE_LIBTOOL=		yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../print/teTeX/module.mk"
@@ -35,7 +35,7 @@ do-install:
 				${PREFIX}/bin
 	${INSTALL_DATA}		${T2PSRC}/ttf2pk.1 \
 				${T2PSRC}/ttf2tfm.1 \
-				${PREFIX}/man/man1
+				${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR}	${PKG_LOCALTEXMFPREFIX}/doc/ttf2pk
 	${INSTALL_DATA}		${T2PSRC}/BUGS \
 				${T2PSRC}/README \
diff --git a/fonts/type1inst/Makefile b/fonts/type1inst/Makefile
index aeaa2adad46..28b08e476df 100644
--- a/fonts/type1inst/Makefile
+++ b/fonts/type1inst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:09:11 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:54 rillig Exp $
 #
 
 DISTNAME=		type1inst-0.6.1
@@ -14,12 +14,12 @@ USE_TOOLS+=		perl:run
 REPLACE_PERL=		t1embed type1inst
 
 NO_BUILD=		yes
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/type1inst ${PREFIX}/bin
 	@${INSTALL_SCRIPT} ${WRKSRC}/t1embed ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/man/man1/type1inst.1
+	@${INSTALL_MAN} ${WRKSRC}/type1inst.man ${PREFIX}/${PKGMANDIR}/man1/type1inst.1
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/type1inst
 	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/type1inst
 
diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile
index 044714fe764..4975a43222a 100644
--- a/fonts/xmbdfed/Makefile
+++ b/fonts/xmbdfed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:09:11 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:54 rillig Exp $
 
 DISTNAME=	xmbdfed-4.5
 PKGREVISION=	2
@@ -11,11 +11,11 @@ COMMENT=	Motif-based BDF font editor with lots of features
 
 USE_X11BASE=	YES
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmbdfed ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1
+	${INSTALL_MAN} ${WRKSRC}/xmbdfed.man ${PREFIX}/${PKGMANDIR}/man1/xmbdfed.1
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"