replaced hardcoding of apache path

4 files changed, 28 insertions, 34 deletions

diff --git a/net-mail/squirrelmail/ChangeLog b/net-mail/squirrelmail/ChangeLog
index 41897f950645..63f6e8186c43 100644
--- a/net-mail/squirrelmail/ChangeLog
+++ b/net-mail/squirrelmail/ChangeLog
@@ -1,14 +1,20 @@
 # ChangeLog for net-mail/squirrelmail
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/ChangeLog,v 1.9 2002/11/12 14:02:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/ChangeLog,v 1.10 2002/11/15 01:15:48 vapier Exp $
 
 *squirrelmail-1.2.9 (12 Nov 2002)
 
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
   12 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Version bump.
 
 *squirrelmail-1.2.8 (20 Sep 2002)
 
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
   20 Sep 2002; Nick Hadaway <raker@gentoo.org>
   squirrelmail-1.2.8.ebuild, files/digest-squirrelmail-1.2.8 :
   Version bump.  register_globals now no longer has to be turned on!
@@ -16,6 +22,9 @@
 
 *squirrelmail-1.2.7 (08 Jul 2002)
 
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
   15 Jul 2002; Ryan Phillips <rphillips@gentoo.org> :
   Updated for new dev-php/ tree
 
diff --git a/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild b/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild
index a16b75aea3a2..de56b91858a6 100644
--- a/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild
+++ b/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild,v 1.8 2002/10/04 06:09:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.7.ebuild,v 1.9 2002/11/15 01:15:48 vapier Exp $
 
-S=${WORKDIR}/${P}
-HTTPD_ROOT="/home/httpd/htdocs"
+HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
 HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
 DESCRIPTION="Webmail for nuts!"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/squirrelmail/${P}.tar.bz2"
-HOMEPAGE="http://www.squirrelmail.org"
+SRC_URI="mirror://sourceforge/squirrelmail/${P}.tar.bz2"
+HOMEPAGE="http://www.squirrelmail.org/"
+
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="x86 ppc sparc sparc64"
@@ -17,7 +18,6 @@ KEYWORDS="x86 ppc sparc sparc64"
 RDEPEND="virtual/php"
 DEPEND="${RDEPEND}"
 
-
 pkg_setup() {
 	if [ -L ${HTTPD_ROOT}/squirrelmail ] ; then
 		ewarn "You need to unmerge your old SquirrelMail version first."
@@ -27,12 +27,7 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
-	#nothing to compile
-	echo "Nothing to compile"
-}
-
-src_install () {
+src_install() {
 	dodir ${HTTPD_ROOT}/squirrelmail
 	cp -r . ${D}/${HTTPD_ROOT}/squirrelmail
 	cd ${D}/${HTTPD_ROOT}
diff --git a/net-mail/squirrelmail/squirrelmail-1.2.8.ebuild b/net-mail/squirrelmail/squirrelmail-1.2.8.ebuild
index d37a6786bb48..c668d9f0abea 100644
--- a/net-mail/squirrelmail/squirrelmail-1.2.8.ebuild
+++ b/net-mail/squirrelmail/squirrelmail-1.2.8.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.8.ebuild,v 1.2 2002/10/04 06:09:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.8.ebuild,v 1.3 2002/11/15 01:15:48 vapier Exp $
 
-S=${WORKDIR}/${P}
-HTTPD_ROOT="/home/httpd/htdocs"
+HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
 HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
 DESCRIPTION="Webmail for nuts!"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/squirrelmail/${P}.tar.bz2"
-HOMEPAGE="http://www.squirrelmail.org"
+SRC_URI="mirror://sourceforge/squirrelmail/${P}.tar.bz2"
+HOMEPAGE="http://www.squirrelmail.org/"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -28,12 +28,7 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
-	#nothing to compile
-	echo "Nothing to compile"
-}
-
-src_install () {
+src_install() {
 	dodir ${HTTPD_ROOT}/squirrelmail
 	cp -r . ${D}/${HTTPD_ROOT}/squirrelmail
 	cd ${D}/${HTTPD_ROOT}
diff --git a/net-mail/squirrelmail/squirrelmail-1.2.9.ebuild b/net-mail/squirrelmail/squirrelmail-1.2.9.ebuild
index fa279537842a..d3ab5e1ae874 100644
--- a/net-mail/squirrelmail/squirrelmail-1.2.9.ebuild
+++ b/net-mail/squirrelmail/squirrelmail-1.2.9.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.9.ebuild,v 1.1 2002/11/12 14:02:09 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/squirrelmail/squirrelmail-1.2.9.ebuild,v 1.2 2002/11/15 01:15:48 vapier Exp $
 
-S=${WORKDIR}/${P}
-HTTPD_ROOT="/home/httpd/htdocs"
+HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
 HTTPD_USER="apache"
 HTTPD_GROUP="apache"
 
 DESCRIPTION="Webmail for nuts!"
 SRC_URI="mirror://sourceforge/squirrelmail/${P}.tar.bz2"
-HOMEPAGE="http://www.squirrelmail.org"
+HOMEPAGE="http://www.squirrelmail.org/"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -27,12 +27,7 @@ pkg_setup() {
 	fi
 }
 
-src_compile() {
-	#nothing to compile
-	echo "Nothing to compile"
-}
-
-src_install () {
+src_install() {
 	dodir ${HTTPD_ROOT}/squirrelmail
 	cp -r . ${D}/${HTTPD_ROOT}/squirrelmail
 	cd ${D}/${HTTPD_ROOT}