diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2012-05-16 07:36:13 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2012-05-16 07:36:13 +0000 |
| commit | 0926c2d68184815a02f5cca31272552ad7775ce9 (patch) | |
| tree | 01547487c274c698024ebc139ec56597c842b064 /lang/php5/files/patch-sapi_cgi_config9.m4 | |
| parent | - Update to 20120508 (diff) | |
Update to 5.4.3 release:
- add support for embedded php library
- add support for dtrace
Re-organize bsd.php.mk:
- add WANT_PHP_EMD
- fix handling of WANT_PHP_*
- remove php4 extensions
From UPDATING:
Suhosin patch has been disabled until the
new version will be released (soon). Suhosing extension will take more
time. LINKTHR option is now enabled by default, be sure to flag it if
you are updating using an old saved configuration. sqlite2 extension
has been permanently removed.
If you want to remain at PHP 5.3, a new port (lang/php53) will be
committed soon.
Diffstat (limited to 'lang/php5/files/patch-sapi_cgi_config9.m4')
| -rw-r--r-- | lang/php5/files/patch-sapi_cgi_config9.m4 | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/lang/php5/files/patch-sapi_cgi_config9.m4 b/lang/php5/files/patch-sapi_cgi_config9.m4 deleted file mode 100644 index 7682dad43110..000000000000 --- a/lang/php5/files/patch-sapi_cgi_config9.m4 +++ /dev/null @@ -1,56 +0,0 @@ ---- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200 -+++ sapi/cgi/config9.m4 2008-09-25 23:07:13.000000000 +0200 -@@ -8,7 +8,6 @@ - dnl - dnl CGI setup - dnl --if test "$PHP_SAPI" = "default"; then - AC_MSG_CHECKING(whether to build CGI binary) - if test "$PHP_CGI" != "no"; then - AC_MSG_RESULT(yes) -@@ -53,8 +52,9 @@ - PHP_SUBST(SAPI_CGI_PATH) - - dnl Set install target and select SAPI -- 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, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)') -+ 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, cgi_main.c fastcgi.c,, cgi) -+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi) - - case $host_alias in - *aix*) -@@ -64,17 +64,29 @@ - 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) -- -- elif test "$PHP_CLI" != "no"; then -- AC_MSG_RESULT(no) -+ PHP_SUBST(INSTALL_CGI) -+ PHP_SUBST(PHP_CGI_OBJS) -+ PHP_SUBST(PHP_CGI_TARGET) -+ PHP_SUBST(PHP_INSTALL_CGI_TARGET) -+ -+ 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_CLI" != "no" ; then - OVERALL_TARGET= - PHP_SAPI=cli - else - AC_MSG_ERROR([No SAPIs selected.]) - fi -+ fi - fi |
