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.

7 files changed, 20 insertions, 20 deletions

diff --git a/time/anacron/Makefile b/time/anacron/Makefile
index 8b156afad7f..068af17010e 100644
--- a/time/anacron/Makefile
+++ b/time/anacron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/22 09:22:15 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	anacron-2.3
@@ -52,7 +52,7 @@ OWN_DIRS=		/var/spool/anacron
 
 RCD_SCRIPTS=		anacron
 
-INSTALLATION_DIRS=	man/man5 man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/time/cal/Makefile b/time/cal/Makefile
index 8b1ed0526f9..95781f2a6ab 100644
--- a/time/cal/Makefile
+++ b/time/cal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/09/09 02:46:09 obache Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:14 rillig Exp $
 
 DISTNAME=		cal-3.5
 PKGREVISION=		1
@@ -17,11 +17,11 @@ CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 EGDIR=			${PREFIX}/share/examples/cal
 # CONF_FILES not used as calcol and caldat are optional.
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cal ${PREFIX}/bin/cal
-	${INSTALL_MAN}  ${WRKSRC}/cal.1 ${PREFIX}/man/man1/cal.1
+	${INSTALL_MAN}  ${WRKSRC}/cal.1 ${PREFIX}/${PKGMANDIR}/man1/cal.1
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${EGDIR}/calcol
 	${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${EGDIR}/caldat
diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile
index 001bc324e32..3af5ee526ce 100644
--- a/time/gnyaclock/Makefile
+++ b/time/gnyaclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/12/27 13:37:40 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	gnya
@@ -15,12 +15,12 @@ COMMENT=	Accessory with Bezier curve
 WRKSRC=		${WRKDIR}/gnyaclock
 USE_IMAKE=	YES
 
-INSTALLATION_DIRS=	bin man/ja_JP.EUC/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/ja_JP.EUC/man1
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/gnyaclock ${PREFIX}/bin
 		${INSTALL_MAN} ${WRKSRC}/gnyaclock.man \
-			${PREFIX}/man/ja_JP.EUC/man1/gnyaclock.1
+			${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man1/gnyaclock.1
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
diff --git a/time/pcal/Makefile b/time/pcal/Makefile
index 4ae9e020994..1c32bce888a 100644
--- a/time/pcal/Makefile
+++ b/time/pcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	pcal-4.7
@@ -21,7 +21,7 @@ MAKE_ENV+=	CC=${CC:Q} HOST_CC=${CC:Q}
 
 BUILD_TARGET=	pcal
 
-INSTALLATION_DIRS=	bin man/man1 share/doc/pcal ${HTDOCS}
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/pcal ${HTDOCS}
 
 pre-install:
 	${MV} ${WRKSRC}/pcal.cgi ${WRKSRC}/pcal.cgi.tmp
@@ -38,7 +38,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pcal ${PREFIX}/bin
 	${INSTALL_SCRIPT_DIR} ${CGIBINDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/pcal.cgi ${CGIBINDIR}
-	${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/man/man1/pcal.1
+	${INSTALL_MAN} ${WRKSRC}/pcal.man ${PREFIX}/${PKGMANDIR}/man1/pcal.1
 	${INSTALL_DATA} ${WRKSRC}/ReadMe ${PREFIX}/share/doc/pcal/ReadMe
 	${INSTALL_DATA} ${WRKSRC}/pcal.html ${HTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/pcalw.html ${HTDOCS}
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index 3aab6770c1c..af52405df1e 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/22 22:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:14 rillig Exp $
 
 DISTNAME=	ptimetracker-1.7.3
 PKGREVISION=	3
@@ -13,14 +13,14 @@ COMMENT=	Keep track of the time spent on projects
 USE_LANGUAGES=		c++
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-configure:
 	cd ${WRKSRC} && ${QTDIR}/bin/qmake -o Makefile ptt.pro
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ptimetracker ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/ptimetracker.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/ptimetracker.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index 1d2d7637aec..4fecc9dcf07 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:40 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -20,10 +20,10 @@ USE_TOOLS+=	gmake
 MAKE_ENV+=	EXTRALIBS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
 
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/time/xdkcal/Makefile b/time/xdkcal/Makefile
index 01a86a25e54..50eef618524 100644
--- a/time/xdkcal/Makefile
+++ b/time/xdkcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:14 rillig Exp $
 #
 
 DISTNAME=	xdkcal-0.9d
@@ -14,12 +14,12 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdkcal ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/man/man1/xdkcal.1
+	${INSTALL_MAN} ${WRKSRC}/xdkcal.1x ${PREFIX}/${PKGMANDIR}/man1/xdkcal.1
 
 .include "../../mk/bsd.pkg.mk"