improved the way this integrates with apache

8 files changed, 19 insertions, 207 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 28763c3582cd..1ee75741010e 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/php
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.10 2002/04/09 23:59:01 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.11 2002/04/11 04:34:21 woodchip Exp $
+
+*php-4.1.2-r5 (10 Apr 2002)
+
+  10 Apr 2002; Donny Davies <woodchip@gentoo.org> php-4.1.2-r5.ebuild,
+  files/mod_php.conf :
+
+  Added a mod_php.conf file, which installs into the apache addon-modules config
+  directory.  This eliminates the need to "sed" the apache config file in order
+  to "turn on" the php mime types.  Removed some stale ebuilds/digests.
 
 *php-4.1.2-r4 (9 Apr 2002)
 
diff --git a/dev-lang/php/files/digest-php-4.1.1-r2 b/dev-lang/php/files/digest-php-4.1.1-r2
deleted file mode 100644
index d7e8f2b826d9..000000000000
--- a/dev-lang/php/files/digest-php-4.1.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 776362ff53bf6ea77b60496f6632b6b6 php-4.1.1.tar.gz 3356062
diff --git a/dev-lang/php/files/digest-php-4.1.1-r4 b/dev-lang/php/files/digest-php-4.1.1-r4
deleted file mode 100644
index d7e8f2b826d9..000000000000
--- a/dev-lang/php/files/digest-php-4.1.1-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 776362ff53bf6ea77b60496f6632b6b6 php-4.1.1.tar.gz 3356062
diff --git a/dev-lang/php/files/digest-php-4.1.2-r4 b/dev-lang/php/files/digest-php-4.1.2-r4
deleted file mode 100644
index b7e2c0275985..000000000000
--- a/dev-lang/php/files/digest-php-4.1.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 75a62553076c20e91d3be575ce158be2 php-4.1.2.tar.gz 3359964
diff --git a/dev-lang/php/files/digest-php-4.1.2-r3 b/dev-lang/php/files/digest-php-4.1.2-r5
index b7e2c0275985..b7e2c0275985 100644
--- a/dev-lang/php/files/digest-php-4.1.2-r3
+++ b/dev-lang/php/files/digest-php-4.1.2-r5
diff --git a/dev-lang/php/files/mod_php.conf b/dev-lang/php/files/mod_php.conf
new file mode 100644
index 000000000000..6f1f47494bf3
--- /dev/null
+++ b/dev-lang/php/files/mod_php.conf
@@ -0,0 +1,6 @@
+<IfModule mod_php4.c>
+
+AddType  application/x-httpd-php         .php .php4 .php3 .phtml
+AddType  application/x-httpd-php-source  .phps
+
+</IfModule>
diff --git a/dev-lang/php/php-4.1.2-r3.ebuild b/dev-lang/php/php-4.1.2-r3.ebuild
deleted file mode 100644
index b037ac024f17..000000000000
--- a/dev-lang/php/php-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Tools Team <tools@gentoo.org>
-# Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.1.2-r3.ebuild,v 1.1 2002/03/14 18:49:39 g2boojum Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${P}.tar.gz"
-HOMEPAGE="http://www.php.net/"
-SLOT="0"
-
-DEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-	>=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-	>=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	mhash? ( >=app-crypt/mhash-0.8 )
-	mcrypt? ( >=dev-libs/libmcrypt-2.4 )
-	X? ( virtual/x11 )
-	qt? ( =x11-libs/qt-2.3* )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imapUW )
-	flash? ( media-libs/libswf media-libs/ming )
-	xml2? ( dev-libs/libxml2 )
-	java? ( virtual/jdk )
-	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	xml2? ( dev-libs/libxml2 )
-	java? ( virtual/jdk )
-	pdflib? ( >=media-libs/pdflib-4.0.1-r2 )
-	"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	if [ "`use java`" ] ; then
-
-		cp configure configure.orig
-		cat configure.orig | \
-			sed -e 's/LIBS="-lttf $LIBS"/LIBS="-lttf -lhpi $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
-	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
-	# also, t1lib support seems to be broken: gcc: /usr/lib/.libs/libt1.so: No such file or directory
-
-	myconf="--without-readline --without-t1lib"
-	use pam && myconf="$myconf --with-pam"
-	use gettext && myconf="$myconf --with-gettext"
-	use gdbm && myconf="$myconf --with-gdbm=/usr"
-	use berkdb && myconf="$myconf --with-db3=/usr"
-	use mysql && myconf="$myconf --with-mysql=/usr"
-	use postgres && myconf="$myconf --with-pgsql=/usr"
-	use odbc && myconf="$myconf --with-unixODBC=/usr"
-	use ldap &&  myconf="$myconf --with-ldap" 
-	use pdflib && myconf="$myconf --with-pdflib"
-
-	if [ "`use qt`" ] ; then
-		export QTDIR=/usr/qt/2 #hope this helps - danarmak
-		myconf="$myconf --with-qtdom" 
-	fi
-
-	if [ "`use imap`" ] ; then
-		# need to see if imap was built w/ ssl support
-		local pkg=`tail -n 1 /var/db/pkg/virtual/imapUW/VIRTUAL`
-		if [ "`grep ssl /var/db/pkg/${pkg}/USE`" ] ; then
-			echo "imap compiled with SSL"
-			myconf="$myconf --with-imap-ssl"
-		else
-			echo "imap compiled w/o SSL"
-			myconf="$myconf --with-imap"
-			# php build will fail if imap doesn't have SSL support
-			echo "unfortunately, the php build will fail due to"
-			echo "strange header errors in /usr/include/imap4r1.h"
-			echo "Please rebuild uw-imap or pine w/ 'ssl' in USE"
-			die
-		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"
-	fi
-
-	use xml2 && myconf="$myconf --with-dom"
-	use mhash && myconf="$myconf --with-mhash"
-	use mcrypt && myconf="$myconf --with-mcrypt"
-	use java && myconf="$myconf --with-java=${JDK_HOME}"
-
-	LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-	if [ "`use X`" ] ; then
-		myconf="$myconf --with-xpm-dir=/usr/X11R6"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-	fi
-    
-	./configure --enable-safe-mode --enable-ftp --enable-track-vars --with-gmp \
-		--enable-dbase --enable-sysvsem --enable-sysvshm --with-zlib=yes --enable-bcmath \
-		--enable-calendar --enable-versioning --enable-inline-optimization --enable-trans-sid \
-		--with-gd --with-ttf --with-t1lib --with-png-dir=/usr/lib --with-jpeg-dir=/usr/lib --prefix=/usr \
-		--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` --host=${CHOST} \
-		--with-apxs="/usr/sbin/apxs -ltiff" --with-exec-dir="/usr/lib/apache/bin" $myconf || die
-
-	make || die
-}
-
-
-src_install() {                 
- 
-	make INSTALL_ROOT=${D} install-pear || die
-	dodir /usr/lib/apache
-	cp .libs/libphp4.so ${D}/usr/lib/apache
-
-	dodir /etc/httpd
-	cp php.ini-dist ${D}/etc/httpd/php.ini
-	dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-	dodoc RELEASE_PROCESS README.* TODO NEWS
-	dodoc ChangeLog* *.txt
-}
-
-pkg_postinst() {
-        einfo "Run 'ebuild php-${PV}-${PR}.ebuild config' to update httpd.conf"
-}
-		
-pkg_config() {
-
-	if [ -f "${ROOT}/etc/httpd/httpd.conf" -a ! "`grep "IfDefine PHP" /etc/httpd/httpd.conf`" ] ; then
-
-		einfo Enabling PHP support in ${ROOT}/etc/httpd/httpd.conf
-
-		# Activate PHP-Extension in httpd.conf
-		einfo "Activate PHP in httpd.conf..."
-		cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-		sed -e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-			-e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-			${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-
-		echo -e "\n<IfDefine PHP4>\nLoadModule php4_module /usr/lib/apache/libphp4.so\n</IfDefine>\n" >> ${ROOT}/etc/httpd/httpd.conf
-		
-	fi
-
-}
-
-
-
diff --git a/dev-lang/php/php-4.1.2-r4.ebuild b/dev-lang/php/php-4.1.2-r5.ebuild
index 45a7e7fa2b7a..bfa222244048 100644
--- a/dev-lang/php/php-4.1.2-r4.ebuild
+++ b/dev-lang/php/php-4.1.2-r5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.1.2-r4.ebuild,v 1.1 2002/04/09 23:59:01 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.1.2-r5.ebuild,v 1.1 2002/04/11 04:34:21 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="HTML embedded scripting language"
@@ -182,6 +182,7 @@ src_install() {
 	doexe .libs/libphp4.so
 
 	insinto /etc/apache/conf/addon-modules
+	doins ${FILESDIR}/mod_php.conf
 	newins php.ini-dist php.ini
 }
 
@@ -197,14 +198,6 @@ pkg_config() {
 	${ROOT}/usr/sbin/apacheaddmod \
 		${ROOT}/etc/apache/conf/apache.conf \
 		extramodules/libphp4.so mod_php4.c php4_module \
-		define=PHP4
-
-	# Activate PHP-Extension in httpd.conf
-	einfo "Enabling PHP support in ${ROOT}/etc/apache/conf/apache.conf"
-	cp ${ROOT}/etc/apache/conf/apache.conf ${ROOT}/etc/apache/conf/apache.conf-before-php
-	sed -e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-		-e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-		${ROOT}/etc/apache/conf/apache.conf-before-php > ${ROOT}/etc/apache/conf/apache.conf
-
+		before=perl define=PHP4 addconf=conf/addon-modules/mod_php.conf
 	:;
 }