From b4df1e02351f566ea9c7014194789f97bc6ce89a Mon Sep 17 00:00:00 2001 From: seb Date: Thu, 15 Dec 2005 13:55:25 +0000 Subject: 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. --- 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 393524f10e9..742c32a83a1 100644 --- a/mail/ja-squirrelmail/Makefile +++ b/mail/ja-squirrelmail/Makefile @@ -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}/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 b34a80ccd55..52301986c12 100644 --- a/mail/squirrelmail/Makefile +++ b/mail/squirrelmail/Makefile @@ -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}/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