diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2003-10-01 21:13:00 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2003-10-01 21:13:00 +0000 |
commit | c3a67ae5c4d632ff4fac8ae9f298e4dfa76e9a62 (patch) | |
tree | f081c96201492c3d39e962905d48b0bb74c41a6a /dev-php/mod_php | |
parent | bump rev on ebuild for eclass changes, and move to stable (diff) | |
download | gentoo-2-c3a67ae5c4d632ff4fac8ae9f298e4dfa76e9a62.tar.gz gentoo-2-c3a67ae5c4d632ff4fac8ae9f298e4dfa76e9a62.tar.bz2 gentoo-2-c3a67ae5c4d632ff4fac8ae9f298e4dfa76e9a62.zip |
bump rev on ebuild for eclass changes, and move to stable
Diffstat (limited to 'dev-php/mod_php')
-rw-r--r-- | dev-php/mod_php/ChangeLog | 7 | ||||
-rw-r--r-- | dev-php/mod_php/Manifest | 4 | ||||
-rw-r--r-- | dev-php/mod_php/files/digest-mod_php-4.3.3-r1 | 2 | ||||
-rw-r--r-- | dev-php/mod_php/mod_php-4.3.3-r1.ebuild | 165 |
4 files changed, 175 insertions, 3 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index 7b1d3ed3b425..08f3fbf634e3 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.99 2003/08/29 16:39:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.100 2003/10/01 21:12:54 robbat2 Exp $ + +*mod_php-4.3.3-r1 (01 Oct 2003) + + 01 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.3-r1.ebuild: + bump rev on ebuild for eclass changes, and move to stable 29 Aug 2003; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest index 11811f3cada0..3078ffacbf6c 100644 --- a/dev-php/mod_php/Manifest +++ b/dev-php/mod_php/Manifest @@ -2,11 +2,11 @@ MD5 e96cf7d2eaa1f48760b1725719a6a653 mod_php-4.3.2.ebuild 3352 MD5 148116b0723c6f40424e835f0c3ecdb0 mod_php-4.3.2-r5.ebuild 5070 MD5 276186f14edf377d3381013437498995 mod_php-4.3.3_rc3.ebuild 5089 MD5 098762e16884a947aab94d4e417598c4 mod_php-4.3.2-r2.ebuild 3656 -MD5 7f3e4f2d010c27ff391bd6e7a7819930 mod_php-4.3.3-r1.ebuild 4858 +MD5 b8223b69f9ba6c14912821d2838a4b7f mod_php-4.3.3-r1.ebuild 4860 MD5 6728dfa5c738e9c5cf0491925bd8fc4a mod_php-4.3.2-r4.ebuild 4939 MD5 9c06f053871d03220ef8fbe456734663 mod_php-4.3.3.ebuild 4859 MD5 3ac28c43c7f5bbfd114c12900959cda9 mod_php-4.3.2-r1.ebuild 2720 -MD5 3564cbf78b7383c1dd95a085ec06e709 ChangeLog 20987 +MD5 ba72f71e86720e38ac540bcf397bb25f ChangeLog 21160 MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384 MD5 3e26b38544b67a53360f6e07b8fab2a1 mod_php-4.3.2-r3.ebuild 4899 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.3-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.3-r1 new file mode 100644 index 000000000000..1fecdf01d76d --- /dev/null +++ b/dev-php/mod_php/files/digest-mod_php-4.3.3-r1 @@ -0,0 +1,2 @@ +MD5 1171d96104e2ff2cff9e19789a4a1536 php-4.3.3.tar.bz2 3711877 +MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild new file mode 100644 index 000000000000..989a2e26f29a --- /dev/null +++ b/dev-php/mod_php/mod_php-4.3.3-r1.ebuild @@ -0,0 +1,165 @@ +# 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.3-r1.ebuild,v 1.1 2003/10/01 21:12:54 robbat2 Exp $ + +IUSE="${IUSE} apache2" + +DESCRIPTION="Apache module for PHP" +KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa ~arm" +EXCLUDE_DB4_FIX=1 +EXCLUDE_PEAR_FIX=1 + +detectapache() { + local domsg= + [ -n "$1" ] && domsg=1 + HAVE_APACHE1= + HAVE_APACHE2= + has_version '=net-www/apache-1*' && HAVE_APACHE1=1 + has_version '=net-www/apache-2*' && HAVE_APACHE2=1 + + [ -n "${HAVE_APACHE1}" ] && APACHEVER=1 + [ -n "${HAVE_APACHE2}" ] && APACHEVER=2 + [ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both' + + case "${APACHEVER}" in + 1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;; + 2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';; + both) + if [ "`use apache2`" ]; then + [ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)" + APACHEVER=2 + else + [ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)' + APACHEVER=1 + fi ;; + *) if [ -n "${domsg}" ]; then + MSG="Unknown Apache version!"; eerror $MSG ; die $MSG + else + APACHEVER=0 + fi; ;; + esac +} + +detectapache + +SLOT="${APACHEVER}" +[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' + +PHPSAPI="apache${APACHEVER}" + +# BIG FAT WARNING! +# the php eclass requires the PHPSAPI setting! +# In this case the PHPSAPI setting is dependant on the detectapache function +# above this point as well! +inherit php eutils + +DEPEND="${DEPEND} + >=net-www/apache-1.3.26-r2 + apache2? ( >=net-www/apache-2.0.43-r1 )" + +src_unpack() { + multiinstwarn + detectapache domsg + php_src_unpack +} + +src_compile() { + #no readline on server SAPI + myconf="${myconf} --without-readline" + + # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety + if [ -n "${USE_APACHE2}" ]; then + APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|xargs|cut -d. -f1`" + case "${APACHE2_MPM}" in + prefork) ;; + *) myconf="${myconf} --enable-experimental-zts" ;; + esac; + fi + + #use apache2 \ + myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" + + php_src_compile +} + + +src_install() { + php_src_install + einfo "Adding extra symlink to php.ini for Apache${USE_APACHE2}" + dodir /etc/apache${USE_APACHE2}/conf/ + dodir ${PHPINIDIRECTORY} + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache${USE_APACHE2}/conf/${PHPINIFILENAME} + + einfo "Adding extra symlink to Apache${USE_APACHE2} extramodules for PHP" + dosym /usr/lib/apache${USE_APACHE2}-extramodules ${PHPINIDIRECTORY}/lib + exeinto /usr/lib/apache${USE_APACHE2}-extramodules + 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 /etc/apache2/conf/modules.d + doins ${FILESDIR}/70_mod_php.conf + else + einfo "Installing a Apache config for PHP (mod_php.conf)" + insinto /etc/apache/conf/addon-modules + doins ${FILESDIR}/mod_php.conf + dosym ${PHPINIDIRECTORY}/${PHPINIFILENAME} /etc/apache/conf/addon-modules/${PHPINIFILENAME} + fi +} + +apache2msg() { + einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\"" + 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 copies of mod_php installed. Please look at the autoclean" + ewarn "output at the end of the emerge and unmerge all but relevant" + ewarn "copies." +} + +apache2fix() { + einfo "Attemping to update /etc/conf.d/apache2 automatically for the PHP/PHP4 change." + local oldfile="/etc/conf.d/apache2.old.`date +%Y%m%d%H%M%S`" + cp /etc/conf.d/apache2 ${oldfile} + sed -re 's,-D PHP\>,-D PHP4,g' ${oldfile} <${oldfile} >/etc/conf.d/apache2 +} + + +pkg_preinst() { + multiinstwarn + [ "${APACHEVER}" -eq '2' ] && apache2fix + php_pkg_preinst +} + +pkg_postinst() { + php_pkg_postinst + multiinstwarn + einfo "To have Apache run php programs, please do the following:" + if [ "`use apache2`" ] ; then + apache2msg + 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 PHP4\"" + 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/conf/apache.conf \ + extramodules/libphp4.so mod_php4.c php4_module \ + before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf + :; + fi +} |