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.

12 files changed, 33 insertions, 33 deletions

diff --git a/lang/Cg-compiler/Makefile b/lang/Cg-compiler/Makefile
index c9c1ed8f625..cfae5b6df32 100644
--- a/lang/Cg-compiler/Makefile
+++ b/lang/Cg-compiler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/30 13:47:06 salo Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:56 rillig Exp $
 #
 
 DISTNAME=	CgLinux-1.3.0408-0400
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 DEPENDS+=	suse_base>=7.3:../../emulators/${SUSE_DIR_PREFIX}_base
 .endif
 
-INSTALLATION_DIRS=	bin lib man/man3 share
+INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man3 share
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/Cg
@@ -33,7 +33,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/usr/include/Cg/* ${PREFIX}/include/Cg
 	${INSTALL_DATA} ${WRKSRC}/usr/include/CgFX/* ${PREFIX}/include/CgFX
 	${INSTALL_DATA} ${WRKSRC}/usr/lib/* ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/usr/share/man/man3/* ${PREFIX}/${PKGMANDIR}/man3
 	cd ${WRKSRC}/usr/local && ${PAX} -rwppm . ${PREFIX}/share/NVIDIA-Cg-linux
 
 .include "../../emulators/suse_linux/Makefile.application"
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 61b29e4fb36..e8289b438be 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/03 22:19:01 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:56 rillig Exp $
 
 PKGNAME=	${DISTNAME:=pl2}
 DISTNAME=	bwbasic-2.20
@@ -27,6 +27,6 @@ post-install:
 	${CP} -r ${BWBASIC_WRKSRC}/bwbtest ${SHARE_DIR}
 	${FIND} ${SHARE_DIR} -type d -print | ${XARGS} ${CHMOD} ${BINMODE}
 	${FIND} ${SHARE_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${PREFIX}/man/man1/bwbasic.1
+	${INSTALL_MAN} ${BWBASIC_WRKSRC}/bwbasic.doc ${PREFIX}/${PKGMANDIR}/man1/bwbasic.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 8fffdadb1df..16ea7512a21 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/08/22 20:17:23 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2007/01/07 09:13:56 rillig Exp $
 #
 
 DISTNAME=		plt-${DRSCHEME_VERSION}-src-unix
@@ -64,8 +64,8 @@ post-patch:
 	@${FIND} ${WRKDIR} -name '*.orig' -print | ${XARGS} ${RM} -f
 
 post-install:
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/../man/man1/*.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/../man/man1/*.1 ${PREFIX}/${PKGMANDIR}/man1/
 	@cd ${PREFIX}/lib/plt && PATH="${OLD_PATH}" ${SH} install || ${TRUE}
 .for f in ${PROGRAMS}
 	@cd ${PREFIX}/bin && ${LN} -s ../lib/plt/bin/${f}
diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile
index 4293c976a92..d1e2ab501c5 100644
--- a/lang/mpd/Makefile
+++ b/lang/mpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/07/10 04:04:22 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:56 rillig Exp $
 #
 
 DISTNAME=		mpd.1.0.1
@@ -29,7 +29,7 @@ SUBST_SED.mpd+=		-e 's,_WRKSRC_,${WRKSRC},g'
 SUBST_SED.mpd+=		-e 's,_XINC_,${X11BASE}/include,g'
 SUBST_SED.mpd+=		-e 's,_XLIB_,${X11BASE}/lib,g'
 
-INSTALLATION_DIRS=	bin lib/mpd man/man1 man/man3 share/doc/mpd
+INSTALLATION_DIRS=	bin lib/mpd ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 share/doc/mpd
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/csw/cstest ${PREFIX}/bin/mpd-cstest
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index c608b3c29f8..eda29987508 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/12/06 16:34:42 taca Exp $
+# $NetBSD: Makefile,v 1.42 2007/01/07 09:13:57 rillig Exp $
 
 DISTNAME=	ruby-${RUBY_VERSION}.${RUBY_PATCH_DATE}
 CATEGORIES=	lang ruby
@@ -24,7 +24,7 @@ RUBY_COMMANDS=	irb ruby
 RUBY_COMMANDS+=	erb h2rb rdoc ri testrb
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
@@ -33,7 +33,7 @@ do-install:
 	${LN} -sf ${f}${RUBY_VER} ${PREFIX}/bin/${f}
 	${ECHO} bin/${f} >> ${PLIST_SRC}
 .endfor
-	${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby.1
+	${LN} -sf ${RUBY_NAME}.1 ${PREFIX}/${PKGMANDIR}/man1/ruby.1
 	${ECHO} man/man1/ruby.1 >> ${PLIST_SRC}
 .endif
 
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 628930aa46e..1529134032c 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/22 09:22:10 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2007/01/07 09:13:57 rillig Exp $
 
 DISTNAME=		sather-1.2.1
 PKGREVISION=		6
@@ -46,7 +46,7 @@ SUBST_SED.sather-configure=					\
 	-e 's:@LINKER_RPATH_FLAG@:${LINKER_RPATH_FLAG}:g'	\
 	-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g'
 
-INSTALLATION_DIRS=	man/man1
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 post-patch:
 	cd ${WRKSRC}/System/Platforms && ${CP} -r netbsd dragonfly
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index 24a9a35d967..5d2b3ca86f9 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:48 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:57 rillig Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -20,7 +20,7 @@ BUILD_TARGET=	it
 
 USE_CONFIGURE=		NO
 USE_TOOLS+=		gzip
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	@${CP} ${WRKSRC}/doc/head ${WRKSRC}/doc/tutorial
@@ -28,7 +28,7 @@ do-install:
 	@unzip -p -opaaqqLC ${WRKSRC}/pm.exe >> ${WRKSRC}/doc/tutorial
 	@${GZIP_CMD} ${WRKSRC}/doc/tutorial
 	@${INSTALL_PROGRAM} ${WRKSRC}/xsnobol4 ${PREFIX}/bin/snobol4
-	@${INSTALL_MAN} ${WRKSRC}/doc/snobol4.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/doc/snobol4.1 ${PREFIX}/${PKGMANDIR}/man1
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/snobol4
 	@cd ${WRKSRC} && ${INSTALL_DATA} snolib.a snolib/bq.sno \
 		${PREFIX}/lib/snobol4
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile
index 83ad8d4747f..2c7413e6a22 100644
--- a/lang/stalin/Makefile
+++ b/lang/stalin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:56 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/01/07 09:13:57 rillig Exp $
 
 DISTNAME=		stalin-0.9
 PKGREVISION=		5
@@ -21,7 +21,7 @@ UNLIMIT_RESOURCES=	stacksize datasize
 CFLAGS:=		${CFLAGS:C/-O[0-9]*/-O0/}
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-patch:
 	${SED} -e 's:@PREFIX@:${PREFIX}:g'			\
