[csw-devel] SF.net SVN: gar:[14454] csw/mgar/pkg/php5/trunk

[bdwalton at users.sourceforge.net]

Revision: 14454
          http://gar.svn.sourceforge.net/gar/?rev=14454&view=rev
Author:   bdwalton
Date:     2011-04-29 01:29:07 +0000 (Fri, 29 Apr 2011)

Log Message:
-----------
php5/trunk: add the httpd-php5.conf file to the ap2_modphp5 package

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/php5/trunk/files/httpd-php5.conf

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-04-28 21:33:41 UTC (rev 14453)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-04-29 01:29:07 UTC (rev 14454)
@@ -41,6 +41,7 @@
 DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
 DISTFILES += CSWphp5.cswreleasenotes
 DISTFILES += CSWap2-modphp5.cswreleasenotes
+DISTFILES += httpd-php5.conf
 
 PATCHFILES += 0001-Strip-usr-ucblib-references.patch
 # this one is filed upstream: http://bugs.php.net/bug.php?id=54318
@@ -65,6 +66,7 @@
 BUILD_DEP_PKGS += CSWsqlite
 
 PRESERVECONF = /etc$(prefix)/php5/php.ini /etc$(prefix)/php5/pear.conf
+PRESERVECONF += /opt/csw/apache2/etc/extra/httpd-php5.conf
 MIGRATE_FILES_CSWphp5 = "php.ini pear.conf"
 MIGRATE_SOURCE_DIR_php_ini = /opt/csw/php5/lib
 MIGRATE_SOURCE_DIR_pear_conf = /opt/csw/php5/etc
@@ -325,9 +327,12 @@
 	@$(MAKECOOKIE)
 
 post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf
+post-install-modulated: AP2EXTCONF=/opt/csw/apache2/etc/extra
 post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini
 post-install-modulated:
 	@rm -f $(DESTDIR)$(AP2SYSCONF)
+	@mkdir -p $(DESTDIR)$(AP2EXTCONF)
+	@cp $(WORKSRC)/httpd-php5.conf $(AP2EXTCONF)
 	@cp $(WORKSRC)/php.ini-production $(INIDEST)
 	@ginstall -m 0755 $(DOWNLOADDIR)/phpext $(DESTDIR)$(prefix)/php5/bin/
 	@perl -pi -e 's/^;extension=php_(.*).dll/;extension=$$1.so/' $(INIDEST)

Added: csw/mgar/pkg/php5/trunk/files/httpd-php5.conf
===================================================================
--- csw/mgar/pkg/php5/trunk/files/httpd-php5.conf	                        (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/httpd-php5.conf	2011-04-29 01:29:07 UTC (rev 14454)
@@ -0,0 +1,6 @@
+<IfModule php5_module>
+    <IfModule mime_module>
+        AddType application/x-httpd-php .php
+        AddType application/x-httpd-php-source .phps
+    </IfModule>
+</IfModule>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.