From 71a95713e2e23a3bf256925b40634a22f4ec806c Mon Sep 17 00:00:00 2001
From: martti <martti>
Date: Sat, 10 Dec 2005 19:23:01 +0000
Subject: List ${SMDIR} and ${SMDIR}/config in REQD_DIRS instead of OWN_DIRS to
 avoid problems with bulk builds with CHECK_FILES=yes. Suggested by Johnny Lam
 on tech-pkg@ list.

---
 mail/ja-squirrelmail/Makefile | 5 +++--
 mail/squirrelmail/Makefile    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index 35c1b363f4f..bebd0f4b898 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/09 10:18:11 martti Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/10 19:23:01 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGNAME=	ja-${DISTNAME}
@@ -46,8 +46,9 @@ CONF_FILES=	${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
 CONF_FILES+=	${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
 CONF_FILES+=	${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
 
+REQD_DIRS=		${SMDIR} ${SMDIR}/config
+
 OWN_DIRS=		${DATADIR}
-OWN_DIRS+=		${SMDIR} ${SMDIR}/config
 OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
 OWN_DIRS_PERMS+=	${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 393e50bf517..89b0f358e04 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/12/09 10:18:11 martti Exp $
+# $NetBSD: Makefile,v 1.63 2005/12/10 19:23:01 martti Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGREVISION=	3
@@ -40,8 +40,9 @@ CONF_FILES=	${SMDIR}/config/config_default.php ${SMDIR}/config/config.php
 CONF_FILES+=	${SMDIR}/data/default_pref ${DATADIR}/data/default_pref
 CONF_FILES+=	${EGDIR}/squirrelmail.conf ${PKG_SYSCONFDIR}/squirrelmail.conf
 
+REQD_DIRS=		${SMDIR} ${SMDIR}/config
+
 OWN_DIRS=		${DATADIR}
-OWN_DIRS+=		${SMDIR} ${SMDIR}/config
 OWN_DIRS_PERMS=		${ATTACHMENTS_DIR} ${ROOT_USER} ${APACHE_GROUP} 730
 OWN_DIRS_PERMS+=	${USER_PREFS_DIR} ${APACHE_USER} ${APACHE_GROUP} 755
 
-- 
cgit v1.2.3