@@ -35,7 +35,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/stalin.sh ${PREFIX}/bin/stalin
 	${INSTALL_DATA} ${WRKSRC}/include/*.sc ${PREFIX}/lib/stalin
 	${INSTALL_DATA} ${WRKSRC}/libstalin.a ${PREFIX}/lib/stalin
-	${INSTALL_MAN} ${WRKSRC}/stalin.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/stalin.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stalin
 	cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCEMENT COPYING README	\
 		stalin.el ${PREFIX}/share/doc/stalin/
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index 2c5c9f6a96d..d31d94ed325 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/11/10 17:34:09 tv Exp $
+# $NetBSD: Makefile,v 1.36 2007/01/07 09:13:57 rillig Exp $
 #
 
 DISTNAME=	tclx8.3.5-src
@@ -57,8 +57,8 @@ post-build:
 post-install:
 	${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE}
-	@${RM} ${PREFIX}/man/man3/TkX_Main.3
-	@${RM} ${PREFIX}/man/man3/Tkx_Init.3
+	@${RM} ${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3
+	@${RM} ${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3
 # the above links are installed based on the contents of the man page.
 # we don't want to modify the man page, as it is also used by ../tk-tclX,
 # so...
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index 5288b6dbdc2..94fbda9b703 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:09:53 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:57 rillig Exp $
 
 .include "../../lang/tcl-expect/Makefile.common"
 
@@ -17,11 +17,11 @@ CONFIGURE_ARGS+=	--with-tclinclude=${PREFIX}/include/tcl
 CONFIGURE_ARGS+=	--with-tkconfig=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-tkinclude=${PREFIX}/include/tk
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/expectk ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/man/man1/expectk.1
+	${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/${PKGMANDIR}/man1/expectk.1
 
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index 96c8762e665..369850abed9 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/11/10 17:34:47 tv Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/07 09:13:57 rillig Exp $
 #
 
 DISTNAME=	tclx8.3.5-src
@@ -83,8 +83,8 @@ post-install:
 	${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${PREFIX}/lib/tcl/tclX8.3/help -type f -print | ${XARGS} ${CHMOD} ${DOCMODE}
 
-# 	@${RM} ${PREFIX}/man/man3/TkX_Main.3
-# 	@${RM} ${PREFIX}/man/man3/Tkx_Init.3
+# 	@${RM} ${PREFIX}/${PKGMANDIR}/man3/TkX_Main.3
+# 	@${RM} ${PREFIX}/${PKGMANDIR}/man3/Tkx_Init.3
 # the above links are installed based on the contents of the man page.
 # we don't want to modify the man page, as it is also used by ../tk-tclX,
 # so...
diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile
index 80713e6b711..8f4c35bdd1c 100644
--- a/lang/umb-scheme/Makefile
+++ b/lang/umb-scheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:57 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:57 rillig Exp $
 
 DISTNAME=		umb-scheme-3.2
 CATEGORIES=		lang
@@ -10,7 +10,7 @@ COMMENT=		UMB Scheme interpreter
 
 WRKSRC=			${WRKDIR}/scheme-3.2
 BUILD_TARGET=		default
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 pre-patch:
 	${MV} ${WRKSRC}/scheme.1 ${WRKSRC}/scheme.1.dist
@@ -35,7 +35,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/prelude.scheme ${PREFIX}/share/umb-scheme
 	${INSTALL_DATA} ${WRKSRC}/SLIB-for-umb-scheme.init \
 		${PREFIX}/share/umb-scheme
-	${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/man/man1/umb-scheme.1
+	${INSTALL_MAN} ${WRKSRC}/scheme.1 ${PREFIX}/${PKGMANDIR}/man1/umb-scheme.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/umb-scheme/slib
 	${INSTALL_DATA} ${WRKSRC}/slib/*.scm ${PREFIX}/share/umb-scheme/slib