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.

59 files changed, 179 insertions, 179 deletions

diff --git a/net/6tunnel/Makefile b/net/6tunnel/Makefile
index d7050478072..97a295bed15 100644
--- a/net/6tunnel/Makefile
+++ b/net/6tunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:01 rillig Exp $
 #
 
 DISTNAME=	6tunnel-0.09
@@ -18,13 +18,13 @@ NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support
 LDFLAGS+=	-lsocket -lnsl
 .endif
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/6tunnel ${WRKSRC}/6tunnel.c ${LDFLAGS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/6tunnel ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/6tunnel.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/6tunnel.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/arping/Makefile b/net/arping/Makefile
index f3bdc83662a..03aee17d4dc 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/12/20 00:00:58 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:01 rillig Exp $
 #
 
 DISTNAME=		arping-2.05
@@ -32,12 +32,12 @@ BUILD_FOR=		macosx
 BUILD_TARGET=		arping1 ${BUILD_FOR}
 .endif
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 .include "../../net/libpcap/buildlink3.mk"
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/arping.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/arping.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/arping ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 28f3957ed18..509bff97835 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/04/22 09:22:12 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	arpwatch-2.1a13
@@ -33,8 +33,8 @@ pre-patch:
 	${SED} -e '/Header/s|\$$||g' ${WRKSRC}/$$f-prepatch > ${WRKSRC}/$$f
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/arpwatch.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/arpsnmp.8 ${PREFIX}/${PKGMANDIR}/man8
 	@${INSTALL_DATA_DIR} ${VARBASE}/db/arpwatch
 	${TOUCH} ${VARBASE}/db/arpwatch/arp.dat
 	${INSTALL_DATA_DIR} ${PREFIX}/share/arpwatch
diff --git a/net/balance/Makefile b/net/balance/Makefile
index cf6206a0ac6..9f7925ec65e 100644
--- a/net/balance/Makefile
+++ b/net/balance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/28 20:46:26 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	balance-3.15
@@ -13,6 +13,6 @@ BUILD_TARGET=	balance
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/balance ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/balance.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/balance.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind4/Makefile b/net/bind4/Makefile
index 3a8b674bdaf..057c56dcfb1 100644
--- a/net/bind4/Makefile
+++ b/net/bind4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:16 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	bind-4.9.11-REL
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}
 
 NOT_FOR_PLATFORM=	NetBSD-0.*-* NetBSD-1.[0123]*-*
 
-INSTALLATION_DIRS=	libexec man/man8 sbin
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8 sbin
 
 post-extract:
 	@${RM} -f ${WRKSRC}/compat/include/sys/cdefs.h
@@ -29,6 +29,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/named/named ${PREFIX}/sbin/named4
 	${INSTALL_PROGRAM} ${WRKSRC}/named/named-xfer ${PREFIX}/libexec/named4-xfer
 	${INSTALL_SCRIPT} ${WRKSRC}/named/ndc4 ${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/man/named.8 ${PREFIX}/man/man8/named4.8
+	${INSTALL_MAN} ${WRKSRC}/man/named.8 ${PREFIX}/${PKGMANDIR}/man8/named4.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index 7987898aca6..040261a5a02 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/09 02:43:11 obache Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	bmon-2.0.1
@@ -26,11 +26,11 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 EGDIR=		${PREFIX}/share/examples/bmon
 CONF_FILES=	${EGDIR}/bmon.conf ${PKG_SYSCONFDIR}/bmon.conf
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/bmon ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/bmon.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bmon
 	${INSTALL_DATA} ${WRKSRC}/etc/bmon.conf	\
 		${PREFIX}/share/examples/bmon/bmon.conf
diff --git a/net/btget/Makefile b/net/btget/Makefile
index 9f681c99437..f19b43ba923 100644
--- a/net/btget/Makefile
+++ b/net/btget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=		libbt-1.05
@@ -19,9 +19,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/btget ${PREFIX}/bin/btget
 	${INSTALL_PROGRAM} ${WRKSRC}/src/btlist ${PREFIX}/bin/btlist
 	${INSTALL_PROGRAM} ${WRKSRC}/src/btcheck ${PREFIX}/bin/btcheck
-	${INSTALL_MAN} ${WRKSRC}/man/btget.1 ${PREFIX}/man/man1/btget.1
-	${INSTALL_MAN} ${WRKSRC}/man/btlist.1 ${PREFIX}/man/man1/btlist.1
-	${INSTALL_MAN} ${WRKSRC}/man/btcheck.1 ${PREFIX}/man/man1/btcheck.1
+	${INSTALL_MAN} ${WRKSRC}/man/btget.1 ${PREFIX}/${PKGMANDIR}/man1/btget.1
+	${INSTALL_MAN} ${WRKSRC}/man/btlist.1 ${PREFIX}/${PKGMANDIR}/man1/btlist.1
+	${INSTALL_MAN} ${WRKSRC}/man/btcheck.1 ${PREFIX}/${PKGMANDIR}/man1/btcheck.1
 
 .include "../../www/curl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/cdpd/Makefile b/net/cdpd/Makefile
index b09284f1a1a..52eb092c757 100644
--- a/net/cdpd/Makefile
+++ b/net/cdpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/06 06:22:31 reed Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	cdpd-1.0.2
@@ -13,11 +13,11 @@ GNU_CONFIGURE=	YES
 
 BUILDLINK_API_DEPENDS.libnet+=	libnet-1.0.*
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cdpd ${PREFIX}/sbin/cdpd
-	${INSTALL_DATA} ${WRKSRC}/cdpd.8 ${PREFIX}/man/man8/cdpd.8
+	${INSTALL_DATA} ${WRKSRC}/cdpd.8 ${PREFIX}/${PKGMANDIR}/man8/cdpd.8
 
 .include "../../devel/libnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/cmu-dhcpd/Makefile b/net/cmu-dhcpd/Makefile
index fc6b90f86a3..b7beff19969 100644
--- a/net/cmu-dhcpd/Makefile
+++ b/net/cmu-dhcpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/10/04 21:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	CMU-dhcp-3.3.7+PU-9
@@ -16,13 +16,13 @@ NOT_FOR_PLATFORM=	Interix-*-* # no userland routing table support
 WRKSRC=		${WRKDIR}/CMU-dhcp-3.3.7+PU-9
 GNU_CONFIGURE=	YES
 
-INSTALLATION_DIRS=	man/man5 man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_DATA_DIR} /var/db/bindings
 	${INSTALL_PROGRAM} ${WRKSRC}/dhcpd ${PREFIX}/sbin/cmu-dhcpd
