[pkgsrc/trunk]: pkgsrc/mail/squirrelmail Fix wrong CONF_FILES handling.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/743286c3f259
branches:  trunk
changeset: 572672:743286c3f259
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Mar 05 03:05:40 2010 +0000

description:
Fix wrong CONF_FILES handling.

Bump PKGREVISION.

diffstat:

 mail/squirrelmail/Makefile |  18 +++++++++++-------
 mail/squirrelmail/PLIST    |   4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r 464924be0283 -r 743286c3f259 mail/squirrelmail/Makefile
--- a/mail/squirrelmail/Makefile        Fri Mar 05 00:22:59 2010 +0000
+++ b/mail/squirrelmail/Makefile        Fri Mar 05 03:05:40 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.112 2010/03/04 16:00:37 taca Exp $
+# $NetBSD: Makefile,v 1.113 2010/03/05 03:05:40 taca Exp $
 
 DISTNAME=      squirrelmail-1.4.20-RC2
 PKGNAME=       ${DISTNAME:S/-RC2/rc2/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    mail www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=squirrelmail/}
 EXTRACT_SUFX=  .tar.bz2
@@ -50,8 +50,10 @@
                        ${DATADIR}/data/default_pref
 CONF_FILES+=           ${EGDIR}/squirrelmail.conf \
                        ${PKG_SYSCONFDIR}/squirrelmail.conf
-CONF_FILES+=           ${USER_PREFS_DIR}/.htaccess ${DATADIR}/data/.htaccess
-CONF_FILES+=           ${USER_PREFS_DIR}/index.php ${DATADIR}/data/index.php
+CONF_FILES+=           ${EGDIR}/data/.htaccess ${DATADIR}/data/.htaccess
+CONF_FILES+=           ${EGDIR}/data/index.php ${DATADIR}/data/index.php
+CONF_FILES+=           ${EGDIR}/data/.htaccess ${USER_PREFS_DIR}/.htaccess
+CONF_FILES+=           ${EGDIR}/data/index.php ${USER_PREFS_DIR}/index.php
 
 REQD_DIRS+=            ${SMDIR} ${SMDIR}/config
 
@@ -68,9 +70,8 @@
 SUBST_SED.paths+=      -e 's,@SMDIR@,${PREFIX}/${SMDIR},g'
 SUBST_STAGE.paths=     pre-configure
 
-INSTALLATION_DIRS=     ${PKGMANDIR}/man8
-INSTALLATION_DIRS+=    share/examples/squirrelmail
-INSTALLATION_DIRS+=    share/squirrelmail
+DATA_FILES=            .htaccess index.php
+INSTALLATION_DIRS=     ${PKGMANDIR}/man8 ${EGDIR}/data ${SMDIR}
 
 post-extract:
        ${CP} ${FILESDIR}/squirrelmail.conf.dist \
@@ -88,6 +89,9 @@
 do-install:
        ${INSTALL_DATA} ${WRKDIR}/squirrelmail.conf.dist \
                ${DESTDIR}${PREFIX}/${EGDIR}/squirrelmail.conf
+.for f in ${DATA_FILES}
+       ${INSTALL_DATA} ${WRKSRC}/data/${f} ${DESTDIR}${PREFIX}/${EGDIR}/data
+.endfor
        cd ${WRKSRC}; pax -rw -pp . ${DESTDIR}${PREFIX}/${SMDIR}
        ${INSTALL_DATA} ${WRKDIR}/squirrelmail-conf.pl.8 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff -r 464924be0283 -r 743286c3f259 mail/squirrelmail/PLIST
--- a/mail/squirrelmail/PLIST   Fri Mar 05 00:22:59 2010 +0000
+++ b/mail/squirrelmail/PLIST   Fri Mar 05 03:05:40 2010 +0000
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.34 2009/09/29 13:30:54 taca Exp $
+@comment $NetBSD: PLIST,v 1.35 2010/03/05 03:05:40 taca Exp $
 man/man8/squirrelmail-conf.pl.8
 share/examples/squirrelmail/squirrelmail.conf
+share/examples/squirrelmail/data/.htaccess
+share/examples/squirrelmail/data/index.php
 share/squirrelmail/README
 share/squirrelmail/class/.htaccess
 share/squirrelmail/class/deliver/Deliver.class.php