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.

15 files changed, 42 insertions, 42 deletions

diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index 33fdc2103ea..a5773933ae7 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/09/03 00:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:46 rillig Exp $
 #
 
 DISTNAME=	amp-0.7.6
@@ -19,10 +19,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/amp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/amp.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index bfd2b98891a..b8a1754b4d3 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:28:54 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:46 rillig Exp $
 #
 
 DISTNAME=		bladeenc-0.94.2-src-stable
@@ -17,6 +17,6 @@ GNU_CONFIGURE=		yes
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bladeenc
 	${INSTALL_DATA} ${WRKSRC}/bladeenc.html ${PREFIX}/share/doc/html/bladeenc
-	${INSTALL_MAN} ${WRKSRC}/bladeenc.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/bladeenc.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 7d96813062e..0af9e846275 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/03/09 21:04:39 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=	cam-1.02
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index bd8a5eb2dea..5eff2cd4a5e 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/07/10 00:56:25 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=		cmus-2.0.3
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	CONFIG_OSS=y
 CONFIGURE_ARGS+=	CONFIG_MAD=y
 CONFIGURE_ARGS+=	CONFIG_AO=y
 CONFIGURE_ARGS+=	CONFIG_FLAC=y
-CONFIGURE_ARGS+=	mandir=${PREFIX}/man/
+CONFIGURE_ARGS+=	mandir=${PREFIX}/${PKGMANDIR}/
 
 .if exists(/usr/include/sys/audioio.h)
 PLIST_SUBST+=	SUN=""
