Version bump.

BerkDB is disabled due to DB4 issues and changes in PHP 4.3.2 presently.
If you need BerkDB support, please do NOT upgrade at this time.

7 files changed, 215 insertions, 4 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index f84adfd409e6..f3452dda62f4 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,14 @@
 # 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.77 2003/05/31 21:41:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.78 2003/05/31 22:32:49 robbat2 Exp $
+
+*mod_php-4.3.2 (31 May 2003)
+
+  26 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild,
+  files/digest-mod_php-4.3.2:
+  Version bump.
+  BerkDB is disabled due to DB4 issues and changes in PHP 4.3.2 presently.
+  If you need BerkDB support, please do NOT upgrade at this time.
 
 *mod_php-4.3.1-r3 (23 Apr 2003)
 
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 69cd834605d8..d7796780d914 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,13 +1,15 @@
+MD5 d9c86f85851b5c5344f4e06dcf1d1d68 mod_php-4.3.2.ebuild 2821
 MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.1-r3.ebuild 2589
 MD5 e71b9c41e34ef0cd3a7c4330f727cf28 mod_php-4.3.1.ebuild 9213
 MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241
 MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071
 MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634
-MD5 de0bcd491f54f02d62b78b2c02a862b6 ChangeLog 16260
+MD5 b4c1c28da3fac9c187823fd1c6583521 ChangeLog 16553
 MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853
 MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1 63
