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.

4 files changed, 13 insertions, 13 deletions

diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 89a8591d9f8..c98bd9bf28e 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:49 rillig Exp $
 #
 
 DISTNAME=	gku100
@@ -22,11 +22,11 @@ MAKE_ENV+=	KFLAGS=${CFLAGS:M*:Q}
 
 CFLAGS+=	-DERRNO_H
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gkermit ${PREFIX}/bin/gkermit; \
-	${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/man/man1/gkermit.1; \
+	${INSTALL_MAN} ${WRKSRC}/gkermit.nr ${PREFIX}/${PKGMANDIR}/man1/gkermit.1; \
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gkermit
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gkermit
 
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 666044d8d8c..78143cf2dcd 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2006/11/20 18:34:27 bad Exp $
+# $NetBSD: Makefile,v 1.59 2007/01/07 09:13:49 rillig Exp $
 #
 
 DISTNAME=		jpilot-0.99.9
@@ -26,7 +26,7 @@ LDFLAGS+=		-export-dynamic
 
 DOCDIR=			${PREFIX}/share/doc/jpilot
 INCDIR=			${PREFIX}/include/jpilot
-MAN1DIR=		${PREFIX}/man/man1
+MAN1DIR=		${PREFIX}/${PKGMANDIR}/man1
 PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
 
 .include "../../comms/pilot-link-libs/buildlink3.mk"
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index 9647357ea16..f6a7524a85c 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/10/01 14:16:21 rillig Exp $
+# $NetBSD: Makefile,v 1.69 2007/01/07 09:13:49 rillig Exp $
 
 DISTNAME=	cku211
 PKGNAME=	kermit-8.0.211
@@ -52,12 +52,12 @@ do-install:
 	  case $$OPT in \
 	    catinstall) \
 		nroff -man ${WRKSRC}/ckuker.nr > ${WRKSRC}/kermit.0; \
-		${INSTALL_MAN_DIR} ${PREFIX}/man/cat1; \
-		${INSTALL_MAN} ${WRKSRC}/kermit.0 ${PREFIX}/man/cat1/kermit.0; \
+		${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/cat1; \
+		${INSTALL_MAN} ${WRKSRC}/kermit.0 ${PREFIX}/${PKGMANDIR}/cat1/kermit.0; \
 		;; \
 	    maninstall) \
-		${INSTALL_MAN_DIR} ${PREFIX}/man/man1; \
-		${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/man/man1/kermit.1; \
+		${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1; \
+		${INSTALL_MAN} ${WRKSRC}/ckuker.nr ${PREFIX}/${PKGMANDIR}/man1/kermit.1; \
 		;; \
 	  esac; \
 	done
diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile
index 96498d5643d..5040183743c 100644
--- a/comms/linuxsms/Makefile
+++ b/comms/linuxsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:29:05 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:49 rillig Exp $
 #
 
 DISTNAME=	linuxsms-0.65
@@ -14,11 +14,11 @@ NO_BUILD=	yes
 
 REPLACE_PERL=	linuxsms
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/linuxsms ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/linuxsms.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/linuxsms.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/linuxsms
 .for f in BUGS CHANGES README README.ES TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/linuxsms