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/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index d39103eaec8..089c224a606 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/08/16 09:46:27 tonio Exp $
+# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:48 rillig Exp $
 #
 
 DISTNAME=		bitlbee-1.0.3
@@ -34,7 +34,7 @@ OWN_DIRS_PERMS=		${STATEDIR} bitlbee nobody 700
 PKG_USERS=		bitlbee:nobody
 PKG_HOME.bitlbee=	${VARBASE}/db/bitlbee
 
-INSTALLATION_DIRS=	man/man5 man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_DATA_DIR} ${DATADIR}
@@ -44,8 +44,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bitlbee ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/doc/user-guide/help.txt ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/motd.txt ${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.conf.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/bitlbee.conf.5 ${PREFIX}/${PKGMANDIR}/man5
 .for f in AUTHORS FAQ README CREDITS user-guide/user-guide.txt user-guide/user-guide.html
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCDIR}
 .endfor
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 96b26f58137..0e29c469db1 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2007/01/07 09:13:48 rillig Exp $
 #
 
 DISTNAME=	centericq-4.21.0
@@ -58,7 +58,7 @@ CONFIGURE_ENV+=		ac_cv_lib_iconv_iconv=yes
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/centericq.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/centericq.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile
index 0c1f5a5b579..b180a1fd8cb 100644
--- a/chat/eggdrop/Makefile
+++ b/chat/eggdrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/03/04 21:29:02 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2007/01/07 09:13:48 rillig Exp $
 
 DISTNAME=	eggdrop1.6.17
 PKGNAME=	eggdrop-1.6.17
@@ -27,7 +27,7 @@ PLIST_SUBST+=		NOIPV6=
 EGDIR=		${PREFIX}/share/examples/eggdrop
 CONF_FILES=	${EGDIR}/eggdrop.conf ${PKG_SYSCONFDIR}/eggdrop.conf
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-patch:
 	cd ${WRKSRC} && ${SED} -e 's,modules/,${PREFIX}/lib/eggdrop/,' \
@@ -39,7 +39,7 @@ post-configure:
 do-install: do-install-program
 do-install-program:
 	${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.dist.new ${EGDIR}/eggdrop.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/eggdrop
diff --git a/chat/goofey/Makefile b/chat/goofey/Makefile
index 8132a4c8735..a280a883cea 100644
--- a/chat/goofey/Makefile
+++ b/chat/goofey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:49 rillig Exp $
 #
 
 DISTNAME=	goofey-3.15
@@ -13,13 +13,13 @@ COMMENT=	Text-based client for goofey, a flexible short message system
 NO_CONFIGURE=	yes
 LDFLAGS.SunOS+=	-lnsl -lsocket
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	cd ${WRKSRC}; ${CC} ${CFLAGS} ${LDFLAGS} -o goofey goofey.c
 
 do-install:
 	${INSTALL} ${WRKSRC}/goofey ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/goofey.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/goofey.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/icbirc/Makefile b/chat/icbirc/Makefile
index bfc4eb2d3c4..233ad938754 100644
--- a/chat/icbirc/Makefile
+++ b/chat/icbirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/22 22:50:31 tv Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:49 rillig Exp $
 
 DISTNAME=	icbirc-1.8
 CATEGORIES=	chat
@@ -16,7 +16,7 @@ SRCS=		icb.c irc.c icbirc.c
 CPPFLAGS.Interix+= -Dsocklen_t=int
 LDFLAGS.SunOS+=	-lsocket -lnsl
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-build:
 .for f in ${SRCS}
@@ -26,6 +26,6 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icbirc ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/icbirc.8 ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/icbirc.8 ${PREFIX}/${PKGMANDIR}/man8/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/iip/Makefile b/chat/iip/Makefile
index fdbee3091bd..74e141c7da2 100644
--- a/chat/iip/Makefile
+++ b/chat/iip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/18 08:02:03 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:49 rillig Exp $
 #
 
 DISTNAME=		iip-1.1.0
@@ -20,6 +20,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/isproxy ${PREFIX}/bin/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/iip
 	${INSTALL_DATA} ${WRKSRC}/src/node.ref ${PREFIX}/share/examples/iip/
-	${INSTALL_DATA} ${WRKSRC}/doc/isproxy.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} ${WRKSRC}/doc/isproxy.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/sirc/Makefile b/chat/sirc/Makefile
index dcb80d1eeb1..b8928a002ba 100644
--- a/chat/sirc/Makefile
+++ b/chat/sirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/07/27 00:09:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:49 rillig Exp $
 
 DISTNAME=	sirc-2.211
 PKGREVISION=	2
@@ -54,7 +54,7 @@ IRC_SERVER=	${DEFAULT_IRC_SERVER}
 IRC_SERVER=	us.undernet.org
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/sirc
@@ -71,7 +71,7 @@ do-install:
 		${ECHO} "${PREFIX}/lib/sirc" ; \
 		${ECHO} "y" ; \
 		${ECHO} "n" ; \
-		${ECHO} "${PREFIX}/man/man1" ; \
+		${ECHO} "${PREFIX}/${PKGMANDIR}/man1" ; \
 		${ECHO} "${IRC_SERVER}" ; \
 		${ECHO} "" ; \
 	) | ./install