Prepare for switching to NO_MTREE=yes.

26 files changed, 81 insertions, 38 deletions

diff --git a/net/aoe-vblade/Makefile b/net/aoe-vblade/Makefile
index eb75d625205..81a5e1d3939 100644
--- a/net/aoe-vblade/Makefile
+++ b/net/aoe-vblade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/15 14:25:52 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/03/24 19:21:28 joerg Exp $
 
 DISTNAME=	vblade-14
 PKGNAME=	aoe-vblade-14
@@ -10,7 +10,9 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aoetools.sourceforge.net/
 COMMENT=	ATA over Ethernet (AoE) server - thin, LAN-based storage protocol
 
-ONLY_FOR_PLATFORM+=    NetBSD-*-* FreeBSD-*-* Linux-*-* DragonFly-*-*
+ONLY_FOR_PLATFORM+=	NetBSD-*-* FreeBSD-*-* Linux-*-* DragonFly-*-*
+
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/arpd/Makefile b/net/arpd/Makefile
index 346dfae6d67..44eedf6046d 100644
--- a/net/arpd/Makefile
+++ b/net/arpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/25 08:29:20 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/24 19:21:28 joerg Exp $
 #
 
 DISTNAME=	arpd
@@ -15,6 +15,8 @@ NOT_FOR_PLATFORM=	Interix-*-* # does not have bpf(4) device
 MAKE_ENV+=	BINDIR=${PREFIX}/sbin
 MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP}
 
+INSTALLATION_DIRS=	share/doc ${PREFIX}/etc
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/arpd.README
 	${INSTALL_DATA} ${WRKSRC}/arpd.conf ${PREFIX}/etc/arpd.conf.example
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 509bff97835..7c9492a967a 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2007/01/07 09:14:02 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2007/03/24 19:21:29 joerg Exp $
 #
 
 DISTNAME=	arpwatch-2.1a13
