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

[wilbury at users.sourceforge.net]

Revision: 21059
          http://gar.svn.sourceforge.net/gar/?rev=21059&view=rev
Author:   wilbury
Date:     2013-05-12 19:37:49 +0000 (Sun, 12 May 2013)
Log Message:
-----------
php5/trunk: Do not activate module during package build.

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

Added Paths:
-----------
    csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2013-05-12 19:10:53 UTC (rev 21058)
+++ csw/mgar/pkg/php5/trunk/Makefile	2013-05-12 19:37:49 UTC (rev 21059)
@@ -47,6 +47,7 @@
 DISTFILES += httpd-php5.conf
 
 PATCHFILES += 0001-Strip-usr-ucblib-references.patch
+PATCHFILES += 0003-Do-not-activate-php5-module-during-package-build.patch
 
 BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils
 BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg
@@ -356,6 +357,9 @@
 pre-install-modulated: $(PI_SCRIPTS)
 	@(mkdir -p $(DESTDIR)$(AP2SYSCONF); \
 		cp $(AP2SYSCONF)/httpd.conf $(DESTDIR)$(AP2SYSCONF) )
+	@echo "LoadModule foo_module libexec/mod_foo.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf
+	@echo "LoadModule foo1_module libexec/mod_foo1.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf
+	@echo "LoadModule foo2_module libexec/mod_foo2.so" > $(DESTDIR)$(AP2SYSCONF)/httpd.conf
 	@$(MAKECOOKIE)
 
 post-install-modulated: AP2SYSCONF=/opt/csw/apache2/etc/httpd.conf

Added: csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch	                        (rev 0)
+++ csw/mgar/pkg/php5/trunk/files/0003-Do-not-activate-php5-module-during-package-build.patch	2013-05-12 19:37:49 UTC (rev 21059)
@@ -0,0 +1,25 @@
+From 65752fa7bb4c2577352ed758f695f53a23edd734 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 12 May 2013 19:25:05 +0200
+Subject: [PATCH] Do not activate php5 module during package build.
+
+---
+ sapi/apache2handler/config.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index 702f91f..9e3d546 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -77,7 +77,7 @@ if test "$PHP_APXS2" != "no"; then
+                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
+-                       -i -a -n php5"
++                       -i -n php5"
+   fi
+ 
+   case $host_alias in
+-- 
+1.8.1.4
+

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