Release bump to fix incorrect DEPENDS entry.

3 files changed, 300 insertions, 1 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 311d97462646..1b6920eb99b5 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.54 2003/03/03 08:57:59 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.55 2003/03/03 13:15:02 tad Exp $
+
+*mod_php-4.3.1-r2 (04 Mar 2003)
+
+  04 Mar 2003; Troy Dack <tad@gentoo.org. mod_php-4.3.1-r2.ebuild:
+  Fix to incorrect DEPENDS= entry
 
 *mod_php-4.3.1-r1 (24 Feb 2003)
 
diff --git a/dev-php/mod_php/files/digest-mod_php-4.3.1-r2 b/dev-php/mod_php/files/digest-mod_php-4.3.1-r2
new file mode 100644
index 000000000000..da8da7df7d9d
--- /dev/null
+++ b/dev-php/mod_php/files/digest-mod_php-4.3.1-r2
@@ -0,0 +1 @@
+MD5 bbfe584acb3549c62bb61355165e2ca6 php-4.3.1.tar.bz2 3682417
diff --git a/dev-php/mod_php/mod_php-4.3.1-r2.ebuild b/dev-php/mod_php/mod_php-4.3.1-r2.ebuild
new file mode 100644
index 000000000000..d1cfdefabe6e
--- /dev/null
+++ b/dev-php/mod_php/mod_php-4.3.1-r2.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.1-r2.ebuild,v 1.1 2003/03/03 13:15:02 tad Exp $
+
+inherit flag-o-matic 
+
+IUSE="java png apache2 truetype postgres tiff libwww nls jpeg ssl oci8 mysql X gdbm curl imap xml2 xml cjk pdflib qt snmp crypt flash odbc ldap berkdb freetds firebird pam spell"
+
+MY_P=php-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Apache module for PHP"
+SRC_URI="http://us3.php.net/distributions/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.php.net/"
+LICENSE="PHP"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa"
+SLOT="0"
+PROVIDE="virtual/php"
+
+#fixes bug #14067
+replace-flags "-march=k6*" "-march=i586"
+
+	# users have been having problems with compiling the gmp support... disabled for now
+	# - rphillips
+	#>=dev-libs/gmp-3.1.1
+
+DEPEND=">=net-www/apache-1.3.26-r2
+	apache2? ( >=net-www/apache-2.0.43-r1 )
+	truetype? ( ~media-libs/freetype-1.3.1 >=media-libs/t1lib-1.3.1 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.5 )
+	X? ( virtual/x11 )
+	png? ( >=media-libs/libpng-1.2.5 )
+	qt? ( x11-libs/qt )
+	nls? ( sys-devel/gettext )
+	pam? ( >=sys-libs/pam-0.75 )
+	xml? ( >=net-libs/libwww-5.3.2 >=app-text/sablotron-0.96 )
+	ssl? ( >=dev-libs/openssl-0.9.5 )
+	curl? ( >=net-ftp/curl-7.10.2 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	imap? ( >=net-mail/uw-imap-2001a-r1 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	odbc? ( >=dev-db/unixODBC-1.8.13 )
+	xml2? ( dev-libs/libxml2 )
+	crypt? ( >=dev-libs/libmcrypt-2.4 >=app-crypt/mhash-0.8 )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	flash? ( media-libs/libswf >=media-libs/ming-0.2a )
+	spell? ( app-text/aspell )
+	berkdb? ( >=sys-libs/db-3 )
+	libwww? ( >=net-libs/libwww-5.3.2 )
+	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
+	freetds? ( >=dev-db/freetds-0.53 )
+	firebird? ( >=dev-db/firebird-1.0 )
+	postgres? ( >=dev-db/postgresql-7.1 )"
+	#java? ( virtual/jdk )
+# Only needed by CGI-Version
+#	readline? ( >=sys-libs/ncurses-5.1
+#		>=sys-libs/readline-4.1 )"
+
+RDEPEND="
+	xml? ( >=app-text/sablotron-0.95-r1 )
+	qt? ( >=x11-libs/qt-2.3.0 )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd ${S}
+
+        # Configure Patch for wired uname -a
+	mv configure configure.old
+	cat configure.old | sed "s/PHP_UNAME=\`uname -a\`/PHP_UNAME=\`uname -s -n -r -v\`/g" > configure
+	chmod 755 configure
+
+	# fix PEAR installer
+	cp pear/PEAR/Registry.php pear/PEAR/Registry.old
+	sed "s:\$pear_install_dir\.:\'$D/usr/lib/php/\' . :g" pear/PEAR/Registry.old > pear/PEAR/Registry.php
+	
+	#if [ "`use java`" ] ; then
+
+	#	cp configure configure.orig
+	#	cat configure.orig | \
+	#		sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf $LIBS"/' \
+	#		> configure
+
+	#	cp ext/gd/gd.c ext/gd/gd.c.orig
+	#	cat ext/gd/gd.c.orig | \
+	#		sed -e "s/typedef FILE gdIOCtx;//" \
+	#		> ext/gd/gd.c
+	#	if [ "$JAVAC" ];
+	#	then
+	#              cp ext/java/Makefile.in ext/java/Makefile.in.orig
+	#              cat ext/java/Makefile.in.orig | \
+	#                      sed -e "s/^\tjavac/\t\$(JAVAC)/" \
+	#                      > ext/java/Makefile.in
+	#	fi
+	#fi
+
+}
+
+src_compile() {
+
+	local myconf
+
+	# readline can only be used w/ CGI build, so I'll turn it off
+	#if [ "`use readline`" ] ; then
+	#  myconf="--with-readline"
+	#fi
+
+	myconf="--without-readline "
+	use pam && myconf="${myconf} --with-pam"
+	use nls && myconf="${myconf} --with-gettext" || myconf="${myconf} --without-gettext"
+	use ssl && myconf="${myconf} --with-openssl"
+	use curl && myconf="${myconf} --with-curl"
+	use snmp && myconf="${myconf} --with-snmp --enable-ucd-snmp-hack"
+	use cjk && myconf="${myconf} --enable-mbstring --enable-mbregex"
+	use gdbm && myconf="${myconf} --with-gdbm=/usr"
+	use berkdb && myconf="${myconf} --with-db3=/usr"
+	use mysql && myconf="${myconf} --with-mysql=/usr" || myconf="${myconf} --without-mysql"
+	use freetds && myconf="${myconf} --with-sybase=/usr"
+	use postgres && myconf="${myconf} --with-pgsql=/usr"
+	use odbc && myconf="${myconf} --with-unixODBC=/usr"
+	use ldap &&  myconf="${myconf} --with-ldap"
+	use firebird && myconf="${myconf} --with-interbase=/opt/interbase"
+	use truetype && myconf="${myconf} --with-ttf --with-t1lib"
+	use pdflib && myconf="${myconf} --with-pdflib=/usr"
+	use jpeg && myconf="${myconf} --with-jpeg-dir=/usr/lib"
+	use tiff && myconf="${myconf} --with-tiff-dir=/usr"
+	use spell && myconf="${myconf} --with-pspell"
+
+	if [ "`use png`" ] ; then
+		myconf="${myconf} --with-png-dir=/usr/lib"
+	fi
+
+	# And zlib, but we need to know if the user wants it - Quequero
+	if [ "`use zlib`" ] ; then
+	 	myconf="${myconf} --with-zlib"
+		myconf="${myconf} --with-zlib-dir=/usr/lib"
+	fi
+
+	# optional support for apache2
+	myconf="${myconf} --with-exec-dir=/usr/bin"
+	if [ "`use apache2`" ] ; then
+		myconf="${myconf} --with-apxs2=/usr/sbin/apxs2"
+	else
+		myconf="${myconf} --with-apxs=/usr/sbin/apxs"
+	fi
+
+
+	# optional support for oracle oci8
+	if [ "`use oci8`" ] ; then
+		if [ "$ORACLE_HOME" ] ; then
+			myconf="${myconf} --with-oci8=${ORACLE_HOME}"
+		fi
+	fi
+
+	use qt && myconf="${myconf} --with-qtdom" 
+
+	if [ "`use imap`" ] ; then
+		if [ "`use ssl`" ] && [ "`strings ${ROOT}/usr/lib/c-client.a \
+					| grep ssl_onceonlyinit`" ] ; then
+			echo "Compiling imap with SSL support"
+			myconf="${myconf} --with-imap --with-imap-ssl"
+		else
+			echo "Compiling imap without SSL support"
+			myconf="${myconf} --with-imap"
+		fi
+	fi
+	use libwww && myconf="${myconf} --with-xml" || myconf="${myconf} --disable-xml"
+	use flash && myconf="${myconf} --with-swf=/usr --with-ming=/usr"
+
+	if [ "`use xml`" ] ; then
+		export LIBS="-lxmlparse -lxmltok"
+		myconf="${myconf} --with-sablot=/usr"
+		myconf="${myconf} --enable-xslt" 
+		myconf="${myconf} --with-xslt-sablot" 
+		myconf="${myconf} --with-xmlrpc"
+	fi
+
+	use xml2 && myconf="${myconf} --with-dom"
+	use crypt && myconf="${myconf} --with-mcrypt --with-mhash --disable-posix-threads"
+	use java && myconf="${myconf} --with-java=${JAVA_HOME}"
+
+	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
+
+	if [ "`use X`" ] ; then
+		myconf="${myconf} --with-xpm-dir=/usr/X11R6"
+		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
+	fi
+
+	# this needed moving to prevent b0rkage
+	# --with-gmp \
+
+	./configure \
+		--prefix=/usr \
+		--with-bz2 \
+		--enable-ftp \
+		--enable-force-cgi-redirect \
+		--enable-discard-path \
+		--enable-gd-native-ttf \
+		--enable-mime-magic \
+		--enable-wddx \
+		--enable-dbase \
+		--with-zlib=yes \
+		--with-iconv \
+		--enable-bcmath \
+		--enable-sysvsem \
+		--enable-exif \
+		--with-gd \
+		--enable-sysvshm \
+		--enable-sockets \
+		--enable-calendar \
+		--enable-trans-sid \
+		--enable-safe-mode \
+		--enable-versioning \
+		--enable-track-vars \
+		--enable-inline-optimization \
+		--with-config-file-path=/etc/php4 \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make || die "compile problem"
+}
+
+ 
+src_install() {
+	addwrite /usr/share/snmp/mibs/.index
+
+ 	make INSTALL_ROOT=${D} install-pear install-headers install-programs install-build || die
+
+	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
+	dodoc README.* TODO NEWS
+
+	cp php.ini-dist php.ini
+	insinto /etc/php4
+	doins php.ini
+	dosym /usr/lib/apache-extramodules /etc/php4/lib
+
+	#install scripts
+	exeinto /usr/bin
+	doexe ${S}/pear/scripts/phpize
+	doexe ${S}/pear/scripts/php-config
+	doexe ${S}/pear/scripts/phpextdist
+	doexe ${S}/ext/ext_skel
+
+	mkdir ${D}/usr/lib/php/build
+	insinto /usr/lib/php/build
+	doins build/* pear/pear.m4 acinclude.m4 configure.in Makefile.global scan_makefile_in.awk
+
+	#fix 15976
+	chmod 755 ${D}/usr/bin/php/pear
+
+    #revert Pear patch
+    rm ${D}/usr/lib/php/PEAR/Registry.php
+    mv ${S}/pear/PEAR/Registry.old ${D}/usr/lib/php/PEAR/Registry.php
+
+	if [ "`use apache2`" ] ; then
+		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
+		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
+}
+
+pkg_postinst() {
+	einfo
+	einfo "To have Apache run php programs, please do the following:"
+	if [ "`use apache2`" ] ; then
+		einfo "Edit /etc/conf.d/apache2 and add \"-D PHP4\""
+		einfo
+		einfo "Please note Apache 2 support in php is currently experimental"
+	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
+		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() {
+	${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
+	:;
+}