diff --git a/audio/disc-cover/Makefile b/audio/disc-cover/Makefile
index 718bda30d0c..346bbd47384 100644
--- a/audio/disc-cover/Makefile
+++ b/audio/disc-cover/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/07/03 18:45:24 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=	disc-cover-1.5.6
@@ -16,7 +16,7 @@ REPLACE_PERL=		disc-cover
 
 DCTMPL=	${PREFIX}/share/disc-cover/templates
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	cd ${WRKSRC} && ${POD2MAN} disc-cover > disc-cover.1
@@ -25,7 +25,7 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/disc-cover ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/disc-cover.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/disc-cover.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${DCTMPL}
 	${INSTALL_DATA} ${WRKSRC}/templates/* ${DCTMPL}
 
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 5f5df2f90d7..aac082a741c 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/05/19 16:18:51 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	festival-1.95-beta
 PKGNAME=	festival-1.95beta
@@ -69,7 +69,7 @@ MAKE_ENV+=	PKG_EST_HOME=${SPEECHTOOLS:Q}				\
 		CC=${CC:Q}						\
 		CXX=${CXX:Q}
 
-INSTALLATION_DIRS=	bin libexec man/man1
+INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1
 
 post-patch:
 	${CP} ${FILESDIR}/top-Makefile ${WRKSRC}/Makefile
@@ -96,8 +96,8 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/festival.sh ${PREFIX}/bin/festival
 	${INSTALL_SCRIPT} ${WRKDIR}/festival_client.sh ${PREFIX}/bin/festival_client
 	${INSTALL_DATA} ${WRKDIR}/sitevars.scm ${FHOME}/lib/sitevars.scm
-	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/man/man1/festival.1
-	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/man/man1/festival_client.1
+	${INSTALL_MAN} ${FESTIVAL}/doc/festival.1 ${PREFIX}/${PKGMANDIR}/man1/festival.1
+	${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 ${PREFIX}/${PKGMANDIR}/man1/festival_client.1
 
 .include "../../audio/nas/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile
index 4304e76da67..c045884340b 100644
--- a/audio/ices-mp3/Makefile
+++ b/audio/ices-mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=		ices-${ICES_VERSION}
@@ -32,14 +32,14 @@ DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 MODDIR=			${PREFIX}/share/${PKGBASE}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 pre-configure:
 	cd ${WRKSRC} && autoreconf --force
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/ices ${PREFIX}/bin/${PKGBASE}
-	${INSTALL_MAN} ${WRKSRC}/doc/ices.1 ${PREFIX}/man/man1/${PKGBASE}.1
+	${INSTALL_MAN} ${WRKSRC}/doc/ices.1 ${PREFIX}/${PKGMANDIR}/man1/${PKGBASE}.1
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/icesmanual.html ${DOCDIR}
 	for i in AUTHORS BUGS COPYING NEWS README README.playlist TODO ; \
diff --git a/audio/mad123/Makefile b/audio/mad123/Makefile
index c4461740f15..7a2c6a90570 100644
--- a/audio/mad123/Makefile
+++ b/audio/mad123/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/11/19 11:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=	mad123-0.8.5
@@ -37,11 +37,11 @@ MAKE_FLAGS+=	USE_OSS=yes
 MAKE_FLAGS+=	USE_SUN=yes
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mad123 ${DESTDIR}${PREFIX}/bin/mad123
-	${INSTALL_MAN} ${WRKSRC}/mad123.1 ${DESTDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/mad123.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index c76bdd45839..f2594ca2e17 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/14 07:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	mp3check-0.8.0
 CATEGORIES=	audio
@@ -13,10 +13,10 @@ USE_LANGUAGES=	c c++
 
 BUILD_TARGET=	mp3check
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mp3check ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/mp3check.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/mp3check.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 80684967af2..336a07c88b8 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:28:57 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	mpegaudio
 PKGNAME=	mpegaudio-3.9
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	MPEG/audio Layer 1 and Layer 2 encoder/decoder package
 
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${FILESDIR}/mpeg_musicin.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${FILESDIR}/mpeg_musicout.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index 3432f595153..aa6f6dc1863 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/26 12:33:37 drochner Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:13:47 rillig Exp $
 
 PKGNAME=	mpg123-esound-${MPG123_VERSION}
 PKGREVISION=	7
@@ -11,11 +11,11 @@ TARGET_SUFFIX=	-esd
 PKG_OPTIONS_VAR=PKG_OPTIONS.mpg123-esound
 .include "../../audio/mpg123/Makefile.common"
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound
-	${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/man/man1/mpg123-esound.1
+	${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/${PKGMANDIR}/man1/mpg123-esound.1
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 817602c9677..07263b1710f 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/03 00:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=	nspmod-0.1
@@ -13,10 +13,10 @@ NOT_FOR_PLATFORM=	Interix-*-*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nspmod ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/nspmod.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/oggasm/Makefile b/audio/oggasm/Makefile
index 9be0de4c971..901ec4f10ad 100644
--- a/audio/oggasm/Makefile
+++ b/audio/oggasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:47 rillig Exp $
 #
 
 DISTNAME=	oggasm_1.4.0
@@ -22,10 +22,10 @@ REPLACE_PERL=	oggasm
 
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/oggasm ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/oggasm.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile
index b94fd09fab4..c688823412a 100644
--- a/audio/tosha/Makefile
+++ b/audio/tosha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 20:44:19 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	tosha-0.05
 PKGREVISION=	1
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../devel/libscsi/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index b42612f9ec9..d2dd004a799 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 20:44:20 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:13:47 rillig Exp $
 
 DISTNAME=	xamp-0.8-10
 PKGNAME=	xamp-0.8.10
@@ -27,7 +27,7 @@ MAKE_ENV+=	QT1DIR=${QT1DIR:Q}
 SKIN_DATA=	bfamp.tar.gz chrome.tar.gz mmxamp.tar.gz
 SKIN_DIR=	${PREFIX}/lib/X11/xamp
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-patch:
 	for f in about.cpp aboutData.cpp readmex.h; do \
@@ -38,7 +38,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/${PKGMANDIR}/man1
 	@${INSTALL_DATA_DIR} ${SKIN_DIR}/bfamp-xamp
 	${INSTALL_DATA} ${WRKDIR}/bfamp-xamp/*.bmp ${SKIN_DIR}/bfamp-xamp
 	@${INSTALL_DATA_DIR} ${SKIN_DIR}/chrome-xamp