# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1219862922 0
# Node ID 41897da4a1dbcf6e938b40fcd83dcf198a1792c4
# Parent  32fa0b9984a6056b96a8600fe81eefcea27015b0
php*: add apache support

diff -r 32fa0b9984a6 -r 41897da4a1db php-apache/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/php-apache/receipt	Wed Aug 27 18:48:42 2008 +0000
@@ -0,0 +1,55 @@
+# SliTaz package receipt.
+
+PACKAGE="php-apache"
+VERSION="5.2.5"
+CATEGORY="development"
+SHORT_DESC="PHP module for apache."
+MAINTAINER="pascal.bellard@slitaz.org"
+DEPENDS="php-common apache"
+WEB_SITE="http://www.php.net/"
+WANTED="php"
+PROVIDE="php:apache"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/share
+	cp -a $_pkg/usr/share/apache $fs/usr/share
+}
+
+# Post and pre install commans to stop
+# and restart Web server if needed.
+pre_install()
+{
+	if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ]; then
+		/etc/init.d/apache stop
+	fi
+}
+
+post_install()
+{
+	grep -q php5_module $1/etc/apache/httpd.conf || {
+	    sed -e 's|mod_rewrite.so|mod_rewrite.so\nLoadModule php5_module share/apache/modules/libphp5.so|' \
+	    	-e 's|DirectoryIndex index.html|DirectoryIndex index.html index.php|' \
+		-e 's|mime.types|mime.types\n    AddType application/x-httpd-php .php .php3 .php4 .php5\n    AddType application/x-httpd-php-source .phps|' \
+	        -i $1/etc/apache/httpd.conf
+	}
+	[ -f $1/etc/apache/conf.d/phpinfo ] || \
+		cat > $1/etc/apache/conf.d/phpinfo <<EOT
+<IfModule mod_alias.c>
+    Alias /phpinfo /usr/share/phpinfo
+</IfModule>
+<DirectoryMatch /usr/share/phpinfo/>
+    DirectoryIndex index.php
+    Options +FollowSymLinks
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+</DirectoryMatch>
+EOT
+	# Start Web server.
+	if [ -z "$1" -a ! -f "/var/run/apache/httpd.pid" ]; then
+		/etc/init.d/apache start
+	fi
+}
+
diff -r 32fa0b9984a6 -r 41897da4a1db php-common/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/php-common/receipt	Wed Aug 27 18:48:42 2008 +0000
@@ -0,0 +1,49 @@
+# SliTaz package receipt.
+
+PACKAGE="php-common"
+VERSION="5.2.5"
+CATEGORY="development"
+SHORT_DESC="Common files for PHP modules."
+MAINTAINER="pascal.bellard@slitaz.org"
+WEB_SITE="http://www.php.net/"
+WANTED="php"
+CONFIG_FILES="/etc/php.ini"
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/share $fs/etc
+	cp -a $_pkg/usr/share/phpinfo $fs/usr/share
+	cp -a $_pkg/usr/share/applications $fs/usr/share
+	cp -a $_pkg/usr/share/pixmap $fs/usr/share
+	cp $_pkg/etc/php.ini $fs/etc
+}
+
+# Post and pre install commands
+pre_install()
+{
+	# Backup existing php.ini
+	if [ -f "$1/etc/php.ini" ]; then
+		echo -n "Creating php.ini backup..."
+		cp $1/etc/php.ini $1/etc/php.ini.bak
+		status
+	fi
+}
+post_install()
+{
+	( cd $1/ ; cpio -o -H newc | gzip -9 ) > \
+		$1/$INSTALLED/$PACKAGE/volatile.cpio.gz <<EOT
+etc/php.ini
+EOT
+	# Restore original php.ini
+	if [ -f "$1/etc/php.ini.bak" ]; then
+		echo -n "Restoring php.ini backup..."
+		mv -f $1/etc/php.ini.bak $1/etc/php.ini 
+		status
+	fi
+}
+
+repack_cleanup()
+{
+        zcat $INSTALLED/$PACKAGE/volatile.cpio.gz | ( cd $1 ; cpio -id )
+}
diff -r 32fa0b9984a6 -r 41897da4a1db php-ldap/receipt
--- a/php-ldap/receipt	Wed Aug 27 18:41:39 2008 +0000
+++ b/php-ldap/receipt	Wed Aug 27 18:48:42 2008 +0000
@@ -20,9 +20,14 @@
 # and restart Web server if needed.
 pre_install()
 {
-	if [ -z "$1" -a -f "/var/run/lighttpd.pid" ]; then
-		/etc/init.d/lighttpd stop
-	fi
+	while read daemon file; do
+		if [ -z "$1" -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
 
 post_install()
@@ -30,8 +35,14 @@
 	grep -q ^extension=msql.so $1/etc/php.ini || \
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=ldap.so|' -i $1/etc/php.ini
 	# Start Web server.
-	if [ -z "$1" -a ! -f "/var/run/lighttpd.pid" ]; then
-		/etc/init.d/lighttpd start
-	fi
+	while read daemon file; do
+		if [ -z "$1" -a -f /etc/init.d/$daemon \
+			     -a ! -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon start
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
 
diff -r 32fa0b9984a6 -r 41897da4a1db php-mysql/receipt
--- a/php-mysql/receipt	Wed Aug 27 18:41:39 2008 +0000
+++ b/php-mysql/receipt	Wed Aug 27 18:48:42 2008 +0000
@@ -20,9 +20,14 @@
 # and restart Web server if needed.
 pre_install()
 {
-	if [ -z "$1" -a -f "/var/run/lighttpd.pid" ]; then
-		/etc/init.d/lighttpd stop
-	fi
+	while read daemon file; do
+		if [ -z "$1" -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
 
 post_install()
@@ -30,8 +35,14 @@
 	grep -q ^extension=msql.so $1/etc/php.ini || \
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=mysql.so|' -i $1/etc/php.ini
 	# Start Web server.
-	if [ -z "$1" -a ! -f "/var/run/lighttpd.pid" ]; then
-		/etc/init.d/lighttpd start
-	fi
+	while read daemon file; do
+		if [ -z "$1" -a -f /etc/init.d/$daemon \
+			     -a ! -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon start
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
 
diff -r 32fa0b9984a6 -r 41897da4a1db php-pgsql/receipt
--- a/php-pgsql/receipt	Wed Aug 27 18:41:39 2008 +0000
+++ b/php-pgsql/receipt	Wed Aug 27 18:48:42 2008 +0000
@@ -20,9 +20,14 @@
 # and restart Web server if needed.
 pre_install()
 {
-	if [ -z "$1" -a -f "/var/run/lighttpd.pid" ]; then
-		/etc/init.d/lighttpd stop
-	fi
+	while read daemon file; do
+		if [ -z "$1" -a -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon stop
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
 
 post_install()
@@ -30,8 +35,14 @@
 	grep -q ^extension=msql.so $1/etc/php.ini || \
 	    sed -e 's|;.*extension=msql.so|;   extension=msql.so\nextension=pgsql.so|' -i $1/etc/php.ini
 	# Start Web server.
-	if [ -z "$1" -a ! -f "/var/run/lighttpd.pid" ]; then
-		/etc/init.d/lighttpd start
-	fi
+	while read daemon file; do
+		if [ -z "$1" -a -f /etc/init.d/$daemon \
+			     -a ! -f "/var/run/$file" ]; then
+			/etc/init.d/$daemon start
+		fi
+	done <<EOT
+apache apache/httpd.pid
+lighttpd lighttpd.pid
+EOT
 }
 
diff -r 32fa0b9984a6 -r 41897da4a1db php/receipt
--- a/php/receipt	Wed Aug 27 18:41:39 2008 +0000
+++ b/php/receipt	Wed Aug 27 18:48:42 2008 +0000
@@ -5,36 +5,49 @@
 CATEGORY="development"
 SHORT_DESC="PHP web programming language."
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="lighttpd zlib libxml2 sqlite"
-BUILD_DEPENDS="sqlite-dev libxml2-dev zlib-dev mysql-dev postgresql postgresql-dev gettext openssl-dev"
+DEPENDS="php-common lighttpd zlib libxml2 sqlite"
+BUILD_DEPENDS="sqlite-dev libxml2-dev zlib-dev mysql-dev postgresql postgresql-dev gettext openssl-dev apache-dev apache"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.php.net/"
 WGET_URL="http://us2.php.net/distributions/$TARBALL"
-CONFIG_FILES="/etc/php.ini"
+PROVIDE="php:lighttpd"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-fastcgi \
-		--enable-discard-path \
-		--enable-force-cgi-redirect \
-		--enable-mbstring \
-		--with-config-file-path=/etc \
-		--with-zlib \
-		--with-gettext \
-		--with-mysql=shared,usr \
-		--with-pgsql=shared,usr \
-		--with-ldap=shared \
-		--disable-cli \
-		$CONFIGURE_ARGS
-	make
-	make INSTALL_ROOT=$PWD/_pkg install
+	COMMON_ARGS="\
+--prefix=/usr \
+--sysconfdir=/etc \
+--infodir=/usr/share/info \
+--mandir=/usr/share/man \
+--enable-fastcgi \
+--enable-discard-path \
+--enable-force-cgi-redirect \
+--enable-mbstring \
+--with-config-file-path=/etc \
+--with-zlib \
+--with-gettext \
+--with-mysql=shared,usr \
+--with-pgsql=shared,usr \
+--with-ldap=shared \
+--disable-cli"
+	./configure $COMMON_ARGS $CONFIGURE_ARGS && \
+	make && make INSTALL_ROOT=$PWD/_pkg install
+	./configure $COMMON_ARGS --with-apxs2=/usr/bin/apxs $CONFIGURE_ARGS && \
+	make && {
+		mkdir -p _pkg/etc/apache
+		cp /etc/apache/httpd.conf _pkg/etc/apache/httpd.conf
+		make INSTALL_ROOT=$PWD/_pkg install
+	}
+	# Recommended config file and phpinfo.
+	cp php.ini-recommended _pkg/etc/php.ini
+	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
+	    -i _pkg/etc/php.ini
+	cp -a ../stuff/phpinfo _pkg/usr/share
+	mkdir _pkg/usr/share/applications _pkg/usr/share/pixmap
+	cp ../stuff/php.desktop _pkg/usr/share/applications
+	cp ../stuff/php.png _pkg/usr/share/pixmap
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -42,43 +55,22 @@
 {
 	mkdir -p $fs/usr/bin $fs/etc $fs/usr/share
 	cp -a $src/sapi/cgi/php-cgi $fs/usr/bin
-	# Recommended config file and phpinfo.
-	cp $src/php.ini-recommended $fs/etc/php.ini
-	sed -e 's|extension_dir = "./"|extension_dir = "/usr/share/php/"|' \
-	    -i $fs/etc/php.ini
-	cp -a stuff/phpinfo $fs/usr/share
 	for i in $(cd $WOK; ls -d php-*)
 	do
 		tazwok cook $i
 	done
 }
 
-# Post and pre install commans to stop
+# Post and pre install commands to stop
 # and restart Web server if needed.
 pre_install()
 {
 	if [ -f "$1/var/run/lighttpd.pid" ]; then
 		/etc/init.d/lighttpd stop
 	fi
-	# Backup existing php.ini
-	if [ -f "$1/etc/php.ini" ]; then
-		echo -n "Creating php.ini backup..."
-		cp $1/etc/php.ini $1/etc/php.ini.bak
-		status
-	fi
 }
 post_install()
 {
-	( cd $1/ ; cpio -o -H newc | gzip -9 ) > \
-		$1/$INSTALLED/$PACKAGE/volatile.cpio.gz <<EOT
-etc/php.ini
-EOT
-	# Restore original php.ini
-	if [ -f "$1/etc/php.ini.bak" ]; then
-		echo -n "Restoring php.ini backup..."
-		mv -f $1/etc/php.ini.bak $1/etc/php.ini 
-		status
-	fi
 	# Enable php
 	if [ -f $1/etc/lighttpd/lighttpd.conf ]; then
 	  [ -f $1/usr/lib/lighttpd/mod_fastcgi.so ] || \
@@ -96,8 +88,3 @@
 		/etc/init.d/lighttpd start
 	fi
 }
-
-repack_cleanup()
-{
-        zcat $INSTALLED/$PACKAGE/volatile.cpio.gz | ( cd $1 ; cpio -id )
-}