summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Holzer <mholzer@gentoo.org>2003-04-29 19:55:29 +0000
committerMartin Holzer <mholzer@gentoo.org>2003-04-29 19:55:29 +0000
commit342461e1838c1049b12ea2f56d917ebf0784094a (patch)
tree7cf19e8a7e507add838e43c8682a259d914447a6 /net-mail
parentminor fixes (diff)
downloadgentoo-2-342461e1838c1049b12ea2f56d917ebf0784094a.tar.gz
gentoo-2-342461e1838c1049b12ea2f56d917ebf0784094a.tar.bz2
gentoo-2-342461e1838c1049b12ea2f56d917ebf0784094a.zip
minor fixes
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/squirrelmail/Manifest2
-rw-r--r--net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild11
2 files changed, 8 insertions, 5 deletions
diff --git a/net-mail/squirrelmail/Manifest b/net-mail/squirrelmail/Manifest
index f248ed6caa4a..62d158676ce3 100644
--- a/net-mail/squirrelmail/Manifest
+++ b/net-mail/squirrelmail/Manifest
@@ -4,7 +4,7 @@ MD5 beb1087e4c12b9b88585e7177034fd10 ChangeLog 3590
MD5 1d014b56d3b519b8626774389dbd149b squirrelmail-1.2.8.ebuild 1589
MD5 4ed98c6ec965564be4311d6f63e6b108 squirrelmail-1.2.9.ebuild 1593
MD5 11ebf3c96e74affebeb697f691127a3f squirrelmail-1.4.0.ebuild 1584
-MD5 ed183aae739b0147a0c5592b1a841cec squirrelmail-1.4.0-r1.ebuild 1988
+MD5 bdb9161e71ee6c628a1e6a8453172783 squirrelmail-1.4.0-r1.ebuild 1955
MD5 666d7152216894372774217761d6eac5 files/digest-squirrelmail-1.2.10 73
MD5 8eeb77a0af1734942ad728fc29c84441 files/digest-squirrelmail-1.2.11 73
MD5 cb8452d8dad1eae871978e6b8f565ec1 files/digest-squirrelmail-1.2.8 72
diff --git a/net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild b/net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild
index b3d358d8400c..765287eaab58 100644
--- a/net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild
+++ b/net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild,v 1.1 2003/04/29 19:48:33 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.4.0-r1.ebuild,v 1.2 2003/04/29 19:55:08 mholzer Exp $
DESCRIPTION="Webmail for nuts!"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
@@ -13,9 +13,12 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
RDEPEND="virtual/php"
DEPEND="${RDEPEND}"
-HTTPD_ROOT="/home/httpd/htdocs"
-HTTPD_USER="apache"
-HTTPD_GROUP="apache"
+HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`"
+HTTPD_USER="`grep '^User' /etc/apache/conf/commonapache.conf | cut -d \ -f2`"
+HTTPD_GROUP="`grep '^Group' /etc/apache/conf/commonapache.conf | cut -d \ -f2`"
+[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
+[ -z "${HTTPD_USER}" ] && HTTPD_USER="apache"
+[ -z "${HTTPD_GROUP}" ] && HTTPD_GROUP="apache"
pkg_setup() {
if [ -L ${HTTPD_ROOT}/${PN} ] ; then