Create directories before installing files into them.

42 files changed, 117 insertions, 42 deletions

diff --git a/mail/YoSucker/Makefile b/mail/YoSucker/Makefile
index 4eb69124a27..00349d97753 100644
--- a/mail/YoSucker/Makefile
+++ b/mail/YoSucker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/26 02:27:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=		YoSucker-pr37
@@ -23,6 +23,7 @@ NO_BUILD=		# defined
 
 EGDIR=			${PREFIX}/share/examples/YoSucker
 DOCDIR=			${PREFIX}/share/doc/YoSucker
+INSTALLATION_DIRS=	bin lib
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/* ${PREFIX}/bin
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index 3a0adee7300..c8493c4e9ad 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	anomy-sanitizer-1.69
@@ -23,6 +23,8 @@ USE_PERL5=	# defined
 ANOMYLIB=	${PREFIX}/lib/anomy-sanitizer
 ANOMYDOC=	${PREFIX}/share/doc/anomy-sanitizer
 
+INSTALLATION_DIRS=	sbin
+
 do-build:
 	cd ${WRKSRC} && ( \
 	    for i in sanitizer simplify; do \
diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index 1b577ba656d..df39e3d6aaa 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=		archivemail-0.6.1
@@ -10,6 +10,7 @@ HOMEPAGE=		http://archivemail.sourceforge.net/
 COMMENT=		Tool for archiving and compressing old email in mailboxes
 
 NO_CONFIGURE=		yes
+INSTALLATION_DIRS=	man/man1
 
 do-build:
 
diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
index 22b6e4abf4f..9cc2a1aa96a 100644
--- a/mail/autorespond/Makefile
+++ b/mail/autorespond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:17 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	autorespond-2.0.5
@@ -17,6 +17,8 @@ SUBST_STAGE.qmaildir=	do-configure
 SUBST_FILES.qmaildir=	autorespond.c
 SUBST_SED.qmaildir=	-e 's|/var/qmail|${QMAILDIR}|g'
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/autorespond.1 ${PREFIX}/man/man1
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 6388bf62f07..1a8e20405b8 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	bbmail-0.8.3
@@ -12,6 +12,8 @@ COMMENT=	Mailbox monitor (not only) for the blackbox windowmanager
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c++
 
+INSTALLATION_DIRS=	bin man/man1
+
 .include "../../mk/x11.buildlink3.mk"
 
 do-install:
diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
index cbcf081de33..98ea3ec0968 100644
--- a/mail/bulk_mailer/Makefile
+++ b/mail/bulk_mailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	bulk_mailer-1.13
@@ -13,6 +13,8 @@ BUILD_TARGET=	bulk_mailer
 
 CPPFLAGS.SunOS+=	-DPIPECOMMAND=\"/usr/sbin/sendmail -bs %s\"
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bulk_mailer ${PREFIX}/bin/bulk_mailer
 	${INSTALL_MAN} ${WRKSRC}/bulk_mailer.1 ${PREFIX}/man/man1/bulk_mailer.1
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 81272e25a5b..4e908ed02c7 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 14:37:31 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	cucipop-1.31
@@ -42,6 +42,7 @@ MAKE_ENV+=	CFLAGS_INET6=-DINET6
 
 LDFLAGS.SunOS+=	-lnsl -lsocket
 
+INSTALLATION_DIRS=	man/man8 sbin
 pre-configure:
 	@(cd ${WRKSRC};							\
 	for f in config.h cucipop.8 makevpopdb.8; do			\
diff --git a/mail/cue/Makefile b/mail/cue/Makefile
index c4eb4bce9bc..b478a0924cb 100644
--- a/mail/cue/Makefile
+++ b/mail/cue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/05/31 10:01:37 dillo Exp $
+# $NetBSD: Makefile,v 1.47 2005/06/16 06:58:02 jlam Exp $
 
 DISTNAME=	cue-snap-20050131
 PKGNAME=	cue-20050131
@@ -38,6 +38,8 @@ CONFIGURE_ARGS+=	--enable-idea
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
+INSTALLATION_DIRS=	bin
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 6828c1bb2ca..166ce094b38 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	demime-1.1d
@@ -27,6 +27,8 @@ POD2MAN?=	${BUILDLINK_PREFIX.perl}/bin/pod2man
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/demime_junkmail.cf ${PKG_SYSCONFDIR}/demime_junkmail.cf
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME:S/-/./} ${WRKSRC}/demime.stable
diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile
index 867d45fe71c..949c3a06062 100644
--- a/mail/fetchmailconf/Makefile
+++ b/mail/fetchmailconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/06/01 18:02:59 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2005/06/16 06:58:02 jlam Exp $
 
 DISTNAME=	fetchmail-6.2.5
 PKGNAME=	${DISTNAME:S/fetchmail/fetchmailconf/}
@@ -20,6 +20,8 @@ PATCHDIR=		${.CURDIR}/../../mail/fetchmail/patches
 
 PYTHON_PATCH_SCRIPTS= fetchmailconf
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/fetchmailconf ${PREFIX}/bin
 		${LN} -s fetchmail.1 ${PREFIX}/man/man1/fetchmailconf.1
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index 562768324aa..9b067f3ba2d 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile,v 1.8 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	fromto-1.5
@@ -14,6 +14,8 @@ RESTRICTED=	"Redistribution allowed for non-commercial purposes only"
 WRKSRC=		${WRKDIR}
 USE_PERL5=	yes
 
+INSTALLATION_DIRS=	bin
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/fromto.in
diff --git a/mail/imap-uw-utils/Makefile b/mail/imap-uw-utils/Makefile
index 9825bb7a928..250e79a9e49 100644
--- a/mail/imap-uw-utils/Makefile
+++ b/mail/imap-uw-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/16 06:58:02 jlam Exp $
 
 DISTNAME=	imap-utils
 PKGNAME=	imap-uw-utils-20050108
@@ -19,6 +19,8 @@ SRCDIRS=	icat ifrom
 CFLAGS+=	-I${BUILDLINK_PREFIX.imap-uw}/include/c-client
 LIBS+=		-lc-client -lssl -lcrypto
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-build:
 	@for prog in ${SRCDIRS}; do					\
 		${ECHO} "==> Building $${prog}";			\
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 2034cd2c538..e08d6984668 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.95 2005/06/16 06:58:02 jlam Exp $
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system with Kerberos libraries
@@ -155,6 +155,7 @@ post-build:
 do-install:
 	${INSTALL_DATA_DIR} ${INC_DIR}
 	cd ${WRKSRC}/c-client; ${INSTALL_DATA} ${CCLIENT_INCS} ${INC_DIR}
+	${INSTALL_LIB_DIR} ${LIB_DIR}
 	${INST_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${LIB_DIR}
 	${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${LIB_DIR}
 	${RANLIB} ${LIB_DIR}/${CCLIENT_PICLIB}
@@ -167,11 +168,14 @@ do-install:
 			;;						\
 		esac;							\
 	done
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
 	${INST_PROG} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/sbin
 	${INST_PROG} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin
 	${LN} -sf ../libexec/imapd ${PREFIX}/sbin/rimapd
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/man/man8
 	${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop2d.8
@@ -182,7 +186,9 @@ do-install:
 	${FIND} ${DOC_DIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${DOC_DIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
 
+	${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
 	${INST_PROG} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
 	${INST_PROG} ${WRKSRC}/dmail/dmail ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/man/man1
diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile
index e4698c2e87f..25afbfaca07 100644
--- a/mail/imapproxy/Makefile
+++ b/mail/imapproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	imapproxy-1.0
@@ -11,6 +11,8 @@ COMMENT=	Simple connection caching IMAP proxy daemon
 
 GNU_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/imapproxy ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imapproxy
diff --git a/mail/incm/Makefile b/mail/incm/Makefile
index ab02910eab5..b1dcfdd8a77 100644
--- a/mail/incm/Makefile
+++ b/mail/incm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/15 13:48:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	incm-0.5
@@ -13,6 +13,8 @@ CONFLICTS=	mew-[0-9]*
 
 GNU_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/incm ${PREFIX}/bin/
 
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index d4b3f43cb22..9ace88c5770 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	mailgraph-1.10
@@ -48,6 +48,7 @@ SUBST_SED.defs+=	-e 's,/var/log/syslog,${VARBASE}/log/maillog,g'
 #
 SUBST_MESSAGE.defs=	"Fixing defaults"
 
+INSTALLATION_DIRS=	${CGIDIR} sbin
 do-build:
 
 do-configure:
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 3ca77291d00..097eb9e7627 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/12/28 02:47:44 reed Exp $
+# $NetBSD: Makefile,v 1.4 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=		MailScanner-4.30.3-2
@@ -90,6 +90,8 @@ SUBST_SED.systemdefs=	-e s,/bin/rm,${RM},g
 SUBST_SED.systemdefs=	-e s,/bin/sed,${SED},g
 .endif
 
+INSTALLATION_DIRS=	bin man/man5 man/man8
+
 # get rid of CVS backup files
 post-extract:
 	cd ${WRKSRC} && ${RM} -f */.#*
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index c22a83499b5..4b0b2e7bd3c 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:58:02 jlam Exp $
 #
 
 DISTNAME=	mailserv
