fix support for Apache1

Package-Manager: portage-2.0.52-r1

5 files changed, 82 insertions, 57 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 5b28ccbd5db4..814a35d3555b 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.269 2005/09/19 19:56:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.270 2005/09/21 17:14:50 hollow Exp $
+
+  21 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
+  +files/4.4.0-a1/70_mod_php.conf, +files/4.4.0-a2/70_mod_php.conf,
+  mod_php-4.4.0-r3.ebuild:
+  fix support for Apache1
 
   19 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   mod_php-4.3.11-r1.ebuild, mod_php-4.4.0-r2.ebuild,
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index cbd7a192b9ac..ccb44069efa1 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,28 +1,40 @@
-MD5 872f2faa4dd9e303718d7a60e0263280 mod_php-4.4.0-r3.ebuild 7092
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 62c90a1a6f08813825cc09893edb42b3 ChangeLog 46722
 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 adf20bea2955fa8bb573026c733864b5 mod_php-4.3.11.ebuild 6196
+MD5 151698471c967f2ee266891aaebd18ea mod_php-4.4.0.ebuild 6145
 MD5 5497fe36dda29f34ea7e35780683acd8 mod_php-4.4.0-r1.ebuild 6370
-MD5 c9cae53fb1aa9adf2521e323b4326682 ChangeLog 46550
 MD5 78df12b8f0637c104e871f22783899ff mod_php-4.3.11-r1.ebuild 6932
-MD5 151698471c967f2ee266891aaebd18ea mod_php-4.4.0.ebuild 6145
 MD5 4fa68e7608c16694675eb9592f7a8438 mod_php-4.4.0-r2.ebuild 6879
-MD5 adf20bea2955fa8bb573026c733864b5 mod_php-4.3.11.ebuild 6196
+MD5 f1b52945fd850c64e60b3ffdcf01fd88 mod_php-4.4.0-r3.ebuild 5913
 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
-MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
-MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
-MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
-MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r3 362
-MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
 MD5 225b57325cbdf582288a8796da9d72f5 files/digest-mod_php-4.3.11 287
-MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
-MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
-MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285
 MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r2 362
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
+MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 ce1f1b2a1e56cf4459b2cbfdcce6b03f files/digest-mod_php-4.3.11-r1 364
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
+MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
+MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
+MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 37b9c16c4d9688ed40561a2e29955896 files/php4.3.11-pcre-security.patch 6030
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
+MD5 b048b183d4cc334d774ba478d695c055 files/php4.4.0-pcre-security.patch 6176
+MD5 ce1f1b2a1e56cf4459b2cbfdcce6b03f files/digest-mod_php-4.3.11-r1 364
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285
+MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r3 362
+MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0-a2/70_mod_php.conf 485
 MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
 MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
+MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0-a1/70_mod_php.conf 484
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMZVpmPFBzbX68WERAhb+AJwPh+j/yCvibPuj0lM+Vkzfu+1ikgCfUAz2
+OLzmrQVoZORV4Y9nu/hbz0I=
+=JuV/
+-----END PGP SIGNATURE-----
diff --git a/dev-php/mod_php/files/4.4.0-a1/70_mod_php.conf b/dev-php/mod_php/files/4.4.0-a1/70_mod_php.conf
new file mode 100644
index 000000000000..34a41d81193c
--- /dev/null
+++ b/dev-php/mod_php/files/4.4.0-a1/70_mod_php.conf
@@ -0,0 +1,19 @@
+# vim: ft=apache sw=4 ts=4
+<IfDefine PHP4>
+
+	# Load the module first
+	<IfModule !sapi_apache.c>
+		LoadModule php4_module    modules/libphp4.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddType application/x-httpd-php .php
+		AddType application/x-httpd-php .phtml
+		AddType application/x-httpd-php .php3
+		AddType application/x-httpd-php .php4
+		AddType application/x-httpd-php-source .phps
+	</IfModule>
+
+	AddDirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-php/mod_php/files/4.4.0-a2/70_mod_php.conf b/dev-php/mod_php/files/4.4.0-a2/70_mod_php.conf
new file mode 100644
index 000000000000..ce680323f6e0
--- /dev/null
+++ b/dev-php/mod_php/files/4.4.0-a2/70_mod_php.conf
@@ -0,0 +1,19 @@
+# vim: ft=apache sw=4 ts=4
+<IfDefine PHP4>
+
+	# Load the module first
+	<IfModule !sapi_apache2.c>
+		LoadModule php4_module    modules/libphp4.so
+	</IfModule>
+
+	# Set it to handle the files
+	<IfModule mod_mime.c>
+		AddType application/x-httpd-php .php
+		AddType application/x-httpd-php .phtml
+		AddType application/x-httpd-php .php3
+		AddType application/x-httpd-php .php4
+		AddType application/x-httpd-php-source .phps
+	</IfModule>
+
+	AddDirectoryIndex index.php index.phtml
+</IfDefine>
diff --git a/dev-php/mod_php/mod_php-4.4.0-r3.ebuild b/dev-php/mod_php/mod_php-4.4.0-r3.ebuild
index 70d7d5edf190..005bdfa0f284 100644
--- a/dev-php/mod_php/mod_php-4.4.0-r3.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0-r3.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-php/mod_php/mod_php-4.4.0-r3.ebuild,v 1.5 2005/09/19 19:56:16 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r3.ebuild,v 1.6 2005/09/21 17:14:50 hollow Exp $
 
 IUSE="apache2"
 
