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.

41 files changed, 113 insertions, 113 deletions

diff --git a/sysutils/acpidump/Makefile b/sysutils/acpidump/Makefile
index 90a23b09f73..7fa432dee30 100644
--- a/sysutils/acpidump/Makefile
+++ b/sysutils/acpidump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:48 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=	pacpidump
@@ -14,10 +14,10 @@ COMMENT=	Portable ACPI table dumper
 USE_TOOLS+=	gmake
 BUILD_TARGET=	# null
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/acpidump ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/acpidump.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/acpidump.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
index 220cd7120bc..df1f6836ac4 100644
--- a/sysutils/adjustkernel/Makefile
+++ b/sysutils/adjustkernel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=	adjustkernel-1.7
 CATEGORIES=	sysutils
@@ -16,13 +16,13 @@ NO_MTREE=	yes
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	adjustkernel
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-extract:
 	${CP} ${FILESDIR}/adjustkernel ${WRKDIR}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/adjustkernel ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/adjustkernel.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${FILESDIR}/adjustkernel.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile
index 213c6359903..474194f7026 100644
--- a/sysutils/bbsload/Makefile
+++ b/sysutils/bbsload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/08 19:29:16 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=	bbsload-0.2.6
@@ -17,6 +17,6 @@ USE_X11BASE=		YES
 .include "../../mk/x11.buildlink3.mk"
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/man/man1/bbsload.1
+	${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/${PKGMANDIR}/man1/bbsload.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 8a2baa9b228..433923d8e2c 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=	bchunk-1.1.1
 CATEGORIES=	sysutils
@@ -10,10 +10,10 @@ COMMENT=	".bin/.cue" CD image converter
 
 MAKE_FLAGS+=	CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${PREFIX}/bin/bchunk
-	${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${PREFIX}/man/man1/bchunk.1
+	${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${PREFIX}/${PKGMANDIR}/man1/bchunk.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index f6e483088bd..bbd5c890464 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/08/27 01:01:15 ben Exp $
+# $NetBSD: Makefile,v 1.27 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=	cdrtools-2.01.01a05
 PKGNAME=	cdrtools-ossdvd-2.01.1.36
@@ -52,7 +52,7 @@ MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV:Q}
 MESSAGE_SUBST+=	CDRECORD_CONF=${CDRECORD_CONF:Q}
 .endif
 
-INSTALLATION_DIRS=	bin man/man1 man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
 SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	post-patch
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 7bdde5e7613..a8622b48887 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/11/03 19:15:45 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=	cdrtools-2.01
 PKGREVISION=	4
@@ -46,7 +46,7 @@ MESSAGE_SUBST+=	PKGNAME_NOREV=${PKGNAME_NOREV:Q}
 MESSAGE_SUBST+=	CDRECORD_CONF=${CDRECORD_CONF:Q}
 .endif
 
-INSTALLATION_DIRS=	bin man/man1 man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8
 
 SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	post-patch
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index aac88587327..0d95de558c9 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/01/06 15:10:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $
 #
 
 PKGREVISION=	4
@@ -23,8 +23,8 @@ pre-configure:
 		${WRKSRC}/contrib/vicf.in.orig > ${WRKSRC}/contrib/vicf.in
 
 post-install:
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/man/man8
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/*.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/inputs/*.example \
 		${PREFIX}/share/examples/cfengine
 	${INSTALL_DATA_DIR} /var/cfengine/inputs
diff --git a/sysutils/checkpassword-pam/Makefile b/sysutils/checkpassword-pam/Makefile
index 5bbee959630..45674d932f0 100644
--- a/sysutils/checkpassword-pam/Makefile
+++ b/sysutils/checkpassword-pam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=		checkpassword-pam-0.99
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cvsreport/Makefile b/sysutils/cvsreport/Makefile
index ddfa5fba95a..547c1477733 100644
--- a/sysutils/cvsreport/Makefile
+++ b/sysutils/cvsreport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/11/05 17:53:44 seb Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=		cvsreport-0.3.5
@@ -15,6 +15,6 @@ NO_BUILD=		yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsreport ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/cvsreport.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/cvsreport.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 4426c870931..c08295a3e14 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=		daemontools-0.76
 PKGREVISION=		1
@@ -22,7 +22,7 @@ DJB_SLASHPACKAGE=	YES
 
 CMDDIR=			${WRKSRC}/command
 
-INSTALLATION_DIRS=	bin man man/man8
+INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man8
 
 SUBST_FILES.djbware+=	src/error.h
 
@@ -37,7 +37,7 @@ do-install:
 
 post-install:
 	cd ${WRKDIR}/*-man; for i in 8; do		 		\
-	for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \
+	for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/${PKGMANDIR}/man$$i; done \
 	done
 
 .include "../../mk/djbware.mk"
diff --git a/sysutils/dmesg2gif/Makefile b/sysutils/dmesg2gif/Makefile
index 2c6d8e4feae..e37240a8891 100644
--- a/sysutils/dmesg2gif/Makefile
+++ b/sysutils/dmesg2gif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/27 00:09:06 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=		dmesg2gif-1.3
@@ -18,10 +18,10 @@ NO_BUILD=		yes
 NO_CHECKSUM=		yes
 NO_CONFIGURE=		yes
 USE_TOOLS+=		perl:run
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/dmesg2gif ${PREFIX}/bin/dmesg2gif
-	${INSTALL_MAN} ${FILESDIR}/dmesg2gif.1 ${PREFIX}/man/man1/dmesg2gif.1
+	${INSTALL_MAN} ${FILESDIR}/dmesg2gif.1 ${PREFIX}/${PKGMANDIR}/man1/dmesg2gif.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
index 8ff2e04d8ee..c8ff113952d 100644
--- a/sysutils/dvd+rw-tools/Makefile
+++ b/sysutils/dvd+rw-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/25 13:17:28 abs Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=	dvd+rw-tools-6.1
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_LANGUAGES=	c c++
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 # These are the only platforms listed in growisofs.c
 ONLY_FOR_PLATFORM=Linux-*-* OpenBSD-*-* NetBSD-*-* FreeBSD-*-* \
@@ -26,7 +26,7 @@ LDFLAGS.NetBSD+=	-lrt # sem_* functions
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/growisofs ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/growisofs.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-booktype ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-format ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-mediainfo ${PREFIX}/bin
diff --git a/sysutils/dvdrecord/Makefile b/sysutils/dvdrecord/Makefile
index ecd219c5f79..5bee93a4774 100644
--- a/sysutils/dvdrecord/Makefile
+++ b/sysutils/dvdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:40 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=	dvdrtools-${VERSION}
 PKGNAME=	${DISTNAME:S/dvdrtools/dvdrecord/}
@@ -15,11 +15,11 @@ VERSION=	0.1.5
 
 GNU_CONFIGURE=		yes
 LIBS.SunOS+=		-lsocket
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	cd ${WRKSRC}/cdrecord;						\
 		${INSTALL_PROGRAM} dvdrecord ${PREFIX}/bin;		\
-		${INSTALL_MAN} dvdrecord.1 ${PREFIX}/man/man1
+		${INSTALL_MAN} dvdrecord.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/free/Makefile b/sysutils/free/Makefile
index 522dd8fc76b..122f0e909c7 100644
--- a/sysutils/free/Makefile
+++ b/sysutils/free/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:41 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:11 rillig Exp $
 #
 
 DISTNAME=		free-1.0
@@ -17,10 +17,10 @@ NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/free ${PREFIX}/bin/free
-	${INSTALL_MAN} ${FILESDIR}/free.1 ${PREFIX}/man/man1/free.1
+	${INSTALL_MAN} ${FILESDIR}/free.1 ${PREFIX}/${PKGMANDIR}/man1/free.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 97ff45299ea..96b39b02777 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/12/11 12:31:53 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2007/01/07 09:14:11 rillig Exp $
 
 .include "../../sysutils/cdrdao/Makefile.common"
 
@@ -12,7 +12,7 @@ WRKSRC=		${WRKDIR}/cdrdao-${CDRDAO_VER}
 USE_DIRS+=		xdg-1.1
 CONFIGURE_ARGS+=	--without-posix-threads
 CONFIGURE_ARGS+=	--with-xdao
-INSTALLATION_DIRS=	bin man/man1 share/applications share/pixmaps
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/applications share/pixmaps
 USE_TOOLS+=		pkg-config
 INSTALL_DIRS=		xdao
 
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index 24289dcdfd3..f8d1417fc17 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:30:41 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:11 rillig Exp $
 
 DISTNAME=	grun-0.9.2
 PKGREVISION=	5
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake
 PTHREAD_OPTS+=		require
 
 post-install:
-	${MV} ${PREFIX}/man/man1/grun.1x ${PREFIX}/man/man1/grun.1
+	${MV} ${PREFIX}/${PKGMANDIR}/man1/grun.1x ${PREFIX}/${PKGMANDIR}/man1/grun.1
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 6d8ec8b88c2..45186a08cbb 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2006/09/26 13:14:03 dsainty Exp $
+# $NetBSD: Makefile,v 1.89 2007/01/07 09:14:12 rillig Exp $
 #
 
 DISTNAME=		lsof_4.76
@@ -39,7 +39,7 @@ REAL_GROUP=		-g kmem
 .elif ${OPSYS} == "SunOS"
 MAKE_ENV+=		CPPFLAGS=
 .endif
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 LSOF_MORE_SECURE?= 0
 
@@ -62,7 +62,7 @@ post-extract:
 do-install:
 	${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 2755 ${REAL_GROUP} \
 		${WRKSRC}/lsof ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/lsof.8 ${PREFIX}/man/man8/lsof.8
+	${INSTALL_MAN} ${WRKSRC}/lsof.8 ${PREFIX}/${PKGMANDIR}/man8/lsof.8
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/lsof
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof
 	@${CHMOD} 0444 ${PREFIX}/share/lsof/00*
diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index d84d622673e..bf014802c3a 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:41 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:12 rillig Exp $
 #
 
 .include "../../sysutils/mbmon/Makefile.common"
@@ -11,10 +11,10 @@ COMMENT=	Motherboard monitoring utility
 
 BUILD_TARGET=	mbmon
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mbmon ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mbmon.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mbmon.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/memtester/Makefile b/sysutils/memtester/Makefile
index d1b2e4d775f..2fb73aefbdd 100644
--- a/sysutils/memtester/Makefile
+++ b/sysutils/memtester/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/11/01 19:01:17 tv Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:12 rillig Exp $
 #
 
 DISTNAME=		memtester-4.0.5
@@ -16,11 +16,11 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
 
-INSTALLATION_DIRS=	bin man/man8 share/doc/memtester
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 share/doc/memtester
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/memtester ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/memtester.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/memtester.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/README.tests ${PREFIX}/share/doc/memtester
 
 .include "../../mk/djbware.mk"
diff --git a/sysutils/mklivecd/Makefile b/sysutils/mklivecd/Makefile
index cc121de265c..dcd7e60cc82 100644
--- a/sysutils/mklivecd/Makefile
+++ b/sysutils/mklivecd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/12/02 01:04:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/07 09:14:12 rillig Exp $
 
 DISTNAME=	mklivecd-0.14.4
 CATEGORIES=	sysutils
@@ -22,7 +22,7 @@ NO_CONFIGURE=	YES
 NO_BUILD=	YES
 USE_TOOLS+=	tar
 
-INSTALLATION_DIRS=	man/man8 sbin share/mklivecd
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/mklivecd
 
 FILES=	    KERN-LIVECD personal_config
 
@@ -36,7 +36,7 @@ do-install:
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/mklivecd
 	${INSTALL_SCRIPT} ${WRKDIR}/mklivecd.sh ${PREFIX}/sbin/mklivecd
-	${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKDIR}/mklivecd.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKDIR}/livecd ${PREFIX}/share/mklivecd
 .for F in ${FILES}
 	${INSTALL_DATA} ${FILESDIR}/${F} ${PREFIX}/share/mklivecd
diff --git a/sysutils/news/Makefile b/sysutils/news/Makefile
index 528a833ca7d..8cd5e677700 100644
--- a/sysutils/news/Makefile
+++ b/sysutils/news/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/11/01 19:07:45 tv Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/07 09:14:12 rillig Exp $
 #
 
 DISTNAME=		news-0.2
@@ -9,11 +9,11 @@ MAINTAINER=		jschauma@NetBSD.org
 HOMEPAGE=		http://www.netmeister.org/
 COMMENT=		System V news(1)
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/news ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/news.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/news.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/nvnet/Makefile b/sysutils/nvnet/Makefile
index efbeef14ea5..4a679633439 100644
--- a/sysutils/nvnet/Makefile
+++ b/sysutils/nvnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/05/18 20:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:12 rillig Exp $
 #
 
 PKGNAME=		nvnet-20050620nb1
@@ -29,7 +29,7 @@ WRKSRC=		${WRKDIR}/nvnet
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-INSTALLATION_DIRS=	lkm man/man4
+INSTALLATION_DIRS=	lkm ${PKGMANDIR}/man4
 
 MESSAGE_SUBST+=  PREFIX=${PREFIX:Q}
 
@@ -39,6 +39,6 @@ do-extract:
 
 do-install:
 	${INSTALL} -c -m 755 ${WRKSRC}/module/nv.o ${PREFIX}/lkm/nv.o
-	${INSTALL_MAN} ${WRKSRC}/man/nv.4 ${PREFIX}/man/man4/nv.4
+	${INSTALL_MAN} ${WRKSRC}/man/nv.4 ${PREFIX}/${PKGMANDIR}/man4/nv.4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pdumpfs/Makefile b/sysutils/pdumpfs/Makefile
index 5728571248c..a08fe13f28a 100644
--- a/sysutils/pdumpfs/Makefile
+++ b/sysutils/pdumpfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/10/04 21:59:35 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:12 rillig Exp $
 #
 
 DISTNAME=	pdumpfs-${VER}
@@ -19,8 +19,8 @@ INSTALLATION_DIRS=	share/doc/pdumpfs
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pdumpfs ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/man8/pdumpfs.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/man/ja/man8/pdumpfs.8 ${PREFIX}/man/ja_JP.EUC/man8
+	${INSTALL_MAN} ${WRKSRC}/man/man8/pdumpfs.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/man/ja/man8/pdumpfs.8 ${PREFIX}/${PKGMANDIR}/ja_JP.EUC/man8
 	cd ${WRKSRC}/doc && \
 		${PAX} -rw -pp -pm . ${PREFIX}/share/doc/pdumpfs
 
diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile
index c8e43b3841e..c464bf489ee 100644
--- a/sysutils/pflogsumm/Makefile
+++ b/sysutils/pflogsumm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:12 rillig Exp $
 #
 
 DISTNAME=		pflogsumm-1.1.0
@@ -15,7 +15,7 @@ DEPENDS+=		p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
 
 NO_CONFIGURE=		yes
 USE_TOOLS+=		perl:run
-INSTALLATION_DIRS=	man/man1 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 sbin
 
 do-build:
 	${SED} 's;/usr/bin/perl;${PERL5};' ${WRKSRC}/pflogsumm.pl \
@@ -23,6 +23,6 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pflogsumm ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/pflogsumm.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pflogsumm.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index c00573add50..70f75360789 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 13:46:48 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:12 rillig Exp $
 
 DISTNAME=	pfstat-1.7
 PKGREVISION=	2
@@ -11,11 +11,11 @@ COMMENT=	Utility to render graphical statistics for PF
 
 NO_CONFIGURE=	yes
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/pfstat.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/freetype-lib/buildlink3.mk"
diff --git a/sysutils/pftop/Makefile b/sysutils/pftop/Makefile
index 0920e77c1e0..9294e935cc7 100644
--- a/sysutils/pftop/Makefile
+++ b/sysutils/pftop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/06 23:02:07 peter Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:12 rillig Exp $
 
 DISTNAME=	pftop-0.4
 CATEGORIES=	sysutils net
@@ -13,11 +13,11 @@ NO_CONFIGURE=	yes
 MAKE_ENV+=	OSLEVEL=${PF_VERSION:S/.//}
 CFLAGS+=	-I${PREFIX}/include
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pftop ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/pftop.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/pftop.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../security/pflkm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile
index a11c69616d8..4dac4bad00d 100644
--- a/sysutils/sarah/Makefile
+++ b/sysutils/sarah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:12 rillig Exp $
 
 DISTNAME=	sarah-0.9.1b
 CATEGORIES=	sysutils
@@ -13,7 +13,7 @@ USE_TOOLS+=	perl:run
 REPLACE_PERL=	sarah
 NO_BUILD=	YES
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 CONF_FILES+=	${PREFIX}/share/examples/sarah/sarah.conf.sample \
 			${PKG_SYSCONFDIR}/sarah.conf
 
@@ -31,7 +31,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sarah ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sarah
 	${INSTALL_DATA} ${WRKSRC}/sarah.conf.sample ${PREFIX}/share/examples/sarah
-	${INSTALL_MAN} ${WRKSRC}/sarah.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/sarah.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sarah
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sarah
 
diff --git a/sysutils/scsiinfo/Makefile b/sysutils/scsiinfo/Makefile
index dfa164a7210..1d5d2e93a80 100644
--- a/sysutils/scsiinfo/Makefile
+++ b/sysutils/scsiinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:01 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:12 rillig Exp $
 
 DISTNAME=	scsiinfo-4.7
 CATEGORIES=	sysutils
@@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}
 
 ONLY_FOR_PLATFORM=	SunOS-*-*
 
-INSTALLATION_DIRS=	man/man1 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 sbin
 
 do-extract:
 	cd ${WRKSRC} && \
@@ -24,6 +24,6 @@ pre-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scsiinfo ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index 32f0f4d3430..38b70698a72 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:12 rillig Exp $
 #
 
 DISTNAME=		sformat-3.5
@@ -30,6 +30,6 @@ MAKE_FLAGS+=	INS_BASE=${LOCALBASE:Q}	# won't work in MAKE_ENV!
 MAKE_ENV+=	CCOM="gcc"
 .endif
 
-INSTALLATION_DIRS=	bin include lib man/man5 man/man8
+INSTALLATION_DIRS=	bin include lib ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/shc/Makefile b/sysutils/shc/Makefile
index a8010b43e5c..b1292a61eb2 100644
--- a/sysutils/shc/Makefile
+++ b/sysutils/shc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=		shc-3.7
@@ -10,10 +10,10 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.datsi.fi.upm.es/~frosal/
 COMMENT=		Shell script to C compiler
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/shc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/shc.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/shc.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index 5b46942f355..a5e529a3051 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/10/28 21:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=	skill-4.1.1
@@ -28,9 +28,9 @@ MAKE_ENV+=	OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS=
 
 pre-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/skill ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/skill.1 ${PREFIX}/man/man1
-	${RM} -f ${PREFIX}/bin/snice ${PREFIX}/man/man1/snice.1
+	${INSTALL_MAN} ${WRKSRC}/skill.1 ${PREFIX}/${PKGMANDIR}/man1
+	${RM} -f ${PREFIX}/bin/snice ${PREFIX}/${PKGMANDIR}/man1/snice.1
 	${LN} -s skill ${PREFIX}/bin/snice
-	${LN} -s skill.1 ${PREFIX}/man/man1/snice.1
+	${LN} -s skill.1 ${PREFIX}/${PKGMANDIR}/man1/snice.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index 2bea44f02e9..34c0efe9d60 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/07/18 23:27:14 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:13 rillig Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -85,7 +85,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so ${PREFIX}/lib/dpt
 	${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1 ${PREFIX}/lib/dpt
 	${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1.0.2 ${PREFIX}/lib/dpt
-	${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_SCRIPT} ${WRKDIR}/dptmgr.sh ${PREFIX}/sbin/dptmgr
 	${INSTALL_SCRIPT} ${WRKDIR}/dptsig.sh ${PREFIX}/sbin/dptsig
 	${INSTALL_SCRIPT} ${WRKDIR}/raidutil.sh ${PREFIX}/sbin/raidutil
diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile
index 537bc9fb9b2..6917ac5d7a6 100644
--- a/sysutils/sysgen/Makefile
+++ b/sysutils/sysgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=	sysgen
@@ -13,10 +13,10 @@ COMMENT=	Assign DEC Qbus or UNIBUS standard CSR and vector addresses
 WRKSRC=		${WRKDIR}
 BUILD_TARGET=	sysgen
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sysgen ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sysgen.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/sysgen.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
index 4dfb5ef33ba..e0dab8b03c1 100644
--- a/sysutils/tdir/Makefile
+++ b/sysutils/tdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:56 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=	tdir-1.58
@@ -13,12 +13,12 @@ LICENSE=	tdir-license
 
 USE_TOOLS+=		gunzip
 PYTHON_PATCH_SCRIPTS=	tdir
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tdir ${PREFIX}/bin/tdir
 	${GUNZIP_CMD} ${WRKSRC}/tdir.1.gz
-	${INSTALL_MAN} ${WRKSRC}/tdir.1 ${PREFIX}/man/man1/tdir.1
+	${INSTALL_MAN} ${WRKSRC}/tdir.1 ${PREFIX}/${PKGMANDIR}/man1/tdir.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdir
 	${INSTALL_DATA} ${WRKSRC}/tdir-license.txt ${PREFIX}/share/doc/tdir/
 
diff --git a/sysutils/tload/Makefile b/sysutils/tload/Makefile
index 6c26132556f..da03306abff 100644
--- a/sysutils/tload/Makefile
+++ b/sysutils/tload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=	procps-2.0.6
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://people.redhat.com/johnsonm/procps/
 MAINTAINER=	hubertf@NetBSD.org
 COMMENT=	Terminal version of xload
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	cd ${WRKSRC} ; \
@@ -18,6 +18,6 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tload ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tload.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tload.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vip/Makefile b/sysutils/vip/Makefile
index 86ff9721137..9741cd3c91b 100644
--- a/sysutils/vip/Makefile
+++ b/sysutils/vip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:13 rillig Exp $
 
 DISTNAME=	vip-19971113
 PKGREVISION=	2
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/vip ${WRKSRC}
@@ -26,6 +26,6 @@ do-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/vip ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/vip.man ${PREFIX}/man/man8/vip.8
+	${INSTALL_MAN} ${WRKSRC}/vip.man ${PREFIX}/${PKGMANDIR}/man8/vip.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index b14cf386cb2..fb23b386ef7 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:43 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=	vobcopy-0.5.14
@@ -15,11 +15,11 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 BUILD_TARGET=	vobcopy
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vobcopy ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/vobcopy.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/vobcopy.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index b01de3bb39d..9a5018c07e5 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:00 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:13 rillig Exp $
 
 DISTNAME=	wmSMPmon-2.3
 PKGREVISION=	1
@@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}/wmSMPmon-2.x/wmSMPmon
 
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/wmsmpmon.1 ${PREFIX}/man/man1/wmSMPmon.1
+	${INSTALL_MAN} ${WRKSRC}/wmsmpmon.1 ${PREFIX}/${PKGMANDIR}/man1/wmSMPmon.1
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xapply/Makefile b/sysutils/xapply/Makefile
index 196d9590b03..e5b9632a51c 100644
--- a/sysutils/xapply/Makefile
+++ b/sysutils/xapply/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/11/02 20:32:24 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=		xapply-3.4
@@ -12,7 +12,7 @@ COMMENT=		Parallel Execution tool a la xargs/apply
 
 BUILD_DEPENDS+=		mkcmd>=8.14:../../devel/mkcmd
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 do-build:
@@ -24,6 +24,6 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/xapply/xapply ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/bin/xapply/xapply.man \
-		${PREFIX}/man/man1/xapply.1
+		${PREFIX}/${PKGMANDIR}/man1/xapply.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 2021c96674f..be4188a217c 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/12/15 20:33:01 joerg Exp $
+# $NetBSD: Makefile,v 1.62 2007/01/07 09:14:13 rillig Exp $
 
 DISTNAME=	xosview-1.8.3
 CATEGORIES=	sysutils
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--x-includes=${X11BASE:Q}/include
 CONFIGURE_ARGS+=	--x-libraries=${X11BASE:Q}/lib
 
-INSTALLATION_DIRS=	bin lib/X11/app-defaults man/man1
+INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man1
 MAKE_FLAGS+=		MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile
index 1cedd3b2e93..09b5a80f8c6 100644
--- a/sysutils/zidrav/Makefile
+++ b/sysutils/zidrav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:02 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:13 rillig Exp $
 #
 
 DISTNAME=	zidrav4unix-1.2.0
@@ -20,10 +20,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 CXXFLAGS+=	-DCPU_BIGENDIAN
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zidrav ${PREFIX}/bin/zidrav
-	${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${PREFIX}/man/man1/zidrav.1
+	${INSTALL_MAN} ${WRKSRC}/zidrav.1 ${PREFIX}/${PKGMANDIR}/man1/zidrav.1
 
 .include "../../mk/bsd.pkg.mk"