@@ -26,6 +26,8 @@ CONF_FILES+=	${EGDIR}/${cf}.cf ${PKG_SYSCONFDIR}/${cf}.cf
 .endfor
 .undef cf
 
+INSTALLATION_DIRS=	libexec/cgi-bin
+
 do-configure:
 .for file in mailserv cgi-lib.pl
 	cd ${WRKSRC} &&							\
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 70b07112a0c..828614511f1 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=	mailsync_5.2.1.orig
@@ -31,6 +31,8 @@ DOCS=	COPYING NEWS README THANKS TODO doc/ABSTRACT doc/HACKING
 
 .include "../../mk/bsd.prefs.mk"
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mailsync
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mailsync
diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile
index 075fd761aaa..270e3759ae4 100644
--- a/mail/mairix/Makefile
+++ b/mail/mairix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/25 00:19:40 simonb Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=		mairix-0.15.1
@@ -21,6 +21,8 @@ BINDIR=			${PREFIX}/bin
 INFODIR=		${PREFIX}/info
 HTMLDIR=		${PREFIX}/share/doc/html/mairix
 
+INSTALLATION_DIRS=	bin info
+
 pre-build:
 			@cd ${WRKSRC}; \
 			makeinfo mairix.texi; \
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index a6dbf9a9fb9..23e43206fce 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/20 11:00:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=		mb2md-3.20.pl
@@ -19,6 +19,7 @@ USE_PERL5=		run
 REPLACE_PERL=		${DISTNAME}
 
 NO_BUILD=		# defined
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/${PKGBASE}
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index 37581812016..14df5596dad 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:19:43 agc Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=	mdfrm.pl
@@ -18,6 +18,8 @@ WRKSRC=		${WRKDIR}
 USE_PERL5=	yes
 NO_BUILD=	yes
 
