Housekeeping

Package-Manager: portage-2.0.51.22-r2

5 files changed, 26 insertions, 14 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index f6ecc0c4fccb..4e50dbff13f1 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.111 2005/07/06 18:31:27 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.112 2005/08/21 14:55:48 rl03 Exp $
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, phpmyadmin-2.6.3_p1.ebuild:
+  Housekeeping
 
 *phpmyadmin-2.6.3_p1 (06 Jul 2005)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index abaf0ff0b3db..a3eb6cac4b43 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8a783d4dcec45df7652c1106403fbba5 phpmyadmin-2.6.3_p1.ebuild 2060
+MD5 b00bc9fe866abc51d9a85cd08b911508 phpmyadmin-2.6.3_p1.ebuild 2058
 MD5 0101bf56e2017374f01c58dec71fca8f phpmyadmin-2.6.2_rc1.ebuild 2390
 MD5 48f714785bc74b5b0ef3adb1f39421c0 phpmyadmin-2.6.2-r2.ebuild 2563
-MD5 ae8d00822c67094317c98f29209e55d7 ChangeLog 15851
+MD5 3551168fb07b59557406e2d5c18d6d42 ChangeLog 15985
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2-r2 70
 MD5 f2b2abcad19bc7efa598ba903d93b9e8 files/digest-phpmyadmin-2.6.3_p1 74
 MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
-MD5 e4c31663a88574914c487cef87c7f1d7 files/postinstall-en.txt 514
+MD5 7bdcf47ce9e20eb1520ab7aeac00877a files/postinstall-en.txt 510
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 3390cfd570ec54f3fc29ccdca0449900 files/reconfig 239
+MD5 c77590e1a3a629c248e58081d2363d5b files/reconfig 314
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCzCOYEzitwsaoONoRAnDfAKCi28NqaMI7ZuV8Za722ciD/BRsggCeLZ7l
-FtYQBgt8eiMzE3q1EVOQxxQ=
-=+q7d
+iD8DBQFDCJYIEzitwsaoONoRAowFAJ9nJgUVhtcJEx6JhGAKFKTLBye2TgCgu/Nb
+veJ5kEVykO/0YaZRcWJ065o=
+=UA98
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/postinstall-en.txt b/dev-db/phpmyadmin/files/postinstall-en.txt
index 32e06db5890c..1a77f7dc2a30 100644
--- a/dev-db/phpmyadmin/files/postinstall-en.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en.txt
@@ -5,7 +5,7 @@ To complete installation, you must
 
 If you are upgrading from an earlier version and are using phpMyAdmin's
 features for master/foreign tables be sure to read
-  http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com
+  http://${VHOST_HOSTNAME}${VHOST_APPDIR}/Documentation.html#col_com
 You will need to perform the ALTER TABLE step yourself.
 
-Finally, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/.
+Finally, point your browser to http://${VHOST_HOSTNAME}${VHOST_APPDIR}
diff --git a/dev-db/phpmyadmin/files/reconfig b/dev-db/phpmyadmin/files/reconfig
index 56998b47a1f2..675fc41f1fe2 100644
--- a/dev-db/phpmyadmin/files/reconfig
+++ b/dev-db/phpmyadmin/files/reconfig
@@ -1,8 +1,16 @@
 #!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
 if [ $1 = "install" ]; then
 	cd ${MY_INSTALLDIR}
-	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php
-		
+	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php || die "sed failed"
+
 elif [ $1 = "clean" ]; then
 	echo $1
 fi
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild
index 08331fba5e1f..ea0e487400cf 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild,v 1.1 2005/07/06 18:31:28 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.3_p1.ebuild,v 1.2 2005/08/21 14:55:48 rl03 Exp $
 
 inherit eutils webapp
 
@@ -64,6 +64,6 @@ src_install() {
 
 	fperms 0640 ${MY_HTDOCSDIR}/config.inc.php
 	fowners root:apache ${MY_HTDOCSDIR}/config.inc.php
-	# bug #88831, make sure the create script it's world-readable.
+	# bug #88831, make sure the create script is world-readable.
 	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
 }