[csw-devel] SF.net SVN: gar:[4841] csw/mgar/pkg/php4/trunk

[valholla at users.sourceforge.net]

Revision: 4841
          http://gar.svn.sourceforge.net/gar/?rev=4841&view=rev
Author:   valholla
Date:     2009-05-14 04:01:52 +0000 (Thu, 14 May 2009)

Log Message:
-----------
working merge

Modified Paths:
--------------
    csw/mgar/pkg/php4/trunk/Makefile
    csw/mgar/pkg/php4/trunk/checksums
    csw/mgar/pkg/php4/trunk/files/php.ini.CSW

Added Paths:
-----------
    csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf
    csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW
    csw/mgar/pkg/php4/trunk/files/pkgdef.mk

Modified: csw/mgar/pkg/php4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php4/trunk/Makefile	2009-05-14 01:34:37 UTC (rev 4840)
+++ csw/mgar/pkg/php4/trunk/Makefile	2009-05-14 04:01:52 UTC (rev 4841)
@@ -19,6 +19,9 @@
 MASTER_SITES   = http://us.php.net/distributions/
 SPKG_SOURCEURL = http://www.php.net/downloads.php
 DISTFILES     += $(GARNAME)-$(GARVERSION).tar.bz2
+DISTFILES     += dummy-httpd.conf
+DISTFILES     += httpd-php4.conf.CSW
+DISTFILES     += php.ini.CSW
 
 INSTALL_ENV   += INSTALL_ROOT=$(DESTDIR)
 PHP4ROOT       = $(DESTDIR)$(prefix)/php4
@@ -82,10 +85,63 @@
 CONFIGURE_ARGS += --with-xmlrpc=shared,$(prefix)
 CONFIGURE_ARGS += --with-zlib=shared
 
-
 # Disable Tests (report submitted to PHP QA)
 SKIPTEST = 1
 ENABLE_CHECK = 0
 
-# System Rules/Configuration
+PI_SCRIPTS  = install-extra
+PI_SCRIPTS += install-ap2modphp4
+PI_SCRIPTS += install-modphp4
+PI_SCRIPTS += install-cleanup
+
+post-install-modulated: $(PI_SCRIPTS)
+	@$(MAKECOOKIE)
+
+install-ap2modphp4:
+	@echo "  ==> Now Building ap2_modphp4 <=="
+	@if [ -f $(WORKSRC)/Makefile ]; then \
+		$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
+	@cd $(WORKSRC) && $(BUILD_ENV) \
+		./configure $(CONFIGURE_ARGS) --with-apxs2=$(prefix)/apache2/sbin/apxs
+	@$(GARBIN)/fixlibtool $(WORKSRC)
+	@$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
+	@strip $(DESTDIR)$(prefix)/apache2/libexec/libphp4.so
+	@$(MAKECOOKIE)
+
+install-modphp4:
+	@echo "  ==> Now Building modphp4 <=="
+	@if [ -f $(WORKSRC)/Makefile ]; then \
+		$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi
+	@cd $(WORKSRC) && $(BUILD_ENV) \
+		./configure $(CONFIGURE_ARGS) --with-apxs=$(prefix)/apache/bin/apxs
+	@$(GARBIN)/fixlibtool $(WORKSRC)
+	@$(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi
+	@strip $(DESTDIR)$(prefix)/apache/libexec/libphp4.so
+	@$(MAKECOOKIE)
+
+install-extra:
+	@gmv $(DESTDIR)$(prefix)/php4/etc/pear.conf \
+		$(DESTDIR)$(prefix)/php4/etc/pear.conf.CSW
+	@gsed -i -e s,PHPEXTDIR,$(shell $(PHP4ROOT)/bin/php-config --extension-dir),\
+			$(WORKDIR)/php.ini.CSW
+	@ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
+	@ginstall -d $(DESTDIR)$(prefix)/apache/conf
+	@ginstall -d $(DESTDIR)$(prefix)/php4/lib
+	@ginstall -m 0644 $(WORKDIR)/php.ini.CSW $(DESTDIR)$(prefix)/php4/lib
+	@ginstall -m 0644 $(WORKDIR)/httpd-php4.conf.CSW \
+		$(DESTDIR)$(prefix)/apache2/etc/extra
+	@gcp $(DOWNLOADDIR)/dummy-httpd.conf $(DESTDIR)$(prefix)/apache2/etc/httpd.conf
+	@gcp $(DOWNLOADDIR)/dummy-httpd.conf $(DESTDIR)$(prefix)/apache/conf/httpd.conf
+	@$(MAKECOOKIE)
+
+install-cleanup:
+	@grm -fr $(DESTDIR)/.[a-z]*
+	@gfind $(DESTDIR) -name \*.a -exec grm -f {} \;
+	@gfind $(DESTDIR)$(prefix)/apache*  \
+		-mindepth 1 -type d | egrep -v "etc|libexec" | xargs grm -fr
+	@grm $(DESTDIR)$(prefix)/apache2/etc/httpd.conf*
+	@$(MAKECOOKIE)
+
+
+include files/pkgdef.mk
 include gar/category.mk

Modified: csw/mgar/pkg/php4/trunk/checksums
===================================================================
--- csw/mgar/pkg/php4/trunk/checksums	2009-05-14 01:34:37 UTC (rev 4840)
+++ csw/mgar/pkg/php4/trunk/checksums	2009-05-14 04:01:52 UTC (rev 4841)
@@ -1,2 +1,5 @@
+93db60a388952ec3b40bb3bb005ff06b  download/dummy-httpd.conf
+ec1d86518d8b6d5a320ce058f03d9eef  download/httpd-php4.conf.CSW
 3870a95f52c9637798294243694fdd47  download/pgsql.diff
 2e3b2a0e27f10cb84fd00e5ecd7a1880  download/php-4.4.9.tar.bz2
+4450995841c11c22e4369dc425307a4a  download/php.ini.CSW

Added: csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf
===================================================================
--- csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf	                        (rev 0)
+++ csw/mgar/pkg/php4/trunk/files/dummy-httpd.conf	2009-05-14 04:01:52 UTC (rev 4841)
@@ -0,0 +1,2 @@
+
+LoadModule dummy_module     libexec/libdummy.so

Added: csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW
===================================================================
--- csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW	                        (rev 0)
+++ csw/mgar/pkg/php4/trunk/files/httpd-php4.conf.CSW	2009-05-14 04:01:52 UTC (rev 4841)
@@ -0,0 +1,8 @@
+
+<IfModule php4_module>
+    <IfModule mime_module>
+        AddType application/x-httpd-php .php
+        AddType application/x-httpd-php-source .phps
+    </IfModule>
+</IfModule>
+

Modified: csw/mgar/pkg/php4/trunk/files/php.ini.CSW
===================================================================
--- csw/mgar/pkg/php4/trunk/files/php.ini.CSW	2009-05-14 01:34:37 UTC (rev 4840)
+++ csw/mgar/pkg/php4/trunk/files/php.ini.CSW	2009-05-14 04:01:52 UTC (rev 4841)
@@ -426,7 +426,7 @@
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "./"
+extension_dir = PHPEXTDIR
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically

Added: csw/mgar/pkg/php4/trunk/files/pkgdef.mk
===================================================================
--- csw/mgar/pkg/php4/trunk/files/pkgdef.mk	                        (rev 0)
+++ csw/mgar/pkg/php4/trunk/files/pkgdef.mk	2009-05-14 04:01:52 UTC (rev 4841)
@@ -0,0 +1,2 @@
+
+# Package Definition File


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