summaryrefslogtreecommitdiff
path: root/lang/php4/files
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-05-11 19:36:53 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-05-11 19:36:53 +0000
commitf44915884b9bbc543ae908eca4075cde7ae60255 (patch)
tree6525f7d6959179de877dffe71314f0e47974f981 /lang/php4/files
parentphp4 is EOLed (diff)
2012-05-10 archivers/php4-bz2: php4 is EOLed
2012-05-10 archivers/php4-zlib: php4 is EOLed 2012-05-10 converters/php4-iconv: php4 is EOLed 2012-05-10 converters/php4-mbstring: php4 is EOLed 2012-05-10 converters/php4-recode: php4 is EOLed 2012-05-10 databases/php4-dba: php4 is EOLed 2012-05-10 databases/php4-dbase: php4 is EOLed 2012-05-10 databases/php4-dbx: php4 is EOLed 2012-05-10 databases/php4-filepro: php4 is EOLed 2012-05-10 databases/php4-interbase: php4 is EOLed 2012-05-10 databases/php4-mssql: php4 is EOLed 2012-05-10 databases/php4-mysql: php4 is EOLed 2012-05-10 databases/php4-odbc: php4 is EOLed 2012-05-10 databases/php4-oracle: php4 is EOLed 2012-05-10 databases/php4-pgsql: php4 is EOLed databases/php4-rrdtool: php4 is EOLed 2012-05-10 databases/php4-sybase_ct: php4 is EOLed 2012-05-10 devel/php4-dio: php4 is EOLed 2012-05-10 devel/php4-gettext: php4 is EOLed 2012-05-10 devel/php4-mcve: php4 is EOLed 2012-05-10 devel/php4-ncurses: php4 is EOLed 2012-05-10 devel/php4-pcntl: php4 is EOLed 2012-05-10 devel/php4-pcre: php4 is EOLed 2012-05-10 devel/php4-readline: php4 is EOLed 2012-05-10 devel/php4-shmop: php4 is EOLed 2012-05-10 devel/php4-sysvmsg: php4 is EOLed 2012-05-10 devel/php4-sysvsem: php4 is EOLed 2012-05-10 devel/php4-sysvshm: php4 is EOLed 2012-05-10 devel/php4-tokenizer: php4 is EOLed 2012-05-10 finance/php4-pfpro: php4 is EOLed 2012-05-10 ftp/php4-curl: php4 is EOLed 2012-05-10 ftp/php4-ftp: php4 is EOLed 2012-05-10 graphics/php4-chartdirector: php4 is EOLed 2012-05-10 graphics/php4-exif: php4 is EOLed 2012-05-10 graphics/php4-gd: php4 is EOLed lang/php4: php4 is EOLed 2012-05-10 lang/php4-extensions: php4 is EOLed 2012-05-10 lang/php4-overload: php4 is EOLed 2012-05-10 mail/php4-imap: php4 is EOLed 2012-05-10 math/php4-bcmath: php4 is EOLed 2012-05-10 math/php4-gmp: php4 is EOLed 2012-05-10 misc/php4-calendar: php4 is EOLed 2012-05-10 misc/php4-mcal: php4 is EOLed 2012-05-10 net/php4-ldap: php4 is EOLed 2012-05-10 net/php4-sockets: php4 is EOLed 2012-05-10 net/php4-xmlrpc: php4 is EOLed 2012-05-10 net/php4-yp: php4 is EOLed 2012-05-10 net-mgmt/php4-snmp: php4 is EOLed 2012-05-10 security/php4-crack: php4 is EOLed 2012-05-10 security/php4-mcrypt: php4 is EOLed 2012-05-10 security/php4-mhash: php4 is EOLed 2012-05-10 security/php4-openssl: php4 is EOLed 2012-05-10 sysutils/php4-posix: php4 is EOLed 2012-05-10 textproc/php4-ctype: php4 is EOLed 2012-05-10 textproc/php4-domxml: php4 is EOLed 2012-05-10 textproc/php4-pspell: php4 is EOLed 2012-05-10 textproc/php4-wddx: php4 is EOLed 2012-05-10 textproc/php4-xml: php4 is EOLed 2012-05-10 textproc/php4-xslt: php4 is EOLed 2012-05-10 www/php4-session: php4 is EOLed 2012-05-10 archivers/pecl-zip: php4 is EOLed 2012-05-10 databases/pecl-sqlite: php4 is EOLed 2012-05-11 devel/pear-XML_XPath: php4 is EOLed 2012-05-11 devel/pecl-json: php4 is EOLed 2012-05-10 www/pecl-tidy: php4 is EOLed 2012-05-10 www/php-dyn: php4 is EOLed 2012-05-11 security/pecl-hash: php4 is EOLed 2012-05-11 net/phpldapadmin098: php4 is EOLed graphics/jpgraph: php4 is EOLed
Notes
Notes: svn path=/head/; revision=296450
Diffstat (limited to 'lang/php4/files')
-rw-r--r--lang/php4/files/patch-TSRM_threads.m411
-rw-r--r--lang/php4/files/patch-Zend::zend.h11
-rw-r--r--lang/php4/files/patch-acinclude.m437
-rw-r--r--lang/php4/files/patch-build_libtool.m411
-rw-r--r--lang/php4/files/patch-configure.in51
-rw-r--r--lang/php4/files/patch-ext_standard_basic_functions.c10
-rw-r--r--lang/php4/files/patch-main::php_config.h.in12
-rw-r--r--lang/php4/files/patch-main_SAPI.c20
-rw-r--r--lang/php4/files/patch-main_main.c11
-rw-r--r--lang/php4/files/patch-php.ini-dist18
-rw-r--r--lang/php4/files/patch-php.ini-recommended18
-rw-r--r--lang/php4/files/patch-sapi_cgi_Makefile.frag9
-rw-r--r--lang/php4/files/patch-sapi_cgi_config9.m454
-rw-r--r--lang/php4/files/patch-scripts::Makefile.frag22
14 files changed, 0 insertions, 295 deletions
diff --git a/lang/php4/files/patch-TSRM_threads.m4 b/lang/php4/files/patch-TSRM_threads.m4
deleted file mode 100644
index 3f75b837b071..000000000000
--- a/lang/php4/files/patch-TSRM_threads.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- TSRM/threads.m4.orig Fri May 5 08:02:38 2006
-+++ TSRM/threads.m4 Fri May 5 08:02:59 2006
-@@ -164,7 +164,7 @@ dnl
- dnl
- AC_DEFUN([PTHREADS_ASSIGN_VARS],[
- if test -n "$ac_cv_pthreads_lib"; then
-- LIBS="$LIBS -l$ac_cv_pthreads_lib"
-+ LIBS="$LIBS $ac_cv_pthreads_lib"
- fi
-
- if test -n "$ac_cv_pthreads_cflags"; then
diff --git a/lang/php4/files/patch-Zend::zend.h b/lang/php4/files/patch-Zend::zend.h
deleted file mode 100644
index 7bbc0dd24d16..000000000000
--- a/lang/php4/files/patch-Zend::zend.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Zend/zend.h.orig Sat Jul 23 13:58:40 2005
-+++ Zend/zend.h Tue Nov 15 23:25:54 2005
-@@ -176,7 +176,7 @@
- #endif
-
-
--#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__)
-+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) && !(defined(ZTS) && defined(__FreeBSD__))
- # define do_alloca(p) alloca(p)
- # define free_alloca(p)
- #else
diff --git a/lang/php4/files/patch-acinclude.m4 b/lang/php4/files/patch-acinclude.m4
deleted file mode 100644
index 94e15f9f3d58..000000000000
--- a/lang/php4/files/patch-acinclude.m4
+++ /dev/null
@@ -1,37 +0,0 @@
---- acinclude.m4.orig Mon Dec 19 23:29:11 2005
-+++ acinclude.m4 Fri May 5 08:05:43 2006
-@@ -84,7 +84,7 @@
- dnl
- dnl which array to append to?
- AC_DEFUN([PHP_ADD_SOURCES],[
-- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
-+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS))))
- ])
- dnl
- dnl _PHP_ASSIGN_BUILD_VARS(type)
-@@ -1305,12 +1305,8 @@
-
- if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
- dnl ---------------------------------------------- CLI static module
-- if test "$PHP_SAPI" = "cgi"; then
-- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
-- EXT_STATIC="$EXT_STATIC $1"
-- else
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
-- fi
-+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
- EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
- fi
- PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1713,9 +1709,9 @@
- test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
-
- dnl Fallbacks for different configure options
-- if test "$PHP_OPENSSL" != "no"; then
-+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then
- PHP_OPENSSL_DIR=$PHP_OPENSSL
-- elif test "$PHP_IMAP_SSL" != "no"; then
-+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then
- PHP_OPENSSL_DIR=$PHP_IMAP_SSL
- fi
-
diff --git a/lang/php4/files/patch-build_libtool.m4 b/lang/php4/files/patch-build_libtool.m4
deleted file mode 100644
index d55e8471178e..000000000000
--- a/lang/php4/files/patch-build_libtool.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/libtool.m4.orig Wed Feb 7 16:51:07 2007
-+++ build/libtool.m4 Wed Feb 7 16:51:49 2007
-@@ -2073,7 +2073,7 @@
- ;;
-
- freebsd*)
-- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
diff --git a/lang/php4/files/patch-configure.in b/lang/php4/files/patch-configure.in
deleted file mode 100644
index 8359580c8dfe..000000000000
--- a/lang/php4/files/patch-configure.in
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.in.orig Sat Jan 20 10:56:56 2007
-+++ configure.in Sat Jan 20 10:57:33 2007
-@@ -261,7 +261,6 @@
- dnl .
- dnl -------------------------------------------------------------------------
-
--PTHREADS_CHECK
- PHP_HELP_SEPARATOR([SAPI modules:])
- PHP_SHLIB_SUFFIX_NAME
- PHP_SAPI=default
-@@ -287,7 +286,6 @@
-
- if test "$enable_experimental_zts" = "yes"; then
- PTHREADS_ASSIGN_VARS
-- PTHREADS_FLAGS
- fi
-
- if test "$PHP_ENABLE_FASTCGI" = "yes"; then
-@@ -1058,7 +1056,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"`
--INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
-+INCLUDE_PATH=.:${prefix}/share/pear
-
- exec_prefix=$old_exec_prefix
- libdir=$old_libdir
-@@ -1235,18 +1233,15 @@
- INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
- CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
-
--all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
--install_targets="$install_modules $install_pear install-build install-headers install-programs"
-+all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET) $(PHP_CGI_TARGET)'
-+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules $install_pear install-build install-headers install-programs"
-
- 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)
-+ install_targets="install-sapi $install_targets"
- ;;
- esac
-
diff --git a/lang/php4/files/patch-ext_standard_basic_functions.c b/lang/php4/files/patch-ext_standard_basic_functions.c
deleted file mode 100644
index b44a87f1ec9e..000000000000
--- a/lang/php4/files/patch-ext_standard_basic_functions.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ext/standard/basic_functions.c.orig Mon Jan 30 15:58:01 2006
-+++ ext/standard/basic_functions.c Mon Jan 30 15:58:36 2006
-@@ -66,6 +66,7 @@
- # include <sys/mman.h>
- #endif
-
-+#define HARTMUT_0
- #ifdef HARTMUT_0
- #include <getopt.h>
- #endif
diff --git a/lang/php4/files/patch-main::php_config.h.in b/lang/php4/files/patch-main::php_config.h.in
deleted file mode 100644
index 0b470b3f484a..000000000000
--- a/lang/php4/files/patch-main::php_config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- main/php_config.h.in.orig Thu Jan 12 19:24:28 2006
-+++ main/php_config.h.in Fri May 5 08:02:13 2006
-@@ -2624,6 +2624,9 @@
- /* Whether to build zip as dynamic module */
- #undef COMPILE_DL_ZIP
-
-+/* Include external shared modules configurations */
-+#include "ext/php_config.h"
-+
- /* Define if int32_t type is present. */
- #undef HAVE_INT32_T
-
diff --git a/lang/php4/files/patch-main_SAPI.c b/lang/php4/files/patch-main_SAPI.c
deleted file mode 100644
index 7064b4797140..000000000000
--- a/lang/php4/files/patch-main_SAPI.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- main/SAPI.c.orig Sun Jan 1 14:46:59 2006
-+++ main/SAPI.c Fri May 5 08:02:13 2006
-@@ -582,7 +582,7 @@
- ptr++;
- len--;
- }
--#if HAVE_ZLIB
-+#if 1
- if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
- zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
- }
-@@ -729,7 +729,7 @@
- return SUCCESS;
- }
-
--#if HAVE_ZLIB
-+#if 1
- /* Add output compression headers at this late stage in order to make
- it possible to switch it off inside the script. */
-
diff --git a/lang/php4/files/patch-main_main.c b/lang/php4/files/patch-main_main.c
deleted file mode 100644
index fda40aee97f5..000000000000
--- a/lang/php4/files/patch-main_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/main.c.orig Sat Dec 10 09:40:39 2005
-+++ main/main.c Sat Dec 10 09:40:57 2005
-@@ -344,7 +344,7 @@
- PHP_INI_ENTRY("smtp_port", "25", PHP_INI_ALL, NULL)
- PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, NULL)
- #if MEMORY_LIMIT
-- PHP_INI_ENTRY("memory_limit", "8M", PHP_INI_ALL, OnChangeMemoryLimit)
-+ PHP_INI_ENTRY("memory_limit", "12M", PHP_INI_ALL, OnChangeMemoryLimit)
- #endif
- PHP_INI_ENTRY("precision", "14", PHP_INI_ALL, OnSetPrecision)
- PHP_INI_ENTRY("sendmail_from", NULL, PHP_INI_ALL, NULL)
diff --git a/lang/php4/files/patch-php.ini-dist b/lang/php4/files/patch-php.ini-dist
deleted file mode 100644
index 5ba593157aab..000000000000
--- a/lang/php4/files/patch-php.ini-dist
+++ /dev/null
@@ -1,18 +0,0 @@
---- php.ini-dist.orig Fri Dec 30 18:19:43 2005
-+++ php.ini-dist Mon Oct 16 08:12:28 2006
-@@ -155,6 +155,15 @@
-
- ; Safe Mode
- ;
-+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
-+; the PHP Safe Mode feature not be relied upon for security, since the
-+; issues Safe Mode tries to handle cannot properly be handled in PHP
-+; (primarily due to PHP's use of external libraries). While many bugs
-+; in Safe Mode has been fixed it's very likely that more issues exist
-+; which allows a user to bypass Safe Mode restrictions.
-+; For increased security we always recommend to install the Suhosin
-+; extension.
-+;
- safe_mode = Off
-
- ; By default, Safe Mode does a UID compare check when
diff --git a/lang/php4/files/patch-php.ini-recommended b/lang/php4/files/patch-php.ini-recommended
deleted file mode 100644
index a2baecd55e4f..000000000000
--- a/lang/php4/files/patch-php.ini-recommended
+++ /dev/null
@@ -1,18 +0,0 @@
---- php.ini-recommended.orig Fri Dec 30 18:19:43 2005
-+++ php.ini-recommended Mon Oct 16 08:13:05 2006
-@@ -169,6 +169,15 @@
- ;
- ; Safe Mode
- ;
-+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
-+; the PHP Safe Mode feature not be relied upon for security, since the
-+; issues Safe Mode tries to handle cannot properly be handled in PHP
-+; (primarily due to PHP's use of external libraries). While many bugs
-+; in Safe Mode has been fixed it's very likely that more issues exist
-+; which allows a user to bypass Safe Mode restrictions.
-+; For increased security we recommend to always install the Suhosin
-+; extension.
-+;
- safe_mode = Off
-
- ; By default, Safe Mode does a UID compare check when
diff --git a/lang/php4/files/patch-sapi_cgi_Makefile.frag b/lang/php4/files/patch-sapi_cgi_Makefile.frag
deleted file mode 100644
index c10be19f4703..000000000000
--- a/lang/php4/files/patch-sapi_cgi_Makefile.frag
+++ /dev/null
@@ -1,9 +0,0 @@
---- sapi/cgi/Makefile.frag.orig Fri May 5 08:09:42 2006
-+++ sapi/cgi/Makefile.frag Fri May 5 08:10:05 2006
-@@ -1,2 +1,5 @@
--$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)
- $(BUILD_CGI)
-+
-+install-cgi: $(SAPI_CGI_PATH)
-+ @$(INSTALL_CGI)
diff --git a/lang/php4/files/patch-sapi_cgi_config9.m4 b/lang/php4/files/patch-sapi_cgi_config9.m4
deleted file mode 100644
index 2d10bb0ac156..000000000000
--- a/lang/php4/files/patch-sapi_cgi_config9.m4
+++ /dev/null
@@ -1,54 +0,0 @@
---- sapi/cgi/config9.m4.orig Fri May 5 08:10:10 2006
-+++ sapi/cgi/config9.m4 Fri May 5 08:15:23 2006
-@@ -81,7 +81,6 @@ main()
- ])
-
-
--if test "$PHP_SAPI" = "default"; then
- AC_MSG_CHECKING(for CGI build)
- if test "$PHP_SAPI_CGI" != "no"; then
- AC_MSG_RESULT(yes)
-@@ -149,25 +148,38 @@ if test "$PHP_SAPI" = "default"; then
- 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)"
-- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, '$(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)"
-+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c, $PHP_FCGI_INCLUDE, cgi)
-+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
-
- case $host_alias in
- *darwin*)
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- *)
-- BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
-+ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CGI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
- ;;
- esac
-
-+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
-+ PHP_INSTALL_CGI_TARGET="install-cgi"
- PHP_SUBST(BUILD_CGI)
-+ PHP_SUBST(INSTALL_CGI)
-+ PHP_SUBST(PHP_CGI_OBJS)
-+ PHP_SUBST(PHP_CGI_TARGET)
-+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)
-
-- elif test "$PHP_SAPI_CLI" != "no"; then
-- AC_MSG_RESULT(no)
-+ if test "$PHP_SAPI" = "default" ; then
-+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
-+ fi
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$PHP_SAPI" = "default" ; then
-+ if test "$PHP_SAPI_CLI" != "no" ; then
- OVERALL_TARGET=
- PHP_SAPI=cli
- else
- AC_MSG_ERROR([No SAPIs selected.])
- fi
-+ fi
- fi
diff --git a/lang/php4/files/patch-scripts::Makefile.frag b/lang/php4/files/patch-scripts::Makefile.frag
deleted file mode 100644
index c0d6f9c744e3..000000000000
--- a/lang/php4/files/patch-scripts::Makefile.frag
+++ /dev/null
@@ -1,22 +0,0 @@
---- scripts/Makefile.frag.orig Wed Jun 8 12:34:41 2005
-+++ scripts/Makefile.frag Wed Jul 13 09:28:45 2005
-@@ -34,18 +34,9 @@
- / \
- Zend/ \
- TSRM/ \
-- include/ \
- main/ \
- regex/ \
-- ext/iconv/ \
-- ext/pgsql/ \
-- ext/standard/ \
-- ext/session/ \
-- ext/xml/ \
-- ext/xml/expat/ \
-- ext/mbstring/ \
-- ext/mbstring/libmbfl/ \
-- ext/mbstring/libmbfl/mbfl/
-+ ext/standard/
-
- install-headers:
- -@for i in $(HEADER_DIRS); do \