@@ -27,6 +27,8 @@ SUBST_SED.paths=	-e 's,/usr/operator/arpwatch,${VARBASE}/db/arpwatch,g'
 
 OWN_DIRS=	${VARBASE:Q}/db/arpwatch
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
+
 pre-patch:
 	f=arpwatch.h;							\
 	${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch;			\
diff --git a/net/bftpd/Makefile b/net/bftpd/Makefile
index 52462350d7c..4cb6edd1476 100644
--- a/net/bftpd/Makefile
+++ b/net/bftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:57 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/03/24 19:21:29 joerg Exp $
 #
 
 DISTNAME=	bftpd-1.0.24
@@ -16,6 +16,8 @@ CONF_FILES=	${PREFIX}/share/examples/bftpd/bftpd.conf \
 		${PKG_SYSCONFDIR}/bftpd.conf
 MAKE_ENV+=	VARBASE=${VARBASE:Q}
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
+
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bftpd
 
diff --git a/net/bing/Makefile b/net/bing/Makefile
index 008465cdd4c..cf25ae37efc 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:52 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/03/24 19:21:29 joerg Exp $
 
 DISTNAME=	bing-1.0.4
 CATEGORIES=	net
@@ -14,8 +14,9 @@ COMMENT=	Bing is a point-to-point bandwidth measurement tool
 LDFLAGS+=	-lsocket -lnsl
 .endif
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 share/doc/bing
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bing
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/bing
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bsddip/Makefile b/net/bsddip/Makefile
index b5fc84012fc..dccb8f5d600 100644
--- a/net/bsddip/Makefile
+++ b/net/bsddip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:26:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/03/24 19:21:29 joerg Exp $
 
 DISTNAME=	bsddip-1.02
 CATEGORIES=	net
@@ -15,6 +15,8 @@ NOT_FOR_PLATFORM=	Interix-*-* # no sl(4) device
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
+INSTALLATION_DIRS=	${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
+
 NO_CONFIGURE=	yes
 MANCOMPRESSED_IF_MANZ=	yes
 MAKE_ENV+=	${BSD_MAKE_ENV}
diff --git a/net/choparp/Makefile b/net/choparp/Makefile
index 1d25ff4de48..40498071043 100644
--- a/net/choparp/Makefile
+++ b/net/choparp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/11/09 09:12:30 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:29 joerg Exp $
 #
 
 DISTNAME=	choparp-20021107
@@ -13,5 +13,6 @@ NOT_FOR_PLATFORM=	Interix-*-* # does not have bpf(4) device
 
 MANCOMPRESSED_IF_MANZ=	yes
 MAKE_ENV+=	${BSD_MAKE_ENV}
+INSTALLATION_DIRS=	${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/dtcpclient/Makefile b/net/dtcpclient/Makefile
index 480b346d3cc..9945e891fdb 100644
--- a/net/dtcpclient/Makefile
+++ b/net/dtcpclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/11/09 09:15:45 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2007/03/24 19:21:29 joerg Exp $
 #
 
 DISTNAME=	dtcpclient-20060526
@@ -23,6 +23,8 @@ SUBST_SED.paths=	's|/usr/local|${PREFIX}|g'
 
 MAKE_ENV+=	${BSD_MAKE_ENV}
 
+INSTALLATION_DIRS=	${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Darwin"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 9c5f7e72c6f..85a89d9f594 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/02/22 19:26:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/03/24 19:21:29 joerg Exp $
 
 DISTNAME=	gated-3-5-11
 PKGNAME=	gated-3.5.11
@@ -25,6 +25,8 @@ RCD_SCRIPT_SRC.gated=	${FILESDIR}/gated
 
 BUILD_TARGET=	gated
 
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 sbin share/doc/gated
+
 post-extract:
 	@${SED} -e 's#@PREFIX@#${PREFIX}#' <${FILESDIR}/configuration \
 	    >${WRKSRC}/src/configs/netbsd
@@ -39,7 +41,6 @@ do-configure:
 		${RM} -f Config
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gated
 	cd ${WRKSRC}/doc && ${PAX} -rw -pe . ${PREFIX}/share/doc/gated
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/gated
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/gated
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index b8ae88f9226..83489cd305c 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/08/06 07:09:51 kim Exp $
+# $NetBSD: Makefile,v 1.37 2007/03/24 19:21:29 joerg Exp $
 
 DISTNAME=	irrd2.2.8
 PKGNAME=	irrd-2.2.8
@@ -33,6 +33,8 @@ BUILD_DEFS+=		USE_INET6
 REPLACE_PERL+=		programs/irrdcacher/irrdcacher
 REPLACE_PERL+=		programs/irrdcacher/ripe2rpsl
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
+
 pre-configure:
 	cd ${WRKSRC} && aclocal && autoheader && autoconf
 
diff --git a/net/libradius/Makefile b/net/libradius/Makefile
index 5ab9a5dc4e5..b59f4ff6321 100644
--- a/net/libradius/Makefile
+++ b/net/libradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:29 joerg Exp $
 
 DISTNAME=	libradius-linux-20040827
 PKGNAME=	${DISTNAME:S/-linux//}
@@ -13,4 +13,6 @@ CONFLICTS+=	inn-[0-9]*
 
 WRKSRC=		${WRKDIR}/libradius-linux
 
+INSTALLATION_DIRS=	include lib ${PKGMANDIR}/man3
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libsscript/Makefile b/net/libsscript/Makefile
index 5ef3383c544..85e23c80f99 100644
--- a/net/libsscript/Makefile
+++ b/net/libsscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/19 23:00:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:29 joerg Exp $
 #
 
 DISTNAME=	sscript-lib2.0
@@ -15,4 +15,6 @@ COMMENT=	Simple library for creating network oriented software in C
 NO_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
+INSTALLATION_DIRS=	lib
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 0ba8591819b..fef512781d9 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/12/13 04:35:16 obache Exp $
+# $NetBSD: Makefile,v 1.18 2007/03/24 19:21:29 joerg Exp $
 
 DISTNAME=	maradns-1.0.39
 CATEGORIES=	net
@@ -17,6 +17,9 @@ MAKE_ENV+=		LANGUAGE="en"
 EGDIR=		${PREFIX}/share/examples/maradns
 CONF_FILES=	${EGDIR}/example_mararc ${PKG_SYSCONFDIR}/mararc
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
+			share/examples
+
 .include "../../mk/pthread.buildlink3.mk"
 LDFLAGS+=	${PTHREAD_LIBS}
 
diff --git a/net/nagios-nrpe/Makefile b/net/nagios-nrpe/Makefile
index ced2fde2510..0c3daa3221f 100644
--- a/net/nagios-nrpe/Makefile
+++ b/net/nagios-nrpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/02/22 19:26:55 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2007/03/24 19:21:30 joerg Exp $
 #
 
 DISTNAME=		nrpe-2.5.2
@@ -31,13 +31,13 @@ CONFIGURE_ARGS+=	--with-nrpe-group=${NAGIOS_GROUP:Q}
 CONF_FILES+=		${PREFIX}/share/examples/nagios/nrpe.cfg ${PKG_SYSCONFDIR}/nrpe.cfg
 RCD_SCRIPTS+=		nrpe
 
+INSTALLATION_DIRS=	sbin libexec/nagios share/examples/nagios share/examples/rc.d
+
 .include "options.mk"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/nagios
 	${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nagios
 	${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${PREFIX}/share/examples/nagios
 	${INSTALL_SCRIPT} ${WRKDIR}/nrpe ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}
 
diff --git a/net/nslint/Makefile b/net/nslint/Makefile
index 4983e24be7d..2e4b06ca1c3 100644
--- a/net/nslint/Makefile
+++ b/net/nslint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/12/29 07:53:32 obache Exp $
+# $NetBSD: Makefile,v 1.7 2007/03/24 19:21:30 joerg Exp $
 #
 
 DISTNAME=	nslint-2.0.2
@@ -13,5 +13,6 @@ COMMENT=	Perform consistency checks on DNS zone files
 GNU_CONFIGURE=	YES
 BUILD_TARGET=	nslint
 INSTALL_TARGET=	install install-man
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/partysip/Makefile b/net/partysip/Makefile
index 8879fce38fb..3144c4f0ad2 100644
--- a/net/partysip/Makefile
+++ b/net/partysip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/03/24 19:21:30 joerg Exp $
 #
 
 DISTNAME=		partysip-2.2.3
@@ -13,6 +13,8 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-config-dir=/etc
 USE_LIBTOOL=		yes
 
+INSTALLATION_DIRS=	share/examples
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/partysip.conf ${PREFIX}/share/examples
 
diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile
index 09e7ee0fc14..cd306a3f0d7 100644
--- a/net/pim6dd/Makefile
+++ b/net/pim6dd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/01/03 15:23:25 tv Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:30 joerg Exp $
 
 DISTNAME=	pim6dd-20031021a
 CATEGORIES=	net
@@ -13,5 +13,8 @@ PKG_OPTIONS_VAR=		PKG_OPTIONS.pim6dd
 PKG_OPTIONS_REQUIRED_GROUPS=	inet6 # require inet6 capability
 PKG_OPTIONS_GROUP.inet6=	inet6
 
+INSTALLATION_DIRS=	${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 \
+			${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin
+
 .include "../../mk/bsd.options.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pim6dd/PLIST b/net/pim6dd/PLIST
index 9d6e4489e79..5dd00e6095c 100644
--- a/net/pim6dd/PLIST
+++ b/net/pim6dd/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:50 zuntum Exp $
-sbin/pim6dd
-man/man8/pim6dd.8
+@comment $NetBSD: PLIST,v 1.2 2007/03/24 19:21:30 joerg Exp $
+man/cat5/pim6dd.conf.0
 man/cat8/pim6dd.0
 man/man5/pim6dd.conf.5
-man/cat5/pim6dd.conf.0
+man/man8/pim6dd.8
+sbin/pim6dd
diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index f76431edf34..fd239a753b2 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:05 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2007/03/24 19:21:30 joerg Exp $
 
 DISTNAME=	pim6sd-20031021a
 CATEGORIES=	net
@@ -10,6 +10,9 @@ COMMENT=	IPv6 PIM sparse mode daemon
 WRKSRC=		${WRKDIR}/${DISTNAME}/pim6sd/
 USE_TOOLS+=	lex yacc
 
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/cat5 ${PKGMANDIR}/man8 \
+			${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/${PKGMANDIR}/man1
 
diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile
index cf9db6edb0b..a947fe7937d 100644
--- a/net/radiusd-cistron/Makefile
+++ b/net/radiusd-cistron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:14:06 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/03/24 19:21:30 joerg Exp $
 
 DISTNAME=	radiusd-cistron-1.6.7
 PKGREVISION=	1
@@ -16,6 +16,9 @@ CONFLICTS+=	freeradius-[0-9]*
 MAKE_FILE=	Makefile.BSD
 BUILD_DIRS=	${WRKSRC}/src
 INSTALL_DIRS=	${WRKSRC}/src
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
+			${PKGMANDIR}/man8 sbin share/examples/raddb \
+			share/doc/radiusd-cistron
 
 RCD_SCRIPTS=	radiusd
 
@@ -34,7 +37,6 @@ CONF_FILES+=	${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//}
 .endfor
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/radiusd-cistron
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron/
 .for i in	ChangeLog README README.CVX README.Y2K README.cisco	\
 		README.pam README.proxy README.radrelay README.simul	\
diff --git a/net/rbldnsd/Makefile b/net/rbldnsd/Makefile
index c810eae0d1b..363b1a7c045 100644
--- a/net/rbldnsd/Makefile
+++ b/net/rbldnsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 22:14:12 cube Exp $
+# $NetBSD: Makefile,v 1.2 2007/03/24 19:21:30 joerg Exp $
 #
 
 DISTNAME=	rbldnsd_0.996a
@@ -32,10 +32,11 @@ RCD_SCRIPTS=	rbldnsd
 
 RBLDNSD_DOCS=	NEWS README.user
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/rbldnsd
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rbldnsd ${PREFIX}/sbin/
 	${INSTALL_MAN} ${WRKSRC}/rbldnsd.8 ${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rbldnsd
 	set -e; for doc in ${RBLDNSD_DOCS}; do \
 	    ${INSTALL_DATA} ${WRKSRC}/"$$doc" ${PREFIX}/share/doc/rbldnsd/; \
 	    done
diff --git a/net/ssync/Makefile b/net/ssync/Makefile
index 7267d730a31..613a2a91034 100644
--- a/net/ssync/Makefile
+++ b/net/ssync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:30 joerg Exp $
 #
 
 DISTNAME=		ssync-1.6
@@ -20,5 +20,6 @@ SSYNC_PAWD?=		pwd
 NO_CONFIGURE=		yes
 BUILD_TARGET=		all PREFIX=${PREFIX} PAWD=${SSYNC_PAWD}
 INSTALL_TARGET=		install PREFIX=${PREFIX}
+INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index 4d31e157dad..969ef04e789 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/12/27 13:37:39 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2007/03/24 19:21:30 joerg Exp $
 
 DISTNAME=		tightvnc-1.2.9
 PKGNAME=		${DISTNAME:S/tightvnc/tightvncviewer/}
@@ -21,11 +21,11 @@ CONFIGURE_DIRS=		${WRKSRC}/libvncauth
 CONFIGURE_DIRS+=	${WRKSRC}/vncviewer
 BUILD_DIRS=		${CONFIGURE_DIRS}
 INSTALL_DIRS=		${WRKSRC}/vncviewer
+INSTALLATION_DIRS	lib/X11/app-defaults share/doc/vncviewer
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/vncviewer/Vncviewer			\
 		${PREFIX}/lib/X11/app-defaults
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vncviewer
 	${INSTALL_DATA} ${WRKSRC}/vncviewer/README			\
 		${PREFIX}/share/doc/vncviewer/README
 
diff --git a/net/wide-dhcpv6/Makefile b/net/wide-dhcpv6/Makefile
index 51b385000b4..a9d17ef3143 100644
--- a/net/wide-dhcpv6/Makefile
+++ b/net/wide-dhcpv6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/19 17:32:07 taca Exp $
+# $NetBSD: Makefile,v 1.2 2007/03/24 19:21:30 joerg Exp $
 
 DISTNAME=	wide-dhcpv6-20061016
 CATEGORIES=	net
@@ -22,6 +22,9 @@ EXAMPLES=	dhcp6c.conf dhcp6s.conf
 MAN5=		dhcp6c.conf.5 dhcp6s.conf.5
 MAN8=		dhcp6c.8 dhcp6ctl.8 dhcp6relay.8 dhcp6s.8
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin \
+			share/examples/wide-dhcpv6
+
 do-install:
 .for f in ${COMMANDS}
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/sbin
@@ -32,7 +35,6 @@ do-install:
 .for f in ${MAN8}
 	${INSTALL_MAN} ${WRKSRC}/${f} ${PREFIX}/${PKGMANDIR}/man8
 .endfor
-	${INSTALL_DATA_DIR} ${EGDIR}
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${f}.sample ${EGDIR}/${f}
 .endfor
diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile
index 461c27ca98c..c152d2eb5f1 100644
--- a/net/xipdump/Makefile
+++ b/net/xipdump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/02/19 20:12:52 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/03/24 19:21:31 joerg Exp $
 #
 
 DISTNAME=	xipdump-1.5.4
@@ -18,6 +18,8 @@ GNU_CONFIGURE=	yes
 CFLAGS+=	-I${PREFIX}/include ${LIBNET_CFLAGS_CMD:sh}
 LIBS+=		-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lnet
 
+INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man8
+
 LIBNET_CFLAGS_CMD= ${BUILDLINK_PREFIX.libnet10}/bin/libnet10-config --defines
 
 post-build:
diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile
index 26bd190a3a9..3152195a2e3 100644
--- a/net/yale-tftpd/Makefile
+++ b/net/yale-tftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/14 14:11:53 he Exp $
+# $NetBSD: Makefile,v 1.15 2007/03/24 19:21:31 joerg Exp $
 
 DISTNAME=	yale-tftpd-3.0
 PKGREVISION=	4
@@ -17,4 +17,6 @@ SUBST_FILES.ytftpdman=		tftpd.8
 SUBST_SED.ytftpdman=		-e 's|@ETCDIR@|${PKG_SYSCONFDIR}|g'
 SUBST_SED.ytftpdman+=		-e 's|@PREFIX@|${PREFIX}|g'
 
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8
+
 .include "../../mk/bsd.pkg.mk"