diff options
| author |   Tom William Payne <twp@gentoo.org> | 2003-05-09 11:16:15 +0000 |
|---|---|---|
| committer | Tom William Payne <twp@gentoo.org> | 2003-05-09 11:16:15 +0000 |
| commit | 6912d7d062007055e9b90dffa7693a0f711c03d7 (patch) | |
| tree | faf51ef7e19cb75937b770ec0cdf7f742f3081ba /dev-db | |
| parent | Attempt to fix bug # 20642 (diff) | |
| download | gentoo-2-6912d7d062007055e9b90dffa7693a0f711c03d7.tar.gz gentoo-2-6912d7d062007055e9b90dffa7693a0f711c03d7.tar.bz2 gentoo-2-6912d7d062007055e9b90dffa7693a0f711c03d7.zip | |
Attempt to fix bug # 20642
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/phpmyadmin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/Manifest | 4 | ||||
| -rw-r--r-- | dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild | 37 |
3 files changed, 29 insertions, 18 deletions
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog index 471276b863e2..6d82448c688f 100644 --- a/dev-db/phpmyadmin/ChangeLog +++ b/dev-db/phpmyadmin/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for dev-db/phpmyadmin # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.17 2003/04/09 10:04:04 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.18 2003/05/09 11:15:40 twp Exp $ *phpmyadmin-2.4.0 (08 Apr 2003) + 09 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild : + + Allow user to override document root with DOCUMENT_ROOT env var. Bug # 20642. + 09 Apr 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild : Dynamically determine DocumentRoot. No bump to ebuild revision number since diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index ca648bf1a4e5..49206401297a 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,7 +1,7 @@ -MD5 96b7c2c11530fb4270eafa9cf9d91c90 ChangeLog 3661 +MD5 033d6df9ae45f601744e939b151c9731 ChangeLog 3661 MD5 50116d5aa339dbdbfdec14a907416b36 phpmyadmin-2.3.2-r1.ebuild 1608 MD5 d89ed894f4f2efad6e88ddcc1bbe4944 phpmyadmin-2.3.3.ebuild 2186 -MD5 a8e7e740f9226d8f1c493a7e638f054c phpmyadmin-2.4.0.ebuild 2743 +MD5 30a48c6ee4a252dd84cf473aedb646fa phpmyadmin-2.4.0.ebuild 2743 MD5 0ee9b66e7a73593103df05d91d31dc8d files/digest-phpmyadmin-2.3.2-r1 73 MD5 fedff25cf01133c5bb8efd8d7f9da56e files/digest-phpmyadmin-2.3.3 76 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857 diff --git a/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild index 5d64b19bb85f..3155b4c92267 100644 --- a/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-2.4.0.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/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild,v 1.3 2003/05/06 10:24:13 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.4.0.ebuild,v 1.4 2003/05/09 11:15:40 twp Exp $ inherit eutils @@ -18,9 +18,6 @@ KEYWORDS="x86 sparc ppc alpha" DEPEND=">=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38 >=dev-php/mod_php-4.1.2-r5" -# FIX- Plz check if path of config file (/etc/apache2/conf/apache2.conf) -# is correct because i'm not using apache2 now, thanx - Quequero - src_unpack() { unpack ${A} epatch ${FILESDIR}/phpmyadmin-config.patch @@ -34,27 +31,37 @@ src_compile() { } src_install () { - cd ${S} - - local DocumentRoot="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" - [ -z "${DocumentRoot}" ] && DocumentRoot="/home/httpd/htdocs" - insinto ${DocumentRoot}/phpmyadmin + # Attempt to guess DocumentRoot (bug # 20642) + # 1. Use DOCUMENT_ROOT env var if set + # 2. Grep apache.conf/apache2.conf as appropriate + # 3. Fallback on /home/httpd/htdocs + if [ -z "${DOCUMENT_ROOT}" ]; then + if [ "`use apache2`" ]; then + DOCUMENT_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache2.conf | cut -d\ -f2`" + else + DOCUMENT_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`" + fi + fi + einfo "DOCUMENT_ROOT=${DOCUMENT_ROOT}" + [ -z "${DOCUMENT_ROOT}" ] && DOCUMENT_ROOT="/home/httpd/htdocs" + + insinto ${DOCUMENT_ROOT}/phpmyadmin doins *.{php,html} ChangeLog - insinto ${DocumentRoot}/phpmyadmin/images + insinto ${DOCUMENT_ROOT}/phpmyadmin/images doins images/*.{gif,png} - insinto ${DocumentRoot}/phpmyadmin/scripts + insinto ${DOCUMENT_ROOT}/phpmyadmin/scripts doins scripts/*.sh - insinto ${DocumentRoot}/phpmyadmin/lang + insinto ${DOCUMENT_ROOT}/phpmyadmin/lang doins lang/*.{php,sh} - insinto ${DocumentRoot}/phpmyadmin/libraries + insinto ${DOCUMENT_ROOT}/phpmyadmin/libraries doins libraries/*.{php,js} - insinto ${DocumentRoot}/phpmyadmin/libraries/auth + insinto ${DOCUMENT_ROOT}/phpmyadmin/libraries/auth doins libraries/auth/*.php dodoc ANNOUNCE.txt CREDITS ChangeLog TODO Documentation.{txt,html} \ @@ -63,7 +70,7 @@ src_install () { insinto /etc/phpmyadmin doins config.inc.php mysql-setup.sql - dosym /etc/phpmyadmin/config.inc.php ${DocumentRoot}/phpmyadmin/config.inc.php + dosym /etc/phpmyadmin/config.inc.php ${DOCUMENT_ROOT}/phpmyadmin/config.inc.php } |