Prepare for switching to NO_MTREE=yes.

16 files changed, 47 insertions, 26 deletions

diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index 3049885848a..167328ad55d 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/02/06 18:31:53 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/24 19:21:25 joerg Exp $
 
 DISTNAME=		coolmail-1.3
 PKGREVISION=		2
@@ -17,6 +17,8 @@ MAKE_ENV+=		EXTRA_LIBS=${EXTRA_LIBS:Q}
 MAKE_ENV+=		X11BASE=${PREFIX:Q}
 USE_X11BASE=		yes
 
+INSTALLATION_DIRS=	bin lib/X11/app-defaults ${PKGMANDIR}/man1
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Coolmail.ad \
 	  ${PREFIX}/lib/X11/app-defaults/Coolmail
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index df0bd46b68d..058a5767789 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/02/22 19:26:40 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/03/24 19:21:26 joerg Exp $
 #
 
 DISTNAME=	demime-1.1d
@@ -24,7 +24,7 @@ USE_TOOLS+=	perl:run pod2man
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/demime_junkmail.cf ${PKG_SYSCONFDIR}/demime_junkmail.cf
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 17ec7f2433f..0c71d45c1bb 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/10/04 21:47:16 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=	distribute-2.1-pl19
 PKGNAME=	distribute-2.1.26
@@ -16,6 +16,8 @@ MAINTAINER=	itojun@itojun.org
 # AWOL
 COMMENT=	Mail dispatcher for mailing list.  Fits nicely with majordomo
 
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man1
+
 WRKSRC=		${WRKDIR}/distribute-pl19
 USE_TOOLS+=	perl:run
 
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 88ae1426cee..f4308bbc82b 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/03/19 16:40:27 tv Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=	dk-milter-0.3.0
 PKGREVISION=	1
@@ -26,6 +26,8 @@ SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
 			-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
 SUBST_MESSAGE.libs=	Fixing makefile references.
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/dk-milter
+
 post-extract:
 	${LN} -s FreeBSD ${WRKSRC}/devtools/OS/DragonFly
 
@@ -41,7 +43,6 @@ do-install:
 	cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \  . | ${TR} \/ -` && \
 		${INSTALL_PROGRAM} dk-filter/dk-filter ${PREFIX}/sbin/dk-milter
 	${INSTALL_MAN} ${WRKSRC}/dk-filter/dk-milter.8 ${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dk-milter
 	${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dk-milter
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dk-milter
 	${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${PREFIX}/share/doc/dk-milter
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 22674527792..d2125e266f2 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=	dkim-milter-0.1.1
 CATEGORIES=	mail
@@ -25,6 +25,8 @@ SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
 			-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
 SUBST_MESSAGE.libs=	Fixing makefile references.
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/dkim-milter
+
 post-extract:
 	${LN} -s FreeBSD ${WRKSRC}/devtools/OS/DragonFly
 
@@ -40,7 +42,6 @@ do-install:
 	cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \  . | ${TR} \/ -` && \
 		${INSTALL_PROGRAM} dkim-filter/dkim-filter ${PREFIX}/sbin/dkim-milter
 	${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/${PKGMANDIR}/man8/
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${PREFIX}/share/doc/dkim-milter
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index da6e33e6085..c96bf801660 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/02/22 19:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2007/03/24 19:21:26 joerg Exp $
 #
 
 DISTNAME=	drac
@@ -21,4 +21,6 @@ MAKE_ENV+=	EBIN="${LOCALBASE}/libexec"
 MAKE_ENV+=	MAN="${LOCALBASE}/man/man"
 MAKE_ENV+=	EXAMPLES="${LOCALBASE}/share/examples/drac"
 
+INSTALLATION_DIRS=	include lib libexec ${PKGMANDIR}/man3 ${PKGMANDIR}/man8
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 31106ca56f2..8f88b1b39d0 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2007/03/17 20:43:24 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
@@ -22,6 +22,7 @@ CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-S
 
 INSTALL_DIRS=		${WRKSRC} ${WRKSRC}/nls
+INSTALLATION_DIRS=	share/nls/C
 
 CONF_FILES=		${PREFIX}/lib/elm.mimetypes-dist		\
 			${PREFIX}/lib/elm.mimetypes
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 5c4e070e485..f05425048c9 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2007/01/07 09:13:57 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	7
@@ -79,6 +79,8 @@ SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_STAGE.paths=	post-patch
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/exim
+
 post-extract:
 	${CP} ${FILESDIR}/Makefile-DragonFly ${FILESDIR}/os.h-DragonFly \
 		${WRKSRC}/OS/
@@ -97,9 +99,6 @@ pre-configure:
 		${MV} -f $$f.subst $$f; \
 	done
 
-pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/exim_newaliases ${PREFIX}/sbin/exim_newaliases
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EGDIR}
diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index ec961e13f8d..c930bb05dd6 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/08/10 11:18:16 abs Exp $
+# $NetBSD: Makefile,v 1.2 2007/03/24 19:21:26 joerg Exp $
 #
 
 DISTNAME=	imapsync-1.182
@@ -20,6 +20,8 @@ NO_BUILD=	YES
 USE_TOOLS+=	perl:run
 REPLACE_PERL+=	imapsync
 
