SF.net SVN: gar:[25422] csw/mgar/pkg/php5/branches/php-5.6.x/files

[cgrzemba at users.sourceforge.net]

Revision: 25422
          http://sourceforge.net/p/gar/code/25422
Author:   cgrzemba
Date:     2015-11-30 12:43:40 +0000 (Mon, 30 Nov 2015)
Log Message:
-----------
php5/branches/php-5.6.x: fix CSWap24-modphp5.preremovecd

Modified Paths:
--------------
    csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
    csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall	2015-11-30 10:26:33 UTC (rev 25421)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall	2015-11-30 12:43:40 UTC (rev 25422)
@@ -3,11 +3,11 @@
 AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load
 
 # Configure mod_php5 in httpd.conf
-if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ] ; then
+if [ -n "`egrep 'Include .*extra/httpd-php5.conf' $AP2_CONFIG`" ] ; then
      echo "Existing mod_php5 configuration detected"
-elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
+elif [ -n "`egrep '#Include .*extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
      echo "Re-enabling existing config"
-     perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG
+     perl -i -plne 's,^#(Include .*extra/httpd-php5.conf),$1,' $AP2_CONFIG
 else
      echo "Adding Include for extra/http-php5.conf to httpd.conf"
      cat << END >> $AP2_CONFIG

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove	2015-11-30 10:26:33 UTC (rev 25421)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove	2015-11-30 12:43:40 UTC (rev 25422)
@@ -5,7 +5,7 @@
 AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load
 
 echo "Disabling httpd-php5.conf in httpd.conf"
-perl -i -plne 's,(?<!#)(Include $CSW_PREFIX/apache2/extra/httpd-php5.conf),#$1,' $AP2_CONFIG
+perl -i -plne 's,(?<!#)(Include .*extra/httpd-php5.conf),#$1,' $AP2_CONFIG
 perl -i -plne 's,(?<!#)(LoadModule php5_module .*),#$1,' $AP2_MODULE
 
 cat <<END

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