From 75986f5b87429b885e6f42a67e341c7250846820 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Fri, 5 Mar 2010 03:05:40 +0000
Subject: Fix wrong CONF_FILES handling.

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

(limited to 'mail/squirrelmail')

diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 86698499f5b..9d49d95d388 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -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 @@ CONF_FILES+=		${SMDIR}/data/default_pref \
 			${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,@USER_PREFS_DIR@,${USER_PREFS_DIR},g'
 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 @@ pre-install:
 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 --git a/mail/squirrelmail/PLIST b/mail/squirrelmail/PLIST
index 7b96106a9da..6143e69852e 100644
--- a/mail/squirrelmail/PLIST
+++ b/mail/squirrelmail/PLIST
@@ -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
-- 
cgit v1.2.3