@@ -126,6 +126,7 @@ src_compile() {
 		einfo "Apache2 MPM: ${APACHE2_MPM}"
 		case "${APACHE2_MPM}" in
 			*prefork*) ;;
+			*peruser*) ;;
 			*) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;;
 		esac;
 	fi
@@ -143,40 +144,27 @@ src_install() {
 	PHP_INSTALLTARGETS="install"
 	php-sapi_src_install
 
-	einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}"
 	dodir ${APACHE_CONFDIR}
 	dodir ${PHPINIDIRECTORY}
-	dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE_CONFDIR}/${PHPINIFILENAME}
 
 	einfo "Cleaning up a little"
 	rm -rf ${D}${APACHE_MODULESDIR}/libphp4.so
 
-	einfo "Adding symlink to Apache${USE_APACHE2} modules for PHP"
-	dosym ${APACHE_MODULESDIR} ${PHPINIDIRECTORY}/lib
 	exeinto ${APACHE_MODULESDIR}
-
 	einfo "Installing mod_php shared object now"
 	doexe .libs/libphp4.so
 
 	if [ -n "${USE_APACHE2}" ] ; then
 		einfo "Installing a Apache2 config for PHP (70_mod_php.conf)"
 		insinto ${APACHE2_MODULES_CONFDIR}
-		doins "${FILESDIR}/4.3.11-r2/70_mod_php.conf"
+		doins ${FILESDIR}/4.4.0-a2/70_mod_php.conf
 	else
-		einfo "Installing a Apache config for PHP (mod_php.conf)"
+		einfo "Installing a Apache config for PHP (70_mod_php.conf)"
 		insinto ${APACHE1_MODULES_CONFDIR}
-		doins ${FILESDIR}/mod_php.conf
-		dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} ${APACHE1_MODULES_CONFDIR}/${PHPINIFILENAME}
+		doins ${FILESDIR}/4.4.0-a1/70_mod_php.conf
 	fi
 }
 
-apache2msg() {
-	einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\" to APACHE2_OPTS"
-	ewarn "This is a CHANGE from previous behavior, which was \"-D PHP\""
-	ewarn "This is for the upcoming PHP5 support. The ebuild will attempt"
-	ewarn "to make this update between PHP and PHP4 automatically"
-}
-
 multiinstwarn() {
 	ewarn "Due to some previous bloopers with PHP and slotting, you may have"
 	ewarn "multiple instances of mod_php installed. Please look at the autoclean"
@@ -203,27 +191,9 @@ pkg_preinst() {
 pkg_postinst() {
 	php-sapi_pkg_postinst
 	multiinstwarn
-	einfo "To have Apache run php programs, please do the following:"
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-		einfo "2. Edit /etc/conf.d/apache and add \"-D PHP4\" to APACHE_OPTS"
-		einfo "That will include the php mime types in your configuration"
-		einfo "automagically and setup Apache to load php when it starts."
-	fi
-}
-
-pkg_config() {
-	multiinstwarn
-	if [ -n "${USE_APACHE2}" ]; then
-		apache2msg
-	else
-		${ROOT}/usr/sbin/apacheaddmod \
-			${ROOT}/etc/apache/apache.conf \
-			modules/libphp4.so mod_php4.c php4_module \
-			before=perl define=PHP4 addconf=addon-modules/mod_php.conf
-			:;
-	fi
+	APACHE1_MOD_DEFINE="PHP4"
+	APACHE1_MOD_CONF="70_mod_php.conf"
+	APACHE2_MOD_DEFINE="PHP4"
+	APACHE2_MOD_CONF="70_mod_php.conf"
+	apache-module_pkg_postinst
 }