replaced hardcoding of apache path

5 files changed, 79 insertions, 51 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 80dbb29fd970..2e4498a956e5 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,33 +1,45 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.5 2002/10/28 20:24:51 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.6 2002/11/14 18:54:26 vapier Exp $
 
 *phpmyadmin-2.3.2 (28 Aug 2002)
 
-  28 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New version.
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  28 Aug 2002; Maik Schreiber <blizzy@gentoo.org> :
+  New version.
 
 *phpmyadmin-2.3.0 (18 Aug 2002)
 
-  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> : New version
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
 
-*phpmyadmin-2.2.6 (27 Apr 2002)
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> :
+  New version
 
-  16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> : Repoman fixes
+*phpmyadmin-2.2.6 (27 Apr 2002)
 
-*phpmyadmin-2.2.5 (27 Apr 2002)
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
 
-  27 Apr 2002; Donny Davies <woodchip@gentoo.org> : Re-added this package back
-  without the CAPS in the name.
+  16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Repoman fixes
 
 *phpmyadmin-2.2.5 (10 Apr 2002)
 
-  10 Apr 2002; Donny Davies <woodchip@gentoo.org> : Updated to latest release
-  and fixed to match the new apache layout.
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  27 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  Re-added this package back without the CAPS in the name.
+
+  10 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  Updated to latest release and fixed to match the new apache layout.
 
 *phpmyadmin-2.2.0 (01 Feb 2002)
 
   01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.2.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.2.5.ebuild
index b1bb738541ce..684d01cafcac 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.2.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.2.5.ebuild,v 1.5 2002/10/04 05:09:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.2.5.ebuild,v 1.6 2002/11/14 18:54:26 vapier Exp $
 
 MY_PN=phpMyAdmin
 
@@ -8,32 +8,36 @@ S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Web-based administration for MySQL database in php"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-php.tar.bz2"
 HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 virtual/php"
-
 # only known to work on x86... can people test on other platforms?
 KEYWORDS="x86"
 
+DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 virtual/php"
+
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
+
 src_compile() { :; }
 
 src_install () {
-	insinto /home/httpd/htdocs/phpmyadmin
+	insinto ${APACHE_ROOT}/phpmyadmin
 	doins *.{php,html}
 
-	insinto /home/httpd/htdocs/phpmyadmin/images
+	insinto ${APACHE_ROOT}/phpmyadmin/images
 	doins images/*.{gif,png}
 
-	insinto /home/httpd/htdocs/phpmyadmin/scripts
+	insinto ${APACHE_ROOT}/phpmyadmin/scripts
 	doins scripts/*.sh
 
-	insinto /home/httpd/htdocs/phpmyadmin/lang
+	insinto ${APACHE_ROOT}/phpmyadmin/lang
 	doins lang/*.{php,sh}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries
 	doins libraries/*.{php,js}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries/auth
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries/auth
 	doins libraries/auth/*.php
 
 	dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \
@@ -42,6 +46,6 @@ src_install () {
 
 pkg_postinst() {
 	einfo
-	einfo "Make sure you edit /home/httpd/htdocs/phpmyadmin/config.inc.php"
+	einfo "Make sure you edit ${APACHE_ROOT}/phpmyadmin/config.inc.php"
 	einfo
 }
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.2.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.2.6.ebuild
index 65aade531f2a..d3322172faf5 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.2.6.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.2.6.ebuild,v 1.6 2002/10/04 05:09:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.2.6.ebuild,v 1.7 2002/11/14 18:54:26 vapier Exp $
 
 MY_PN=phpMyAdmin
 
@@ -8,32 +8,36 @@ S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Web-based administration for MySQL database in php"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-php.tar.bz2"
 HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5"
-
 # only known to work on x86... can people test on other platforms?
 KEYWORDS="x86"
 
+DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5"
+
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
+
 src_compile() { :; }
 
 src_install () {
-	insinto /home/httpd/htdocs/phpmyadmin
+	insinto ${APACHE_ROOT}/phpmyadmin
 	doins *.{php,html}
 
-	insinto /home/httpd/htdocs/phpmyadmin/images
+	insinto ${APACHE_ROOT}/phpmyadmin/images
 	doins images/*.{gif,png}
 
-	insinto /home/httpd/htdocs/phpmyadmin/scripts
+	insinto ${APACHE_ROOT}/phpmyadmin/scripts
 	doins scripts/*.sh
 
-	insinto /home/httpd/htdocs/phpmyadmin/lang
+	insinto ${APACHE_ROOT}/phpmyadmin/lang
 	doins lang/*.{php,sh}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries
 	doins libraries/*.{php,js}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries/auth
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries/auth
 	doins libraries/auth/*.php
 
 	dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \
@@ -42,6 +46,6 @@ src_install () {
 
 pkg_postinst() {
 	einfo
-	einfo "Make sure you edit /home/httpd/htdocs/phpmyadmin/config.inc.php"
+	einfo "Make sure you edit ${APACHE_ROOT}/phpmyadmin/config.inc.php"
 	einfo
 }
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.3.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.3.0.ebuild
index e56f77f506bf..b47eff34ec3c 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.3.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.3.0.ebuild,v 1.2 2002/10/04 05:09:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.3.0.ebuild,v 1.3 2002/11/14 18:54:26 vapier Exp $
 
 MY_PN=phpMyAdmin
 
@@ -8,32 +8,36 @@ S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Web-based administration for MySQL database in php"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-php.tar.bz2"
 HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5"
-
 # only known to work on x86... can people test on other platforms?
 KEYWORDS="x86"
 
+DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5"
+
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
+
 src_compile() { :; }
 
 src_install () {
-	insinto /home/httpd/htdocs/phpmyadmin
+	insinto ${APACHE_ROOT}/phpmyadmin
 	doins *.{php,html}
 
-	insinto /home/httpd/htdocs/phpmyadmin/images
+	insinto ${APACHE_ROOT}/phpmyadmin/images
 	doins images/*.{gif,png}
 
-	insinto /home/httpd/htdocs/phpmyadmin/scripts
+	insinto ${APACHE_ROOT}/phpmyadmin/scripts
 	doins scripts/*.sh
 
-	insinto /home/httpd/htdocs/phpmyadmin/lang
+	insinto ${APACHE_ROOT}/phpmyadmin/lang
 	doins lang/*.{php,sh}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries
 	doins libraries/*.{php,js}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries/auth
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries/auth
 	doins libraries/auth/*.php
 
 	dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \
@@ -42,6 +46,6 @@ src_install () {
 
 pkg_postinst() {
 	einfo
-	einfo "Make sure you edit /home/httpd/htdocs/phpmyadmin/config.inc.php"
+	einfo "Make sure you edit ${APACHE_ROOT}/phpmyadmin/config.inc.php"
 	einfo
 }
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.3.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.3.2.ebuild
index c3c4761b7842..d83794515b07 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.3.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.3.2.ebuild,v 1.1 2002/10/28 20:24:51 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.3.2.ebuild,v 1.2 2002/11/14 18:54:26 vapier Exp $
 
 MY_PN=phpMyAdmin
 
@@ -8,32 +8,36 @@ S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Web-based administration for MySQL database in php"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-php.tar.bz2"
 HOMEPAGE="http://phpmyadmin.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5"
-
 # only known to work on x86... can people test on other platforms?
 KEYWORDS="x86"
 
+DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5"
+
+APACHE_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\  -f2`"
+[ -z "${APACHE_ROOT}" ] && APACHE_ROOT="/home/httpd/htdocs"
+
 src_compile() { :; }
 
 src_install () {
-	insinto /home/httpd/htdocs/phpmyadmin
+	insinto ${APACHE_ROOT}/phpmyadmin
 	doins *.{php,html}
 
-	insinto /home/httpd/htdocs/phpmyadmin/images
+	insinto ${APACHE_ROOT}/phpmyadmin/images
 	doins images/*.{gif,png}
 
-	insinto /home/httpd/htdocs/phpmyadmin/scripts
+	insinto ${APACHE_ROOT}/phpmyadmin/scripts
 	doins scripts/*.sh
 
-	insinto /home/httpd/htdocs/phpmyadmin/lang
+	insinto ${APACHE_ROOT}/phpmyadmin/lang
 	doins lang/*.{php,sh}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries
 	doins libraries/*.{php,js}
 
-	insinto /home/httpd/htdocs/phpmyadmin/libraries/auth
+	insinto ${APACHE_ROOT}/phpmyadmin/libraries/auth
 	doins libraries/auth/*.php
 
 	dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \
@@ -42,6 +46,6 @@ src_install () {
 
 pkg_postinst() {
 	einfo
-	einfo "Make sure you edit /home/httpd/htdocs/phpmyadmin/config.inc.php"
+	einfo "Make sure you edit ${APACHE_ROOT}/phpmyadmin/config.inc.php"
 	einfo
 }