diff options
33 files changed, 15 insertions, 2410 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog index edaa5fa6d4ec..53dce7fc88d7 100644 --- a/dev-php/mod_php/ChangeLog +++ b/dev-php/mod_php/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-php/mod_php # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.133 2004/03/31 13:21:34 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.134 2004/04/01 06:30:30 robbat2 Exp $ + + 31 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild, + mod_php-4.3.2-r2.ebuild, mod_php-4.3.2-r3.ebuild, mod_php-4.3.2-r4.ebuild, + mod_php-4.3.2-r5.ebuild, mod_php-4.3.2.ebuild, mod_php-4.3.3-r1.ebuild, + mod_php-4.3.3-r2.ebuild, mod_php-4.3.3-r3.ebuild, mod_php-4.3.3.ebuild, + mod_php-4.3.3_rc3.ebuild, mod_php-4.3.4-r1.ebuild, mod_php-4.3.4-r2.ebuild, + mod_php-4.3.4-r3.ebuild, mod_php-4.3.4-r4.ebuild, mod_php-4.3.4.ebuild, + mod_php-4.3.5.ebuild: + remove all old php ebuilds before 4.3.4-r4. fix bug #46309. 31 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> mod_php-4.3.5.ebuild: Fixed amd64 patch, closing #46260. diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2 b/dev-php/mod_php/files/digest-mod_php-4.3.2 deleted file mode 100644 index b16a849236e0..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r1 deleted file mode 100644 index b16a849236e0..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.2-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r2 deleted file mode 100644 index b16a849236e0..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.2-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r3 deleted file mode 100644 index b16a849236e0..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.2-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r4 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r4 deleted file mode 100644 index b16a849236e0..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.2-r4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.2-r5 b/dev-php/mod_php/files/digest-mod_php-4.3.2-r5 deleted file mode 100644 index b16a849236e0..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.2-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.3 b/dev-php/mod_php/files/digest-mod_php-4.3.3 deleted file mode 100644 index 1fecdf01d76d..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.3 +++ /dev/null @@ -1,2 +0,0 @@ -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/files/digest-mod_php-4.3.3-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.3-r1 deleted file mode 100644 index 1fecdf01d76d..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.3-r1 +++ /dev/null @@ -1,2 +0,0 @@ -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/files/digest-mod_php-4.3.3-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.3-r2 deleted file mode 100644 index 1fecdf01d76d..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.3-r2 +++ /dev/null @@ -1,2 +0,0 @@ -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/files/digest-mod_php-4.3.3-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.3-r3 deleted file mode 100644 index 1fecdf01d76d..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.3-r3 +++ /dev/null @@ -1,2 +0,0 @@ -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/files/digest-mod_php-4.3.3_rc3 b/dev-php/mod_php/files/digest-mod_php-4.3.3_rc3 deleted file mode 100644 index d1f9a616375f..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.3_rc3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 3dd83add4dbcd5233b32cffda7732b7b php-4.3.3RC3.tar.bz2 3709389 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4 b/dev-php/mod_php/files/digest-mod_php-4.3.4 deleted file mode 100644 index 2f7602289366..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 -MD5 a5dd907ca0aed4ba38c79181d407cbff php-4.3.4-phpizeexecfix.patch 386 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r1 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r1 deleted file mode 100644 index d65ce9576341..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.4-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r2 deleted file mode 100644 index d65ce9576341..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.4-r2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.4-r3 b/dev-php/mod_php/files/digest-mod_php-4.3.4-r3 deleted file mode 100644 index d65ce9576341..000000000000 --- a/dev-php/mod_php/files/digest-mod_php-4.3.4-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b9dd601863e08e52e3c4d5e02c2627cf php-4.3.4.tar.bz2 3774324 -MD5 912ff94309b762563d0542db5187315f php-4.3.2-fopen-url-secure.patch 416 diff --git a/dev-php/mod_php/mod_php-4.3.2-r1.ebuild b/dev-php/mod_php/mod_php-4.3.2-r1.ebuild deleted file mode 100644 index b8b68972f1d1..000000000000 --- a/dev-php/mod_php/mod_php-4.3.2-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2004 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.2-r1.ebuild,v 1.8 2004/01/08 06:33:45 robbat2 Exp $ - -use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1" -inherit php eutils - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa" -EXCLUDE_DB4_FIX=1 -EXCLUDE_PEAR_FIX=1 - -DEPEND="${DEPEND} - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 ) " - -APACHEVER='1' -use apache2 && APACHEVER='2' -SLOT="${APACHEVER}" -[ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - php_src_compile -} - - -src_install() { - php_src_install - - cp php.ini-dist php.ini - insinto /etc/php4 - doins php.ini - dosym /etc/php4/php.ini /etc/apache${USE_APACHE2}/conf/php.ini - - dosym /usr/lib/apache${USE_APACHE2}-extramodules /etc/php4/lib - exeinto /usr/lib/apache${USE_APACHE2}-extramodules - doexe .libs/libphp4.so - - if [ -n "${USE_APACHE2}" ] ; then - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php.conf - else - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php.conf - dosym /etc/php4/php.ini /etc/apache/conf/addon-modules/php.ini - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP\"" -} - -pkg_postinst() { - 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 PHP\"" - 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() { - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild deleted file mode 100644 index 000023a5c595..000000000000 --- a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2004 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.2-r2.ebuild,v 1.11 2004/01/08 06:33:45 robbat2 Exp $ - -use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1" -inherit php eutils - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa" -EXCLUDE_DB4_FIX=1 -EXCLUDE_PEAR_FIX=1 - -DEPEND="${DEPEND} - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 ) " - - -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='' - -src_unpack() { - 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - php_src_compile -} - - -src_install() { - php_src_install - - cp php.ini-dist php.ini - insinto /etc/php4 - doins php.ini - dosym /etc/php4/php.ini /etc/apache${USE_APACHE2}/conf/php.ini - - dosym /usr/lib/apache${USE_APACHE2}-extramodules /etc/php4/lib - exeinto /usr/lib/apache${USE_APACHE2}-extramodules - doexe .libs/libphp4.so - - if [ -n "${USE_APACHE2}" ] ; then - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php.conf - else - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php.conf - dosym /etc/php4/php.ini /etc/apache/conf/addon-modules/php.ini - fi -} - -apache2msg() { - einfo "Edit /etc/conf.d/apache2 and add \"-D PHP\"" -} - -pkg_postinst() { - php_pkg_postinst - 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 PHP\"" - 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() { - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.2-r3.ebuild b/dev-php/mod_php/mod_php-4.3.2-r3.ebuild deleted file mode 100644 index 020ce1508522..000000000000 --- a/dev-php/mod_php/mod_php-4.3.2-r3.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2004 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.2-r3.ebuild,v 1.10 2004/01/08 06:33:45 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa" -EXCLUDE_DB4_FIX=1 -EXCLUDE_PEAR_FIX=1 - -DEPEND="${DEPEND} - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 ) " - -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}" - -inherit php eutils - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.2-r4.ebuild b/dev-php/mod_php/mod_php-4.3.2-r4.ebuild deleted file mode 100644 index c89ba094e31a..000000000000 --- a/dev-php/mod_php/mod_php-4.3.2-r4.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2004 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.2-r4.ebuild,v 1.8 2004/01/08 06:33:45 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 sparc ~ppc ~alpha hppa" -EXCLUDE_DB4_FIX=1 -EXCLUDE_PEAR_FIX=1 - -DEPEND="${DEPEND} - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 ) " - -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}" - -inherit php eutils - -src_unpack() { - php_securityupgrade - 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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - 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 - php_securityupgrade - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild b/dev-php/mod_php/mod_php-4.3.2-r5.ebuild deleted file mode 100644 index 05d126fbfdb7..000000000000 --- a/dev-php/mod_php/mod_php-4.3.2-r5.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2004 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.2-r5.ebuild,v 1.8 2004/01/08 06:33:45 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa" -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.2.ebuild b/dev-php/mod_php/mod_php-4.3.2.ebuild deleted file mode 100644 index b33b8b5fa6a2..000000000000 --- a/dev-php/mod_php/mod_php-4.3.2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2004 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.2.ebuild,v 1.12 2004/01/08 06:33:45 robbat2 Exp $ - -use apache2 && PHPSAPI="apache2" || PHPSAPI="apache1" -inherit php eutils - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 sparc ppc alpha hppa" -SLOT="0" -EXCLUDE_DB4_FIX=1 -EXCLUDE_PEAR_FIX=1 - -DEPEND="${DEPEND} - || ( - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 ) - )" - - -src_compile() { - #no readline on server SAPI - myconf="${myconf} --without-readline" - - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ "`use apache2`" ]; then - APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - has_version '>=net-www/apache-2' \ - && myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - || myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - php_src_compile -} - - -src_install() { - php_src_install - - cp php.ini-dist php.ini - insinto /etc/php4 - doins php.ini - - if [ "`use apache2`" ] ; then - dosym /usr/lib/apache2-extramodules /etc/php4/lib - exeinto /usr/lib/apache2-extramodules - doexe .libs/libphp4.so - insinto /etc/apache2/conf/modules.d - doins ${FILESDIR}/70_mod_php.conf - dosym /etc/php4/php.ini /etc/apache2/conf/php.ini - else - dosym /usr/lib/apache-extramodules /etc/php4/lib - exeinto /usr/lib/apache-extramodules - doexe .libs/libphp4.so - insinto /etc/apache/conf/addon-modules - doins ${FILESDIR}/mod_php.conf - dosym /etc/php4/php.ini /etc/apache/conf/php.ini - dosym /etc/php4/php.ini /etc/apache/conf/addon-modules/php.ini - fi -} - -apache2msg() { - ewarn "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" -} -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 -e 's,-D PHP,-D PHP4,g' ${oldfile} <${oldfile} >/etc/conf.d/apache2 -} - -pkg_preinst() { - [ "${APACHEVER}" -eq '2' ] && apache2fix - php_pkg_preinst -} - -pkg_postinst() { - 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() { - if [ "`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 -} 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 deleted file mode 100644 index bd7d91095015..000000000000 --- a/dev-php/mod_php/mod_php-4.3.3-r1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2004 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.8 2004/01/31 22:38:34 stuart Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 ~sparc ~ppc ~alpha hppa" -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - 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\" 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 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\" 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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild b/dev-php/mod_php/mod_php-4.3.3-r2.ebuild deleted file mode 100644 index a3799a1f2bc5..000000000000 --- a/dev-php/mod_php/mod_php-4.3.3-r2.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2004 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-r2.ebuild,v 1.7 2004/01/31 22:38:34 stuart Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa" - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - 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\" 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 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\" 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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild b/dev-php/mod_php/mod_php-4.3.3-r3.ebuild deleted file mode 100644 index 3217519f04db..000000000000 --- a/dev-php/mod_php/mod_php-4.3.3-r3.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2004 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-r3.ebuild,v 1.10 2004/01/31 22:38:34 stuart Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 sparc ~ppc alpha hppa ia64" - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - 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\" 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 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/${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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.3.ebuild b/dev-php/mod_php/mod_php-4.3.3.ebuild deleted file mode 100644 index ed9e2b7e87d5..000000000000 --- a/dev-php/mod_php/mod_php-4.3.3.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2004 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.ebuild,v 1.6 2004/01/08 06:33:45 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa" -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild b/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild deleted file mode 100644 index 5302f1c768f7..000000000000 --- a/dev-php/mod_php/mod_php-4.3.3_rc3.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2004 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_rc3.ebuild,v 1.5 2004/01/08 04:11:46 robbat2 Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="-* ~ppc" -EXCLUDE_DB4_FIX=1 -EXCLUDE_PEAR_FIX=1 -SRC_URI_BASE="http://downloads.php.net/ilia" - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ;; - esac; - fi - - # optional support for apache2 - #&& myconf="${myconf} --with-apxs2=/usr/sbin/apxs2" \ - #|| myconf="${myconf} --with-apxs=/usr/sbin/apxs" - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - #php CGI stuff - #--enable-discard-path --enable-force-cgi-redirect - - 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 -} diff --git a/dev-php/mod_php/mod_php-4.3.4-r1.ebuild b/dev-php/mod_php/mod_php-4.3.4-r1.ebuild deleted file mode 100644 index ec27aa9f89cf..000000000000 --- a/dev-php/mod_php/mod_php-4.3.4-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2004 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.4-r1.ebuild,v 1.6 2004/01/31 22:38:34 stuart Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa" - -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-2 eutils - -DEPEND="${DEPEND} - >=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 )" -PDEPEND="${PDEPEND} ~dev-php/php-core-${PV}" -PROVIDE="virtual/php-4.3.4" - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - 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\" 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 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/${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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild b/dev-php/mod_php/mod_php-4.3.4-r2.ebuild deleted file mode 100644 index 47a2a5a7461d..000000000000 --- a/dev-php/mod_php/mod_php-4.3.4-r2.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2004 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.4-r2.ebuild,v 1.10 2004/01/31 22:38:34 stuart Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="x86 sparc ~ppc alpha hppa ia64" - -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-sapi eutils - -DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - multiinstwarn - detectapache domsg - php-sapi_src_unpack -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php-sapi_src_compile -} - - -src_install() { - php-sapi_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\" 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" - ewarn "output at the end of the emerge and unmerge all but relevant" - ewarn "instances." -} - -apache2fix() { - if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then - 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 - fi -} - - -pkg_preinst() { - multiinstwarn - [ "${APACHEVER}" -eq '2' ] && apache2fix - php-sapi_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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.4-r3.ebuild b/dev-php/mod_php/mod_php-4.3.4-r3.ebuild deleted file mode 100644 index 0005dc2be2cd..000000000000 --- a/dev-php/mod_php/mod_php-4.3.4-r3.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2004 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.4-r3.ebuild,v 1.5 2004/02/06 22:39:20 pylon Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ppc ~alpha ~hppa ~ia64 ~amd64" - -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-sapi eutils - -DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 - apache2? ( >=net-www/apache-2.0.43-r1 )" -DEPEND="${DEPEND} ${DEPEND_EXTRA}" -RDEPEND="${RDEPEND} ${DEPEND_EXTRA}" - -# Add a 'return 0' as we DON'T want the return code checked -pkg_setup() { - use debug && einfo "Installing in SLOT=${SLOT}" - return 0 -} - -src_unpack() { - multiinstwarn - detectapache domsg - php-sapi_src_unpack - if [ "${ARCH}" == "amd64" ] ; then - epatch ${FILESDIR}/${P}-amd64hack.diff - fi - - # bug fix for security problem - bug #39952 - epatch ${FILESDIR}/mod_php-4.3.4-r3.diff -} - -src_compile() { - # Every Apache2 MPM EXCEPT prefork needs Zend Thread Safety - if [ -n "${USE_APACHE2}" ]; then - APACHE2_MPM="`apache2 -l |egrep 'worker|perchild|leader|threadpool|prefork'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - esac; - fi - - #use apache2 \ - myconf="${myconf} --with-apxs${USE_APACHE2}=/usr/sbin/apxs${USE_APACHE2}" - - php-sapi_src_compile -} - - -src_install() { - php-sapi_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\" 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" - ewarn "output at the end of the emerge and unmerge all but relevant" - ewarn "instances." -} - -apache2fix() { - if egrep -q -- '-D PHP\>' /etc/conf.d/apache2; then - 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 - fi -} - - -pkg_preinst() { - multiinstwarn - [ "${APACHEVER}" -eq '2' ] && apache2fix - php-sapi_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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.4-r4.ebuild b/dev-php/mod_php/mod_php-4.3.4-r4.ebuild index ef93044fac18..4e646e52fe29 100644 --- a/dev-php/mod_php/mod_php-4.3.4-r4.ebuild +++ b/dev-php/mod_php/mod_php-4.3.4-r4.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2004 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.4-r4.ebuild,v 1.6 2004/03/09 23:17:21 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.4-r4.ebuild,v 1.7 2004/04/01 06:30:30 robbat2 Exp $ IUSE="${IUSE} apache2" -DESCRIPTION="Apache module for PHP" KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64" detectapache() { @@ -50,6 +49,7 @@ PHPSAPI="apache${APACHEVER}" # In this case the PHPSAPI setting is dependant on the detectapache function # above this point as well! inherit php-sapi eutils +DESCRIPTION="Apache module for PHP" DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 apache2? ( >=net-www/apache-2.0.43-r1 )" diff --git a/dev-php/mod_php/mod_php-4.3.4.ebuild b/dev-php/mod_php/mod_php-4.3.4.ebuild deleted file mode 100644 index a24302ea2ad4..000000000000 --- a/dev-php/mod_php/mod_php-4.3.4.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2004 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.4.ebuild,v 1.6 2004/01/31 22:38:34 stuart Exp $ - -IUSE="${IUSE} apache2" - -DESCRIPTION="Apache module for PHP" -KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa" - -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'|cut -d. -f1|sed -e 's/^[[:space:]]*//g;s/[[:space:]]+/ /g;'`" - einfo "Apache2 MPM: ${APACHE2_MPM}" - case "${APACHE2_MPM}" in - *prefork*) ;; - *) myconf="${myconf} --enable-experimental-zts" ; ewarn "Enabling ZTS for Apache2 MPM" ;; - 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\" 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 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/${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/conf/apache.conf \ - extramodules/libphp4.so mod_php4.c php4_module \ - before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf - :; - fi -} diff --git a/dev-php/mod_php/mod_php-4.3.5.ebuild b/dev-php/mod_php/mod_php-4.3.5.ebuild index a58ab207642a..f3cc25667f4d 100644 --- a/dev-php/mod_php/mod_php-4.3.5.ebuild +++ b/dev-php/mod_php/mod_php-4.3.5.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2004 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.5.ebuild,v 1.4 2004/03/31 13:21:34 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.5.ebuild,v 1.5 2004/04/01 06:30:30 robbat2 Exp $ IUSE="${IUSE} apache2" -DESCRIPTION="Apache module for PHP" KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64" detectapache() { @@ -51,6 +50,8 @@ PHPSAPI="apache${APACHEVER}" # above this point as well! inherit php-sapi eutils +DESCRIPTION="Apache module for PHP" + DEPEND_EXTRA=">=net-www/apache-1.3.26-r2 apache2? ( >=net-www/apache-2.0.43-r1 )" DEPEND="${DEPEND} ${DEPEND_EXTRA}" |