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.

27 files changed, 83 insertions, 83 deletions

diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 95552e0522f..4bb122d3536 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/04 21:35:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:50 rillig Exp $
 
 DISTNAME=	argtable-1.2
 CATEGORIES=	devel
@@ -12,10 +12,10 @@ GNU_CONFIGURE=		YES
 
 USE_LANGUAGES=	c c++
 
-INSTALLATION_DIRS=	include lib man/man3 share/doc/argtable
+INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3 share/doc/argtable
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/man/man3/*.3 ${PREFIX}/man/man3
+	${INSTALL_DATA} ${WRKSRC}/man/man3/*.3 ${PREFIX}/${PKGMANDIR}/man3
 	${INSTALL_DATA} ${WRKSRC}/COPYING.LIB ${PREFIX}/share/doc/argtable
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index 68cdde5a1a8..e9b1eb091c7 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/09/09 02:41:56 obache Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:50 rillig Exp $
 
 DISTNAME=	asm.8051
 PKGNAME=	as31-19900126
@@ -18,10 +18,10 @@ USE_TOOLS+=	yacc
 MAKE_FILE=	makefile
 BUILD_TARGET=	as31
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/as31 ${PREFIX}/bin/as31
-	${INSTALL_DATA} ${WRKSRC}/as31.man ${PREFIX}/man/man1/as31.1
+	${INSTALL_DATA} ${WRKSRC}/as31.man ${PREFIX}/${PKGMANDIR}/man1/as31.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index 1fae4dfa22f..c76e6d395b5 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:50 rillig Exp $
 #
 
 DISTNAME=	c4
@@ -14,10 +14,10 @@ DEPENDS+=	p4-[0-9]*:../../devel/p4
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 BUILD_TARGET=	c4
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/c4 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/c4.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/c4.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index affb79f2946..3e8b94a2608 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:40 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:13:50 rillig Exp $
 #
 
 DISTNAME=	cvsps-2.1
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=		gmake
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 LIBS.SunOS+=		-lnsl -lsocket
 MAKE_ENV+=		LIBS=${LIBS:M*:Q}
diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile
index 13bf13a82c3..699a9fee1cb 100644
--- a/devel/cvsup-bin/Makefile
+++ b/devel/cvsup-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:13 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:50 rillig Exp $
 
 DISTNAME=	cvsup-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
@@ -19,7 +19,7 @@ DIST_SUBDIR=	cvsup-i386-1.6
 
 CONFLICTS=	cvsup-[0-9]* cvsup-gui-[0-9]*
 
-INSTALLATION_DIRS=	bin man/man1 man/man5 sbin
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 sbin
 
 do-install:
 	for i in cvpasswd cvsup ; do \
@@ -29,10 +29,10 @@ do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/sbin/$$i ${PREFIX}/sbin; \
 	done
 	for i in cvpasswd.1 cvsup.1; do \
-		${INSTALL_MAN} ${WRKSRC}/man/man1/$$i ${PREFIX}/man/man1; \
+		${INSTALL_MAN} ${WRKSRC}/man/man1/$$i ${PREFIX}/${PKGMANDIR}/man1; \
 	done
 	for i in cvsupd.8; do \
-		${INSTALL_MAN} ${WRKSRC}/man/man8/$$i ${PREFIX}/man/man8; \
+		${INSTALL_MAN} ${WRKSRC}/man/man8/$$i ${PREFIX}/${PKGMANDIR}/man8; \
 	done
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cvsup
 	${INSTALL_DATA} ${WRKSRC}/share/doc/cvsup/License \
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index 680c904f00d..7a2cbc88c06 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/09/09 02:41:57 obache Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:13:50 rillig Exp $
 #
 
 DISTNAME=	dmake-v4.1-src-export.all-unknown-all
@@ -16,7 +16,7 @@ MAKE_FILE=	makefile
 BUILD_TARGET=	linux
 WRKSRC=		${WRKDIR}/dmake
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-configure:
 	cd ${WRKSRC} && ${RM} unix/bsd43/dirent.h &&		\
@@ -26,7 +26,7 @@ do-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dmake ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${PREFIX}/man/man1/dmake.1
+	${INSTALL_MAN} ${WRKSRC}/man/dmake.tf ${PREFIX}/${PKGMANDIR}/man1/dmake.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/dmake
 	${CP} -pR ${WRKSRC}/startup ${PREFIX}/share/dmake
 
diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile
index 0ca2651792b..3821d3fd46c 100644
--- a/devel/electricfence/Makefile
+++ b/devel/electricfence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/01/08 20:25:34 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:50 rillig Exp $
 
 DISTNAME=		ElectricFence-2.1
 PKGREVISION=		1
@@ -17,10 +17,10 @@ CFLAGS+=		-g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
 CFLAGS+=		-g
 .endif
 
-INSTALLATION_DIRS=	lib man/man3
+INSTALLATION_DIRS=	lib ${PKGMANDIR}/man3
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libefence.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/libefence.3 ${PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/libefence.3 ${PREFIX}/${PKGMANDIR}/man3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/its4/Makefile b/devel/its4/Makefile
index afcc67ead0b..e6a15357659 100644
--- a/devel/its4/Makefile
+++ b/devel/its4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/02 14:14:31 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:50 rillig Exp $
 #
 
 DISTNAME=	its4-1.1.1
@@ -16,13 +16,13 @@ WRKSRC=		${WRKDIR}/its4
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/its4
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 USE_LANGUAGES=		c++
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/its4 ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/docs/its4.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/docs/its4.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/its4
 	cd ${WRKSRC} && ${INSTALL_DATA} LICENSE TODO vulns.i4d \
 		${PREFIX}/share/its4
diff --git a/devel/lcc/Makefile b/devel/lcc/Makefile
index 6f95e58834e..4bf8124f3f3 100644
--- a/devel/lcc/Makefile
+++ b/devel/lcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:13:51 rillig Exp $
 
 DISTNAME=	lcc-4.1
 CATEGORIES=	devel lang
@@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM=	*-*-i386
 BUILDDIR=	${WRKSRC}/src
 MAKE_FILE=	makefile
 
-INSTALLATION_DIRS=	bin libexec man/man1
+INSTALLATION_DIRS=	bin libexec ${PKGMANDIR}/man1
 
 post-extract:
 	${CP} ${FILESDIR}/x86bsd.md ${WRKSRC}/src/
@@ -44,7 +44,7 @@ do-install:
 		${PREFIX}/share/lcc/include
 	${INSTALL_DATA} ${FILESDIR}/cdefs.h \
 		${PREFIX}/share/lcc/include/sys
-	${INSTALL_MAN} ${WRKSRC}/doc/lcc.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/bprint.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/lcc.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/bprint.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile
index 3f274e1a8c3..2504fdb7c9c 100644
--- a/devel/libgetopt/Makefile
+++ b/devel/libgetopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/03/04 21:29:17 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=	libgetopt-1.4.1
@@ -20,7 +20,7 @@ MAKEFLAGS+=	NETBSD_COMPATIBLE=YES
 CFLAGS+=	-DREPLACE_GETOPT
 .endif
 
-INSTALLATION_DIRS=	include lib man/man3
+INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -34,6 +34,6 @@ do-build:
 do-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libgetopt.la ${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/getopt.h ${PREFIX}/include/
-	${INSTALL_MAN} ${WRKSRC}/getopt_long.3 ${PREFIX}/man/man3/
+	${INSTALL_MAN} ${WRKSRC}/getopt_long.3 ${PREFIX}/${PKGMANDIR}/man3/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libnet11/Makefile b/devel/libnet11/Makefile
index 7fd12f7ecfa..157e9c6ef2b 100644
--- a/devel/libnet11/Makefile
+++ b/devel/libnet11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/06/17 20:39:36 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:51 rillig Exp $
 
 DISTNAME=	libnet-1.1.2.1
 PKGREVISION=	1
@@ -23,7 +23,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libnet/html
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/libnet
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man3
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man3
 
 	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html \
 		${PREFIX}/share/doc/libnet/html
@@ -38,7 +38,7 @@ post-install:
 		${PREFIX}/share/examples/libnet
 
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/*.3 \
-		${PREFIX}/man/man3
+		${PREFIX}/${PKGMANDIR}/man3
 
 	for f in ${LNDOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/doc/$$f \
diff --git a/devel/libscsi/Makefile b/devel/libscsi/Makefile
index ba023f3e0b0..5e8677f6de5 100644
--- a/devel/libscsi/Makefile
+++ b/devel/libscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/18 12:10:30 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=	libscsi-1.6
@@ -19,6 +19,6 @@ MAKE_ENV+=	MANOWN=${MANOWN} MANGRP=${MANGRP}
 
 MANCOMPRESSED_IF_MANZ=	yes
 
-INSTALLATION_DIRS=	include lib man/cat3 man/man3
+INSTALLATION_DIRS=	include lib ${PKGMANDIR}/cat3 ${PKGMANDIR}/man3
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/memcached/Makefile b/devel/memcached/Makefile
index cc1d5f150b0..adc6229f322 100644
--- a/devel/memcached/Makefile
+++ b/devel/memcached/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/03/04 21:29:18 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=	memcached-1.1.12
@@ -13,11 +13,11 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--with-libevent=${BUILDLINK_PREFIX.libevent}
 
-INSTALLATION_DIRS=	bin share/doc/${PKGBASE} man/man1
+INSTALLATION_DIRS=	bin share/doc/${PKGBASE} ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/memcached ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/memcached.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../devel/libevent/buildlink3.mk"
diff --git a/devel/mkcmd/Makefile b/devel/mkcmd/Makefile
index dae9c52f898..92e70a99f27 100644
--- a/devel/mkcmd/Makefile
+++ b/devel/mkcmd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/01/25 15:19:16 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=		mkcmd-8.14
@@ -11,7 +11,7 @@ MAINTAINER=		epg@NetBSD.org
 COMMENT=		Command-line parser and manual page generator
 
 
-INSTALLATION_DIRS=	bin man/man1 man/man5
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 do-build:
@@ -25,8 +25,8 @@ do-install:
 		install
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/bin/mkcmd/mkcmd.man \
-		${PREFIX}/man/man1/mkcmd.1
+		${PREFIX}/${PKGMANDIR}/man1/mkcmd.1
 	${INSTALL_MAN} ${WRKSRC}/lib/mkcmd/mkcmd.man \
-		${PREFIX}/man/man5/mkcmd.5
+		${PREFIX}/${PKGMANDIR}/man5/mkcmd.5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/netbsd-iscsi/Makefile b/devel/netbsd-iscsi/Makefile
index cebeef91461..03081689395 100644
--- a/devel/netbsd-iscsi/Makefile
+++ b/devel/netbsd-iscsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/17 16:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $
 
 DISTNAME=	netbsd-iscsi-20060527
 CATEGORIES=	devel
@@ -16,8 +16,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/iscsi-harness ${PREFIX}/sbin/iscsi-harness
 	${INSTALL_DATA_DIR} ${PREFIX}/share/iscsi
 	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${PREFIX}/share/iscsi/FAQ
-	${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${PREFIX}/man/man8/iscsi-target.8
-	${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${PREFIX}/man/man5/targets.5
+	${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${PREFIX}/${PKGMANDIR}/man8/iscsi-target.8
+	${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${PREFIX}/${PKGMANDIR}/man5/targets.5
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/devel/newfile/Makefile b/devel/newfile/Makefile
index 83a7b4e5f18..92f10ab65a2 100644
--- a/devel/newfile/Makefile
+++ b/devel/newfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/03 04:43:47 taca Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=	newfile-1.0.14
@@ -19,7 +19,7 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/newfile.rb ${PREFIX}/bin/newfile
 	${INSTALL_DATA} ${WRKSRC}/src/fileproc.rb ${WRKSRC}/src/sytab.rb \
 		${PREFIX}/share/newfile/
-	${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/newfile.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../lang/ruby/modules.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile
index 5d77d2204b6..48bbf1bdba4 100644
--- a/devel/p4-docs/Makefile
+++ b/devel/p4-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/12 14:32:45 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=	p4-docs
@@ -43,10 +43,10 @@ HTMLDIR=	share/doc/html/p4
 PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
 PLIST_SUBST+=	HTMLDIR=${HTMLDIR:Q}
 
-INSTALLATION_DIRS=	man/man1
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/${PKGMANDIR}/man1
 
 	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/relnotes.txt \
diff --git a/devel/palmpower/Makefile b/devel/palmpower/Makefile
index 647d3063390..dec61609d46 100644
--- a/devel/palmpower/Makefile
+++ b/devel/palmpower/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:29:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=		palmpower-1.0.2
@@ -13,7 +13,7 @@ CPPFLAGS+=		-Dunix
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 post-build:
 	cd ${WRKSRC}/utils &&						\
@@ -23,6 +23,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/pila/pila ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/pilotdis/pilotdis ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/splitprc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/pilotdis.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/pilotdis.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ratfor/Makefile b/devel/ratfor/Makefile
index f52a2381d37..5ba5297caab 100644
--- a/devel/ratfor/Makefile
+++ b/devel/ratfor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:13:51 rillig Exp $
 
 DISTNAME=		ratfor77
 PKGNAME=		ratfor-1.0
@@ -12,10 +12,10 @@ COMMENT=		Preprocessor for the Ratfor dialect of Fortran
 
 BUILD_TARGET=		ratfor77
 USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${PREFIX}/bin/ratfor
-	${INSTALL_MAN} ${WRKSRC}/ratfor.man ${PREFIX}/man/man1/ratfor.1
+	${INSTALL_MAN} ${WRKSRC}/ratfor.man ${PREFIX}/${PKGMANDIR}/man1/ratfor.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rcs/Makefile b/devel/rcs/Makefile
index 4cfc86c71ce..b80c6b7f322 100644
--- a/devel/rcs/Makefile
+++ b/devel/rcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/07/01 22:03:12 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=		rcs-5.7
@@ -25,7 +25,7 @@ CONFIGURE_HAS_MANDIR=	no
 post-install:
 	${RM} -f ${PREFIX}/bin/rcslog
 	${LN} -s ${PREFIX}/bin/rlog ${PREFIX}/bin/rcslog
-	${RM} -f ${PREFIX}/man/man1/rcslog.1 ${PREFIX}/man/man1/rcslog.1.gz
-	${LN} -s ${PREFIX}/man/man1/rlog.1 ${PREFIX}/man/man1/rcslog.1
+	${RM} -f ${PREFIX}/${PKGMANDIR}/man1/rcslog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1.gz
+	${LN} -s ${PREFIX}/${PKGMANDIR}/man1/rlog.1 ${PREFIX}/${PKGMANDIR}/man1/rcslog.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index 189c2155a66..331c4fa1489 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/10/04 21:36:00 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/07 09:13:51 rillig Exp $
 
 DISTNAME=	roundup-1.1.2
 CATEGORIES=	devel
@@ -29,10 +29,10 @@ PYTHON_PATCH_SCRIPTS+=	tools/migrate-queries.py tools/pygettext.py
 ROUNDUPDOCDIR=	${PREFIX}/share/doc/roundup
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/roundup-admin.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/roundup-demo.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/roundup-mailgw.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/roundup-server.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/roundup-admin.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/roundup-demo.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/roundup-mailgw.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/roundup-server.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${ROUNDUPDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES.txt ${ROUNDUPDOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING.txt ${ROUNDUPDOCDIR}
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 62f74bcc496..a4fbb47ac4b 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $
 #
 
 # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000.
@@ -20,7 +20,7 @@ COMMENT=	Safe and Fast IO library
 
 WRKSRC=		${WRKDIR}
 
-INSTALLATION_DIRS=	man/man3
+INSTALLATION_DIRS=	${PKGMANDIR}/man3
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile
index 13fffd1cd94..535a8e4909f 100644
--- a/devel/unidiff/Makefile
+++ b/devel/unidiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:29:30 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=	part01
@@ -17,11 +17,11 @@ BUILD_DEPENDS+=	gsharutils>=4.2.1:../../archivers/gsharutils
 WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	${GZCAT} ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unify ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unipatch ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/unify.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/uno/Makefile b/devel/uno/Makefile
index 6f4ffc412fb..ec52bb0eb6f 100644
--- a/devel/uno/Makefile
+++ b/devel/uno/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/09/09 02:41:58 obache Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:13:51 rillig Exp $
 #
 
 DISTNAME=		uno_v28
@@ -31,7 +31,7 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/Uno/doc/uno_man.pdf ${PREFIX}/share/doc/uno
 	${INSTALL_DATA} ${WRKDIR}/Uno/doc/uno_manpage.pdf ${PREFIX}/share/doc/uno
 	${INSTALL_DATA} ${WRKDIR}/Uno/doc/uno_short.pdf ${PREFIX}/share/doc/uno
-	${INSTALL_MAN} ${WRKDIR}/Uno/doc/uno.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/Uno/doc/uno.1 ${PREFIX}/${PKGMANDIR}/man1
 
 USE_TOOLS+=	bison gmake flex
 
diff --git a/devel/xmake/Makefile b/devel/xmake/Makefile
index c4a617ed0b1..91f8a035a46 100644
--- a/devel/xmake/Makefile
+++ b/devel/xmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/28 16:35:38 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=	xmake-1.06
@@ -14,6 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/xmake
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 06d3ca66aeb..9daea4a888e 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:36 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=	xxgdb-1.12
@@ -18,12 +18,12 @@ USE_IMAKE=	yes
 MAKE_ENV+=	CPPFLAGS=
 .endif
 
-INSTALLATION_DIRS=	bin lib/X11/app-defaults man/man1
+INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxgdb ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XDbx.ad ${PREFIX}/lib/X11/app-defaults/XDbx
-	${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${PREFIX}/man/man1/xxgdb.1
+	${INSTALL_DATA} ${WRKSRC}/xxgdb.man ${PREFIX}/${PKGMANDIR}/man1/xxgdb.1
 
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile
index 7cfd6633a6f..741556f03d7 100644
--- a/devel/z80-asm/Makefile
+++ b/devel/z80-asm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/05 23:08:54 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:13:52 rillig Exp $
 #
 
 DISTNAME=	z80-asm-1.0
@@ -13,14 +13,14 @@ COMMENT=	Z80 assembly code assembler and disassembler
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
-INSTALLATION_DIRS=	bin man/man1 man/man5
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/z80-asm ${PREFIX}/bin/z80-asm
 	${INSTALL_PROGRAM} ${WRKSRC}/z80-dis ${PREFIX}/bin/z80-dis
-	${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/z80-dis.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.5 ${PREFIX}/man/man5
-	${INSTALL_DATA} ${WRKSRC}/doc/z80-file.5 ${PREFIX}/man/man5
+	${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/z80-dis.1 ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/z80-asm.5 ${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_DATA} ${WRKSRC}/doc/z80-file.5 ${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../mk/bsd.pkg.mk"