2 files changed, 10 insertions, 14 deletions
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in
index 7e735cdeb2a7..98264d6155d2 100644
--- a/lang/php5/files/patch-configure.in
+++ b/lang/php5/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Sat Jan 20 10:52:51 2007
-+++ configure.in	Sat Jan 20 10:55:48 2007
-@@ -227,7 +227,6 @@
+--- configure.in.orig	Mon Jun  4 08:08:43 2007
++++ configure.in	Mon Jun  4 08:13:47 2007
+@@ -233,7 +233,6 @@
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,15 +8,15 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_SAPI=default
-@@ -252,7 +251,6 @@
+@@ -258,7 +257,6 @@
  
  if test "$enable_maintainer_zts" = "yes"; then
    PTHREADS_ASSIGN_VARS
 -  PTHREADS_FLAGS
  fi
  
- if test "$PHP_ENABLE_FASTCGI" = "yes"; then
-@@ -1100,7 +1098,7 @@
+ divert(3)
+@@ -1123,7 +1121,7 @@
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -25,7 +25,7 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1271,25 +1269,22 @@
+@@ -1295,22 +1293,19 @@
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
@@ -35,16 +35,12 @@
 +install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear"
  
  case $PHP_SAPI in
--  cgi)
-+  apache)
-     install_targets="install-sapi $install_targets"
-     ;;
 -  cli)
 -    install_targets="$PHP_INSTALL_CLI_TARGET $install_targets"
 -    ;;
 -  *)
 -    install_targets="install-sapi $PHP_INSTALL_CLI_TARGET $install_targets"
-+  apache2handler)
++  apache|apache2handler)
 +    install_targets="install-sapi $install_targets"
      ;;
  esac
diff --git a/lang/php5/files/patch-sapi_cgi_config9.m4 b/lang/php5/files/patch-sapi_cgi_config9.m4
index 8677e0e9aa12..d3f012498cd6 100644
--- a/lang/php5/files/patch-sapi_cgi_config9.m4
+++ b/lang/php5/files/patch-sapi_cgi_config9.m4
@@ -12,9 +12,9 @@
      AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ])
      AC_MSG_RESULT($PHP_ENABLE_FASTCGI)
  
--    INSTALL_IT="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)"
+-    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
 -    PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, , '$(SAPI_CGI_PATH)')
-+    INSTALL_CGI="@echo \"Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
++    INSTALL_CGI="@echo \"Installing PHP CGI binary: $(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
 +    PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
 +    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)