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

[valholla at users.sourceforge.net]

Revision: 4460
          http://gar.svn.sourceforge.net/gar/?rev=4460&view=rev
Author:   valholla
Date:     2009-04-24 02:13:14 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
mod_php added to extensions to build with base php

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile
    csw/mgar/pkg/php5/trunk/checksums
    csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2009-04-23 22:18:12 UTC (rev 4459)
+++ csw/mgar/pkg/php5/trunk/Makefile	2009-04-24 02:13:14 UTC (rev 4460)
@@ -88,6 +88,10 @@
 # SAPI Specific Rules
 STRIP_DIRS += $(DESTDIR)$(prefix)/apache2/libexec
 
+# Rebuild Configure Args to build mod_php5
+NEW_CONFIGURE_ARGS = $(shell echo $(CONFIGURE_ARGS) |sed -e 's/apxs2/apxs/' \
+		-e 's/apache2\/sbin\/apxs/apache\/bin\/apxs/')
+
 # Copy over template config files and utility scripts
 
 post-install-modulated:
@@ -103,6 +107,12 @@
 		$(DESTDIR)$(prefix)/php5/etc
 	@(grm -fr $(DESTDIR)/.[a-z]*)
 	@(gfind $(PHP5ROOT)/lib -name "*.a" -exec grm {} \;)
+	@( echo "  ==> Now Building mod_php5 <==" )
+	@( if [ -f $(WORKSRC)/Makefile ]; then \
+		$(BUILD_ENV) gmake -C $(WORKSRC) distclean; fi)
+	cd $(WORKSRC) && $(BUILD_ENV) ./configure $(NEW_CONFIGURE_ARGS)
+	@( $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-sapi )
+	@( strip $(DESTDIR)$(prefix)/apache/libexec/libphp5.so )
 	@$(MAKECOOKIE)
 
 post-configure-modulated:

Modified: csw/mgar/pkg/php5/trunk/checksums
===================================================================
--- csw/mgar/pkg/php5/trunk/checksums	2009-04-23 22:18:12 UTC (rev 4459)
+++ csw/mgar/pkg/php5/trunk/checksums	2009-04-24 02:13:14 UTC (rev 4460)
@@ -2,6 +2,9 @@
 632cb357e102e18e04bb5666825a912f  download/CSWap2modphp5.postinstall
 e1381a4ba49e46b2097b76286a1b36fb  download/CSWap2modphp5.preremove
 0dd379f20ceb32fc77bb3a9bf045097f  download/CSWap2modphp5.space
+5f0046fe1b3f8e2228fdb165bdbbe73a  download/CSWmodphp5.postinstall
+2e5dbed2c9dd5e24c331753984946822  download/CSWmodphp5.preremove
+0dd379f20ceb32fc77bb3a9bf045097f  download/CSWmodphp5.space
 8139c9c02a2f62bac64041fdd0e90bf6  download/CSWphp5.postinstall
 89e79becc9d7698c5c561581f2b098bc  download/CSWphp5_ext_disable.sh
 de56d3571f4484284d106af158bffc38  download/CSWphp5_ext_enable.sh

Modified: csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile	2009-04-23 22:18:12 UTC (rev 4459)
+++ csw/mgar/pkg/php5/trunk/extensions/php5_apache/Makefile	2009-04-24 02:13:14 UTC (rev 4460)
@@ -1,13 +1,13 @@
 PHP5EXT_NAME = mod_php5
 
-#PACKAGES += CSWmodphp5
+PACKAGES += CSWmodphp5
 
 CATALOGNAME_CSWmodphp5 = mod_php5
 SPKG_DESC_CSWmodphp5 = PHP 5 - Apache 1.3.x Module
 REQUIRED_PKGS_CSWmodphp5  = CSWapache CSWbdb44 CSWiconv CSWkrb5lib
 REQUIRED_PKGS_CSWmodphp5 += CSWlibmm CSWlibxml2 CSWosslrt CSWphp5 CSWzlib
 
-#DISTFILES += CSWmodphp5.postinstall CSWmodphp5.preremove CSWmodphp5.space
-#CONFIGURE_ARGS += --with-apxs=$(prefix)/apache/bin/apxs
-#PKGFILES_CSWmodphp5 = .*/csw/apache/.*
+DISTFILES += CSWmodphp5.postinstall CSWmodphp5.preremove CSWmodphp5.space
 
+PKGFILES_CSWmodphp5 = .*/csw/apache/.*
+


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