+INSTALLATION_DIRS=	bin share/doc
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/imapsync ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/imapsync
diff --git a/mail/ja-mh/Makefile b/mail/ja-mh/Makefile
index 70a45378ed5..ad11b7ae657 100644
--- a/mail/ja-mh/Makefile
+++ b/mail/ja-mh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/04 21:47:16 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=	mh-6.8.4-JP-3.05
 PKGNAME=	ja-mh6-3.05
@@ -30,6 +30,8 @@ CONFIGURE_ARGS+=	--enable-jmandir=${PREFIX:Q}/${PKGMANDIR:Q}/ja_JP.EUC
 CONFIGURE_ARGS+=	--enable-apop=${PREFIX:Q}/etc/pop.auth
 CONFIGURE_ARGS+=	--enable-rpop
 
+INSTALLATION_DIRS=	bin lib
+
 post-install:
 	${LN} -sf libmh.so.3.2 ${PREFIX}/lib/libmh.so.3
 
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 11166b9ba58..fa708a030a3 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2007/01/07 09:13:58 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2007/03/24 19:21:26 joerg Exp $
 
 DISTNAME=	squirrelmail-1.4.9a
 PKGNAME=	ja-${DISTNAME}
@@ -64,6 +64,9 @@ SUBST_SED.paths+=	-e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
 SUBST_SED.paths+=	-e 's,@SMDIR@,${SMDIR},g'
 SUBST_STAGE.paths=	post-patch
 
+INSTALLATION_DIRS=	share/examples/squirrelmail share/squirrelmail \
+			${PKGMANDIR}/man8
+
 post-extract:
 	${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
 		${WRKDIR:Q}/squirrelmail.conf.dist
@@ -72,8 +75,6 @@ pre-configure:
 	${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR:Q}
-	${INSTALL_DATA_DIR} ${SMDIR:Q}
 	${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
 	${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile
index 9c3ee78e940..db280701f09 100644
--- a/mail/jchkmail/Makefile
+++ b/mail/jchkmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/04/11 11:12:21 manu Exp $
+# $NetBSD: Makefile,v 1.10 2007/03/24 19:21:27 joerg Exp $
 #
 
 DISTNAME=		jchkmail-1.3.1a
@@ -29,6 +29,8 @@ RCD_SCRIPTS=		jchkmail
 
 PTHREAD_AUTO_VARS=	yes
 
+INSTALLATION_DIRS=	share/examples/rc.d
+
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/libmilter/Makefile b/mail/libmilter/Makefile
index 61ab347cc9f..551cccd395b 100644
--- a/mail/libmilter/Makefile
+++ b/mail/libmilter/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2004/10/28 06:36:51 cube Exp $
+# $NetBSD: Makefile,v 1.9 2007/03/24 19:21:27 joerg Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
 PKGNAME=	libmilter-${DIST_VERS}
 COMMENT=	Mail filter support library for sendmail
 
+INSTALLATION_DIRS=	lib
+
 post-patch: make-sendmail-siteconfig
 
 do-build:
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 7736a0b6e6d..52750e96e92 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/10/23 08:14:02 rillig Exp $
+# $NetBSD: Makefile,v 1.58 2007/03/24 19:21:27 joerg Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -50,6 +50,8 @@ SUBST_STAGE.libexec=	pre-configure
 SUBST_FILES.libexec=	man/popper.8
 SUBST_SED.libexec=	-e "s|/usr/local/lib|${PREFIX}/libexec|g"
 
+INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8 sbin share/doc share/exmaples
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/License.txt				\
 		${PREFIX}/share/doc/qpopper.License
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 7bca57f22d1..c070470e9ea 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/12/07 16:16:07 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2007/03/24 19:21:27 joerg Exp $
 
 DISTNAME=	squirrelmail-1.4.9a
 CATEGORIES=	mail www
@@ -58,6 +58,8 @@ SUBST_SED.paths+=	-e 's,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
 SUBST_SED.paths+=	-e 's,@SMDIR@,${SMDIR},g'
 SUBST_STAGE.paths=	post-patch
 
+INSTALLATION_DIRS=	${PKGMANDIR}/man8 share/examples/squirrelmail share/squirrelmail
+
 post-extract:
 	${CP} ${FILESDIR:Q}/squirrelmail.conf.dist \
 		${WRKDIR:Q}/squirrelmail.conf.dist
@@ -66,8 +68,6 @@ pre-configure:
 	${FIND} ${WRKSRC:Q} \( -name "*.orig*" -o -name ".cvsignore" \) -print | ${XARGS} ${RM} -f
 
 do-install:
-	${INSTALL_DATA_DIR} ${EGDIR:Q}
-	${INSTALL_DATA_DIR} ${SMDIR:Q}
 	${INSTALL_DATA} ${WRKDIR:Q}/squirrelmail.conf.dist ${EGDIR:Q}/squirrelmail.conf
 	${CP} -R ${WRKSRC:Q}/* ${SMDIR:Q}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index c7e403f6dd2..219222df187 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/06 18:30:26 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:27 joerg Exp $
 #
 
 DISTNAME=	xbuffy-3.4
@@ -15,6 +15,8 @@ USE_X11BASE=	YES
 CPPFLAGS+=	-I${X11BASE}/include
 CPPFLAGS+=	-Wall
 
+INSTALLATION_DIRS=	lib/X11/app-defaults
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/XBuffy.ad ${PREFIX}/lib/X11/app-defaults/XBuffy