[Lunar-commits] <moonbase> Revert "php5: add mod_php and fix php.ini install."

Michael 'v4hn' Goerner v4hn at lunar-linux.org
Tue May 15 14:35:25 CEST 2012


commit 91c750c1a34424af8532ce3bb8851063d7f1b3be
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Tue May 15 14:35:25 2012 +0200

    Revert "php5: add mod_php and fix php.ini install."
    
    This reverts commit 423993fa82ce2de58396785613a11589c78e91eb.
---
 compilers/php5/DEPENDS      |    5 -----
 compilers/php5/POST_INSTALL |    3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/compilers/php5/DEPENDS b/compilers/php5/DEPENDS
index ae19179..8c1b374 100644
--- a/compilers/php5/DEPENDS
+++ b/compilers/php5/DEPENDS
@@ -1,11 +1,6 @@
 depends readline
 depends libxml2
 
-optional_depends "httpd" \
-		 "--with-apxs2 --disable-cli" \
-		 "" \
-		 "build httpd handler module"
-
 optional_depends "lighttpd" \
                  "--enable-fastcgi" \
                  "" \
diff --git a/compilers/php5/POST_INSTALL b/compilers/php5/POST_INSTALL
index 4496f86..ac7ac3d 100644
--- a/compilers/php5/POST_INSTALL
+++ b/compilers/php5/POST_INSTALL
@@ -1,3 +1,4 @@
+
 # prototype AddType definition for apache2
 if [ -f /etc/httpd/conf/httpd.conf ] ; then
   if ! grep -q "x-httpd-php" /etc/httpd/conf/httpd.conf ; then
@@ -12,7 +13,7 @@ EOF
 fi
 
 if [ ! -e /etc/php.ini ] ; then
-  cp $SOURCE_DIRECTORY/php.ini-production /etc/php.ini
+  cp $SOURCE_DIRECTORY/php.ini-dist /etc/php.ini
 fi
 
 case  $REGGLOBALS  in


More information about the Lunar-commits mailing list