+INSTALLATION_DIRS=	bin
+
 post-patch:
 	${SED}	-e "s,/usr/local/bin/perl,${LOCALBASE}/bin/perl,g"	\
 		-e "s,.Maildir,Maildir,g"				\
diff --git a/mail/milter-regex/Makefile b/mail/milter-regex/Makefile
index c82cea3bd0b..e9269bc0d6b 100644
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=	milter-regex-1.5
@@ -9,6 +9,7 @@ MAINTAINER=	jdarrow@NetBSD.org
 HOMEPAGE=	http://www.benzedrine.cx/milter-regex.html
 COMMENT=	Milter enabling regular expression filtering
 
+INSTALLATION_DIRS=	man/man8 sbin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-regex ${PREFIX}/sbin
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index e3808f9aa88..e66f2b5f78a 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/05 22:31:34 markd Exp $
+# $NetBSD: Makefile,v 1.24 2005/06/16 06:58:03 jlam Exp $
 
 DISTNAME=		mimedefang-2.52
 CATEGORIES=		mail
@@ -63,6 +63,7 @@ CONFIGURE_ENV+=		NAI=${PREFIX}/bin/uvscan
 # Doesn't work with pth
 PTHREAD_OPTS+=		require native
 
+INSTALLATION_DIRS=	bin man/man5 man/man7 man/man8
 do-install:
 	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index a7e9884cd0f..7067282ee2a 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/06/16 06:58:03 jlam Exp $
 
 DISTNAME=	nail-11.22
 CATEGORIES=	mail
@@ -30,6 +30,8 @@ EGDIR=		${PREFIX}/share/examples/nail
 
 CONF_FILES=     ${EGDIR}/nail.rc ${PKG_SYSCONFDIR}/nail.rc
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
 		${INSTALL_MAN} ${WRKSRC}/nail.1 ${PREFIX}/man/man1
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index eab3f3574c0..b7636b0df86 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2005/04/15 16:36:39 tron Exp $
+# $NetBSD: Makefile,v 1.105 2005/06/16 06:58:03 jlam Exp $
 
 DISTNAME=	pine4.62
 PKGNAME=	pine-4.62
@@ -57,6 +57,8 @@ PINE_LDAPCFLAGS=	LDAPCFLAGS="-DENABLE_LDAP"
 PINE_LDAPLIBS=		LDAPLIBS="-lldap -llber"
 .endif
 
