[pkgsrc/pkgsrc-2005Q3]: pkgsrc/mail Pullup ticket 957 - requested by Martti K...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f24788ac29be
branches:  pkgsrc-2005Q3
changeset: 499753:f24788ac29be
user:      seb <seb%pkgsrc.org@localhost>
date:      Thu Dec 15 13:55:25 2005 +0000

description:
Pullup ticket 957 - requested by Martti Kuparinen
bulk build fix for mail/ja-squirrelmail and mail/squirrelmail

Revisions pulled up:
- pkgsrc/mail/ja-squirrelmail/Makefile                        1.21
- pkgsrc/mail/squirrelmail/Makefile                           1.63

   Module Name: pkgsrc
   Committed By:        martti
   Date:                Sat Dec 10 19:23:01 UTC 2005

   Modified Files:
        pkgsrc/mail/ja-squirrelmail: Makefile
        pkgsrc/mail/squirrelmail: Makefile

   Log Message:
   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.

diffstat:

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

diffs (40 lines):

diff -r 19d6a1e8b660 -r f24788ac29be mail/ja-squirrelmail/Makefile
--- a/mail/ja-squirrelmail/Makefile     Thu Dec 15 13:37:04 2005 +0000
+++ b/mail/ja-squirrelmail/Makefile     Thu Dec 15 13:55:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15.2.1 2005/12/09 16:20:16 salo Exp $
+# $NetBSD: Makefile,v 1.15.2.2 2005/12/15 13:55:25 seb Exp $
 
 DISTNAME=      squirrelmail-1.4.5
 PKGNAME=       ja-${DISTNAME}
@@ -46,8 +46,9 @@
 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 -r 19d6a1e8b660 -r f24788ac29be mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Thu Dec 15 13:37:04 2005 +0000
+++ b/mail/squirrelmail/Makefile        Thu Dec 15 13:55:25 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57.2.1 2005/12/09 16:20:16 salo Exp $
+# $NetBSD: Makefile,v 1.57.2.2 2005/12/15 13:55:25 seb Exp $
 
 DISTNAME=      squirrelmail-1.4.5
 PKGREVISION=   3
@@ -40,8 +40,9 @@
 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