+MD5 5123f10b8c04d755f87e65e6aeb66fa2 files/digest-mod_php-4.3.2 126
 MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
 MD5 ad1869c3f2c3a60b4d7c4d26026373cf files/digest-mod_php-4.2.3-r2 63
 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-mod_php-4.3.0-r2 63
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
new file mode 100644
index 000000000000..7780d6111ce2
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.2
@@ -0,0 +1,2 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
+MD5 be35e7f1f7d84343e94faa88f35a96c6 php-4.3.2-db4.diff.gz 606
diff --git a/dev-php/mod_php/mod_php-4.3.2.ebuild b/dev-php/mod_php/mod_php-4.3.2.ebuild
new file mode 100644
index 000000000000..5cead6638e65
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.2.ebuild
@@ -0,0 +1,104 @@
+# 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.2.ebuild,v 1.1 2003/05/31 22:32:49 robbat2 Exp $
+
+inherit php eutils
+
+IUSE="${IUSE} apache2"
+
+DESCRIPTION="Apache module for PHP"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~arm ~sparc"
+SLOT="0"
+EXCLUDE_DB4_FIX=1
+EXCLUDE_PEAR_FIX=1
+
+DEPEND="${DEPEND}
+	apache2? ( >=net-www/apache-2.0.43-r1 )
+	!apache2? ( !<net-www/apache-1.3.26-r2 <net-www/apache-2 )"
+
+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|prechild|leader|threadpool|prefork'|xargs|cut -d. -f1`"
+		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
+
+	# No CLI in here
+	myconf="${myconf} --disable-cli"
+
+	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() {
+		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 [ "`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/php/Manifest b/dev-php/php/Manifest
index 82ef0aa1f03b..718e2578518c 100644
--- a/dev-php/php/Manifest
+++ b/dev-php/php/Manifest
@@ -1,10 +1,10 @@
 MD5 0d1e14b4e015cbd589bc3a7d5886b602 php-4.3.1-r1.ebuild 8142
 MD5 c06db8bbd5bb6030cc4f41c35a7bfc67 php-4.3.0-r4.ebuild 8032
-MD5 6241dd4d12d3312f793a0bc1a346f9cb php-4.3.2.ebuild 2474
+MD5 75eada54a48637351e9c8444ebfa8e5a php-4.3.2.ebuild 2471
 MD5 32e507e008f3a07bf40463b7e8b0d1fe php-4.3.0-r3.ebuild 6737
 MD5 db07b5c392bb552093618f33dd73a839 php-4.3.1.ebuild 8487
 MD5 82c31a660af5431b5abd96f70ece4854 php-4.3.1-r2.ebuild 2436
-MD5 e09d35fb0ebb99ab284dfed7f7fb14e9 ChangeLog 6741
+MD5 c3342361869bb079838e9fabea2cc1b4 ChangeLog 7022
 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-php-4.3.0-r3 63
 MD5 3604218eee0ba5f7a1eac325de001eb1 files/digest-php-4.3.0-r4 63
 MD5 316366d60770de4c45957483cde50fe8 files/digest-php-4.3.1-r1 63
diff --git a/dev-php/php/files/digest-php-4.3.2 b/dev-php/php/files/digest-php-4.3.2
new file mode 100644
index 000000000000..7780d6111ce2
--- /dev/null
+++ b/dev-php/php/files/digest-php-4.3.2
@@ -0,0 +1,2 @@
+MD5 8aec1bb2dbcca1c92835c71e2e30d9c5 php-4.3.2.tar.bz2 3697581
+MD5 be35e7f1f7d84343e94faa88f35a96c6 php-4.3.2-db4.diff.gz 606
diff --git a/dev-php/php/php-4.3.2.ebuild b/dev-php/php/php-4.3.2.ebuild
new file mode 100644
index 000000000000..36d07daba73a
--- /dev/null
+++ b/dev-php/php/php-4.3.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# Update: Roman Weber <gentoo@gonzo.ch>
+# $Header: /var/cvsroot/gentoo-x86/dev-php/php/php-4.3.2.ebuild,v 1.1 2003/05/31 22:32:02 robbat2 Exp $
+
+inherit php eutils
+
+IUSE="${IUSE} readline"
+
+DESCRIPTION="PHP Shell Interpreter"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+
+DEPEND="${DEPEND}
+	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) "
+
+RDEPEND="${RDEPEND}"
+
+EXCLUDE_DB4_FIX=1
+EXCLUDE_PEAR_FIX=1
+
+src_compile() {
+	
+	use readline && myconf="${myconf} --with-readline"
+
+	myconf="${myconf} \
+		--disable-cgi \
+		--enable-cli \
+		--enable-pcntl"
+	
+	php_src_compile
+
+}
+
+
+src_install() {
+	installtargets="${installtargets} install-cli"
+	php_src_install
+
+	# php executable is located in ./sapi/cli/
+	cp sapi/cli/php .
+	exeinto /usr/bin
+	doexe php
+
+	# Support for Java extension
+	#
+	# 1. install php_java.jar file into /etc/php4/lib directory
+	# 2. edit the php.ini file ready for installation
+	#
+	# - stuart@gnqs.org
+
+	if [ "`use java`" ] ; then
+
+		# we put these into /usr/lib so that they cannot conflict
+		# with other versions of PHP
+
+		insinto /usr/lib/php/extensions/no-debug-non-zts-20020429
+		doins ext/java/php_java.jar
+
+		cp ext/java/except.php java-test.php
+		doins java-test.php
+
+		JAVA_LIBRARY="`grep -- '-DJAVALIB' Makefile | sed -e 's/.\+-DJAVALIB=\"\([^"]*\)\".*$/\1/g;'`"
+		cat php.ini-dist | sed -e "s|;java.library .*$|java.library = $JAVA_LIBRARY|g;" > php.ini-1
+		cat php.ini-1 | sed -e "s|;java.class.path .*$|java.class.path = /etc/php4/lib/php_java.jar|g;" > php.ini-2
+		cat php.ini-2 | sed -e "s|extension_dir .*$|extension_dir = /etc/php4/lib|g;" > php.ini-3
+		cat php.ini-3 | sed -e "s|;extension=php_java.dll.*$|extension = java.so|g;" > php.ini-4
+		cat php.ini-4 | sed -e "s|;java.library.path .*$|java.library.path = /etc/php4/lib/|g;" > php.ini-5
+
+		mv php.ini-5 php.ini
+	else
+		mv php.ini-dist php.ini
+	fi
+
+    insinto /etc/php4
+	doins php.ini
+
+	if [ "`use java`" ]; then
+		# I can't find a way to make these symlinks using dosym
+		# SLH - 20030211
+		( cd ${D}/usr/lib/php/extensions/no-debug-non-zts-20020429 ; ln -snf java.so libphp_java.so )
+		( cd ${D}/etc/php4 ; ln -snf ../../usr/lib/php/extensions/no-debug-non-zts-20020429 lib )
+	fi
+
+}
+
+pkg_postinst() {
+	# This is more correct information.
+	einfo 
+	einfo "This is a CLI only build."
+	einfo "You can not use it on a webserver."
+	einfo 
+}