+INSTALLATION_DIRS=	bin man/man1
+
 # Make sure the imap lib that comes with pine isn't
 # used (see http://www.securityfocus.com/advisories/2646)
 pre-patch:
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index add9a4bdb15..c5a6c0c4a04 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/05/31 17:46:45 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=	popa3d-1.0
@@ -32,6 +32,8 @@ SUBST_FILES.params=	params.h
 SUBST_SED.params=	-e 's,/var/empty,${PREFIX}/share/empty,'	\
 			-e 's,@@POPA3D_USER@@,"${POPA3D_USER}",'
 
+INSTALLATION_DIRS=	man/man8 sbin
+
 do-install:
 	${INSTALL_PROGRAM} -m 500 ${WRKSRC}/popa3d ${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/popa3d.8 ${PREFIX}/man/man8/
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index 3539bdcd287..2971ff9e17a 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/15 05:26:20 taca Exp $
+# $NetBSD: Makefile,v 1.20 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -23,6 +23,8 @@ MAKE_ENV+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 
 .include "options.mk"
 
+INSTALLATION_DIRS=	man/man8 share/doc
+
 do-build:
 .for DIR in common password
 	cd ${WRKSRC}/${DIR}; ${SETENV} ${MAKE_ENV}			\
diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile
index 347f480e0b2..59b08f3b0dc 100644
--- a/mail/poppy/Makefile
+++ b/mail/poppy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/07/23 14:28:56 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:03 jlam Exp $
 #
 
 DISTNAME=	poppy-3.1
@@ -13,6 +13,8 @@ NO_BUILD=	YES
 USE_PERL5=	YES
 REPLACE_PERL=	poppy
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/poppy ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/poppy.1 ${PREFIX}/man/man1
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index 64582ca9e55..dd9104615a4 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/17 16:32:10 kim Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	postgrey-1.21
@@ -70,6 +70,8 @@ SUBST_SED.postgrey+=	-e 's,/etc/postfix,${PKG_SYSCONFDIR},g'
 #
 SUBST_MESSAGE.postgrey=	"Fixing defaults"
 
+INSTALLATION_DIRS=	sbin
+
 do-build:
 
 do-install:
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 66cbb1b128e..e0e392b4627 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.37 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	procmail-3.22
@@ -23,6 +23,8 @@ BUILD_DEFS+=	PROCMAIL_MAILSPOOLHOME PROCMAIL_TRUSTED_IDS
 PROCMAIL_TRUSTED_IDS?=\
 "root","daemon","uucp","mail","x400","network","list","slist","lists","news",0
 
+INSTALLATION_DIRS=	bin man/man1 man/man5
+
 pre-configure:
 	${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}"	\
 	>> ${WRKSRC}/config.h
diff --git a/mail/qcheck/Makefile b/mail/qcheck/Makefile
index 1d557dde812..8d4b46e729b 100644
--- a/mail/qcheck/Makefile
+++ b/mail/qcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:46:52 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	qcheck
@@ -11,6 +11,8 @@ COMMENT=	Text-only biff with Maildir support
 
 NO_CONFIGURE=	YES
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	${CC} ${CFLAGS} ${WRKSRC}/qcheck.c -o ${WRKSRC}/qcheck
 
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index 431616aafda..4e5c92e6605 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/12/28 02:47:45 reed Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	qmhandle-1.2.0
@@ -25,6 +25,8 @@ SUBST_SED.config+=	-e 's|/etc/init.d/qmail|${RCD_SCRIPTS_DIR}/qmail|g'
 SUBST_SED.config+=	-e 's|pidof|/usr/bin/pgrep|g'
 .endif
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/qmHandle
diff --git a/mail/qmail-lint/Makefile b/mail/qmail-lint/Makefile
index 359268f8eaa..acd9802ef30 100644
--- a/mail/qmail-lint/Makefile
+++ b/mail/qmail-lint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/30 16:49:45 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	qmail-lint-0.55
@@ -23,6 +23,8 @@ SUBST_STAGE.qmaildir=	do-configure
 SUBST_FILES.qmaildir=	${DISTNAME}
 SUBST_SED.qmaildir=	-e 's|/var/qmail|${QMAILDIR}|g'
 
+INSTALLATION_DIRS=	bin
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin/qmail-lint
 
diff --git a/mail/queue_repair/Makefile b/mail/queue_repair/Makefile
index 4680b354168..deb0da0510f 100644
--- a/mail/queue_repair/Makefile
+++ b/mail/queue_repair/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/02/16 18:44:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.13 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=		queue-repair-0.9.0
@@ -12,6 +12,7 @@ COMMENT=		Check or correct most corruptions of the queue in qmail
 NO_BUILD=		YES
 
 PYTHON_PATCH_SCRIPTS=	queue_repair.py
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py ${PREFIX}/bin/queue_repair
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index 9dcb5cb5376..87927d79102 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/16 06:58:08 jlam Exp $
 
 DISTNAME=	rblcheck-1.4
 CATEGORIES=	mail
@@ -11,6 +11,7 @@ COMMENT=	Command-line interface to Paul Vixie's RBL filter
 
 DOCS=		BUGS CHANGES CREDITS INSTALL PLATFORMS TODO
 
+INSTALLATION_DIRS=	bin
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin
diff --git a/mail/rss2email/Makefile b/mail/rss2email/Makefile
index 6c77649a9e1..327faf1e852 100644
--- a/mail/rss2email/Makefile
+++ b/mail/rss2email/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=		rss2email-${RVER}
@@ -31,6 +31,7 @@ SUBST_SED.bin+=		-e 's|@PYTHONBIN@|${PYTHONBIN}|g'
 
 SHAREDIR=		${PREFIX}/share/rss2email
 EGDIR=			${PREFIX}/share/examples/rss2email
+INSTALLATION_DIRS=	bin man/man1
 
 do-extract:
 	${CP} -R ${DISTDIR}/${DIST_SUBDIR} ${WRKSRC}
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index 97d5f742563..b217a2dbfd5 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:08 jlam Exp $
 
 DISTNAME=	sigrot_1.2-1
 PKGNAME=	sigrot-1.2
@@ -15,6 +15,8 @@ USE_TOOLS+=	gmake
 DOCDIR=		${PREFIX}/share/doc/sigrot
 EGDIR=		${PREFIX}/share/examples/sigrot
 
+INSTALLATION_DIRS=	bin man/man1
+
 do-build:
 	cd ${WRKSRC} && ${CC} sigrot.c -o sigrot
 
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index ab19294b822..a7a9c90475d 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/06/16 06:58:08 jlam Exp $
 
 DISTNAME=       sma-1.3.2
 CATEGORIES=	mail
@@ -19,6 +19,7 @@ BUILD_TARGET=	sma
 .if empty(LOWER_OPSYS:Mirix5*)                                                                     
 CFLAGS+=	-DUSE_REGEXP                                                                        
 .endif                                                                                             
+INSTALLATION_DIRS=	bin man/man8
 
 do-install:
 	cd ${WRKSRC};						\
diff --git a/mail/squirrelmail-locales/Makefile b/mail/squirrelmail-locales/Makefile
index 3b86cc88a72..064b58ba560 100644
--- a/mail/squirrelmail-locales/Makefile
+++ b/mail/squirrelmail-locales/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	all_locales-${VER}-20050122
@@ -15,6 +15,7 @@ VER=		1.4.4
 
 NO_CONFIGURE=		# defined
 PKGSRC_USE_TOOLS+=	tar
+INSTALLATION_DIRS=	share/squirrelmail
 
 WRKSRC=		${WRKDIR}
 
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index da95b1320ae..646e4022fb7 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/16 06:58:08 jlam Exp $
 #
 
 DISTNAME=	tmda-1.0.3
@@ -44,6 +44,8 @@ SUBST_STAGE.etc=	do-configure
 SUBST_FILES.etc=	bin/tmda-ofmipd TMDA/Auth.py TMDA/Defaults.py
 SUBST_SED.etc=		-e 's|/etc|${PKG_SYSCONFDIR}|g'
 
+INSTALLATION_DIRS=	bin
+
 do-build:
 	cd ${WRKSRC} && ${PYTHONBIN} ./compileall
 
diff --git a/mail/xmailwatcher/Makefile b/mail/xmailwatcher/Makefile
index 15c588f6fcc..45466002bc4 100644
--- a/mail/xmailwatcher/Makefile
+++ b/mail/xmailwatcher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/16 06:58:08 jlam Exp $
 
 DISTNAME=		xmailwatcher
 PKGNAME=		${DISTNAME}-1.6
@@ -9,6 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 COMMENT= 		Mailbox checker which displays sender and subject lines of mails
 
 USE_IMAKE=		yes
+INSTALLATION_DIRS=	bin man/man1
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/xmailwatcher.0 ${PREFIX}/man/man1/xmailwatcher.1