Create directories before installing files into them.

82 files changed, 229 insertions, 82 deletions

diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 603eeb2b263..47c51c4ad16 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:44 jlam Exp $
 #
 
 DISTNAME=	ArX-1.0.20
@@ -27,6 +27,8 @@ IMG_FILES=	ArX001.png ArX002.png ArX003.png ArX004.png
 DOC_FILES=	ArX.html ArX.pdf ${IMG_FILES}
 DOCDIR=		${PREFIX}/share/doc/ArX
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} &&	\
 		${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile
index 4d16614131e..f4680496b83 100644
--- a/devel/ArX2/Makefile
+++ b/devel/ArX2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/10 07:23:25 recht Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:44 jlam Exp $
 #
 
 DISTNAME=	ArX-2.2.2
@@ -28,6 +28,8 @@ IMG_FILES=	ArX001.png ArX002.png ArX003.png ArX004.png
 DOC_FILES=	ArX.html ArX.pdf ${IMG_FILES}
 DOCDIR=		${PREFIX}/share/doc/ArX
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${WRKSRC} &&	\
 		${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons
diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile
index b3e907c0657..74dfbfbfb9e 100644
--- a/devel/GConf2-ui/Makefile
+++ b/devel/GConf2-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/03/22 15:55:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:44 jlam Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
@@ -12,6 +12,8 @@ CONFIGURE_ARGS+=	--enable-gtk
 BUILD_DIRS=	${WRKSRC}/gconf
 BUILD_TARGET=	gconfmarshal.h gconfmarshal.c GConfX.h gconf-sanity-check-2
 
+INSTALLATION_DIRS=	libexec
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gconf/.libs/gconf-sanity-check-2 \
 		${PREFIX}/libexec
diff --git a/devel/RTFM/Makefile b/devel/RTFM/Makefile
index 458fd2f6aa6..ab5f4027ecd 100644
--- a/devel/RTFM/Makefile
+++ b/devel/RTFM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/11/03 23:46:29 cube Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:44 jlam Exp $
 #
 
 DISTNAME=	RTFM-2.0.4
@@ -26,6 +26,8 @@ PLIST_SUBST+=	RT_HTML_DIR=${RT_HTML_DIR:C/^${LOCALBASE}\///}	\
 NO_BUILD=	YES
 NO_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	lib share
+
 do-install:
 	@${ECHO} "=> Libraries"
 	cd ${WRKSRC}/lib && ${FIND} . -type f ! -name '*.orig' 2>/dev/null |		\
diff --git a/devel/acme/Makefile b/devel/acme/Makefile
index 2f1efa9b1d4..ce31230f963 100644
--- a/devel/acme/Makefile
+++ b/devel/acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/25 12:11:39 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:44 jlam Exp $
 #
 
 DISTNAME=	acme085_linux
@@ -21,6 +21,8 @@ WRKTOP=		${WRKDIR}/acme085
 ACME_LIB=	${PREFIX}/share/acme
 MAKE_ENV+=	ACME_LIB=${ACME_LIB}
 
+INSTALLATION_DIRS=	bin
+
 post-extract:
 	cd ${WRKDIR} && unzip -qa ${_DISTDIR}/${LIBDIST}
 
diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile
index 1a196e3f050..9ec785a6dc2 100644
--- a/devel/adocman/Makefile
+++ b/devel/adocman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/31 22:43:53 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:44 jlam Exp $
 #
 
 DISTNAME=	adocman-0.10
@@ -18,6 +18,8 @@ NO_BUILD=	YES
 
 REPLACE_PERL=	adocman xml_export
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/adocman ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/xml_export ${PREFIX}/bin
diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index 3ed15b8a054..6a3652f7c48 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:14:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	ald-0.0.19d
@@ -15,6 +15,8 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	bin man/man8
+
 #do-build:
 #	cd ${WRKSRC} && ${MAKE_PROGRAM} -f ${MAKEFILE} ${BUILD_TARGET}
 
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 0f698c54fed..611d162c015 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/16 06:57:45 jlam Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -25,6 +25,7 @@ USE_JAVA=	run
 USE_JAVA2=	yes
 
 EXTRACT_CMD_OPTS.zip=	-Caq
+INSTALLATION_DIRS=	bin
 
 do-build:
 	${SED}	-e 's,@PREFIX@,${PREFIX},g'				\
diff --git a/devel/apache-ant15/Makefile b/devel/apache-ant15/Makefile
index 3726eb757c7..8845488e020 100644
--- a/devel/apache-ant15/Makefile
+++ b/devel/apache-ant15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:45 jlam Exp $
 #
 # NOTE: if you are depending on ant from another package, please be aware that
 # the ant team has CHANGED the version numbering scheme.  A previous version
@@ -25,6 +25,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_JAVA=	run
 
 EXTRACT_CMD_OPTS.zip=	-Caq
+INSTALLATION_DIRS=	bin
 
 do-build:
 	${SED}	-e 's,@PREFIX@,${PREFIX},g'				\
diff --git a/devel/as31/Makefile b/devel/as31/Makefile
index f2ec042565f..05f8d74e62d 100644
--- a/devel/as31/Makefile
+++ b/devel/as31/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:45 jlam Exp $
 
 DISTNAME=	asm.8051
 PKGNAME=	as31-19900126
@@ -16,6 +16,8 @@ EXTRACT_CMD=	${DECOMPRESS_CMD} ${DOWNLOADED_DISTFILE} | \
 MAKEFILE=	makefile
 BUILD_TARGET=	as31 man
 
+INSTALLATION_DIRS=	bin man/cat1 man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/as31 ${PREFIX}/bin/as31
 	${INSTALL_DATA} ${WRKSRC}/as31.man ${PREFIX}/man/man1/as31.1
diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
index 5b0c6d34e21..b1461ee84c3 100644
--- a/devel/bmake/Makefile
+++ b/devel/bmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/31 20:52:53 sjg Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=       bmake-20050530
@@ -17,6 +17,8 @@ makesyspath=${PREFIX}/share/mk:/usr/share/mk:/usr/local/share/mk:/opt/share/mk
 GNU_CONFIGURE=	no
 CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
 
+INSTALLATION_DIRS=	bin man/cat1 man/man1
+
 do-configure:
 
 do-build:
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 7f6ff5b7501..c1d7dd98fd8 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=		boa-constructor-0.2.3.src
@@ -20,6 +20,8 @@ BOADIR=	${PREFIX}/share/boa-constructor-0.2.3
 SEDSUBST=	-e "s|@PYTHONBIN@|${PYTHONBIN}|"
 SEDSUBST+=	-e "s|@PREFIX@|${PREFIX}|"
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	${SED} ${SEDSUBST} <${FILESDIR}/Boa.sh >${WRKDIR}/Boa
 
diff --git a/devel/buddy/Makefile b/devel/buddy/Makefile
index a37a793182a..b68157f58c2 100644
--- a/devel/buddy/Makefile
+++ b/devel/buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	buddy22
@@ -13,6 +13,8 @@ COMMENT=	Library for binary decision diagrams
 MAKEFILE=	makefile
 BUILD_TARGET=	buddy
 
+INSTALLATION_DIRS=	include lib
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/libbdd.a ${PREFIX}/lib
 	${INSTALL_DATA}	${WRKSRC}/src/bdd.h ${WRKSRC}/src/fdd.h \
diff --git a/devel/c4/Makefile b/devel/c4/Makefile
index 62fb1d5dcf6..1fae4dfa22f 100644
--- a/devel/c4/Makefile
+++ b/devel/c4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	c4
@@ -14,6 +14,8 @@ DEPENDS+=	p4-[0-9]*:../../devel/p4
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 BUILD_TARGET=	c4
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/c4 ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/c4.1 ${PREFIX}/man/man1
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 0c9edf81515..9472f21ec8e 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=       cbrowser-0.6
@@ -15,6 +15,8 @@ DEPENDS+=	tk-[0-9]*:../../x11/tk
 
 NO_BUILD=	# defined
 
+INSTALLATION_DIRS=	bin
+
 post-patch:
 	${MV} ${WRKSRC}/cbrowser ${WRKSRC}/cbrowser.input && \
 		${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/cbrowser.input > ${WRKSRC}/cbrowser
diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index f4d3e4b4505..5a31c88ffab 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/02/28 07:28:29 tron Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:45 jlam Exp $
 
 DISTNAME=	cfitsio2500
 PKGNAME=	cfitsio-2.500
@@ -16,6 +16,8 @@ USE_LIBTOOL=	YES
 
 BUILD_TARGET=	all testprog
 
+INSTALLATION_DIRS=	include lib
+
 post-build:
 	cd ${WRKSRC}; \
 	./testprog | diff - testprog.out; \
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 343bee711dc..2c349cb7912 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:49 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	cgdb-0.4.0
@@ -15,6 +15,8 @@ USE_TOOLS+=	gmake
 USE_NCURSES=	# tigetstr()
 USE_GNU_READLINE=	# rl_mark and others
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cgdb
 	${INSTALL_PROGRAM} ${WRKSRC}/cgdb/src/cgdb ${PREFIX}/bin
diff --git a/devel/cvs2cl/Makefile b/devel/cvs2cl/Makefile
index 127a28ec62a..2a66c3f600f 100644
--- a/devel/cvs2cl/Makefile
+++ b/devel/cvs2cl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	cvs2cl-2.58
@@ -16,6 +16,8 @@ NO_CONFIGURE=	YES
 NO_BUILD=	YES
 USE_PERL5=	# defined
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_SCRIPT} ${DISTDIR}/${DISTNAME} \
 		${LOCALBASE}/bin/${DISTNAME:C/-.*$//}
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index dcb59576d64..f8a19e502ac 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	cvs2html-1.82
@@ -13,6 +13,8 @@ NO_BUILD=	YES
 USE_PERL5=	# defined
 REPLACE_PERL=	cvs2html
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cvs2html ${PREFIX}/bin
 
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index e4cdad016d3..25f0e63a015 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:30:06 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	cvs2p4-2.3.3
@@ -32,6 +32,8 @@ FILES_SUBST+=	P4PORT=${P4PORT:Q}
 CVS2P4_INLIB=	$$Mydir/lib/util\.pl
 CVS2P4_OUTLIB=	${LIBDIR}/${PKGBASE}-util.pl
 
+INSTALLATION_DIRS=	bin ${LIBDIR}
+
 do-configure:
 	for f in ${WRKSRC}/bin/*; do \
 		( ${ECHO} \#!${PERL5}; ${CAT} $${f} ) | ${SED} -e '2,5d' \
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 22a9878bb6a..6b6d767b333 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:50 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	cvsgraph-1.5.1
@@ -27,6 +27,8 @@ SUBST_FILES.man= 	cvsgraph.1
 SUBST_SED.man=		-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.man=	"Fixing man page paths."
 
+INSTALLATION_DIRS=	bin man/man1 man/man5
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cvsgraph ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cvsgraph.1 ${PREFIX}/man/man1/
diff --git a/devel/cvsup-bin/Makefile b/devel/cvsup-bin/Makefile
index a51fc2105d6..b689b137ab5 100644
--- a/devel/cvsup-bin/Makefile
+++ b/devel/cvsup-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/04/23 18:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:45 jlam Exp $
 
 DISTNAME=	cvsup-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
@@ -19,6 +19,8 @@ DIST_SUBDIR=	cvsup-i386-1.6
 
 CONFLICTS=	cvsup-[0-9]* cvsup-gui-[0-9]*
 
+INSTALLATION_DIRS=	bin man/man1 man/man5 sbin
+
 do-install:
 	for i in cvpasswd cvsup ; do \
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/$$i ${PREFIX}/bin; \
diff --git a/devel/cvsup-gui-bin/Makefile b/devel/cvsup-gui-bin/Makefile
index 28804bf6576..102c2314a8f 100644
--- a/devel/cvsup-gui-bin/Makefile
+++ b/devel/cvsup-gui-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/04/23 18:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:45 jlam Exp $
 
 DISTNAME=	cvsup-gui-static-16.1.h
 PKGNAME=	${DISTNAME:C/static/bin/}
@@ -20,6 +20,8 @@ DIST_SUBDIR=	cvsup-i386-1.6
 
 ONLY_FOR_PLATFORM=      NetBSD-1.[5-9]*-i386 NetBSD-[2-9]*-i386
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cvsup ${PREFIX}/bin/cvsup-gui
 
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 79eebc4fc8a..0cfd364570b 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/02 17:17:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:45 jlam Exp $
 #
 # XXX This package needs to be installed with the same PREFIX as teTeX
 #
@@ -17,6 +17,7 @@ CONFLICTS+=		teTeX-bin>=2.0		# Part of teTeX>=2.0
 DEPENDS+= 		teTeX-[0-9]*:../../print/teTeX1
 
 WRKSRC=			${WRKDIR}
+INSTALLATION_DIRS=	bin man/man1
 
 post-patch:
 	${MV} ${WRKSRC}/cweb.1 ${WRKSRC}/cweb.1.dist
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index 908fc8adefd..de9a6ca0ce2 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/03 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:45 jlam Exp $
 #
 
 DISTNAME=	dmake-v4.1-src-export.all-unknown-all
@@ -16,6 +16,8 @@ MAKEFILE=	makefile
 BUILD_TARGET=	linux
 WRKSRC=		${WRKDIR}/dmake
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-configure:
 	cd ${WRKSRC} && ${RM} unix/bsd43/dirent.h &&		\
 	${CP} unix/startup.h unix/startup.h.orig &&		\
diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile
index 2ea3807120c..df862913399 100644
--- a/devel/eclipse/Makefile
+++ b/devel/eclipse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/01/19 20:44:11 jschauma Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}
@@ -35,6 +35,8 @@ BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 
 PAXDIR=		${WRKDIR}
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	cd ${WRKDIR} && ${MAKE_ENV} ${SH} build -os linux -ws motif -arch x86
 .else
diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile
index 6651fec9ca7..5813fc4e358 100644
--- a/devel/electricfence/Makefile
+++ b/devel/electricfence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/04 13:33:36 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:46 jlam Exp $
 
 DISTNAME=		ElectricFence-2.1
 PKGREVISION=		1
@@ -17,6 +17,8 @@ CFLAGS+=		-g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
 CFLAGS+=		-g
 .endif
 
+INSTALLATION_DIRS=	lib man/man3
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libefence.a ${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/libefence.3 ${PREFIX}/man/man3
diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index 90ae96ff889..1a926ba0972 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	elf-0.5.3
@@ -16,6 +16,8 @@ GNU_CONFIGURE=	YES
 BUILD_DIRS=	${WRKSRC}/src
 BUILD_TARGET=	elf
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/elf ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/elf.1 ${PREFIX}/man/man1
diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile
index 0285643c3dd..d8f93fd6f8c 100644
--- a/devel/elfsh/Makefile
+++ b/devel/elfsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:46 jlam Exp $
 #
 
 VERS=		0.51b3
@@ -24,6 +24,8 @@ SUBST_CLASSES+=		elfsh
 
 # XXX This package should be converted to use libtool
 
+INSTALLATION_DIRS=	bin include lib
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vm/elfsh ${PREFIX}/bin/elfsh
 	${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.a ${PREFIX}/lib/libelfsh.a
diff --git a/devel/fastdep/Makefile b/devel/fastdep/Makefile
index 6c34dc2217f..24f8554cb33 100644
--- a/devel/fastdep/Makefile
+++ b/devel/fastdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:50 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	fastdep-0.16
@@ -12,6 +12,8 @@ COMMENT=	Dependency generator for C/C++ files
 GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake
 
+INSTALLATION_DIRS=	bin
+
 post-extract:
 	${RM} -f ${WRKSRC}/*.orig
 
diff --git a/devel/gentle/Makefile b/devel/gentle/Makefile
index 21c69cf62df..841f70c1758 100644
--- a/devel/gentle/Makefile
+++ b/devel/gentle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=		gentle-97
@@ -10,6 +10,7 @@ HOMEPAGE=		http://gentle.compilertools.net/distribution.html
 COMMENT=		Gentle Compiler Construction System
 
 USE_LIBTOOL=		yes
+INSTALLATION_DIRS=	bin lib
 
 do-build:
 	(cd ${WRKSRC}/gentle ; LIBTOOL=${LOCALBASE}/bin/libtool ./build)
diff --git a/devel/gobo-eiffel/Makefile b/devel/gobo-eiffel/Makefile
index f418f5f2c3d..a892fc3eb94 100644
--- a/devel/gobo-eiffel/Makefile
+++ b/devel/gobo-eiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/24 22:46:09 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	gobo15
@@ -21,6 +21,8 @@ EXTRACT_CMD=	${LOCALBASE}/bin/unzip -uLa \
 
 GOBO=		${PREFIX}/share/gobo-eiffel
 
+INSTALLATION_DIRS=	bin
+
 post-extract:
 	${RM} -rf ${WRKSRC}/bin
 
diff --git a/devel/guile-slib/Makefile b/devel/guile-slib/Makefile
index 3b3432a8f14..343ba36af56 100644
--- a/devel/guile-slib/Makefile
+++ b/devel/guile-slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/09 20:30:42 kristerw Exp $
+# $NetBSD: Makefile,v 1.26 2005/06/16 06:57:46 jlam Exp $
 
 DISTNAME=	guile-slib-2.4.2
 PKGREVISION=	6
@@ -16,6 +16,8 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 WRKSRC=		${WRKDIR}
 
+INSTALLATION_DIRS=	share/guile
+
 do-build:
 
 do-install:
diff --git a/devel/guile14-slib/Makefile b/devel/guile14-slib/Makefile
index 94bfc39c814..3aab7494605 100644
--- a/devel/guile14-slib/Makefile
+++ b/devel/guile14-slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/09 20:29:26 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:46 jlam Exp $
 
 DISTNAME=	guile-slib-2.4.2
 PKGREVISION=	5
@@ -18,6 +18,8 @@ WRKSRC=		${WRKDIR}
 
 PLIST_SUBST+=	GUILE14_SUBDIR=${GUILE14_SUBDIR:Q}
 
+INSTALLATION_DIRS=	share/guile
+
 do-build:
 
 do-install:
diff --git a/devel/idiff/Makefile b/devel/idiff/Makefile
index 85f66c70306..e23f2e1f644 100644
--- a/devel/idiff/Makefile
+++ b/devel/idiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:31:08 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	idiff-1.0
@@ -9,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.darwinsys.com/freeware/
 COMMENT=	Interactive front-end to diff(1)
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/idiff ${PREFIX}/bin/idiff
 
diff --git a/devel/ipv6socket_scrub/Makefile b/devel/ipv6socket_scrub/Makefile
index 590680794ec..f13804fe703 100644
--- a/devel/ipv6socket_scrub/Makefile
+++ b/devel/ipv6socket_scrub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:46 jlam Exp $
 # KAME Id: Makefile,v 1.6 1999/11/28 14:36:04 itojun Exp
 #
 
@@ -23,6 +23,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
 INTERACTIVE_STAGE=	fetch
+INSTALLATION_DIRS=	bin man/man1
 
 _FETCH_MESSAGE= \
 	${ECHO} '======================================================='; \
diff --git a/devel/its4/Makefile b/devel/its4/Makefile
index 1fdd29859ee..8d16085b67a 100644
--- a/devel/its4/Makefile
+++ b/devel/its4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	its4-1.1.1
@@ -16,6 +16,7 @@ WRKSRC=		${WRKDIR}/its4
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/its4
+INSTALLATION_DIRS=	bin man/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/its4 ${PREFIX}/bin
diff --git a/devel/jam/Makefile b/devel/jam/Makefile
index 2daf63aeedd..63c519bda4a 100644
--- a/devel/jam/Makefile
+++ b/devel/jam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/09/04 13:56:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	jam-2.5
@@ -19,6 +19,8 @@ WRKSRC=		${WRKDIR}
 DOCDIR=		share/doc/${PKGBASE}
 HTMLDIR=	share/doc/html/${PKGBASE}
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	@for f in jam mkjambase; do \
 		${INSTALL_PROGRAM} ${WRKSRC}/bin.*/$${f} ${PREFIX}/bin; \
diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile
index 558f61a9d10..e930a1530c7 100644
--- a/devel/javadeps/Makefile
+++ b/devel/javadeps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	javadeps-1.1
@@ -13,6 +13,8 @@ COMMENT=	Automatic dependency tracking for Java
 WRKSRC=		${WRKDIR}/JavaDeps-1.1
 USE_JAVA=	run
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	cd ${WRKSRC}; for file in jdeps; do				\
 		${SED}	-e "s|@PREFIX@|${PREFIX}|g"			\
diff --git a/devel/jgrasp/Makefile b/devel/jgrasp/Makefile
index f234683a0a2..89f20863ff8 100644
--- a/devel/jgrasp/Makefile
+++ b/devel/jgrasp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=		jgrasp170
@@ -13,6 +13,7 @@ COMMENT=		IDE with support for Software Visualizations
 
 WRKSRC=			${WRKDIR}/jgrasp
 PKG_JVMS_ACCEPTED=	sun-jdk13 sun-jdk14 jdk13 jdk14
+INSTALLATION_DIRS=	bin
 
 do-configure:
 	${MKDIR} ${WRKSRC}/bin/${LOWER_OPSYS}
diff --git a/devel/lcc/Makefile b/devel/lcc/Makefile
index fd0bacbb6e9..17c9373af76 100644
--- a/devel/lcc/Makefile
+++ b/devel/lcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/21 16:43:25 martti Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:46 jlam Exp $
 
 DISTNAME=	lcc-4.1
 CATEGORIES=	devel lang
@@ -19,6 +19,8 @@ ONLY_FOR_PLATFORM=	*-*-i386
 BUILDDIR=	${WRKSRC}/src
 MAKEFILE=	makefile
 
+INSTALLATION_DIRS=	bin libexec man/man1
+
 post-extract:
 	${CP} ${FILESDIR}/x86bsd.md ${WRKSRC}/src/
 	${CP} ${FILESDIR}/netbsd.c ${WRKSRC}/etc/
diff --git a/devel/libetm/Makefile b/devel/libetm/Makefile
index 4feb5891459..d3799c249e2 100644
--- a/devel/libetm/Makefile
+++ b/devel/libetm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=		ETM-1.09
@@ -11,6 +11,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Exception and termination manager
 
 WRKSRC=			${WRKDIR}/etm
+INSTALLATION_DIRS=	include lib
 
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
diff --git a/devel/libgetopt/Makefile b/devel/libgetopt/Makefile
index 458dc3fae3a..f8d8aa6afe3 100644
--- a/devel/libgetopt/Makefile
+++ b/devel/libgetopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/06/12 07:26:18 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	libgetopt-1.4.1
@@ -20,6 +20,8 @@ MAKEFLAGS+=	NETBSD_COMPATIBLE=YES
 CFLAGS+=	-DREPLACE_GETOPT
 .endif
 
+INSTALLATION_DIRS=	include lib man/man3
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${FILESDIR}/getopt_long.? ${WRKSRC}
diff --git a/devel/libhfs/Makefile b/devel/libhfs/Makefile
index 3574b3270bc..bc7dc312316 100644
--- a/devel/libhfs/Makefile
+++ b/devel/libhfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:27 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
@@ -19,6 +19,8 @@ USE_LIBTOOL=	yes
 
 BUILD_TARGET=	all_lib
 
+INSTALLATION_DIRS=	lib
+
 pre-patch:
 	for f in librsrc/librsrc.h libhfs/libhfs.h; do \
 	  ${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-prepatch; \
diff --git a/devel/libmemmgr/Makefile b/devel/libmemmgr/Makefile
index 87234beea65..07f086984cf 100644
--- a/devel/libmemmgr/Makefile
+++ b/devel/libmemmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/05 11:11:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:46 jlam Exp $
 #
 
 DISTNAME=		MemMgr-1.04
@@ -11,6 +11,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Simple memory manager library
 
 WRKSRC=			${WRKDIR}/memmgr-1.04
+INSTALLATION_DIRS=	include lib
 
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
diff --git a/devel/libportlib/Makefile b/devel/libportlib/Makefile
index ad4523038c1..7408b1561d3 100644
--- a/devel/libportlib/Makefile
+++ b/devel/libportlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=		portlib-1.01
@@ -11,6 +11,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Portable file locking and directory reading
 
 WRKSRC=			${WRKDIR}/portlib-1.01
+INSTALLATION_DIRS=	include lib
 
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
diff --git a/devel/libts/Makefile b/devel/libts/Makefile
index d40e90adaec..5461b4f6f97 100644
--- a/devel/libts/Makefile
+++ b/devel/libts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=		TS-1.08
@@ -11,6 +11,7 @@ HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Library of simple token-scanning routines
 
 WRKSRC=			${WRKDIR}/tokenscan
+INSTALLATION_DIRS=	include lib
 
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.bak
diff --git a/devel/monotone-viz/Makefile b/devel/monotone-viz/Makefile
index 404d57e63a1..d5171dfa0c7 100644
--- a/devel/monotone-viz/Makefile
+++ b/devel/monotone-viz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/31 16:00:58 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=		monotone-viz-0.9
@@ -13,6 +13,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 BUILD_TARGET=		monotone-viz
 BUILD_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${CP} ${WRKSRC}/monotone-viz ${PREFIX}/bin
diff --git a/devel/mph/Makefile b/devel/mph/Makefile
index f4443ea4acc..8c75a49fbaa 100644
--- a/devel/mph/Makefile
+++ b/devel/mph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	mph-1.2
@@ -9,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	none
 COMMENT=	Minimal perfect hashing functionality
 
+INSTALLATION_DIRS=	bin share/doc
+
 do-install:
 	for i in emitc mph mphm; do					\
 		${INSTALL_PROGRAM} ${WRKSRC}/$$i ${PREFIX}/bin;		\
diff --git a/devel/netbeans-ide/Makefile b/devel/netbeans-ide/Makefile
index 44b54ac9c4b..3ebb9096f66 100644
--- a/devel/netbeans-ide/Makefile
+++ b/devel/netbeans-ide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	NetBeansIDE-release351
@@ -20,6 +20,8 @@ WRKSRC=		${WRKDIR}/netbeans
 SHAREDIR=	${PREFIX}/share/${PKGBASE}
 DOCDIR=		${PREFIX}/share/doc/html/${PKGBASE}
 
+INSTALLATION_DIRS=	bin
+
 pre-install:
 	cd ${WRKSRC}/bin && ${RM} -rf *.exe *.cmd *.com \
 	    runide_exe_defaults unsupported
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index a23a4697de3..84b1484f3e2 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:47 jlam Exp $
 
 DISTNAME=	${PKGNAME_NOREV}-5.src.rpm
 PKGNAME=	newt-0.51.6
@@ -21,6 +21,8 @@ NO_EXPORT_CPP=	yes
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
+INSTALLATION_DIRS=	bin include lib
+
 do-extract:
 	${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DISTNAME}
 	cd ${WRKDIR} ; ${GZCAT} ${WRKSRC}.tar.gz | ${TAR} -xf -
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 2f91f4ad541..aa2199c7794 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 20:08:00 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:47 jlam Exp $
 
 DISTNAME=		nspr-4.4.1
 PKGREVISION=		1
@@ -31,6 +31,8 @@ SO_SUFFIX=		so.1.0
 .endif
 PLIST_SUBST+=		SO_SUFFIX=${SO_SUFFIX}
 
+INSTALLATION_DIRS=	bin
+
 pre-configure:
 	cd ${WRKSRC}/.. && autoconf
 
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 76eb039c0d8..9e9fbbddfe7 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	ode-0.039
@@ -14,6 +14,8 @@ USE_TOOLS+=	gmake
 
 .include "../../mk/x11.buildlink3.mk"
 
+INSTALLATION_DIRS=	lib
+
 do-configure:
 	cd ${WRKSRC} && ${GMAKE} configure
 do-build:
diff --git a/devel/p4-docs/Makefile b/devel/p4-docs/Makefile
index b7dc0ff6292..501d2a85a3f 100644
--- a/devel/p4-docs/Makefile
+++ b/devel/p4-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/07/19 12:34:50 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	p4-docs
@@ -43,6 +43,8 @@ HTMLDIR=	share/doc/html/p4
 PLIST_SUBST+=	DOCDIR=${DOCDIR}
 PLIST_SUBST+=	HTMLDIR=${HTMLDIR}
 
+INSTALLATION_DIRS=	man/man1
+
 do-install:
 	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/*.1 ${PREFIX}/man/man1
 
diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 705fdeef089..018a77f9eee 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/09/01 02:30:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	p4
@@ -9,6 +9,8 @@ P4BINONLY=	# defined
 
 .include "../../devel/p4/Makefile.common"
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${PREFIX}/bin
 
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index 1bfeeec2357..e0a3fd566a2 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/28 02:47:43 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	p4d
@@ -30,6 +30,8 @@ RCD_SCRIPTS=	p4d
 P4LOG?=		log
 P4JOURNAL?=	journal
 
+INSTALLATION_DIRS=	sbin
+
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${PREFIX}/sbin
 
diff --git a/devel/p4pr/Makefile b/devel/p4pr/Makefile
index 707c104f059..e936a457802 100644
--- a/devel/p4pr/Makefile
+++ b/devel/p4pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	p4pr
@@ -18,6 +18,8 @@ NO_BUILD=	# defined
 USE_PERL5=	# defined
 REPLACE_PERL=	${DISTFILES}
 
+INSTALLATION_DIRS=	bin
+
 post-extract:
 	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 2224961d2cd..77380545108 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/01 05:29:12 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	p4web
@@ -9,6 +9,8 @@ P4BINONLY=	# defined
 
 .include "../../devel/p4/Makefile.common"
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} \
 		${PREFIX}/bin/${DISTNAME}
diff --git a/devel/palmpower/Makefile b/devel/palmpower/Makefile
index 37616e516a2..b6c585bb016 100644
--- a/devel/palmpower/Makefile
+++ b/devel/palmpower/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=		palmpower-1.0.2
@@ -13,6 +13,7 @@ CPPFLAGS+=		-Dunix
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+INSTALLATION_DIRS=	bin man/man1
 
 post-build:
 	cd ${WRKSRC}/utils &&						\
diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
index 59121346bcc..7014d84ef64 100644
--- a/devel/pvs/Makefile
+++ b/devel/pvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:37 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
@@ -50,6 +50,8 @@ MAINFILEEXT=		solaris
 MESSAGE_SRC=		${FILESDIR}/MESSAGE
 .endif
 
+INSTALLATION_DIRS=	bin
+
 post-patch:
 	${SED} -e "s|@PREFIX@|${PREFIX}|" ${WRKSRC}/pvs > \
 		${WRKSRC}/pvs.tmp
diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile
index c0638685884..f10b4000f80 100644
--- a/devel/py-idle/Makefile
+++ b/devel/py-idle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:47 jlam Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-idle-0
@@ -31,6 +31,7 @@ PYTHON_VERSIONS_ACCEPTED=	24 23 22 21 20
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Tools/idle/*
 PYTHON_PATCH_SCRIPTS=	Tools/idle/idle.py
+INSTALLATION_DIRS=	bin ${PYSITELIB}
 
 do-build:
 	${PYTHONBIN} ${LOCALBASE}/${PYLIB}/compileall.py ${WRKSRC}/Tools/idle
@@ -51,6 +52,7 @@ do-install:
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Tools/scripts/idle
 PYTHON_PATCH_SCRIPTS= Tools/scripts/idle
 NO_BUILD=	yes
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/Tools/scripts/idle \
diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile
index e4649dfe1c4..691776c585e 100644
--- a/devel/python-mode/Makefile
+++ b/devel/python-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/12/05 13:40:56 ben Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:47 jlam Exp $
 #
 
 DISTNAME=	python-mode-4.54
@@ -19,6 +19,8 @@ DIST_SUBDIR=	python-mode-20041204
 
 .include "../../mk/emacs.mk"
 
+INSTALLATION_DIRS=	${EMACS_LISPPREFIX:S/^${PREFIX}\///}
+
 do-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/python-mode.el ${WRKDIR}
 
diff --git a/devel/ratfor/Makefile b/devel/ratfor/Makefile
index f062c85e26c..879029b5828 100644
--- a/devel/ratfor/Makefile
+++ b/devel/ratfor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:47 jlam Exp $
 
 DISTNAME=		ratfor77
 PKGNAME=		ratfor-1.0
@@ -11,6 +11,7 @@ COMMENT=		Preprocessor for the Ratfor dialect of Fortran
 
 BUILD_TARGET=		ratfor77
 USE_TOOLS+=		gmake
+INSTALLATION_DIRS=	bin man/man1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${PREFIX}/bin/ratfor
diff --git a/devel/rdp/Makefile b/devel/rdp/Makefile
index 436e8989a9b..567f76f4e55 100644
--- a/devel/rdp/Makefile
+++ b/devel/rdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:47 jlam Exp $
 
 DISTNAME=		rdp1_5
 PKGNAME=		rdp-1.5
@@ -16,6 +16,8 @@ MAKEFILE=		makefile
 NO_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rdp ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rdp
diff --git a/devel/rsltc/Makefile b/devel/rsltc/Makefile
index 1aae34f0b05..30b903a5bb6 100644
--- a/devel/rsltc/Makefile
+++ b/devel/rsltc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=		rsltcsrc
@@ -17,6 +17,7 @@ DEPENDS+=		gentle>=97:../../devel/gentle
 MAKEFILE=		make_sunos
 USE_TOOLS+=		gmake
 WRKSRC=			${WRKDIR}/rsl.2.4
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rsltc ${PREFIX}/bin
diff --git a/devel/ruby-activesupport/Makefile b/devel/ruby-activesupport/Makefile
index 4ee5ae5135d..22751cccc61 100644
--- a/devel/ruby-activesupport/Makefile
+++ b/devel/ruby-activesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/10 02:47:00 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/16 06:57:48 jlam Exp $
 
 DISTNAME=	activesupport-1.0.3
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -16,6 +16,7 @@ NO_CONFIGURE=	yes
 .include "../../lang/ruby/modules.mk"
 
 do-install:
+	${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}
 	${CP} -R ${WRKSRC}/lib/* ${RUBY_SITELIBDIR}
 	${CHOWN} -R ${LIBOWN}:${LIBGRP} ${RUBY_SITELIBDIR}/active_support*
 	${FIND} ${RUBY_SITELIBDIR}/active_support -type d -print |	\
diff --git a/devel/ruby-bsearch/Makefile b/devel/ruby-bsearch/Makefile
index 668e6411836..83b62b493b7 100644
--- a/devel/ruby-bsearch/Makefile
+++ b/devel/ruby-bsearch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:48 jlam Exp $
 
 DISTNAME=	ruby-bsearch-${VERSION}
 PKGNAME=	${RUBY_PKGPREFIX}-bsearch-${VERSION}
@@ -24,6 +24,7 @@ do-build:
 .endfor
 
 do-install:
+	${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/bsearch.rb ${RUBY_SITELIBDIR}/bsearch.rb
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/bsearch
 .for f in ${DOCS}
diff --git a/devel/ruby-optparse/Makefile b/devel/ruby-optparse/Makefile
index 8a79d662c8a..21528a88eb2 100644
--- a/devel/ruby-optparse/Makefile
+++ b/devel/ruby-optparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:48 jlam Exp $
 
 DISTNAME=	optparse-0.12
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
@@ -20,7 +20,10 @@ EXAMPLES=	cmd-ls.rb cmd.rb getopts.test.en opttest.rb \
 		rd/jfold.rb
 EXAMPLES_JA=	getopts.test
 
+INSTALLATION_DIRS=	man/man3
+
 do-install:
+	${INSTALL_DATA_DIR} ${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/optparse.rb ${RUBY_SITELIBDIR}
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/optparse
 .for f in ${DOCS}
diff --git a/devel/sablecc/Makefile b/devel/sablecc/Makefile
index 189da94baed..4b57a2e6f5e 100644
--- a/devel/sablecc/Makefile
+++ b/devel/sablecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/08/05 13:38:00 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	sablecc-2.16.2
@@ -13,6 +13,8 @@ COMMENT=	Java based Compiler Compiler
 USE_JAVA=	run
 USE_JAVA2=	yes
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	${SED}	-e 's,@PREFIX@,${PREFIX},g'				\
 		-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},g'			\
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 8135fbd18ea..622c710e82c 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	semantic-1.4.2
@@ -45,6 +45,8 @@ AUXFILES=	semantic-load.el
 # XXX cd ${WRKSRC}; ${MAKE} -V aux_AUX
 AUXFILES+=	c.bnf make.bnf java.bnf scheme.bnf
 
+INSTALLATION_DIRS=	${INFO_DIR}
+
 do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/semantic
 	cd ${WRKSRC} && ${INSTALL_DATA} ${SRCS} ${SRCS:.el=.elc} 	\
diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index 7f182bdd9cb..ead0972aecd 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/24 22:13:40 perry Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:48 jlam Exp $
 
 DISTNAME=	slib3a1
 #
@@ -26,6 +26,8 @@ DOCDIR=		${PREFIX}/share/doc/slib
 
 INFO_FILES=	slib.info
 
+INSTALLATION_DIRS=	${INFO_DIR}
+
 do-install:
 	${INSTALL_DATA_DIR} ${SLIBDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} *.scm *.init ${SLIBDIR}
diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile
index cf044cfed29..5e12940bbb6 100644
--- a/devel/sml-mode/Makefile
+++ b/devel/sml-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/12/03 15:14:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $
 
 DISTNAME=	sml-mode-3.9.5
 CATEGORIES=	devel editors
@@ -11,6 +11,8 @@ BUILD_TARGET=	default
 
 INFO_FILES=	sml-mode.info
 
+INSTALLATION_DIRS=	info
+
 do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/sml-mode
 	cd ${WRKSRC} && ${INSTALL_DATA} *.el *.elc README NEWS TODO \
diff --git a/devel/st/Makefile b/devel/st/Makefile
index 5be18867d31..1ed27abf17f 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	st-1.5.1
@@ -17,6 +17,8 @@ BUILD_TARGET=	netbsd-debug
 
 HTMLDIR=	${PREFIX}/share/doc/html/st
 
+INSTALLATION_DIRS=	bin lib
+
 do-install:
 	${LIBTOOL} --mode=install ${INSTALL_DATA} \
 		${WRKSRC}/libst.la ${PREFIX}/lib
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 7ee24153c5c..bc2b6f63254 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/16 06:57:48 jlam Exp $
 
 DISTNAME=	STLport-4.6
 PKGNAME=	stlport-4.6
@@ -28,6 +28,8 @@ INCDIR=		${PREFIX}/include/stlport
 LIBDIR=		${PREFIX}/lib
 HTMLDIR=	${PREFIX}/share/doc/html/stlport
 
+INSTALLATION_DIRS=	include lib
+
 pre-install:
 	cd ${WRKSRC}/stlport && ${RM} -rf BC50 config/new_compiler old_hp
 	${FIND} ${WRKSRC}/stlport -name "*.orig" -print | ${XARGS} ${RM} -f
diff --git a/devel/tavrasm/Makefile b/devel/tavrasm/Makefile
index 32bb29e209d..591153ecccb 100644
--- a/devel/tavrasm/Makefile
+++ b/devel/tavrasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/06/12 12:40:21 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	tavrasm
@@ -19,6 +19,7 @@ MAKEFILE=	makefile
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 ONLY_FOR_COMPILER=	gcc
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tavrasm
diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index 11e4bf2537e..866dabfd7bd 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 02:41:21 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=		teem-1.8.0-src
@@ -45,6 +45,8 @@ MAKE_ENV+=	TEEM_ARCH=${TEEM_ARCH}					\
 		TEEM_PTHREAD_IPATH="-I${BUILDLINK_PREFIX.pthread}/include" \
 		TEEM_PTHREAD_LPATH="-L${BUILDLINK_PREFIX.pthread}/lib"
 
+INSTALLATION_DIRS=	bin include lib
+
 do-build:
 	cd ${WRKSRC}/src && ${MAKE_ENV} ${GMAKE}
 
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index a762726103b..0ce8ad46e16 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/19 13:30:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	tmake-1.11
@@ -18,6 +18,8 @@ USE_PERL5=		YES
 TMAKEPATH=	${PREFIX}/lib/tmake/netbsd-g++
 GLBASE=		${X11BASE}
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	${MV} ${WRKSRC}/bin/tmake ${WRKSRC}/bin/tmake.BAK
 	${SED}  -e 's;@PERL5@;${PERL5};g' \
diff --git a/devel/tpasm/Makefile b/devel/tpasm/Makefile
index f13f71095ba..187f6c6f262 100644
--- a/devel/tpasm/Makefile
+++ b/devel/tpasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	tpasm1.0r
@@ -14,6 +14,8 @@ COMMENT=	Assembler for 6805, 68HC11, 6502, Surplus, 8051, Z80, PIC, and AVR
 WRKSRC=		${WRKDIR}/tpasm
 USE_TOOLS+=	gmake
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/libdata/tpasm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tpasm
diff --git a/devel/trio/Makefile b/devel/trio/Makefile
index 59934795a0c..a6dce9aff1d 100644
--- a/devel/trio/Makefile
+++ b/devel/trio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 16:43:48 martti Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	trio-1.3
@@ -9,6 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.contactor.se/~dast/trio/
 COMMENT=	Fully matured and stable set of printf and string functions
 
+INSTALLATION_DIRS=	include lib man/man3
+
 post-patch:
 	${SED} "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile			\
 		> ${WRKSRC}/Makefile.done
diff --git a/devel/unidiff/Makefile b/devel/unidiff/Makefile
index 7fdd9821732..6de1ffb705d 100644
--- a/devel/unidiff/Makefile
+++ b/devel/unidiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/09 15:18:03 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $
 #
 
 DISTNAME=	part01
@@ -17,6 +17,8 @@ BUILD_DEPENDS=	gsharutils>=4.2.1:../../archivers/gsharutils
 WRKSRC=		${WRKDIR}
 EXTRACT_CMD=	zcat ${DOWNLOADED_DISTFILE} | ${PREFIX}/bin/gunshar
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/unify ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/unipatch ${PREFIX}/bin
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 899677e0d78..12f705121c1 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:30 agc Exp $
+# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:49 jlam Exp $
 #
 
 DISTNAME=	xxgdb-1.12
@@ -17,6 +17,8 @@ USE_IMAKE=	yes
 MAKE_ENV+=	CPPFLAGS=
 .endif
 
+INSTALLATION_DIRS=	bin lib/X11/app-defaults man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xxgdb ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XDbx.ad ${PREFIX}/lib/X11/app-defaults/XDbx
diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile
index e1113cc9ee1..d62ff688d6a 100644
--- a/devel/z80-asm/Makefile
+++ b/devel/z80-asm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:55 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:49 jlam Exp $
 #
 
 DISTNAME=	z80-asm-1.0
@@ -12,6 +12,8 @@ COMMENT=	Z80 assembly code assembler and disassembler
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 
+INSTALLATION_DIRS=	bin man/man1 man/man5
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/z80-asm ${PREFIX}/bin/z80-asm
 	${INSTALL_PROGRAM} ${WRKSRC}/z80-dis ${PREFIX}/bin/z80-dis