fixed bugs #20603 & #15622

5 files changed, 23 insertions, 11 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 96b5a8116718..af44bf2d4d68 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.60 2003/04/24 13:35:10 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.61 2003/05/08 05:15:38 heim Exp $
 
 *mod_php-4.3.1-r3 (23 Apr 2003)
-
+ 
   24 Apr 2003; Tal Peer <coredumb@gentoo.org> mod_php-4.3.1-r2.ebuild,
   mod_php-4.3.1-r3.ebuild:
   Fixed bug #18551
@@ -14,6 +14,9 @@
 
 *mod_php-4.3.1-r2 (21 Apr 2003)
 
+  08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r2.ebuild: 
+  Fixed bug #20603, #15622
+
   22 Apr 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r2.ebuild:
   Re-added -r2 (Mar 02 copy had been deleted).  Fixed world readable files bug by patching pear/PEAR/Config.php (bug# 16325)
 
@@ -24,6 +27,9 @@
 
 *mod_php-4.3.1-r1 (24 Feb 2003)
 
+  08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1-r1.ebuild: 
+  Fixed bug #20603
+
   17 Mar 2003; Masatomo Nakano <nakano@gentoo.org> mod_php-4.3.1-r1.ebuild,
     mod_php-4.3.1.ebuild:
   Fixed bug #16910
@@ -41,6 +47,9 @@
 
 *mod_php-4.3.1 (18 Feb 2003)
 
+  08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.1.ebuild: 
+  Fixed bug #20603
+
   25 Feb 2003; Guy Martin <gmsoft@gentoo.org> mod_php-4.3.1.ebuild :
   Added hppa to keywords.
 
@@ -52,6 +61,9 @@
 
 *mod_php-4.3.0-r2 (10 Jan 2003)
 
+  08 May 2003; Todd Heim <heim@gentoo.org> mod_php-4.3.0-r2.ebuild: 
+  Fixed bug #20603
+
   07 Feb 2003; Ryan Phillips <rphillips@gentoo.org> mod_php-4.3.0-r2.ebuild :
   Fix bug #15277, #14067, #14068, #14330, #14364
 
diff --git a/dev-php/mod_php/mod_php-4.3.0-r2.ebuild b/dev-php/mod_php/mod_php-4.3.0-r2.ebuild
index 4f5891bb4d5b..9299d7c6b596 100644
--- a/dev-php/mod_php/mod_php-4.3.0-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.0-r2.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-php/mod_php/mod_php-4.3.0-r2.ebuild,v 1.10 2003/03/09 02:33:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.0-r2.ebuild,v 1.11 2003/05/08 05:15:38 heim Exp $
 
 inherit flag-o-matic 
 
@@ -272,7 +272,7 @@ pkg_postinst() {
 	else
 		einfo "1. Execute the command:"
 		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
-		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\""
 		einfo
 		einfo "That will include the php mime types in your configuration"
 		einfo "automagically and setup Apache to load php when it starts."
diff --git a/dev-php/mod_php/mod_php-4.3.1-r1.ebuild b/dev-php/mod_php/mod_php-4.3.1-r1.ebuild
index 723c8f34f657..dc4bb18976ce 100644
--- a/dev-php/mod_php/mod_php-4.3.1-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.1-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/dev-php/mod_php/mod_php-4.3.1-r1.ebuild,v 1.11 2003/03/17 03:14:17 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r1.ebuild,v 1.12 2003/05/08 05:15:38 heim Exp $
 
 inherit flag-o-matic 
 
@@ -276,7 +276,7 @@ pkg_postinst() {
 	else
 		einfo "1. Execute the command:"
 		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
-		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\""
 		einfo
 		einfo "That will include the php mime types in your configuration"
 		einfo "automagically and setup Apache to load php when it starts."
diff --git a/dev-php/mod_php/mod_php-4.3.1-r2.ebuild b/dev-php/mod_php/mod_php-4.3.1-r2.ebuild
index 66ad33c3c4ba..dc4d0a7b2933 100644
--- a/dev-php/mod_php/mod_php-4.3.1-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.1-r2.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-php/mod_php/mod_php-4.3.1-r2.ebuild,v 1.4 2003/04/24 13:35:10 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r2.ebuild,v 1.5 2003/05/08 05:15:38 heim Exp $
 
 inherit flag-o-matic 
 
@@ -252,8 +252,8 @@ src_install() {
 
     #revert Pear patch
     rm ${D}/usr/lib/php/PEAR/Registry.php
-    mv ${S}/pear/PEAR/Registry.old ${D}/usr/lib/php/PEAR/Registry.php
-
+#    mv ${S}/pear/PEAR/Registry.old ${D}/usr/lib/php/PEAR/Registry.php
+    cat ${S}/pear/PEAR/Registry.old | sed -e 's:${PORTAGE_TMPDIR}/${PF}::' > ${D}/usr/lib/php/PEAR/Registry.php
 	if [ "`use apache2`" ] ; then
 		exeinto /usr/lib/apache2-extramodules
 		doexe .libs/libphp4.so
diff --git a/dev-php/mod_php/mod_php-4.3.1.ebuild b/dev-php/mod_php/mod_php-4.3.1.ebuild
index 74058f6bfeec..b1596d98a18c 100644
--- a/dev-php/mod_php/mod_php-4.3.1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.1.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-php/mod_php/mod_php-4.3.1.ebuild,v 1.9 2003/03/17 03:25:11 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1.ebuild,v 1.10 2003/05/08 05:15:38 heim Exp $
 
 inherit flag-o-matic 
 
@@ -270,7 +270,7 @@ pkg_postinst() {
 	else
 		einfo "1. Execute the command:"
 		einfo " \"ebuild /var/db/pkg/dev-php/${PF}/${PF}.ebuild config\""
-		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP\""
+		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\""
 		einfo
 		einfo "That will include the php mime types in your configuration"
 		einfo "automagically and setup Apache to load php when it starts."