-	${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${PREFIX}/man/man5/bootptab.5
-	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${PREFIX}/man/man8/dhcpd.8
-	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${PREFIX}/man/man5/dhcpd.conf.5
+	${INSTALL_MAN} ${WRKSRC}/man/bootptab.5 ${PREFIX}/${PKGMANDIR}/man5/bootptab.5
+	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.8 ${PREFIX}/${PKGMANDIR}/man8/dhcpd.8
+	${INSTALL_MAN} ${WRKSRC}/man/dhcpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/dhcpd.conf.5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index ac3d9af3ae4..f6638c8b691 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2007/01/07 09:14:02 rillig Exp $
 
 DISTNAME=		djbdns-1.05
 PKGREVISION=		7
@@ -26,11 +26,11 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}
 CONF_FILES+=		${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
 PLIST_SRC=		${PKGDIR}/PLIST
 
-INSTALLATION_DIRS=	bin man man/man1 man/man5 man/man8 share/examples/djbdns
+INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/djbdns
 
 post-install:
 	cd ${WRKDIR}/*-man; for i in 1 5 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/net/dnstop/Makefile b/net/dnstop/Makefile
index bcd72b35de5..15c2d48ecaf 100644
--- a/net/dnstop/Makefile
+++ b/net/dnstop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/08 12:43:38 obache Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	dnstop-20060517
@@ -9,11 +9,11 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dns.measurement-factory.com/tools/dnstop/
 COMMENT=	Diagnose tcpdump trace for DNS queries/replies
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dnstop ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dnstop.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/dnstop.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dnstop
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/dnstop
 
diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index c304b684a0d..efc8406385b 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/09 06:33:27 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	driftnet-0.1.6
@@ -17,11 +17,11 @@ BUILD_TARGET=	default
 MAKE_ENV+=	CAT=${CAT:Q} TRUE=${TRUE:Q}
 USE_TOOLS+=	makedepend
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/net/dynipclient/Makefile b/net/dynipclient/Makefile
index 3d0ec5c15d7..c34e984917b 100644
--- a/net/dynipclient/Makefile
+++ b/net/dynipclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	dynip_3.00
@@ -17,7 +17,7 @@ RCD_SCRIPTS=	dynipclient
 EGDIR=		${PREFIX}/share/examples/dynipclient
 CONF_FILES=	${EGDIR}/dynip.cfg ${PKG_SYSCONFDIR}/dynip.cfg
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-build:
 	cd ${WRKSRC} && ./Configure freebsd ${PREFIX}/bin ${PKG_SYSCONFDIR} \
@@ -26,7 +26,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dynipadmin ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/dynipclient ${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} ${WRKSRC}/*.1 ${PREFIX}/${PKGMANDIR}/man1/
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/dynip.cfg ${EGDIR}
 
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index a373a024d18..ac5ab63f210 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/06 06:22:32 reed Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:02 rillig Exp $
 
 DISTNAME=	firewalk-5.0
 PKGREVISION=	1
@@ -23,6 +23,6 @@ MAKE_ENV+=	FIREWALK_LOC=${PREFIX:Q}
 .include "../../net/libpcap/buildlink3.mk"
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/man/firewalk.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/flodo/Makefile b/net/flodo/Makefile
index 73cbc11e136..67d6935deeb 100644
--- a/net/flodo/Makefile
+++ b/net/flodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/06 06:22:32 reed Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=		flodo-v4
@@ -16,14 +16,14 @@ BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libpcap}/include
 LDFLAGS+=		-L${BUILDLINK_PREFIX.libpcap}/lib
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o flodo flodo.c hash.c local_mac.c -lpcap
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flodo ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/flodo.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/flodo.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile
index ddc26441087..a843158e1fc 100644
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/01/08 18:35:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/07 09:14:02 rillig Exp $
 
 DISTNAME=	flow-tools-0.68
 PKGREVISION=	2
@@ -53,7 +53,7 @@ PLIST_SUBST+=	PYTHON_OPT=""
 post-install:
 .   for s in flow-rpt2rrd flow-log2rrd flow-rptfmt
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${s} ${PREFIX}/bin/${s}
-	${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/man/man1/${s}.1
+	${INSTALL_MAN} ${WRKSRC}/docs/${s}.1 ${PREFIX}/${PKGMANDIR}/man1/${s}.1
 .  endfor
 .else
 PLIST_SUBST+=	PYTHON_OPT="@comment "
diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile
index b5066e741fd..85224f3c57f 100644
--- a/net/ftpproxy/Makefile
+++ b/net/ftpproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:18 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=	ftpproxy-${VERSION}
@@ -22,7 +22,7 @@ OSFLAG=		-DSOLARIS
 .endif
 MAKE_ENV+=	OSFLAG=${OSFLAG:Q} OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q}
 
-INSTALLATION_DIRS=	libexec man/man8
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ftp.proxy ${PREFIX:Q}/libexec/
diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile
index 0540df03550..a32bfbd609e 100644
--- a/net/hf6to4/Makefile
+++ b/net/hf6to4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/14 08:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=		hf6to4-1.3
@@ -23,7 +23,7 @@ NO_BUILD=	yes
 
 CONF_FILES+=	${PREFIX}/share/examples/hf6to4/hf6to4.conf ${PKG_SYSCONFDIR}/hf6to4.conf
 
-INSTALLATION_DIRS=	man/man8 sbin share/examples/hf6to4 share/doc/hf6to4
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/hf6to4 share/doc/hf6to4
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	hf6to4
@@ -36,7 +36,7 @@ post-extract:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/hf6to4 ${PREFIX}/sbin/hf6to4
-	${INSTALL_MAN} ${FILESDIR}/hf6to4.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${FILESDIR}/hf6to4.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${FILESDIR}/hf6to4.html ${PREFIX}/share/doc/hf6to4/hf6to4.html
 	${INSTALL_DATA} ${FILESDIR}/hf6to4.conf ${PREFIX}/share/examples/hf6to4
 
diff --git a/net/hping/Makefile b/net/hping/Makefile
index 6b937ced189..db8d3ea24af 100644
--- a/net/hping/Makefile
+++ b/net/hping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/03/30 13:51:28 salo Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:02 rillig Exp $
 #
 
 DISTNAME=		hping2.0.0-rc3
@@ -15,7 +15,7 @@ HAS_CONFIGURE=		YES
 MANPATH=		${PREFIX}/man
 CONFIGURE_ENV+=		MANPATH=${MANPATH:Q}
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 CONFIGURE_ENV+=		PCAPINCDIR=${BUILDLINK_PREFIX.libpcap}/include
 CONFIGURE_ENV+=		PCAPLIBDIR=${BUILDLINK_PREFIX.libpcap}/lib
@@ -25,8 +25,8 @@ CONFIGURE_ENV+=		PCAPLIBDIR=${BUILDLINK_PREFIX.libpcap}/lib
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${PREFIX}/sbin
 	${LN} -s ../sbin/hping2 ${PREFIX}/sbin/hping
-	${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/man/man8
-	${LN} -s ../../man/man8/hping2.8 ${PREFIX}/man/man8/hping.8
+	${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 ${PREFIX}/${PKGMANDIR}/man8
+	${LN} -s ../../man/man8/hping2.8 ${PREFIX}/${PKGMANDIR}/man8/hping.8
 
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/httping/Makefile b/net/httping/Makefile
index 2df7214a913..ebd2190796a 100644
--- a/net/httping/Makefile
+++ b/net/httping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/09/16 10:07:55 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2007/01/07 09:14:03 rillig Exp $
 #
 
 DISTNAME=		httping-1.2.1
@@ -13,7 +13,7 @@ COMMENT=		Like 'ping' but for http-requests
 LDFLAGS.SunOS=		-lnsl -lsocket
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/httping.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/httping.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/httping ${PREFIX}/bin
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index 8ed9be626f4..c4b7c9f2709 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/07/07 12:30:56 spz Exp $
+# $NetBSD: Makefile,v 1.9 2007/01/07 09:14:03 rillig Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.2
@@ -12,7 +12,7 @@ COMMENT=		The Internet Routing Registry Toolset - client to IRRd
 
 USE_LANGUAGES=		c c++
 
-INSTALLATION_DIRS=	bin man/man1 man/man3
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
 
 LICENSE=		no-commercial-use
 
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index 686691c5e43..bca9291012e 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2007/01/04 13:27:12 ghen Exp $
+# $NetBSD: Makefile,v 1.76 2007/01/07 09:14:03 rillig Exp $
 
 DISTNAME=		lftp-3.5.6
 CATEGORIES=		net
@@ -33,7 +33,7 @@ CONFIGURE_ENV+=		F77=${FALSE:Q}
 EGDIR=			${PREFIX}/share/examples/lftp
 CONF_FILES=		${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
 
-INSTALLATION_DIRS=	bin lib/lftp man/man1 share/examples/lftp share/lftp
+INSTALLATION_DIRS=	bin lib/lftp ${PKGMANDIR}/man1 share/examples/lftp share/lftp
 
 post-install: post-install-perl
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/net/mDNSResponder-nss/Makefile b/net/mDNSResponder-nss/Makefile
index 21b8ec720ea..968087f72b2 100644
--- a/net/mDNSResponder-nss/Makefile
+++ b/net/mDNSResponder-nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/09/21 18:06:18 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/07 09:14:03 rillig Exp $
 
 DISTNAME=	mDNSResponder-108
 PKGNAME=	mDNSResponder-nss-108
@@ -27,7 +27,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nss_mdns
 	${INSTALL_DATA} ${WRKSRC}/mDNSPosix/nss_mdns.conf \
 		${PREFIX}/share/examples/nss_mdns
-	${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/mDNSPosix/nss_mdns.conf.5 ${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 9ae2935dd7c..a4da4ca124a 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2006/10/19 06:40:54 martti Exp $
+# $NetBSD: Makefile,v 1.76 2007/01/07 09:14:04 rillig Exp $
 
 DISTNAME=	mrtg-2.14.7
 CATEGORIES=	net
@@ -70,9 +70,9 @@ do-install:
 	for FILE in ${WRKSRC}/doc/*.??*; do \
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/mrtg; \
 	done
-	${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${PREFIX}/man/man1/
+	${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${PREFIX}/${PKGMANDIR}/man1/
 	for FILE in cfgmaker.1 indexmaker.1; do \
-	  ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${PREFIX}/man/man1/mrtg$$FILE; \
+	  ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${PREFIX}/${PKGMANDIR}/man1/mrtg$$FILE; \
 	done
 	for FILE in CHANGES COPYING COPYRIGHT README; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/mrtg; \
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 4d260e85a21..5abcfa605d0 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/10/03 19:15:20 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2007/01/07 09:14:04 rillig Exp $
 
 DISTNAME=	mtr-0.72
 CATEGORIES=	net
@@ -12,7 +12,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 .include "options.mk"
 
@@ -24,7 +24,7 @@ BUILDLINK_TRANSFORM+=	l:termcap:ncurses
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mtr
 	${INSTALL} -c -s -m 4755 -o ${ROOT_USER} -g ${ROOT_GROUP} ${WRKSRC}/mtr ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/mtr.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/mtr
 
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/net/nam/Makefile b/net/nam/Makefile
index c6a14e234e9..1cfa42afea8 100644
--- a/net/nam/Makefile
+++ b/net/nam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/08/23 10:43:49 minskim Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:04 rillig Exp $
 
 DISTNAME=	ns-allinone-2.29.3
 PKGNAME=	nam-1.11
@@ -36,7 +36,7 @@ INSTALLATION_DIRS=	bin
 .include "../../x11/tk/buildlink3.mk"
 
 post-install:
-	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/man/man1
+	${INSTALL_MAN_DIR} ${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/nam.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index 55a60d4ee5f..859b5c39f14 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/03/04 21:30:21 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2007/01/07 09:14:04 rillig Exp $
 
 DISTNAME=		ncftp-2.4.3
 PKGREVISION=		2
@@ -18,11 +18,11 @@ USE_TOOLS+=		gzcat
 
 .include "options.mk"
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
-	${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1
+	${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/${PKGMANDIR}/man1/ncftp2.1
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ns/Makefile b/net/ns/Makefile
index 92f49e4e40d..9a647bc35b7 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/08/23 10:28:06 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2007/01/07 09:14:04 rillig Exp $
 
 DISTNAME=	ns-allinone-2.29.3
 PKGNAME=	${DISTNAME:S/-allinone//}
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=	--with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
 
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 .include "../../devel/tcl-tclcl/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index 3c247d00c8c..2e0c3e7032c 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 14:06:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/07 09:14:04 rillig Exp $
 
 DISTNAME=	oinkmaster-2.0
 CATEGORIES=	net
@@ -43,7 +43,7 @@ do-install:
 
 	${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR}
-	${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${PREFIX}/bin/oinkmaster
 	${LN} -s ${PKG_SYSCONFDIR}/classification.config \
 		${PREFIX}/share/snort/rules/classification.config
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index a465ae1031f..04c383577d9 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/20 14:50:43 peter Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/07 09:14:05 rillig Exp $
 
 DISTNAME=		openntpd-3.9p1
 CATEGORIES=		net
@@ -27,12 +27,12 @@ PKG_USERS=		_ntp:_ntp
 PKG_HOME._ntp=		${VARBASE}/chroot/ntpd
 
 OWN_DIRS=		${VARBASE}/chroot/ntpd
-INSTALLATION_DIRS=	man/man5 man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${PREFIX}/sbin/ntpd
-	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/man/man8/ntpd.8
-	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/man/man5/ntpd.conf.5
+	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/${PKGMANDIR}/man8/ntpd.8
+	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5
 
 post-install:
 	@${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/net/pchar/Makefile b/net/pchar/Makefile
index 652ceb5532a..51df32a0621 100644
--- a/net/pchar/Makefile
+++ b/net/pchar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/10/04 21:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:05 rillig Exp $
 
 DISTNAME=		pchar-1.5
 CATEGORIES=		net
@@ -26,11 +26,11 @@ CONFIGURE_ARGS+=	--with-snmp=${BUILDLINK_PREFIX.net-snmp}
 LIBS+=			-lsnmp -lcrypto -ldes
 .endif
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pchar ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/pchar.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/pchar.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index 026e0a86c2e..f76431edf34 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/01/03 15:23:25 tv Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:05 rillig Exp $
 
 DISTNAME=	pim6sd-20031021a
 CATEGORIES=	net
@@ -11,7 +11,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/pim6sd/
 USE_TOOLS+=	lex yacc
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/${PKGMANDIR}/man1
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pim6sd
 PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
diff --git a/net/poink/Makefile b/net/poink/Makefile
index 13f0aac1b95..e1db939f49e 100644
--- a/net/poink/Makefile
+++ b/net/poink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/01/03 15:21:35 tv Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:05 rillig Exp $
 #
 
 DISTNAME=	poink-1.6
@@ -10,11 +10,11 @@ COMMENT=	Nosuid, absolutely secure version of ping utility
 
 NO_SRC_ON_FTP=	Already in MASTER_SITE_LOCAL.
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/poink ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ping.1 ${PREFIX}/man/man1/poink.1
+	${INSTALL_MAN} ${WRKSRC}/ping.1 ${PREFIX}/${PKGMANDIR}/man1/poink.1
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ppp-lzs/Makefile b/net/ppp-lzs/Makefile
index e89d98fc529..574abeb915f 100644
--- a/net/ppp-lzs/Makefile
+++ b/net/ppp-lzs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/05/18 20:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:05 rillig Exp $
 
 DISTNAME=	ppp-lzs-1.2
 CATEGORIES=	net
@@ -23,7 +23,7 @@ USE_TOOLS+=	patch
 
 BUILDLINK_PASSTHRU_DIRS=	${NETBSDSRCDIR}/lib/libpcap
 
-INSTALLATION_DIRS=	lkm man/cat8 man/man8 sbin
+INSTALLATION_DIRS=	lkm ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
 
 pre-extract:
 .if !exists(${NETBSDSRCDIR}/usr.sbin/pppd/Makefile)
@@ -59,8 +59,8 @@ pre-install:
 do-install:
 	${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 4555 \
 		${WRKSRC}/pppd/pppd ${PREFIX}/sbin/pppd
-	${INSTALL_MAN} ${WRKSRC}/pppd/pppd.cat8 ${PREFIX}/man/cat8/pppd.0
-	${INSTALL_MAN} ${WRKSRC}/pppd/pppd.8 ${PREFIX}/man/man8/pppd.8
+	${INSTALL_MAN} ${WRKSRC}/pppd/pppd.cat8 ${PREFIX}/${PKGMANDIR}/cat8/pppd.0
+	${INSTALL_MAN} ${WRKSRC}/pppd/pppd.8 ${PREFIX}/${PKGMANDIR}/man8/pppd.8
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${WRKSRC}/lkm/lzs.o ${PREFIX}/lkm/lzs.o
 
diff --git a/net/proxycheck/Makefile b/net/proxycheck/Makefile
index 77fea1cd5b5..807c95e1f22 100644
--- a/net/proxycheck/Makefile
+++ b/net/proxycheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/22 22:50:32 tv Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:05 rillig Exp $
 #
 
 DISTNAME=	proxycheck-0.49a
@@ -12,10 +12,10 @@ COMMENT=	Tester for open (promiscuous) proxy systems
 HAS_CONFIGURE=	YES
 MAKE_FLAGS+=	CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q}
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/proxycheck ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/proxycheck.1 ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/proxycheck.1 ${PREFIX}/${PKGMANDIR}/man1/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index a54f40a6c7e..b271c3ab169 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:05 rillig Exp $
 #
 
 DISTNAME=	pygopherd_2.0.9
@@ -61,7 +61,7 @@ post-install:
 	for egfile in ${EGFILES}; do \
 		${INSTALL_DATA} $$egfile ${EXAMPLEDIR}; \
 	done
-	${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/pygopherd.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/qadsl/Makefile b/net/qadsl/Makefile
index 7671b62f56d..448574216ab 100644
--- a/net/qadsl/Makefile
+++ b/net/qadsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/01/07 09:14:06 rillig Exp $
 #
 # qadsl is now GNU Alive (wip/alive)
 
@@ -17,12 +17,12 @@ MANCOMPRESSED=	yes
 MAKE_ENV+=	LIBS=${LIBS:M*:Q}
 MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
-INSTALLATION_DIRS=	man/man8 sbin share/examples
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qadsl ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/qadsl.conf \
 		${PREFIX}/share/examples/qadsl.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/qadsl.8.gz ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/qadsl.8.gz ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index b1f1fcfcd66..489d7578c4e 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:02 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2007/01/07 09:14:06 rillig Exp $
 
 DISTNAME=	rtspd-src-1.0.0.0
 PKGNAME=	ra-rtsp-proxy-1.0.0.0
@@ -27,10 +27,10 @@ WRKSRC=		${WRKDIR}/rtspd-1.0.0.0a
 MAKE_ENV+=	LOCAL_LIBS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	etc/rc.d man/man8 sbin
+INSTALLATION_DIRS=	etc/rc.d ${PKGMANDIR}/man8 sbin
 
 do-install:
-	${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ra-rtsp-proxy
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/share/doc/ra-rtsp-proxy
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index 80dd5bb99e1..cf9db6edb0b 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/09/09 02:43:11 obache Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:06 rillig Exp $
 
 DISTNAME=	radiusd-cistron-1.6.7
 PKGREVISION=	1
@@ -42,13 +42,13 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/radiusd-cistron/
 .endfor
 .for i in	radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man1/
 .endfor
 .for i in	clients.5rad naslist.5rad
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man5/
 .endfor
 .for i in	radiusd.8 radrelay.8 radwatch.8
-	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man8/
 .endfor
 
 # The sources assume <malloc.h> exists.  Create a fake one for platforms
diff --git a/net/sdig/Makefile b/net/sdig/Makefile
index eb49aff1407..e6861918f91 100644
--- a/net/sdig/Makefile
+++ b/net/sdig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:06 rillig Exp $
 
 DISTNAME=	sdig-0.30
 PKGREVISION=	1
@@ -23,8 +23,8 @@ post-build: my-post-build
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/sdig.conf ${PREFIX}/share/examples/
 	${INSTALL_DATA} ${WRKDIR}/mactable ${PREFIX}/share/misc/
-	${INSTALL_DATA} ${WRKSRC}/sdig.8 ${PREFIX}/man/man8/
-	${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${PREFIX}/man/man5/
+	${INSTALL_DATA} ${WRKSRC}/sdig.8 ${PREFIX}/${PKGMANDIR}/man8/
+	${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${PREFIX}/${PKGMANDIR}/man5/
 
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index a193ec0e6c6..369f83c0ff5 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/14 08:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=	Sharity-Light.1.2
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM=	Interix-*-* # SMB is all native
 # avoid picking up a bad value from a users environment
 MAKE_ENV+=	"ARCH=	"
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 post-extract:
 	${MKDIR} ${WRKDIR}/unshlight
@@ -31,6 +31,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sharity-light
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/FAQ.txt \
 		${PREFIX}/share/doc/sharity-light/
-	${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/man/man8/shlight.8
+	${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/${PKGMANDIR}/man8/shlight.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/sitescooper/Makefile b/net/sitescooper/Makefile
index af3edb46bd6..ade2467f0ab 100644
--- a/net/sitescooper/Makefile
+++ b/net/sitescooper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/22 22:51:28 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=	sitescooper-2.2.8
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 CONF_FILES+=	${PREFIX}/share/examples/sitescooper/sitescooper.cf \
 		${PREFIX}/etc/sitescooper.cf \
 
-INSTALLATION_DIRS=	bin etc man/man1
+INSTALLATION_DIRS=	bin etc ${PKGMANDIR}/man1
 
 do-configure:
 .for file in sitescooper rss-to-site subs-to-site
@@ -38,7 +38,7 @@ do-configure:
 do-install:
 .for file in sitescooper rss-to-site subs-to-site
 	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${PREFIX}/man/man1/${file}.1
+	${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${PREFIX}/${PKGMANDIR}/man1/${file}.1
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/sitescooper/lib
 	${CP} -R ${WRKSRC}/site_samples ${PREFIX}/share/sitescooper
diff --git a/net/slurm/Makefile b/net/slurm/Makefile
index 2ecb00324c3..565e58b5a59 100644
--- a/net/slurm/Makefile
+++ b/net/slurm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/30 04:56:27 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=	slurm-0.3.3
@@ -11,11 +11,11 @@ COMMENT=	Realtime traffic statistics
 
 GNU_CONFIGURE=	YES
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/${PKGMANDIR}/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/slurm
 	for theme in black blue cyan foo; do								\
 		${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme ${PREFIX}/share/slurm ;	\
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 93f1590a51d..f13d1ec6525 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=		sniffit.0.3.5
@@ -15,12 +15,12 @@ NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 loss
 
 GNU_CONFIGURE=		YES
 BUILD_TARGET=
-INSTALLATION_DIRS=	man/man5 man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin/sniffit
-	${INSTALL_MAN}     ${WRKSRC}/sniffit.5 ${PREFIX}/man/man5
-	${INSTALL_MAN}     ${WRKSRC}/sniffit.8 ${PREFIX}/man/man8
+	${INSTALL_MAN}     ${WRKSRC}/sniffit.5 ${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_MAN}     ${WRKSRC}/sniffit.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common
index e3404c631e6..49a937f4e11 100644
--- a/net/snort/Makefile.common
+++ b/net/snort/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2006/06/18 00:25:26 rillig Exp $
+# $NetBSD: Makefile.common,v 1.37 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=		snort-2.4.5
@@ -71,7 +71,7 @@ post-install:
 	for i in `${LS} | ${EGREP} -v "(Makefile|signatures)"` ; do \
 		${INSTALL_DATA} $$i ${PREFIX}/share/doc/snort ; \
 	done
-	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/snort.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/schemas/create_mysql \
 		${PREFIX}/share/doc/snort/schemas
 	${INSTALL_DATA} ${WRKSRC}/schemas/create_postgresql \
diff --git a/net/socks4/Makefile b/net/socks4/Makefile
index 14a41b08357..9ae3eae700c 100644
--- a/net/socks4/Makefile
+++ b/net/socks4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:24 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=	export.socks.cstc.4.2.2
@@ -21,7 +21,7 @@ MAKE_ENV+=		OPTIMIZE=${CFLAGS:M*:Q}
 EGDIR=		${PREFIX}/share/examples/socks4
 CONF_FILES=	${EGDIR}/socks.conf ${PKG_SYSCONFDIR}/socks.conf
 
-INSTALLATION_DIRS=	bin lib libexec man/man1 man/man5 man/man8
+INSTALLATION_DIRS=	bin lib libexec ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 post-patch:
 	@cd ${WRKSRC};							\
diff --git a/net/tacacs/Makefile b/net/tacacs/Makefile
index bf25d99921c..a40b7b04262 100644
--- a/net/tacacs/Makefile
+++ b/net/tacacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:28 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/01/07 09:14:06 rillig Exp $
 #
 
 DISTNAME=	tac_plus.F4.0.4.alpha
@@ -18,11 +18,11 @@ BUILD_TARGET=	tac_plus
 MAKE_FLAGS+=	OS=-DSOLARIS OSLIBS="-lsocket -lnsl"
 .endif
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tac_plus ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${PREFIX}/man/man8/tac_plus.8
+	${INSTALL_MAN} ${WRKSRC}/tac_plus.1 ${PREFIX}/${PKGMANDIR}/man8/tac_plus.8
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tacacs
 	${INSTALL_DATA} ${WRKSRC}/users_guide ${PREFIX}/share/doc/tacacs
 
diff --git a/net/tcpdpriv/Makefile b/net/tcpdpriv/Makefile
index 32d29ee6d02..f7b4a972b7c 100644
--- a/net/tcpdpriv/Makefile
+++ b/net/tcpdpriv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/08/06 05:16:51 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/07 09:14:06 rillig Exp $
 
 DISTNAME=	tcpd-tools-0.8
 PKGNAME=	tcpdpriv-0.8
@@ -10,10 +10,10 @@ COMMENT=	Anonymize tcpdump traces
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wide-tcpdpriv
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcpdpriv ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tcpdpriv.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index c8720dd0956..989aa20f4f5 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:07 rillig Exp $
 
 DISTNAME=	tcptrace-6.6.7
 CATEGORIES=	net
@@ -16,11 +16,11 @@ DOCFILES=		COPYRIGHT FAQ README README.tput_graphs
 
 LDFLAGS.SunOS+=		-lm
 
-INSTALLATION_DIRS=	bin man/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/man/man1/tcptrace.1
+	${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/${PKGMANDIR}/man1/tcptrace.1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcptrace
 .for f in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/tcptrace
diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile
index 1edfec9ad97..993d525bee3 100644
--- a/net/tcptraceroute/Makefile
+++ b/net/tcptraceroute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/06 06:22:35 reed Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/07 09:14:07 rillig Exp $
 #
 
 DISTNAME=		tcptraceroute-1.4
@@ -20,11 +20,11 @@ BINMODE=		4711
 
 .include "../../mk/bsd.prefs.mk"
 
-INSTALLATION_DIRS=	man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples.txt ${DOCDIR}
 
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 4fc2c741773..0bf29befb6f 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:10:31 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2007/01/07 09:14:07 rillig Exp $
 #
 
 DISTNAME=		tightvnc-1.2.9
@@ -27,22 +27,22 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \
 	    ${PREFIX}/bin/Xvnc
 	${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \
-	    ${PREFIX}/man/man1/Xvnc.1
+	    ${PREFIX}/${PKGMANDIR}/man1/Xvnc.1
 	${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \
 	    ${PREFIX}/bin/vncconnect
 	${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \
-	    ${PREFIX}/man/man1/vncconnect.1
+	    ${PREFIX}/${PKGMANDIR}/man1/vncconnect.1
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \
 	    ${PREFIX}/bin/vncpasswd
 	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
-	    ${PREFIX}/man/man1/vncpasswd.1
+	    ${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
 	${SED} -e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g' \
 		-e 's|/usr/bin/perl|${PERL5}|g' \
 		< ${WRKSRC}/vncserver \
 		> ${WRKSRC}/vncserver.local
 	${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
 	${INSTALL_MAN} ${WRKSRC}/vncserver.man \
-	    ${PREFIX}/man/man1/vncserver.1
+	    ${PREFIX}/${PKGMANDIR}/man1/vncserver.1
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
diff --git a/net/tkined/Makefile b/net/tkined/Makefile
index 40e8c66b563..15df0a35bc1 100644
--- a/net/tkined/Makefile
+++ b/net/tkined/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/07 09:14:07 rillig Exp $
 #
 
 DISTNAME=	scotty-2.1.11
@@ -26,14 +26,14 @@ DISTINFO_FILE=	${.CURDIR}/../../net/tcl-scotty/distinfo
 FILESDIR=	${.CURDIR}/../../net/tcl-scotty/files
 PATCHDIR=	${.CURDIR}/../../net/tcl-scotty/patches
 
-INSTALLATION_DIRS=	man/man1
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 .include "../../net/tcl-scotty/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
 do-install:
 	@cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} tki-install
-	${INSTALL_DATA} ${WRKSRC}/../doc/tkined.1 ${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/../doc/tkined.1 ${PREFIX}/${PKGMANDIR}/man1
 
 post-install:
 	cd ${PREFIX}/bin && ${LN} -f -s tkined1.4.11 tkined
diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile
index 83d37d287ef..eba039f9b1b 100644
--- a/net/tnftpd/Makefile
+++ b/net/tnftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/02 23:00:04 adrianp Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:07 rillig Exp $
 #
 
 DISTNAME=		tnftpd-20040810
@@ -28,13 +28,13 @@ OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	CPPFLAGS=""
 
 EXAMPLEDIR=		${PREFIX}/share/examples/tnftpd
-INSTALLATION_DIRS=	libexec man/man5 man/man8
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tnftpd ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/src/ftpd.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/src/ftpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_MAN} ${WRKSRC}/src/ftpusers.5 ${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_MAN} ${WRKSRC}/src/ftpd.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ftpd.conf ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/ftpusers ${EXAMPLEDIR}
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 111b35d7cb9..16c960deebd 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/07/27 18:48:03 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:07 rillig Exp $
 
 DISTNAME=		ucspi-tcp-0.88
 PKGREVISION=		1
@@ -17,11 +17,11 @@ DJB_RESTRICTED=		YES
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-INSTALLATION_DIRS=	bin man man/man1
+INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man1
 
 post-install:
 	cd ${WRKDIR}/*-man; for i in 1; 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/net/vncviewer/Makefile b/net/vncviewer/Makefile
index afe722c6e79..ac4144e4310 100644
--- a/net/vncviewer/Makefile
+++ b/net/vncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/07 09:14:07 rillig Exp $
 
 DISTNAME=       	vnc-4_1_2-unixsrc
 PKGNAME=		vncviewer-4.1.2
@@ -27,10 +27,10 @@ pre-fetch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
 	${INSTALL_MAN} ${WRKSRC}/vncviewer/vncviewer.man \
-		${PREFIX}/man/man1/vncviewer.1
+		${PREFIX}/${PKGMANDIR}/man1/vncviewer.1
 	${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
 	${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
-		${PREFIX}/man/man1/vncpasswd.1
+		${PREFIX}/${PKGMANDIR}/man1/vncpasswd.1
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index 9fdfceb866e..ef6ddf185c3 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/27 12:50:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:07 rillig Exp $
 #
 
 DISTNAME=		vpnc-0.3.3
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM=	Interix-*-*
 
 USE_TOOLS+=		gmake
 BUILD_TARGET=		vpnc
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 EGDIR=                  ${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES+=		${EGDIR}/vpnc.conf ${PKG_SYSCONFDIR}/vpnc.conf
@@ -26,7 +26,7 @@ do-install:
 	:
 	${INSTALL_PROGRAM} ${WRKSRC}/vpnc ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/vpnc-disconnect ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/vpnc
 	${INSTALL_MAN} ${WRKSRC}/vpnc.conf ${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/vpnc-script ${EGDIR}
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index eb208f6369a..3789b2ed8c1 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/01/03 15:54:56 tv Exp $
+# $NetBSD: Makefile,v 1.26 2007/01/07 09:14:07 rillig Exp $
 #
 
 DISTNAME=	vsftpd-2.0.4
@@ -29,7 +29,7 @@ CONF_FILES=	${EGDIR}/vsftpd.conf.default ${PKG_SYSCONFDIR}/vsftpd.conf
 MAKE_DIRS=	${VARBASE}/chroot
 OWN_DIRS=	${VARBASE}/chroot/vsftpd
 
-INSTALLATION_DIRS=	libexec man/man5 man/man8
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	vsftpd.8 vsftpd.conf.5 vsftpd.conf
@@ -46,8 +46,8 @@ LIBS.SunOS=	-lsocket -lnsl -lrt -lsendfile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vsftpd ${PREFIX}/libexec
-	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/vsftpd.8 ${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/vsftpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/vsftpd.conf ${EGDIR}/vsftpd.conf.default
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index b395c9c7379..e0cbed83cb4 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/03/14 01:14:31 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2007/01/07 09:14:08 rillig Exp $
 
 DISTNAME=	vtun-2.6
 PKGREVISION=	6
@@ -33,7 +33,7 @@ CONF_FILES_PERMS=	${EGDIR}/vtund.conf ${PKG_SYSCONFDIR}/vtund.conf \
 			${ROOT_USER} ${ROOT_GROUP} 0600
 OWN_DIRS=		${LOCKDIR} ${LOGDIR}
 
-INSTALLATION_DIRS=	man/man5 man/man8 sbin
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
 
 post-build:
 	@cd ${WRKSRC}; for file in vtund.8; do				\
@@ -52,10 +52,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.Setup ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.Shaper ${DOCDIR}
 	${INSTALL_DATA} ${WRKDIR}/vtund.conf ${EGDIR}/vtund.conf
-	${INSTALL_MAN} ${WRKSRC}/vtund.conf.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/vtund.8 ${PREFIX}/man/man8
-	${RM} -f ${PREFIX}/man/man8/vtun.8
-	${LN} -s vtund.8 ${PREFIX}/man/man8/vtun.8
+	${INSTALL_MAN} ${WRKSRC}/vtund.conf.5 ${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_MAN} ${WRKSRC}/vtund.8 ${PREFIX}/${PKGMANDIR}/man8
+	${RM} -f ${PREFIX}/${PKGMANDIR}/man8/vtun.8
+	${LN} -s vtund.8 ${PREFIX}/${PKGMANDIR}/man8/vtun.8
 
 .include "../../archivers/liblzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/net/wimon/Makefile b/net/wimon/Makefile
index 042d4942710..56dd6ec0a7d 100644
--- a/net/wimon/Makefile
+++ b/net/wimon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/09 17:04:51 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2007/01/07 09:14:08 rillig Exp $
 #
 
 DISTNAME=	wimon-0.3
@@ -19,11 +19,11 @@ NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-*
 
 WRKSRC=		${WRKDIR}/wimon
 
-INSTALLATION_DIRS=	bin man/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wimon ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"